From 1b2081603df4c70ff4bc6c371197be29d2e04575 Mon Sep 17 00:00:00 2001 From: Mihai <103061463+mihai-peteu@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:10:31 -0700 Subject: [PATCH] fix(analytics): keep peerDependencies in step with workspace version [MA-1977] (#220) --- package.json | 6 ++-- .../Applications/ApplicationDashboard.vue | 5 ++-- src/views/Applications/ApplicationDetail.vue | 7 +++-- yarn.lock | 29 ++++++++++--------- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 10b284df..33b89102 100644 --- a/package.json +++ b/package.json @@ -25,9 +25,9 @@ "launchdarkly-js-client-sdk": "3.1.3" }, "dependencies": { - "@kong-ui-public/analytics-chart": "0.8.25", - "@kong-ui-public/analytics-metric-provider": "1.1.17", - "@kong-ui-public/analytics-utilities": "0.5.3", + "@kong-ui-public/analytics-chart": "0.8.31", + "@kong-ui-public/analytics-metric-provider": "1.1.22", + "@kong-ui-public/analytics-utilities": "0.7.1", "@kong-ui-public/copy-uuid": "1.1.5", "@kong-ui-public/document-viewer": "0.10.5", "@kong-ui-public/spec-renderer": "0.11.6", diff --git a/src/views/Applications/ApplicationDashboard.vue b/src/views/Applications/ApplicationDashboard.vue index 719029cb..b91c3455 100644 --- a/src/views/Applications/ApplicationDashboard.vue +++ b/src/views/Applications/ApplicationDashboard.vue @@ -65,7 +65,7 @@ class="mb-6" data-testid="analytics-metric-cards" :application-id="(appId as string)" - :timeframe="selectedTimeframe" + :timeframe="(selectedTimeframe as Timeframe)" :product-version-ids="selectedProductVersionIds" />

@@ -116,6 +116,7 @@ import { FeatureFlags } from '@/constants/feature-flags' import useLDFeatureFlag from '@/hooks/useLDFeatureFlag' import { datePickerSelectionToTimeframe, + Timeframe, TimeframeKeys, TimePeriods, timeframeToDatepickerSelection @@ -185,7 +186,7 @@ const FILTER_SEARCH_DEBOUNCE = 350 const FILTER_SELECTION_DEBOUNCE = 900 const selectedTimeframe = ref(TimePeriods.get(TimeframeKeys.ONE_DAY)) -const timeframe = ref(timeframeToDatepickerSelection(selectedTimeframe.value)) +const timeframe = ref(timeframeToDatepickerSelection(selectedTimeframe.value as Timeframe)) const vitalsLoading = ref(true) const allProductVersions = ref([]) diff --git a/src/views/Applications/ApplicationDetail.vue b/src/views/Applications/ApplicationDetail.vue index cd3b1d22..e1fde5a9 100644 --- a/src/views/Applications/ApplicationDetail.vue +++ b/src/views/Applications/ApplicationDetail.vue @@ -81,7 +81,7 @@ data-testid="analytics-metric-cards" hide-title :application-id="application.id" - :timeframe="fixedTimeframe" + :timeframe="(fixedTimeframe as Timeframe)" />
@@ -117,6 +117,7 @@ import AnalyticsMetricsCard from '@/components/vitals/AnalyticsMetricsCard.vue' import { useI18nStore, useAppStore } from '@/stores' import { PortalTimeframeKeys } from '@/types/vitals' +import type { Timeframe } from '@kong-ui-public/analytics-utilities' import { TimeframeKeys, TimePeriods @@ -144,8 +145,8 @@ export default defineComponent({ const { isDcr, allowedTimePeriod } = storeToRefs(appStore) const vitalsLoading = ref(false) const fixedTimeframe = allowedTimePeriod.value === PortalTimeframeKeys.NINETY_DAYS - ? ref(TimePeriods.get(TimeframeKeys.THIRTY_DAY)) - : ref(TimePeriods.get(TimeframeKeys.ONE_DAY)) + ? ref(TimePeriods.get(TimeframeKeys.THIRTY_DAY) as Timeframe) + : ref(TimePeriods.get(TimeframeKeys.ONE_DAY) as Timeframe) const { state: currentState, send } = useMachine(createMachine({ predictableActionArguments: true, diff --git a/yarn.lock b/yarn.lock index 8913931a..8c7eb6dd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -844,12 +844,12 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@kong-ui-public/analytics-chart@0.8.25": - version "0.8.25" - resolved "https://registry.npmjs.org/@kong-ui-public/analytics-chart/-/analytics-chart-0.8.25.tgz#ad045b5f0397aef175c6a5e31183ca1a396f9ac7" - integrity sha512-cFKM7ifx5zyKK/qKB35nOpGiSvcnXKzP8b+Nbpecm85XKPsexOiIPuH8KRsuhnKXgyC3JTWualhk4SbYjs773g== +"@kong-ui-public/analytics-chart@0.8.31": + version "0.8.31" + resolved "https://registry.yarnpkg.com/@kong-ui-public/analytics-chart/-/analytics-chart-0.8.31.tgz#12af0382e8284ecbcb16ea080dd7bfa938edb86c" + integrity sha512-QS28POgoCNdt7r946/KucPNAaa7NNQd6ugWNKcAYZqQthUgY72uOCw+MYaFnFraRX46KQEWjXsebcF+5007BDA== dependencies: - "@kong-ui-public/analytics-utilities" "^0.5.3" + "@kong-ui-public/analytics-utilities" "^0.7.1" approximate-number "^2.1.1" chart.js "^4.3.3" chartjs-adapter-date-fns "^3.0.0" @@ -860,23 +860,24 @@ uuid "^9.0.0" vue-chartjs "^5.2.0" -"@kong-ui-public/analytics-metric-provider@1.1.17": - version "1.1.17" - resolved "https://registry.npmjs.org/@kong-ui-public/analytics-metric-provider/-/analytics-metric-provider-1.1.17.tgz#6952bd736e1e0817b2e82546b4b052914ccfa31a" - integrity sha512-XndaSJGKnVQyz6y2s8kPaRvmv5rzNdMlNv8jhxgb44HXWwLj8vE4Xqf2OqWgkbL62/5yIEFW1kt3VB8y0cQKMw== +"@kong-ui-public/analytics-metric-provider@1.1.22": + version "1.1.22" + resolved "https://registry.yarnpkg.com/@kong-ui-public/analytics-metric-provider/-/analytics-metric-provider-1.1.22.tgz#08a9829d99e34cece68b4958f7a584afaa6be5d5" + integrity sha512-avI6PEg004zUzpmHAZU8hQh8QbwJoza+HXEyRLuo2XUysqfDJWe0IAcans51Ons5bFGI7DoMWo7WuiIS40FY1Q== dependencies: - "@kong-ui-public/analytics-utilities" "^0.5.3" + "@kong-ui-public/analytics-utilities" "^0.7.1" "@kong-ui-public/core" "1.1.0" "@kong-ui-public/metric-cards" "0.2.14" axios "^1.4.0" swrv "^1.0.4" -"@kong-ui-public/analytics-utilities@0.5.3", "@kong-ui-public/analytics-utilities@^0.5.3": - version "0.5.3" - resolved "https://registry.npmjs.org/@kong-ui-public/analytics-utilities/-/analytics-utilities-0.5.3.tgz#e47ed1c02fb0d9041e15d35eb866ab24efce73d7" - integrity sha512-etXGp/DrVxmnmko5Cx308oZ2lBOxq/zsAbmfzkPVDL9xOcJ0De3ni6TVpsX3JUtrSv05rnwZpyTLxpU66nuGQg== +"@kong-ui-public/analytics-utilities@0.7.1", "@kong-ui-public/analytics-utilities@^0.7.1": + version "0.7.1" + resolved "https://registry.yarnpkg.com/@kong-ui-public/analytics-utilities/-/analytics-utilities-0.7.1.tgz#c351396b85244a9d6445348d5f58da3c25e2d20c" + integrity sha512-XYdRAdyvai+yAQuRiJgosJIzYXtFfwTfx+8Ew0zdr1hnAwkaLiFB6mH8KQWSDjjOIqD5FqxN3CiNcrIVkZU8yQ== dependencies: date-fns "^2.30.0" + date-fns-tz "^2.0.0" "@kong-ui-public/copy-uuid@1.1.5": version "1.1.5"