Remove app router routing

jellyfin · Sep 6, 2024 · 99b2bd4 · 99b2bd4
1 parent 9d6e266
commit 99b2bd4
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 346 deletions.
diff --git a/src/components/ConnectionRequired.tsx b/src/components/ConnectionRequired.tsx
@@ -3,7 +3,6 @@ import { Outlet, useLocation, useNavigate } from 'react-router-dom';
 import type { ConnectResponse } from 'jellyfin-apiclient';
 
 import alert from './alert';
-import { appRouter } from './router/appRouter';
 import Loading from './loading/LoadingComponent';
 import ServerConnections from './ServerConnections';
 import globalize from '../lib/globalize';
@@ -149,24 +148,20 @@ const ConnectionRequired: FunctionComponent<ConnectionRequiredProps> = ({
     }, [bounce, isAdminRequired, isUserRequired]);
 
     useEffect(() => {
-        // TODO: appRouter will call appHost.exit() if navigating back when you are already at the default route.
-        // This case will need to be handled elsewhere before appRouter can be killed.
-
         // Check connection status on initial page load
-        const firstConnection = appRouter.firstConnectionResult;
-        appRouter.firstConnectionResult = null;
-
-        if (firstConnection && firstConnection.State !== ConnectionState.SignedIn) {
-            handleIncompleteWizard(firstConnection)
-                .catch(err => {
-                    console.error('[ConnectionRequired] failed to start wizard', err);
-                });
-        } else {
-            validateUserAccess()
-                .catch(err => {
-                    console.error('[ConnectionRequired] failed to validate user access', err);
-                });
-        }
+        ServerConnections.connect()
+            .then(firstConnection => {
+                console.debug('[ConnectionRequired] connection state', firstConnection?.State);
+
+                if (firstConnection && firstConnection.State !== ConnectionState.SignedIn) {
+                    return handleIncompleteWizard(firstConnection);
+                } else {
+                    return validateUserAccess();
+                }
+            })
+            .catch(err => {
+                console.error('[ConnectionRequired] failed to connect to server', err);
+            });
     }, [handleIncompleteWizard, validateUserAccess]);
 
     if (isLoading) {

diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -1,3 +1,4 @@
+import { appRouter, isLyricsPage } from 'components/router/appRouter';
 import datetime from '../../scripts/datetime';
 import Events from '../../utils/events.ts';
 import browser from '../../scripts/browser';
@@ -16,7 +17,6 @@ import appFooter from '../appFooter/appFooter';
 import itemShortcuts from '../shortcuts';
 import './nowPlayingBar.scss';
 import '../../elements/emby-slider/emby-slider';
-import { appRouter } from '../router/appRouter';
 
 let currentPlayer;
 let currentPlayerSupportedCommands = [];
@@ -773,7 +773,7 @@ function refreshFromPlayer(player, type) {
 }
 
 function bindToPlayer(player) {
-    isLyricPageActive = appRouter.currentRouteInfo.path.toLowerCase() === '/lyrics';
+    isLyricPageActive = isLyricsPage();
     if (player === currentPlayer) {
         return;
     }
@@ -806,7 +806,7 @@ Events.on(playbackManager, 'playerchange', function () {
 bindToPlayer(playbackManager.getCurrentPlayer());
 
 document.addEventListener('viewbeforeshow', function (e) {
-    isLyricPageActive = appRouter.currentRouteInfo.path.toLowerCase() === '/lyrics';
+    isLyricPageActive = isLyricsPage();
     setLyricButtonActiveStatus();
     if (!e.detail.options.enableMediaControl) {
         if (isVisibilityAllowed) {