diff --git a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts index 35f529d98..5ec748141 100644 --- a/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/user-listing/user-listing-screen.component.ts @@ -18,8 +18,8 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { rolesTranslations } from '../../../../translations/roles-translations'; import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -import { User } from '@red/domain'; -import { userTypeChecker, userTypeFilters, UserTypes } from '../../../../utils'; +import { User, UserTypes } from '@red/domain'; +import { userTypeChecker, userTypeFilters } from '../../../../utils'; @Component({ templateUrl: './user-listing-screen.component.html', diff --git a/apps/red-ui/src/app/utils/filter-utils.ts b/apps/red-ui/src/app/utils/filter-utils.ts index 815465856..ebc432957 100644 --- a/apps/red-ui/src/app/utils/filter-utils.ts +++ b/apps/red-ui/src/app/utils/filter-utils.ts @@ -1,5 +1,5 @@ import { File } from '@models/file/file'; -import { Dossier, User } from '@red/domain'; +import { Dossier, User, UserType } from '@red/domain'; import { handleCheckedValue, INestedFilter } from '@iqser/common-ui'; export function handleFilterDelta(oldFilters: INestedFilter[], newFilters: INestedFilter[], allFilters: INestedFilter[]) { @@ -86,9 +86,6 @@ export const dossierTemplateChecker = (dw: Dossier, filter: INestedFilter) => dw export const dossierApproverChecker = (dw: Dossier, filter: INestedFilter) => dw.approverIds.includes(filter.id); -export const UserTypes = ['INACTIVE', 'REGULAR', 'RED_MANAGER', 'MANAGER_ADMIN', 'RED_USER_ADMIN', 'RED_ADMIN'] as const; -export type UserType = typeof UserTypes[number]; - export const userTypeFilters: { [key in UserType]: (user: User) => boolean } = { INACTIVE: (user: User) => !user.isActive, REGULAR: (user: User) => user.roles.length === 1 && user.roles[0] === 'RED_USER', diff --git a/libs/red-domain/src/lib/users/index.ts b/libs/red-domain/src/lib/users/index.ts index 403810e2f..528be9585 100644 --- a/libs/red-domain/src/lib/users/index.ts +++ b/libs/red-domain/src/lib/users/index.ts @@ -3,3 +3,4 @@ export * from './user.interface'; export * from './my-profile-update.request'; export * from './profile-update.request'; export * from './profile.interface'; +export * from './types'; diff --git a/libs/red-domain/src/lib/users/types.ts b/libs/red-domain/src/lib/users/types.ts new file mode 100644 index 000000000..fdea744f7 --- /dev/null +++ b/libs/red-domain/src/lib/users/types.ts @@ -0,0 +1,2 @@ +export const UserTypes = ['INACTIVE', 'REGULAR', 'RED_MANAGER', 'MANAGER_ADMIN', 'RED_USER_ADMIN', 'RED_ADMIN'] as const; +export type UserType = typeof UserTypes[number];