JASPER 577: Nutrient updates

web/src/components/case-details/civil/CivilDocumentsView.vue

@@ -262,7 +262,8 @@
     const documents: {
       documentType: DocumentRequestType;
       documentData: DocumentData;
-      memberName: string;
+      groupKeyOne: string;
+      groupKeyTwo: string;
       documentName: string;
     }[] = [];
     items
@@ -276,7 +277,8 @@
         documents.push({
           documentType,
           documentData,
-          memberName: '',
+          groupKeyOne: documentData.fileNumberText,
+          groupKeyTwo: '',
           documentName:
             item.documentTypeDescription +
             ' - ' +

web/src/components/case-details/criminal/CriminalDocumentsView.vue

@@ -288,7 +288,8 @@
     const documents: {
       documentType: DocumentRequestType;
       documentData: DocumentData;
-      memberName: string;
+      groupKeyOne: string;
+      groupKeyTwo: string;
       documentName: string;
     }[] = [];
     selectedItems.value
@@ -302,7 +303,8 @@
         documents.push({
           documentType,
           documentData,
-          memberName: item.fullName,
+          groupKeyOne: documentData.fileNumberText,
+          groupKeyTwo: item.fullName,
           documentName: documentData.documentDescription || ''
         });
       });

web/src/components/courtlist/CourtList.vue

@@ -227,9 +227,9 @@
     const documents: Array<{
       documentType: DocumentRequestType;
       documentData: Record<string, any>;
-      memberName: string;
+      groupKeyTwo: string;
       documentName: any;
-      caseNumber: string;
+      groupKeyOne: string;
     }> = [];
     uniqueMap.forEach((value) => {
       let documentData: Record<string, any> = {
@@ -241,16 +241,17 @@
       };
       if (value.division === DivisionEnum.R) {
         documentData.reportType = reportType;
+        documentData.isCriminal = true;
       } else if (value.division === DivisionEnum.I) {
         documentData.additionsList = reportType === 'Additions' ? 'Y' : 'N';
       }
 
       documents.push({
         documentType: DocumentRequestType.Report,
         documentData,
-        memberName: value.courtRoom,
-        documentName: documentData.reportType || documentData.date,
-        caseNumber: value.locationName,
+        groupKeyTwo: value.courtRoom,
+        documentName: reportType,
+        groupKeyOne: value.locationName,
       });
     });
     shared.openDocumentsPdfV2(documents);

web/src/components/documents/NutrientContainer.vue

@@ -24,12 +24,7 @@
   }
   const loading = ref(false);
   const emptyStore = ref(false);
-  const configuration = {
-    initialViewState: new NutrientViewer.ViewState({
-      sidebarMode: NutrientViewer.SidebarMode.DOCUMENT_OUTLINE,
-    }),
-    container: '.pdf-container',
-  };
+  const configuration = { container: '.pdf-container' };
   let documentResponse: GeneratePdfResponse | null = null;
   let pageIndex = 0;
 
@@ -48,6 +43,7 @@
   const loadMultiple = async () => {
     const groupedDocs = pdfStore.groupedDocuments;
     const allDocs: StoreDocument[] = [];
+
     Object.values(groupedDocs).forEach(
       (userGroup: Record<string, StoreDocument[]>) => {
         Object.values(userGroup).forEach((docs) => {
@@ -60,46 +56,70 @@
       allDocs.map((doc) => doc.request)
     );
     loading.value = false;
-
+    const outline = configureOutline();
     let instance = await NutrientViewer.load({
       ...configuration,
       document: `data:application/pdf;base64,${documentResponse.base64Pdf}`,
     });
-    configureOutline(instance);
+
+    instance.setDocumentOutline(outline);
+    instance.setViewState((viewState) =>
+      viewState.set('sidebarMode', NutrientViewer.SidebarMode.DOCUMENT_OUTLINE)
+    );
   };
 
-  const configureOutline = (instance: any) => {
+  const configureOutline = (): any => {
     const outline = NutrientViewer.Immutable.List(
       Object.entries(pdfStore.groupedDocuments).map(([groupKey, userGroup]) =>
-        makeCaseElement(groupKey, userGroup)
+        makeFirstGroup(groupKey, userGroup)
       )
     );
-    instance.setDocumentOutline(outline);
+    return outline;
   };
 
-  const makeCaseElement = (
+  const makeFirstGroup = (
     groupKey: string,
     userGroup: Record<string, StoreDocument[]>
   ) => {
+    const childrenArray: any[] = [];
+    Object.entries(userGroup).forEach(([name, docs]) => {
+      if (name !== '') {
+        childrenArray.push(makeSecondGroup(name, docs));
+      } else {
+        makeDocElements(docs).forEach((el: any) => childrenArray.push(el));
+      }
+    });
+    const childrenList = NutrientViewer.Immutable.List(childrenArray);
     return new NutrientViewer.OutlineElement({
       title: groupKey,
-      children: NutrientViewer.Immutable.List(
-        Object.entries(userGroup).map(([name, docs]) =>
-          makeMemberElement(name || 'Documents', docs)
-        )
-      ),
+      isExpanded: true,
+      children: childrenList,
     });
   };
 
-  const makeMemberElement = (memberName: string, docs: StoreDocument[]) => {
+  const makeSecondGroup = (memberName: string, docs: StoreDocument[]) => {
     return new NutrientViewer.OutlineElement({
       title: memberName,
+      isExpanded: true,
       children: NutrientViewer.Immutable.List(
         docs.map((doc) => makeDocElement(doc))
       ),
     });
   };
 
+  const makeDocElements = (docs: StoreDocument[]) => {
+    return NutrientViewer.Immutable.List(
+      docs.map((doc) =>
+      new NutrientViewer.OutlineElement({
+        title: doc.documentName,
+        action: new NutrientViewer.Actions.GoToAction({
+        pageIndex: documentResponse?.pageRanges?.[pageIndex++]?.start,
+        }),
+      })
+      )
+    );
+  };
+
   const makeDocElement = (doc: StoreDocument) => {
     return new NutrientViewer.OutlineElement({
       title: doc.documentName,

web/src/components/shared.ts

@@ -87,9 +87,9 @@ export default {
     documents?: {
       documentType: DocumentRequestType;
       documentData: DocumentData;
-      memberName: string;
+      groupKeyOne: string;
+      groupKeyTwo: string;
       documentName: string;
-      caseNumber?: string;
     }[]
   ): void {
     if (!documents || documents.length === 0) return;
@@ -117,15 +117,17 @@ export default {
             locationId: doc.documentData.locationId,
             roomCode: doc.documentData.roomCode || '',
             reportType: doc.documentData.reportType || '',
+            additionsList: doc.documentData.additionsList || '',
           },
         },
-        caseNumber: doc.caseNumber || doc.documentData.fileNumberText || 'Case',
-        memberName: doc.memberName,
+        groupKeyOne: doc.groupKeyOne,
+        groupKeyTwo: doc.groupKeyTwo,
         documentName: doc.documentName,
       });
     });
     window.open('/pdf-viewer', 'pdf-viewer');
   },
+
   generateFileName(
     documentType: CourtDocumentType,
     documentData: DocumentData

web/src/stores/PDFViewerStore.ts

@@ -17,14 +17,13 @@ export const usePDFViewerStore = defineStore('PDFViewerStore', {
     addDocument(document: StoreDocument): void {
       this.storedDocuments.push(document);
 
-      if (document.caseNumber) {
-        // Group documents by caseNumber, then by memberName
+      if (document.groupKeyOne) {
         const grouped = this.documents.reduce(
           (acc, doc) => {
-            if (!acc[doc.caseNumber]) acc[doc.caseNumber] = {};
-            if (!acc[doc.caseNumber][doc.memberName])
-              acc[doc.caseNumber][doc.memberName] = [];
-            acc[doc.caseNumber][doc.memberName].push(doc);
+            if (!acc[doc.groupKeyOne]) acc[doc.groupKeyOne] = {};
+            if (!acc[doc.groupKeyOne][doc.groupKeyTwo])
+              acc[doc.groupKeyOne][doc.groupKeyTwo] = [];
+            acc[doc.groupKeyOne][doc.groupKeyTwo].push(doc);
             return acc;
           },
           {} as Record<string, Record<string, StoreDocument[]>>
@@ -41,7 +40,7 @@ export const usePDFViewerStore = defineStore('PDFViewerStore', {
 
 export type StoreDocument = {
   request: GeneratePdfRequest;
-  caseNumber: string;
-  memberName: string;
+  groupKeyOne: string;
+  groupKeyTwo: string;
   documentName: string;
 };

web/src/types/shared.ts

@@ -20,6 +20,7 @@ export interface DocumentData {
   roomCode?: string;
   reportType?: string;
   isCriminal?: boolean;
+  additionsList?: string;
 }
 
 export enum CourtDocumentType {

web/tests/components/documents/NutrientContainer.test.ts

@@ -14,8 +14,8 @@ const mockGroupedDocuments = {
                     "data": {
                     }
                 },
-                "caseNumber": "123",
-                "memberName": "John Johnson",
+                "groupKeyOne": "123",
+                "groupKeyTwo": "John Johnson",
                 "documentName": "Information"
             }
         ],
@@ -26,8 +26,8 @@ const mockGroupedDocuments = {
                     "data": {
                     }
                 },
-                "caseNumber": "123",
-                "memberName": "Elmer Fudd",
+                "groupKeyOne": "123",
+                "groupKeyTwo": "Elmer Fudd",
                 "documentName": "Information"
             }
         ]
@@ -91,7 +91,8 @@ describe('NutrientContainer.vue', () => {
       const mergedInstance = {
         totalPageCount: typeof document !== 'string' && document instanceof ArrayBuffer ? 3 : 2,
         exportPDFWithOperations: vi.fn().mockResolvedValue('mergedDocument'),
-        setDocumentOutline: vi.fn()
+        setDocumentOutline: vi.fn(),
+        setViewState: vi.fn(),
       };
       return Promise.resolve(mergedInstance);
     });