Skip to content

Commit ea51592

Browse files
committed
run yarn dev
1 parent 2177bfa commit ea51592

File tree

2 files changed

+29
-8
lines changed

2 files changed

+29
-8
lines changed

src/data_formatter.test.ts

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,14 @@ describe('DataFormatter', () => {
169169
panel: {
170170
valueName: 'total',
171171
},
172-
locations: [{ key: 'IE', name: 'Ireland', latitude: 1, longitude: 1 }, { key: 'SE', name: 'Sweden', latitude: 2, longitude: 2 }],
173-
series: [{ alias: 'IE', datapoints: [1, 2], stats: { total: 3 } }, { alias: 'SE', datapoints: [2, 3], stats: { total: 5 } }],
172+
locations: [
173+
{ key: 'IE', name: 'Ireland', latitude: 1, longitude: 1 },
174+
{ key: 'SE', name: 'Sweden', latitude: 2, longitude: 2 },
175+
],
176+
series: [
177+
{ alias: 'IE', datapoints: [1, 2], stats: { total: 3 } },
178+
{ alias: 'SE', datapoints: [2, 3], stats: { total: 5 } },
179+
],
174180
});
175181
dataFormatter = new DataFormatter(ctrl);
176182
dataFormatter.setTimeseriesValues(ctrl.series, formattedData);
@@ -197,8 +203,14 @@ describe('DataFormatter', () => {
197203
panel: {
198204
valueName: 'total',
199205
},
200-
locations: [{ key: 'IE', name: 'Ireland', latitude: 1, longitude: 1 }, { key: 'SE', name: 'Sweden', latitude: 2, longitude: 2 }],
201-
series: [{ alias: 'ie', datapoints: [1, 2], stats: { total: 3 } }, { alias: 'se', datapoints: [2, 3], stats: { total: 5 } }],
206+
locations: [
207+
{ key: 'IE', name: 'Ireland', latitude: 1, longitude: 1 },
208+
{ key: 'SE', name: 'Sweden', latitude: 2, longitude: 2 },
209+
],
210+
series: [
211+
{ alias: 'ie', datapoints: [1, 2], stats: { total: 3 } },
212+
{ alias: 'se', datapoints: [2, 3], stats: { total: 5 } },
213+
],
202214
});
203215
dataFormatter = new DataFormatter(ctrl);
204216
dataFormatter.setTimeseriesValues(ctrl.series, formattedData);
@@ -226,7 +238,10 @@ describe('DataFormatter', () => {
226238
valueName: 'total',
227239
},
228240
locations: [{ key: 'IE', name: 'Ireland', latitude: 1, longitude: 1 }],
229-
series: [{ alias: 'SX', datapoints: [1, 2], stats: { total: 3 } }, { alias: 'IE', datapoints: [1, 2], stats: { total: 3 } }],
241+
series: [
242+
{ alias: 'SX', datapoints: [1, 2], stats: { total: 3 } },
243+
{ alias: 'IE', datapoints: [1, 2], stats: { total: 3 } },
244+
],
230245
});
231246
dataFormatter = new DataFormatter(ctrl);
232247
dataFormatter.setTimeseriesValues(ctrl.series, formattedData);
@@ -245,7 +260,10 @@ describe('DataFormatter', () => {
245260
valueName: 'total',
246261
decimals: 2,
247262
},
248-
locations: [{ key: 'IE', name: 'Ireland', latitude: 1, longitude: 1 }, { key: 'SE', name: 'Sweden', latitude: 2, longitude: 2 }],
263+
locations: [
264+
{ key: 'IE', name: 'Ireland', latitude: 1, longitude: 1 },
265+
{ key: 'SE', name: 'Sweden', latitude: 2, longitude: 2 },
266+
],
249267
series: [
250268
{ alias: 'IE', datapoints: [1.11, 2.22], stats: { total: 3.33 } },
251269
{ alias: 'SE', datapoints: [2.221, 3.331], stats: { total: 5.552 } },
@@ -267,7 +285,10 @@ describe('DataFormatter', () => {
267285
valueName: 'total',
268286
decimals: '2',
269287
},
270-
locations: [{ key: 'IE', name: 'Ireland', latitude: 1, longitude: 1 }, { key: 'SE', name: 'Sweden', latitude: 2, longitude: 2 }],
288+
locations: [
289+
{ key: 'IE', name: 'Ireland', latitude: 1, longitude: 1 },
290+
{ key: 'SE', name: 'Sweden', latitude: 2, longitude: 2 },
291+
],
271292
series: [
272293
{ alias: 'IE', datapoints: [1.11, 2.22], stats: { total: 3.33 } },
273294
{ alias: 'SE', datapoints: [2.221, 3.331], stats: { total: 5.552 } },

src/worldmap_ctrl.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ export default class WorldmapCtrl extends MetricsPanelCtrl {
251251
console.info('Refreshing panel. initializing=', this.initializing);
252252
this.errors.reset('data');
253253

254-
if (!this.loading && !this.initializing && (_.isEmpty(this.locations) && _.isEmpty(this.panel.snapshotLocationData))) {
254+
if (!this.loading && !this.initializing && _.isEmpty(this.locations) && _.isEmpty(this.panel.snapshotLocationData)) {
255255
this.loadLocationData(true);
256256
}
257257
}

0 commit comments

Comments
 (0)