@@ -21,7 +21,7 @@ import { groupBy, memoize, sortBy, toPairs } from 'lodash'; | |||
import { enhanceMeasure } from '../../components/measure/utils'; | |||
import { isBranch, isPullRequest } from '../../helpers/branch-like'; | |||
import { getLocalizedMetricName } from '../../helpers/l10n'; | |||
import { getDisplayMetrics, isDiffMetric } from '../../helpers/measures'; | |||
import { MEASURES_REDIRECTION, getDisplayMetrics, isDiffMetric } from '../../helpers/measures'; | |||
import { | |||
cleanQuery, | |||
parseAsOptionalBoolean, | |||
@@ -231,7 +231,8 @@ export interface Query { | |||
} | |||
export const parseQuery = memoize((urlQuery: RawQuery): Query => { | |||
const metric = (parseAsString(urlQuery['metric']) || DEFAULT_METRIC) as MetricKey; | |||
const parsedMetric = parseAsString<MetricKey>(urlQuery['metric']) || DEFAULT_METRIC; | |||
const metric = MEASURES_REDIRECTION[parsedMetric] ?? parsedMetric; | |||
return { | |||
metric, | |||
selected: parseAsString(urlQuery['selected']), |
@@ -21,6 +21,7 @@ import { startOfDay } from 'date-fns'; | |||
import { isEqual } from 'lodash'; | |||
import { DEFAULT_GRAPH } from '../../components/activity-graph/utils'; | |||
import { parseDate } from '../../helpers/dates'; | |||
import { MEASURES_REDIRECTION } from '../../helpers/measures'; | |||
import { | |||
cleanQuery, | |||
parseAsArray, | |||
@@ -30,6 +31,7 @@ import { | |||
serializeString, | |||
serializeStringArray, | |||
} from '../../helpers/query'; | |||
import { MetricKey } from '../../types/metrics'; | |||
import { GraphType, ParsedAnalysis } from '../../types/project-activity'; | |||
import { Dict, RawQuery } from '../../types/types'; | |||
@@ -109,9 +111,12 @@ export function getAnalysesByVersionByDay( | |||
} | |||
export function parseQuery(urlQuery: RawQuery): Query { | |||
const parsedMetrics = parseAsArray(urlQuery['custom_metrics'], parseAsString<MetricKey>); | |||
const customMetrics = parsedMetrics.map((metric) => MEASURES_REDIRECTION[metric] ?? metric); | |||
return { | |||
category: parseAsString(urlQuery['category']), | |||
customMetrics: parseAsArray(urlQuery['custom_metrics'], parseAsString), | |||
customMetrics, | |||
from: parseAsDate(urlQuery['from']), | |||
graph: parseGraph(urlQuery['graph']), | |||
project: parseAsString(urlQuery['id']), |
@@ -28,6 +28,10 @@ import { translate, translateWithParameters } from './l10n'; | |||
import { getCurrentLocale } from './l10nBundle'; | |||
import { isDefined } from './types'; | |||
export const MEASURES_REDIRECTION: Partial<Record<MetricKey, MetricKey>> = { | |||
[MetricKey.wont_fix_issues]: MetricKey.accepted_issues, | |||
}; | |||
export function enhanceMeasuresWithMetrics( | |||
measures: Measure[], | |||
metrics: Metric[], |
@@ -1485,12 +1485,12 @@ export const DEFAULT_METRICS: Dict<Metric> = { | |||
qualitative: false, | |||
hidden: false, | |||
}, | |||
wont_fix_issues: { | |||
id: 'AXJMbIl_PAOIsUIE3gt5', | |||
key: 'wont_fix_issues', | |||
accepted_issues: { | |||
id: 'AXJMbIl_PAOIsUIE3ga7', | |||
key: 'accepted_issues', | |||
type: 'INT', | |||
name: "Won't Fix Issues", | |||
description: "Won't fix issues", | |||
name: 'Accepted Issues', | |||
description: 'Accepted issues', | |||
domain: 'Issues', | |||
direction: -1, | |||
qualitative: false, |
@@ -152,6 +152,7 @@ export enum MetricKey { | |||
uncovered_lines = 'uncovered_lines', | |||
violations = 'violations', | |||
vulnerabilities = 'vulnerabilities', | |||
accepted_issues = 'accepted_issues', | |||
wont_fix_issues = 'wont_fix_issues', | |||
} | |||