From 219f4776a2b6a0c8a822be64f5a9aa5dad5ab808 Mon Sep 17 00:00:00 2001 From: Ashley Harrison Date: Tue, 23 Jul 2024 13:56:57 +0100 Subject: [PATCH] run prettier --- packages/grafana-data/src/dataframe/StreamingDataFrame.ts | 4 ++-- .../src/transformations/transformers/histogram.ts | 2 +- .../src/querybuilder/shared/OperationInfoButton.tsx | 2 +- .../src/querybuilder/shared/OperationListExplained.tsx | 2 +- packages/grafana-ui/src/components/Table/styles.ts | 6 +++--- .../src/components/uPlot/config/UPlotAxisBuilder.ts | 2 +- .../src/components/uPlot/config/UPlotScaleBuilder.ts | 5 +++-- public/app/core/components/TimeSeries/utils.ts | 2 +- public/app/core/components/TimelineChart/utils.ts | 4 +++- public/app/features/alerting/unified/MuteTimings.tsx | 2 +- .../alerting/unified/components/contact-points/utils.ts | 4 ++-- .../unified/components/rule-viewer/tabs/Details.tsx | 2 +- .../app/features/alerting/unified/hooks/useCombinedRule.ts | 3 ++- public/app/features/alerting/unified/utils/datasource.ts | 2 +- public/app/features/alerting/unified/utils/receiver-form.ts | 2 +- .../features/connections/tabs/ConnectData/Search/Search.tsx | 2 +- .../settings/variables/components/VariableTextField.tsx | 2 +- .../TransformationsEditor/TransformationOperationRow.tsx | 2 +- .../features/explore/CorrelationTransformationAddModal.tsx | 2 +- public/app/features/explore/Logs/LogsTable.tsx | 2 +- .../gops/configuration-tracker/components/Essentials.tsx | 2 +- .../azure_monitor/azure_monitor_datasource.test.ts | 2 +- .../grafana-pyroscope-datasource/QueryEditor/Stack.tsx | 2 +- .../plugins/datasource/grafana/components/QueryEditor.tsx | 2 +- .../components/editor/query/influxql/utils/tagUtils.ts | 2 +- .../editor/query/influxql/visual/InputSection.tsx | 2 +- public/app/plugins/datasource/parca/QueryEditor/Stack.tsx | 2 +- public/app/plugins/panel/heatmap/utils.ts | 4 ++-- public/app/plugins/panel/piechart/PieChartPanel.tsx | 2 +- .../plugins/panel/state-timeline/StateTimelineTooltip2.tsx | 2 +- public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx | 2 +- public/app/plugins/panel/xychart/v2/migrations.ts | 2 +- public/app/plugins/panel/xychart/v2/scatter.ts | 4 ++-- 33 files changed, 44 insertions(+), 40 deletions(-) diff --git a/packages/grafana-data/src/dataframe/StreamingDataFrame.ts b/packages/grafana-data/src/dataframe/StreamingDataFrame.ts index 2837f3553c6..ac928f73f48 100644 --- a/packages/grafana-data/src/dataframe/StreamingDataFrame.ts +++ b/packages/grafana-data/src/dataframe/StreamingDataFrame.ts @@ -268,8 +268,8 @@ export class StreamingDataFrame implements DataFrame { type: f.type ?? FieldType.other, // transfer old values by type & name, unless we relied on labels to match fields values: isWide - ? this.fields.find((of) => of.name === f.name && f.type === of.type)?.values ?? - Array(this.length).fill(undefined) + ? (this.fields.find((of) => of.name === f.name && f.type === of.type)?.values ?? + Array(this.length).fill(undefined)) : [], }; }); diff --git a/packages/grafana-data/src/transformations/transformers/histogram.ts b/packages/grafana-data/src/transformations/transformers/histogram.ts index bc608996985..0d5746309b7 100644 --- a/packages/grafana-data/src/transformations/transformers/histogram.ts +++ b/packages/grafana-data/src/transformations/transformers/histogram.ts @@ -459,7 +459,7 @@ export function buildHistogram(frames: DataFrame[], options?: HistogramTransform state: undefined, config: bucketDecimals === 0 - ? config ?? {} + ? (config ?? {}) : { ...config, decimals: bucketDecimals, diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationInfoButton.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationInfoButton.tsx index d95e308d817..e50c3b6a803 100644 --- a/packages/grafana-prometheus/src/querybuilder/shared/OperationInfoButton.tsx +++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationInfoButton.tsx @@ -118,5 +118,5 @@ const getStyles = (theme: GrafanaTheme2) => { }; function getOperationDocs(def: QueryBuilderOperationDef, op: QueryBuilderOperation): string { - return renderMarkdown(def.explainHandler ? def.explainHandler(op, def) : def.documentation ?? 'no docs'); + return renderMarkdown(def.explainHandler ? def.explainHandler(op, def) : (def.documentation ?? 'no docs')); } diff --git a/packages/grafana-prometheus/src/querybuilder/shared/OperationListExplained.tsx b/packages/grafana-prometheus/src/querybuilder/shared/OperationListExplained.tsx index 580109a0999..92afe395aaf 100644 --- a/packages/grafana-prometheus/src/querybuilder/shared/OperationListExplained.tsx +++ b/packages/grafana-prometheus/src/querybuilder/shared/OperationListExplained.tsx @@ -34,7 +34,7 @@ export function OperationListExplained({ return `Operation ${op.id} not found`; } const title = def.renderer(op, def, ''); - const body = def.explainHandler ? def.explainHandler(op, def) : def.documentation ?? 'no docs'; + const body = def.explainHandler ? def.explainHandler(op, def) : (def.documentation ?? 'no docs'); return (
{ ticks: Object.assign( { show: true, - stroke: border?.show ? color ?? theme.colors.text.primary : gridColor, + stroke: border?.show ? (color ?? theme.colors.text.primary) : gridColor, width: 1 / devicePixelRatio, size: 4, }, diff --git a/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts b/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts index e840eb5c5fe..47a0595e12b 100644 --- a/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts +++ b/packages/grafana-ui/src/components/uPlot/config/UPlotScaleBuilder.ts @@ -55,8 +55,9 @@ export class UPlotScaleBuilder extends PlotConfigBuilder { : distr === ScaleDistribution.Ordinal ? 2 : 1, - log: distr === ScaleDistribution.Log || distr === ScaleDistribution.Symlog ? this.props.log ?? 2 : undefined, - asinh: distr === ScaleDistribution.Symlog ? this.props.linearThreshold ?? 1 : undefined, + log: + distr === ScaleDistribution.Log || distr === ScaleDistribution.Symlog ? (this.props.log ?? 2) : undefined, + asinh: distr === ScaleDistribution.Symlog ? (this.props.linearThreshold ?? 1) : undefined, } : {}; diff --git a/public/app/core/components/TimeSeries/utils.ts b/public/app/core/components/TimeSeries/utils.ts index 833db010556..71a2a740375 100644 --- a/public/app/core/components/TimeSeries/utils.ts +++ b/public/app/core/components/TimeSeries/utils.ts @@ -323,7 +323,7 @@ export const preparePlotConfigBuilder: UPlotConfigPrepFn = ({ scaleKey, label: customConfig.axisLabel, size: customConfig.axisWidth, - placement: isHorizontal ? customConfig.axisPlacement ?? AxisPlacement.Auto : AxisPlacement.Bottom, + placement: isHorizontal ? (customConfig.axisPlacement ?? AxisPlacement.Auto) : AxisPlacement.Bottom, formatValue: (v, decimals) => formattedValueToString(fmt(v, decimals)), theme, grid: { show: customConfig.axisGridShow }, diff --git a/public/app/core/components/TimelineChart/utils.ts b/public/app/core/components/TimelineChart/utils.ts index 156dbd1990d..835d5e74d2c 100644 --- a/public/app/core/components/TimelineChart/utils.ts +++ b/public/app/core/components/TimelineChart/utils.ts @@ -443,7 +443,9 @@ export function getThresholdItems(fieldConfig: FieldConfig, theme: GrafanaTheme2 } const steps = thresholds.steps; - const getDisplay = getValueFormat(thresholds.mode === ThresholdsMode.Percentage ? 'percent' : fieldConfig.unit ?? ''); + const getDisplay = getValueFormat( + thresholds.mode === ThresholdsMode.Percentage ? 'percent' : (fieldConfig.unit ?? '') + ); // `undefined` value for decimals will use `auto` const format = (value: number) => formattedValueToString(getDisplay(value, fieldConfig.decimals ?? undefined)); diff --git a/public/app/features/alerting/unified/MuteTimings.tsx b/public/app/features/alerting/unified/MuteTimings.tsx index 8306c1eb724..26d2028f889 100644 --- a/public/app/features/alerting/unified/MuteTimings.tsx +++ b/public/app/features/alerting/unified/MuteTimings.tsx @@ -22,7 +22,7 @@ const MuteTimings = () => { const getMuteTimingByName = useCallback( (id: string, fromTimeIntervals: boolean): MuteTimeInterval | undefined => { - const time_intervals = fromTimeIntervals ? config?.time_intervals ?? [] : config?.mute_time_intervals ?? []; + const time_intervals = fromTimeIntervals ? (config?.time_intervals ?? []) : (config?.mute_time_intervals ?? []); const timing = time_intervals.find(({ name }: MuteTimeInterval) => name === id); if (timing) { diff --git a/public/app/features/alerting/unified/components/contact-points/utils.ts b/public/app/features/alerting/unified/components/contact-points/utils.ts index e472fb07f14..d95ee7dc369 100644 --- a/public/app/features/alerting/unified/components/contact-points/utils.ts +++ b/public/app/features/alerting/unified/components/contact-points/utils.ts @@ -124,8 +124,8 @@ export function enhanceContactPointsWithMetadata( const usedContactPointsByName = groupBy(usedContactPoints, 'receiver'); const contactPointsList = alertmanagerConfiguration - ? alertmanagerConfiguration?.alertmanager_config.receivers ?? [] - : contactPoints ?? []; + ? (alertmanagerConfiguration?.alertmanager_config.receivers ?? []) + : (contactPoints ?? []); return contactPointsList.map((contactPoint) => { const receivers = extractReceivers(contactPoint); diff --git a/public/app/features/alerting/unified/components/rule-viewer/tabs/Details.tsx b/public/app/features/alerting/unified/components/rule-viewer/tabs/Details.tsx index 21c8ae2a6a4..6999e5a18ea 100644 --- a/public/app/features/alerting/unified/components/rule-viewer/tabs/Details.tsx +++ b/public/app/features/alerting/unified/components/rule-viewer/tabs/Details.tsx @@ -47,7 +47,7 @@ const Details = ({ rule }: DetailsProps) => { }, [rule.rulerRule]); const annotations: Annotations | undefined = !isRecordingRulerRule(rule.rulerRule) - ? rule.annotations ?? [] + ? (rule.annotations ?? []) : undefined; const hasEvaluationDuration = Number.isFinite(evaluationDuration); diff --git a/public/app/features/alerting/unified/hooks/useCombinedRule.ts b/public/app/features/alerting/unified/hooks/useCombinedRule.ts index d2f24516cac..60782c18315 100644 --- a/public/app/features/alerting/unified/hooks/useCombinedRule.ts +++ b/public/app/features/alerting/unified/hooks/useCombinedRule.ts @@ -143,7 +143,8 @@ function useCombinedRulesLoader( return { loading, - error: promRuleRequest.error ?? isRulerNotSupportedResponse(rulerRuleRequest) ? undefined : rulerRuleRequest.error, + error: + (promRuleRequest.error ?? isRulerNotSupportedResponse(rulerRuleRequest)) ? undefined : rulerRuleRequest.error, dispatched: promRuleRequest.dispatched && rulerRuleRequest.dispatched, }; } diff --git a/public/app/features/alerting/unified/utils/datasource.ts b/public/app/features/alerting/unified/utils/datasource.ts index f4aed4ceacc..7b922f78966 100644 --- a/public/app/features/alerting/unified/utils/datasource.ts +++ b/public/app/features/alerting/unified/utils/datasource.ts @@ -47,7 +47,7 @@ export function getRulesDataSources() { } export function getRulesSourceUniqueKey(rulesSource: RulesSource): string { - return isGrafanaRulesSource(rulesSource) ? 'grafana' : rulesSource.uid ?? rulesSource.id; + return isGrafanaRulesSource(rulesSource) ? 'grafana' : (rulesSource.uid ?? rulesSource.id); } export function getRulesDataSource(rulesSourceName: string) { diff --git a/public/app/features/alerting/unified/utils/receiver-form.ts b/public/app/features/alerting/unified/utils/receiver-form.ts index b7e4b35233b..672fd3ac801 100644 --- a/public/app/features/alerting/unified/utils/receiver-form.ts +++ b/public/app/features/alerting/unified/utils/receiver-form.ts @@ -233,7 +233,7 @@ export function formChannelValuesToGrafanaChannelConfig( ): GrafanaManagedReceiverConfig { const channel: GrafanaManagedReceiverConfig = { settings: omitEmptyValues({ - ...(existing && existing.type === values.type ? existing.settings ?? {} : {}), + ...(existing && existing.type === values.type ? (existing.settings ?? {}) : {}), ...(values.settings ?? {}), }), secureSettings: omitEmptyUnlessExisting(values.secureSettings, existing?.secureFields), diff --git a/public/app/features/connections/tabs/ConnectData/Search/Search.tsx b/public/app/features/connections/tabs/ConnectData/Search/Search.tsx index 75508adffeb..0e8e5435b9e 100644 --- a/public/app/features/connections/tabs/ConnectData/Search/Search.tsx +++ b/public/app/features/connections/tabs/ConnectData/Search/Search.tsx @@ -28,7 +28,7 @@ export interface Props { export const Search = ({ onChange, value }: Props) => { const chromeHeaderHeight = useChromeHeaderHeight(); - const styles = useStyles2(getStyles, config.featureToggles.bodyScrolling ? chromeHeaderHeight ?? 0 : 0); + const styles = useStyles2(getStyles, config.featureToggles.bodyScrolling ? (chromeHeaderHeight ?? 0) : 0); return (
diff --git a/public/app/features/dashboard-scene/settings/variables/components/VariableTextField.tsx b/public/app/features/dashboard-scene/settings/variables/components/VariableTextField.tsx index 6de619d8f9d..e7136100265 100644 --- a/public/app/features/dashboard-scene/settings/variables/components/VariableTextField.tsx +++ b/public/app/features/dashboard-scene/settings/variables/components/VariableTextField.tsx @@ -49,7 +49,7 @@ export function VariableTextField({ defaultValue={defaultValue} onChange={onChange} onBlur={onBlur} - width={grow ? undefined : width ?? 30} + width={grow ? undefined : (width ?? 30)} data-testid={testId} maxLength={maxLength} required={required} diff --git a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx index a1f7db3b37d..e34c93ab6d9 100644 --- a/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx +++ b/public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx @@ -168,7 +168,7 @@ export const TransformationOperationRow = ({ diff --git a/public/app/features/explore/Logs/LogsTable.tsx b/public/app/features/explore/Logs/LogsTable.tsx index ddb3dcb1e5c..4d629e1cc1a 100644 --- a/public/app/features/explore/Logs/LogsTable.tsx +++ b/public/app/features/explore/Logs/LogsTable.tsx @@ -89,7 +89,7 @@ export function LogsTable(props: Props) { }; // If it's a string, then try to guess for a better type for numeric support in viz - field.type = field.type === FieldType.string ? guessFieldTypeForField(field) ?? FieldType.string : field.type; + field.type = field.type === FieldType.string ? (guessFieldTypeForField(field) ?? FieldType.string) : field.type; } return frameWithOverrides; diff --git a/public/app/features/gops/configuration-tracker/components/Essentials.tsx b/public/app/features/gops/configuration-tracker/components/Essentials.tsx index 15fc2f9cefd..c7a509ad1ab 100644 --- a/public/app/features/gops/configuration-tracker/components/Essentials.tsx +++ b/public/app/features/gops/configuration-tracker/components/Essentials.tsx @@ -109,7 +109,7 @@ function OpenLinkButton(props: LinkButtonProps) { const urlToGo = done ? urlToGoWhenDone : urlToGoWhenNotDone; return ( - {done ? labelOnDone ?? label : label} + {done ? (labelOnDone ?? label) : label} ); } diff --git a/public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.test.ts b/public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.test.ts index cac9970ddd5..caeb19f9c04 100644 --- a/public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.test.ts +++ b/public/app/plugins/datasource/azuremonitor/azure_monitor/azure_monitor_datasource.test.ts @@ -748,7 +748,7 @@ describe('AzureMonitorDatasource', () => { if (target?.includes('$reg')) { return 'eastus'; } - return target === `$${multiVariable.id}` ? 'foo,bar' : target ?? ''; + return target === `$${multiVariable.id}` ? 'foo,bar' : (target ?? ''); }; const ds = new AzureMonitorDatasource(ctx.instanceSettings); //ds.azureMonitorDatasource.templateSrv = tsrv; diff --git a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/Stack.tsx b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/Stack.tsx index 483af932c05..e7ee8a098d0 100644 --- a/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/Stack.tsx +++ b/public/app/plugins/datasource/grafana-pyroscope-datasource/QueryEditor/Stack.tsx @@ -23,7 +23,7 @@ const getStyles = (theme: GrafanaTheme2, props: StackProps) => ({ root: css({ display: 'flex', flexDirection: props.direction ?? 'row', - flexWrap: props.wrap ?? true ? 'wrap' : undefined, + flexWrap: (props.wrap ?? true) ? 'wrap' : undefined, alignItems: props.alignItems, gap: theme.spacing(props.gap ?? 2), flexGrow: props.flexGrow, diff --git a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx index 16707526820..e5f3b948d1c 100644 --- a/public/app/plugins/datasource/grafana/components/QueryEditor.tsx +++ b/public/app/plugins/datasource/grafana/components/QueryEditor.tsx @@ -217,7 +217,7 @@ export class UnthemedQueryEditor extends PureComponent { } const distinctFields = new Set(); - const fields: Array> = channel ? channelFields[channel] ?? [] : []; + const fields: Array> = channel ? (channelFields[channel] ?? []) : []; // if (data && data.series?.length) { // for (const frame of data.series) { // for (const field of frame.fields) { diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/utils/tagUtils.ts b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/utils/tagUtils.ts index e3cae3d5ddf..2d6b722b15a 100644 --- a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/utils/tagUtils.ts +++ b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/utils/tagUtils.ts @@ -13,7 +13,7 @@ export function getOperator(tag: InfluxQueryTag): string { // FIXME: sync these to the query-string-generation-code // probably it's in influx_query_model.ts export function getCondition(tag: InfluxQueryTag, isFirst: boolean): string | undefined { - return isFirst ? undefined : tag.condition ?? 'AND'; + return isFirst ? undefined : (tag.condition ?? 'AND'); } export function adjustOperatorIfNeeded(currentOperator: string, newTagValue: string): string { diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/InputSection.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/InputSection.tsx index bb197aedd2d..98c4ebf30ac 100644 --- a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/InputSection.tsx +++ b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/InputSection.tsx @@ -26,7 +26,7 @@ export const InputSection = ({ value, onChange, isWide, placeholder }: Props): J <> ({ root: css({ display: 'flex', flexDirection: props.direction ?? 'row', - flexWrap: props.wrap ?? true ? 'wrap' : undefined, + flexWrap: (props.wrap ?? true) ? 'wrap' : undefined, alignItems: props.alignItems, gap: theme.spacing(props.gap ?? 2), flexGrow: props.flexGrow, diff --git a/public/app/plugins/panel/heatmap/utils.ts b/public/app/plugins/panel/heatmap/utils.ts index 0ad1167497d..04919f2e809 100644 --- a/public/app/plugins/panel/heatmap/utils.ts +++ b/public/app/plugins/panel/heatmap/utils.ts @@ -367,8 +367,8 @@ export function prepConfig(opts: PrepConfigOpts) { if (meta.yOrdinalDisplay) { return splits.map((v) => v < 0 - ? meta.yMinDisplay ?? '' // Check prometheus style labels - : meta.yOrdinalDisplay[v] ?? '' + ? (meta.yMinDisplay ?? '') // Check prometheus style labels + : (meta.yOrdinalDisplay[v] ?? '') ); } return splits; diff --git a/public/app/plugins/panel/piechart/PieChartPanel.tsx b/public/app/plugins/panel/piechart/PieChartPanel.tsx index 5d2ab75b69d..ae7bc3624b7 100644 --- a/public/app/plugins/panel/piechart/PieChartPanel.tsx +++ b/public/app/plugins/panel/piechart/PieChartPanel.tsx @@ -127,7 +127,7 @@ function getLegend(props: Props, displayValues: FieldDisplay[]) { percent: percentOfTotal, text: hideFromViz || isNaN(fractionOfTotal) - ? props.fieldConfig.defaults.noValue ?? '-' + ? (props.fieldConfig.defaults.noValue ?? '-') : percentOfTotal.toFixed(value.field.decimals ?? 0) + '%', title: valuesToShow.length > 1 ? 'Percent' : '', }); diff --git a/public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx b/public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx index d60aad35d23..1588f7a353c 100644 --- a/public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx +++ b/public/app/plugins/panel/state-timeline/StateTimelineTooltip2.tsx @@ -76,7 +76,7 @@ export const StateTimelineTooltip2 = ({ } const headerItem: VizTooltipItem = { - label: xField.type === FieldType.time ? '' : xField.state?.displayName ?? xField.name, + label: xField.type === FieldType.time ? '' : (xField.state?.displayName ?? xField.name), value: xVal, }; diff --git a/public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx b/public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx index 49f8a3262bb..a30bb03ce17 100644 --- a/public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx +++ b/public/app/plugins/panel/timeseries/TimeSeriesTooltip.tsx @@ -86,7 +86,7 @@ export const TimeSeriesTooltip = ({ const headerItem: VizTooltipItem | null = xField.config.custom?.hideFrom?.tooltip ? null : { - label: xField.type === FieldType.time ? '' : xField.state?.displayName ?? xField.name, + label: xField.type === FieldType.time ? '' : (xField.state?.displayName ?? xField.name), value: xVal, }; diff --git a/public/app/plugins/panel/xychart/v2/migrations.ts b/public/app/plugins/panel/xychart/v2/migrations.ts index b4857d602fe..7fe76f5290e 100644 --- a/public/app/plugins/panel/xychart/v2/migrations.ts +++ b/public/app/plugins/panel/xychart/v2/migrations.ts @@ -189,7 +189,7 @@ function migrateOptions(panel: PanelModel): Options { frame: { matcher: { id: FrameMatcherID.byIndex, - options: frame ?? (seriesMapping === SeriesMapping.Manual ? i++ : frameShared ?? 0), + options: frame ?? (seriesMapping === SeriesMapping.Manual ? i++ : (frameShared ?? 0)), }, }, x: { diff --git a/public/app/plugins/panel/xychart/v2/scatter.ts b/public/app/plugins/panel/xychart/v2/scatter.ts index e918620479e..904d35ec73a 100644 --- a/public/app/plugins/panel/xychart/v2/scatter.ts +++ b/public/app/plugins/panel/xychart/v2/scatter.ts @@ -327,7 +327,7 @@ export const prepConfig = (xySeries: XYSeries[], theme: GrafanaTheme2) => { let xAxisAutoLabel = xySeries.length === 1 - ? xField.state?.displayName ?? xField.name + ? (xField.state?.displayName ?? xField.name) : new Set(dispNames).size === 1 ? dispNames[0] : getCommonPrefixSuffix(dispNames); @@ -384,7 +384,7 @@ export const prepConfig = (xySeries: XYSeries[], theme: GrafanaTheme2) => { let yAxisAutoLabel = xySeries.length === 1 - ? field.state?.displayName ?? field.name + ? (field.state?.displayName ?? field.name) : new Set(dispNames).size === 1 ? dispNames[0] : getCommonPrefixSuffix(dispNames);