From 798f0642f1384e8e1e03378b05cd1176b1f4db7a Mon Sep 17 00:00:00 2001 From: JayaShakthi97 Date: Mon, 9 Dec 2024 14:17:40 +0530 Subject: [PATCH 1/2] Hide new remote user stores in administrators listing --- .../console-administrators/console-administrators.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/features/admin.console-settings.v1/components/console-administrators/console-administrators.tsx b/features/admin.console-settings.v1/components/console-administrators/console-administrators.tsx index a618b3e9287..a182609a92e 100644 --- a/features/admin.console-settings.v1/components/console-administrators/console-administrators.tsx +++ b/features/admin.console-settings.v1/components/console-administrators/console-administrators.tsx @@ -1,5 +1,5 @@ /** - * Copyright (c) 2023, WSO2 LLC. (https://www.wso2.com). + * Copyright (c) 2023-2024, WSO2 LLC. (https://www.wso2.com). * * WSO2 LLC. licenses this file to you under the Apache License, * Version 2.0 (the "License"); you may not use this file except @@ -27,6 +27,7 @@ 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"; import { useUserStores } from "@wso2is/admin.userstores.v1/api"; +import { RemoteUserStoreManagerType } from "@wso2is/admin.userstores.v1/constants/user-store-constants"; import { UserStoreDropdownItem, UserStoreListItem, UserStorePostData } from "@wso2is/admin.userstores.v1/models"; import { IdentifiableComponentInterface } from "@wso2is/core/models"; import React, { @@ -118,6 +119,11 @@ const ConsoleAdministrators: FunctionComponent = }; userStoreList?.forEach((store: UserStoreListItem, index: number) => { + // Skip the remote user store in administrators listing as it is not supporting user listing. + if (store?.typeName === RemoteUserStoreManagerType.RemoteUserStoreManager) { + return; + } + if (store?.name?.toUpperCase() !== userstoresConfig?.primaryUserstoreName) { getAUserStore(store.id).then((response: UserStorePostData) => { const isDisabled: boolean = response.properties.find( From d4e7a710eb2d2cd00d052c1990663e9a91df44a1 Mon Sep 17 00:00:00 2001 From: JayaShakthi97 Date: Mon, 9 Dec 2024 14:18:14 +0530 Subject: [PATCH 2/2] =?UTF-8?q?Add=20changeset=20=F0=9F=A6=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/lazy-eggs-talk.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/lazy-eggs-talk.md diff --git a/.changeset/lazy-eggs-talk.md b/.changeset/lazy-eggs-talk.md new file mode 100644 index 00000000000..20782ded82c --- /dev/null +++ b/.changeset/lazy-eggs-talk.md @@ -0,0 +1,5 @@ +--- +"@wso2is/admin.console-settings.v1": patch +--- + +Hide new remote user stores in administrators listing