Disable guest user and privileged user related UI elements

wso2 · Oct 1, 2024 · dfde4f2 · dfde4f2
1 parent 142c4f6
commit dfde4f2
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 24 deletions.
diff --git a/apps/console/src/public/deployment.config.json b/apps/console/src/public/deployment.config.json
@@ -456,7 +456,10 @@
                 }
             },
             "consoleSettings": {
-                "disabledFeatures": [],
+                "disabledFeatures": [
+                    "consoleSettings.invitedAdmins",
+                    "consoleSettings.privilegedUsers"
+                ],
                 "enabled": true,
                 "scopes": {
                     "create": [

diff --git a/...settings.v1/components/console-administrators/administrators-list/administrators-list.tsx b/...settings.v1/components/console-administrators/administrators-list/administrators-list.tsx
@@ -18,6 +18,7 @@
 
 import { GearIcon } from "@oxygen-ui/react-icons";
 import {
+    FeatureAccessConfigInterface,
     FeatureStatus,
     Show,
     useCheckFeatureStatus
@@ -144,6 +145,18 @@ const AdministratorsList: React.FunctionComponent<AdministratorsListProps> = (
 
     const featureConfig: FeatureConfigInterface = useSelector((state: AppState) => state.config.ui.features);
 
+    const consoleSettingsFeatureConfig: FeatureAccessConfigInterface =
+        useSelector((state: AppState) => state.config.ui.features.consoleSettings);
+
+    const isPrivilegedUsersInConsoleSettingsEnabled: boolean =
+        !consoleSettingsFeatureConfig?.disabledFeatures?.includes(
+            "consoleSettings.privilegedUsers"
+        );
+    const isInvitedAdminInConsoleSettingsEnabled: boolean = !consoleSettingsFeatureConfig?.disabledFeatures?.includes(
+        "consoleSettings.invitedAdmins"
+    );
+
+
     const { isSubOrganization, isFirstLevelOrganization, isSuperOrganization } = useGetCurrentOrganizationType();
     const { unassignAdministratorRoles } = useBulkAssignAdministratorRoles();
 
@@ -270,7 +283,7 @@ const AdministratorsList: React.FunctionComponent<AdministratorsListProps> = (
 
         const addAdminOptions: any = [];
 
-        if (!isCurrentOrgSubOrganization) {
+        if (!isCurrentOrgSubOrganization && isInvitedAdminInConsoleSettingsEnabled) {
             addAdminOptions.push({
                 "data-componentid": `${componentId}-add-external-admin-dropdown-item`,
                 key: 1,
@@ -351,6 +364,27 @@ const AdministratorsList: React.FunctionComponent<AdministratorsListProps> = (
         history.push(AdministratorConstants.getPaths().get("COLLABORATOR_SETTINGS_EDIT_PATH"));
     };
 
+    const renderRightActionPanel = () => {
+
+        if (isPrivilegedUsersInConsoleSettingsEnabled) {
+            return null;
+        }
+
+        if (isFirstLevelOrganization() || isSuperOrganization()) {
+            return (
+                <Dropdown
+                    data-testid="user-mgt-user-list-userstore-dropdown"
+                    selection
+                    options={ availableUserStores }
+                    onChange={ handleSelectedUserStoreChange }
+                    defaultValue={ PRIMARY_USERSTORE }
+                />
+            );
+        }
+
+        return null;
+    };
+
     return (
         <ListLayout
             advancedSearch={ (
@@ -414,26 +448,19 @@ const AdministratorsList: React.FunctionComponent<AdministratorsListProps> = (
             paginationOptions={ {
                 disableNextButton: !isNextPageAvailable
             } }
-            rightActionPanel={
-                !isEnterpriseLoginEnabled && (isFirstLevelOrganization() || isSuperOrganization())
-                    ? (
-                        <Dropdown
-                            data-testid="user-mgt-user-list-userstore-dropdown"
-                            selection
-                            options={ availableUserStores }
-                            onChange={ handleSelectedUserStoreChange }
-                            defaultValue={ PRIMARY_USERSTORE }
-                        />
-                    ) : null
-            }
+            rightActionPanel={ renderRightActionPanel() }
             topActionPanelExtension={ (
                 <Show when={ [ ...featureConfig?.users?.scopes?.create, ...featureConfig?.userRoles?.scopes?.update ] }>
-                    { !isSubOrganization() && isEnterpriseLoginEnabled && (<Button
-                        data-componentid={ `${componentId}-admin-settings-button` }
-                        icon={ GearIcon }
-                        onClick={ handleSettingsButton }
-                    >
-                    </Button>) }
+                    { !isSubOrganization() &&
+                      isEnterpriseLoginEnabled &&
+                      isPrivilegedUsersInConsoleSettingsEnabled && (
+                        <Button
+                            data-componentid={ `${componentId}-admin-settings-button` }
+                            icon={ GearIcon }
+                            onClick={ handleSettingsButton }
+                        >
+                        </Button>
+                    ) }
                     { renderAdministratorAddOptions() }
                 </Show>
             ) }

diff --git a/...es/admin.console-settings.v1/components/console-administrators/console-administrators.tsx b/...es/admin.console-settings.v1/components/console-administrators/console-administrators.tsx
@@ -19,10 +19,10 @@
 import FormControlLabel from "@oxygen-ui/react/FormControlLabel";
 import Radio from "@oxygen-ui/react/Radio";
 import RadioGroup from "@oxygen-ui/react/RadioGroup";
-import { FeatureStatus, useCheckFeatureStatus } from "@wso2is/access-control";
+import { FeatureAccessConfigInterface, FeatureStatus, useCheckFeatureStatus } from "@wso2is/access-control";
 import { useOrganizationConfigV2 } from "@wso2is/admin.administrators.v1/api/useOrganizationConfigV2";
 import { UseOrganizationConfigType } from "@wso2is/admin.administrators.v1/models/organization";
-import { UserStoreProperty, getAUserStore, store } from "@wso2is/admin.core.v1";
+import { AppState, UserStoreProperty, getAUserStore, store } from "@wso2is/admin.core.v1";
 import { userstoresConfig } from "@wso2is/admin.extensions.v1";
 import FeatureGateConstants from "@wso2is/admin.feature-gate.v1/constants/feature-gate-constants";
 import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
@@ -36,6 +36,7 @@ import React, {
     useEffect,
     useState
 } from "react";
+import { useSelector } from "react-redux";
 import AdministratorsList from "./administrators-list/administrators-list";
 import InvitedAdministratorsList from "./invited-administrators/invited-administrators-list";
 
@@ -57,6 +58,13 @@ const ConsoleAdministrators: FunctionComponent<ConsoleAdministratorsInterface> =
 
     const { isFirstLevelOrganization, isSubOrganization } = useGetCurrentOrganizationType();
 
+    const consoleSettingsFeatureConfig: FeatureAccessConfigInterface =
+        useSelector((state: AppState) => state?.config?.ui?.features?.consoleSettings);
+    const isPrivilegedUsersInConsoleSettingsEnabled: boolean =
+        !consoleSettingsFeatureConfig?.disabledFeatures?.includes(
+            "consoleSettings.privilegedUsers"
+        );
+
     const [ activeAdministratorGroup, setActiveAdministratorGroup ] =
         useState(isSubOrganization() ? "activeUsers" : "administrators");
     const [ availableUserStores, setAvailableUserStores ] = useState<UserStoreDropdownItem[]>([]);
@@ -163,7 +171,11 @@ const ConsoleAdministrators: FunctionComponent<ConsoleAdministratorsInterface> =
     };
 
     const renderActiveAdministratorGroups = (): ReactElement => {
-        if (isFirstLevelOrganization() && isEnterpriseLoginEnabled) {
+        if (
+            isFirstLevelOrganization()
+            && isEnterpriseLoginEnabled
+            && isPrivilegedUsersInConsoleSettingsEnabled
+        ) {
             return (
                 <RadioGroup
                     row

diff --git a/features/admin.console-settings.v1/package.json b/features/admin.console-settings.v1/package.json
@@ -26,6 +26,7 @@
         "@wso2is/admin.authentication.v1": "^2.21.12",
         "@wso2is/admin.core.v1": "^2.30.12",
         "@wso2is/admin.extensions.v1": "^2.30.12",
+        "@wso2is/admin.feature-gate.v1": "^1.1.10",
         "@wso2is/admin.identity-providers.v1": "^2.22.12",
         "@wso2is/admin.login-flow.ai.v1": "^2.22.12",
         "@wso2is/admin.organizations.v1": "^2.22.12",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml