Fixes policy admin state duplication and unresponsive ui

wso2 · Feb 18, 2025 · 09b878d · 09b878d
1 parent ee79e32
commit 09b878d
Showing 1 changed file with 8 additions and 34 deletions.
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
@@ -108,51 +108,26 @@ const PolicyAdministrationPageLayout: FunctionComponent<PolicyAdministrationPage
         if (!inactivePolicyArray) {
             return;
         }
-
-        const activePolicyIds: string[] = activePolicies.map(
-            ((activePolicy: PolicyInterface) => activePolicy.policyId)
-        );
-
-        const filteredInactivePolicies: PolicyInterface[] = (inactivePolicyArray.policySet ?? [])
-            .filter((policy: PolicyInterface) =>
-                policy !== null && !activePolicyIds.includes(policy.policyId)
-            );
-
-        if (pageInactive === 0) {
-            setInactivePolicies(filteredInactivePolicies);
-        } else {
-            setInactivePolicies(
-                (prev: PolicyInterface[]): PolicyInterface[] => [ ...prev, ...filteredInactivePolicies ]
-            );
-        }
-
+        const filteredInactivePolicies: PolicyInterface[] = (inactivePolicyArray.policySet ?? []).filter
+        ((policy: PolicyInterface) => policy !== null || []);
+        setInactivePolicies(filteredInactivePolicies);
         if ((pageInactive + 1) >= (inactivePolicyArray.numberOfPages ?? 1)) {
             setHasMoreInactivePolicies(false);
         }
 
-    }, [ inactivePolicyArray, activePolicyArray ]);
-
+    }, [ inactivePolicyArray]);
     useEffect(() => {
-        if (!activePolicyArray){
+        if (!activePolicyArray) {
             return;
         }
-
-        const rawActivePolicies: PolicyInterface[] = activePolicyArray.policySet?.filter(
-            (policy: PolicyInterface) => policy !== null) || [];
-
-        if (pageActive === 0) {
-            setActivePolicies(rawActivePolicies);
-        } else {
-            setActivePolicies((prev: PolicyInterface[]): PolicyInterface[] => [ ...prev, ...rawActivePolicies ]);
-        }
-
+        const filteredActivePolicies: PolicyInterface[] = activePolicyArray.policySet?.filter(
+            (policy: PolicyInterface) => policy !== null || []);
+        setActivePolicies(filteredActivePolicies);
         if ((pageActive + 1) >= (activePolicyArray.numberOfPages ?? 1)) {
             setHasMoreActivePolicies(false);
         }
-
     }, [ activePolicyArray ]);
 
-
     useEffect(() => {
         setPageInactive(0);
         setHasMoreInactivePolicies(true);
@@ -184,7 +159,6 @@ const PolicyAdministrationPageLayout: FunctionComponent<PolicyAdministrationPage
         setPageInactive((prevPage: number) => prevPage + 1);
     };
 
-
     const handleSubmit = (event: React.FormEvent<HTMLFormElement>) => {
         event.preventDefault();
         setSubmittedSearchQuery(searchQuery);