Merge pull request wso2#7420 from adibmbrk/fix/22315

Fix minor issues in the Policy Administration Page
HasiniSama · Jan 27, 2025 · 4d9cfbc · 4d9cfbc
2 parents 3c818d7 + 87a2443
commit 4d9cfbc
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 64 deletions.
diff --git a/.changeset/honest-cooks-call.md b/.changeset/honest-cooks-call.md
@@ -0,0 +1,6 @@
+---
+"@wso2is/admin.policy-administration.v1": patch
+"@wso2is/console": patch
+---
+
+Fix minor issues in the policy administration page and the console
diff --git a/apps/console/src/configs/routes.tsx b/apps/console/src/configs/routes.tsx
@@ -135,7 +135,7 @@ export const getAppViewRoutes = (): RouteInterface[] => {
                 icon: getSidePanelIcons().policyAdministration
             },
             id: "policyAdministration",
-            name: "Policy Administration",
+            name: "policyAdministration:title",
             order: 30,
             path: AppConstants.getPaths().get("POLICY_ADMINISTRATION"),
             protected: true,

diff --git a/...administration.v1/api/update-algorithm.ts → ...entitlement-policy-combining-algorithm.ts b/...administration.v1/api/update-algorithm.ts → ...entitlement-policy-combining-algorithm.ts
@@ -27,14 +27,14 @@ import { PolicyAlgorithmRequestInterface } from "../models/policies";
  * Get an httpClient instance.
  */
 const httpClient: HttpClientInstance = AsgardeoSPAClient.getInstance()
-    .httpRequest.bind(AsgardeoSPAClient.getInstance())
+    .httpRequest.bind(AsgardeoSPAClient.getInstance());
 
 /**
  * Function to update the policy combining algorithm.
  *
  * @param policyCombiningAlgorithm - The policy combining algorithm to be updated.
  */
-export const updateAlgorithm = (
+export const updateEntitlementPolicyCombiningAlgorithm = async (
     policyCombiningAlgorithm: PolicyAlgorithmRequestInterface
 ) : Promise<any> => {
     const requestConfig: RequestConfigInterface = {

diff --git a/...dministration.v1/api/use-get-algorithm.ts → ...entitlement-policy-combining-algorithm.ts b/...dministration.v1/api/use-get-algorithm.ts → ...entitlement-policy-combining-algorithm.ts
@@ -28,30 +28,32 @@ import { AlgorithmResponseInterface } from "../models/policies";
 /**
  * Fetches the policy combining algorithm.
  *
- * @param {boolean} shouldFetch - Flag to determine if the data should be fetched.
- * @return {RequestResultInterface} Response as a promise.
+ * @param shouldFetch - Should fetch the data.
+ * @returns SWR response object containing the data, error, isLoading, isValidating, mutate.
  */
-export const useGetAlgorithm = <Data = AlgorithmResponseInterface, Error = RequestErrorInterface>(
-    shouldFetch: boolean = true
-): RequestResultInterface<Data, Error> => {
-    const requestConfig: RequestConfigInterface = {
-        headers: {
-            Accept: "application/json",
-            "Content-Type": "application/json"
-        },
-        method: HttpMethods.GET,
-        url: `${store.getState().config.endpoints.entitlementPolicyCombiningAlgorithmApi}`
-    };
+export const useGetEntitlementPolicyCombiningAlgorithm =
+    <Data = AlgorithmResponseInterface, Error = RequestErrorInterface>(
+        shouldFetch: boolean = true
+    ): RequestResultInterface<Data, Error> => {
+        const requestConfig: RequestConfigInterface = {
+            headers: {
+                Accept: "application/json",
+                "Content-Type": "application/json"
+            },
+            method: HttpMethods.GET,
+            url: `${store.getState().config.endpoints.entitlementPolicyCombiningAlgorithmApi}`
+        };
 
-    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,
-        error,
-        isLoading,
-        isValidating,
-        mutate
+        return {
+            data,
+            error,
+            isLoading,
+            isValidating,
+            mutate
+        };
     };
-};
diff --git a/...admin.policy-administration.v1/components/edit-policy-algorithm/edit-policy-algorithm.tsx b/...admin.policy-administration.v1/components/edit-policy-algorithm/edit-policy-algorithm.tsx
@@ -34,7 +34,7 @@ import React, { FunctionComponent, ReactElement } from "react";
 import { useTranslation } from "react-i18next";
 import { useDispatch } from "react-redux";
 import { Dispatch } from "redux";
-import { updateAlgorithm } from "../../api/update-algorithm";
+import { updateEntitlementPolicyCombiningAlgorithm } from "../../api/update-entitlement-policy-combining-algorithm";
 import { AlgorithmOption, PolicyAlgorithmRequestInterface } from "../../models/policies";
 
 interface EditPolicyAlgorithmProps extends IdentifiableComponentInterface{
@@ -76,7 +76,7 @@ const EditPolicyAlgorithm: FunctionComponent<EditPolicyAlgorithmProps> = (
             policyCombiningAlgorithm: selectedOption.id
         };
 
-        updateAlgorithm(data).then(() => {
+        updateEntitlementPolicyCombiningAlgorithm(data).then(() => {
             dispatch(addAlert({
                 description: t("policyAdministration:alerts.updateAlgorithmSuccess.description"),
                 level: AlertLevels.SUCCESS,

diff --git a/features/admin.policy-administration.v1/components/edit-policy-algorithm/index.ts b/features/admin.policy-administration.v1/components/edit-policy-algorithm/index.ts
diff --git a/features/admin.policy-administration.v1/components/policy-administration-page-layout.scss b/features/admin.policy-administration.v1/components/policy-administration-page-layout.scss
@@ -34,15 +34,6 @@
 .policy-list-card {
     background-color: transparent;
     padding: 0;
-}
-
-#active-policy-list-container{
-    height: 60vh;
-    overflow-x: hidden;
-    overflow-y: auto;
-}
-
-#inactive-policy-list-container{
     height: 60vh;
     overflow-x: hidden;
     overflow-y: auto;
@@ -61,4 +52,3 @@
         flex: 1;
     }
 }
-
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
@@ -38,7 +38,7 @@ import InfiniteScroll from "react-infinite-scroll-component";
 import { Icon } from "semantic-ui-react";
 import { PolicyList } from "./policy-list";
 import { NewPolicyWizard } from "./wizard/new-policy-wizard";
-import { useGetAlgorithm } from "../api/use-get-algorithm";
+import { useGetEntitlementPolicyCombiningAlgorithm } from "../api/use-get-entitlement-policy-combining-algorithm";
 import { useGetPolicies } from "../api/use-get-policies";
 import EditPolicyAlgorithmModal from "../components/edit-policy-algorithm/edit-policy-algorithm";
 import "./policy-administration-page-layout.scss";
@@ -92,7 +92,7 @@ const PolicyAdministrationPageLayout: FunctionComponent<PolicyAdministrationPage
     const {
         data: algorithm,
         mutate: mutateAlgorithm
-    } = useGetAlgorithm();
+    } = useGetEntitlementPolicyCombiningAlgorithm();
 
     useEffect(() => {
         if (algorithm) {
@@ -218,9 +218,9 @@ const PolicyAdministrationPageLayout: FunctionComponent<PolicyAdministrationPage
                                     <Typography variant="body1" noWrap>
                                         { t("policyAdministration:buttons.policyAlgorithm") }
                                     </Typography>
-                                    { !isAlgorithmLoading && selectedAlgorithm?.id && (
+                                    { !isAlgorithmLoading && (
                                         <Typography variant="body2">
-                                            { selectedAlgorithm.id }
+                                            { algorithm }
                                         </Typography>
                                     ) }
                                     { isAlgorithmLoading && <CircularProgress size={ 12 } /> }

diff --git a/features/admin.policy-administration.v1/pages/edit-policy.tsx b/features/admin.policy-administration.v1/pages/edit-policy.tsx
@@ -25,7 +25,6 @@ import { AlertLevels, IdentifiableComponentInterface } from "@wso2is/core/models
 import { addAlert } from "@wso2is/core/store";
 import { PageLayout } from "@wso2is/react-components";
 import isEmpty from "lodash-es/isEmpty";
-import lowerCase from "lodash-es/lowerCase";
 import React, { FunctionComponent, ReactElement, useState } from "react";
 import { useTranslation } from "react-i18next";
 import "./edit-policy.scss";
@@ -34,7 +33,6 @@ import { RouteComponentProps } from "react-router";
 import { Dispatch } from "redux";
 import { updatePolicy } from "../api/entitlement-policies";
 import { useGetPolicy } from "../api/use-get-policy";
-import startCase from "lodash-es/startCase";
 import PolicyEditor from "../components/policy-editor/policy-editor";
 import { PolicyInterface } from "../models/policies";
 
@@ -116,7 +114,7 @@ const EditPolicyPage: FunctionComponent<EditPolicyPageProps> = ({
 
     return (
         <PageLayout
-            title={ startCase(lowerCase(policy?.policyId)) || t("policyAdministration:editPolicy.loadingTitle") }
+            title={ isLoading ? "" : policy?.policyId }
             backButton={ {
                 "data-componentid": `${componentId}-edit-policy-page-back-button`,
                 onClick: handleBackButtonClick,