From 35a282a510ad45e8c13112293aa3ea92b0fbd3e5 Mon Sep 17 00:00:00 2001 From: nick-delirium Date: Fri, 3 Feb 2023 16:49:05 +0100 Subject: [PATCH] change(ui): dont ask chart for dashboard and metrics pages for lcickmap --- frontend/app/mstore/types/widget.ts | 2 +- frontend/app/services/MetricService.ts | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/frontend/app/mstore/types/widget.ts b/frontend/app/mstore/types/widget.ts index 5dee5d19d..ecf7249ce 100644 --- a/frontend/app/mstore/types/widget.ts +++ b/frontend/app/mstore/types/widget.ts @@ -250,7 +250,7 @@ export default class Widget { } } - this.data = _data; + Object.assign(this.data, _data) return _data; } diff --git a/frontend/app/services/MetricService.ts b/frontend/app/services/MetricService.ts index 94f4b8288..d8c6e099a 100644 --- a/frontend/app/services/MetricService.ts +++ b/frontend/app/services/MetricService.ts @@ -1,5 +1,6 @@ import Widget from "App/mstore/types/widget"; import APIClient from 'App/api_client'; +import { CLICKMAP } from "App/constants/card"; export default class MetricService { private client: APIClient; @@ -72,6 +73,13 @@ export default class MetricService { } getMetricChartData(metric: Widget, data: any, isWidget: boolean = false): Promise { + if ( + metric.metricType === CLICKMAP + && document.location.pathname.split('/').pop() !== 'metrics' + && (document.location.pathname.indexOf('dashboard') !== -1 && document.location.pathname.indexOf('metric') === -1) + ) { + return Promise.resolve({}) + } const path = isWidget ? `/cards/${metric.metricId}/chart` : `/cards/try`; return this.client.post(path, data) .then(r => r.json())