Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const Default: Story = {
unit: "ms",
raw: 62466300.59999996
},

impactScore: 0,
impactScores: {
ScoreExp25: 0,
ScoreExp1000: 0
Expand Down
20 changes: 16 additions & 4 deletions src/components/Assets/AssetList/AssetEntry/index.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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);
};
Expand Down Expand Up @@ -151,14 +163,14 @@ export const AssetEntry = ({
</s.ValueContainer>
</s.Stats>
</s.StatsColumn>
{!isImpactHidden && entry.impactScores && (
{!isImpactHidden && isNumber(impactScore) && (
<s.StatsColumn>
<s.Stats>
<span>Performance impact</span>
<Tooltip title={entry.impactScores.ScoreExp25}>
<Tooltip title={impactScore}>
<s.ValueContainer>
<ImpactScore
score={entry.impactScores.ScoreExp25}
score={impactScore}
showIndicator={
sortingCriterion === SORTING_CRITERION.PERFORMANCE_IMPACT
}
Expand Down
20 changes: 20 additions & 0 deletions src/components/Assets/AssetList/mockedData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.3521035689991816,
impactScores: {
ScoreExp25: 0.3521035689991816,
ScoreExp1000: 0.3386358571779296
Expand Down Expand Up @@ -97,6 +98,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -146,6 +148,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -196,6 +199,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -246,6 +250,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -291,6 +296,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.8314664295667409,
ScoreExp1000: 0.8645342516094802
Expand Down Expand Up @@ -336,6 +342,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -381,6 +388,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -426,6 +434,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -471,6 +480,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -516,6 +526,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -555,6 +566,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.7208595047530149,
ScoreExp1000: 0.6627975469849793
Expand Down Expand Up @@ -594,6 +606,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -633,6 +646,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -673,6 +687,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 1.0,
ScoreExp1000: 1.0
Expand Down Expand Up @@ -713,6 +728,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -753,6 +769,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -793,6 +810,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -833,6 +851,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down Expand Up @@ -873,6 +892,7 @@ export const mockedAssetsData: AssetsData = {
criticality: 0.5
}
],
impactScore: 0.0,
impactScores: {
ScoreExp25: 0.0,
ScoreExp1000: 0.0
Expand Down
2 changes: 2 additions & 0 deletions src/components/Assets/AssetList/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ export interface AssetEntry {
instrumentationLibrary?: string;
insights: Insight[];
latestSpanTimestamp: string;
/** @deprecated */
impactScores?: ImpactScores;
impactScore: number;
service: string;
services: string[];
spanCodeObjectId: string;
Expand Down