feat: adding router state persistence (#104)

* feat: adding router state persistence Signed-off-by: axel7083 <[email protected]> * fix: tests Signed-off-by: axel7083 <[email protected]> * fix: linter Signed-off-by: axel7083 <[email protected]> * fix: prettier Signed-off-by: axel7083 <[email protected]> * fix: revert + using state management Signed-off-by: axel7083 <[email protected]> * fix: moving model file to frontend package Signed-off-by: axel7083 <[email protected]> --------- Signed-off-by: axel7083 <[email protected]>
containers · Jan 22, 2024 · ffad087 · ffad087
1 parent 4696e3f
commit ffad087
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 2 deletions.
diff --git a/packages/frontend/src/App.svelte b/packages/frontend/src/App.svelte
@@ -11,13 +11,24 @@ import Preferences from '/@/pages/Preferences.svelte';
 import Registries from '/@/pages/Registries.svelte';
 import Models from '/@/pages/Models.svelte';
 import Recipe from '/@/pages/Recipe.svelte';
-  import Model from './pages/Model.svelte';
+import Model from './pages/Model.svelte';
+import { onMount } from 'svelte';
+import { getRouterState } from '/@/utils/client';
 
 router.mode.hash();
+
+let isMounted = false;
+
+onMount(() => {
+  // Load router state on application startup
+  const state = getRouterState();
+  router.goto(state.url);
+  isMounted = true;
+});
 </script>
 
 
-<Route path="/*" breadcrumb="Home" let:meta>
+<Route path="/*" breadcrumb="Home" isAppMounted="{isMounted}" let:meta>
   <main class="flex flex-col w-screen h-screen overflow-hidden bg-charcoal-700">
     <div class="flex flex-row w-full h-full overflow-hidden">
       <Navigation meta="{meta}"/>

diff --git a/packages/frontend/src/Route.svelte b/packages/frontend/src/Route.svelte
@@ -1,13 +1,16 @@
 <script lang="ts">
 import { createRouteObject } from 'tinro/dist/tinro_lib';
 import type { TinroRouteMeta } from 'tinro';
+import { saveRouterState, studioClient } from '/@/utils/client';
 
 export let path = '/*';
 export let fallback = false;
 export let redirect = false;
 export let firstmatch = false;
 export let breadcrumb: string | undefined = undefined;
 
+export let isAppMounted: boolean = false;
+
 let showContent = false;
 let params: Record<string, string> = {};
 let meta: TinroRouteMeta = {} as TinroRouteMeta;
@@ -23,6 +26,10 @@ const route = createRouteObject({
   onMeta(newMeta: TinroRouteMeta) {
     meta = newMeta;
     params = meta.params;
+
+    if(isAppMounted) {
+      saveRouterState({url: newMeta.url});
+    }
   },
 });
 

diff --git a/packages/frontend/src/models/IRouterState.ts b/packages/frontend/src/models/IRouterState.ts
@@ -0,0 +1,21 @@
+/**********************************************************************
+ * Copyright (C) 2024 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ ***********************************************************************/
+
+export interface RouterState {
+  url: string;
+}
diff --git a/packages/frontend/src/utils/client.ts b/packages/frontend/src/utils/client.ts
@@ -1,8 +1,23 @@
 import type { StudioAPI } from '@shared/src/StudioAPI';
 import { RpcBrowser } from '@shared/src/messages/MessageProxy';
+import type { RouterState } from '/@/models/IRouterState';
 
 export const RECENT_CATEGORY_ID = 'recent-category';
 const podmanDesktopApi = acquirePodmanDesktopApi();
 export const rpcBrowser: RpcBrowser = new RpcBrowser(window, podmanDesktopApi);
 
 export const studioClient: StudioAPI = rpcBrowser.getProxy<StudioAPI>();
+
+export const saveRouterState = (state: RouterState) => {
+  podmanDesktopApi.setState(state);
+};
+
+const isRouterState = (value: unknown): value is RouterState => {
+  return typeof value === 'object' && !!value && 'url' in value;
+};
+
+export const getRouterState = (): RouterState => {
+  const state = podmanDesktopApi.getState();
+  if (isRouterState(state)) return state;
+  return { url: '/' };
+};