refactor: move permissions into single location

Author: joshunrau

apps/web/src/features/admin/components/UpdateUserForm.tsx

@@ -5,8 +5,8 @@ import { estimatePasswordStrength } from '@douglasneuroinformatics/libpasswd';
 import { Button, Dialog, Form } from '@douglasneuroinformatics/libui/components';
 import { useTranslation } from '@douglasneuroinformatics/libui/hooks';
 import type { FormTypes } from '@opendatacapture/runtime-core';
-import { $UserPermission } from '@opendatacapture/schemas/user';
-import type { UserPermission } from '@opendatacapture/schemas/user';
+import { $UserPermission } from '@opendatacapture/schemas/core';
+import type { UserPermission } from '@opendatacapture/schemas/core';
 import type { Promisable } from 'type-fest';
 import { z } from 'zod';
 

packages/schemas/src/core/core.ts

@@ -23,7 +23,14 @@ export const $AppSubjectName = z.enum([
 
 export type BaseAppAbility = PureAbility<[AppAction, AppSubjectName]>;
 
-export type Permissions = RawRuleOf<BaseAppAbility>[];
+export type UserPermission = z.infer<typeof $UserPermission>;
+export const $UserPermission = z.object({
+  action: $AppAction,
+  subject: $AppSubjectName
+}) satisfies z.ZodType<RawRuleOf<BaseAppAbility>>;
+
+export type Permissions = z.infer<typeof $Permissions>;
+export const $Permissions = z.array($UserPermission);
 
 export const $Language: z.ZodType<Language> = z.enum(['en', 'fr']);
 

packages/schemas/src/user/user.ts

@@ -1,23 +1,15 @@
 import { z } from 'zod';
 
-import { $AppAction, $AppSubjectName, $BaseModel } from '../core/core.js';
+import { $BaseModel, $Permissions } from '../core/core.js';
 import { $Sex } from '../subject/subject.js';
 
 export const $BasePermissionLevel = z.enum(['ADMIN', 'GROUP_MANAGER', 'STANDARD']);
 
 export type BasePermissionLevel = z.infer<typeof $BasePermissionLevel>;
 
-export type UserPermission = z.infer<typeof $UserPermission>;
-export const $UserPermission = z.object({
-  action: $AppAction,
-  subject: $AppSubjectName
-});
-
-export const $AdditionalUserPermissions = z.array($UserPermission);
-
 export type User = z.infer<typeof $User>;
 export const $User = $BaseModel.extend({
-  additionalPermissions: $AdditionalUserPermissions,
+  additionalPermissions: $Permissions,
   basePermissionLevel: $BasePermissionLevel.nullable(),
   dateOfBirth: z.coerce.date().nullish(),
   firstName: z.string().min(1),
@@ -44,5 +36,5 @@ export const $CreateUserData = $User
 
 export type UpdateUserData = z.infer<typeof $UpdateUserData>;
 export const $UpdateUserData = $CreateUserData.partial().extend({
-  additionalPermissions: $AdditionalUserPermissions.optional()
+  additionalPermissions: $Permissions.optional()
 });