From b2a9275bbece2504ba56bf7fa4b49da6174d831a Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Fri, 7 Mar 2025 10:54:14 -0600
Subject: [PATCH 1/2] add agent metrics

---
 src/lib/helpers/store.js                      | 11 +++++
 src/lib/helpers/types/pluginTypes.js          |  1 +
 src/routes/VerticalLayout/Index.svelte        | 17 +++----
 src/routes/page/agent/+page.svelte            | 14 +++---
 .../agent-components/agent-utility.svelte     | 36 ++++++++-------
 src/routes/page/agent/metrics/+page.svelte    | 45 +++++++++++++++++++
 svelte.config.js                              |  1 +
 7 files changed, 93 insertions(+), 32 deletions(-)
 create mode 100644 src/routes/page/agent/metrics/+page.svelte

diff --git a/src/lib/helpers/store.js b/src/lib/helpers/store.js
index 4d886565..075d677b 100644
--- a/src/lib/helpers/store.js
+++ b/src/lib/helpers/store.js
@@ -20,6 +20,17 @@ const createGlobalEventStore = () => {
 
 export const globalEventStore = createGlobalEventStore();
 
+/** @type {Writable<import('$pluginTypes').PluginMenuDefModel[]>} */
+const createGlobalMenuStore = () => {
+    const { set, subscribe } = writable([]);
+    return {
+        set,
+        subscribe
+    };
+}
+
+export const globalMenuStore = createGlobalMenuStore();
+
 
 /** @type {Writable<import('$userTypes').UserModel>} */
 export const userStore = writable({ id: "", full_name: "", expires: 0, token: null });
diff --git a/src/lib/helpers/types/pluginTypes.js b/src/lib/helpers/types/pluginTypes.js
index 4727cec9..0e8fcc78 100644
--- a/src/lib/helpers/types/pluginTypes.js
+++ b/src/lib/helpers/types/pluginTypes.js
@@ -16,6 +16,7 @@
  * @property {string} label
  * @property {string} icon
  * @property {string} link
+ * @property {string?} [iFrameUrl]
  * @property {boolean} isHeader
  */
 
diff --git a/src/routes/VerticalLayout/Index.svelte b/src/routes/VerticalLayout/Index.svelte
index 3bb24bf4..1bc6ea9a 100644
--- a/src/routes/VerticalLayout/Index.svelte
+++ b/src/routes/VerticalLayout/Index.svelte
@@ -1,18 +1,18 @@
 <script>
+	import { onMount } from 'svelte';
+	import { browser } from '$app/environment';
 	import RightSidebar from '$lib/common/RightSidebar.svelte';
+	import { getPluginMenu } from '$lib/services/plugin-service';
+	import { myInfo } from '$lib/services/auth-service';
+	import { globalMenuStore } from '$lib/helpers/store';
 	import Header from './Header.svelte';
 	import Sidebar from './Sidebar.svelte';
-	import { browser } from '$app/environment';
 	import Footer from './Footer.svelte';
-	import { onMount } from 'svelte';
-	import { getPluginMenu } from '$lib/services/plugin-service';
-	import { myInfo } from '$lib/services/auth-service';
-
+	
 	/** @type {import('$pluginTypes').PluginMenuDefModel[]} */
 	let menu;
-	/**
-	 * @type {import("$userTypes").UserModel}
-	 */
+
+	/** @type {import("$userTypes").UserModel} */
 	let user;
 
 	const toggleRightBar = () => {
@@ -31,6 +31,7 @@
 
 	onMount(async () => {
 		menu = await getPluginMenu();
+		globalMenuStore.set(menu || []);
 		user = await myInfo();
 		if (browser) {
 			document.body.setAttribute('data-layout', 'vertical');
diff --git a/src/routes/page/agent/+page.svelte b/src/routes/page/agent/+page.svelte
index 202b92a6..8c653b2b 100644
--- a/src/routes/page/agent/+page.svelte
+++ b/src/routes/page/agent/+page.svelte
@@ -1,20 +1,20 @@
 <script>
 	import { onDestroy, onMount } from 'svelte';
+	import { _ } from 'svelte-i18n';
+	import { goto } from '$app/navigation';
+	import Swal from 'sweetalert2';
 	import { Button, Col, Row } from '@sveltestrap/sveltestrap';
 	import Breadcrumb from '$lib/common/Breadcrumb.svelte';
 	import HeadTitle from '$lib/common/HeadTitle.svelte';
-	import CardAgent from './card-agent.svelte';
 	import LoadingToComplete from '$lib/common/LoadingToComplete.svelte';
-  	import { createAgent, getAgentLabels, getAgents } from '$lib/services/agent-service.js';
-  	import { myInfo } from '$lib/services/auth-service';
 	import PlainPagination from '$lib/common/PlainPagination.svelte';
-	import { _ } from 'svelte-i18n'
-	import { goto } from '$app/navigation';
-	import Swal from 'sweetalert2';
+	import MultiSelect from '$lib/common/MultiSelect.svelte';
+  	import { createAgent, getAgentLabels, getAgents } from '$lib/services/agent-service.js';
 	import { AgentType, GlobalEvent, UserPermission } from '$lib/helpers/enums';
+  	import { myInfo } from '$lib/services/auth-service';
 	import { ADMIN_ROLES } from '$lib/helpers/constants';
 	import { globalEventStore } from '$lib/helpers/store';
-	import MultiSelect from '$lib/common/MultiSelect.svelte';
+	import CardAgent from './card-agent.svelte';
 	
 	
   	const firstPage = 1;
diff --git a/src/routes/page/agent/[agentId]/agent-components/agent-utility.svelte b/src/routes/page/agent/[agentId]/agent-components/agent-utility.svelte
index c76c738c..948afecf 100644
--- a/src/routes/page/agent/[agentId]/agent-components/agent-utility.svelte
+++ b/src/routes/page/agent/[agentId]/agent-components/agent-utility.svelte
@@ -269,24 +269,26 @@
         </div>
 
         <div class="agent-utility-container">
-            <div class="merge-utility">
-                <Input
-					type="checkbox"
-					checked={agent?.merge_utility || false}
-					on:change={e => { toggleMergeUtility(e); handleAgentChange(); }}
-				/>
-                <div class="fw-bold">
-                    Merge utilities
-                </div>
-                <div
-                    class="line-align-center"
-                    data-bs-toggle="tooltip"
-                    data-bs-placement="top"
-                    title="Merge with entry agent utilities"
-                >
-                    <i class="bx bx-info-circle" />
+            {#if !agent?.is_router}
+                <div class="merge-utility">
+                    <Input
+                        type="checkbox"
+                        checked={agent?.merge_utility || false}
+                        on:change={e => { toggleMergeUtility(e); handleAgentChange(); }}
+                    />
+                    <div class="fw-bold">
+                        Merge utilities
+                    </div>
+                    <div
+                        class="line-align-center"
+                        data-bs-toggle="tooltip"
+                        data-bs-placement="top"
+                        title="Merge with entry agent utilities"
+                    >
+                        <i class="bx bx-info-circle" />
+                    </div>
                 </div>
-            </div>
+            {/if}
 
             {#each innerUtilities as utility, uid (uid)}
                 <div class="utility-wrapper">
diff --git a/src/routes/page/agent/metrics/+page.svelte b/src/routes/page/agent/metrics/+page.svelte
new file mode 100644
index 00000000..81a85029
--- /dev/null
+++ b/src/routes/page/agent/metrics/+page.svelte
@@ -0,0 +1,45 @@
+<script>
+    import { onDestroy } from 'svelte';
+    import { page } from '$app/stores';
+    import { _ } from 'svelte-i18n';
+    import { Card, CardBody, Col, Row } from '@sveltestrap/sveltestrap';
+	import HeadTitle from "$lib/common/HeadTitle.svelte";
+	import Breadcrumb from '$lib/common/Breadcrumb.svelte';
+	import { globalMenuStore } from '$lib/helpers/store';
+
+    /** @type {string} */
+    let iFrameUrl = '';
+
+    const unsubscriber = globalMenuStore.subscribe((/** @type {import('$pluginTypes').PluginMenuDefModel[]} */ menu) => {
+        const url = $page.url.pathname;
+        const pageInfo = menu.find(x => x.link === url) || null;
+        iFrameUrl = pageInfo?.iFrameUrl || '';
+    });
+
+    onDestroy(() => {
+        unsubscriber?.();
+    });
+</script>
+
+<HeadTitle title="{$_('Metrics')}" />
+<Breadcrumb title="{$_('Agent')}" pagetitle="{$_('Metrics')}" />
+
+{#if iFrameUrl}
+<Row>
+	<Col lg="12">
+		<Card>
+			<CardBody>
+                <iframe
+                    title="agent-metrics"
+                    height="100%"
+                    width="100%"
+                    src={iFrameUrl}
+                    frameborder="0"
+                    allowfullscreen
+                >
+                </iframe>
+            </CardBody>
+        </Card>
+    </Col>
+</Row>
+{/if}
\ No newline at end of file
diff --git a/svelte.config.js b/svelte.config.js
index 03780c3c..08d6f844 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -49,6 +49,7 @@ const config = {
 				"/page/agent",
 				"/page/agent/router",
 				"/page/agent/evaluator",
+				"/page/agent/metrics",
 				"/page/agent/[agentId]",
 				"/page/agent/[agentId]/build",
 				"/page/agent/[agentId]/train",

From 51dc51752b54b4b60603db50cd79bd577812c2f0 Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Fri, 7 Mar 2025 10:59:35 -0600
Subject: [PATCH 2/2] rename

---
 src/lib/helpers/types/pluginTypes.js       | 2 +-
 src/routes/page/agent/metrics/+page.svelte | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/helpers/types/pluginTypes.js b/src/lib/helpers/types/pluginTypes.js
index 0e8fcc78..9f13826f 100644
--- a/src/lib/helpers/types/pluginTypes.js
+++ b/src/lib/helpers/types/pluginTypes.js
@@ -16,7 +16,7 @@
  * @property {string} label
  * @property {string} icon
  * @property {string} link
- * @property {string?} [iFrameUrl]
+ * @property {string?} [embedUrl]
  * @property {boolean} isHeader
  */
 
diff --git a/src/routes/page/agent/metrics/+page.svelte b/src/routes/page/agent/metrics/+page.svelte
index 81a85029..d00f5d96 100644
--- a/src/routes/page/agent/metrics/+page.svelte
+++ b/src/routes/page/agent/metrics/+page.svelte
@@ -8,12 +8,12 @@
 	import { globalMenuStore } from '$lib/helpers/store';
 
     /** @type {string} */
-    let iFrameUrl = '';
+    let embedUrl = '';
 
     const unsubscriber = globalMenuStore.subscribe((/** @type {import('$pluginTypes').PluginMenuDefModel[]} */ menu) => {
         const url = $page.url.pathname;
         const pageInfo = menu.find(x => x.link === url) || null;
-        iFrameUrl = pageInfo?.iFrameUrl || '';
+        embedUrl = pageInfo?.embedUrl || '';
     });
 
     onDestroy(() => {
@@ -24,7 +24,7 @@
 <HeadTitle title="{$_('Metrics')}" />
 <Breadcrumb title="{$_('Agent')}" pagetitle="{$_('Metrics')}" />
 
-{#if iFrameUrl}
+{#if embedUrl}
 <Row>
 	<Col lg="12">
 		<Card>
@@ -33,7 +33,7 @@
                     title="agent-metrics"
                     height="100%"
                     width="100%"
-                    src={iFrameUrl}
+                    src={embedUrl}
                     frameborder="0"
                     allowfullscreen
                 >