Merge remote-tracking branch 'origin/project-labels' into project-labels

tnc-ca-geo · Jan 23, 2024 · 9b4ae82 · 9b4ae82
2 parents db0bb1b + 1cb8b8c
commit 9b4ae82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/features/loupe/BoundingBoxLabel.jsx b/src/features/loupe/BoundingBoxLabel.jsx
@@ -144,7 +144,7 @@ const BoundingBoxLabel = forwardRef(({
           handleCategorySelectorBlur={handleCategorySelectorBlur}
           menuPlacement='bottom'
         />
-        <LabelDisplay css={{ display: catSelectorOpen ? 'none' : 'block', color: displayLabel && getTextColor(displayLabel.color) }}>
+        <LabelDisplay css={{ display: catSelectorOpen ? 'none' : 'block', color: getTextColor(displayLabel.color) }}>
           <Category>{displayLabel?.name || "ERROR FINDING LABEL"}</Category>
           {!object.locked && <Confidence>{conf}%</Confidence>}
         </LabelDisplay>

diff --git a/src/features/projects/ProjectAndViewNav.jsx b/src/features/projects/ProjectAndViewNav.jsx
@@ -17,6 +17,7 @@ import {
   selectRouterLocation,
   fetchImageContext,
   preFocusImageStart,
+  clearImages,
 } from '../images/imagesSlice.js';
 import {
   NavigationMenu,
@@ -207,6 +208,7 @@ const ProjectAndViewNav = () => {
     if (projId === selectedProj._id) return;
     const project = projects.find((p) => p._id === projId);
     const viewId = project.views.find((v) => v.name === 'All images')._id;
+    dispatch(clearImages());
     dispatch(push(`/app/${projId}/${viewId}`));
   };