Skip to content

Commit 2ff0106

Browse files
VladLasitsaVladLasitsa
committed
Fixed nits
1 parent af28c3d commit 2ff0106

7 files changed

Lines changed: 33 additions & 35 deletions

File tree

‎src/plugins/vis_types/gauge/public/convert_to_lens/gauge.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ export const convertToLens: ConvertGaugeVisToLensVisualization = async (vis, tim
6767
return null;
6868
}
6969

70-
const result = layers[0];
70+
const [layerConfig] = layers;
7171

7272
// for now, multiple metrics are not supported
73-
if (result.metrics.length > 1 || result.buckets.all.length) {
73+
if (layerConfig.metrics.length > 1 || layerConfig.buckets.all.length) {
7474
return null;
7575
}
7676

77-
if (result.metrics[0]) {
78-
const metric = result.columns.find(({ columnId }) => columnId === result.metrics[0]);
77+
if (layerConfig.metrics[0]) {
78+
const metric = layerConfig.columns.find(({ columnId }) => columnId === layerConfig.metrics[0]);
7979
if (metric?.dataType !== 'number') {
8080
return null;
8181
}
@@ -84,11 +84,11 @@ export const convertToLens: ConvertGaugeVisToLensVisualization = async (vis, tim
8484
const layerId = uuid();
8585
const indexPatternId = dataView.id!;
8686

87-
const metricAccessor = result.metrics[0];
87+
const metricAccessor = layerConfig.metrics[0];
8888
const { min, max, isPercentageMode } = percentageModeConfig as PercentageModeConfigWithMinMax;
8989
const minColumn = createStaticValueColumn(isPercentageMode ? 0 : min);
9090
const maxColumn = createStaticValueColumn(isPercentageMode ? 1 : max);
91-
const columns = [...result.columns, minColumn, maxColumn];
91+
const columns = [...layerConfig.columns, minColumn, maxColumn];
9292

9393
return {
9494
type: 'lnsGauge',

‎src/plugins/vis_types/gauge/public/convert_to_lens/goal.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,23 @@ export const convertToLens: ConvertGoalVisToLensVisualization = async (vis, time
6767
return null;
6868
}
6969

70-
const result = layers[0];
70+
const [layerConfig] = layers;
7171

7272
// for now, multiple metrics are not supported
73-
if (result.metrics.length > 1 || result.buckets.all.length > 1) {
73+
if (layerConfig.metrics.length > 1 || layerConfig.buckets.all.length > 1) {
7474
return null;
7575
}
7676

77-
if (result.metrics[0]) {
78-
const metric = result.columns.find(({ columnId }) => columnId === result.metrics[0]);
77+
if (layerConfig.metrics[0]) {
78+
const metric = layerConfig.columns.find(({ columnId }) => columnId === layerConfig.metrics[0]);
7979
if (metric?.dataType !== 'number') {
8080
return null;
8181
}
8282
}
8383
const { isPercentageMode, max } = percentageModeConfig as PercentageModeConfigWithMinMax;
8484
const maxColumn = createStaticValueColumn(isPercentageMode ? 1 : max);
8585

86-
const columns = [...result.columns, maxColumn];
86+
const columns = [...layerConfig.columns, maxColumn];
8787
const layerId = uuid();
8888
const indexPatternId = dataView.id!;
8989

@@ -102,7 +102,7 @@ export const convertToLens: ConvertGoalVisToLensVisualization = async (vis, time
102102
vis.params,
103103
getPalette(vis.params.gauge, percentageModeConfig, true),
104104
{
105-
...result,
105+
...layerConfig,
106106
maxAccessor: maxColumn.columnId,
107107
}
108108
),

‎src/plugins/vis_types/metric/public/convert_to_lens/index.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,15 @@ export const convertToLens: ConvertMetricVisToLensVisualization = async (vis, ti
6060
return null;
6161
}
6262

63-
const result = layers[0];
63+
const [layerConfig] = layers;
6464

6565
// for now, multiple metrics are not supported
66-
if (result.metrics.length > 1 || result.buckets.all.length > 1) {
66+
if (layerConfig.metrics.length > 1 || layerConfig.buckets.all.length > 1) {
6767
return null;
6868
}
6969

70-
if (result.metrics[0]) {
71-
const metric = result.columns.find(({ columnId }) => columnId === result.metrics[0]);
70+
if (layerConfig.metrics[0]) {
71+
const metric = layerConfig.columns.find(({ columnId }) => columnId === layerConfig.metrics[0]);
7272
if (metric?.dataType !== 'number') {
7373
return null;
7474
}
@@ -83,15 +83,15 @@ export const convertToLens: ConvertMetricVisToLensVisualization = async (vis, ti
8383
{
8484
indexPatternId,
8585
layerId,
86-
columns: result.columns.map(excludeMetaFromColumn),
86+
columns: layerConfig.columns.map(excludeMetaFromColumn),
8787
columnOrder: [],
8888
},
8989
],
9090
configuration: getConfiguration(
9191
layerId,
9292
vis.params,
9393
getPalette(vis.params.metric, percentageModeConfig),
94-
result
94+
layerConfig
9595
),
9696
indexPatternIds: [indexPatternId],
9797
};

‎src/plugins/vis_types/pie/public/convert_to_lens/index.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,11 @@ export const convertToLens: ConvertPieToLensVisualization = async (vis, timefilt
5454
return null;
5555
}
5656

57-
const result = layers[0];
57+
const [layerConfig] = layers;
5858

5959
// doesn't support more than three split slice levels
6060
// doesn't support pie without at least one split slice
61-
if (result.buckets.all.length > 3 || !result.buckets.all.length) {
61+
if (layerConfig.buckets.all.length > 3 || !layerConfig.buckets.all.length) {
6262
return null;
6363
}
6464

@@ -71,11 +71,11 @@ export const convertToLens: ConvertPieToLensVisualization = async (vis, timefilt
7171
{
7272
indexPatternId,
7373
layerId,
74-
columns: result.columns.map(excludeMetaFromColumn),
74+
columns: layerConfig.columns.map(excludeMetaFromColumn),
7575
columnOrder: [],
7676
},
7777
],
78-
configuration: getConfiguration(layerId, vis, result),
78+
configuration: getConfiguration(layerId, vis, layerConfig),
7979
indexPatternIds: [indexPatternId],
8080
};
8181
};

‎src/plugins/vis_types/table/public/convert_to_lens/index.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export const convertToLens: ConvertTableToLensVisualization = async (vis, timefi
6161
return null;
6262
}
6363

64-
const result = layers[0];
64+
const [layerConfig] = layers;
6565

6666
if (vis.params.percentageCol) {
6767
const visSchemas = getVisSchemas(vis, {
@@ -80,12 +80,12 @@ export const convertToLens: ConvertTableToLensVisualization = async (vis, timefi
8080
if (!percentageColumn) {
8181
return null;
8282
}
83-
result.columns.splice(
84-
result.columnsWithoutReferenced.findIndex((c) => c.meta.aggId === metricAgg.aggId) + 1,
83+
layerConfig.columns.splice(
84+
layerConfig.columnsWithoutReferenced.findIndex((c) => c.meta.aggId === metricAgg.aggId) + 1,
8585
0,
8686
percentageColumn
8787
);
88-
result.columnsWithoutReferenced.push(percentageColumn);
88+
layerConfig.columnsWithoutReferenced.push(percentageColumn);
8989
}
9090

9191
const layerId = uuid();
@@ -96,11 +96,11 @@ export const convertToLens: ConvertTableToLensVisualization = async (vis, timefi
9696
{
9797
indexPatternId,
9898
layerId,
99-
columns: result.columns.map(excludeMetaFromColumn),
99+
columns: layerConfig.columns.map(excludeMetaFromColumn),
100100
columnOrder: [],
101101
},
102102
],
103-
configuration: getConfiguration(layerId, vis.params, result),
103+
configuration: getConfiguration(layerId, vis.params, layerConfig),
104104
indexPatternIds: [indexPatternId],
105105
};
106106
};

‎src/plugins/vis_types/xy/public/convert_to_lens/index.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ export const convertToLens: ConvertXYToLensVisualization = async (vis, timefilte
132132

133133
const uuid = await import('uuid/v4');
134134

135-
const layers = dataLayers.reduce<Layer[]>((accLayers, l) => {
135+
const layers = dataLayers.map<Layer>((l) => {
136136
const layerId = uuid.default();
137137
const series = visibleSeries.find((s) =>
138138
l.columns.some((c) => !c.isBucketed && c.meta.aggId.split('.')[0] === s.data.id)
@@ -142,17 +142,16 @@ export const convertToLens: ConvertXYToLensVisualization = async (vis, timefilte
142142
l.bucketCollapseFn[key].includes(l.buckets.customBuckets[l.metrics[0]])
143143
)
144144
: undefined;
145-
accLayers.push({
145+
return {
146146
indexPatternId,
147147
layerId,
148148
columns: l.columns.map(excludeMetaFromColumn),
149149
columnOrder: [],
150150
seriesId: series?.data.id!,
151151
collapseFn,
152152
isReferenceLineLayer: false,
153-
});
154-
return accLayers;
155-
}, []);
153+
};
154+
});
156155

157156
if (vis.params.thresholdLine.show) {
158157
layers.push({

‎src/plugins/visualizations/public/convert_to_lens/schemas.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,7 @@ export const getColumnsFromVis = <T>(
173173
const layers = [];
174174

175175
if (series && series.length) {
176-
for (let i = 0; i < series.length; i++) {
177-
const metricAggIds = series[i].metrics;
176+
for (const { metrics: metricAggIds } of series) {
178177
const metrics = aggs.filter(
179178
(agg) => agg.aggId && metricAggIds.includes(agg.aggId.split('.')[0])
180179
);

0 commit comments

Comments
 (0)