Merge pull request #57 from saumeya/quarter-week

ODC-7470: fix logic for quarterly week grouping
openshift-pipelines · Feb 1, 2024 · 38060e7 · 38060e7
2 parents 4bc4767 + 5129925
commit 38060e7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 21 deletions.
diff --git a/src/components/pipelines-metrics/PipelinesAverageDuration.tsx b/src/components/pipelines-metrics/PipelinesAverageDuration.tsx
@@ -48,18 +48,12 @@ const getChartData = (
       if (type == 'hour') {
         return new Date(d.group_value * 1000).getHours() === value;
       }
-      if (type == 'day') {
+      if (type == 'day' || type == 'week') {
         return (
           new Date(d.group_value * 1000).toDateString() ===
           new Date(value).toDateString()
         );
       }
-      if (type == 'week') {
-        const wDate = new Date(d.group_value * 1000);
-        const weekend = new Date(value);
-        weekend.setDate(weekend.getDate() + 6);
-        return wDate >= new Date(value) && wDate <= weekend;
-      }
       if (type == 'month') {
         return new Date(d.group_value * 1000).getMonth() === value.getMonth();
       }

diff --git a/src/components/pipelines-overview/PipelineRunsNumbersChart.tsx b/src/components/pipelines-overview/PipelineRunsNumbersChart.tsx
@@ -48,18 +48,12 @@ const getChartData = (
       if (type == 'hour') {
         return new Date(d.group_value * 1000).getHours() === value;
       }
-      if (type == 'day') {
+      if (type == 'day' || type == 'week') {
         return (
           new Date(d.group_value * 1000).toDateString() ===
           new Date(value).toDateString()
         );
       }
-      if (type == 'week') {
-        const wDate = new Date(d.group_value * 1000);
-        const weekend = new Date(value);
-        weekend.setDate(weekend.getDate() + 6);
-        return wDate >= new Date(value) && wDate <= weekend;
-      }
       if (type == 'month') {
         return new Date(d.group_value * 1000).getMonth() === value.getMonth();
       }

diff --git a/src/components/pipelines-overview/PipelineRunsStatusCard.tsx b/src/components/pipelines-overview/PipelineRunsStatusCard.tsx
@@ -69,18 +69,12 @@ const getChartData = (
       if (type == 'hour') {
         return new Date(d.group_value * 1000).getHours() === value;
       }
-      if (type == 'day') {
+      if (type == 'day' || type == 'week') {
         return (
           new Date(d.group_value * 1000).toDateString() ===
           new Date(value).toDateString()
         );
       }
-      if (type == 'week') {
-        const wDate = new Date(d.group_value * 1000);
-        const weekend = new Date(value);
-        weekend.setDate(weekend.getDate() + 6);
-        return wDate >= new Date(value) && wDate <= weekend;
-      }
       if (type == 'month') {
         return new Date(d.group_value * 1000).getMonth() === value.getMonth();
       }