Merge pull request #6055 from DilshanSenarath/managed-by

Add 'Managed by' property as 'Parent Organization' for invited users
wso2 · Apr 24, 2024 · 697dd6c · 697dd6c
2 parents 1eed218 + a648798
commit 697dd6c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/.changeset/modern-seas-smell.md b/.changeset/modern-seas-smell.md
@@ -0,0 +1,5 @@
+---
+"@wso2is/features": patch
+---
+
+add 'Managed by' property as 'Parent Organization' for invited users
diff --git a/features/admin.users.v1/components/users-list.tsx b/features/admin.users.v1/components/users-list.tsx
@@ -253,6 +253,10 @@ export const UsersList: React.FunctionComponent<UsersListProps> = (props: UsersL
     };
 
     const renderUserIdp = (user: UserBasicInterface): string => {
+        if (user[SCIMConfigs?.scim?.enterpriseSchema]?.managedOrg) {
+            return UserManagementConstants.MANAGED_BY_PARENT_TEXT;
+        }
+
         const userStore: string = user?.userName?.split("/").length > 1
             ? user?.userName?.split("/")[0]?.toUpperCase()
             : userstoresConfig.primaryUserstoreName;
@@ -313,12 +317,13 @@ export const UsersList: React.FunctionComponent<UsersListProps> = (props: UsersL
                                 <div>
                                     { header as ReactNode }
                                     {
-                                        user[SCIMConfigs.scim.enterpriseSchema]?.managedOrg && (
-                                            <Label size="mini" className="client-id-label">
-                                                { t("parentOrgInvitations:" +
-                                                "invitedUserLabel") }
-                                            </Label>
-                                        )
+                                        userConfig?.disableManagedByColumn
+                                            && user[SCIMConfigs?.scim?.enterpriseSchema]?.managedOrg
+                                            && (
+                                                <Label size="mini" className="client-id-label">
+                                                    { t("parentOrgInvitations:invitedUserLabel") }
+                                                </Label>
+                                            )
                                     }
                                 </div>
                                 {

diff --git a/features/admin.users.v1/constants/user-management-constants.ts b/features/admin.users.v1/constants/user-management-constants.ts
@@ -149,6 +149,8 @@ export class UserManagementConstants {
     public static readonly ERROR_COLLABORATOR_USER_LIMIT_REACHED: string = "ASG-UIM-10010";
     // Query param to exclude groups from getUserList API call.
     public static readonly GROUPS_ATTRIBUTE: string = "groups";
+
+    public static readonly MANAGED_BY_PARENT_TEXT: string = "Parent Organization";
 }
 
 /**