Merge pull request #1145 from david-roper/subject-id-fix

Allow for subject id display length to be changes as a group setting

Author: joshunrau

apps/api/prisma/schema.prisma

@@ -68,6 +68,7 @@ type GroupSettings {
   defaultIdentificationMethod   SubjectIdentificationMethod
   idValidationRegex             String?
   idValidationRegexErrorMessage ErrorMessage?
+  subjectIdDisplayLength        Int?  
 }
 
 model Group {
@@ -82,7 +83,7 @@ model Group {
   settings                GroupSettings
   sessions                Session[]
   subjects                Subject[]          @relation(fields: [subjectIds], references: [id])
-  subjectIds              String[]
+  subjectIds              String[]           
   type                    GroupType
   userIds                 String[]           @db.ObjectId
   users                   User[]             @relation(fields: [userIds], references: [id])

apps/web/src/features/datahub/components/MasterDataTable.tsx

@@ -4,18 +4,21 @@ import { useTranslation } from '@douglasneuroinformatics/libui/hooks';
 import type { Subject } from '@opendatacapture/schemas/subject';
 import { removeSubjectIdScope } from '@opendatacapture/subject-utils';
 
+import { useAppStore } from '@/store';
+
 export type MasterDataTableProps = {
   data: Subject[];
   onSelect: (subject: Subject) => void;
 };
 
 export const MasterDataTable = ({ data, onSelect }: MasterDataTableProps) => {
   const { t } = useTranslation();
+  const subjectIdDisplaySetting = useAppStore((store) => store.currentGroup?.settings.subjectIdDisplayLength);
   return (
     <ClientTable<Subject>
       columns={[
         {
-          field: (subject) => removeSubjectIdScope(subject.id).slice(0, 9),
+          field: (subject) => removeSubjectIdScope(subject.id).slice(0, subjectIdDisplaySetting ?? 9),
           label: t('datahub.index.table.subject')
         },
         {

apps/web/src/features/datahub/components/SubjectLayout.tsx

@@ -8,6 +8,7 @@ import { Outlet, useParams } from 'react-router-dom';
 import { LoadingFallback } from '@/components/LoadingFallback';
 import { PageHeader } from '@/components/PageHeader';
 import { config } from '@/config';
+import { useAppStore } from '@/store';
 
 import { TabLink } from './TabLink';
 
@@ -16,6 +17,7 @@ export const SubjectLayout = () => {
   const { t } = useTranslation('datahub');
   const subjectId = params.subjectId!;
   const basePathname = `/datahub/${subjectId}`;
+  const subjectIdDisplaySetting = useAppStore((store) => store.currentGroup?.settings.subjectIdDisplayLength);
 
   return (
     <React.Fragment>
@@ -26,7 +28,7 @@ export const SubjectLayout = () => {
               en: 'Instrument Records for Subject {}',
               fr: "Dossiers d'instruments pour le client {}"
             },
-            removeSubjectIdScope(subjectId).slice(0, 9)
+            removeSubjectIdScope(subjectId).slice(0, subjectIdDisplaySetting ?? 9)
           )}
         </Heading>
       </PageHeader>

apps/web/src/features/group/components/ManageGroupForm.tsx

@@ -22,6 +22,7 @@ export type ManageGroupFormProps = {
       accessibleInteractiveInstrumentIds: Set<string>;
       defaultIdentificationMethod?: SubjectIdentificationMethod;
       idValidationRegex?: null | string;
+      subjectIdDisplayLength?: number;
     };
   };
   onSubmit: (data: Partial<UpdateGroupData>) => Promisable<any>;
@@ -59,6 +60,22 @@ export const ManageGroupForm = ({ data, onSubmit, readOnly }: ManageGroupFormPro
           },
           title: t('group.manage.accessibleInstruments')
         },
+        {
+          fields: {
+            subjectIdDisplayLength: {
+              kind: 'number',
+              label: t({
+                en: 'Preferred Subject ID Display Length',
+                fr: "La longueur d'affichage préférée de l'ID"
+              }),
+              variant: 'input'
+            }
+          },
+          title: t({
+            en: 'Display Settings',
+            fr: "Paramètres d'affichage"
+          })
+        },
         {
           fields: {
             defaultIdentificationMethod: {
@@ -129,7 +146,8 @@ export const ManageGroupForm = ({ data, onSubmit, readOnly }: ManageGroupFormPro
         defaultIdentificationMethod: $SubjectIdentificationMethod.optional(),
         idValidationRegex: $RegexString.optional(),
         idValidationRegexErrorMessageEn: z.string().optional(),
-        idValidationRegexErrorMessageFr: z.string().optional()
+        idValidationRegexErrorMessageFr: z.string().optional(),
+        subjectIdDisplayLength: z.number().int().min(1)
       })}
       onSubmit={(data) => {
         void onSubmit({
@@ -140,7 +158,8 @@ export const ManageGroupForm = ({ data, onSubmit, readOnly }: ManageGroupFormPro
             idValidationRegexErrorMessage: {
               en: data.idValidationRegexErrorMessageEn,
               fr: data.idValidationRegexErrorMessageFr
-            }
+            },
+            subjectIdDisplayLength: data.subjectIdDisplayLength
           }
         });
       }}

packages/schemas/src/group/group.ts

@@ -12,7 +12,8 @@ export const $GroupSettings = z.object({
       en: z.string().nullish(),
       fr: z.string().nullish()
     })
-    .nullish()
+    .nullish(),
+  subjectIdDisplayLength: z.number().nullish()
 });
 
 export type GroupType = z.infer<typeof $GroupType>;