Skip to content

Commit 3626d3e

Browse files
dej611dej611
committed
♻️ Refactor configureDimension function
1 parent cb75149 commit 3626d3e

File tree

4 files changed

+6
-22
lines changed

4 files changed

+6
-22
lines changed

‎x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,18 @@ export default function ({ getPageObjects, getService }) {
4040
operation: 'date_histogram',
4141
field: '@timestamp',
4242
});
43-
await PageObjects.lens.closeDimensionEditor();
4443

4544
await PageObjects.lens.configureDimension({
4645
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
4746
operation: 'avg',
4847
field: 'bytes',
4948
});
50-
await PageObjects.lens.closeDimensionEditor();
5149

5250
await PageObjects.lens.configureDimension({
5351
dimension: 'lnsXY_splitDimensionPanel > lns-empty-dimension',
5452
operation: 'terms',
5553
field: 'ip',
5654
});
57-
await PageObjects.lens.closeDimensionEditor();
5855
await PageObjects.lens.save(title, saveAsNew, redirectToOrigin);
5956
}
6057

‎x-pack/test/functional/apps/lens/rollup.ts‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,18 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
3434
operation: 'date_histogram',
3535
field: '@timestamp',
3636
});
37-
await PageObjects.lens.closeDimensionEditor();
3837

3938
await PageObjects.lens.configureDimension({
4039
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
4140
operation: 'sum',
4241
field: 'bytes',
4342
});
44-
await PageObjects.lens.closeDimensionEditor();
4543

4644
await PageObjects.lens.configureDimension({
4745
dimension: 'lnsXY_splitDimensionPanel > lns-empty-dimension',
4846
operation: 'terms',
4947
field: 'geo.src',
5048
});
51-
await PageObjects.lens.closeDimensionEditor();
5249
expect(await find.allByCssSelector('.echLegendItem')).to.have.length(2);
5350

5451
await PageObjects.lens.save('Afancilenstest');

‎x-pack/test/functional/apps/lens/smokescreen.ts‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,18 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
2525
operation: 'date_histogram',
2626
field: '@timestamp',
2727
});
28-
await PageObjects.lens.closeDimensionEditor();
2928

3029
await PageObjects.lens.configureDimension({
3130
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
3231
operation: 'avg',
3332
field: 'bytes',
3433
});
35-
await PageObjects.lens.closeDimensionEditor();
3634

3735
await PageObjects.lens.configureDimension({
3836
dimension: 'lnsXY_splitDimensionPanel > lns-empty-dimension',
3937
operation: 'terms',
4038
field: '@message.raw',
4139
});
42-
await PageObjects.lens.closeDimensionEditor();
4340

4441
await PageObjects.lens.switchToVisualization('lnsDatatable');
4542
await PageObjects.lens.removeDimension('lnsDatatable_column');
@@ -50,7 +47,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
5047
operation: 'terms',
5148
field: 'ip',
5249
});
53-
await PageObjects.lens.closeDimensionEditor();
5450

5551
await PageObjects.lens.save('Afancilenstest');
5652

@@ -76,6 +72,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
7672
dimension: 'lnsXY_splitDimensionPanel > lns-dimensionTrigger',
7773
operation: 'filters',
7874
isPreviousIncompatible: true,
75+
keepOpen: true,
7976
});
8077
await PageObjects.lens.addFilterToAgg(`geo.src : CN`);
8178

@@ -107,14 +104,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
107104
field: '@timestamp',
108105
});
109106

110-
await PageObjects.lens.closeDimensionEditor();
111107
await PageObjects.lens.configureDimension({
112108
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
113109
operation: 'avg',
114110
field: 'bytes',
115111
});
116112

117-
await PageObjects.lens.closeDimensionEditor();
118113
await PageObjects.lens.createLayer();
119114

120115
expect(await PageObjects.lens.hasChartSwitchWarning('line')).to.eql(false);
@@ -129,7 +124,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
129124
1
130125
);
131126

132-
await PageObjects.lens.closeDimensionEditor();
133127
await PageObjects.lens.configureDimension(
134128
{
135129
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
@@ -139,7 +133,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
139133
1
140134
);
141135

142-
await PageObjects.lens.closeDimensionEditor();
143136
expect(await PageObjects.lens.getLayerCount()).to.eql(2);
144137
await testSubjects.click('lnsLayerRemove');
145138
await testSubjects.click('lnsLayerRemove');
@@ -168,8 +161,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
168161

169162
await testSubjects.existOrFail('indexPattern-dimension-formatDecimals');
170163

171-
await PageObjects.lens.closeDimensionEditor();
172-
173164
expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
174165
'Test of label'
175166
);
@@ -186,14 +177,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
186177
field: 'geo.dest',
187178
});
188179

189-
await PageObjects.lens.closeDimensionEditor();
190180
await PageObjects.lens.configureDimension({
191181
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
192182
operation: 'avg',
193183
field: 'bytes',
194184
});
195185

196-
await PageObjects.lens.closeDimensionEditor();
197186
await PageObjects.lens.createLayer();
198187

199188
await PageObjects.lens.configureDimension(
@@ -205,7 +194,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
205194
1
206195
);
207196

208-
await PageObjects.lens.closeDimensionEditor();
209197
await PageObjects.lens.configureDimension(
210198
{
211199
dimension: 'lnsXY_yDimensionPanel > lns-empty-dimension',
@@ -215,7 +203,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
215203
1
216204
);
217205

218-
await PageObjects.lens.closeDimensionEditor();
219206
await PageObjects.lens.save('twolayerchart');
220207
await testSubjects.click('lnsSuggestion-asDonut > lnsSuggestion');
221208

@@ -301,15 +288,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
301288
operation: 'date_histogram',
302289
field: '@timestamp',
303290
});
304-
await PageObjects.lens.closeDimensionEditor();
305291

306292
await PageObjects.lens.configureDimension({
307293
dimension: 'lnsPie_sizeByDimensionPanel > lns-empty-dimension',
308294
operation: 'avg',
309295
field: 'bytes',
310296
});
311297

312-
await PageObjects.lens.closeDimensionEditor();
313298
expect(await PageObjects.lens.hasChartSwitchWarning('lnsDatatable')).to.eql(false);
314299
await PageObjects.lens.switchToVisualization('lnsDatatable');
315300

‎x-pack/test/functional/page_objects/lens_page.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
9090
operation: string;
9191
field?: string;
9292
isPreviousIncompatible?: boolean;
93+
keepOpen?: boolean;
9394
},
9495
layerIndex = 0
9596
) {
@@ -107,6 +108,10 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
107108
await comboBox.openOptionsList(target);
108109
await comboBox.setElement(target, opts.field);
109110
}
111+
112+
if (!opts.keepOpen) {
113+
this.closeDimensionEditor();
114+
}
110115
},
111116

112117
// closes the dimension editor flyout

0 commit comments

Comments
 (0)