From 53555318ef73c9b4b9c5c2cc04ff93c52c9a11f5 Mon Sep 17 00:00:00 2001 From: Kyrylo Shmidt Date: Thu, 22 Aug 2024 15:12:28 +0200 Subject: [PATCH 1/2] Migrate to new impact score field --- .../Assets/AssetList/AssetEntry/index.tsx | 20 +++++++++++++++---- src/components/Assets/AssetList/types.ts | 2 ++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/components/Assets/AssetList/AssetEntry/index.tsx b/src/components/Assets/AssetList/AssetEntry/index.tsx index f6046beb9..dae0ba702 100644 --- a/src/components/Assets/AssetList/AssetEntry/index.tsx +++ b/src/components/Assets/AssetList/AssetEntry/index.tsx @@ -1,5 +1,8 @@ +import { useGlobalStore } from "../../../../containers/Main/stores/useGlobalStore"; +import { getFeatureFlagValue } from "../../../../featureFlags"; +import { isNumber } from "../../../../typeGuards/isNumber"; import { isString } from "../../../../typeGuards/isString"; -import { InsightType } from "../../../../types"; +import { FeatureFlag, InsightType } from "../../../../types"; import { formatTimeDistance } from "../../../../utils/formatTimeDistance"; import { getInsightTypeInfo } from "../../../../utils/getInsightTypeInfo"; import { getInsightTypeOrderPriority } from "../../../../utils/getInsightTypeOrderPriority"; @@ -21,6 +24,15 @@ export const AssetEntry = ({ isImpactHidden, sortingCriterion }: AssetEntryProps) => { + const backendInfo = useGlobalStore.use.backendInfo(); + const isNewImpactScoreCalculationEnabled = getFeatureFlagValue( + backendInfo, + FeatureFlag.IS_NEW_IMPACT_SCORE_CALCULATION_ENABLED + ); + const impactScore = isNewImpactScoreCalculationEnabled + ? entry.impactScore + : entry.impactScores?.ScoreExp25; + const handleLinkClick = () => { onAssetLinkClick(entry); }; @@ -151,14 +163,14 @@ export const AssetEntry = ({ - {!isImpactHidden && entry.impactScores && ( + {!isImpactHidden && isNumber(impactScore) && ( Performance impact - + Date: Thu, 22 Aug 2024 15:19:16 +0200 Subject: [PATCH 2/2] Fix stories --- .../AssetEntry/AssetEntry.stories.tsx | 2 +- src/components/Assets/AssetList/mockedData.ts | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/components/Assets/AssetList/AssetEntry/AssetEntry.stories.tsx b/src/components/Assets/AssetList/AssetEntry/AssetEntry.stories.tsx index ae15eee79..051dc1dbe 100644 --- a/src/components/Assets/AssetList/AssetEntry/AssetEntry.stories.tsx +++ b/src/components/Assets/AssetList/AssetEntry/AssetEntry.stories.tsx @@ -35,7 +35,7 @@ export const Default: Story = { unit: "ms", raw: 62466300.59999996 }, - + impactScore: 0, impactScores: { ScoreExp25: 0, ScoreExp1000: 0 diff --git a/src/components/Assets/AssetList/mockedData.ts b/src/components/Assets/AssetList/mockedData.ts index 1f7676e9d..2891032c7 100644 --- a/src/components/Assets/AssetList/mockedData.ts +++ b/src/components/Assets/AssetList/mockedData.ts @@ -47,6 +47,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.3521035689991816, impactScores: { ScoreExp25: 0.3521035689991816, ScoreExp1000: 0.3386358571779296 @@ -97,6 +98,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -146,6 +148,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -196,6 +199,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -246,6 +250,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -291,6 +296,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.8314664295667409, ScoreExp1000: 0.8645342516094802 @@ -336,6 +342,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -381,6 +388,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -426,6 +434,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -471,6 +480,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -516,6 +526,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -555,6 +566,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.7208595047530149, ScoreExp1000: 0.6627975469849793 @@ -594,6 +606,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -633,6 +646,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -673,6 +687,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 1.0, ScoreExp1000: 1.0 @@ -713,6 +728,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -753,6 +769,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -793,6 +810,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -833,6 +851,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0 @@ -873,6 +892,7 @@ export const mockedAssetsData: AssetsData = { criticality: 0.5 } ], + impactScore: 0.0, impactScores: { ScoreExp25: 0.0, ScoreExp1000: 0.0