fix navigation between settings and setup

sumn2u · Jul 9, 2024 · c641b7d · c641b7d
1 parent 0094579
commit c641b7d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/client/src/Annotation/index.jsx b/client/src/Annotation/index.jsx
@@ -230,8 +230,12 @@ export default () => {
      } 
   }
 
-  const showAnnotationLab = () => {
-    preloadConfiguration();
+  const showAnnotationLab = (newSettings) => {
+    setSettings(newSettings);
+    const lastSavedImageIndex = newSettings.lastSavedImageIndex || 0;
+    if (newSettings.images.length > 0) {
+        fetchImages(newSettings.images, lastSavedImageIndex);
+      }
   }
   useEffect(() => {
     preloadConfiguration();

diff --git a/client/src/SetupPage/index.jsx b/client/src/SetupPage/index.jsx
@@ -116,7 +116,7 @@ export const SetupPage = ({setConfiguration, settings, setShowLabel, showAnnotat
     if(hasLabels) {
       const newSettings = {...settings, showLab: true}
       settingsConfig.changeSetting('settings',newSettings);
-      showAnnotationLab()
+      showAnnotationLab(newSettings)
     }
   }, [setShowLabel]);
 
@@ -133,7 +133,7 @@ export const SetupPage = ({setConfiguration, settings, setShowLabel, showAnnotat
     if(hasLabels) {
       const newSettings = {...settings, showLab: true}
       settingsConfig.changeSetting('settings',newSettings);
-      showAnnotationLab()
+      showAnnotationLab(newSettings)
     }
   }