webui-props loading ok

Author: simonredfern

src/routes/(protected)/system/webui-props/+page.server.ts

@@ -3,11 +3,15 @@ import { obp_requests } from "$lib/obp/requests";
 import { error } from "@sveltejs/kit";
 import type { OBPWebUIPropsResponse } from "$lib/obp/types";
 import type { RequestEvent } from "@sveltejs/kit";
+import { SessionOAuthHelper } from "$lib/oauth/sessionHelper";
 
 const logger = createLogger("WebUIPropsServer");
 
 export async function load(event: RequestEvent) {
-  const token = event.locals.session.data.oauth?.access_token;
+  const session = event.locals.session;
+  const sessionOAuth = SessionOAuthHelper.getSessionOAuth(session);
+  const token = sessionOAuth?.accessToken;
+
   if (!token) {
     error(401, {
       message: "Unauthorized: No access token found in session.",
@@ -20,7 +24,8 @@ export async function load(event: RequestEvent) {
   // Validate filter
   if (!["active", "database", "config"].includes(filter)) {
     error(400, {
-      message: "Invalid filter parameter. Must be 'active', 'database', or 'config'.",
+      message:
+        "Invalid filter parameter. Must be 'active', 'database', or 'config'.",
     });
   }
 

src/routes/(protected)/system/webui-props/+page.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { goto } from "$app/navigation";
+  import { goto, invalidateAll } from "$app/navigation";
   import type { PageData } from "./$types";
   import type { OBPWebUIProp } from "$lib/obp/types";
   import {
@@ -206,9 +206,9 @@
     }
   }
 
-  function switchFilter(filter: string) {
+  async function switchFilter(filter: string) {
     currentFilter = filter;
-    goto(`/system/webui-props?what=${filter}`);
+    await goto(`/system/webui-props?what=${filter}`, { invalidateAll: true });
   }
 </script>
 
@@ -274,7 +274,7 @@
 <!-- Props List -->
 {#if filteredProps && filteredProps.length > 0}
   <div class="space-y-4">
-    {#each filteredProps as prop (prop.webui_props_id)}
+    {#each filteredProps as prop, index (prop.webui_props_id || `prop-${index}`)}
       <div
         class="rounded-lg border border-gray-200 bg-white p-6 shadow-sm dark:border-gray-700 dark:bg-gray-800"
       >

src/routes/+layout.svelte

@@ -96,13 +96,17 @@
   }
 
   logger.info("🔐 Checking authentication state");
-  if (data.email) {
-    isAuthenticated = true;
-    logger.info(`✅ User authenticated: ${data.email}`);
-  } else {
-    isAuthenticated = false;
-    logger.info("ℹ️  User not authenticated");
-  }
+
+  // Make authentication reactive to data changes
+  $effect(() => {
+    if (data.email) {
+      isAuthenticated = true;
+      logger.info(`✅ User authenticated: ${data.email}`);
+    } else {
+      isAuthenticated = false;
+      logger.info("ℹ️  User not authenticated");
+    }
+  });
 
   // Pre-warm resource docs cache in browser for authenticated users
   onMount(() => {