feat: refresh results cache after changing config

scanoss · Feb 18, 2025 · 57842a2 · 57842a2
1 parent 9de6921
commit 57842a2
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 16 deletions.
diff --git a/backend/repository/result_repository_json_impl.go b/backend/repository/result_repository_json_impl.go
@@ -70,11 +70,22 @@ func NewResultRepositoryJsonImpl(fr utils.FileReader) *ResultRepositoryJsonImpl
 		log.Error().Err(err).Msg("Error loading initial cache")
 	}
 
+	config.GetInstance().RegisterListener(repo.onConfigChange)
+
 	go repo.watchForChanges()
 
 	return repo
 }
 
+func (r *ResultRepositoryJsonImpl) onConfigChange(newCfg *config.Config) {
+	r.mutex.Lock()
+	defer r.mutex.Unlock()
+
+	if err := r.refreshCache(); err != nil {
+		log.Error().Err(err).Msg("Error refreshing results cache after config change")
+	}
+}
+
 func (r *ResultRepositoryJsonImpl) watchForChanges() {
 	for {
 		select {

diff --git a/frontend/src/components/CodeViewer.tsx b/frontend/src/components/CodeViewer.tsx
@@ -138,11 +138,8 @@ export default function CodeViewer({
 
   useEffect(() => {
     updateContent();
-  }, [content]);
-
-  useEffect(() => {
     updateHighlight();
-  }, []);
+  }, [content]);
 
   if (isError) {
     return (

diff --git a/frontend/src/components/ScanDialog.tsx b/frontend/src/components/ScanDialog.tsx
@@ -29,6 +29,7 @@ import { Button } from '@/components/ui/button';
 import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog';
 import { Input } from '@/components/ui/input';
 import { Label } from '@/components/ui/label';
+import { useResults } from '@/hooks/useResults';
 import { withErrorHandling } from '@/lib/errors';
 import useResultsStore from '@/modules/results/stores/useResultsStore';
 import useConfigStore from '@/stores/useConfigStore';
@@ -67,7 +68,7 @@ export default function ScanDialog({ onOpenChange }: ScanDialogProps) {
   const [advancedScanArgs, setAdvancedScanArgs] = useState<string[]>([]);
   const [options, setOptions] = useState<Record<string, string | number | boolean | string[]>>({});
 
-  const fetchResults = useResultsStore((state) => state.fetchResults);
+  const { reset: resetResults } = useResults();
   const setSelectedResults = useResultsStore((state) => state.setSelectedResults);
 
   const handleSelectDirectory = withErrorHandling({
@@ -116,7 +117,7 @@ export default function ScanDialog({ onOpenChange }: ScanDialogProps) {
       await ScanStream(cmdArgs);
       await setScanRoot(directory);
       setSelectedResults([]);
-      await fetchResults();
+      resetResults();
     },
     onError: () => {
       toast({

diff --git a/frontend/src/components/SelectResultsFile.tsx b/frontend/src/components/SelectResultsFile.tsx
@@ -23,28 +23,28 @@
 
 import { File } from 'lucide-react';
 
+import { useResults } from '@/hooks/useResults';
 import { withErrorHandling } from '@/lib/errors';
 import { truncatePath } from '@/lib/utils';
-import useResultsStore from '@/modules/results/stores/useResultsStore';
 import useConfigStore from '@/stores/useConfigStore';
 
 import { SelectFile } from '../../wailsjs/go/main/App';
 import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip';
 import { toast } from './ui/use-toast';
 
 export default function SelectResultsFile() {
-  const fetchResults = useResultsStore((state) => state.fetchResults);
-
   const scanRoot = useConfigStore((state) => state.scanRoot);
   const resultsFile = useConfigStore((state) => state.resultsFile);
   const setResultsFile = useConfigStore((state) => state.setResultsFile);
 
+  const { reset: resetResults } = useResults();
+
   const handleSelectResultsFile = withErrorHandling({
     asyncFn: async () => {
       const file = await SelectFile(scanRoot ?? '.');
       if (file) {
         await setResultsFile(file);
-        await fetchResults();
+        resetResults();
       }
     },
     onError: () => {

diff --git a/frontend/src/components/SelectScanRoot.tsx b/frontend/src/components/SelectScanRoot.tsx
@@ -24,10 +24,10 @@
 import { useQueryClient } from '@tanstack/react-query';
 import { Folder } from 'lucide-react';
 
+import { useResults } from '@/hooks/useResults';
 import useSelectedResult from '@/hooks/useSelectedResult';
 import { withErrorHandling } from '@/lib/errors';
 import { truncatePath } from '@/lib/utils';
-import useResultsStore from '@/modules/results/stores/useResultsStore';
 import useConfigStore from '@/stores/useConfigStore';
 
 import { SelectDirectory } from '../../wailsjs/go/main/App';
@@ -42,14 +42,14 @@ export default function SelectScanRoot() {
   const scanRoot = useConfigStore((state) => state.scanRoot);
   const setScanRoot = useConfigStore((state) => state.setScanRoot);
 
-  const fetchResults = useResultsStore((state) => state.fetchResults);
+  const { reset: resetResults } = useResults();
 
   const handleSelectScanRoot = withErrorHandling({
     asyncFn: async () => {
       const selectedDir = await SelectDirectory();
       if (selectedDir) {
         await setScanRoot(selectedDir);
-        await fetchResults();
+        resetResults();
         await queryClient.invalidateQueries({
           queryKey: ['localFileContent', selectedResult?.path],
         });

diff --git a/frontend/src/components/SelectSettingsFile.tsx b/frontend/src/components/SelectSettingsFile.tsx
@@ -23,17 +23,17 @@
 
 import { File } from 'lucide-react';
 
+import { useResults } from '@/hooks/useResults';
 import { withErrorHandling } from '@/lib/errors';
 import { truncatePath } from '@/lib/utils';
-import useResultsStore from '@/modules/results/stores/useResultsStore';
 import useConfigStore from '@/stores/useConfigStore';
 
 import { SelectFile } from '../../wailsjs/go/main/App';
 import { Tooltip, TooltipContent, TooltipTrigger } from './ui/tooltip';
 import { toast } from './ui/use-toast';
 
 export default function SelectSettingsFile() {
-  const fetchResults = useResultsStore((state) => state.fetchResults);
+  const { reset: resetResults } = useResults();
 
   const scanRoot = useConfigStore((state) => state.scanRoot);
   const settingsFile = useConfigStore((state) => state.settingsFile);
@@ -44,7 +44,7 @@ export default function SelectSettingsFile() {
       const file = await SelectFile(scanRoot ?? '.');
       if (file) {
         await setSettingsFile(file);
-        await fetchResults();
+        resetResults();
       }
     },
     onError: () => {

diff --git a/frontend/src/hooks/useResults.tsx b/frontend/src/hooks/useResults.tsx
@@ -10,6 +10,7 @@ export const useResults = () => {
   const query = useResultsStore((state) => state.query);
   const sort = useResultsStore((state) => state.sort);
   const fetchResults = useResultsStore((state) => state.fetchResults);
+
   const setQuery = useResultsStore((state) => state.setQuery);
 
   const debouncedQuery = useDebounce<string>(query, DEBOUNCE_QUERY_MS);