ADM-513:[frontend] feat: fix the issue of review.

au-heartbeat · Dec 11, 2023 · 91547d6 · 91547d6
1 parent 8568da9
commit 91547d6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/frontend/__tests__/src/fixtures.ts b/frontend/__tests__/src/fixtures.ts
@@ -288,7 +288,7 @@ export const MOCK_BUILD_KITE_VERIFY_RESPONSE = {
   ],
 }
 
-export const filterCycleTimeSettings = [
+export const FILTER_CYCLE_TIME_SETTINGS = [
   { name: 'TODO', value: 'TODO' },
   { name: 'BACKLOG', value: 'TODO' },
   { name: 'IN DEV', value: 'IN DEV' },

diff --git a/frontend/__tests__/src/utils/Util.test.tsx b/frontend/__tests__/src/utils/Util.test.tsx
@@ -8,7 +8,7 @@ import {
 import { CleanedBuildKiteEmoji, OriginBuildKiteEmoji } from '@src/emojis/emoji'
 import { EMPTY_STRING } from '@src/constants/commons'
 import {
-  filterCycleTimeSettings,
+  FILTER_CYCLE_TIME_SETTINGS,
   MOCK_CYCLE_TIME_SETTING,
   MOCK_JIRA_WITH_STATUES_SETTING,
   PIPELINE_TOOL_TYPES,
@@ -103,7 +103,7 @@ describe('findCaseInsensitiveType function', () => {
 describe('filterAndMapCycleTimeSettings function', () => {
   it('should filter and map CycleTimeSettings when generate report', () => {
     const value = filterAndMapCycleTimeSettings(MOCK_CYCLE_TIME_SETTING, MOCK_JIRA_WITH_STATUES_SETTING)
-    expect(value).toStrictEqual(filterCycleTimeSettings)
+    expect(value).toStrictEqual(FILTER_CYCLE_TIME_SETTINGS)
   })
 
   it('should filter and map CycleTimeSettings when generate report', () => {

diff --git a/frontend/src/components/Common/ReportForThreeColumns/index.tsx b/frontend/src/components/Common/ReportForThreeColumns/index.tsx
@@ -8,7 +8,7 @@ import {
 } from '@src/components/Common/ReportForTwoColumns/style'
 import React, { Fragment } from 'react'
 import { ReportDataWithThreeColumns } from '@src/hooks/reportMapper/reportUIDataStructure'
-import { AVERAGE_FIELD, Unit } from '@src/constants/resources'
+import { AVERAGE_FIELD, REPORT_SUFFIX_UNITS } from '@src/constants/resources'
 import { getEmojiUrls, removeExtraEmojiName } from '@src/emojis/emoji'
 import { EmojiWrap, StyledAvatar, StyledTypography } from '@src/emojis/style'
 import { ReportSelectionTitle } from '@src/components/Metrics/MetricsStep/style'
@@ -64,7 +64,10 @@ export const ReportForThreeColumns = ({ title, fieldName, listName, data }: Repo
               <StyledTableCell>{fieldName}</StyledTableCell>
               <StyledTableCell>{listName}</StyledTableCell>
               <StyledTableCell>
-                Value{title === 'Lead time for changes' || title === 'Mean Time To Recovery' ? Unit.HOURS : ''}
+                Value
+                {title === 'Lead time for changes' || title === 'Mean Time To Recovery'
+                  ? REPORT_SUFFIX_UNITS.HOURS
+                  : ''}
               </StyledTableCell>
             </TableRow>
           </TableHead>

diff --git a/frontend/src/constants/resources.ts b/frontend/src/constants/resources.ts
@@ -117,7 +117,7 @@ export const NAME = 'Name'
 
 export const AVERAGE_FIELD = 'Average'
 
-export enum Unit {
+export enum REPORT_SUFFIX_UNITS {
   PER_SP = '(days/SP)',
   PER_CARD = '(days/card)',
   HOURS = '(hours)',

diff --git a/frontend/src/hooks/reportMapper/cycleTime.ts b/frontend/src/hooks/reportMapper/cycleTime.ts
@@ -1,4 +1,4 @@
-import { CYCLE_TIME_METRICS_NAME, METRICS_CONSTANTS, Unit } from '@src/constants/resources'
+import { CYCLE_TIME_METRICS_NAME, METRICS_CONSTANTS, REPORT_SUFFIX_UNITS } from '@src/constants/resources'
 import { ReportDataWithTwoColumns, ValueWithUnits } from '@src/hooks/reportMapper/reportUIDataStructure'
 import { CycleTimeResponse, Swimlane } from '@src/clients/report/dto/response'
 
@@ -21,21 +21,21 @@ export const cycleTimeMapper = ({
     const swimlane = getSwimlaneByItemName(itemName)
     return swimlane
       ? [
-          { value: swimlane.averageTimeForSP.toFixed(2), unit: Unit.PER_SP },
+          { value: swimlane.averageTimeForSP.toFixed(2), unit: REPORT_SUFFIX_UNITS.PER_SP },
           {
             value: swimlane.averageTimeForCards.toFixed(2),
-            unit: Unit.PER_CARD,
+            unit: REPORT_SUFFIX_UNITS.PER_CARD,
           },
         ]
       : []
   }
 
   const cycleTimeValue: { [key: string]: ValueWithUnits[] } = {
     AVERAGE_CYCLE_TIME: [
-      { value: Number(averageCycleTimePerSP.toFixed(2)), unit: Unit.PER_SP },
+      { value: Number(averageCycleTimePerSP.toFixed(2)), unit: REPORT_SUFFIX_UNITS.PER_SP },
       {
         value: averageCycleTimePerCard.toFixed(2),
-        unit: Unit.PER_CARD,
+        unit: REPORT_SUFFIX_UNITS.PER_CARD,
       },
     ],
     DEVELOPMENT_PROPORTION: calPerColumnTotalTimeDivTotalTime(METRICS_CONSTANTS.inDevValue),