Merge pull request #1151 from cmu-delphi/release/v3.0.2

krivard · web-flow · commit 47ce3a4e38c2 · 2022-02-02T11:00:16.000-05:00
Release v3.0.2
diff --git a/.github/workflows/release_main.yml b/.github/workflows/release_main.yml
@@ -113,17 +113,5 @@ jobs:
       - name: Reset dev branch
         run: |
           git fetch origin main:main
-          git reset --hard main
-      - name: Create pull request into dev
-        uses: peter-evans/create-pull-request@v3
-        with:
-          token: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_PAT }}
-          branch: bot/sync-main-dev
-          commit-message: 'chore: sync main-dev'
-          base: dev
-          title: 'chore: sync main->dev'
-          labels: chore
-          reviewers: krivard
-          # assignees:
-          body: |
-            Syncing Main->Dev.
+          git merge main
+          git push
diff --git a/.github/workflows/update_gdocs_data.yml b/.github/workflows/update_gdocs_data.yml
@@ -29,7 +29,7 @@ jobs:
           commit-message: 'chore: update docs'
           title: Update Google Docs Meta Data
           labels: chore
-          reviewers: krivard,sgratzl
-          assignees: sgratzl
+          reviewers: krivard
+          assignees: krivard
           body: |
             Updating Google Docs Meta Data
diff --git a/README.md b/README.md
@@ -71,7 +71,6 @@ The release consists of multiple steps which can be all done via the GitHub webs
 1. Let the code owner review the PR and its changes and let the CI check whether everything builds successfully
 1. Once approved and merged, another GitHub action job starts which automatically will
    1. create a git tag
-   1. create another [Pull Request](https://github.com/cmu-delphi/www-covidcast/pulls) to merge the changes back to the `dev` branch
    1. create a [GitHub release](https://github.com/cmu-delphi/www-covidcast/releases) with automatically derived release notes
    1. create a [Pull Request in www-main](https://github.com/cmu-delphi/www-main/pulls) to update the website to the new release
 1. Done
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "www-covidcast",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "private": true,
   "license": "MIT",
   "description": "",
diff --git a/src/blocks/HistoryLineChart.svelte b/src/blocks/HistoryLineChart.svelte
@@ -252,7 +252,7 @@
     }-${sensor.isWeeklySignal ? formatWeek(timeFrame.max_week) : formatDateISO(timeFrame.max)}${suffix}`;
   }
 
-  function injectRanges(spec, timeFrame, annotations) {
+  function injectRanges(spec, timeFrame, annotations, multipleRegions) {
     if (annotations.length > 0) {
       spec.layer.unshift(genAnnotationLayer(annotations, timeFrame));
     }
@@ -264,7 +264,7 @@
     }
     const uncertaintyAnnotation = annotations.find((d) => d.uncertainty);
     if (uncertaintyAnnotation) {
-      spec.layer.push(genUncertaintyLayer(uncertaintyAnnotation, { color }));
+      spec.layer.push(genUncertaintyLayer(uncertaintyAnnotation, { color, multipleRegions }));
     }
     return spec;
   }
@@ -274,7 +274,15 @@
 
   $: raw = singleRaw && sensor.rawValue != null && !($isMobileDevice && showFull);
   $: regions = raw ? [region.value] : resolveRegions(region.value, singleRegionOnly, showNeighbors);
-  $: annotations = $annotationManager.getWindowAnnotations(sensor.value, regions, timeFrame.min, timeFrame.max, true);
+  $: annotations = raw
+    ? $annotationManager.getMultiWindowAnnotations(
+        [sensor.value, sensor.rawValue],
+        regions,
+        timeFrame.min,
+        timeFrame.max,
+        true,
+      )
+    : $annotationManager.getWindowAnnotations(sensor.value, regions, timeFrame.min, timeFrame.max, true);
   $: spec = injectRanges(
     genSpec(sensor, region, date, timeFrame, {
       height,
@@ -286,7 +294,8 @@
       stderr,
     }),
     timeFrame,
-    annotations,
+    annotations.filter((d) => !d.isAllTime),
+    regions.length > 1,
   );
   $: data = raw
     ? loadSingleData(sensor, region, timeFrame)
@@ -336,7 +345,7 @@
     <Toggle bind:checked={singleRaw}>Raw Data</Toggle>
   {/if}
   {#if !($isMobileDevice && raw)}
-    <Toggle bind:checked={showFull}>Show All Dates</Toggle>
+    <Toggle bind:checked={showFull}>All Dates</Toggle>
   {/if}
   <div class="spacer" />
   <DownloadMenu {fileName} {vegaRef} {data} {sensor} {raw} {stderr} />
diff --git a/src/blocks/MaxDateHint.svelte b/src/blocks/MaxDateHint.svelte
@@ -9,50 +9,28 @@
 
   export let suffix = '';
 
-  /**
-   * @type {import("../../stores/params").DateParam | null}
-   */
-  export let date = null;
-  /**
-   * @type {import("../../stores/params").RegionParam | null}
-   */
-  export let region = null;
   /**
    * @type {import("../../stores/DataFetcher").DataFetcher | null}
    */
   export let fetcher = null;
 
-  let maxTime;
   $: info = $metaDataManager.getMetaData(sensor);
-
-  function updateMaxTime(fetcher, sensor, region, date) {
-    if (date.sparkLineTimeFrame.max <= maxTime) {
-      return;
-    }
-    const sparkline = fetcher.fetch1Sensor1RegionSparkline(sensor, region, date);
-    // use sparkline data to find the "real" max time
-    sparkline.then((data) => {
-      const maxDate = data.reduce((acc, v) => (v.date_value > acc ? v.date_value : acc), maxTime);
-      if (maxDate > maxTime) {
-        maxTime = maxDate;
-      }
-    });
-  }
-  $: {
-    maxTime = info.maxTime;
-    if (fetcher && region && date) {
-      updateMaxTime(fetcher, sensor, region, date);
-    }
-  }
+  $: maxTimeAndIssue = fetcher
+    ? fetcher.fetch1SensorMaxDateAndIssue(sensor, $metaDataManager)
+    : info
+    ? Promise.resolve(info)
+    : null;
 </script>
 
 {#if info}
-  <UIKitHint
-    title="Most recent available date:<br>&nbsp;{formatDateYearDayOfWeekAbbr(
-      maxTime,
-    )}<br>Last update on:<br>&nbsp;{formatDateYearDayOfWeekAbbr(info.maxIssue)}"
-    noMargin={suffix.length > 0}
-    inline={suffix.length === 0}
-  />
+  {#await maxTimeAndIssue then t}
+    <UIKitHint
+      title="Most recent available date:<br>&nbsp;{formatDateYearDayOfWeekAbbr(
+        t.maxTime,
+      )}<br>Last update on:<br>&nbsp;{formatDateYearDayOfWeekAbbr(t.maxIssue)}"
+      noMargin={suffix.length > 0}
+      inline={suffix.length === 0}
+    />
+  {/await}
 {/if}
 {suffix}
diff --git a/src/components/IndicatorAnnotation.svelte b/src/components/IndicatorAnnotation.svelte
@@ -7,7 +7,7 @@
   export let annotation;
 </script>
 
-<div class="uk-alert uk-alert-{annotation.uncertainty ? 'info' : 'warning'} {className}">
+<div class="uk-alert uk-alert-{annotation.uncertainty || annotation.isAllTime ? 'info' : 'warning'} {className}">
   <h5 class="alert-header">
     <div class="text">
       <span class="inline-svg-icon">
@@ -19,7 +19,9 @@
       </span>
       {annotation.problem}
     </div>
-    <div class="date">{formatDateISO(annotation.dates[0])} - {formatDateISO(annotation.dates[1])}</div>
+    {#if !annotation.isAllTime}
+      <div class="date">{formatDateISO(annotation.dates[0])} - {formatDateISO(annotation.dates[1])}</div>
+    {/if}
   </h5>
   <p class="uk-margin-remove-bottom">
     {annotation.explanation}
diff --git a/src/components/RegionDatePicker.svelte b/src/components/RegionDatePicker.svelte
@@ -22,6 +22,10 @@
   $: if (selectedDate !== undefined) {
     currentDate.set(formatAPITime(selectedDate));
   }
+  /**
+   * @type {import("../../stores/DataFetcher").DataFetcher | null}
+   */
+  export let fetcher = null;
 
   /**
    * @param {import('../stores/params').Region} d
@@ -47,7 +51,7 @@
       maxItemsToShowInList={5}
       on:change={(e) => selectByInfo(e.detail && e.detail.level === 'nation' ? null : e.detail)}
     />
-    <SensorDatePicker2 className="survey-date grid-8-11" bind:value={selectedDate} {sensor} />
+    <SensorDatePicker2 className="survey-date grid-8-11" bind:value={selectedDate} {sensor} {fetcher} />
   </div>
   <slot />
 </div>
diff --git a/src/components/SensorDatePicker2.svelte b/src/components/SensorDatePicker2.svelte
@@ -20,9 +20,19 @@
   export let value = null;
 
   export let className = '';
+  /**
+   * @type {import("../../stores/DataFetcher").DataFetcher | null}
+   */
+  export let fetcher = null;
 
-  $: timeFrame = $metaDataManager.getTimeFrame(sensor);
   $: info = $metaDataManager.getMetaData(sensor);
+  $: maxTimeAndIssue = fetcher
+    ? fetcher.fetch1SensorMaxDateAndIssue(sensor, $metaDataManager)
+    : info
+    ? Promise.resolve(info)
+    : null;
+
+  $: timeFrame = $metaDataManager.getTimeFrame(sensor);
 
   $: formatter = $isMobileDevice ? formatDateShortDayOfWeekAbbr : formatDateYearDayOfWeekAbbr;
 </script>
@@ -57,21 +67,21 @@
       </button>
       <svelte:fragment slot="footer">
         {#if info}
-          <p class="date-info">
-            Most recent available date is <button
-              type="button"
-              on:click={() => (value = info.maxTime)}
-              class="uk-link-muted"
-            >
-              {sensor.isWeeklySignal ? formatWeek(info.maxWeek) : formatDateYearDayOfWeekAbbr(info.maxTime)}
-            </button>
-            updated on
-            <span class="uk-text-nowrap"
-              >{sensor.isWeeklySignal
-                ? formatWeek(info.maxIssueWeek)
-                : formatDateYearDayOfWeekAbbr(info.maxIssue)}</span
-            >.
-          </p>
+          {#await maxTimeAndIssue then t}
+            <p class="date-info">
+              Data is available for dates up through <button
+                type="button"
+                on:click={() => (value = t.maxTime)}
+                class="uk-link-muted"
+              >
+                {sensor.isWeeklySignal ? formatWeek(t.maxTime) : formatDateYearDayOfWeekAbbr(t.maxTime)}
+              </button>
+              (last updated on
+              <span class="uk-text-nowrap"
+                >{sensor.isWeeklySignal ? formatWeek(t.maxIssue) : formatDateYearDayOfWeekAbbr(t.maxIssue)}</span
+              >).
+            </p>
+          {/await}
         {/if}
       </svelte:fragment>
     </Datepicker>
diff --git a/src/data/annotations.ts b/src/data/annotations.ts
@@ -19,9 +19,11 @@ function parseSignals(signals: string) {
   );
 }
 
+const ALL_TIME_MIN = new Date(2019, 0, 1);
+
 function parseDates(dates: string): [Date, Date] {
   if (!dates) {
-    return [new Date(), new Date()];
+    return [ALL_TIME_MIN, new Date()];
   }
   if (/^-\d+$/g.test(dates)) {
     const uncertaintyDays = Number.parseInt(dates);
@@ -73,6 +75,7 @@ export class Annotation {
   readonly regions: { level: RegionLevel; ids: '*' | Set<string> }[];
   readonly uncertainty: boolean;
   readonly reference?: string;
+  readonly isAllTime: boolean;
 
   constructor(raw: EpiDataAnomaliesRow) {
     this.source = raw.source.trim();
@@ -83,6 +86,7 @@ export class Annotation {
     this.regions = parseRegions(raw.regions);
     this.reference = raw.reference;
     this.uncertainty = /^-\d+$/g.test(raw.dates);
+    this.isAllTime = !raw.dates;
   }
 
   /**
@@ -191,6 +195,25 @@ export class AnnotationManager {
       .sort(sortByDate);
   }
 
+  getMultiWindowAnnotations(
+    sensors: { id: string; signal: string }[],
+    region: RegionInfo | RegionInfo[],
+    dateStart: Date,
+    dateEnd: Date,
+    includeUncertainty = false,
+  ): Annotation[] {
+    return this.annotations
+      .filter(
+        (d) =>
+          sensors.some((s) => d.matchSensor(s)) &&
+          region != null &&
+          d.matchRegion(region) &&
+          d.inDateRange(dateStart, dateEnd) &&
+          (includeUncertainty || !d.uncertainty),
+      )
+      .sort(sortByDate);
+  }
+
   getWindowLevelAnnotations(
     sensor: { id: string; signal: string },
     level: RegionLevel,
diff --git a/src/modes/dashboard/Dashboard.svelte b/src/modes/dashboard/Dashboard.svelte
@@ -173,7 +173,7 @@
       </button>
     </div>
     {#if configureParams}
-      <DashboardParameters {sensor} {region} {date} />
+      <DashboardParameters {sensor} {region} {date} {fetcher} />
     {/if}
   </div>
   {#if $isMobileDevice}
diff --git a/src/modes/dashboard/DashboardParameters.svelte b/src/modes/dashboard/DashboardParameters.svelte
@@ -19,6 +19,10 @@
    * @type {import("../../stores/params").RegionParam}
    */
   export let region;
+  /**
+   * @type {import("../../stores/DataFetcher").DataFetcher | null}
+   */
+  export let fetcher = null;
 
   let selectedDate = date.value;
 
@@ -63,7 +67,7 @@
     selectedItem={region.value}
     on:change={(e) => setRegion(e.detail && e.detail.level === 'nation' ? null : e.detail)}
   />
-  <SensorDatePicker2 className="grid-9-13" bind:value={selectedDate} {sensor} />
+  <SensorDatePicker2 className="grid-9-13" bind:value={selectedDate} {sensor} {fetcher} />
 </div>
 
 <style>
diff --git a/src/modes/indicator/Indicator.svelte b/src/modes/indicator/Indicator.svelte
@@ -49,7 +49,13 @@
 </script>
 
 <div class="mobile-root">
-  <RegionDatePicker sensor={sensor.value} {items} defaultItem={nationInfo} placeholder="Search by State or County">
+  <RegionDatePicker
+    sensor={sensor.value}
+    {items}
+    defaultItem={nationInfo}
+    placeholder="Search by State or County"
+    {fetcher}
+  >
     <div class="grid-3-11 mobile-header-line mobile-back-line" slot="title">
       <h2>
         <button class="mobile-back inline-svg-icon" on:click|preventDefault={switchMode} title="Back">
@@ -74,7 +80,7 @@
 
       <p>
         On {formatDateDayOfWeek(date.value)}
-        <MaxDateHint sensor={sensor.value} suffix="," {date} {region} {fetcher} />
+        <MaxDateHint sensor={sensor.value} suffix="," {fetcher} />
         the {sensor.valueUnit} was:
       </p>
       <IndicatorOverview {sensor} {date} {region} {fetcher} />
diff --git a/src/modes/summary/CasesOverview.svelte b/src/modes/summary/CasesOverview.svelte
@@ -37,7 +37,7 @@
 
 <p>
   On {formatDateDayOfWeek(date.value)}
-  <MaxDateHint sensor={CASES.value} suffix="," {date} {region} {fetcher} />
+  <MaxDateHint sensor={CASES.value} suffix="," {fetcher} />
   the {CASES.valueUnit}s were:
 </p>
 
diff --git a/src/modes/summary/Summary.svelte b/src/modes/summary/Summary.svelte
diff --git a/src/modes/survey-results/SurveyQuestion.svelte b/src/modes/survey-results/SurveyQuestion.svelte
diff --git a/src/modes/survey-results/SurveyResults.svelte b/src/modes/survey-results/SurveyResults.svelte
diff --git a/src/specs/lineSpec.ts b/src/specs/lineSpec.ts
diff --git a/src/stores/DataFetcher.ts b/src/stores/DataFetcher.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "www-covidcast",`
`3`		`- "version": "3.0.1",`
	`3`	`+ "version": "3.0.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"license": "MIT",`
`6`	`6`	`"description": "",`