From c0f1de9f3f456f3993c2adbaa9ece42f1b3ee060 Mon Sep 17 00:00:00 2001
From: Bill Thornton <thornbill@users.noreply.github.com>
Date: Fri, 9 Jun 2023 03:01:27 -0400
Subject: [PATCH] Update paths and stable app view

---
 src/apps/experimental/App.tsx                               | 3 +++
 .../components/drawers/dashboard/DevicesDrawerSection.tsx   | 2 +-
 src/apps/experimental/routes/legacyRoutes/admin.ts          | 6 ------
 src/apps/stable/App.tsx                                     | 3 +++
 src/apps/stable/routes/asyncRoutes/admin.ts                 | 1 -
 src/apps/stable/routes/legacyRoutes/admin.ts                | 2 +-
 src/controllers/dashboard/dashboard.html                    | 4 ++--
 src/scripts/libraryMenu.js                                  | 2 +-
 8 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/apps/experimental/App.tsx b/src/apps/experimental/App.tsx
index 0013ef0430..0c0778b74e 100644
--- a/src/apps/experimental/App.tsx
+++ b/src/apps/experimental/App.tsx
@@ -36,6 +36,9 @@ const ExperimentalApp = () => {
 
                     {LEGACY_PUBLIC_ROUTES.map(toViewManagerPageRoute)}
                 </Route>
+
+                {/* Redirects for old paths */}
+                <Route path='serveractivity.html' element={<Navigate replace to='/dashboard/activity' />} />
             </Route>
         </Routes>
     );
diff --git a/src/apps/experimental/components/drawers/dashboard/DevicesDrawerSection.tsx b/src/apps/experimental/components/drawers/dashboard/DevicesDrawerSection.tsx
index ae1e7d4b85..cb3cbf33ce 100644
--- a/src/apps/experimental/components/drawers/dashboard/DevicesDrawerSection.tsx
+++ b/src/apps/experimental/components/drawers/dashboard/DevicesDrawerSection.tsx
@@ -40,7 +40,7 @@ const DevicesDrawerSection = () => {
                 </ListItemLink>
             </ListItem>
             <ListItem disablePadding>
-                <ListItemLink to='/serveractivity.html'>
+                <ListItemLink to='/dashboard/activity'>
                     <ListItemIcon>
                         <Analytics />
                     </ListItemIcon>
diff --git a/src/apps/experimental/routes/legacyRoutes/admin.ts b/src/apps/experimental/routes/legacyRoutes/admin.ts
index e2037ddb11..b53f86ce87 100644
--- a/src/apps/experimental/routes/legacyRoutes/admin.ts
+++ b/src/apps/experimental/routes/legacyRoutes/admin.ts
@@ -163,12 +163,6 @@ export const LEGACY_ADMIN_ROUTES: LegacyRoute[] = [
             controller: 'dashboard/scheduledtasks/scheduledtasks',
             view: 'dashboard/scheduledtasks/scheduledtasks.html'
         }
-    }, {
-        path: 'serveractivity.html',
-        pageProps: {
-            controller: 'dashboard/serveractivity',
-            view: 'dashboard/serveractivity.html'
-        }
     }, {
         path: 'apikeys.html',
         pageProps: {
diff --git a/src/apps/stable/App.tsx b/src/apps/stable/App.tsx
index bbaec1b922..73c73f5881 100644
--- a/src/apps/stable/App.tsx
+++ b/src/apps/stable/App.tsx
@@ -51,6 +51,9 @@ const StableApp = () => (
 
             {/* Suppress warnings for unhandled routes */}
             <Route path='*' element={null} />
+
+            {/* Redirects for old paths */}
+            <Route path='/serveractivity.html' element={<Navigate replace to='/dashboard/activity' />} />
         </Route>
     </Routes>
 );
diff --git a/src/apps/stable/routes/asyncRoutes/admin.ts b/src/apps/stable/routes/asyncRoutes/admin.ts
index b06c8cac8c..72bcc6f32b 100644
--- a/src/apps/stable/routes/asyncRoutes/admin.ts
+++ b/src/apps/stable/routes/asyncRoutes/admin.ts
@@ -1,7 +1,6 @@
 import { AsyncRoute } from '../../../../components/router/AsyncRoute';
 
 export const ASYNC_ADMIN_ROUTES: AsyncRoute[] = [
-    { path: 'dashboard/activity', page: 'dashboard/activity' },
     { path: 'notificationsettings.html', page: 'dashboard/notifications' },
     { path: 'usernew.html', page: 'user/usernew' },
     { path: 'userprofiles.html', page: 'user/userprofiles' },
diff --git a/src/apps/stable/routes/legacyRoutes/admin.ts b/src/apps/stable/routes/legacyRoutes/admin.ts
index e2037ddb11..92aaef8041 100644
--- a/src/apps/stable/routes/legacyRoutes/admin.ts
+++ b/src/apps/stable/routes/legacyRoutes/admin.ts
@@ -164,7 +164,7 @@ export const LEGACY_ADMIN_ROUTES: LegacyRoute[] = [
             view: 'dashboard/scheduledtasks/scheduledtasks.html'
         }
     }, {
-        path: 'serveractivity.html',
+        path: 'dashboard/activity',
         pageProps: {
             controller: 'dashboard/serveractivity',
             view: 'dashboard/serveractivity.html'
diff --git a/src/controllers/dashboard/dashboard.html b/src/controllers/dashboard/dashboard.html
index 7fd60f7695..a76cf11971 100644
--- a/src/controllers/dashboard/dashboard.html
+++ b/src/controllers/dashboard/dashboard.html
@@ -44,7 +44,7 @@
 
             <div class="dashboardColumn dashboardColumn-2-40 dashboardColumn-3-27">
                 <div class="dashboardSection">
-                    <a is="emby-linkbutton" href="#/serveractivity.html?useractivity=true" class="button-flat sectionTitleTextButton">
+                    <a is="emby-linkbutton" href="#/dashboard/activity?useractivity=true" class="button-flat sectionTitleTextButton">
                         <h3>${HeaderActivity}</h3>
                         <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
@@ -61,7 +61,7 @@
                 </div>
 
                 <div class="dashboardSection serverActivitySection hide activityContainer">
-                    <a is="emby-linkbutton" href="#/serveractivity.html?useractivity=false" class="button-flat sectionTitleTextButton">
+                    <a is="emby-linkbutton" href="#/dashboard/activity?useractivity=false" class="button-flat sectionTitleTextButton">
                         <h3>${Alerts}</h3>
                         <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index ae59829aa5..c49a8336d3 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -466,7 +466,7 @@ function createToolsMenuList(pluginItems) {
     });
     links.push({
         name: globalize.translate('HeaderActivity'),
-        href: '#/serveractivity.html',
+        href: '#/dashboard/activity',
         pageIds: ['serverActivityPage'],
         icon: 'assessment'
     });