Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-08-27 13:49:10 +02:00
Code Issues Projects Releases Wiki Activity

fix: fix variant metrics (#3947) (#3950)

Browse Source
This commit is contained in:
Jaanus Sellin 2023-06-12 11:43:11 +03:00 committed by GitHub
parent 42e68734c8
commit 9ceb88ca0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/component/admin/apiToken/ApiTokenForm/ProjectSelector/ProjectSelector.tsx
View File

@ -2,7 +2,7 @@ import { SelectProjectInput } from './SelectProjectInput/SelectProjectInput';
import { TokenType } from '../../../../../interfaces/token';
import React from 'react';
import { StyledInputDescription } from '../ApiTokenForm.styles';
import useProjects from '../../../../../hooks/api/getters/useProjects/useProjects';
import useProjects from 'hooks/api/getters/useProjects/useProjects';
import { ApiTokenFormErrorType } from '../useApiTokenForm';
import { useOptionalPathParam } from '../../../../../hooks/useOptionalPathParam';

51
src/lib/util/collapseHourlyMetrics.test.ts
View File

@ -108,3 +108,54 @@ test('collapseHourlyMetrics', () => {
},
]);
});
test('collapseHourlyMetrics variants', () => {
const timestamp = startOfHour(new Date());
const metricsWithoutVariant: IClientMetricsEnv = {
featureName: 'a',
appName: 'x',
environment: 'x',
timestamp: addMinutes(timestamp, 1),
yes: 1,
no: 11,
};
const metricsWithVariant1: IClientMetricsEnv = {
featureName: 'a',
appName: 'x',
environment: 'x',
timestamp: addMinutes(timestamp, 2),
yes: 2,
no: 12,
variants: { disabled: 3, red: 2 },
};
const metricsWithVariant2: IClientMetricsEnv = {
featureName: 'a',
appName: 'x',
environment: 'x',
timestamp: addMinutes(timestamp, 2),
yes: 2,
no: 12,
variants: { disabled: 1, red: 3 },
};
expect(
collapseHourlyMetrics([
metricsWithoutVariant,
metricsWithVariant1,
metricsWithVariant2,
]),
).toEqual([
{
featureName: 'a',
appName: 'x',
environment: 'x',
timestamp,
yes: 5,
no: 35,
variants: { disabled: 4, red: 5 },
},
]);
});

2
src/lib/util/collapseHourlyMetrics.ts
View File

@ -51,7 +51,7 @@ export const collapseHourlyMetrics = (
if (metric.variants) {
grouped[key].variants = mergeRecords(
metric.variants,
grouped[key].variants,
grouped[key].variants ?? {},
);
}
}