From 82b348a76674292ba42ac4ad4ff0090dfd415f60 Mon Sep 17 00:00:00 2001 From: Fine0830 Date: Fri, 26 Aug 2022 16:26:25 +0800 Subject: [PATCH 1/9] feat: add a calculation to convert nanoseconds to milliseconds (#148) --- src/hooks/data.ts | 1 + src/hooks/useProcessor.ts | 5 ++++- src/views/dashboard/data.ts | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/hooks/data.ts b/src/hooks/data.ts index 73eef8d1..1656122f 100644 --- a/src/hooks/data.ts +++ b/src/hooks/data.ts @@ -37,6 +37,7 @@ export enum Calculations { PercentageAvg = "percentageAvg", ApdexAvg = "apdexAvg", SecondToDay = "secondToDay", + NanosecondToMillisecond = "nanosecondToMillisecond", } export enum sizeEnum { XS = "XS", diff --git a/src/hooks/useProcessor.ts b/src/hooks/useProcessor.ts index dea25185..55f2edc7 100644 --- a/src/hooks/useProcessor.ts +++ b/src/hooks/useProcessor.ts @@ -397,7 +397,7 @@ export function aggregation( data = (val / 1024 / 1024 / 1024).toFixed(2); break; case Calculations.Apdex: - data = val / 10000; + data = (val / 10000).toFixed(2); break; case Calculations.ConvertSeconds: data = dayjs(val * 1000).format("YYYY-MM-DD HH:mm:ss"); @@ -414,6 +414,9 @@ export function aggregation( case Calculations.SecondToDay: data = (val / 86400).toFixed(2); break; + case Calculations.NanosecondToMillisecond: + data = (val / 1000 / 1000).toFixed(2); + break; default: data; break; diff --git a/src/views/dashboard/data.ts b/src/views/dashboard/data.ts index e79af1c0..78536e37 100644 --- a/src/views/dashboard/data.ts +++ b/src/views/dashboard/data.ts @@ -297,4 +297,5 @@ export const CalculationOpts = [ { label: "Precision is 2", value: "precision" }, { label: "Milliseconds to seconds", value: "msTos" }, { label: "Seconds to days", value: "secondToDay" }, + { label: "Nanoseconds to milliseconds", value: "nanosecondToMillisecond" }, ]; From 1a989a1434da052788ba5e7f5b37620527300e52 Mon Sep 17 00:00:00 2001 From: Fine0830 Date: Mon, 29 Aug 2022 17:02:42 +0800 Subject: [PATCH 2/9] fix widget name (#149) --- .../dashboard/configuration/widget/AssociateOptions.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/dashboard/configuration/widget/AssociateOptions.vue b/src/views/dashboard/configuration/widget/AssociateOptions.vue index 967bc337..765baa95 100644 --- a/src/views/dashboard/configuration/widget/AssociateOptions.vue +++ b/src/views/dashboard/configuration/widget/AssociateOptions.vue @@ -40,15 +40,16 @@ const widgetIds = ref( associate.map((d: { widgetId: string }) => d.widgetId) ); const widgets: any = computed(() => { - const all = getDashboard(dashboardStore.currentDashboard).widgets; - const items = all.filter((d: any) => { + const widgetList = getDashboard(dashboardStore.currentDashboard).widgets; + const items = []; + for (const d of widgetList) { const isLinear = ["Bar", "Line", "Area"].includes( (d.graph && d.graph.type) || "" ); if (isLinear && d.id && dashboardStore.selectedGrid.id !== d.id) { - return { value: d.id, label: (d.widget && d.widget.name) || d.id }; + items.push({ value: d.id, label: (d.widget && d.widget.name) || d.id }); } - }); + } return items; }); function updateWidgetConfig(options: Option[]) { From d8889f178716e5358bf37787385142e5a317d427 Mon Sep 17 00:00:00 2001 From: Fine0830 Date: Mon, 29 Aug 2022 17:32:49 +0800 Subject: [PATCH 3/9] fix: set configurations for process topology (#150) --- src/views/dashboard/controls/NetworkProfiling.vue | 2 +- .../dashboard/related/network-profiling/Content.vue | 10 +++++++++- .../related/network-profiling/components/Settings.vue | 5 +---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/views/dashboard/controls/NetworkProfiling.vue b/src/views/dashboard/controls/NetworkProfiling.vue index d5dfd490..5dc6ab59 100644 --- a/src/views/dashboard/controls/NetworkProfiling.vue +++ b/src/views/dashboard/controls/NetworkProfiling.vue @@ -30,7 +30,7 @@ limitations under the License. --> {{ t("delete") }} - + diff --git a/src/views/dashboard/related/network-profiling/components/Settings.vue b/src/views/dashboard/related/network-profiling/components/Settings.vue index b0cb5aaa..a12a2cc8 100644 --- a/src/views/dashboard/related/network-profiling/components/Settings.vue +++ b/src/views/dashboard/related/network-profiling/components/Settings.vue @@ -15,7 +15,7 @@ limitations under the License. -->