feat: ✨ add users search filter (admin)

apps/client/src/components/AdminRoleForm.vue

@@ -105,7 +105,7 @@ async function switchUserMembership(checked: boolean, user: User, fromSuggestion
   }
 }
 onBeforeMount(async () => {
-  users.value = await usersStore.listUsers({ adminRoleId: role.value.id })
+  users.value = await usersStore.listUsers({ adminRoleIds: role.value.id })
 })
 </script>
 

apps/client/src/stores/users.ts

@@ -3,7 +3,7 @@ import type { userContract } from '@cpn-console/shared'
 import { apiClient, extractData } from '@/api/xhr-client.js'
 
 export const useUsersStore = defineStore('users', () => {
-  const listUsers = async (query: typeof userContract.getAllUsers.query._type) =>
+  const listUsers = async (query: typeof userContract.getAllUsers.query._input) =>
     apiClient.Users.getAllUsers({ query })
       .then(res => extractData(res, 200))
 

apps/client/src/views/admin/AdminRoles.vue

@@ -55,7 +55,6 @@ onBeforeMount(async () => {
 </script>
 
 <template>
-  <DsoSelectedProject />
   <div
     class="flex flex-row"
   >
@@ -70,7 +69,7 @@ onBeforeMount(async () => {
           data-testid="addRoleBtn"
           :class="selectedId ? 'w-11/12' : ''"
           secondary
-          @click="addRole()"
+          @click="addRole"
         />
         <button
           v-for="role in roleList"

apps/server/src/resources/user/business.spec.ts

@@ -55,15 +55,15 @@ describe('test users business', () => {
       await getUsers({})
 
       expect(getUsersQueryMock).toHaveBeenCalledTimes(1)
-      expect(getUsersQueryMock).toHaveBeenCalledWith({})
+      expect(getUsersQueryMock).toHaveBeenCalledWith({ AND: [] })
     })
     it('should query with filter adminRoleIds', async () => {
       prisma.user.update.mockResolvedValue(null)
 
-      await getUsers({ adminRoleId })
+      await getUsers({ adminRoleIds: [adminRoleId] })
 
       expect(getUsersQueryMock).toHaveBeenCalledTimes(1)
-      expect(getUsersQueryMock).toHaveBeenCalledWith({ adminRoleIds: { has: adminRoleId } })
+      expect(getUsersQueryMock).toHaveBeenCalledWith({ AND: [{ adminRoleIds: { hasSome: [adminRoleId] } }] })
     })
   })
 

apps/server/src/resources/user/business.ts

@@ -5,12 +5,29 @@ import { getMatchingUsers as getMatchingUsersQuery, getUsers as getUsersQuery }
 import prisma from '@/prisma.js'
 import type { UserDetails } from '@/types/index.js'
 
-export function getUsers(query: typeof userContract.getAllUsers.query._type) {
-  const where: Prisma.UserWhereInput = {}
-  if (query.adminRoleId) {
-    where.adminRoleIds = { has: query.adminRoleId }
+export async function getUsers(query: typeof userContract.getAllUsers.query._type, relationType: 'OR' | 'AND' = 'AND') {
+  const adminRoleIds = [
+    ...query.adminRoleIds ?? [],
+    ...query.adminRoles
+      ? (await prisma.adminRole.findMany({ where: { name: { in: query.adminRoles } } }))
+          .map(({ id }) => id)
+      : [],
+  ]
+
+  const whereInputs: Prisma.UserWhereInput[] = []
+  if (adminRoleIds.length) {
+    whereInputs.push({ adminRoleIds: { hasSome: adminRoleIds } })
+  }
+  if (query.memberOfIds) {
+    whereInputs.push({
+      OR: [
+        { projectsOwned: { some: { id: { in: query.memberOfIds } } } },
+        { ProjectMembers: { some: { project: { id: { in: query.memberOfIds } } } } },
+      ],
+    })
   }
-  return getUsersQuery(where)
+
+  return getUsersQuery({ [relationType]: whereInputs })
 }
 
 export async function getMatchingUsers(query: typeof userContract.getMatchingUsers.query._type) {

apps/server/src/resources/user/router.ts

@@ -34,12 +34,12 @@ export function userRouter() {
       }
     },
 
-    getAllUsers: async ({ request: req, query }) => {
+    getAllUsers: async ({ request: req, query: { relationType, ...query } }) => {
       const perms = await authUser(req)
 
       if (!AdminAuthorized.isAdmin(perms.adminPermissions)) return new Forbidden403()
 
-      const body = await getUsers(query)
+      const body = await getUsers(query, relationType)
 
       return {
         status: 200,

packages/shared/src/contracts/user.ts

@@ -3,6 +3,7 @@ import { z } from 'zod'
 import { apiPrefix, contractInstance } from '../api-client.js'
 import {
   GetMatchingUsersSchema,
+  UserQuerySchema,
   UserSchema,
 } from '../schemas/index.js'
 import { ErrorSchema } from '../schemas/utils.js'
@@ -38,9 +39,7 @@ export const userContract = contractInstance.router({
     path: `${apiPrefix}/users`,
     summary: 'Get all users',
     description: 'Get all users.',
-    query: z.object({
-      adminRoleId: z.string().uuid().optional(),
-    }),
+    query: UserQuerySchema,
     responses: {
       200: z.lazy(() => UserSchema.array()),
       400: ErrorSchema,

packages/shared/src/schemas/role.ts

@@ -1,9 +1,11 @@
 import { z } from 'zod'
 import { permissionLevelSchema } from '../utils/permissions.js'
 
+export const RoleNameSchema = z.string().max(30)
+
 export const RoleSchema = z.object({
   id: z.string().uuid(),
-  name: z.string().max(30),
+  name: RoleNameSchema,
   permissions: permissionLevelSchema,
   position: z.number().min(0),
 })
@@ -16,6 +18,12 @@ export const AdminRoleSchema = RoleSchema.extend({
   oidcGroup: z.string(),
 })
 
+export const RoleNameCsvSchema = z.string()
+  .refine((value) => {
+    return !value.split(',').some(name => !RoleNameSchema.safeParse(name).success)
+  })
+  .transform(value => value.split(','))
+
 export type Role = Zod.infer<typeof RoleSchema>
 export type RoleBigint = Omit<Zod.infer<typeof RoleSchema>, 'permissions'> & { permissions: bigint }
 export type AdminRole = Zod.infer<typeof AdminRoleSchema>

packages/shared/src/schemas/user.ts

@@ -1,5 +1,6 @@
 import { z } from 'zod'
-import { AtDatesToStringExtend, ErrorSchema } from './utils.js'
+import { AtDatesToStringExtend, ErrorSchema, UuidOrCsvUuidSchema } from './utils.js'
+import { RoleNameCsvSchema } from './role.js'
 
 export const UserSchema = z.object({
   id: z.string()
@@ -108,3 +109,14 @@ export const UpdateUserAdminRoleSchema = {
     500: ErrorSchema,
   },
 }
+
+export const UserQuerySchema = z.object({
+  adminRoles: RoleNameCsvSchema
+    .optional(),
+  adminRoleIds: UuidOrCsvUuidSchema
+    .optional(),
+  memberOfIds: UuidOrCsvUuidSchema
+    .optional(),
+  relationType: z.enum(['OR', 'AND'])
+    .optional(),
+})

packages/shared/src/schemas/utils.ts

@@ -12,3 +12,11 @@ export const AtDatesToStringExtend = {
   updatedAt: dateToString,
   createdAt: dateToString,
 }
+
+export const UuidOrCsvUuidSchema = z.string()
+  .refine((value) => {
+    return !value
+      .split(',')
+      .some(uuid => !z.string().uuid().safeParse(uuid).success)
+  })
+  .transform(value => value.split(','))