Skip to content

Commit bc0736f

Browse files
sarpong4sarpong4
committed
fix added from PR comments
Signed-off-by: Onesimus Wiafe <[email protected]>
1 parent 7b7d8b3 commit bc0736f

File tree

2 files changed

+39
-40
lines changed

2 files changed

+39
-40
lines changed

‎packages/perspective-viewer-d3fc/src/ts/legend/filter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function refineDateData(settings: Settings) {
1818
const { crossValues } = settings;
1919

2020
crossValues.forEach(({ type }, index) => {
21-
console.log("Type:", type)
21+
console.log("Type:", type);
2222
const formatType =
2323
type === "date" || type === "datetime"
2424
? (value: any) => new Date(value).toLocaleString()

‎packages/perspective-viewer-d3fc/test/js/axisLabel.spec.ts‎

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -36,79 +36,78 @@ test.beforeEach(async ({ page }) => {
3636
});
3737

3838
function confirmDataIsDate(dateValues: any[]) {
39-
if (dateValues.length === 0){
40-
throw Error("No date values recorded")
39+
if (dateValues.length === 0) {
40+
throw Error("No date values recorded");
4141
}
4242

43-
const filtered_dates = dateValues.filter(_ => isNaN(Date.parse(_)));
43+
const filtered_dates = dateValues.filter((_) => isNaN(Date.parse(_)));
4444

45-
expect(filtered_dates.length).toEqual(0)
45+
expect(filtered_dates.length).toEqual(0);
4646
}
4747

4848
function confirmDataIsNotEpochForm(dateValues: any[]) {
49-
confirmDataIsDate(dateValues)
49+
confirmDataIsDate(dateValues);
5050

5151
const isEpoch = (date: any): boolean => {
52-
return !isNaN(date) && (date.length === 10 || date.length === 13)
53-
}
54-
55-
const filtered_dates = dateValues.filter(_ => isEpoch(_));
52+
return !isNaN(date) && (date.length === 10 || date.length === 13);
53+
};
5654

57-
expect(filtered_dates.length).toEqual(0)
55+
const filtered_dates = dateValues.filter((_) => isEpoch(_));
5856

57+
expect(filtered_dates.length).toEqual(0);
5958
}
6059

6160
test.describe("Axis Values With Grouped Data With A Date Field In The Group", () => {
6261
test("X Bar y-axis label with grouped data", async ({ page }) => {
6362
await page.click('div[data-plugin="X Bar"]');
64-
await page.waitForSelector("perspective-viewer")
63+
await page.waitForSelector("perspective-viewer");
6564

6665
const dateValues = await page.evaluate(async () => {
6766
let viewer = document.querySelector("perspective-viewer");
6867

6968
if (!viewer) {
70-
return Error("Invalid Viewer")
71-
};
69+
return Error("Invalid Viewer");
70+
}
7271

7372
const plugin_element = viewer.querySelector(
7473
`perspective-viewer-d3fc-xbar`
7574
);
7675

7776
if (!plugin_element) {
78-
throw Error("Invalid Plugin Element")
77+
throw Error("Invalid Plugin Element");
7978
}
8079

8180
const shadowRoot = plugin_element.shadowRoot;
8281
const dateTextElements = shadowRoot.querySelectorAll(
8382
"div d3fc-group d3fc-svg.y-axis.left-axis svg g.group:last-child g.tick text"
8483
);
85-
84+
8685
// collect and return the actual date data to be used.
8786
return Array.from(dateTextElements).map((el) =>
8887
el.textContent?.trim()
8988
);
9089
});
9190

92-
confirmDataIsNotEpochForm(dateValues)
91+
confirmDataIsNotEpochForm(dateValues);
9392
});
9493

9594
test("Y Bar x-axis label with grouped data", async ({ page }) => {
9695
await page.click('div[data-plugin="Y Bar"]');
97-
await page.waitForSelector("perspective-viewer")
96+
await page.waitForSelector("perspective-viewer");
9897

9998
const dateValues = await page.evaluate(async () => {
10099
let viewer = document.querySelector("perspective-viewer");
101100

102101
if (!viewer) {
103-
return Error("Invalid Viewer")
104-
};
102+
return Error("Invalid Viewer");
103+
}
105104

106105
const plugin_element = viewer.querySelector(
107106
`perspective-viewer-d3fc-ybar`
108107
);
109108

110109
if (!plugin_element) {
111-
throw Error("Invalid Plugin Element")
110+
throw Error("Invalid Plugin Element");
112111
}
113112

114113
const shadowRoot = plugin_element.shadowRoot;
@@ -133,15 +132,15 @@ test.describe("Axis Values With Grouped Data With A Date Field In The Group", ()
133132
let viewer = document.querySelector("perspective-viewer");
134133

135134
if (!viewer) {
136-
return Error("Invalid Viewer")
137-
};
135+
return Error("Invalid Viewer");
136+
}
138137

139138
const plugin_element = viewer.querySelector(
140139
`perspective-viewer-d3fc-ohlc`
141140
);
142141

143142
if (!plugin_element) {
144-
throw Error("Invalid Plugin Element")
143+
throw Error("Invalid Plugin Element");
145144
}
146145

147146
const shadowRoot = plugin_element.shadowRoot;
@@ -155,7 +154,7 @@ test.describe("Axis Values With Grouped Data With A Date Field In The Group", ()
155154
);
156155
});
157156

158-
confirmDataIsNotEpochForm(dateValues);
157+
confirmDataIsNotEpochForm(dateValues);
159158
});
160159

161160
test("Heatmap x-axis label with grouped data", async ({ page }) => {
@@ -166,15 +165,15 @@ test.describe("Axis Values With Grouped Data With A Date Field In The Group", ()
166165
let viewer = document.querySelector("perspective-viewer");
167166

168167
if (!viewer) {
169-
return Error("Invalid Viewer")
170-
};
168+
return Error("Invalid Viewer");
169+
}
171170

172171
const plugin_element = viewer.querySelector(
173172
`perspective-viewer-d3fc-heatmap`
174173
);
175174

176175
if (!plugin_element) {
177-
throw Error("Invalid Plugin Element")
176+
throw Error("Invalid Plugin Element");
178177
}
179178

180179
const shadowRoot = plugin_element.shadowRoot;
@@ -199,15 +198,15 @@ test.describe("Axis Values With Grouped Data With A Date Field In The Group", ()
199198
let viewer = document.querySelector("perspective-viewer");
200199

201200
if (!viewer) {
202-
return Error("Invalid Viewer")
203-
};
201+
return Error("Invalid Viewer");
202+
}
204203

205204
const plugin_element = viewer.querySelector(
206205
`perspective-viewer-d3fc-yline`
207206
);
208207

209208
if (!plugin_element) {
210-
throw Error("Invalid Plugin Element")
209+
throw Error("Invalid Plugin Element");
211210
}
212211

213212
const shadowRoot = plugin_element.shadowRoot;
@@ -232,15 +231,15 @@ test.describe("Axis Values With Grouped Data With A Date Field In The Group", ()
232231
let viewer = document.querySelector("perspective-viewer");
233232

234233
if (!viewer) {
235-
return Error("Invalid Viewer")
236-
};
234+
return Error("Invalid Viewer");
235+
}
237236

238237
const plugin_element = viewer.querySelector(
239238
`perspective-viewer-d3fc-yarea`
240239
);
241240

242241
if (!plugin_element) {
243-
throw Error("Invalid Plugin Element")
242+
throw Error("Invalid Plugin Element");
244243
}
245244

246245
const shadowRoot = plugin_element.shadowRoot;
@@ -265,15 +264,15 @@ test.describe("Axis Values With Grouped Data With A Date Field In The Group", ()
265264
let viewer = document.querySelector("perspective-viewer");
266265

267266
if (!viewer) {
268-
return Error("Invalid Viewer")
269-
};
267+
return Error("Invalid Viewer");
268+
}
270269

271270
const plugin_element = viewer.querySelector(
272271
`perspective-viewer-d3fc-yscatter`
273272
);
274273

275274
if (!plugin_element) {
276-
throw Error("Invalid Plugin Element")
275+
throw Error("Invalid Plugin Element");
277276
}
278277

279278
const shadowRoot = plugin_element.shadowRoot;
@@ -298,15 +297,15 @@ test.describe("Axis Values With Grouped Data With A Date Field In The Group", ()
298297
let viewer = document.querySelector("perspective-viewer");
299298

300299
if (!viewer) {
301-
return Error("Invalid Viewer")
302-
};
300+
return Error("Invalid Viewer");
301+
}
303302

304303
const plugin_element = viewer.querySelector(
305304
`perspective-viewer-d3fc-candlestick`
306305
);
307306

308307
if (!plugin_element) {
309-
throw Error("Invalid Plugin Element")
308+
throw Error("Invalid Plugin Element");
310309
}
311310

312311
const shadowRoot = plugin_element.shadowRoot;

0 commit comments

Comments
 (0)