Use /locations/:locationId/edit for the form

falling-fruit · Jan 28, 2025 · f77ae1d · f77ae1d
1 parent 048295a
commit f77ae1d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/src/components/desktop/SidePane.js b/src/components/desktop/SidePane.js
@@ -115,7 +115,7 @@ const SidePane = () => {
                       <BackButton
                         onClick={() =>
                           history.push(
-                            `/locations/${match.params.locationId}/edit/details`,
+                            `/locations/${match.params.locationId}/edit`,
                           )
                         }
                       >

diff --git a/src/components/entry/EntryMobile.js b/src/components/entry/EntryMobile.js
@@ -99,7 +99,7 @@ const TopRibbonButtons = ({ hasImages, drawerDisabled, onBackButtonClick }) => {
         <EntryButton
           onClick={(event) => {
             event.stopPropagation()
-            history.push(`/locations/${locationId}/edit/details`)
+            history.push(`/locations/${locationId}/edit`)
           }}
           icon={<PencilIcon />}
           label="edit-button"

diff --git a/src/components/form/formRoutes.js b/src/components/form/formRoutes.js
@@ -132,7 +132,7 @@ const EditReview = ({ NavComponent }) => {
 }
 
 export const formRoutesMobile = [
-  <Route key="edit-location" path="/locations/:locationId/edit/details">
+  <Route key="edit-location" path="/locations/:locationId/edit">
     <EditLocation NavComponent={MobileNav} />
   </Route>,
   <Route key="add-location" path="/locations/new">
@@ -147,7 +147,7 @@ export const formRoutesMobile = [
 ]
 
 export const formRoutesDesktop = [
-  <Route key="edit-location" path="/locations/:locationId/edit/details">
+  <Route key="edit-location" path="/locations/:locationId/edit">
     <EditLocation NavComponent={DesktopNav} />
   </Route>,
   <Route key="add-location" path="/locations/new">

diff --git a/src/components/mobile/EditLocationPositionNav.js b/src/components/mobile/EditLocationPositionNav.js
@@ -36,21 +36,18 @@ const EditLocationPositionNav = () => {
 
       if (distanceMeters > 1) {
         // Wait half a second to let the user observe the edited position being undone
-        setTimeout(
-          () => history.push(`/locations/${locationId}/edit/details`),
-          500,
-        )
+        setTimeout(() => history.push(`/locations/${locationId}/edit`), 500)
       } else {
-        history.push(`/locations/${locationId}/edit/details`)
+        history.push(`/locations/${locationId}/edit`)
       }
     } else {
-      history.push(`/locations/${locationId}/edit/details`)
+      history.push(`/locations/${locationId}/edit`)
     }
   }
 
   const handleConfirm = () => {
     dispatch(updatePosition(googleMap?.getCenter().toJSON()))
-    history.push(`/locations/${locationId}/edit/details`)
+    history.push(`/locations/${locationId}/edit`)
   }
 
   return (

diff --git a/src/components/mobile/MobileLayout.js b/src/components/mobile/MobileLayout.js
@@ -92,7 +92,6 @@ const MobileLayout = () => {
             path={[
               '/reviews/:reviewId/edit',
               '/locations/:locationId/review',
-              '/locations/:locationId/edit/details',
               '/locations/new',
             ]}
           />
@@ -108,6 +107,7 @@ const MobileLayout = () => {
                   <EditLocationPositionNav />
                 </TopBar>
               </Route>
+              <Route path="/locations/:locationId/edit" />
               <Route
                 path={['/map', '/list', '/locations/:locationId']}
                 component={SearchAndFilterTopBar}
@@ -121,7 +121,7 @@ const MobileLayout = () => {
                 <Route path={['/map', '/locations', '/list', '/settings']}>
                   <Switch>
                     <Route path="/locations/init" />
-                    <Route path="/locations/:locationId/edit/position" />
+                    <Route path="/locations/:locationId/edit" />
                     <Route path="/locations/:locationId">
                       {!streetView && <EntryMobile />}
                     </Route>