diff --git a/.changeset/healthy-games-brush.md b/.changeset/healthy-games-brush.md new file mode 100644 index 00000000000..b2d413565a1 --- /dev/null +++ b/.changeset/healthy-games-brush.md @@ -0,0 +1,7 @@ +--- +"@wso2is/admin.applications.v1": patch +"@wso2is/admin.extensions.v1": patch +"@wso2is/console": patch +--- + +Enable simplified my account settings by default diff --git a/apps/console/src/public/deployment.config.json b/apps/console/src/public/deployment.config.json index 9f4c631f89d..70a0edb0cfe 100644 --- a/apps/console/src/public/deployment.config.json +++ b/apps/console/src/public/deployment.config.json @@ -307,8 +307,7 @@ "disabledFeatures": [ "applications.loginFlow.ai", "applications.loginFlow.legacyEditor", - "applications.myaccount.saasMyaccountSettings", - "applications.myaccount.simplifiedSettings" + "applications.myaccount.saasMyaccountSettings" ], "enabled": true, "scopes": { diff --git a/features/admin.applications.v1/components/edit-application.tsx b/features/admin.applications.v1/components/edit-application.tsx index 255ca658c68..fde5e2b92fa 100644 --- a/features/admin.applications.v1/components/edit-application.tsx +++ b/features/admin.applications.v1/components/edit-application.tsx @@ -199,11 +199,8 @@ export const EditApplication: FunctionComponent = const isFragmentApp: boolean = application?.advancedConfigurations?.fragment || false; const hiddenAuthenticators: string[] = [ ...(UIConfig?.hiddenAuthenticators ?? []) ]; - const disabledApplicationFeatures: string[] = useSelector((state: AppState) => - state.config.ui.features.applications?.disabledFeatures); - const isMyAccountSimplifiedSettingsEnabled: boolean = - ApplicationManagementConstants.MY_ACCOUNT_CLIENT_ID === application?.clientId - && !disabledApplicationFeatures?.includes("applications.myaccount.simplifiedSettings"); + const isMyAccount: boolean = + ApplicationManagementConstants.MY_ACCOUNT_CLIENT_ID === application?.clientId; const applicationsUpdateScopes: string[] = featureConfig?.applications?.scopes?.update; const { isSubOrganization } = useGetCurrentOrganizationType(); @@ -242,7 +239,7 @@ export const EditApplication: FunctionComponent = } if (featureConfig) { - if (!legacyAuthzRuntime && isMyAccountSimplifiedSettingsEnabled) { + if (!legacyAuthzRuntime && isMyAccount) { panes.push({ componentId: "overview", menuItem: t("applications:myaccount.overview.tabName"), @@ -252,7 +249,7 @@ export const EditApplication: FunctionComponent = if (isFeatureEnabled(featureConfig?.applications, ApplicationManagementConstants.FEATURE_DICTIONARY.get("APPLICATION_EDIT_GENERAL_SETTINGS")) && !isSubOrganization() - && (legacyAuthzRuntime || !isMyAccountSimplifiedSettingsEnabled)) { + && (legacyAuthzRuntime || !isMyAccount)) { if (applicationConfig.editApplication. isTabEnabledForApp( inboundProtocolConfig?.oidc?.clientId, @@ -281,7 +278,7 @@ export const EditApplication: FunctionComponent = if (isFeatureEnabled(featureConfig?.applications, ApplicationManagementConstants.FEATURE_DICTIONARY.get("APPLICATION_EDIT_ACCESS_CONFIG")) && !isFragmentApp - && (legacyAuthzRuntime || !isMyAccountSimplifiedSettingsEnabled) + && (legacyAuthzRuntime || !isMyAccount) ) { applicationConfig.editApplication.isTabEnabledForApp( @@ -400,7 +397,7 @@ export const EditApplication: FunctionComponent = if (isFeatureEnabled(featureConfig?.applications, ApplicationManagementConstants.FEATURE_DICTIONARY.get("APPLICATION_EDIT_INFO")) && !isFragmentApp - && (legacyAuthzRuntime || !isMyAccountSimplifiedSettingsEnabled)) { + && (legacyAuthzRuntime || !isMyAccount)) { applicationConfig.editApplication. isTabEnabledForApp( inboundProtocolConfig?.oidc?.clientId, diff --git a/features/admin.extensions.v1/configs/components/my-account-overview.tsx b/features/admin.extensions.v1/configs/components/my-account-overview.tsx index ba166daa918..5c6bbd1014f 100644 --- a/features/admin.extensions.v1/configs/components/my-account-overview.tsx +++ b/features/admin.extensions.v1/configs/components/my-account-overview.tsx @@ -26,7 +26,8 @@ import { Heading, Link, Popup, - Text + Text, + useDocumentation } from "@wso2is/react-components"; import React, { FunctionComponent, ReactElement } from "react"; import { Trans, useTranslation } from "react-i18next"; @@ -42,6 +43,7 @@ export const MyAccountOverview: FunctionComponent state?.config?.deployment?.accountApp?.tenantQualifiedPath); const { t } = useTranslation(); + const { getLink } = useDocumentation(); return ( @@ -52,8 +54,7 @@ export const MyAccountOverview: FunctionComponent { t("applications:myaccount.overview.contentIntro") }