From f1c1ff70e68bc3c19dcad97367d35876e2b49699 Mon Sep 17 00:00:00 2001 From: Rostyslav Zatserkovnyi Date: Mon, 16 Sep 2024 19:12:26 +0300 Subject: [PATCH 1/2] Fix empty datasets locking UI --- src/api/EpiData.ts | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/api/EpiData.ts b/src/api/EpiData.ts index 866063e..cb965f2 100644 --- a/src/api/EpiData.ts +++ b/src/api/EpiData.ts @@ -91,7 +91,9 @@ function loadEpidata( } points.push(new EpiPoint(date, row[col] as number)); } - datasets.push(new DataSet(points, col, params)); + if (points.length > 0) { + datasets.push(new DataSet(points, col, params)); + } } return new DataGroup(name, datasets); } @@ -135,7 +137,19 @@ export function loadDataSet( url.searchParams.set('format', 'json'); return fetchImpl[]>(url) .then((res) => { - return loadEpidata(title, res, columns, { _endpoint: endpoint, ...params }); + const data = loadEpidata(title, res, columns, { _endpoint: endpoint, ...params }); + if (data.datasets.length == 0) { + console.warn('empty datasets'); + return UIkit.modal + .alert( + ` +
+ API Link returned no data. +
`, + ) + .then(() => null); + } + return data; }) .catch((error) => { console.warn('failed fetching data', error); From fa3f51fc5fcc7a8de14c0b735ac3ddadb529e2c7 Mon Sep 17 00:00:00 2001 From: Rostyslav Zatserkovnyi Date: Mon, 16 Sep 2024 19:14:33 +0300 Subject: [PATCH 2/2] warning not needed --- src/api/EpiData.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/api/EpiData.ts b/src/api/EpiData.ts index cb965f2..b059736 100644 --- a/src/api/EpiData.ts +++ b/src/api/EpiData.ts @@ -139,7 +139,6 @@ export function loadDataSet( .then((res) => { const data = loadEpidata(title, res, columns, { _endpoint: endpoint, ...params }); if (data.datasets.length == 0) { - console.warn('empty datasets'); return UIkit.modal .alert( `