diff --git a/frontend/src/component/project/Project/ProjectInsights/LeadTimeForChanges/LeadTimeForChanges.test.tsx b/frontend/src/component/project/Project/ProjectInsights/LeadTimeForChanges/LeadTimeForChanges.test.tsx index d1ef989ceb..82b70c0104 100644 --- a/frontend/src/component/project/Project/ProjectInsights/LeadTimeForChanges/LeadTimeForChanges.test.tsx +++ b/frontend/src/component/project/Project/ProjectInsights/LeadTimeForChanges/LeadTimeForChanges.test.tsx @@ -1,18 +1,11 @@ import { screen } from '@testing-library/react'; import { render } from 'utils/testRenderer'; -import { testServerRoute, testServerSetup } from 'utils/testServer'; import type { ProjectDoraMetricsSchema } from 'openapi'; import { LeadTimeForChanges } from './LeadTimeForChanges'; import { Route, Routes } from 'react-router-dom'; -const server = testServerSetup(); - -const setupApi = (outdatedSdks: ProjectDoraMetricsSchema) => { - testServerRoute(server, '/api/admin/projects/default/dora', outdatedSdks); -}; - test('Show outdated SDKs and apps using them', async () => { - setupApi({ + const leadTime: ProjectDoraMetricsSchema = { features: [ { name: 'ABCD', @@ -20,12 +13,12 @@ test('Show outdated SDKs and apps using them', async () => { }, ], projectAverage: 67, - }); + }; render( } + element={} /> , { diff --git a/frontend/src/component/project/Project/ProjectInsights/LeadTimeForChanges/LeadTimeForChanges.tsx b/frontend/src/component/project/Project/ProjectInsights/LeadTimeForChanges/LeadTimeForChanges.tsx index 6e15627510..39717ba6d5 100644 --- a/frontend/src/component/project/Project/ProjectInsights/LeadTimeForChanges/LeadTimeForChanges.tsx +++ b/frontend/src/component/project/Project/ProjectInsights/LeadTimeForChanges/LeadTimeForChanges.tsx @@ -1,6 +1,4 @@ import { Box, styled, Tooltip, Typography, useMediaQuery } from '@mui/material'; -import { useProjectDoraMetrics } from 'hooks/api/getters/useProjectDoraMetrics/useProjectDoraMetrics'; -import { useRequiredPathParam } from 'hooks/useRequiredPathParam'; import { useMemo } from 'react'; import { useTable, useGlobalFilter, useSortBy } from 'react-table'; import { @@ -15,6 +13,7 @@ import { ConditionallyRender } from 'component/common/ConditionallyRender/Condit import { Badge } from 'component/common/Badge/Badge'; import { useConditionallyHiddenColumns } from 'hooks/useConditionallyHiddenColumns'; import theme from 'themes/theme'; +import type { ProjectDoraMetricsSchema } from '../../../../../openapi'; const Container = styled(Box)(({ theme }) => ({ display: 'flex', @@ -41,22 +40,11 @@ const resolveDoraMetrics = (input: number) => { } }; -export const LeadTimeForChanges = () => { - const projectId = useRequiredPathParam('projectId'); - - const { dora, loading } = useProjectDoraMetrics(projectId); - - const data = useMemo(() => { - if (loading) { - return Array(5).fill({ - name: 'Featurename', - timeToProduction: 'Data for production', - }); - } - - return dora.features; - }, [dora, loading]); +interface ILeadTimeForChangesProps { + leadTime: ProjectDoraMetricsSchema; +} +export const LeadTimeForChanges = ({ leadTime }: ILeadTimeForChangesProps) => { const columns = useMemo( () => [ { @@ -117,7 +105,7 @@ export const LeadTimeForChanges = () => { Cell: ({ row: { original } }: any) => ( @@ -129,8 +117,8 @@ export const LeadTimeForChanges = () => { data-loading > {Math.round( - (dora.projectAverage - ? dora.projectAverage + (leadTime.projectAverage + ? leadTime.projectAverage : 0) - original.timeToProduction, )}{' '} days @@ -166,7 +154,7 @@ export const LeadTimeForChanges = () => { disableSortBy: true, }, ], - [JSON.stringify(dora.features), loading], + [JSON.stringify(leadTime.features)], ); const initialState = useMemo( @@ -194,7 +182,7 @@ export const LeadTimeForChanges = () => { } = useTable( { columns: columns as any[], - data, + data: leadTime.features, initialState, autoResetGlobalFilter: false, autoResetSortBy: false, diff --git a/frontend/src/component/project/Project/ProjectInsights/ProjectInsights.tsx b/frontend/src/component/project/Project/ProjectInsights/ProjectInsights.tsx index e77721cb6b..699e6ef040 100644 --- a/frontend/src/component/project/Project/ProjectInsights/ProjectInsights.tsx +++ b/frontend/src/component/project/Project/ProjectInsights/ProjectInsights.tsx @@ -52,7 +52,7 @@ export const ProjectInsights = () => { - +