feat: Add prefix paper to all routes

With the merge of cozy-mespapiers-lib we had this prefix. We wanted to take advantage of this work to simplify the url, but several apps/libs use redirection urls including this prefix. In the end, it doesn't change much... The fix is faster if you put it back on the app.
cozy · Jun 10, 2024 · 3e9fc5c · 3e9fc5c
1 parent b0c0c80
commit 3e9fc5c
Show file tree

Hide file tree

Showing 21 changed files with 103 additions and 83 deletions.
diff --git a/manifest.webapp b/manifest.webapp
@@ -125,6 +125,6 @@
     "accepted_mime_types": ["application/pdf", "image/jpeg", "image/png"],
     "max_number_of_files": 1,
     "max_size_per_file_in_MB": 10,
-    "route_to_upload": "/#/create?fromFlagshipUpload=true"
+    "route_to_upload": "/#/paper/create?fromFlagshipUpload=true"
   }
 }
diff --git a/src/components/Actions/DeleteConfirm.jsx b/src/components/Actions/DeleteConfirm.jsx
@@ -32,7 +32,7 @@ const DeleteConfirm = ({ files, isLast, onClose, children }) => {
     }
     onClose()
     if (isLast || isMultiSelectionActive) {
-      navigate('/', { replace: true })
+      navigate('/paper', { replace: true })
     }
   }, [
     clearQualification,

diff --git a/src/components/Actions/Items/open.jsx b/src/components/Actions/Items/open.jsx
@@ -25,7 +25,7 @@ export const open = () => {
           cozyUrl: client.getStackClient().uri,
           subDomainType: client.getInstanceOptions().subdomain,
           pathname: '/',
-          hash: `/files/${qualificationLabel}/${fileId}`
+          hash: `/paper/files/${qualificationLabel}/${fileId}`
         })
 
         return (

diff --git a/src/components/Actions/Items/select.jsx b/src/components/Actions/Items/select.jsx
@@ -26,7 +26,7 @@ export const select = ({ hideActionsMenu, addMultiSelectionFile }) => {
           cozyUrl: client.getStackClient().uri,
           subDomainType: client.getInstanceOptions().subdomain,
           pathname: '/',
-          hash: '/multiselect'
+          hash: '/paper/multiselect'
         })
 
         return (

diff --git a/src/components/AppRouter.jsx b/src/components/AppRouter.jsx
@@ -42,80 +42,95 @@ export const AppRouter = props => {
           <Route errorElement={<ErrorBoundary />}>
             <Route element={<CreatePaperDataBackupRoute />}>
               <Route element={<AppLayout />} errorElement={<ErrorBoundary />}>
-                <Route path="/" element={<OutletWrapper Component={Home} />}>
-                  <Route path="editcontact/:fileId" element={<ContactEdit />} />
-                  <Route
-                    path="installAppIntent"
-                    element={<InstallAppFromIntent />}
-                  />
-                  <Route
-                    path="installKonnectorIntent"
-                    element={<InstallKonnectorFromIntent />}
-                  />
-                  <Route path="create" element={<PlaceholdersSelector />} />
-                  <Route
-                    path="create/:qualificationLabel"
-                    element={<CreatePaperModalWrapper />}
-                  />
-                  <Route
-                    path="forward/:fileId"
-                    element={<ForwardModalByRoute />}
-                  />
+                <Route path="paper">
+                  <Route index element={<OutletWrapper Component={Home} />} />
+                  <Route element={<OutletWrapper Component={Home} />}>
+                    <Route
+                      path="editcontact/:fileId"
+                      element={<ContactEdit />}
+                    />
+                    <Route
+                      path="installAppIntent"
+                      element={<InstallAppFromIntent />}
+                    />
+                    <Route
+                      path="installKonnectorIntent"
+                      element={<InstallKonnectorFromIntent />}
+                    />
+                    <Route path="create" element={<PlaceholdersSelector />} />
+                    <Route
+                      path="create/:qualificationLabel"
+                      element={<CreatePaperModalWrapper />}
+                    />
+                    <Route
+                      path="forward/:fileId"
+                      element={<ForwardModalByRoute />}
+                    />
+                    <Route
+                      path="multiselect"
+                      element={<OutletWrapper Component={MultiselectView} />}
+                    >
+                      <Route
+                        path="forward/:fileId"
+                        element={<ForwardModalByRoute />}
+                      />
+                      <Route
+                        path="share"
+                        element={<ShareBottomSheetByRoute />}
+                      />
+                      <Route
+                        path="view/:fileId"
+                        element={
+                          <OutletWrapper Component={FilesViewerWithQuery} />
+                        }
+                      >
+                        {fileViewerRoutes.map(Component => Component)}
+                      </Route>
+                    </Route>
+                  </Route>
                   <Route
-                    path="multiselect"
-                    element={<OutletWrapper Component={MultiselectView} />}
+                    path="files/:qualificationLabel"
+                    element={
+                      <OutletWrapper Component={ConditionnalPapersList} />
+                    }
                   >
                     <Route
                       path="forward/:fileId"
                       element={<ForwardModalByRoute />}
                     />
                     <Route path="share" element={<ShareBottomSheetByRoute />} />
                     <Route
-                      path="view/:fileId"
+                      path="editcontact/:fileId"
+                      element={<ContactEdit />}
+                    />
+                    <Route
+                      path="installAppIntent"
+                      element={<InstallAppFromIntent />}
+                    />
+                    <Route
+                      path="installKonnectorIntent"
+                      element={<InstallKonnectorFromIntent />}
+                    />
+                    <Route path="create" element={<PlaceholdersSelector />} />
+                    <Route
+                      path="create/:qualificationLabel"
+                      element={<CreatePaperModalWrapper />}
+                    />
+                    <Route
+                      path=":fileId"
                       element={
                         <OutletWrapper Component={FilesViewerWithQuery} />
                       }
                     >
                       {fileViewerRoutes.map(Component => Component)}
                     </Route>
+                    <Route
+                      path="harvest/:connectorSlug/*"
+                      element={<HarvestRoutes />}
+                    />
                   </Route>
                 </Route>
-                <Route
-                  path="files/:qualificationLabel"
-                  element={<OutletWrapper Component={ConditionnalPapersList} />}
-                >
-                  <Route
-                    path="forward/:fileId"
-                    element={<ForwardModalByRoute />}
-                  />
-                  <Route path="share" element={<ShareBottomSheetByRoute />} />
-                  <Route path="editcontact/:fileId" element={<ContactEdit />} />
-                  <Route
-                    path="installAppIntent"
-                    element={<InstallAppFromIntent />}
-                  />
-                  <Route
-                    path="installKonnectorIntent"
-                    element={<InstallKonnectorFromIntent />}
-                  />
-                  <Route path="create" element={<PlaceholdersSelector />} />
-                  <Route
-                    path="create/:qualificationLabel"
-                    element={<CreatePaperModalWrapper />}
-                  />
-                  <Route
-                    path=":fileId"
-                    element={<OutletWrapper Component={FilesViewerWithQuery} />}
-                  >
-                    {fileViewerRoutes.map(Component => Component)}
-                  </Route>
-                  <Route
-                    path="harvest/:connectorSlug/*"
-                    element={<HarvestRoutes />}
-                  />
-                </Route>
-
-                <Route path="*" element={<Navigate to="/" replace />} />
+                <Route path="*" element={<Navigate to="/paper" replace />} />
               </Route>
             </Route>
           </Route>

diff --git a/src/components/Contexts/MultiSelectionProvider.spec.jsx b/src/components/Contexts/MultiSelectionProvider.spec.jsx
@@ -38,7 +38,7 @@ describe('MultiSelectionProvider', () => {
       expect(result.current.allMultiSelectionFiles).toEqual([fileMock01])
 
       // isMultiSelectionActive => false
-      useLocation.mockReturnValue({ pathname: '/' })
+      useLocation.mockReturnValue({ pathname: '/paper' })
 
       rerender()
 

diff --git a/src/components/CreatePaperDataBackupRoute.jsx b/src/components/CreatePaperDataBackupRoute.jsx
@@ -15,7 +15,7 @@ const CreatePaperDataBackupRoute = () => {
       )
 
       if (qualificationLabel) {
-        navigate(`/create/${qualificationLabel}`)
+        navigate(`/paper/create/${qualificationLabel}`)
       }
     }
 

diff --git a/src/components/ForwardFab/ForwardFab.jsx b/src/components/ForwardFab/ForwardFab.jsx
@@ -27,7 +27,7 @@ const ForwardFab = () => {
   )
 
   const hideForwardFabTooltip = settings?.[0]?.hideForwardFabTooltip
-  const isHome = pathname === '/'
+  const isHome = pathname === '/paper'
 
   const open =
     isHome && countPaperCreatedByMesPapiers === 1 && !hideForwardFabTooltip
@@ -54,7 +54,7 @@ const ForwardFab = () => {
           className="u-mr-half"
           onClick={() => {
             hideTooltip()
-            navigate(`/multiselect`)
+            navigate(`/paper/multiselect`)
           }}
           aria-label={t('Home.Fab.forwardPaper')}
         >

diff --git a/src/components/Harvest/CannotConnectModal/ExtraContent.jsx b/src/components/Harvest/CannotConnectModal/ExtraContent.jsx
@@ -21,7 +21,9 @@ const ExtraContent = () => {
         variant="secondary"
         label={t('Harvest.cannotConnectModal.button')}
         onClick={() =>
-          navigate(`/files/${qualificationLabel}/create/${qualificationLabel}`)
+          navigate(
+            `/paper/files/${qualificationLabel}/create/${qualificationLabel}`
+          )
         }
         fullWidth
         startIcon={<Icon icon="camera" />}

diff --git a/src/components/Multiselect/ForwardModalByRoute.jsx b/src/components/Multiselect/ForwardModalByRoute.jsx
@@ -41,7 +41,7 @@ const ForwardModalByRoute = () => {
       file={file}
       onForward={() =>
         isMultiSelectionActive
-          ? navigate('/', { replace: true })
+          ? navigate('/paper', { replace: true })
           : navigate('..', { replace: true })
       }
       onClose={() => navigate('..', { replace: true })}

diff --git a/src/components/Multiselect/ShareBottomSheet.jsx b/src/components/Multiselect/ShareBottomSheet.jsx
@@ -39,7 +39,7 @@ const ShareBottomSheet = ({ onClose, fileId, docs }) => {
         variant: 'filled'
       })
       if (isMultiSelectionActive) {
-        navigate('/', { replace: true })
+        navigate('/paper', { replace: true })
       } else {
         navigate('..', { replace: true })
       }

diff --git a/src/components/Papers/PaperItem.jsx b/src/components/Papers/PaperItem.jsx
@@ -87,7 +87,7 @@ const PaperItem = ({
         const route = isMultiSelectionActive
           ? `multiselect/view`
           : `files/${paperTheme}`
-        navigate(`/${route}/${paper._id}`, {
+        navigate(`/paper/${route}/${paper._id}`, {
           state: { background: `${pathname}${search}` }
         })
       }

diff --git a/src/components/PapersFab/PapersFab.jsx b/src/components/PapersFab/PapersFab.jsx
@@ -62,7 +62,7 @@ const PapersFab = () => {
 
   const handleClick = () => {
     return generalActions.length === 0
-      ? navigate('/create')
+      ? navigate('/paper/create')
       : setShowGeneralMenu(prev => !prev)
   }
 

diff --git a/src/components/PapersFab/PapersFab.spec.jsx b/src/components/PapersFab/PapersFab.spec.jsx
@@ -48,7 +48,7 @@ describe('PapersFabWrapper', () => {
       fireEvent.click(btn)
 
       expect(mockNavigate).toBeCalledTimes(1)
-      expect(mockNavigate).toBeCalledWith('/create')
+      expect(mockNavigate).toBeCalledWith('/paper/create')
     })
   })
 

diff --git a/src/components/SearchResult/helpers.js b/src/components/SearchResult/helpers.js
@@ -32,7 +32,7 @@ export const makeFlexsearchResultLineOnClick = ({
       if (isMultiSelectionActive) {
         changeCurrentMultiSelectionFile(doc)
       } else {
-        navigate(`/files/${qualificationLabel}/${doc._id}`, {
+        navigate(`/paper/files/${qualificationLabel}/${doc._id}`, {
           state: navigateState
         })
       }

diff --git a/src/components/SearchResult/helpers.spec.js b/src/components/SearchResult/helpers.spec.js
@@ -16,7 +16,7 @@ describe('makeFlexsearchResultLineOnClick', () => {
     getInstanceOptions: () => ({ subdomain: 'cozy' })
   }
   const navigate = jest.fn()
-  const navigateState = { background: '/search' }
+  const navigateState = { background: '/paper/search' }
   const changeCurrentMultiSelectionFile = jest.fn()
 
   beforeEach(() => {
@@ -67,9 +67,12 @@ describe('makeFlexsearchResultLineOnClick', () => {
     })
     onClick()
 
-    expect(navigate).toHaveBeenCalledWith('/files/qualificationLabel/fileId', {
-      state: { background: '/search' }
-    })
+    expect(navigate).toHaveBeenCalledWith(
+      '/paper/files/qualificationLabel/fileId',
+      {
+        state: { background: '/paper/search' }
+      }
+    )
   })
 
   it('should return a function that changes the current multi selection file when the doc is a file and the multi selection is active', () => {

diff --git a/src/components/Viewer/SelectFileButton.jsx b/src/components/Viewer/SelectFileButton.jsx
@@ -18,7 +18,7 @@ const SelectFileButton = ({ file }) => {
   const icon = <Icon icon="select-all" />
 
   const handleClick = () => {
-    navigate(`/multiselect`)
+    navigate(`/paper/multiselect`)
     addMultiSelectionFile(file)
   }
 

diff --git a/src/components/Views/CreatePaperModal.jsx b/src/components/Views/CreatePaperModal.jsx
@@ -32,7 +32,7 @@ const CreatePaperModal = () => {
   }, [fromFlagshipUpload, navigate, webviewIntent])
 
   const onSubmit = () => {
-    navigate(`/files/${qualificationLabel}`)
+    navigate(`/paper/files/${qualificationLabel}`)
   }
 
   useEffect(() => {

diff --git a/src/components/Views/PapersList.jsx b/src/components/Views/PapersList.jsx
@@ -28,7 +28,7 @@ const ConditionnalPapersList = props => {
     flag('hide.healthTheme.enabled') &&
     getThemeByItem({ label: params.qualificationLabel })?.label === 'health'
   ) {
-    return <Navigate replace to="/" />
+    return <Navigate replace to="/paper" />
   }
 
   return <PapersList {...props} />

diff --git a/src/components/Views/helpers.js b/src/components/Views/helpers.js
@@ -71,7 +71,7 @@ export const buildURLSearchParamsForInstallKonnectorFromIntent = (
 ) => {
   const paramsObj = {
     // Useful for redirecting on the route(harvest) opening the login modal
-    redirectAfterInstall: `/files/${qualificationLabel}/harvest/`,
+    redirectAfterInstall: `/paper/files/${qualificationLabel}/harvest/`,
     ...(konnectorCriteria.name && {
       slug: konnectorCriteria.name
     }),

diff --git a/src/notifications/index.js b/src/notifications/index.js
@@ -71,12 +71,12 @@ class ExpirationNotification extends NotificationView {
   }
 
   getExtraAttributes() {
-    let paperLink = ''
+    let paperLink = 'paper'
 
     if (!this.#hasMultipleExpiredFiles) {
       const file = this.filesInfo[0].file
       if (file) {
-        paperLink = `files/${file.metadata.qualification.label}/${file._id}`
+        paperLink = `paper/files/${file.metadata.qualification.label}/${file._id}`
       }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ const CreatePaperDataBackupRoute = () => { @@
           )
           if (qualificationLabel) {
-            navigate(`/create/${qualificationLabel}`)
+            navigate(`/paper/create/${qualificationLabel}`)
           }
         }
@@ Expand Down @@