Skip to content

All users with the Administrator role are not listed on the Console Settings -> Administrators page. (Closes #19761) #9388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Yasodhyassp30 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

All users with the Administrator role are not listed on the Console Settings -> Administrators page. (Closes #19761) #9388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...settings.v1/components/console-administrators/administrators-list/administrators-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ const AdministratorsList: FunctionComponent<AdministratorsListProps> = (
searchQuery,
null,
selectedUserStore,
UserManagementConstants.GROUPS_ATTRIBUTE
""
);

const useOrgConfig: UseOrganizationConfigType = useOrganizationConfigV2;
Expand Down
45 changes: 32 additions & 13 deletions features/admin.console-settings.v1/hooks/use-administrators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,25 @@
* under the License.
*/

import { UserBasicInterface, UserListInterface, UserRoleInterface } from "@wso2is/admin.core.v1/models/users";
import { UserBasicInterface, UserListInterface } from "@wso2is/admin.core.v1/models/users";
import { AppState } from "@wso2is/admin.core.v1/store";
import { SCIMConfigs } from "@wso2is/admin.extensions.v1/configs/scim";
import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
import { useUsersList } from "@wso2is/admin.users.v1/api/users";
import { useGetParentOrgUserInvites }
from "@wso2is/admin.users.v1/components/guests/api/use-get-parent-org-user-invites";
import { InvitationsInterface } from "@wso2is/admin.users.v1/components/guests/models/invite";
import { UserAccountTypes } from "@wso2is/admin.users.v1/constants/user-management-constants";
import { UserAccountTypes, UserManagementConstants } from "@wso2is/admin.users.v1/constants/user-management-constants";
import { UserManagementUtils } from "@wso2is/admin.users.v1/utils/user-management-utils";
import { MultiValueAttributeInterface, RolesInterface } from "@wso2is/core/models";
import { MultiValueAttributeInterface } from "@wso2is/core/models";
import { AxiosError } from "axios";
import cloneDeep from "lodash-es/cloneDeep";
import isEmpty from "lodash-es/isEmpty";
import { useMemo, useState } from "react";
import { useSelector } from "react-redux";
import useConsoleRoles from "./use-console-roles";

import { useGroupList } from "../../admin.groups.v1/api/groups";
import { GroupListInterface, GroupsInterface } from "../../admin.groups.v1/models/groups";
/**
* Props interface of {@link UseAdministrators}
*/
Expand Down Expand Up @@ -118,6 +119,17 @@ const useAdministrators = (
shouldFetch
);

const {
data:originalGroupList
} = useGroupList(
null,
null,
null,
domain,
UserManagementConstants.MEMBERS_ATTRIBUTE,
true
);

const {
data: invitedAdministrators,
mutate: mutateInvitedAdministratorsListFetchRequest
Expand All @@ -131,23 +143,30 @@ const useAdministrators = (
* @param usersList - User list from the API.
* @returns Processed list of users.
*/
const transformUserList = (usersList: UserListInterface): UserListInterface => {
const transformUserList = (usersList: UserListInterface, groupList: GroupListInterface): UserListInterface => {
if (!usersList) {
return;
}

const clonedUserList: UserListInterface = cloneDeep(usersList);
const processedUserList: UserBasicInterface[] = [];

const consoleRoleIds = new Set(consoleRoles?.Resources?.map(r => r.id) || []);
/*
* Get all groups which have any of the administrator role
*/
const adminGroups: GroupsInterface[] =
groupList?.Resources?.filter(group =>
group?.roles?.some(role => consoleRoleIds.has(role.value))
) || [];
/**
* Checks whether administrator role is present in the user.
*/
const isAdminUser = (user: UserBasicInterface): boolean => {
return user?.roles?.some((userRole: UserRoleInterface) => {
return consoleRoles?.Resources?.some((consoleRole: RolesInterface) => {
return consoleRole.id === userRole.value;
});
});
const isAdminUser = (user: UserBasicInterface, adminGroups: GroupsInterface[]): boolean => {
const userRoleIds = new Set(user?.roles?.map(role => role.value) || []);
const userGroupIds = new Set(user?.groups?.map(group => group.value) || []);
const adminGroupIds = new Set(adminGroups?.map(adminGroup => adminGroup.id) || []);
return [...userRoleIds].some(id => consoleRoleIds.has(id)) || [...userGroupIds].some(id => adminGroupIds.has(id));
};

const isOwner = (user: UserBasicInterface): boolean => {
Expand All @@ -156,7 +175,7 @@ const useAdministrators = (

clonedUserList.Resources = clonedUserList?.Resources?.map((resource: UserBasicInterface) => {
// Filter out users belong to groups named "Administrator"
if (!isAdminUser(resource)) {
if (!isAdminUser(resource, adminGroups)) {
return null;
}

Expand Down Expand Up @@ -238,7 +257,7 @@ const useAdministrators = (
return {};
}

return transformUserList(originalAdminUserList);
return transformUserList(originalAdminUserList, originalGroupList);
}, [ originalAdminUserList, consoleRoles ]);

return {
Expand Down
2 changes: 2 additions & 0 deletions features/admin.users.v1/constants/user-management-constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ export class UserManagementConstants {
// Query param to exclude groups from getUserList API call.
public static readonly GROUPS_ATTRIBUTE: string = "groups";

public static readonly MEMBERS_ATTRIBUTE: string = "members";

public static readonly MANAGED_BY_PARENT_TEXT: string = "Parent Organization";

public static readonly GLOBE: string = "globe";
Expand Down