Merge branch 'main' into bug/v2/improved-cache-busting

build.gradle

@@ -59,7 +59,7 @@ repositories {
 
 allprojects {
     group = 'stirling.software'
-    version = '2.1.3'
+    version = '2.1.2'
 
     configurations.configureEach {
         exclude group: 'commons-logging', module: 'commons-logging'

frontend/package-lock.json

@@ -105,7 +105,6 @@
         "typescript": "^5.9.2",
         "typescript-eslint": "^8.44.1",
         "vite": "^7.1.7",
-        "vite-plugin-static-copy": "^3.1.4",
         "vite-tsconfig-paths": "^5.1.4",
         "vitest": "^3.2.4"
       }
@@ -11094,19 +11093,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-map": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz",
-      "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/pac-proxy-agent": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",
@@ -14517,25 +14503,6 @@
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/vite-plugin-static-copy": {
-      "version": "3.1.4",
-      "resolved": "https://registry.npmjs.org/vite-plugin-static-copy/-/vite-plugin-static-copy-3.1.4.tgz",
-      "integrity": "sha512-iCmr4GSw4eSnaB+G8zc2f4dxSuDjbkjwpuBLLGvQYR9IW7rnDzftnUjOH5p4RYR+d4GsiBqXRvzuFhs5bnzVyw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "chokidar": "^3.6.0",
-        "p-map": "^7.0.3",
-        "picocolors": "^1.1.1",
-        "tinyglobby": "^0.2.15"
-      },
-      "engines": {
-        "node": "^18.0.0 || >=20.0.0"
-      },
-      "peerDependencies": {
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
-      }
-    },
     "node_modules/vite-tsconfig-paths": {
       "version": "5.1.4",
       "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-5.1.4.tgz",

frontend/package.json

@@ -152,7 +152,6 @@
     "typescript": "^5.9.2",
     "typescript-eslint": "^8.44.1",
     "vite": "^7.1.7",
-    "vite-plugin-static-copy": "^3.1.4",
     "vite-tsconfig-paths": "^5.1.4",
     "vitest": "^3.2.4"
   },

frontend/src/core/components/viewer/CustomSearchLayer.tsx

@@ -44,10 +44,8 @@ export function CustomSearchLayer({
     }
 
     const unsubscribe = searchProvides.onSearchResultStateChange?.((state: SearchResultState) => {
-      if (!state) return;
-
       // Auto-scroll to active search result
-      if (state.results && state.activeResultIndex !== undefined && state.activeResultIndex >= 0) {
+      if (state?.results && state.activeResultIndex !== undefined && state.activeResultIndex >= 0) {
         const activeResult = state.results[state.activeResultIndex];
         if (activeResult) {
           const pageNumber = activeResult.pageIndex + 1; // Convert to 1-based page number

frontend/src/core/components/viewer/EmbedPdfViewer.tsx

@@ -43,8 +43,6 @@ const EmbedPdfViewerContent = ({
     isThumbnailSidebarVisible,
     toggleThumbnailSidebar,
     isBookmarkSidebarVisible,
-    isSearchInterfaceVisible,
-    searchInterfaceActions,
     zoomActions,
     panActions: _panActions,
     rotationActions: _rotationActions,
@@ -186,7 +184,7 @@ const EmbedPdfViewerContent = ({
     onZoomOut: zoomActions.zoomOut,
   });
 
-  // Handle keyboard shortcuts (zoom and search)
+  // Handle keyboard zoom shortcuts
   useEffect(() => {
     const handleKeyDown = (event: KeyboardEvent) => {
       if (!isViewerHovered) return;
@@ -201,16 +199,6 @@ const EmbedPdfViewerContent = ({
           // Ctrl+- for zoom out
           event.preventDefault();
           zoomActions.zoomOut();
-        } else if (event.key === 'f' || event.key === 'F') {
-          // Ctrl+F for search
-          event.preventDefault();
-          if (isSearchInterfaceVisible) {
-            // If already open, trigger refocus event
-            window.dispatchEvent(new CustomEvent('refocus-search-input'));
-          } else {
-            // Open search interface
-            searchInterfaceActions.open();
-          }
         }
       }
     };
@@ -219,7 +207,7 @@ const EmbedPdfViewerContent = ({
     return () => {
       document.removeEventListener('keydown', handleKeyDown);
     };
-  }, [isViewerHovered, isSearchInterfaceVisible, zoomActions, searchInterfaceActions]);
+  }, [isViewerHovered]);
 
   // Register checker for unsaved changes (annotations only for now)
   useEffect(() => {

frontend/src/core/components/viewer/LocalEmbedPDF.tsx

@@ -46,7 +46,6 @@ import { PrintAPIBridge } from '@app/components/viewer/PrintAPIBridge';
 import { isPdfFile } from '@app/utils/fileUtils';
 import { useTranslation } from 'react-i18next';
 import { LinkLayer } from '@app/components/viewer/LinkLayer';
-import { absoluteWithBasePath } from '@app/constants/app';
 
 interface LocalEmbedPDFProps {
   file?: File | Blob;
@@ -168,10 +167,8 @@ export function LocalEmbedPDF({ file, url, enableAnnotations = false, onSignatur
     ];
   }, [pdfUrl]);
 
-  // Initialize the engine with the React hook - use local WASM for offline support
-  const { engine, isLoading, error } = usePdfiumEngine({
-    wasmUrl: absoluteWithBasePath('/pdfium/pdfium.wasm'),
-  });
+  // Initialize the engine with the React hook
+  const { engine, isLoading, error } = usePdfiumEngine();
 
 
   // Early return if no file or URL provided

frontend/src/core/components/viewer/SearchAPIBridge.tsx

@@ -28,13 +28,11 @@ export function SearchAPIBridge() {
     if (!search) return;
 
     const unsubscribe = search.onSearchResultStateChange?.((state: any) => {
-      if (!state) return;
-
       const newState = {
-        results: state.results || null,
-        activeIndex: (state.activeResultIndex || 0) + 1 // Convert to 1-based index
+        results: state?.results || null,
+        activeIndex: (state?.activeResultIndex || 0) + 1 // Convert to 1-based index
       };
-
+      
       setLocalState(prevState => {
         // Only update if state actually changed
         if (prevState.results !== newState.results || prevState.activeIndex !== newState.activeIndex) {
@@ -54,42 +52,16 @@ export function SearchAPIBridge() {
         state: localState,
         api: {
           search: async (query: string) => {
-            if (search?.startSearch && search?.searchAllPages) {
-              search.startSearch();
-              return search.searchAllPages(query);
-            }
+            search.startSearch();
+            return search.searchAllPages(query);
           },
           clear: () => {
-            try {
-              if (search?.stopSearch) {
-                search.stopSearch();
-              }
-            } catch (error) {
-              console.warn('Error stopping search:', error);
-            }
+            search.stopSearch();
             setLocalState({ results: null, activeIndex: 0 });
           },
-          next: () => {
-            try {
-              search?.nextResult?.();
-            } catch (error) {
-              console.warn('Error navigating to next result:', error);
-            }
-          },
-          previous: () => {
-            try {
-              search?.previousResult?.();
-            } catch (error) {
-              console.warn('Error navigating to previous result:', error);
-            }
-          },
-          goToResult: (index: number) => {
-            try {
-              search?.goToResult?.(index);
-            } catch (error) {
-              console.warn('Error going to result:', error);
-            }
-          },
+          next: () => search.nextResult(),
+          previous: () => search.previousResult(),
+          goToResult: (index: number) => search.goToResult(index),
         }
       });
     }

frontend/src/core/components/viewer/SearchInterface.tsx

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Box, TextInput, ActionIcon, Text, Group } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { LocalIcon } from '@app/components/shared/LocalIcon';
@@ -12,9 +12,7 @@ interface SearchInterfaceProps {
 export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
   const { t } = useTranslation();
   const viewerContext = React.useContext(ViewerContext);
-  const inputRef = useRef<HTMLInputElement>(null);
-  const searchTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-
+  
   const searchState = viewerContext?.getSearchState();
   const searchResults = searchState?.results;
   const searchActiveIndex = searchState?.activeIndex;
@@ -28,61 +26,6 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
   } | null>(null);
   const [isSearching, setIsSearching] = useState(false);
 
-  // Auto-focus search input when visible
-  useEffect(() => {
-    if (visible) {
-      inputRef.current?.focus();
-    }
-  }, [visible]);
-
-  // Listen for refocus event (when Ctrl+F pressed while already open)
-  useEffect(() => {
-    const handleRefocus = () => {
-      inputRef.current?.focus();
-      inputRef.current?.select();
-    };
-
-    window.addEventListener('refocus-search-input', handleRefocus);
-    return () => {
-      window.removeEventListener('refocus-search-input', handleRefocus);
-    };
-  }, []);
-
-  // Auto-search as user types (debounced)
-  useEffect(() => {
-    // Clear existing timeout
-    if (searchTimeoutRef.current) {
-      clearTimeout(searchTimeoutRef.current);
-    }
-
-    // If query is empty, clear search immediately
-    if (!searchQuery.trim()) {
-      searchActions?.clear();
-      setResultInfo(null);
-      return;
-    }
-
-    // Debounce search by 300ms
-    searchTimeoutRef.current = setTimeout(async () => {
-      if (searchQuery.trim() && searchActions) {
-        setIsSearching(true);
-        try {
-          await searchActions.search(searchQuery.trim());
-        } catch (error) {
-          console.error('Search failed:', error);
-        } finally {
-          setIsSearching(false);
-        }
-      }
-    }, 300);
-
-    return () => {
-      if (searchTimeoutRef.current) {
-        clearTimeout(searchTimeoutRef.current);
-      }
-    };
-  }, [searchQuery, searchActions]);
-
   // Monitor search state changes
   useEffect(() => {
     if (!visible) return;
@@ -116,21 +59,30 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
     return () => clearInterval(interval);
   }, [visible, searchResults, searchActiveIndex, searchQuery]);
 
+  const handleSearch = async (query: string) => {
+    if (!query.trim()) {
+      // If query is empty, clear the search
+      handleClearSearch();
+      return;
+    }
+
+    if (query.trim() && searchActions) {
+      setIsSearching(true);
+      try {
+        await searchActions.search(query.trim());
+      } catch (error) {
+        console.error('Search failed:', error);
+      } finally {
+        setIsSearching(false);
+      }
+    }
+  };
+
   const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
     if (event.key === 'Enter') {
-      // Navigate to next result on Enter
-      event.preventDefault();
-      handleNext();
+      handleSearch(searchQuery);
     } else if (event.key === 'Escape') {
       onClose();
-    } else if (event.key === 'ArrowDown') {
-      // Navigate to next result
-      event.preventDefault();
-      handleNext();
-    } else if (event.key === 'ArrowUp') {
-      // Navigate to previous result
-      event.preventDefault();
-      handlePrevious();
     }
   };
 
@@ -151,17 +103,17 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
   // No longer need to sync with external API on mount - removed
 
   const handleJumpToResult = (index: number) => {
+    // Use context actions instead of window API - functionality simplified for now
     if (resultInfo && index >= 1 && index <= resultInfo.totalResults) {
-      // Convert to 0-based index for the API
-      searchActions?.goToResult?.(index - 1);
+      // Note: goToResult functionality would need to be implemented in SearchAPIBridge
+      console.log('Jump to result:', index);
     }
   };
 
   const handleJumpToSubmit = () => {
-    const index = parseInt(jumpToValue, 10);
-    if (!isNaN(index) && resultInfo && index >= 1 && index <= resultInfo.totalResults) {
+    const index = parseInt(jumpToValue);
+    if (index && resultInfo && index >= 1 && index <= resultInfo.totalResults) {
       handleJumpToResult(index);
-      setJumpToValue(''); // Clear the input after jumping
     }
   };
 
@@ -171,14 +123,7 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
     }
   };
 
-  const handleInputBlur = () => {
-    // Close popover on blur if no text is entered
-    if (!searchQuery.trim()) {
-      onClose();
-    }
-  };
-
-  const handleCloseClick = () => {
+  const _handleClose = () => {
     handleClearSearch();
     onClose();
   };
@@ -190,99 +135,100 @@ export function SearchInterface({ visible, onClose }: SearchInterfaceProps) {
         padding: '0px'
       }}
     >
-      {/* Header with close button */}
-      <Group mb="md" justify="space-between">
+      {/* Header */}
+      <Group mb="md">
         <Text size="sm" fw={600}>
           {t('search.title', 'Search PDF')}
         </Text>
-        <ActionIcon
-          variant="subtle"
-          size="sm"
-          onClick={handleCloseClick}
-          aria-label="Close search"
-        >
-          <LocalIcon icon="close" width="1rem" height="1rem" />
-        </ActionIcon>
       </Group>
 
       {/* Search input */}
       <Group mb="md">
         <TextInput
-          ref={inputRef}
           placeholder={t('search.placeholder', 'Enter search term...')}
           value={searchQuery}
           onChange={(e) => {
             const newValue = e.currentTarget.value;
             setSearchQuery(newValue);
+            // If user clears the input, clear the search highlights
+            if (!newValue.trim()) {
+              handleClearSearch();
+            }
           }}
           onKeyDown={handleKeyDown}
-          onBlur={handleInputBlur}
           style={{ flex: 1 }}
           rightSection={
-            searchQuery.trim() && (
-              <ActionIcon
-                variant="subtle"
-                onClick={handleClearSearch}
-                aria-label="Clear search"
-              >
-                <LocalIcon icon="close" width="0.875rem" height="0.875rem" />
-              </ActionIcon>
-            )
+            <ActionIcon
+              variant="subtle"
+              onClick={() => handleSearch(searchQuery)}
+              disabled={!searchQuery.trim() || isSearching}
+              loading={isSearching}
+            >
+              <LocalIcon icon="search" width="1rem" height="1rem" />
+            </ActionIcon>
           }
         />
       </Group>
 
-      {/* Results info and navigation - always show */}
-      <Group justify="space-between" align="center">
-        <Group gap="xs" align="center">
-          <TextInput
-            size="xs"
-            value={jumpToValue}
-            onChange={(e) => {
-              const newValue = e.currentTarget.value;
-              setJumpToValue(newValue);
-
-              // Jump immediately as user types
-              const index = parseInt(newValue, 10);
-              if (resultInfo && !isNaN(index) && index >= 1 && index <= resultInfo.totalResults) {
-                handleJumpToResult(index);
-              }
-            }}
-            onKeyDown={handleJumpToKeyDown}
-            onBlur={() => setJumpToValue('')} // Clear on blur instead of submit
-            placeholder={(resultInfo?.currentIndex || 0).toString()}
-            style={{ width: '3rem' }}
-            type="number"
-            min="1"
-            max={resultInfo?.totalResults || 0}
-            disabled={!resultInfo || resultInfo.totalResults === 0}
-          />
-          <Text size="sm" c="dimmed">
-            of {resultInfo?.totalResults || 0}
-          </Text>
+      {/* Results info and navigation */}
+      {resultInfo && (
+        <Group justify="space-between" align="center">
+          {resultInfo.totalResults === 0 ? (
+            <Text size="sm" c="dimmed">
+              {t('search.noResults', 'No results found')}
+            </Text>
+          ) : (
+            <Group gap="xs" align="center">
+              <TextInput
+                size="xs"
+                value={jumpToValue}
+                onChange={(e) => setJumpToValue(e.currentTarget.value)}
+                onKeyDown={handleJumpToKeyDown}
+                onBlur={handleJumpToSubmit}
+                placeholder={resultInfo.currentIndex.toString()}
+                style={{ width: '3rem' }}
+                type="number"
+                min="1"
+                max={resultInfo.totalResults}
+              />
+              <Text size="sm" c="dimmed">
+                of {resultInfo.totalResults}
+              </Text>
+            </Group>
+          )}
+          
+          {resultInfo.totalResults > 0 && (
+            <Group gap="xs">
+              <ActionIcon
+                variant="subtle"
+                size="sm"
+                onClick={handlePrevious}
+                disabled={resultInfo.currentIndex <= 1}
+                aria-label="Previous result"
+              >
+                <LocalIcon icon="keyboard-arrow-up" width="1rem" height="1rem" />
+              </ActionIcon>
+              <ActionIcon
+                variant="subtle"
+                size="sm"
+                onClick={handleNext}
+                disabled={resultInfo.currentIndex >= resultInfo.totalResults}
+                aria-label="Next result"
+              >
+                <LocalIcon icon="keyboard-arrow-down" width="1rem" height="1rem" />
+              </ActionIcon>
+              <ActionIcon
+                variant="subtle"
+                size="sm"
+                onClick={handleClearSearch}
+                aria-label="Clear search"
+              >
+                <LocalIcon icon="close" width="1rem" height="1rem" />
+              </ActionIcon>
+            </Group>
+          )}
         </Group>
-
-        <Group gap="xs">
-          <ActionIcon
-            variant="subtle"
-            size="sm"
-            onClick={handlePrevious}
-            disabled={!resultInfo || resultInfo.currentIndex <= 1}
-            aria-label="Previous result"
-          >
-            <LocalIcon icon="keyboard-arrow-up" width="1rem" height="1rem" />
-          </ActionIcon>
-          <ActionIcon
-            variant="subtle"
-            size="sm"
-            onClick={handleNext}
-            disabled={!resultInfo || resultInfo.currentIndex >= resultInfo.totalResults}
-            aria-label="Next result"
-          >
-            <LocalIcon icon="keyboard-arrow-down" width="1rem" height="1rem" />
-          </ActionIcon>
-        </Group>
-      </Group>
+      )}
 
       {/* Loading state */}
       {isSearching && (

frontend/src/core/components/viewer/useViewerRightRailButtons.tsx

@@ -36,14 +36,7 @@ export function useViewerRightRailButtons() {
         order: 10,
         render: ({ disabled }) => (
           <Tooltip content={searchLabel} position={tooltipPosition} offset={12} arrow portalTarget={document.body}>
-            <Popover
-              position={tooltipPosition}
-              withArrow
-              shadow="md"
-              offset={8}
-              opened={viewer.isSearchInterfaceVisible}
-              onClose={viewer.searchInterfaceActions.close}
-            >
+            <Popover position={tooltipPosition} withArrow shadow="md" offset={8}>
               <Popover.Target>
                 <div style={{ display: 'inline-flex' }}>
                   <ActionIcon
@@ -52,7 +45,6 @@ export function useViewerRightRailButtons() {
                     className="right-rail-icon"
                     disabled={disabled}
                     aria-label={searchLabel}
-                    onClick={viewer.searchInterfaceActions.toggle}
                   >
                     <LocalIcon icon="search" width="1.5rem" height="1.5rem" />
                   </ActionIcon>
@@ -60,7 +52,7 @@ export function useViewerRightRailButtons() {
               </Popover.Target>
               <Popover.Dropdown>
                 <div style={{ minWidth: '20rem' }}>
-                  <SearchInterface visible={viewer.isSearchInterfaceVisible} onClose={viewer.searchInterfaceActions.close} />
+                  <SearchInterface visible={true} onClose={() => {}} />
                 </div>
               </Popover.Dropdown>
             </Popover>

frontend/src/core/contexts/ViewerContext.tsx

@@ -80,14 +80,6 @@ interface ViewerContextType {
   isBookmarkSidebarVisible: boolean;
   toggleBookmarkSidebar: () => void;
 
-  // Search interface visibility
-  isSearchInterfaceVisible: boolean;
-  searchInterfaceActions: {
-    open: () => void;
-    close: () => void;
-    toggle: () => void;
-  };
-
   // Annotation visibility toggle
   isAnnotationsVisible: boolean;
   toggleAnnotationsVisibility: () => void;
@@ -153,7 +145,6 @@ export const ViewerProvider: React.FC<ViewerProviderProps> = ({ children }) => {
   // UI state - only state directly managed by this context
   const [isThumbnailSidebarVisible, setIsThumbnailSidebarVisible] = useState(false);
   const [isBookmarkSidebarVisible, setIsBookmarkSidebarVisible] = useState(false);
-  const [isSearchInterfaceVisible, setSearchInterfaceVisible] = useState(false);
   const [isAnnotationsVisible, setIsAnnotationsVisible] = useState(true);
   const [isAnnotationMode, setIsAnnotationModeState] = useState(false);
   const [activeFileIndex, setActiveFileIndex] = useState(0);
@@ -216,12 +207,6 @@ export const ViewerProvider: React.FC<ViewerProviderProps> = ({ children }) => {
     setIsBookmarkSidebarVisible(prev => !prev);
   };
 
-  const searchInterfaceActions = {
-    open: () => setSearchInterfaceVisible(true),
-    close: () => setSearchInterfaceVisible(false),
-    toggle: () => setSearchInterfaceVisible(prev => !prev),
-  };
-
   const toggleAnnotationsVisibility = () => {
     setIsAnnotationsVisible(prev => !prev);
   };
@@ -309,10 +294,6 @@ export const ViewerProvider: React.FC<ViewerProviderProps> = ({ children }) => {
     isBookmarkSidebarVisible,
     toggleBookmarkSidebar,
 
-    // Search interface
-    isSearchInterfaceVisible,
-    searchInterfaceActions,
-
     // Annotation controls
     isAnnotationsVisible,
     toggleAnnotationsVisibility,

frontend/src/core/contexts/viewer/viewerActions.ts

@@ -52,7 +52,6 @@ export interface SearchActions {
   next: () => void;
   previous: () => void;
   clear: () => void;
-  goToResult: (index: number) => void;
 }
 
 export interface ExportActions {
@@ -288,12 +287,6 @@ export function createViewerActions({
         api.clear();
       }
     },
-    goToResult: (index: number) => {
-      const api = registry.current.search?.api;
-      if (api?.goToResult) {
-        api.goToResult(index);
-      }
-    },
   };
 
   const exportActions: ExportActions = {

frontend/vite.config.ts

@@ -1,7 +1,6 @@
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react-swc';
 import tsconfigPaths from 'vite-tsconfig-paths';
-import { viteStaticCopy } from 'vite-plugin-static-copy';
 
 export default defineConfig(({ mode }) => {
   // When DISABLE_ADDITIONAL_FEATURES is false (or unset), enable proprietary features
@@ -21,15 +20,6 @@ export default defineConfig(({ mode }) => {
       tsconfigPaths({
         projects: [tsconfigProject],
       }),
-      viteStaticCopy({
-        targets: [
-          {
-            //provides static pdfium so embedpdf can run without cdn
-            src: 'node_modules/@embedpdf/pdfium/dist/pdfium.wasm',
-            dest: 'pdfium'
-          }
-        ]
-      })
     ],
     server: {
       host: true,