fix: api for user and api token list

Author: eshankvaish

src/Common/Constants.ts

@@ -103,6 +103,7 @@ export const ROUTES = {
     PLUGIN_GLOBAL_LIST_V2: 'plugin/global/list/v2',
     PLUGIN_GLOBAL_LIST_TAGS: 'plugin/global/list/tags',
     DEPLOYMENT_CHARTS_LIST: 'deployment/template/fetch',
+    USER_LIST_MIN: 'user/list/min',
 }
 
 export enum KEY_VALUE {

src/Pages/GlobalConfigurations/Authorization/index.ts

@@ -18,3 +18,4 @@ export * from './constants'
 export type { UserListFilterParams, UserRoleGroup, UserGroupDTO, UserGroupType } from './types'
 export * from './shared'
 export * from './service'
+export { getUserAndApiTokenOption } from './utils'

src/Pages/GlobalConfigurations/Authorization/service.ts

@@ -1,49 +1,34 @@
-import { get, getUrlWithSearchParams } from '@Common/index'
+import { get, ResponseType, ROUTES } from '@Common/index'
 import { SelectPickerCustomOptionType } from '@Shared/Components'
 import { API_TOKEN_PREFIX } from '@Shared/constants'
 import { stringComparatorBySortOrder } from '@Shared/Helpers'
-import { DefaultUserKey, BaseFilterQueryParams } from '@Shared/types'
+import { DefaultUserKey } from '@Shared/types'
 import { GroupBase } from 'react-select'
+import { UserMinType } from './types'
+import { getUserAndApiTokenOption } from './utils'
 
 // FIXME: Common out the typing and url from dashboard
 export const getUserAndApiTokenOptions = async (): Promise<GroupBase<SelectPickerCustomOptionType<string>>[]> => {
-    const userUrl = getUrlWithSearchParams('user/v2', {
-        showAll: true,
-    } as BaseFilterQueryParams<never>)
+    const { result } = (await get(ROUTES.USER_LIST_MIN)) as ResponseType<UserMinType[]>
 
-    const [userPromise, apiTokenPromise] = await Promise.allSettled([get(userUrl), get('api-token')])
-
-    const options: GroupBase<SelectPickerCustomOptionType<string>>[] = []
-
-    if (userPromise.status === 'fulfilled') {
-        const { result: userResponse } = userPromise.value
-
-        options.push({
-            label: 'Users',
-            options: (userResponse?.users ?? [])
-                .sort((a, b) => stringComparatorBySortOrder(a.email_id, b.email_id))
-                .filter(({ email_id: emailId }) => emailId !== DefaultUserKey.system)
-                .map(({ email_id: emailId }) => ({
-                    label: emailId,
-                    value: emailId,
-                })),
-        })
+    if (!result) {
+        return []
     }
 
-    if (apiTokenPromise.status === 'fulfilled') {
-        const { result: apiTokenResponse } = apiTokenPromise.value
+    const sortedEmailList = result.map(({ emailId }) => emailId).sort(stringComparatorBySortOrder)
 
-        options.push({
+    return [
+        {
+            label: 'Users',
+            options: sortedEmailList
+                .filter((emailId) => emailId !== DefaultUserKey.system && !emailId.startsWith(API_TOKEN_PREFIX))
+                .map((emailId) => getUserAndApiTokenOption(emailId)),
+        },
+        {
             label: 'API Tokens',
-            options: (apiTokenResponse ?? [])
-                .sort((a, b) => stringComparatorBySortOrder(a.userIdentifier, b.userIdentifier))
-                .map(({ userIdentifier }) => ({
-                    // Remove the API Token Prefix
-                    label: userIdentifier.startsWith(API_TOKEN_PREFIX) ? userIdentifier.split(':')[1] : userIdentifier,
-                    value: userIdentifier,
-                })),
-        })
-    }
-
-    return options
+            options: sortedEmailList
+                .filter((emailId) => emailId.startsWith(API_TOKEN_PREFIX))
+                .map((emailId) => getUserAndApiTokenOption(emailId)),
+        },
+    ]
 }

src/Pages/GlobalConfigurations/Authorization/types.ts

@@ -24,6 +24,11 @@ export type UserListFilterParams = BaseFilterQueryParams<UserListSortableKeys> &
     status: UserStatus[]
 }
 
+export interface UserMinType {
+    id: number
+    emailId: string
+}
+
 export interface UserRoleGroup {
     /**
      * Id of the permission group

src/Pages/GlobalConfigurations/Authorization/utils.ts

@@ -0,0 +1,7 @@
+import { SelectPickerCustomOptionType } from '@Shared/Components'
+import { API_TOKEN_PREFIX } from '@Shared/constants'
+
+export const getUserAndApiTokenOption = (emailId: string): SelectPickerCustomOptionType<string> => ({
+    label: emailId.startsWith(API_TOKEN_PREFIX) ? emailId.split(':')[1] : emailId,
+    value: emailId,
+})