[feat] introduce new remote user store impl - disable RemoteUserStore…

…Manager in user/group lists
wso2 · Nov 25, 2024 · 813c902 · 813c902
1 parent ae800bb
commit 813c902
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/features/admin.groups.v1/pages/groups.tsx b/features/admin.groups.v1/pages/groups.tsx
@@ -31,7 +31,11 @@ import { commonConfig, groupConfig, userstoresConfig } from "@wso2is/admin.exten
 import { RootOnlyComponent } from "@wso2is/admin.organizations.v1/components";
 import { useGetCurrentOrganizationType } from "@wso2is/admin.organizations.v1/hooks/use-get-organization-type";
 import { getUserStoreList } from "@wso2is/admin.userstores.v1/api";
-import { CONSUMER_USERSTORE, PRIMARY_USERSTORE } from "@wso2is/admin.userstores.v1/constants";
+import {
+    CONSUMER_USERSTORE,
+    PRIMARY_USERSTORE,
+    RemoteUserStoreManagerType
+} from "@wso2is/admin.userstores.v1/constants";
 import { UserStorePostData } from "@wso2is/admin.userstores.v1/models/user-stores";
 import { AlertInterface, AlertLevels, RolesInterface, UserstoreListResponseInterface } from "@wso2is/core/models";
 import { addAlert } from "@wso2is/core/store";
@@ -199,6 +203,7 @@ const GroupsPage: FunctionComponent<any> = (): ReactElement => {
 
                                 if (!isDisabled) {
                                     storeOption = {
+                                        disabled: store.typeName === RemoteUserStoreManagerType.RemoteUserStoreManager,
                                         key: index,
                                         text: store.name,
                                         value: store.name

diff --git a/features/admin.users.v1/pages/users.tsx b/features/admin.users.v1/pages/users.tsx
@@ -46,6 +46,7 @@ import {
     useServerConfigs
 } from "@wso2is/admin.server-configurations.v1";
 import { useUserStores } from "@wso2is/admin.userstores.v1/api";
+import { RemoteUserStoreManagerType } from "@wso2is/admin.userstores.v1/constants";
 import {
     UserStoreItem,
     UserStoreListItem,
@@ -264,6 +265,7 @@ const UsersPage: FunctionComponent<UsersPageInterface> = (
 
                         if (!isDisabled) {
                             const storeOption: UserStoreItem = {
+                                disabled: store.typeName === RemoteUserStoreManagerType.RemoteUserStoreManager,
                                 key: index,
                                 text: store.name,
                                 value: store.name

diff --git a/features/admin.userstores.v1/models/user-stores.ts b/features/admin.userstores.v1/models/user-stores.ts
@@ -259,4 +259,5 @@ export interface UserStoreItem {
     key: number;
     text: string;
     value: string;
+    disabled?: boolean;
 }
diff --git a/modules/core/src/models/userstores.ts b/modules/core/src/models/userstores.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020, WSO2 LLC. (https://www.wso2.com). All Rights Reserved.
+ * Copyright (c) 2020-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
@@ -16,6 +16,12 @@
  * under the License.
  */
 
+/**
+ * Userstore list response interface.
+ *
+ * @deprecated - This interface will be removed in the future. Use the interface from admin.userstores.v1.models.
+ * https://github.com/wso2-enterprise/asgardeo-product/issues/27546
+ */
 export interface UserstoreListResponseInterface {
     /**
      * base64 url encoded value of domain name.
@@ -34,17 +40,24 @@ export interface UserstoreListResponseInterface {
     description: string;
     /**
      * Location of the created/updated resource.
-     * example: /t/{tenant-domain}/api/server/v1/userstores/SkRCQy1TRUNPTkRBUlk
+     * example: /t/\{tenant-domain\}/api/server/v1/userstores/SkRCQy1TRUNPTkRBUlk
      */
     self: string;
     /**
      * Requested configured user store property for the set.
      */
     properties: UserstorePropertiesResponseInterface[];
+    /**
+     * Name of the user store manager.
+     */
+    typeName?: string;
 }
 
 /**
  * Available User Store Properties interface.
+ *
+ * * @deprecated - This interface will be removed in the future. Use the interface from admin.userstores.v1.models.
+ * https://github.com/wso2-enterprise/asgardeo-product/issues/27546
  */
 export interface UserstorePropertiesResponseInterface {
     /**