From cbda0d17438a0305e66fba299e73bc75def03df1 Mon Sep 17 00:00:00 2001 From: dhaura Date: Mon, 21 Oct 2024 18:53:29 +0530 Subject: [PATCH 1/2] Enable shared user profile update in console. --- features/admin.users.v1/components/edit-user.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/features/admin.users.v1/components/edit-user.tsx b/features/admin.users.v1/components/edit-user.tsx index c67a4e8748d..41be51e7254 100644 --- a/features/admin.users.v1/components/edit-user.tsx +++ b/features/admin.users.v1/components/edit-user.tsx @@ -133,7 +133,6 @@ export const EditUser: FunctionComponent = ( useEffect(() => { if (user[ SCIMConfigs.scim.enterpriseSchema ]?.managedOrg) { setIsUserManagedByParentOrg(true); - setIsUserProfileReadOnly(true); } }, [ user ]); From 0f5fdc429cf1e1622b2176877c066227cc6fce1a Mon Sep 17 00:00:00 2001 From: dhaura Date: Tue, 5 Nov 2024 14:47:46 +0530 Subject: [PATCH 2/2] Remove eye icon from shared user list in child orgs. --- features/admin.users.v1/components/edit-user.tsx | 3 +-- features/admin.users.v1/components/users-list.tsx | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/features/admin.users.v1/components/edit-user.tsx b/features/admin.users.v1/components/edit-user.tsx index 41be51e7254..c2c35c9cea6 100644 --- a/features/admin.users.v1/components/edit-user.tsx +++ b/features/admin.users.v1/components/edit-user.tsx @@ -105,7 +105,6 @@ export const EditUser: FunctionComponent = ( const [ hideTermination, setHideTermination ] = useState(false); const [ adminUsername, setAdminUsername ] = useState(null); const [ isUserManagedByParentOrg, setIsUserManagedByParentOrg ] = useState(false); - const [ isUserProfileReadOnly, setIsUserProfileReadOnly ] = useState(false); useEffect(() => { const userStore: string = user?.userName?.split("/").length > 1 @@ -205,7 +204,7 @@ export const EditUser: FunctionComponent = ( onAlertFired={ handleAlerts } user={ user } handleUserUpdate={ handleUserUpdate } - isReadOnly={ isReadOnly || isUserProfileReadOnly } + isReadOnly={ isReadOnly } connectorProperties={ connectorProperties } isReadOnlyUserStoresLoading={ isReadOnlyUserStoresLoading } isUserManagedByParentOrg={ isUserManagedByParentOrg } diff --git a/features/admin.users.v1/components/users-list.tsx b/features/admin.users.v1/components/users-list.tsx index 9640c588173..0bd34f2eedd 100644 --- a/features/admin.users.v1/components/users-list.tsx +++ b/features/admin.users.v1/components/users-list.tsx @@ -424,7 +424,6 @@ export const UsersList: React.FunctionComponent = (props: UsersL || !isFeatureEnabled(featureConfig?.users, UserManagementConstants.FEATURE_DICTIONARY.get("USER_UPDATE")) || readOnlyUserStores?.includes(userStore.toString()) - || user[SCIMConfigs.scim.enterpriseSchema]?.managedOrg ? "eye" : "pencil alternate"; },