Wire up unlock menu item

tnc-ca-geo · Dec 8, 2023 · cc8cf69 · cc8cf69
1 parent fcf94bb
commit cc8cf69
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 9 deletions.
diff --git a/src/features/images/ImagesTable.jsx b/src/features/images/ImagesTable.jsx
@@ -29,6 +29,7 @@ import {
   setFocus,
   labelsAdded,
   labelsValidated,
+  objectsManuallyUnlocked,
   selectFocusIndex,
   selectFocusChangeType
 } from '../review/reviewSlice';
@@ -457,6 +458,25 @@ const ImagesTable = ({ workingImages, hasNext, loadNextPage }) => {
           dispatch(addLabelStart('from-image-table'));
         };
 
+        // unlock all labels
+        const handleUnlockMenuItemClick = (e) => {
+          e.stopPropagation();
+          let objects = [];
+          for (const image of selectedImages) {
+            const objectsToUnlock = image.objects
+              .filter((obj) => (
+                obj.locked && obj.labels.some((lbl) => (
+                  lbl.validation === null || lbl.validation.validated
+                ))
+              ))
+              .map((obj) => ({ imgId: image._id, objId: obj._id }));
+
+            objects = objects.concat(objectsToUnlock);
+          }
+          dispatch(objectsManuallyUnlocked({ objects }));
+        };
+
+
         // TODO: double check that all the "disabled" conditions are consistent 
         // across bounding-box context menu items, ImageReviewToolbar, and the
         // context menu items here
@@ -533,6 +553,15 @@ const ImagesTable = ({ workingImages, hasNext, loadNextPage }) => {
                     Edit all labels
                   </ContextMenuItem>)
               }
+              <ContextMenuItem
+                onSelect={handleUnlockMenuItemClick}
+                disabled={isAddingLabel}
+              >
+                <ContextMenuItemIconLeft>
+                  <LockOpen1Icon />
+                </ContextMenuItemIconLeft>
+                Unlock
+              </ContextMenuItem>
             </ContextMenuContent>
           </ContextMenu>
         );

diff --git a/src/features/loupe/BoundingBox.jsx b/src/features/loupe/BoundingBox.jsx
@@ -255,7 +255,7 @@ const BoundingBox = ({
 
   const handleUnlockMenuItemClick = (e) => {
     e.stopPropagation();
-    dispatch(objectsManuallyUnlocked({ imgId, objIds: [object._id] }));
+    dispatch(objectsManuallyUnlocked({ objects: [{ imgId, objId: object._id }] }));
   };
 
   return (

diff --git a/src/features/loupe/Loupe.jsx b/src/features/loupe/Loupe.jsx
@@ -229,14 +229,14 @@ const Loupe = () => {
   const handleCloseLoupe = () => dispatch(toggleOpenLoupe(false));
 
   const handleUnlockAllButtonClick = () => {
-    const objIds = currImgObjects
+    const objects = currImgObjects
       .filter((obj) => (
         obj.locked && obj.labels.some((lbl) => (
           lbl.validation === null || lbl.validation.validated
         ))
       ))
-      .map((obj) => obj._id);
-    dispatch(objectsManuallyUnlocked({ imgId: image._id, objIds }));
+      .map((obj) => ({ imgId: image._id, objId: obj._id }));
+    dispatch(objectsManuallyUnlocked({ objects }));
   };
 
   const handleIncrementClick = (delta) => {

diff --git a/src/features/loupe/ValidationButtons.jsx b/src/features/loupe/ValidationButtons.jsx
@@ -33,7 +33,7 @@ const ValidationButtons = ({
 
   const handleLockButtonClick = (e) => {
     e.stopPropagation();
-    dispatch(objectsManuallyUnlocked({ imgId, objIds: [object._id] }));
+    dispatch(objectsManuallyUnlocked({ objects: [{ imgId, objId: object._id }] }));
   };
 
   const handleValidationButtonClick = (e, validated) => {

diff --git a/src/features/review/objectMiddleware.js b/src/features/review/objectMiddleware.js
@@ -55,8 +55,12 @@ export const objectMiddleware = store => next => action => {
 
   else if (objectsManuallyUnlocked.match(action)) {
     next(action);
-    const { imgId, objIds } = action.payload;
-    const objects = objIds.map((objId) => ({ imgId, objId, locked: false }));
+    console.log('objectMiddleware - objectsManuallyUnlocked: ', action.payload)
+    // const { imgId, objIds } = action.payload;
+    // const objects = objIds.map((objId) => ({ imgId, objId, locked: false }));
+    const objects = action.payload.objects.map(({ imgId, objId }) => ({
+      imgId, objId, locked: false
+    }));
     store.dispatch(objectsLocked({ objects }));
   }
 

diff --git a/src/features/review/undoMiddleware.js b/src/features/review/undoMiddleware.js
@@ -74,8 +74,7 @@ export const undoMiddleware = createUndoMiddleware({
     [objectsManuallyUnlocked.toString()]: {
       action: (action) => {
         console.log("reverting objectsManuallyUnlocked with action: ", action);
-        const { imgId, objIds } = action.payload;
-        const objects = objIds.map((objId) => ({ imgId, objId, locked: true }));
+        const objects = action.payload.objects.map(({ imgId, objId }) => ({ imgId, objId, locked: true }));
         return objectsLocked({ objects });
       },
     },