From 03e6b136026db6905dabf10c3ec49f05e887d895 Mon Sep 17 00:00:00 2001
From: Laura Whitaker <laura.whitaker@temporal.io>
Date: Mon, 3 Nov 2025 12:25:04 -0700
Subject: [PATCH 1/3] Move fetchNamespace to layout

---
 src/lib/services/namespaces-service.ts             | 2 +-
 src/routes/(app)/namespaces/[namespace]/+layout.ts | 7 +++++++
 src/routes/(app)/namespaces/[namespace]/+page.ts   | 7 ++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/lib/services/namespaces-service.ts b/src/lib/services/namespaces-service.ts
index a16e489952..2009625623 100644
--- a/src/lib/services/namespaces-service.ts
+++ b/src/lib/services/namespaces-service.ts
@@ -91,7 +91,7 @@ export async function fetchNamespace(
   const results = await requestFromAPI<DescribeNamespaceResponse>(route, {
     request,
     onError: () =>
-      toaster.push({ variant: 'error', message: 'Unable to fetch namespaces' }),
+      toaster.push({ variant: 'error', message: 'Unable to fetch namespace' }),
   });
 
   return results ? toNamespaceDetails(results) : empty;
diff --git a/src/routes/(app)/namespaces/[namespace]/+layout.ts b/src/routes/(app)/namespaces/[namespace]/+layout.ts
index 719c6a0685..dd16adc096 100644
--- a/src/routes/(app)/namespaces/[namespace]/+layout.ts
+++ b/src/routes/(app)/namespaces/[namespace]/+layout.ts
@@ -1,5 +1,6 @@
 import type { LayoutData, LayoutLoad } from './$types';
 
+import { fetchNamespace } from '$lib/services/namespaces-service';
 import { fetchSearchAttributesForNamespace } from '$lib/services/search-attributes-service';
 import { allSearchAttributes } from '$lib/stores/search-attributes';
 
@@ -15,4 +16,10 @@ export const load: LayoutLoad = async ({
   );
 
   allSearchAttributes.set(attributes);
+
+  const namespace = await fetchNamespace(params.namespace);
+
+  return {
+    namespace,
+  };
 };
diff --git a/src/routes/(app)/namespaces/[namespace]/+page.ts b/src/routes/(app)/namespaces/[namespace]/+page.ts
index 178535acc2..03c1469bf1 100644
--- a/src/routes/(app)/namespaces/[namespace]/+page.ts
+++ b/src/routes/(app)/namespaces/[namespace]/+page.ts
@@ -1,19 +1,16 @@
 import type { PageLoad } from './$types';
 
-import { fetchNamespace } from '$lib/services/namespaces-service';
 import { getClusters } from '$lib/utilities/get-clusters';
 
-export const load: PageLoad = async function ({ params, parent, url }) {
+export const load: PageLoad = async function ({ parent, url }) {
   const { searchParams } = url;
 
   if (searchParams.has('time-range')) searchParams.delete('time-range');
 
-  await parent();
-  const namespace = await fetchNamespace(params.namespace);
+  const { namespace } = await parent();
   const clusters = getClusters(namespace);
 
   return {
-    namespace,
     clusters,
   };
 };

From 7a0c41047902d68741b2243489e4a8af99e36048 Mon Sep 17 00:00:00 2001
From: Laura Whitaker <laura.whitaker@temporal.io>
Date: Mon, 3 Nov 2025 12:25:38 -0700
Subject: [PATCH 2/3] Use page.data.namespace in getWorkflowRelationships

---
 .../workflow-family-node-tree.svelte          |  7 +--
 .../workflow-relationships-old.svelte         |  9 ++-
 src/lib/layouts/workflow-header.svelte        |  3 +-
 .../get-workflow-relationships.test.ts        | 56 +++++++++----------
 .../utilities/get-workflow-relationships.ts   |  7 +--
 5 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/src/lib/components/workflow/relationships/workflow-family-node-tree.svelte b/src/lib/components/workflow/relationships/workflow-family-node-tree.svelte
index dd56ccf49e..a1b8539e28 100644
--- a/src/lib/components/workflow/relationships/workflow-family-node-tree.svelte
+++ b/src/lib/components/workflow/relationships/workflow-family-node-tree.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
   import { cva } from 'class-variance-authority';
 
-  import { page } from '$app/stores';
+  import { page } from '$app/state';
 
   import Icon from '$lib/holocene/icon';
   import type { RootNode } from '$lib/services/workflow-service';
   import { fullEventHistory } from '$lib/stores/events';
-  import { namespaces } from '$lib/stores/namespaces';
   import { workflowRun } from '$lib/stores/workflow-run';
   import type { WorkflowExecution } from '$lib/types/workflows';
   import { getWorkflowRelationships } from '$lib/utilities/get-workflow-relationships';
@@ -29,12 +28,12 @@
   export let onNodeClick: (node: RootNode, generation: number) => void;
   export let activeWorkflow: WorkflowExecution | undefined = undefined;
 
-  $: ({ workflow, run, namespace } = $page.params);
+  $: ({ workflow, run, namespace } = page.params);
   $: ({ workflow: fullWorkflow } = $workflowRun);
   $: workflowRelationships = getWorkflowRelationships(
     fullWorkflow,
     $fullEventHistory,
-    $namespaces,
+    page.data.namespace,
   );
   $: ({ first, next, previous } = workflowRelationships);
 
diff --git a/src/lib/components/workflow/workflow-relationships-old.svelte b/src/lib/components/workflow/workflow-relationships-old.svelte
index db4921a10f..4fee8dc2dd 100644
--- a/src/lib/components/workflow/workflow-relationships-old.svelte
+++ b/src/lib/components/workflow/workflow-relationships-old.svelte
@@ -1,9 +1,8 @@
 <script lang="ts">
-  import { page } from '$app/stores';
+  import { page } from '$app/state';
 
   import { fetchAllChildWorkflows } from '$lib/services/workflow-service';
   import { fullEventHistory } from '$lib/stores/events';
-  import { namespaces } from '$lib/stores/namespaces';
   import { workflowRun } from '$lib/stores/workflow-run';
   import { getWorkflowRelationships } from '$lib/utilities/get-workflow-relationships';
 
@@ -13,13 +12,13 @@
   import ParentWorkflowTable from './parent-workflow-table.svelte';
   import SchedulerTable from './scheduler-table.svelte';
 
-  $: ({ namespace, workflow: workflowId, run: runId } = $page.params);
+  $: ({ namespace, workflow: workflowId, run: runId } = page.params);
   $: ({ workflow } = $workflowRun);
 
   $: workflowRelationships = getWorkflowRelationships(
     workflow,
     $fullEventHistory,
-    $namespaces,
+    page.data.namespace,
   );
 
   $: ({
@@ -59,7 +58,7 @@
       <ChildWorkflowsTable
         {children}
         pendingChildren={$workflowRun.workflow.pendingChildren}
-        namespace={$page.params.namespace}
+        namespace={page.params.namespace}
       />
     {/if}
   {/await}
diff --git a/src/lib/layouts/workflow-header.svelte b/src/lib/layouts/workflow-header.svelte
index b08929e213..dded4bbd99 100644
--- a/src/lib/layouts/workflow-header.svelte
+++ b/src/lib/layouts/workflow-header.svelte
@@ -19,7 +19,6 @@
   import { getInboundNexusLinkEvents } from '$lib/runes/inbound-nexus-links.svelte';
   import { getWorkflowPollersWithVersions } from '$lib/runes/workflow-versions.svelte';
   import { fullEventHistory } from '$lib/stores/events';
-  import { namespaces } from '$lib/stores/namespaces';
   import { resetWorkflows } from '$lib/stores/reset-workflows';
   import { workflowRun } from '$lib/stores/workflow-run';
   import { workflowsSearchParams } from '$lib/stores/workflows';
@@ -70,7 +69,7 @@
   );
   const workflowHasBeenReset = $derived(!!resetRunId);
   const workflowRelationships = $derived(
-    getWorkflowRelationships(workflow, $fullEventHistory, $namespaces),
+    getWorkflowRelationships(workflow, $fullEventHistory, page.data.namespace),
   );
   const workflowsHref = $derived(
     `${routeForWorkflows({
diff --git a/src/lib/utilities/get-workflow-relationships.test.ts b/src/lib/utilities/get-workflow-relationships.test.ts
index 80c289aa24..2fb201fb98 100644
--- a/src/lib/utilities/get-workflow-relationships.test.ts
+++ b/src/lib/utilities/get-workflow-relationships.test.ts
@@ -25,7 +25,7 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(pendingChildrenWorkflow),
         completedEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).hasChildren,
     ).toBe(true);
   });
@@ -35,24 +35,34 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(pendingChildrenWorkflow),
         childEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).hasChildren,
     ).toBe(true);
     expect(
       getWorkflowRelationships(
         toWorkflowExecution(pendingChildrenWorkflow),
         childEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).children.length,
     ).toBe(15);
   });
 
-  it('parentNamespaceName should return undefined if parentNamespaceId does not match namespaces list', () => {
+  it('parentNamespaceName should return the namespace name', () => {
     expect(
       getWorkflowRelationships(
         toWorkflowExecution(pendingChildrenWorkflow),
         childEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
+      ).parentNamespaceName,
+    ).toBe('my-namespace-name');
+  });
+
+  it('parentNamespaceName should return undefined if namespace name does not exist', () => {
+    expect(
+      getWorkflowRelationships(
+        toWorkflowExecution(pendingChildrenWorkflow),
+        childEvents,
+        { namespaceInfo: {} },
       ).parentNamespaceName,
     ).toBe(undefined);
   });
@@ -62,14 +72,14 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(runningWorkflow),
         childEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).hasChildren,
     ).toBe(true);
     expect(
       getWorkflowRelationships(
         toWorkflowExecution(runningWorkflow),
         childEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).children.length,
     ).toBe(15);
   });
@@ -79,21 +89,11 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(runningWorkflow),
         completedEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).hasChildren,
     ).toBe(false);
   });
 
-  it('parentNamespaceName should return namespace name if parentNamespaceId does match namespaces list', () => {
-    expect(
-      getWorkflowRelationships(
-        toWorkflowExecution(runningWorkflow),
-        completedEvents,
-        namespaces.namespaces,
-      ).parentNamespaceName,
-    ).toBe('canary');
-  });
-
   it('should return the firstExecutionRunId for first on a workflowExecutionStartedEvent', () => {
     const workflowExecutionStartedEvent = continuedAsNewEvents.find(
       (event) => event?.name === 'WorkflowExecutionStarted',
@@ -105,7 +105,7 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(continuedAsNewWorkflow),
         continuedAsNewEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).first,
     ).toBe(firstExecutionRunId);
   });
@@ -123,7 +123,7 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(continuedAsNewWorkflowCopy),
         continuedAsNewEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).first,
     ).toBe(firstExecutionRunId);
 
@@ -134,7 +134,7 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(continuedAsNewWorkflowCopy),
         continuedAsNewEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).first,
     ).toBe(undefined);
   });
@@ -149,7 +149,7 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(continuedAsNewWorkflow),
         continuedAsNewEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).previous,
     ).toBe(continuedExecutionRunId);
   });
@@ -165,7 +165,7 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(continuedAsNewWorkflow),
         continuedAsNewEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).next,
     ).toBe(newExecutionRunId);
   });
@@ -181,7 +181,7 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(completedWorkflow),
         completedEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).next,
     ).toBe(newExecutionRunId);
   });
@@ -197,7 +197,7 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(timedOutWorkflow),
         timedOutEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).next,
     ).toBe(newExecutionRunId);
   });
@@ -213,7 +213,7 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(failedWorkflow),
         failedEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).next,
     ).toBe(newExecutionRunId);
   });
@@ -227,7 +227,7 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(scheduledWorkflow),
         completedEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).scheduleId,
     ).toBe(workflowScheduledId);
   });
@@ -237,7 +237,7 @@ describe('getWorkflowRelationships', () => {
       getWorkflowRelationships(
         toWorkflowExecution(completedWorkflow),
         completedEvents,
-        namespaces.namespaces,
+        namespaces.namespaces[0],
       ).scheduleId,
     ).toBe('');
   });
diff --git a/src/lib/utilities/get-workflow-relationships.ts b/src/lib/utilities/get-workflow-relationships.ts
index 23a738e0a7..499a566c51 100644
--- a/src/lib/utilities/get-workflow-relationships.ts
+++ b/src/lib/utilities/get-workflow-relationships.ts
@@ -68,17 +68,14 @@ type WorkflowRelationships = {
 export const getWorkflowRelationships = (
   workflow: WorkflowExecution | null,
   fullEventHistory: WorkflowEvents,
-  namespaces: DescribeNamespaceResponse[],
+  namespace: DescribeNamespaceResponse,
 ): WorkflowRelationships => {
   const children = fullEventHistory.filter((event) =>
     isChildWorkflowClosedEvent(event),
   ) as ChildWorkflowClosedEvent[];
   const hasChildren = !!workflow?.pendingChildren.length || !!children.length;
   const parent = workflow?.parent;
-
-  const parentNamespaceName = namespaces?.find((namespace) => {
-    return namespace.namespaceInfo.id === workflow.parentNamespaceId;
-  })?.namespaceInfo?.name;
+  const parentNamespaceName = namespace.namespaceInfo?.name;
 
   const workflowExecutionStartedEvent = fullEventHistory.find(
     isWorkflowExecutionStartedEvent,

From eaf4b6bd138bb144a4cab6bdde78e58b04bcf0b5 Mon Sep 17 00:00:00 2001
From: Laura Whitaker <laura.whitaker@temporal.io>
Date: Mon, 3 Nov 2025 15:06:12 -0700
Subject: [PATCH 3/3] Update mock apis

---
 tests/integration/start-a-workflow.spec.ts | 2 ++
 tests/test-utilities/mock-apis.ts          | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/tests/integration/start-a-workflow.spec.ts b/tests/integration/start-a-workflow.spec.ts
index 841fbf3e3b..7534835b76 100644
--- a/tests/integration/start-a-workflow.spec.ts
+++ b/tests/integration/start-a-workflow.spec.ts
@@ -2,6 +2,7 @@ import { expect, test } from '@playwright/test';
 
 import {
   mockGlobalApis,
+  mockNamespaceApi,
   mockSearchAttributesApi,
   mockSettingsApi,
   mockTaskQueuesApi,
@@ -11,6 +12,7 @@ test.describe('Start a Workflow', () => {
   const startWorkflowUrl = '/namespaces/default/workflows/start-workflow';
   test.beforeEach(async ({ page }) => {
     await mockGlobalApis(page);
+    await mockNamespaceApi(page);
   });
 
   test.describe('Start a Workflow - Disabled', () => {
diff --git a/tests/test-utilities/mock-apis.ts b/tests/test-utilities/mock-apis.ts
index 0a5e55be90..fb8db4a082 100644
--- a/tests/test-utilities/mock-apis.ts
+++ b/tests/test-utilities/mock-apis.ts
@@ -68,6 +68,7 @@ export const mockGlobalApis = (page: Page) => {
 export const mockWorkflowsApis = (page: Page) => {
   return Promise.all([
     mockGlobalApis(page),
+    mockNamespaceApi(page),
     mockWorkflowsApi(page),
     mockSearchAttributesApi(page),
     mockWorkflowsCountApi(page),
@@ -82,6 +83,7 @@ export const mockSchedulesApis = (
 ) => {
   return Promise.all([
     mockGlobalApis(page),
+    mockNamespaceApis(page),
     mockSearchAttributesApi(page, customSearchAttributes),
     mockSchedulesApi(page, empty),
     mockWorkflowsCountApi(page, emptyWorkflowsCount),
@@ -109,6 +111,7 @@ export const mockWorkflowApis = (
 ) => {
   return Promise.all([
     mockNamespaceApis(page),
+    mockNamespaceApi(page),
     mockWorkflowApi(page, workflow),
     mockEventHistoryApi(page),
     mockTaskQueuesApi(page),