Merge pull request #48 from cmu-delphi/release/v2.1.1

Release v2.1.1

Author: melange396

.github/workflows/create_release.yml

@@ -32,7 +32,7 @@ jobs:
           base: main
           title: Release ${{ steps.version.outputs.next_tag }}
           labels: chore
-          reviewers: krivard
-          assignees: krivard
+          # reviewers:
+          assignees: melange396
           body: |
             Releasing ${{ steps.version.outputs.next_tag }}.

.github/workflows/dependabot-assignments.yml

@@ -0,0 +1,17 @@
+name: Dependabot auto-assign reviewer
+on: pull_request
+
+permissions:
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    env:
+      GH_TOKEN: ${{ secrets.CMU_DELPHI_AUTOMATION_MACHINE_DEPENDABOT_PAT }}
+    if: ${{ github.actor == 'dependabot[bot]' }}
+    steps:
+      - name: Assign team to PR
+        run: gh pr edit "$PR_URL" --add-reviewer "cmu-delphi/code-reviewers"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}

.github/workflows/release_main.yml

@@ -96,8 +96,8 @@ jobs:
           commit-message: 'feat: update to EPIVis ${{ needs.create_release.outputs.tag_name }}'
           title: 'update to EPIVis ${{ needs.create_release.outputs.tag_name }}'
           labels: feat
-          reviewers: krivard,sgratzl
-          assignees: sgratzl
+          # reviewers:
+          assignees: melange396
           body: |
             update to [EPIVis ${{ needs.create_release.outputs.tag_name }}](https://github.com/cmu-delphi/www-epivis/releases/${{ needs.create_release.outputs.tag_name }})
 
@@ -123,7 +123,7 @@ jobs:
           base: dev
           title: 'chore: sync main->dev'
           labels: chore
-          reviewers: krivard,sgratzl
-          assignees: sgratzl
+          # reviewers:
+          assignees: melange396
           body: |
             Syncing Main->Dev.

netlify.toml

@@ -1,8 +1,8 @@
 [context.production.environment]
-  EPIDATA_ENDPOINT_URL = "https://api.covidcast.cmu.edu/epidata"
+  EPIDATA_ENDPOINT_URL = "https://api.delphi.cmu.edu/epidata"
 
 [context.branch-deploy.environment]
-  EPIDATA_ENDPOINT_URL = "https://api.covidcast.cmu.edu/epidata"
+  EPIDATA_ENDPOINT_URL = "https://api.delphi.cmu.edu/epidata"
 
 [context.deploy-preview.environment]
-  EPIDATA_ENDPOINT_URL = "https://api.covidcast.cmu.edu/epidata"
+  EPIDATA_ENDPOINT_URL = "https://api.delphi.cmu.edu/epidata"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "www-epivis",
-  "version": "2.0.3",
+  "version": "2.1.1",
   "private": true,
   "license": "MIT",
   "description": "",
@@ -27,7 +27,8 @@
     "lint": "eslint src --ext .ts,.js,.svelte && prettier --check \"**/*\"",
     "fix": "eslint src --ext .ts,.js,.svelte --fix && prettier --write \"**/*\"",
     "prepare": "husky install",
-    "prepack": "npm run build"
+    "prepack": "npm run build",
+    "prettier": "prettier --write \"**/*\""
   },
   "devDependencies": {
     "@fortawesome/free-solid-svg-icons": "^6.1.2",

package.json

@@ -51,7 +51,7 @@ export default [
           'process.env.NODE_ENV': JSON.stringify(production ? 'production' : 'development'),
           __VERSION__: JSON.stringify(pkg.version),
           'process.env.EPIDATA_ENDPOINT_URL': JSON.stringify(
-            process.env.EPIDATA_ENDPOINT_URL || 'https://api.covidcast.cmu.edu/epidata',
+            process.env.EPIDATA_ENDPOINT_URL || 'https://api.delphi.cmu.edu/epidata',
           ),
         },
         preventAssignment: true,

rollup.config.js

@@ -6,22 +6,48 @@
   import type { IChart } from './store';
   import { onMount } from 'svelte';
   import { tour } from './tour';
+  import { addDataSet } from './store';
+  import { fluViewRegions } from './data/data';
+  import { DEFAULT_ISSUE } from './components/dialogs/utils';
+  import { importFluView } from './api/EpiData';
 
   let chart: Chart | null = null;
   $: ichart = chart as unknown as IChart | null;
 
   onMount(() => {
-    tour.start();
+    if (!localStorage.getItem('shepherd-tour')) {
+      tour.start();
+    }
+
+    // Try fetching the default FluView dataset! (unless the URL has a shared dataset in it)
+    const url = new URL(location.href);
+    const hash = url.hash.slice(1);
+    if (!hash) {
+      let regions = fluViewRegions[0].value;
+      let issue = DEFAULT_ISSUE;
+      let auth: string = '';
+
+      importFluView({ regions, ...issue, auth }).then((ds) => {
+        if (ds) {
+          // add the dataset itself
+          addDataSet(ds);
+          // reset active datasets to fluview -> ili
+          $activeDatasets = [ds.datasets[1]];
+          if (chart) {
+            chart.fitData(true);
+          }
+        }
+      });
+    }
   });
 </script>
 
 <TopMenu chart={ichart} style="grid-area: menu" />
-<LeftMenu style="grid-area: side" />
+<LeftMenu chart={ichart} style="grid-area: side; max-height: 100vh; overflow: scroll" />
 <Chart
   bind:this={chart}
   style="grid-area: main"
   bind:showPoints={$isShowingPoints}
   bind:navMode={$navMode}
   initialViewport={$initialViewport}
-  datasets={$activeDatasets}
 />

src/App.svelte

@@ -21,6 +21,8 @@ import {
 import DataSet, { DataGroup } from '../data/DataSet';
 import EpiDate from '../data/EpiDate';
 import EpiPoint from '../data/EpiPoint';
+import { get } from 'svelte/store';
+import { expandedDataGroups } from '../store';
 
 // import DataSet from "../data/DataSet";
 // import EpiDate from "../data/EpiDate";
@@ -111,6 +113,17 @@ export function loadDataSet(
   userParams: Record<string, unknown>,
   columns: string[],
 ): Promise<DataGroup | null> {
+  const duplicates = get(expandedDataGroups).filter((d) => d.title == title);
+  if (duplicates.length > 0) {
+    return UIkit.modal
+      .alert(
+        `
+    <div class="uk-alert uk-alert-error">
+      Cannot import duplicate dataset: <b>${title}.</b>
+    </div>`,
+      )
+      .then(() => null);
+  }
   const url = new URL(ENDPOINT + `/${endpoint}/`);
   const params = cleanParams(userParams);
   Object.entries(fixedParams).forEach(([key, value]) => {

src/api/EpiData.ts

@@ -1,5 +1,6 @@
 <script lang="ts">
   import { onMount } from 'svelte';
+  import { activeDatasets } from '../store';
   import type DataSet from '../data/DataSet';
   import { DEFAULT_VIEWPORT } from '../data/DataSet';
   import EpiDate from '../data/EpiDate';
@@ -81,7 +82,8 @@
   export let showPoints = false;
   export let interpolate = false;
   export let highlightedDate: EpiDate | null = null;
-  export let datasets: DataSet[] = [];
+
+  $: datasets = $activeDatasets;
 
   function date2x(date: number): number {
     return ((date - xMin) / (xMax - xMin)) * width;
@@ -381,6 +383,7 @@
   }
 
   export function fitData(shouldAnimate = false): void {
+    datasets = $activeDatasets; // force an update
     if (datasets.length === 0) {
       return;
     }