Merge pull request #6420 from dasuni-30/fix/24630

Enable myaccount status in applications section based on the config
wso2 · Jun 7, 2024 · 9375baf · 9375baf
2 parents 3aaec8c + be2f72f
commit 9375baf
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 17 deletions.
diff --git a/.changeset/silver-eagles-burn.md b/.changeset/silver-eagles-burn.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/admin.applications.v1": patch
+---
+
+Enable myaccount status in applications section based on the config
diff --git a/features/admin.applications.v1/pages/applications.tsx b/features/admin.applications.v1/pages/applications.tsx
@@ -72,6 +72,7 @@ import {
     PaginationProps
 } from "semantic-ui-react";
 import { useApplicationList, useMyAccountApplicationData, useMyAccountStatus } from "../api";
+import { useGetApplication } from "../api/use-get-application";
 import { ApplicationList } from "../components/application-list";
 import { MinimalAppCreateWizard } from "../components/wizard/minimal-application-create-wizard";
 import { ApplicationManagementConstants } from "../constants";
@@ -150,6 +151,7 @@ const ApplicationsPage: FunctionComponent<ApplicationsPageInterface> = (
     // Note: If we are providing strong auth for applications use this state to handle it.
     const [ strongAuth, _setStrongAuth ] = useState<boolean>(undefined);
     const [ filteredApplicationList, setFilteredApplicationList ] = useState<ApplicationListInterface>(null);
+    const [ myAccountAppId, setMyAccountAppId ] = useState<string>(null);
 
     const { isSubOrganization, organizationType } = useGetCurrentOrganizationType();
 
@@ -168,6 +170,12 @@ const ApplicationsPage: FunctionComponent<ApplicationsPageInterface> = (
         error: myAccountApplicationDataFetchRequestError
     } = useMyAccountApplicationData("advancedConfigurations,templateId,clientId,issuer");
 
+    const {
+        data: myAccountApplication,
+        isLoading: isMyAccountApplicationGetRequestLoading,
+        error: myAccountApplicationGetRequestError
+    } = useGetApplication(myAccountAppId , !!myAccountAppId && !legacyAuthzRuntime);
+
     const isSubOrg: boolean = window[ "AppUtils" ].getConfig().organizationName;
 
     const {
@@ -176,35 +184,64 @@ const ApplicationsPage: FunctionComponent<ApplicationsPageInterface> = (
         error: myAccountStatusFetchRequestError
     } = useMyAccountStatus(!isSubOrg && applicationConfig?.advancedConfigurations?.showMyAccountStatus);
 
+    /**
+     * Set the application id for My Account.
+     */
+    useEffect(() => {
+        if (myAccountApplicationData?.applications?.length === 1) {
+            myAccountApplicationData.applications.forEach((
+                item: ApplicationListItemInterface
+            ) => {
+                setMyAccountAppId(item?.id);
+            });
+        }
+    }, [ myAccountApplicationData ]);
+
     /**
      * Sets the initial spinner.
      * TODO: Remove this once the loaders are finalized.
      */
     useEffect(() => {
-        if (isApplicationListFetchRequestLoading === false && isMyAccountStatusLoading === false
-            && !isMyAccountApplicationDataFetchRequestLoading) {
-            let status: boolean = AppConstants.DEFAULT_MY_ACCOUNT_STATUS;
-
-            if (myAccountStatus) {
-                const enableProperty: string = myAccountStatus["value"];
-
-                if (enableProperty && enableProperty === "false") {
-                    status = false;
+        let status: boolean = AppConstants.DEFAULT_MY_ACCOUNT_STATUS;
+
+        if (legacyAuthzRuntime) {
+            if (
+                !isApplicationListFetchRequestLoading
+                && !isMyAccountStatusLoading
+                && !isMyAccountApplicationDataFetchRequestLoading
+            ) {
+                if (myAccountStatus) {
+                    const enableProperty: string = myAccountStatus["value"];
+
+                    if (enableProperty && enableProperty === "false") {
+                        status = false;
+                    }
+                }
+            }
+        } else {
+            if (
+                !isApplicationListFetchRequestLoading
+                && !isMyAccountApplicationGetRequestLoading
+                && !isMyAccountApplicationDataFetchRequestLoading
+            ) {
+                if (myAccountApplication) {
+                    status = myAccountApplication?.applicationEnabled;
                 }
             }
-            setMyAccountStatus(status);
         }
+        setMyAccountStatus(status);
     }, [
         isApplicationListFetchRequestLoading,
+        isMyAccountApplicationGetRequestLoading,
         isMyAccountStatusLoading,
-        isMyAccountApplicationDataFetchRequestLoading
+        isMyAccountApplicationDataFetchRequestLoading,
+        myAccountAppId
     ]);
 
     /**
      * Handles the application list fetch request error.
      */
     useEffect(() => {
-
         if (!applicationListFetchRequestError) {
             return;
         }
@@ -235,7 +272,6 @@ const ApplicationsPage: FunctionComponent<ApplicationsPageInterface> = (
      * Handles the my account application fetch request error.
      */
     useEffect(() => {
-
         if (!myAccountApplicationDataFetchRequestError) {
             return;
         }
@@ -260,6 +296,40 @@ const ApplicationsPage: FunctionComponent<ApplicationsPageInterface> = (
         }));
     }, [ myAccountApplicationDataFetchRequestError ]);
 
+    /**
+     * Handles the My Account application data fetch request error.
+     */
+    useEffect(() => {
+        if (!myAccountApplicationGetRequestError) {
+            return;
+        }
+
+        if (
+            myAccountApplicationGetRequestError?.response?.data?.description
+        ) {
+            if (myAccountApplicationGetRequestError.response?.status === 404) {
+                return;
+            }
+
+            dispatch(addAlert({
+                description: myAccountApplicationGetRequestError.response.data.description ??
+                    t("applications:myaccount.fetchMyAccountStatus.error.description"),
+                level: AlertLevels.ERROR,
+                message: t("applications:myaccount.fetchMyAccountStatus.error.message")
+            }));
+
+            return;
+        }
+
+        dispatch(addAlert({
+            description: t("applications:myaccount.fetchMyAccountStatus" +
+                ".genericError.description"),
+            level: AlertLevels.ERROR,
+            message: t("applications:myaccount.fetchMyAccountStatus" +
+                ".genericError.message")
+        }));
+    }, [ myAccountApplicationGetRequestError ]);
+
     /**
      * Handles the application list fetch request error.
      */
@@ -269,10 +339,10 @@ const ApplicationsPage: FunctionComponent<ApplicationsPageInterface> = (
             return;
         }
 
-        if (myAccountStatusFetchRequestError.response
-            && myAccountStatusFetchRequestError.response.data
-            && myAccountStatusFetchRequestError.response.data.description) {
-            if (myAccountStatusFetchRequestError.response.status === 404) {
+        if (
+            myAccountStatusFetchRequestError?.response?.data?.description
+        ) {
+            if (myAccountStatusFetchRequestError.response?.status === 404) {
                 return;
             }
             dispatch(addAlert({