Allow single observation deletion when editing multiple (#1285)

inaturalist · Mar 18, 2024 · c0bd48c · c0bd48c
1 parent 4e32f10
commit c0bd48c
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 41 deletions.
diff --git a/src/components/ObsEdit/Header.js b/src/components/ObsEdit/Header.js
@@ -154,14 +154,25 @@ const Header = ( {
           setDeleteSheetVisible( true );
           setKebabMenuVisible( false );
         }}
-        title={
-          observations.length > 1
-            ? t( "Delete-observations" )
-            : t( "Delete-observation" )
-        }
+        title={t( "Delete-observation" )}
       />
+      { observations.length > 1 && (
+        <Menu.Item
+          testID="Header.delete-all-observation"
+          onPress={( ) => {
+            setDiscardObservationSheetVisible( true );
+            setKebabMenuVisible( false );
+          }}
+          title={t( "Delete-all-observations" )}
+        />
+      ) }
     </KebabMenu>
-  ), [kebabMenuVisible, observations, t, setDeleteSheetVisible] );
+  ), [
+    kebabMenuVisible,
+    observations,
+    setDeleteSheetVisible,
+    t
+  ] );
 
   return (
     <View className="flex-row justify-between items-center">
@@ -176,6 +187,7 @@ const Header = ( {
           navToObsList={navToObsList}
           observations={observations}
           currentObservation={currentObservation}
+          updateObservations={updateObservations}
         />
       )}
       {discardObservationSheetVisible && (

diff --git a/src/components/ObsEdit/Sheets/DeleteObservationSheet.js b/src/components/ObsEdit/Sheets/DeleteObservationSheet.js
@@ -6,26 +6,25 @@ import {
 import { RealmContext } from "providers/contexts";
 import type { Node } from "react";
 import React, { useCallback } from "react";
-import { log } from "sharedHelpers/logger";
 import safeRealmWrite from "sharedHelpers/safeRealmWrite";
 import { useTranslation } from "sharedHooks";
 
 const { useRealm } = RealmContext;
 
-const logger = log.extend( "DeleteObservationSheet" );
-
 type Props = {
+  currentObservation: Object,
   handleClose: Function,
   navToObsList: Function,
-  currentObservation: Object,
-  observations: Array<Object>
+  observations: Array<Object>,
+  updateObservations: Function
 }
 
 const DeleteObservationSheet = ( {
+  currentObservation,
   handleClose,
   navToObsList,
-  currentObservation,
-  observations
+  observations,
+  updateObservations
 }: Props ): Node => {
   const { t } = useTranslation( );
   const realm = useRealm( );
@@ -35,35 +34,35 @@ const DeleteObservationSheet = ( {
 
   const addObservationToDeletionQueue = useCallback( ( ) => {
     const localObsToDelete = realm.objectForPrimaryKey( "Observation", uuid );
-    if ( !localObsToDelete ) {
-      logger.info(
-        "Observation to delete is not saved in realm; returning to MyObservations"
-      );
-      navToObsList( );
-    } else {
-      logger.info( "Observation to add to deletion queue: ", localObsToDelete.uuid );
+    if ( localObsToDelete ) {
       safeRealmWrite( realm, ( ) => {
         localObsToDelete._deleted_at = new Date( );
       }, "adding _deleted_at date in DeleteObservationSheet" );
-      logger.info(
-        "Observation added to deletion queue; returning to MyObservations"
-      );
-      navToObsList( );
     }
-  }, [uuid, realm, navToObsList] );
+    if ( multipleObservations ) {
+      updateObservations( observations.filter( o => o.uuid !== uuid ) );
+      handleClose( );
+      return;
+    }
+    navToObsList( );
+  }, [
+    handleClose,
+    multipleObservations,
+    navToObsList,
+    observations,
+    realm,
+    updateObservations,
+    uuid
+  ] );
 
   return (
     <WarningSheet
       handleClose={handleClose}
-      headerText={multipleObservations
-        ? t( "DELETE-X-OBSERVATIONS", { count: observations.length } )
-        : t( "DELETE-OBSERVATION" )}
+      headerText={t( "DELETE-OBSERVATION" )}
       handleSecondButtonPress={handleClose}
       secondButtonText={t( "CANCEL" )}
       confirm={addObservationToDeletionQueue}
-      buttonText={multipleObservations
-        ? t( "DELETE-ALL" )
-        : t( "DELETE" )}
+      buttonText={t( "DELETE" )}
     />
   );
 };

diff --git a/src/i18n/l10n/en.ftl b/src/i18n/l10n/en.ftl
@@ -304,6 +304,8 @@ Delete-comment = Delete comment
 
 DELETE-OBSERVATION = DELETE OBSERVATION?
 
+Delete-all-observations = Delete all observations
+
 Delete-observation = Delete observation
 
 Delete-observations = Delete observations

diff --git a/src/i18n/l10n/en.ftl.json b/src/i18n/l10n/en.ftl.json
@@ -176,6 +176,7 @@
   "DELETE-COMMENT-QUESTION": "DELETE COMMENT?",
   "Delete-comment": "Delete comment",
   "DELETE-OBSERVATION": "DELETE OBSERVATION?",
+  "Delete-all-observations": "Delete all observations",
   "Delete-observation": "Delete observation",
   "Delete-observations": "Delete observations",
   "DELETE-X-OBSERVATIONS": "DELETE { $count ->\n  [one] 1 OBSERVATION?\n *[other] { $count } OBSERVATIONS?\n}",

diff --git a/src/i18n/strings.ftl b/src/i18n/strings.ftl
@@ -304,6 +304,8 @@ Delete-comment = Delete comment
 
 DELETE-OBSERVATION = DELETE OBSERVATION?
 
+Delete-all-observations = Delete all observations
+
 Delete-observation = Delete observation
 
 Delete-observations = Delete observations

diff --git a/tests/unit/components/ObsEdit/DeleteObservationSheet.test.js b/tests/unit/components/ObsEdit/DeleteObservationSheet.test.js
@@ -5,7 +5,6 @@ import inatjs from "inaturalistjs";
 import React from "react";
 import safeRealmWrite from "sharedHelpers/safeRealmWrite";
 import factory from "tests/factory";
-import faker from "tests/helpers/faker";
 import { renderComponent } from "tests/helpers/render";
 
 const observations = [factory( "LocalObservation", {
@@ -14,6 +13,8 @@ const observations = [factory( "LocalObservation", {
 
 const currentObservation = observations[0];
 
+const mockUpdateObservations = jest.fn( );
+
 afterEach( ( ) => {
   jest.clearAllMocks( );
 } );
@@ -22,9 +23,11 @@ const mockNavigate = jest.fn( );
 
 const renderDeleteSheet = ( ) => renderComponent(
   <DeleteObservationSheet
+    handleClose={jest.fn( )}
     navToObsList={mockNavigate}
     currentObservation={currentObservation}
     observations={observations}
+    updateObservations={mockUpdateObservations}
   />
 );
 
@@ -67,23 +70,44 @@ describe( "delete observation", ( ) => {
     } );
   } );
 
-  describe( "handles multiple observation deletion", ( ) => {
-    it( "navigates back to MyObservations when observations are not in realm", ( ) => {
-      const unsavedObservations = [{
-        uuid: faker.string.uuid( )
-      }, {
-        uuid: faker.string.uuid( )
-      }];
+  it( "navigates back when there's only one observation", ( ) => {
+    expect( observations.length ).toEqual( 1 );
+    renderDeleteSheet( );
+    const deleteButton = screen.queryByText( "DELETE" );
+    fireEvent.press( deleteButton );
+    expect( mockNavigate ).toBeCalled( );
+  } );
+
+  describe( "with multiple observations", ( ) => {
+    const unsavedObservations = [
+      factory( "LocalObservation" ),
+      factory( "LocalObservation" )
+    ];
+
+    function renderDeleteSheetWithMultiple( ) {
       renderComponent(
         <DeleteObservationSheet
+          handleClose={jest.fn( )}
           navToObsList={mockNavigate}
           currentObservation={unsavedObservations[0]}
           observations={unsavedObservations}
+          updateObservations={mockUpdateObservations}
         />
       );
-      const deleteButton = screen.queryByText( /DELETE ALL/ );
+    }
+
+    it( "does not navigate back when there's more than one observation", ( ) => {
+      renderDeleteSheetWithMultiple( );
+      const deleteButton = screen.queryByText( "DELETE" );
+      fireEvent.press( deleteButton );
+      expect( mockNavigate ).not.toBeCalled( );
+    } );
+
+    it( "removes observation from state when there's more than one observation", ( ) => {
+      renderDeleteSheetWithMultiple( );
+      const deleteButton = screen.queryByText( "DELETE" );
       fireEvent.press( deleteButton );
-      expect( mockNavigate ).toBeCalled( );
+      expect( mockUpdateObservations ).toBeCalledWith( [unsavedObservations[1]] );
     } );
   } );
 } );