review comments

tnc-ca-geo · Nov 6, 2024 · e667c90 · e667c90
1 parent 13a1066
commit e667c90
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 20 deletions.
diff --git a/src/components/ErrorToast.jsx b/src/components/ErrorToast.jsx
@@ -42,6 +42,8 @@ import {
   dismissDeploymentsError,
   selectCameraSerialNumberErrors,
   dismissCameraSerialNumberError,
+  selectDeleteImagesErrors,
+  dismissDeleteImagesError,
 } from '../features/tasks/tasksSlice';
 import {
   selectRedriveBatchErrors,
@@ -74,6 +76,7 @@ const ErrorToast = () => {
   const manageLabelsErrors = useSelector(selectManageLabelsErrors);
   const uploadErrors = useSelector(selectUploadErrors);
   const cameraSerialNumberErrors = useSelector(selectCameraSerialNumberErrors);
+  const deleteImagesErrors = useSelector(selectDeleteImagesErrors);
 
   const enrichedErrors = [
     enrichErrors(labelsErrors, 'Label Error', 'labels'),
@@ -98,6 +101,7 @@ const ErrorToast = () => {
       'Error Updating Camera Serial Number',
       'cameraSerialNumber',
     ),
+    enrichErrors(deleteImagesErrors, 'Error Deleting Images', 'deleteImages'),
   ];
 
   const errors = enrichedErrors.reduce(
@@ -161,6 +165,7 @@ const dismissErrorActions = {
   manageLabels: (i) => dismissManageLabelsError(i),
   upload: (i) => dismissUploadError(i),
   cameraSerialNumber: (i) => dismissCameraSerialNumberError(i),
+  deleteImagesError: (i) => dismissDeleteImagesError(i),
 };
 
 function enrichErrors(errors, title, entity) {

diff --git a/src/features/filters/FiltersPanelFooter.jsx b/src/features/filters/FiltersPanelFooter.jsx
@@ -187,7 +187,7 @@ const FiltersPanelFooter = () => {
             </DeleteImagesButton>
           </TooltipTrigger>
           <TooltipContent side="top" sideOffset={5}>
-            Delete all images shown
+            Delete all filtered images
             <TooltipArrow />
           </TooltipContent>
         </Tooltip>

diff --git a/src/features/images/imagesSlice.js b/src/features/images/imagesSlice.js
@@ -345,9 +345,11 @@ export const deleteImages = (imageIds) => async (dispatch, getState) => {
     );
     dispatch(setSelectedImageIndices([]));
     dispatch(deleteImagesSuccess(imageIds));
+    dispatch(setDeleteImagesAlertClose())
   } catch (err) {
     console.log(`error attempting to delete image: `, err);
     dispatch(deleteImagesError(err));
+    dispatch(setDeleteImagesAlertClose())
   }
 };
 

diff --git a/src/features/loupe/DeleteImagesAlert.jsx b/src/features/loupe/DeleteImagesAlert.jsx
@@ -73,14 +73,13 @@ const DeleteImagesAlert = () => {
   return (
     <Alert open={alertState.deleteImagesAlertOpen}>
       <AlertPortal>
-        <AlertOverlay>
+        <AlertOverlay />
+        <AlertContent>
           {isSpinnerActive && (
             <SpinnerOverlay>
               <SimpleSpinner />
             </SpinnerOverlay>
           )}
-        </AlertOverlay>
-        <AlertContent>
           <AlertTitle>
             {alertState.deleteImagesAlertByFilter ? filterText : selectionText}
           </AlertTitle>

diff --git a/src/features/tasks/tasksSlice.js b/src/features/tasks/tasksSlice.js
@@ -413,18 +413,27 @@ export const fetchTask = (taskId) => {
             DeleteImages: {
               COMPLETE: (res) => {
                 dispatch(deleteImagesSuccess(res.task.output.imageIds));
+                dispatch(
+                  setFocus({
+                    index: { image: null, object: null, label: null },
+                    type: 'auto',
+                  }),
+                );
+                dispatch(setSelectedImageIndices([]));
+                dispatch(setDeleteImagesAlertClose());
               },
               FAIL: (res) => dispatch(deleteImagesFailure(res))
             },
             DeleteImagesByFilter: {
               COMPLETE: (res) => {
-                dispatch(deleteImagesSuccess());
+                dispatch(deleteImagesSuccess([]));
                 dispatch(
                   setFocus({
                     index: { image: null, object: null, label: null },
                     type: 'auto',
                   }),
                 );
+                dispatch(setSelectedImageIndices([]));
                 dispatch(setDeleteImagesAlertClose());
                 dispatch(fetchImages(res.task.output.filters));
               },
@@ -586,32 +595,22 @@ export const deleteImagesTask = (imageIds = [], filters = null, useFilters) => {
       const token = currentUser.getSignInUserSession().getIdToken().getJwtToken();
       const projects = getState().projects.projects;
       const selectedProj = projects.find((proj) => proj.selected);
-      let res = null;
       if (token && selectedProj) {
         if (useFilters) {
-          res = await call({
+          const res = await call({
             projId: selectedProj._id,
             request: 'deleteImagesByFilterTask',
             input: { filters },
           });
+          dispatch(deleteImagesUpdate({ taskId: res.deleteImagesByFilterTask._id }));
         } else {
-          res = await call({
+          const res = await call({
             projId: selectedProj._id,
             request: 'deleteImagesTask',
             input: { imageIds },
           });
+          dispatch(deleteImagesUpdate({ taskId: res.deleteImagesTask._id }));
         }
-
-        console.log('deleteImages - res: ', res);
-        dispatch(deleteImagesUpdate({ taskId: res.deleteImagesTask._id }));
-        dispatch(
-          setFocus({
-            index: { image: null, object: null, label: null },
-            type: 'auto',
-          }),
-        );
-        dispatch(setSelectedImageIndices([]));
-        dispatch(setDeleteImagesAlertClose());
       }
     }
     catch (err) {
@@ -639,6 +638,6 @@ export const selectCameraSerialNumberLoading = (state) =>
 export const selectCameraSerialNumberErrors = (state) =>
   state.tasks.loadingStates.cameraSerialNumber.errors;
 export const selectDeleteImagesLoading = (state) => state.tasks.loadingStates.deleteImages;
-export const selectDeleteImagesByFilterLoading = (state) => state.tasks.loadingStates.deleteImagesByFilter;
+export const selectDeleteImagesErrors = (state) => state.tasks.loadingStates.deleteImages.errors;
 
 export default tasksSlice.reducer;