@striae-org/striae 5.2.0 → 5.3.0

package/app/components/actions/case-export/index.ts

@@ -2,40 +2,16 @@
 // This maintains backward compatibility with existing imports
 
 // Types and constants
-export type { ExportFormat } from './types-constants';
-export { CSV_HEADERS, formatDateForFilename } from './types-constants';
+export { formatDateForFilename } from './types-constants';
 
-// Metadata and protection helpers
-export {
-  getUserExportMetadata,
-  addForensicDataWarning,
-  generateRandomPassword,
-  protectExcelWorksheet
-} from './metadata-helpers';
-
-// Data processing functions
-export {
-  generateMetadataRows,
-  processFileDataForTabular,
-  generateCSVContent
-} from './data-processing';
+// Metadata helpers
+export { getUserExportMetadata } from './metadata-helpers';
 
 // Core export functions
-export {
-  exportAllCases,
-  exportCaseData
-} from './core-export';
+export { exportCaseData } from './core-export';
 
 // Download handlers
-export {
-  downloadAllCasesAsJSON,
-  downloadAllCasesAsCSV,
-  downloadCaseAsJSON,
-  downloadCaseAsCSV,
-  downloadCaseAsZip
-} from './download-handlers';
+export { downloadCaseAsZip } from './download-handlers';
 
 // Validation utilities
-export {
-  validateCaseNumberForExport
-} from './validation-utils';
+export { validateCaseNumberForExport } from './validation-utils';

package/app/components/actions/case-export/metadata-helpers.ts

@@ -46,81 +46,3 @@ export function addForensicDataWarning(content: string, format: 'csv' | 'json'):
   return warning + content;
 }
 
-/**
- * Generate a secure random password for Excel protection
- */
-export function generateRandomPassword(): string {
-  const charset = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*';
-  const length = 16;
-  let password = '';
-  
-  // Ensure we have at least one of each type
-  password += 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'[Math.floor(Math.random() * 26)]; // Uppercase
-  password += 'abcdefghijklmnopqrstuvwxyz'[Math.floor(Math.random() * 26)]; // Lowercase
-  password += '0123456789'[Math.floor(Math.random() * 10)]; // Number
-  password += '!@#$%^&*'[Math.floor(Math.random() * 8)]; // Special char
-  
-  // Fill remaining length with random characters
-  for (let i = password.length; i < length; i++) {
-    password += charset[Math.floor(Math.random() * charset.length)];
-  }
-  
-  // Shuffle the password to randomize character positions
-  return password.split('').sort(() => Math.random() - 0.5).join('');
-}
-
-type WorksheetProtectionOptions = {
-  selectLockedCells: boolean;
-  selectUnlockedCells: boolean;
-  formatCells: boolean;
-  formatColumns: boolean;
-  formatRows: boolean;
-  insertColumns: boolean;
-  insertRows: boolean;
-  insertHyperlinks: boolean;
-  deleteColumns: boolean;
-  deleteRows: boolean;
-  sort: boolean;
-  autoFilter: boolean;
-  pivotTables: boolean;
-  objects: boolean;
-  scenarios: boolean;
-  spinCount: number;
-};
-
-type ProtectableWorksheet = {
-  protect: (password: string, options: Record<string, unknown>) => Promise<unknown> | unknown;
-};
-
-/**
- * Protect Excel worksheet from editing
- */
-export async function protectExcelWorksheet(worksheet: ProtectableWorksheet, sheetPassword?: string): Promise<string> {
-  // Generate random password if none provided
-  const password = sheetPassword || generateRandomPassword();
-
-  const protectionOptions: WorksheetProtectionOptions = {
-    // Keep read-only defaults and prevent structural edits.
-    selectLockedCells: true,
-    selectUnlockedCells: true,
-    formatCells: false,
-    formatColumns: false,
-    formatRows: false,
-    insertColumns: false,
-    insertRows: false,
-    insertHyperlinks: false,
-    deleteColumns: false,
-    deleteRows: false,
-    sort: false,
-    autoFilter: false,
-    pivotTables: false,
-    objects: false,
-    scenarios: false,
-    spinCount: 100000
-  };
-
-  await Promise.resolve(worksheet.protect(password, protectionOptions as Record<string, unknown>));
-  
-  // Return the password for inclusion in metadata
-  return password;
-}

package/app/components/actions/case-export/types-constants.ts

@@ -1,46 +1,3 @@
-export type ExportFormat = 'json' | 'csv';
-
-// Shared CSV headers for all tabular exports
-export const CSV_HEADERS = [
-  'File ID',
-  'Original Filename',
-  'Upload Date',
-  'Has Annotations',
-  'Left Case',
-  'Right Case',
-  'Left Item',
-  'Right Item',
-  'Case Font Color',
-  'Class Type',
-  'Custom Class',
-  'Class Note',
-  'Index Type',
-  'Index Number',
-  'Index Color',
-  'Support Level',
-  'Has Subclass',
-  'Include Confirmation',
-  'Confirmation Status',
-  'Confirming Examiner Name',
-  'Confirming Examiner Badge ID',
-  'Confirming Examiner Email',
-  'Confirming Examiner Company',
-  'Confirmation ID',
-  'Confirmation Timestamp',
-  'Confirmation Date (ISO)',
-  'Total Box Annotations',
-  'Box ID',
-  'Box X',
-  'Box Y',
-  'Box Width',
-  'Box Height',
-  'Box Color',
-  'Box Label',
-  'Box Timestamp',
-  'Additional Notes',
-  'Last Updated'
-];
-
 /**
  * Helper function to format timestamp for filename using user's local timezone
  */

package/app/components/actions/case-import/confirmation-import.ts

@@ -297,15 +297,14 @@ export async function importConfirmationData(
         
         // Audit log successful confirmation import
         try {
-          await auditService.logAnnotationEdit(
+          await auditService.logConfirmationImport(
             user,
-            `${result.caseNumber}-${currentImageId}`,
-            annotationData, // Previous state (without confirmation)
-            updatedAnnotationData, // New state (with confirmation)
             result.caseNumber,
-            'confirmation-import',
-            currentImageId,
-            displayFilename
+            displayFilename,
+            'success',
+            true,
+            confirmations.length,
+            [displayFilename]
           );
         } catch (auditError) {
           console.error('Failed to log confirmation import audit:', auditError);
@@ -315,15 +314,15 @@ export async function importConfirmationData(
         
         // Audit log failed confirmation import
         try {
-          await auditService.logAnnotationEdit(
+          await auditService.logConfirmationImport(
             user,
-            `${result.caseNumber}-${currentImageId}`,
-            annotationData, // Previous state
-            null, // Failed save
             result.caseNumber,
-            'confirmation-import',
-            currentImageId,
-            displayFilename
+            displayFilename,
+            'failure',
+            false,
+            0,
+            [],
+            [`Failed to update image ${displayFilename}: ${saveResponse.status}`]
           );
         } catch (auditError) {
           console.error('Failed to log failed confirmation import audit:', auditError);

package/app/components/actions/case-import/zip-processing.ts

@@ -103,6 +103,82 @@ function extractImageIdFromFilename(exportFilename: string): string | null {
   return filenameWithoutExt.substring(lastHyphenIndex + 1);
 }
 
+interface ReadmeCaseInfo {
+  caseNumber: string | null;
+  exportedBy: string | null;
+  exportedByName: string | null;
+  exportedByCompany: string | null;
+  exportedByBadgeId: string | null;
+  exportDate: string | null;
+  caseCreatedDate: string | null;
+  totalFiles: number;
+  isArchived: boolean;
+}
+
+/**
+ * Parse case metadata from a README.txt included in a case package ZIP.
+ * Handles both standard export format and archived package format.
+ * Falls back gracefully when fields are absent or README is missing.
+ */
+function parseReadmeCaseInfo(readme: string | null, fallbackTotalFiles: number): ReadmeCaseInfo {
+  const result: ReadmeCaseInfo = {
+    caseNumber: null,
+    exportedBy: null,
+    exportedByName: null,
+    exportedByCompany: null,
+    exportedByBadgeId: null,
+    exportDate: null,
+    caseCreatedDate: null,
+    totalFiles: fallbackTotalFiles,
+    isArchived: false
+  };
+
+  if (!readme) return result;
+
+  const isArchived = readme.trimStart().startsWith('Striae Archived Case Package');
+  result.isArchived = isArchived;
+
+  const field = (key: string): string | null => {
+    const regex = new RegExp(`^${key}:\\s*(.+)$`, 'm');
+    const match = readme.match(regex);
+    if (!match) return null;
+    const value = match[1].trim();
+    return value === 'N/A' || value === '' ? null : value;
+  };
+
+  result.caseNumber = field('Case Number');
+
+  if (isArchived) {
+    result.exportDate = field('Archived At');
+    const archivedBy = field('Archived By');
+    if (archivedBy) {
+      // Format: "Name (email)" or just "Name" — extract name and optional email
+      const parenMatch = archivedBy.match(/^(.+?)\s*\(([^)]+)\)\s*$/);
+      if (parenMatch) {
+        result.exportedByName = parenMatch[1].trim() || null;
+        result.exportedBy = parenMatch[2].trim() || null;
+      } else {
+        result.exportedByName = archivedBy;
+      }
+    }
+  } else {
+    result.exportDate = field('Export Date');
+    result.caseCreatedDate = field('Case Created Date');
+    result.exportedBy = field('Exported By \\(Email\\)');
+    result.exportedByName = field('Exported By \\(Name\\)');
+    result.exportedByCompany = field('Exported By \\(Company\\)');
+    result.exportedByBadgeId = field('Exported By \\(Badge\\/ID\\)');
+
+    const totalFilesStr = field('- Total Files');
+    if (totalFilesStr !== null) {
+      const parsed = parseInt(totalFilesStr, 10);
+      if (!isNaN(parsed)) result.totalFiles = parsed;
+    }
+  }
+
+  return result;
+}
+
 /**
  * Preview case information from ZIP file without importing
  */
@@ -116,12 +192,10 @@ export async function previewCaseImport(zipFile: File, currentUser: User): Promi
     // Check if export is encrypted
     const encryptionManifestFile = zip.file('ENCRYPTION_MANIFEST.json');
     if (encryptionManifestFile) {
-      // For encrypted exports, we can't read the plaintext data to extract case info
-      // Return an encrypted preview that requires decryption during import
       try {
         const manifestContent = await encryptionManifestFile.async('text');
         JSON.parse(manifestContent); // Validate it's valid JSON
-        
+
         // Count image files
         let totalFiles = 0;
         const imagesFolder = zip.folder('images');
@@ -132,18 +206,24 @@ export async function previewCaseImport(zipFile: File, currentUser: User): Promi
             }
           }
         }
-        
+
         const hasForensicManifest = zip.file('FORENSIC_MANIFEST.json') !== null;
 
+        // Read README.txt to surface case metadata without decrypting
+        const readmeFile = zip.file('README.txt');
+        const readmeContent = readmeFile ? await readmeFile.async('text') : null;
+        const readmeMeta = parseReadmeCaseInfo(readmeContent, totalFiles);
+
         return {
-          caseNumber: 'ENCRYPTED',
-          archived: false,
-          exportedBy: null,
-          exportedByName: null,
-          exportedByCompany: null,
-          exportedByBadgeId: null,
-          exportDate: new Date().toISOString(),
-          totalFiles,
+          caseNumber: readmeMeta.caseNumber ?? 'ENCRYPTED',
+          archived: readmeMeta.isArchived,
+          exportedBy: readmeMeta.exportedBy,
+          exportedByName: readmeMeta.exportedByName,
+          exportedByCompany: readmeMeta.exportedByCompany,
+          exportedByBadgeId: readmeMeta.exportedByBadgeId,
+          exportDate: readmeMeta.exportDate ?? new Date().toISOString(),
+          totalFiles: readmeMeta.totalFiles,
+          caseCreatedDate: readmeMeta.caseCreatedDate ?? undefined,
           hasAnnotations: false,
           validationSummary: 'Export is encrypted. Integrity validation will occur during import.',
           hashValid: undefined,

package/app/components/actions/generate-pdf.ts

@@ -2,6 +2,7 @@ import { type AnnotationData } from '~/types/annotations';
 import { auditService } from '~/services/audit';
 import type { User } from 'firebase/auth';
 import { fetchPdfApi } from '~/utils/api';
+import type { ToastType } from '~/components/toast/toast';
 
 interface GeneratePDFParams {
   user: User;
@@ -16,7 +17,7 @@ interface GeneratePDFParams {
   annotationData: AnnotationData | null;
   activeAnnotations: Set<string>;
   setIsGeneratingPDF: (isGenerating: boolean) => void;
-  setToastType: (type: 'success' | 'error') => void;
+  setToastType: (type: ToastType) => void;
   setToastMessage: (message: string) => void;
   setShowToast: (show: boolean) => void;
   setToastDuration?: (duration: number) => void;
@@ -90,7 +91,7 @@ export const generatePDF = async ({
   const startTime = Date.now();
   
   // Show generating toast immediately with duration 0 (stays until manually closed or completion)
-  setToastType('success');
+  setToastType('loading');
   setToastMessage('Generating PDF report... This may take up to a minute.');
   if (setToastDuration) setToastDuration(0);
   setShowToast(true);

package/app/components/audit/user-audit-viewer.tsx

@@ -9,7 +9,6 @@ import { AuditEntriesList } from './viewer/audit-entries-list';
 import { summarizeAuditEntries } from './viewer/audit-viewer-utils';
 import { useAuditViewerData } from './viewer/use-audit-viewer-data';
 import { useAuditViewerFilters } from './viewer/use-audit-viewer-filters';
-import { useAuditViewerExport } from './viewer/use-audit-viewer-export';
 import styles from './user-audit.module.css';
 
 interface UserAuditViewerProps {
@@ -56,8 +55,6 @@ export const UserAuditViewer = ({ isOpen, onClose, caseNumber, title }: UserAudi
     userData,
     loading,
     error,
-    setError,
-    auditTrail,
     isArchivedReadOnlyCase,
     bundledAuditWarning,
     loadAuditData
@@ -73,18 +70,6 @@ export const UserAuditViewer = ({ isOpen, onClose, caseNumber, title }: UserAudi
   const filteredEntries = useMemo(() => getFilteredEntries(auditEntries), [auditEntries, getFilteredEntries]);
   const auditSummary = useMemo(() => summarizeAuditEntries(auditEntries), [auditEntries]);
 
-  const {
-    handleExportCSV,
-    handleExportJSON,
-    handleGenerateReport
-  } = useAuditViewerExport({
-    user,
-    effectiveCaseNumber,
-    filteredEntries,
-    auditTrail,
-    setError
-  });
-
   const {
     requestClose,
     overlayProps
@@ -106,10 +91,6 @@ export const UserAuditViewer = ({ isOpen, onClose, caseNumber, title }: UserAudi
       <div className={styles.modal}>
         <AuditViewerHeader
           title={title || (effectiveCaseNumber ? `Audit Trail - Case ${effectiveCaseNumber}` : 'My Audit Trail')}
-          hasEntries={auditEntries.length > 0}
-          onExportCSV={handleExportCSV}
-          onExportJSON={handleExportJSON}
-          onGenerateReport={handleGenerateReport}
           onClose={requestClose}
         />
 

package/app/components/audit/viewer/audit-viewer-header.tsx

@@ -2,50 +2,17 @@ import styles from '../user-audit.module.css';
 
 interface AuditViewerHeaderProps {
   title: string;
-  hasEntries: boolean;
-  onExportCSV: () => void;
-  onExportJSON: () => void;
-  onGenerateReport: () => void;
   onClose: () => void;
 }
 
 export const AuditViewerHeader = ({
   title,
-  hasEntries,
-  onExportCSV,
-  onExportJSON,
-  onGenerateReport,
   onClose,
 }: AuditViewerHeaderProps) => {
   return (
     <div className={styles.header}>
       <h2 className={styles.title}>{title}</h2>
       <div className={styles.headerActions}>
-        {hasEntries && (
-          <div className={styles.exportButtons}>
-            <button
-              onClick={onExportCSV}
-              className={styles.exportButton}
-              title="CSV - Individual entry log with summary data"
-            >
-              📊 CSV
-            </button>
-            <button
-              onClick={onExportJSON}
-              className={styles.exportButton}
-              title="JSON - Complete log data for version capture and auditing"
-            >
-              📄 JSON
-            </button>
-            <button
-              onClick={onGenerateReport}
-              className={styles.exportButton}
-              title="Summary report only"
-            >
-              📋 Report
-            </button>
-          </div>
-        )}
         <button className={styles.closeButton} onClick={onClose}>
           ×
         </button>

package/app/components/navbar/case-modals/archive-case-modal.tsx

@@ -82,7 +82,7 @@ export const ArchiveCaseModal = ({
             Archiving a case permanently renders it read-only.
           </p>
           <p>
-            The archive will be in JSON format and include all images.
+            The archive will be packaged as an encrypted case package and will always include all images.
           </p>
           <p>
             The full audit trail is packaged with Striae&apos;s current public key and forensic signatures.

package/app/components/navbar/navbar.tsx

@@ -194,7 +194,7 @@ export const Navbar = ({
                     setIsCaseMenuOpen(false);
                   }}
                 >
-                  Export Case Data
+                  {isReadOnly ? 'Export Confirmations' : 'Export Case Package'}
                 </button>
                 <button
                   type="button"

package/app/components/sidebar/case-import/case-import.module.css

@@ -461,6 +461,41 @@
   padding: var(--spaceM);
 }
 
+.previewMeta {
+  display: flex;
+  flex-direction: column;
+  gap: var(--spaceS);
+}
+
+.previewMetaRow {
+  display: grid;
+  grid-template-columns: 100px 1fr;
+  gap: var(--spaceS);
+  font-size: var(--fontSizeBodyS);
+}
+
+.previewMetaLabel {
+  color: var(--textLight);
+}
+
+.previewMetaValue {
+  color: var(--textBody);
+  font-weight: var(--fontWeightMedium);
+  word-break: break-word;
+}
+
+.previewValidBadge {
+  color: var(--success);
+  font-size: var(--fontSizeBodyS);
+  font-weight: var(--fontWeightMedium);
+}
+
+.previewInvalidBadge {
+  color: var(--error);
+  font-size: var(--fontSizeBodyS);
+  font-weight: var(--fontWeightMedium);
+}
+
 /* Confirmation Dialog */
 .confirmationOverlay {
   position: fixed;

package/app/components/sidebar/case-import/components/CasePreviewSection.tsx

@@ -11,6 +11,21 @@ interface CasePreviewSectionProps {
   isArchivedRegularCaseImportBlocked?: boolean;
 }
 
+function formatDate(isoDate: string | undefined): string {
+  if (!isoDate) return 'Unknown';
+
+  const date = new Date(isoDate);
+  if (Number.isNaN(date.getTime())) {
+    return isoDate;
+  }
+
+  return date.toLocaleDateString(undefined, {
+    year: 'numeric',
+    month: 'short',
+    day: 'numeric'
+  });
+}
+
 export const CasePreviewSection = ({
   casePreview,
   isLoadingPreview,
@@ -28,12 +43,53 @@ export const CasePreviewSection = ({
 
   if (!casePreview) return null;
 
+  const isEncrypted = casePreview.caseNumber === 'ENCRYPTED';
+
   return (
     <div className={styles.previewSection}>
       <h3 className={styles.previewTitle}>Case Import Preview</h3>
-      <p className={styles.previewMessage}>
-        Case package detected. Details are hidden until import verification completes.
-      </p>
+      {isEncrypted ? (
+        <p className={styles.previewMessage}>
+          Encrypted package detected. Case details could not be read from the package.
+        </p>
+      ) : (
+        <div className={styles.previewMeta}>
+          <div className={styles.previewMetaRow}>
+            <span className={styles.previewMetaLabel}>Case</span>
+            <span className={styles.previewMetaValue}>{casePreview.caseNumber}</span>
+          </div>
+          {(casePreview.exportedByName ?? casePreview.exportedBy) && (
+            <div className={styles.previewMetaRow}>
+              <span className={styles.previewMetaLabel}>Exported by</span>
+              <span className={styles.previewMetaValue}>
+                {casePreview.exportedByName ?? casePreview.exportedBy}
+              </span>
+            </div>
+          )}
+          {casePreview.exportedByCompany && (
+            <div className={styles.previewMetaRow}>
+              <span className={styles.previewMetaLabel}>Organization</span>
+              <span className={styles.previewMetaValue}>{casePreview.exportedByCompany}</span>
+            </div>
+          )}
+          <div className={styles.previewMetaRow}>
+            <span className={styles.previewMetaLabel}>Exported</span>
+            <span className={styles.previewMetaValue}>{formatDate(casePreview.exportDate)}</span>
+          </div>
+          <div className={styles.previewMetaRow}>
+            <span className={styles.previewMetaLabel}>Files</span>
+            <span className={styles.previewMetaValue}>{casePreview.totalFiles}</span>
+          </div>
+          {casePreview.hashValid !== undefined && (
+            <div className={styles.previewMetaRow}>
+              <span className={styles.previewMetaLabel}>Integrity</span>
+              <span className={casePreview.hashValid ? styles.previewValidBadge : styles.previewInvalidBadge}>
+                {casePreview.hashValid ? 'Passed' : 'Failed'}
+              </span>
+            </div>
+          )}
+        </div>
+      )}
       {casePreview.archived && (
         <div className={styles.archivedImportNote}>
           {ARCHIVED_SELF_IMPORT_NOTE}

package/app/components/sidebar/case-import/components/ConfirmationDialog.tsx

@@ -24,6 +24,7 @@ export const ConfirmationDialog = ({
 }: ConfirmationDialogProps) => {
   if (!showConfirmation || !casePreview) return null;
 
+  const isEncrypted = casePreview.caseNumber === 'ENCRYPTED';
   const hasDetails = casePreview.archived || isArchivedRegularCaseImportBlocked;
 
   return (
@@ -32,10 +33,7 @@ export const ConfirmationDialog = ({
         <div className={styles.confirmationContent}>
           <h3 className={styles.confirmationTitle}>Confirm Case Import</h3>
           <p className={styles.confirmationText}>
-            Are you sure you want to import this case for review?
-          </p>
-          <p className={styles.confirmationText}>
-            Package details stay hidden until verification completes.
+            Are you sure you want to import{isEncrypted ? ' this encrypted case' : ` case ${casePreview.caseNumber}`} for review?
           </p>
 
           {hasDetails && (

package/app/components/sidebar/case-import/components/ConfirmationPreviewSection.tsx

@@ -24,7 +24,7 @@ export const ConfirmationPreviewSection = ({ confirmationPreview, isLoadingPrevi
     <div className={styles.previewSection}>
       <h3 className={styles.previewTitle}>Confirmation Import Preview</h3>
       <p className={styles.previewMessage}>
-        Confirmation package detected. Details are hidden until import verification completes.
+        Encrypted confirmation package detected.
       </p>
     </div>
   );

package/app/components/sidebar/notes/class-details-shared.ts

@@ -89,10 +89,10 @@ export const SHOTSHELL_BUCKSHOT_OPTIONS = [
 
 export const ALL_CALIBERS: string[] = [...PISTOL_CALIBERS, ...RIFLE_CALIBERS];
 export const BULLET_JACKET_METAL_OPTIONS = ['Cu', 'Brass', 'Ni-plated', 'Al', 'Steel', 'None'] as const;
-export const BULLET_CORE_METAL_OPTIONS = ['Pb', 'Steel'] as const;
+export const BULLET_CORE_METAL_OPTIONS = ['Pb', 'Steel', 'Solid Cu', 'Frangible'] as const;
 export const BULLET_TYPE_OPTIONS = ['FMJ', 'TMJ', 'HP', 'WC'] as const;
 export const BULLET_BARREL_TYPE_OPTIONS = ['Conventional', 'Polygonal'] as const;
-export const CARTRIDGE_METAL_OPTIONS = ['Brass', 'Ni-plated', 'Al', 'Steel'] as const;
+export const CARTRIDGE_METAL_OPTIONS = ['Brass', 'Ni-plated', 'Al', 'Steel', 'Bi-metal'] as const;
 export const CARTRIDGE_PRIMER_TYPE_OPTIONS = ['CF', 'RF'] as const;
 export const CARTRIDGE_FPI_SHAPE_OPTIONS = ['Circular', 'Elliptical', 'Rectangular/Square', 'Tear-drop'] as const;
 export const CARTRIDGE_APERTURE_SHAPE_OPTIONS = ['Circular', 'Rectangular'] as const;