Merge pull request #1142 from internxt/bugfix/resolve-duplicated-rute…

…s-id [_]: bugfix/Resolved duplicate route ids
internxt · Jun 4, 2024 · 0d95bf1 · 0d95bf1
2 parents 4f4afbe + cbb5e13
commit 0d95bf1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 35 deletions.
diff --git a/src/app/core/config/views.ts b/src/app/core/config/views.ts
@@ -30,7 +30,6 @@ import JoinTeamView from 'app/teams/views/JoinTeamView/JoinTeamView';
 import TeamSuccessView from 'app/teams/views/TeamSuccessView/TeamSuccessView';
 import RedirectToAppView from '../../core/views/RedirectToAppView/RedirectToAppView';
 import ShareFolderView from '../../share/views/ShareView/ShareFolderView';
-import SharePhotosView from '../../share/views/ShareView/SharePhotosView';
 import ShareGuestSingUpView from '../../share/views/SharedGuestSignUp/ShareGuestSingUpView';
 import SharedViewWrapper from '../../share/views/SharedLinksView/SharedViewWrapper';
 import ChangeEmailView from '../views/ChangeEmailView';
@@ -69,8 +68,9 @@ const views: Array<{
   { id: AppView.CheckoutPlan, component: CheckoutPlanView },
   { id: AppView.RecoveryLink, component: RecoveryLinkView },
   { id: AppView.ShareFileToken, component: ShareFileView },
+  { id: AppView.ShareFileToken2, component: ShareFileView },
   { id: AppView.ShareFolderToken, component: ShareFolderView },
-  { id: AppView.SharePhotosToken, component: SharePhotosView },
+  { id: AppView.ShareFolderToken2, component: ShareFolderView },
   { id: AppView.RedirectToApp, component: RedirectToAppView },
   { id: AppView.VerifyEmail, component: VerifyEmailView },
   { id: AppView.ChangeEmail, component: ChangeEmailView },

diff --git a/src/app/core/types.ts b/src/app/core/types.ts
@@ -132,8 +132,9 @@ export enum AppView {
   Checkout = 'checkout',
   RecoveryLink = 'recovery-link',
   ShareFileToken = 'share-token',
+  ShareFileToken2 = 'share-token-2',
   ShareFolderToken = 'share-folder-token',
-  SharePhotosToken = 'share-photos-token',
+  ShareFolderToken2 = 'share-folder-token-2',
   ShareGuestAcceptInvite = 'share-guest-accept-invite',
   GuestAcceptInvite = 'guest-accept-invite',
   RedirectToApp = 'redirect-to-app',

diff --git a/src/app/routes/paths.json b/src/app/routes/paths.json
@@ -192,13 +192,7 @@
       "exact": false
     },
     {
-      "id": "share-token",
-      "layout": "share",
-      "path": "/d/sh/file/:token/:code?",
-      "exact": false
-    },
-    {
-      "id": "share-token",
+      "id": "share-token-2",
       "layout": "share",
       "path": "/d/file/:token/:code?",
       "exact": false
@@ -210,13 +204,7 @@
       "exact": false
     },
     {
-      "id": "share-folder-token",
-      "layout": "share",
-      "path": "/d/sh/folder/:token/:code?",
-      "exact": false
-    },
-    {
-      "id": "share-folder-token",
+      "id": "share-folder-token-2",
       "layout": "share",
       "path": "/d/folder/:token/:code?",
       "exact": false
@@ -227,24 +215,6 @@
       "path": "/shared-guest",
       "exact": false
     },
-    {
-      "id": "share-photos-token",
-      "layout": "share",
-      "path": "/sh/photos/:token([a-z0-9]{24})/:code",
-      "exact": false
-    },
-    {
-      "id": "share-photos-token",
-      "layout": "share",
-      "path": "/d/sh/photos/:token([a-z0-9]{24})/:code",
-      "exact": false
-    },
-    {
-      "id": "share-photos-token",
-      "layout": "share",
-      "path": "/d/photos/:token([a-z0-9]{24})/:code",
-      "exact": false
-    },
     {
       "id": "guest-accept-invite",
       "layout": "empty",