Review fixes

rzats · rzats · commit a8394f36d369 · 2024-12-11T18:55:24.000+02:00
diff --git a/src/components/dialogs/dataSources/CDC.svelte b/src/components/dialogs/dataSources/CDC.svelte
@@ -7,11 +7,10 @@
 
   export let id: string;
 
-  let locations = $formSelections.cdc.locations;
   let auth = '';
 
   export function importDataSet() {
-    return importCDC({ locations, auth });
+    return importCDC({ locations: $formSelections.cdc.locations, auth });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/COVIDHosp.svelte b/src/components/dialogs/dataSources/COVIDHosp.svelte
@@ -7,11 +7,8 @@
 
   export let id: string;
 
-  let states = $formSelections.covidHosp.states;
-  let issue = $formSelections.covidHosp.issue;
-
   export function importDataSet() {
-    return importCOVIDHosp({ states, ...issue });
+    return importCOVIDHosp({ states: $formSelections.covidHosp.states, ...$formSelections.covidHosp.issue });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/FluSurv.svelte b/src/components/dialogs/dataSources/FluSurv.svelte
@@ -8,11 +8,8 @@
 
   export let id: string;
 
-  let locations = $formSelections.fluSurv.locations;
-  let issue = $formSelections.fluSurv.issue;
-
   export function importDataSet() {
-    return importFluSurv({ locations, ...issue });
+    return importFluSurv({ locations: $formSelections.fluSurv.locations, ...$formSelections.fluSurv.issue });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/FluView.svelte b/src/components/dialogs/dataSources/FluView.svelte
@@ -8,12 +8,10 @@
 
   export let id: string;
 
-  let regions = $formSelections.fluView.locations;
-  let issue = $formSelections.fluView.issue;
   let auth: string = '';
 
   export function importDataSet() {
-    return importFluView({ regions, ...issue, auth });
+    return importFluView({ regions: $formSelections.fluView.locations, ...$formSelections.fluView.issue, auth });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/GFT.svelte b/src/components/dialogs/dataSources/GFT.svelte
@@ -6,10 +6,8 @@
 
   export let id: string;
 
-  let locations = $formSelections.gft.locations;
-
   export function importDataSet() {
-    return importGFT({ locations });
+    return importGFT({ locations: $formSelections.gft.locations });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/GHT.svelte b/src/components/dialogs/dataSources/GHT.svelte
@@ -7,12 +7,10 @@
 
   export let id: string;
 
-  let locations = $formSelections.ght.locations;
   let auth = '';
-  let query = $formSelections.ght.query;
 
   export function importDataSet() {
-    return importGHT({ auth, locations, query });
+    return importGHT({ auth, locations: $formSelections.ght.locations, query: $formSelections.ght.query });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/NIDSSDengue.svelte b/src/components/dialogs/dataSources/NIDSSDengue.svelte
@@ -6,10 +6,8 @@
 
   export let id: string;
 
-  let locations = $formSelections.nidssDengue.locations;
-
   export function importDataSet() {
-    return importNIDSSDengue({ locations });
+    return importNIDSSDengue({ locations: $formSelections.nidssDengue.locations });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/NIDSSFlu.svelte b/src/components/dialogs/dataSources/NIDSSFlu.svelte
@@ -7,11 +7,8 @@
 
   export let id: string;
 
-  let locations = $formSelections.nidssFlu.locations;
-  let issue = $formSelections.nidssFlu.issue;
-
   export function importDataSet() {
-    return importNIDSSFlu({ regions: locations, ...issue });
+    return importNIDSSFlu({ regions: $formSelections.nidssFlu.locations, ...$formSelections.nidssFlu.issue });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/Nowcast.svelte b/src/components/dialogs/dataSources/Nowcast.svelte
@@ -6,10 +6,8 @@
 
   export let id: string;
 
-  let locations = $formSelections.nowcast.locations;
-
   export function importDataSet() {
-    return importNowcast({ locations });
+    return importNowcast({ locations: $formSelections.nowcast.locations });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/Quidel.svelte b/src/components/dialogs/dataSources/Quidel.svelte
@@ -7,11 +7,10 @@
 
   export let id: string;
 
-  let locations = $formSelections.quidel.locations;
   let auth = '';
 
   export function importDataSet() {
-    return importQuidel({ auth, locations });
+    return importQuidel({ auth, locations: $formSelections.quidel.locations });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/Sensors.svelte b/src/components/dialogs/dataSources/Sensors.svelte
@@ -7,12 +7,10 @@
 
   export let id: string;
 
-  let locations = $formSelections.sensors.locations;
   let auth = '';
-  let names = $formSelections.sensors.names;
 
   export function importDataSet() {
-    return importSensors({ auth, names, locations });
+    return importSensors({ auth, names: $formSelections.sensors.names, locations: $formSelections.sensors.locations });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/Twitter.svelte b/src/components/dialogs/dataSources/Twitter.svelte
@@ -7,12 +7,14 @@
 
   export let id: string;
 
-  let locations = $formSelections.twitter.locations;
   let auth = '';
-  let resolution = $formSelections.twitter.resolution;
 
   export function importDataSet() {
-    return importTwitter({ auth, locations, resolution });
+    return importTwitter({
+      auth,
+      locations: $formSelections.twitter.locations,
+      resolution: $formSelections.twitter.resolution,
+    });
   }
 </script>
 
diff --git a/src/components/dialogs/dataSources/Wiki.svelte b/src/components/dialogs/dataSources/Wiki.svelte
@@ -6,12 +6,6 @@
 
   export let id: string;
 
-  let articles = $formSelections.wiki.articles;
-  let resolution = $formSelections.wiki.resolution;
-  let hour = $formSelections.wiki.hour;
-  let useHour = $formSelections.wiki.useHour;
-  let language = $formSelections.wiki.language;
-
   const languages = [
     {
       value: 'en',
@@ -20,7 +14,12 @@
   ];
 
   export function importDataSet() {
-    return importWiki({ articles, resolution, hour: useHour ? hour : null, language });
+    return importWiki({
+      articles: $formSelections.wiki.articles,
+      resolution: $formSelections.wiki.resolution,
+      hour: $formSelections.wiki.useHour ? $formSelections.wiki.hour : null,
+      language: $formSelections.wiki.language,
+    });
   }
 </script>
 
diff --git a/src/components/dialogs/formSelections.ts b/src/components/dialogs/formSelections.ts
@@ -16,6 +16,8 @@ import {
 } from '../../data/data';
 import { DEFAULT_ISSUE } from './utils';
 
+// The following classes define default values for the various "data source" forms, and will store modifications to those values as the user interacts with the forms.
+
 export class CdcSelections {
   locations = cdcLocations[0].value;
 }
@@ -86,6 +88,8 @@ export class WikiSelections {
   language = 'en';
 }
 
+// The FormSelections class defines the default form choice, stores changes to that choice, and holds references to the values used in each "data source" form.
+
 export default class FormSelections {
   dataSource:
     | 'fluview'
diff --git a/src/store.ts b/src/store.ts
@@ -23,11 +23,11 @@ export function getFormSelections() {
     if (sessionStorage.getItem('form')) {
       return JSON.parse(sessionStorage.getItem('form')!) as FormSelections;
     }
-    return new FormSelections();
   } catch {
+    // we are probably here because parsing failed, so remove bad JSON from sessionStorage
     sessionStorage.removeItem('form');
-    return new FormSelections();
   }
+  return new FormSelections();
 }
 
 export const formSelections = writable(getFormSelections());

Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,10 @@`
`7`	`7`
`8`	`8`	`export let id: string;`
`9`	`9`
`10`		`- let locations = $formSelections.cdc.locations;`
`11`	`10`	`let auth = '';`
`12`	`11`
`13`	`12`	`export function importDataSet() {`
`14`		`- return importCDC({ locations, auth });`
	`13`	`+ return importCDC({ locations: $formSelections.cdc.locations, auth });`
`15`	`14`	`}`
`16`	`15`	`</script>`
`17`	`16`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,8 @@`
`6`	`6`
`7`	`7`	`export let id: string;`
`8`	`8`
`9`		`- let locations = $formSelections.gft.locations;`
`10`		`-`
`11`	`9`	`export function importDataSet() {`
`12`		`- return importGFT({ locations });`
	`10`	`+ return importGFT({ locations: $formSelections.gft.locations });`
`13`	`11`	`}`
`14`	`12`	`</script>`
`15`	`13`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,8 @@`
`6`	`6`
`7`	`7`	`export let id: string;`
`8`	`8`
`9`		`- let locations = $formSelections.nidssDengue.locations;`
`10`		`-`
`11`	`9`	`export function importDataSet() {`
`12`		`- return importNIDSSDengue({ locations });`
	`10`	`+ return importNIDSSDengue({ locations: $formSelections.nidssDengue.locations });`
`13`	`11`	`}`
`14`	`12`	`</script>`
`15`	`13`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,8 @@`
`6`	`6`
`7`	`7`	`export let id: string;`
`8`	`8`
`9`		`- let locations = $formSelections.nowcast.locations;`
`10`		`-`
`11`	`9`	`export function importDataSet() {`
`12`		`- return importNowcast({ locations });`
	`10`	`+ return importNowcast({ locations: $formSelections.nowcast.locations });`
`13`	`11`	`}`
`14`	`12`	`</script>`
`15`	`13`