Merge pull request #478 from devtron-labs/feat/deleted-user-in-export

feat: add type for user typeToFetch

Author: eshankvaish

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.3.2",
+    "version": "1.3.3",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -32,6 +32,7 @@ import {
     ZERO_TIME_STRING,
     TOAST_ACCESS_DENIED,
     UNCHANGED_ARRAY_ELEMENT_SYMBOL,
+    DATE_TIME_FORMATS,
 } from './Constants'
 import { ServerErrors } from './ServerError'
 import { AsyncOptions, AsyncState, DeploymentNodeType, UseSearchString } from './Types'
@@ -233,6 +234,9 @@ export function handleUTCTime(ts: string, isRelativeTime = false) {
     return timestamp
 }
 
+export const getFormattedUTCTimeForExport = (timeToConvert: string, fallback = '-') =>
+    timeToConvert ? `${moment(timeToConvert).utc().format(DATE_TIME_FORMATS.TWELVE_HOURS_EXPORT_FORMAT)} (UTC)` : '-'
+
 export function useSearchString(): UseSearchString {
     const location = useLocation()
     const queryParams: URLSearchParams = useMemo(() => {

src/Common/Helper.tsx

@@ -16,6 +16,7 @@
 
 export * from './constants'
 export type { UserListFilterParams, UserRoleGroup, UserGroupDTO, UserGroupType } from './types'
+export { UserTypeToFetchType } from './types'
 export * from './shared'
 export * from './service'
 export { getUserAndApiTokenOption } from './utils'

src/Pages/GlobalConfigurations/Authorization/index.ts

@@ -17,11 +17,18 @@
 import { BaseFilterQueryParams } from '../../../Shared'
 import { UserListSortableKeys, UserStatus } from './constants'
 
+export enum UserTypeToFetchType {
+    includeDeleted = 'includeDeleted',
+    excludeDelete = 'excludeDelete',
+    onlyDeleted = 'onlyDeleted',
+}
+
 export type UserListFilterParams = BaseFilterQueryParams<UserListSortableKeys> & {
     /**
      * Selected statuses (if any)
      */
     status: UserStatus[]
+    typeToFetch?: UserTypeToFetchType
 }
 
 export interface UserMinType {