Mark COVIDcast value as active by default (#90)

* Mark COVIDcast value as active by default

* Fix type

* Revert previous changes, add default_enabled

* Lint fix

* Set `defaultEnabled` explicitly instead of passing thru call chain (#93)

* DataGroup: use .defaultEnabled as mutable member instead of constructor-only arg

* typo

---------

Co-authored-by: george <george.haff@gmail.com>

Author: rzats

src/App.svelte

@@ -2,7 +2,7 @@
   import Chart from './components/Chart.svelte';
   import LeftMenu from './components/LeftMenu.svelte';
   import TopMenu from './components/TopMenu.svelte';
-  import { activeDatasets, initialViewport, isShowingPoints, navMode } from './store';
+  import { initialViewport, isShowingPoints, navMode } from './store';
   import type { IChart } from './store';
   import { onMount } from 'svelte';
   import { tour } from './tour';
@@ -31,8 +31,6 @@
         if (ds) {
           // add the dataset itself
           addDataSet(ds);
-          // reset active datasets to fluview -> wili
-          $activeDatasets = [ds.datasets[0]];
           if (chart) {
             chart.fitData(true);
           }

src/api/EpiData.ts

@@ -273,7 +273,14 @@ export function importCOVIDcast({
     { data_source, signal, time_type, geo_type, geo_value },
     ['value', 'stderr', 'sample_size'],
     api_key,
-  );
+  ).then((ds) => {
+    // get inside the Promise and make sure its not null,
+    // then enable display of 'value' data
+    if (ds instanceof DataGroup) {
+      ds.defaultEnabled = ['value'];
+    }
+    return ds;
+  });
 }
 
 export function importCOVIDHosp({
@@ -414,7 +421,14 @@ export function importFluView({
       wili: '%wILI',
       ili: '%ILI',
     },
-  );
+  ).then((ds) => {
+    // get inside the Promise and make sure its not null,
+    // then enable display of 'percent weighted ILI' data
+    if (ds instanceof DataGroup) {
+      ds.defaultEnabled = ['%wILI'];
+    }
+    return ds;
+  });
 }
 
 export function importGFT({ locations }: { locations: string }): Promise<DataGroup | null> {

src/data/DataSet.ts

@@ -102,6 +102,8 @@ export default class DataSet {
 
 export class DataGroup {
   public parent?: DataGroup;
+  // which fields of this DataGroup should be "enabled" (shown/displayed) on load:
+  public defaultEnabled: string[] = [];
 
   constructor(public readonly title: string, public readonly datasets: (DataSet | DataGroup)[]) {}
 

src/store.ts

@@ -66,6 +66,12 @@ export function addDataSet(dataset: DataSet | DataGroup): void {
   if (dataset instanceof DataGroup) {
     // auto expand
     expandedDataGroups.set([...get(expandedDataGroups), dataset]);
+    // add defaultEnabled datasets to the list of active datasets
+    for (const ds of dataset.datasets) {
+      if (ds instanceof DataSet && dataset.defaultEnabled.includes(ds.title)) {
+        activeDatasets.set([...get(activeDatasets), ds]);
+      }
+    }
   } else {
     activeDatasets.set([...get(activeDatasets), dataset]);
   }