Merge pull request #7471 from adibmbrk/fix-search

Fix search functionality in the policy administration page
wso2 · Jan 31, 2025 · aad06bc · aad06bc
2 parents 0eefeaa + 55f38bf
commit aad06bc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 28 deletions.
diff --git a/.changeset/itchy-experts-appear.md b/.changeset/itchy-experts-appear.md
@@ -0,0 +1,6 @@
+---
+"@wso2is/console": patch
+"@wso2is/admin.policy-administration.v1": patch
+---
+
+Fix search functionality and remove index file
diff --git a/features/admin.core.v1/configs/app.ts b/features/admin.core.v1/configs/app.ts
@@ -35,7 +35,7 @@ import { getScopesResourceEndpoints } from "@wso2is/admin.oidc-scopes.v1";
 import { getInsightsResourceEndpoints } from "@wso2is/admin.org-insights.v1/config/org-insights";
 import { getOrganizationsResourceEndpoints } from "@wso2is/admin.organizations.v1/configs";
 import { OrganizationUtils } from "@wso2is/admin.organizations.v1/utils";
-import { getPolicyAdministrationResourceEndpoints } from "@wso2is/admin.policy-administration.v1/configs";
+import { getPolicyAdministrationResourceEndpoints } from "@wso2is/admin.policy-administration.v1/configs/endpoints";
 import {
     getPushProviderResourceEndpoints, getPushProviderTemplateEndpoints
 } from "@wso2is/admin.push-providers.v1/configs/endpoints";

diff --git a/features/admin.policy-administration.v1/api/use-get-policies.ts b/features/admin.policy-administration.v1/api/use-get-policies.ts
@@ -44,6 +44,9 @@ export const useGetPolicies = <
         policySearchString: string,
         policyType: string
     ): RequestResultInterface<Data, Error> => {
+
+    const searchStringWithWildcard: string = policySearchString.trim() !== "" ? `*${policySearchString}*` : "*";
+
     const requestConfig: RequestConfigInterface = {
         headers: {
             Accept: "application/json",
@@ -53,15 +56,16 @@ export const useGetPolicies = <
         params: {
             isPDPPolicy,
             pageNumber,
-            policySearchString,
+            policySearchString: searchStringWithWildcard,
             policyType
         },
         url: `${store.getState().config.endpoints.entitlementPoliciesApi}`
     };
 
-    const { data, error, isValidating, mutate, isLoading } = useRequest<Data, Error>(shouldFetch ? requestConfig : null, {
-        shouldRetryOnError: false
-    });
+    const { data, error, isValidating, mutate, isLoading } = useRequest<Data, Error>(
+        shouldFetch ? requestConfig : null, {
+            shouldRetryOnError: false
+        });
 
     return {
         data,

diff --git a/features/admin.policy-administration.v1/components/policy-administration-page-layout.tsx b/features/admin.policy-administration.v1/components/policy-administration-page-layout.tsx
@@ -79,15 +79,13 @@ const PolicyAdministrationPageLayout: FunctionComponent<PolicyAdministrationPage
         data: inactivePolicyArray,
         error: inactivePolicyError,
         mutate: mutateInactivePolicy
-    } = useGetPolicies(true, pageInactive, false, submittedSearchQuery &&
-    submittedSearchQuery.trim() !== "" ? submittedSearchQuery : "*", "ALL");
+    } = useGetPolicies(true, pageInactive, false, submittedSearchQuery, "ALL");
 
     const {
         data: activePolicyArray,
         error: activePolicyError,
         mutate: mutateActivePolicy
-    } = useGetPolicies(true, pageActive, true, submittedSearchQuery &&
-    submittedSearchQuery.trim() !== "" ? submittedSearchQuery : "*", "ALL");
+    } = useGetPolicies(true, pageActive, true, submittedSearchQuery, "ALL");
 
     const {
         data: algorithm,

diff --git a/features/admin.policy-administration.v1/configs/index.ts b/features/admin.policy-administration.v1/configs/index.ts