From 81e9d2f22070aa39b510f1e35b45b6099bf72ba1 Mon Sep 17 00:00:00 2001 From: Harshith Date: Wed, 17 Dec 2025 00:57:31 +0530 Subject: [PATCH] Consolidate date range constants --- .../analytics_dashboards/components/filters/constants.js | 7 ------- .../data_sources/ai_impact_over_time.js | 8 ++++---- .../data_sources/code_suggestions_acceptance_by_ide.js | 4 ++-- .../code_suggestions_acceptance_by_language.js | 4 ++-- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ee/app/assets/javascripts/analytics/analytics_dashboards/components/filters/constants.js b/ee/app/assets/javascripts/analytics/analytics_dashboards/components/filters/constants.js index cb30277c99d390..3a6289065a8477 100644 --- a/ee/app/assets/javascripts/analytics/analytics_dashboards/components/filters/constants.js +++ b/ee/app/assets/javascripts/analytics/analytics_dashboards/components/filters/constants.js @@ -41,13 +41,6 @@ const last30Days = nDaysBefore(startOfTomorrow, 30, { utc: true }); const last90Days = nDaysBefore(startOfTomorrow, 90, { utc: true }); const last180Days = nDaysBefore(startOfTomorrow, 180, { utc: true }); -export const DORA_METRIC_QUERY_RANGES = { - LAST_WEEK: lastWeek, - LAST_MONTH: lastMonth, - LAST_30_DAYS: last30Days, - LAST_90_DAYS: last90Days, - LAST_180_DAYS: last180Days, -}; export const TODAY = startOfToday; export const SEVEN_DAYS_AGO = getDateInPast(TODAY, 7); diff --git a/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/ai_impact_over_time.js b/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/ai_impact_over_time.js index 70a7998a598e99..d401c89a52fd31 100644 --- a/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/ai_impact_over_time.js +++ b/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/ai_impact_over_time.js @@ -8,7 +8,7 @@ import { calculateRate } from 'ee/analytics/dashboards/ai_impact/utils'; import { LAST_30_DAYS, LAST_180_DAYS, - DORA_METRIC_QUERY_RANGES, + DATE_RANGE_OPTIONS, startOfTomorrow, } from 'ee/analytics/analytics_dashboards/components/filters/constants'; import { AI_METRICS } from '~/analytics/shared/constants'; @@ -118,9 +118,9 @@ export default async function fetch({ : dateRange.toUpperCase(); // Default to 180 days if an invalid date range is given - const startDate = DORA_METRIC_QUERY_RANGES[dateRangeKey] - ? DORA_METRIC_QUERY_RANGES[dateRangeKey] - : DORA_METRIC_QUERY_RANGES[LAST_180_DAYS]; + const startDate = DATE_RANGE_OPTIONS[dateRangeKey]?.startDate + ? DATE_RANGE_OPTIONS[dateRangeKey].startDate + : DATE_RANGE_OPTIONS[LAST_180_DAYS].startDate; const { rate, tooltip } = await fetchAiImpactQuery({ startDate, diff --git a/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/code_suggestions_acceptance_by_ide.js b/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/code_suggestions_acceptance_by_ide.js index e279f1990b727b..8b5d789e0c696c 100644 --- a/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/code_suggestions_acceptance_by_ide.js +++ b/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/code_suggestions_acceptance_by_ide.js @@ -4,7 +4,7 @@ import { extractQueryResponseFromNamespace } from '~/analytics/shared/utils'; import { s__, __, sprintf } from '~/locale'; import { LAST_30_DAYS, - DORA_METRIC_QUERY_RANGES, + DATE_RANGE_OPTIONS, startOfTomorrow, } from 'ee/analytics/analytics_dashboards/components/filters/constants'; import { GENERIC_DASHBOARD_ERROR } from 'ee/analytics/dashboards/constants'; @@ -90,7 +90,7 @@ export default async function fetch({ : dateRange.toUpperCase(); const startDate = - DORA_METRIC_QUERY_RANGES[dateRangeKey] ?? DORA_METRIC_QUERY_RANGES[LAST_30_DAYS]; + DATE_RANGE_OPTIONS[dateRangeKey]?.startDate ?? DATE_RANGE_OPTIONS[LAST_30_DAYS].startDate; const { successful, failed } = await fetchAllCodeSuggestionsIdeMetrics({ fullPath: namespaceOverride ?? namespace, diff --git a/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/code_suggestions_acceptance_by_language.js b/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/code_suggestions_acceptance_by_language.js index 30acb9279081fa..50fdc67becc2d2 100644 --- a/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/code_suggestions_acceptance_by_language.js +++ b/ee/app/assets/javascripts/analytics/analytics_dashboards/data_sources/code_suggestions_acceptance_by_language.js @@ -3,7 +3,7 @@ import { extractQueryResponseFromNamespace } from '~/analytics/shared/utils'; import { __, s__, sprintf } from '~/locale'; import { LAST_30_DAYS, - DORA_METRIC_QUERY_RANGES, + DATE_RANGE_OPTIONS, startOfTomorrow, } from 'ee/analytics/analytics_dashboards/components/filters/constants'; import { getLanguageDisplayName } from 'ee/analytics/analytics_dashboards/code_suggestions_languages'; @@ -92,7 +92,7 @@ export default async function fetch({ : dateRange.toUpperCase(); const startDate = - DORA_METRIC_QUERY_RANGES[dateRangeKey] ?? DORA_METRIC_QUERY_RANGES[LAST_30_DAYS]; + DATE_RANGE_OPTIONS[dateRangeKey]?.startDate ?? DORA_METRIC_QUERY_RANGES[LAST_30_DAYS].startDate; const { successfulLanguages, failedLanguages } = await fetchAllCodeSuggestionsLanguagesMetrics({ fullPath: namespaceOverride ?? namespace, -- GitLab