@striae-org/striae 6.0.1 → 6.1.1

package/app/utils/data/permissions.ts

@@ -26,6 +26,16 @@ export interface CaseMetadata {
   createdAt: string;
 }
 
+/**
+ * Result for notes viewing permissions
+ * Determines if notes can be viewed and in what mode (edit or view-only)
+ */
+export interface NotesViewPermission {
+  canOpen: boolean;        // Can the notes panel be opened
+  isReadOnly: boolean;     // Are notes in read-only mode (can view but not edit)
+  reason?: string;         // Reason if notes cannot be opened
+}
+
 /**
  * Get user data from KV store
  */
@@ -565,4 +575,117 @@ export const removeUserCase = async (user: User, caseNumber: string): Promise<vo
     console.error('Error removing case from user:', error);
     throw error;
   }
+};
+
+// ============================================================================
+// NOTES VIEW PERMISSIONS
+// ============================================================================
+
+/**
+ * Determine if notes can be opened and viewed, and whether they should be in read-only mode
+ * 
+ * Notes can be viewed in the following scenarios:
+ * - Normal active case with unconfirmed image: Can edit and save
+ * - Active case with confirmed image: Can view only (read-only)
+ * - Read-only case (review/confirmation case): Can view only (read-only)
+ * - Archived case: Can view only (read-only)
+ * 
+ * Notes cannot be opened when:
+ * - Files are uploading
+ * - Confirmation status is still being checked
+ * - No image is loaded
+ * 
+ * @param config Configuration object with state flags
+ * @returns NotesViewPermission object indicating if notes can be opened and if they're read-only
+ */
+export const getNotesViewPermission = (config: {
+  imageLoaded: boolean;
+  isUploading: boolean;
+  isCheckingConfirmation: boolean;
+  isReadOnlyCase?: boolean;
+  isArchivedCase?: boolean;
+  isConfirmedImage?: boolean;
+}): NotesViewPermission => {
+  const {
+    imageLoaded,
+    isUploading,
+    isCheckingConfirmation,
+    isReadOnlyCase = false,
+    isArchivedCase = false,
+    isConfirmedImage = false
+  } = config;
+
+  // Cannot open if uploading files
+  if (isUploading) {
+    return {
+      canOpen: false,
+      isReadOnly: false,
+      reason: 'Cannot open notes while uploading'
+    };
+  }
+
+  // Cannot open if checking confirmation status
+  if (isCheckingConfirmation) {
+    return {
+      canOpen: false,
+      isReadOnly: false,
+      reason: 'Checking confirmation status...'
+    };
+  }
+
+  // Cannot open if no image is loaded
+  if (!imageLoaded) {
+    return {
+      canOpen: false,
+      isReadOnly: false,
+      reason: 'Select an image first'
+    };
+  }
+
+  // Can open, determine if read-only
+  const isReadOnly = isConfirmedImage || isReadOnlyCase || isArchivedCase;
+
+  return {
+    canOpen: true,
+    isReadOnly
+  };
+};
+
+/**
+ * Get a user-friendly tooltip message for the Image Notes button
+ * 
+ * This centralizes all the tooltip logic that appears in the navbar and sidebar
+ * 
+ * @param permission NotesViewPermission object from getNotesViewPermission
+ * @param additionalContext Optional context for more specific messages
+ * @returns Tooltip string, or undefined if button has no specific tooltip
+ */
+export const getNotesButtonTooltip = (
+  permission: NotesViewPermission,
+  additionalContext?: {
+    isReadOnlyCase?: boolean;
+    isArchivedCase?: boolean;
+    isConfirmedImage?: boolean;
+  }
+): string | undefined => {
+  // If cannot open, return the reason
+  if (!permission.canOpen) {
+    return permission.reason;
+  }
+
+  // Can open - provide context-specific read-only messages
+  if (permission.isReadOnly && additionalContext) {
+    if (additionalContext.isConfirmedImage) {
+      return 'Image notes: viewing only (image is confirmed)';
+    }
+    if (additionalContext.isReadOnlyCase) {
+      return 'Image notes: viewing only (case is read-only)';
+    }
+    if (additionalContext.isArchivedCase) {
+      return 'Image notes: viewing only (case is archived)';
+    }
+  }
+
+  // No tooltip needed for normal edit mode
+  return undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@striae-org/striae",
-  "version": "6.0.1",
+  "version": "6.1.1",
   "private": false,
   "description": "Striae is a specialized, cloud-native platform designed to streamline forensic firearms identification by providing an intuitive environment for digital comparison image annotation, authenticated confirmations, and automated report generation.",
   "license": "Apache-2.0",
@@ -50,12 +50,12 @@
     "workers/pdf-worker/src/assets/generated-assets.example.ts",
     "!workers/pdf-worker/src/formats/**/*",
     "workers/pdf-worker/src/formats/format-striae.ts",
-    ".env.example",    
+    ".env.example",
     "firebase.json",
     "tsconfig.json",
     "vite.config.ts",
     "/worker-configuration.d.ts",
-    "wrangler.toml.example",    
+    "wrangler.toml.example",
     "LICENSE"
   ],
   "sideEffects": false,
@@ -100,23 +100,23 @@
     "deploy-workers:user": "cd workers/user-worker && npm run deploy"
   },
   "dependencies": {
-    "@react-router/cloudflare": "^7.14.0",
+    "@react-router/cloudflare": "^7.14.1",
     "firebase": "^12.12.0",
-    "isbot": "^5.1.37",
+    "isbot": "^5.1.38",
     "jszip": "^3.10.1",
     "qrcode": "^1.5.4",
     "react": "^19.2.5",
     "react-dom": "^19.2.5",
-    "react-router": "^7.14.0"
+    "react-router": "^7.14.1"
   },
   "devDependencies": {
-    "@react-router/dev": "^7.14.0",
-    "@react-router/fs-routes": "^7.14.0",
+    "@react-router/dev": "^7.14.1",
+    "@react-router/fs-routes": "^7.14.1",
     "@types/qrcode": "^1.5.6",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "@typescript-eslint/eslint-plugin": "^8.58.1",
-    "@typescript-eslint/parser": "^8.58.1",
+    "@typescript-eslint/eslint-plugin": "^8.58.2",
+    "@typescript-eslint/parser": "^8.58.2",
     "eslint": "^9.39.4",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
@@ -128,7 +128,7 @@
     "typescript": "^5.9.3",
     "vite": "^7.3.2",
     "vite-tsconfig-paths": "^6.1.1",
-    "wrangler": "^4.81.1"
+    "wrangler": "^4.83.0"
   },
   "overrides": {
     "@tootallnate/once": "3.0.1"
@@ -136,5 +136,5 @@
   "engines": {
     "node": ">=20.19.0"
   },
-  "packageManager": "npm@11.11.0"
+  "packageManager": "npm@11.12.0"
 }

package/workers/audit-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "audit-worker",
-  "version": "6.0.1",
+  "version": "6.1.1",
   "private": true,
   "scripts": {
     "deploy": "wrangler deploy",
@@ -8,6 +8,6 @@
     "start": "wrangler dev"
   },
   "devDependencies": {
-    "wrangler": "^4.81.1"
+    "wrangler": "^4.83.0"
   }
 }

package/workers/audit-worker/wrangler.jsonc.example

@@ -7,7 +7,7 @@
   "name": "AUDIT_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/audit-worker.ts",
-  "compatibility_date": "2026-04-12",
+  "compatibility_date": "2026-04-15",
   "compatibility_flags": [
     "nodejs_compat"
   ], 

package/workers/data-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-worker",
-  "version": "6.0.1",
+  "version": "6.1.1",
   "private": true,
   "scripts": {
     "deploy": "wrangler deploy",
@@ -8,6 +8,6 @@
     "start": "wrangler dev"
   },
   "devDependencies": {
-    "wrangler": "^4.81.1"
+    "wrangler": "^4.83.0"
   }
 }

package/workers/data-worker/wrangler.jsonc.example

@@ -5,7 +5,7 @@
   "name": "DATA_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/data-worker.ts",
-  "compatibility_date": "2026-04-12",
+  "compatibility_date": "2026-04-15",
   "compatibility_flags": [
     "nodejs_compat"
   ], 

package/workers/image-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "image-worker",
-  "version": "6.0.1",
+  "version": "6.1.1",
   "private": true,
   "scripts": {
     "deploy": "wrangler deploy",
@@ -8,6 +8,6 @@
     "start": "wrangler dev"
   },
   "devDependencies": {
-    "wrangler": "^4.81.1"
+    "wrangler": "^4.83.0"
   }
 }

package/workers/image-worker/wrangler.jsonc.example

@@ -2,7 +2,7 @@
   "name": "IMAGES_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/image-worker.ts",
-  "compatibility_date": "2026-04-12",
+  "compatibility_date": "2026-04-15",
   "compatibility_flags": [
     "nodejs_compat"
   ], 

package/workers/pdf-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdf-worker",
-  "version": "6.0.1",
+  "version": "6.1.1",
   "private": true,
   "scripts": {
     "generate:assets": "node scripts/generate-assets.js",
@@ -9,6 +9,6 @@
     "start": "wrangler dev"
   },
   "devDependencies": {
-    "wrangler": "^4.81.1"
+    "wrangler": "^4.83.0"
   }
 }

package/workers/pdf-worker/src/formats/format-striae.ts

@@ -7,6 +7,14 @@ export const renderReport: ReportRenderer = (data: PDFGenerationData): string =>
   const annotationsSet = new Set(activeAnnotations);
   const hasImage = Boolean(imageUrl && imageUrl !== '/clear.jpg');
   const safeText = (value: unknown): string => escapeHtml(String(value ?? ''));
+  const leftAdditionalNotes = annotationData?.leftAdditionalNotes?.trim() || '';
+  const rightAdditionalNotes = annotationData?.rightAdditionalNotes?.trim() || '';
+  const generalAdditionalNotes = annotationData?.additionalNotes?.trim() || '';
+  const hasSideAdditionalNotes = Boolean(leftAdditionalNotes || rightAdditionalNotes);
+  const hasGeneralAdditionalNotes = Boolean(generalAdditionalNotes);
+  const hasAdditionalNotes = hasSideAdditionalNotes || hasGeneralAdditionalNotes;
+  const hasConfirmationOrNotes = Boolean(annotationData && ((annotationData.includeConfirmation === true) || hasAdditionalNotes));
+  const notesShouldStartNewPage = hasImage || annotationData?.includeConfirmation === true;
 
   // Programmatically determine if a color is dark and needs a light background
   const needsLightBackground = (color: string | undefined): boolean => {
@@ -323,6 +331,15 @@ export const renderReport: ReportRenderer = (data: PDFGenerationData): string =>
         font-family: 'Inter', Arial, sans-serif;
         color: #333;
       }
+      .additional-notes-grid {
+        display: flex;
+        align-items: stretch;
+        gap: 12px;
+      }
+      .additional-notes-section--half {
+        flex: 1 1 50%;
+        width: 50%;
+      }
       .additional-notes-title {
         margin: 0 0 10px;
         font-size: 12px;
@@ -415,15 +432,31 @@ export const renderReport: ReportRenderer = (data: PDFGenerationData): string =>
         </div>
         ` : '<div class="support-level-annotation"></div>'}
         
-        ${annotationData && annotationsSet?.has('class') ? `
+        ${annotationData && annotationsSet?.has('item') ? `
         <div class="class-annotation">
           <div class="class-text-annotation">
-            ${safeText(annotationData.customClass || annotationData.classType)}${annotationData.classNote ? ` (${safeText(annotationData.classNote)})` : ''}
+            ${(() => {
+              const leftValue = annotationData.leftCustomClass || annotationData.leftItemType;
+              const rightValue = annotationData.rightCustomClass || annotationData.rightItemType;
+              const legacyValue = annotationData.customClass || annotationData.itemType || annotationData.classType;
+              const displayValue =
+                leftValue && rightValue && leftValue !== rightValue
+                  ? `${leftValue} / ${rightValue}`
+                  : leftValue || rightValue || legacyValue;
+              const leftClassNote = annotationData.leftClassNote?.trim();
+              const rightClassNote = annotationData.rightClassNote?.trim();
+              const legacyClassNote = annotationData.classNote?.trim();
+              const displayClassNote =
+                leftClassNote && rightClassNote && leftClassNote !== rightClassNote
+                  ? `${leftClassNote} / ${rightClassNote}`
+                  : leftClassNote || rightClassNote || legacyClassNote;
+              return safeText(displayValue || '') + (displayClassNote ? ` (${safeText(displayClassNote)})` : '');
+            })()}
           </div>
         </div>
         ` : '<div class="class-annotation"></div>'}
         
-        ${annotationData && annotationsSet?.has('class') && annotationData.hasSubclass ? `
+        ${annotationData && annotationsSet?.has('item') && (annotationData.leftHasSubclass || annotationData.rightHasSubclass || annotationData.hasSubclass) ? `
         <div class="subclass-annotation">
           <div class="subclass-text">
             POTENTIAL SUBCLASS
@@ -434,7 +467,7 @@ export const renderReport: ReportRenderer = (data: PDFGenerationData): string =>
     </div>
     ` : ''}
     
-    ${annotationData && ((annotationData.includeConfirmation === true) || annotationData.additionalNotes) ? `
+    ${hasConfirmationOrNotes ? `
     <div class="confirmation-section">
       ${annotationData && (annotationData.includeConfirmation === true) ? `
         <div class="confirmation-summary">
@@ -465,10 +498,34 @@ export const renderReport: ReportRenderer = (data: PDFGenerationData): string =>
         </div>
       ` : ''}
 
-      ${annotationData && annotationsSet?.has('notes') && annotationData.additionalNotes && annotationData.additionalNotes.trim() ? `
-      <section class="additional-notes-section ${hasImage || annotationData.includeConfirmation === true ? 'notes-page' : ''}">
-        <h2 class="additional-notes-title">Additional Notes</h2>
-        <p class="additional-notes-body">${escapeHtml(annotationData.additionalNotes.trim())}</p>
+      ${annotationData && annotationsSet?.has('notes') && hasAdditionalNotes ? `
+      <section class="${notesShouldStartNewPage ? 'notes-page' : ''}">
+        ${hasSideAdditionalNotes ? `
+          ${leftAdditionalNotes && rightAdditionalNotes ? `
+            <div class="additional-notes-grid">
+              <div class="additional-notes-section additional-notes-section--half">
+                <h2 class="additional-notes-title">Additional Notes (L)</h2>
+                <p class="additional-notes-body">${escapeHtml(leftAdditionalNotes)}</p>
+              </div>
+              <div class="additional-notes-section additional-notes-section--half">
+                <h2 class="additional-notes-title">Additional Notes (R)</h2>
+                <p class="additional-notes-body">${escapeHtml(rightAdditionalNotes)}</p>
+              </div>
+            </div>
+          ` : `
+            <div class="additional-notes-section">
+              <h2 class="additional-notes-title">Additional Notes (${leftAdditionalNotes ? 'L' : 'R'})</h2>
+              <p class="additional-notes-body">${escapeHtml(leftAdditionalNotes || rightAdditionalNotes)}</p>
+            </div>
+          `}
+        ` : ''}
+
+        ${hasGeneralAdditionalNotes ? `
+          <div class="additional-notes-section" style="margin-top: ${hasSideAdditionalNotes ? '12px' : '0'};">
+            <h2 class="additional-notes-title">Additional Notes (General)</h2>
+            <p class="additional-notes-body">${escapeHtml(generalAdditionalNotes)}</p>
+          </div>
+        ` : ''}
       </section>
       ` : ''}
     </div>

package/workers/pdf-worker/src/report-types.ts

@@ -1,3 +1,5 @@
+import type { IndexType, SupportLevel } from '../../../shared/types/annotation-literals';
+
 export interface BoxAnnotation {
   x: number;
   y: number;
@@ -16,7 +18,7 @@ export interface ConfirmationData {
 
 export interface AnnotationData {
   // Index annotations
-  indexType?: 'number' | 'color';
+  indexType?: IndexType;
   indexNumber?: string;
   indexColor?: string;
 
@@ -31,9 +33,19 @@ export interface AnnotationData {
   boxAnnotations?: BoxAnnotation[];
 
   // ID/Support level annotations
-  supportLevel?: 'ID' | 'Exclusion' | 'Inconclusive';
-
-  // Class annotations
+  supportLevel?: SupportLevel;
+
+  // Class annotations (left/right per-item)
+  leftItemType?: string;
+  leftCustomClass?: string;
+  leftClassNote?: string;
+  leftHasSubclass?: boolean;
+  rightItemType?: string;
+  rightCustomClass?: string;
+  rightClassNote?: string;
+  rightHasSubclass?: boolean;
+  // Legacy (kept for backward compatibility)
+  itemType?: string;
   classType?: string;
   customClass?: string;
   classNote?: string;
@@ -44,6 +56,8 @@ export interface AnnotationData {
   confirmationData?: ConfirmationData;
 
   // Notes
+  leftAdditionalNotes?: string;
+  rightAdditionalNotes?: string;
   additionalNotes?: string;
 }
 

package/workers/pdf-worker/wrangler.jsonc.example

@@ -2,7 +2,7 @@
   "name": "PDF_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/pdf-worker.ts",
-  "compatibility_date": "2026-04-12",
+  "compatibility_date": "2026-04-15",
   "compatibility_flags": [
     "nodejs_compat"
   ],

package/workers/user-worker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "user-worker",
-  "version": "6.0.1",
+  "version": "6.1.1",
   "private": true,
   "scripts": {
     "deploy": "wrangler deploy",
@@ -8,6 +8,6 @@
     "start": "wrangler dev"
   },
   "devDependencies": {
-    "wrangler": "^4.81.1"
+    "wrangler": "^4.83.0"
   }
 }

package/workers/user-worker/wrangler.jsonc.example

@@ -2,7 +2,7 @@
   "name": "USER_WORKER_NAME",
   "account_id": "ACCOUNT_ID",
   "main": "src/user-worker.ts",
-  "compatibility_date": "2026-04-12",
+  "compatibility_date": "2026-04-15",
   "compatibility_flags": [
     "nodejs_compat"
   ], 

package/wrangler.toml.example

@@ -1,6 +1,6 @@
 #:schema node_modules/wrangler/config-schema.json
 name = "PAGES_PROJECT_NAME"
-compatibility_date = "2026-04-12"
+compatibility_date = "2026-04-15"
 compatibility_flags = ["nodejs_compat"]
 pages_build_output_dir = "./build/client"