From 7004ff70972eb122b4ffa1c8d78804bdbd50e24b Mon Sep 17 00:00:00 2001 From: Qiuxia Fan Date: Mon, 18 Apr 2022 14:48:37 +0800 Subject: [PATCH] fix type --- src/views/dashboard/data.ts | 3 +- src/views/dashboard/panel/Tool.vue | 50 +++++++++++++++++++++--------- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/views/dashboard/data.ts b/src/views/dashboard/data.ts index bed9001e..6bfe2a93 100644 --- a/src/views/dashboard/data.ts +++ b/src/views/dashboard/data.ts @@ -181,7 +181,8 @@ export const ServiceTools = [ { name: "library_books", content: "Text", id: "addText" }, { name: "device_hub", content: "Topology", id: "addTopology" }, { name: "merge", content: "Trace", id: "addTrace" }, - { name: "timeline", content: "Profile", id: "addProfile" }, + { name: "timeline", content: "Trace Profile", id: "addProfile" }, + { name: "timeline", content: "eBPF Profile", id: "addEbpf" }, { name: "assignment", content: "Log", id: "addLog" }, ]; export const InstanceTools = [ diff --git a/src/views/dashboard/panel/Tool.vue b/src/views/dashboard/panel/Tool.vue index 2c079d76..56e1cd96 100644 --- a/src/views/dashboard/panel/Tool.vue +++ b/src/views/dashboard/panel/Tool.vue @@ -258,7 +258,7 @@ async function setSourceSelector() { let currentPod; if (states.currentPod) { currentPod = selectorStore.pods.find( - (d: { id: string }) => d.label === states.currentPod + (d: { label: string }) => d.label === states.currentPod ); } else { currentPod = selectorStore.pods.find((d: { id: string }) => d.id === pod); @@ -283,10 +283,10 @@ async function setDestSelector() { return; } const destPod = params.destPodId || selectorStore.destPods[0].id; - let currentDestPod = ""; + let currentDestPod = { label: "" }; if (states.currentDestPod) { currentDestPod = selectorStore.pods.find( - (d: { id: string }) => d.label === states.currentDestPod + (d: { label: string }) => d.label === states.currentDestPod ); } else { currentDestPod = selectorStore.destPods.find( @@ -317,19 +317,23 @@ async function getServices() { let s; if (states.currentService) { s = (selectorStore.services || []).find( - (d) => d.label === states.currentService + (d: { label: string }) => d.label === states.currentService ); } else { - s = (selectorStore.services || []).find((d, index) => index === 0); + s = (selectorStore.services || []).find( + (d: unknown, index: number) => index === 0 + ); } selectorStore.setCurrentService(s || null); let d; if (states.currentService) { d = (selectorStore.services || []).find( - (d) => d.label === states.currentDestService + (d: { label: string }) => d.label === states.currentDestService ); } else { - d = (selectorStore.services || []).find((d, index) => index === 1); + d = (selectorStore.services || []).find( + (d: unknown, index: number) => index === 1 + ); } selectorStore.setCurrentDestService(d || null); if (!selectorStore.currentService) { @@ -484,9 +488,13 @@ async function fetchPods( if (setPod) { let p; if (states.currentPod) { - p = selectorStore.pods.find((d) => d.label === states.currentPod); + p = selectorStore.pods.find( + (d: { label: unknown }) => d.label === states.currentPod + ); } else { - p = selectorStore.pods.find((d, index) => index === 0); + p = selectorStore.pods.find( + (d: unknown, index: number) => index === 0 + ); } selectorStore.setCurrentPod(p || null); states.currentPod = selectorStore.currentPod.label; @@ -497,9 +505,13 @@ async function fetchPods( if (setPod) { let p; if (states.currentPod) { - p = selectorStore.pods.find((d) => d.label === states.currentPod); + p = selectorStore.pods.find( + (d: { label: string }) => d.label === states.currentPod + ); } else { - p = selectorStore.pods.find((d, index) => index === 0); + p = selectorStore.pods.find( + (d: { label: string }, index: number) => index === 0 + ); } selectorStore.setCurrentPod(p || null); states.currentPod = selectorStore.currentPod.label; @@ -514,9 +526,13 @@ async function fetchPods( if (setPod) { let p; if (states.currentDestPod) { - p = selectorStore.pods.find((d) => d.label === states.currentDestPod); + p = selectorStore.pods.find( + (d: { label: string }) => d.label === states.currentDestPod + ); } else { - p = selectorStore.pods.find((d, index) => index === 0); + p = selectorStore.pods.find( + (d: { label: string }, index: number) => index === 0 + ); } selectorStore.setCurrentDestPod(p || null); states.currentDestPod = selectorStore.currentDestPod.label; @@ -530,9 +546,13 @@ async function fetchPods( if (setPod) { let p; if (states.currentDestPod) { - p = selectorStore.pods.find((d) => d.label === states.currentDestPod); + p = selectorStore.pods.find( + (d: { label: string }) => d.label === states.currentDestPod + ); } else { - p = selectorStore.pods.find((d, index) => index === 0); + p = selectorStore.pods.find( + (d: { label: string }, index: number) => index === 0 + ); } selectorStore.setCurrentDestPod(p || null); states.currentDestPod = selectorStore.currentDestPod.label;