Merge pull request #1266 from cmu-delphi/release/v3.2.11

Release v3.2.11

.github/workflows/ci.yml

@@ -6,12 +6,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - name: Cache Node.js modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4.0.1
         with:
           path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
           key: ${{ runner.OS }}-node2-${{ hashFiles('**/package-lock.json') }}

.github/workflows/create_release.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: main
           ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }}
@@ -25,7 +25,7 @@ jobs:
           echo -n "::set-output name=next_tag::"
           npm version --no-git-tag-version ${{ github.event.inputs.versionName }}
       - name: Create pull request into main
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         with:
           branch: release/${{ steps.version.outputs.next_tag }}
           commit-message: 'chore: release ${{ steps.version.outputs.next_tag }}'
@@ -37,7 +37,7 @@ jobs:
           body: |
             Releasing ${{ steps.version.outputs.next_tag }}.
       - name: Check out delphi epidata
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           token: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_PAT }}
           repository: cmu-delphi/delphi-epidata

.github/workflows/release_main.yml

@@ -17,16 +17,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+        uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - name: Extract version
         id: extract_version
         run: node -pe "'::set-output name=version::' + require('./package.json').version"
       - name: Create Release
         id: create_release
-        uses: release-drafter/release-drafter@v5
+        uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -42,12 +42,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+        uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - name: Cache Node.js modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4.0.1
         with:
           path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
           key: ${{ runner.OS }}-node2-${{ hashFiles('**/package-lock.json') }}
@@ -57,7 +57,7 @@ jobs:
       - name: Build Assets
         run: npm pack
       - name: Upload Release Asset
-        uses: AButler/upload-release-assets@v2.0
+        uses: AButler/upload-release-assets@v3.0
         with:
           files: 'www-covidcast-*.tgz'
           repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -70,15 +70,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           repository: cmu-delphi/www-main
           ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }}
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - name: Cache Node.js modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4.0.1
         with:
           path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
           key: ${{ runner.OS }}-main-node2-${{ hashFiles('**/package-lock.json') }}
@@ -89,7 +89,7 @@ jobs:
         run: |
           npm install https://github.com/cmu-delphi/www-covidcast/releases/download/${{ needs.create_release.outputs.tag_name }}/www-covidcast-${{ needs.create_release.outputs.version }}.tgz
       - name: Create pull request to update COVIDcast
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_PAT }}
           branch: bot/update-covidcast
@@ -106,7 +106,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: dev
           ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }}

.github/workflows/update_gdocs_data.yml

@@ -6,14 +6,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ssh-key: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_SSH }}
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v4
         with:
-          node-version: 16
+          node-version: 18
       - name: Cache Node.js modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4.0.1
         with:
           path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
           key: ${{ runner.OS }}-node2-${{ hashFiles('**/package-lock.json') }}
@@ -23,7 +23,7 @@ jobs:
       - name: Update Docs
         run: npm run gen
       - name: Create pull request into main
-        uses: peter-evans/create-pull-request@v3
+        uses: peter-evans/create-pull-request@v4
         with:
           branch: bot/update-docs
           commit-message: 'chore: update docs'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "www-covidcast",
-  "version": "3.2.10",
+  "version": "3.2.11",
   "private": true,
   "license": "MIT",
   "description": "",

src/blocks/NoRecentDataWarning.svelte

@@ -10,14 +10,15 @@
    */
   export let date;
 
-  export let warningType;
-
   function switchDate() {
     date.set(minMaxDate);
   }
 </script>
 
-{#if warningType === 1}
+<!-- We are not going to show any king of warning message in case the choosen date is less than the most recent date that has data for all three indicators. -->
+
+<!-- If the choosen date is the same as the most recent date that has data for all three indicators, show this message. -->
+{#if minMaxDate.getTime() === date.value.getTime()}
   <div data-uk-alert class="uk-alert-warning">
     <p>
       This date, {formatDateYearDayOfWeekAbbr(minMaxDate)}, is the most recent that has data for all three of the
@@ -27,7 +28,8 @@
   </div>
 {/if}
 
-{#if warningType === 2}
+<!-- If the chosen date is greater than the most recent date that has data for all three indicators, show this message. -->
+{#if minMaxDate.getTime() < date.value.getTime()}
   <div data-uk-alert class="uk-alert-warning">
     <p>
       This date ({formatDateYearDayOfWeekAbbr(date.value)}) does not yet have data for all of the highlighted

src/modes/exportdata/ExportData.svelte

@@ -27,18 +27,37 @@
     }
   }
 
+  // Pre-fill the form from URL parameters.
+  // Supported parameters: data_source, signal, start_day, end_day, geo_type, geo_value, as_of
+  const urlParams = new URLSearchParams(window.location.search);
+
+  // Overwrite default source & sensor if these are present in the URL
+  if (urlParams.has('data_source')) {
+    sourceValue = urlParams.get('data_source');
+
+    if (urlParams.has('signal')) {
+      sensorValue = urlParams.get('signal');
+    }
+  }
+
   $: isWeekly = sensor ? sensor.isWeeklySignal : false;
   $: formatDate = isWeekly ? (d) => formatWeek(d).replace('W', '') : formatDateISO;
 
-  let geoType = 'county';
+  let geoType = urlParams.has('geo_type') ? urlParams.get('geo_type') : 'county';
 
   let startDate = new Date();
   let endDate = new Date();
 
   function initDate(date) {
     const param = new DateParam(date);
-    endDate = param.sparkLineTimeFrame.max;
-    startDate = param.sparkLineTimeFrame.min;
+
+    // Populate date based on URL params or, if absent, the current date
+    startDate = urlParams.has('start_day') ? new Date(urlParams.get('start_day')) : param.sparkLineTimeFrame.min;
+    endDate = urlParams.has('end_day') ? new Date(urlParams.get('end_day')) : param.sparkLineTimeFrame.max;
+
+    // Also normalize the dates to the current timezone
+    startDate = new Date(startDate.getTime() - startDate.getTimezoneOffset() * -60000);
+    endDate = new Date(endDate.getTime() - endDate.getTimezoneOffset() * -60000);
   }
   $: initDate($currentDateObject);
 
@@ -59,12 +78,20 @@
 
   let geoValuesMode = 'all';
   let geoValues = [];
+  let geoURLSet = false;
   $: geoItems = [...(infosByLevel[geoType] || []), ...(geoType === 'county' ? infosByLevel.state : [])];
   $: {
     if (geoItems != null) {
       geoValues = [];
       geoValuesMode = guessMode(geoItems.length);
     }
+
+    // Populate region based on URL params... but let the user override this later
+    if (urlParams.has('geo_value') && !geoURLSet) {
+      let infos = infosByLevel[geoType].filter((d) => d.propertyId == urlParams.get('geo_value'));
+      addRegion(infos[0]);
+      geoURLSet = true;
+    }
   }
 
   function flatIds(geoValues) {
@@ -90,6 +117,13 @@
     }
   }
   $: usesAsOf = asOfMode !== 'latest' && asOfDate instanceof Date;
+  // set as_of based on URL params, if it's a valid date
+  if (urlParams.has('as_of') && !isNaN(new Date(urlParams.get('as_of')))) {
+    asOfMode = 'single';
+    asOfDate = new Date(urlParams.get('as_of'));
+    // Also normalize the dates to the current timezone
+    asOfDate = new Date(asOfDate.getTime() - asOfDate.getTimezoneOffset() * -60000);
+  }
 
   let form = null;
 
@@ -104,6 +138,14 @@
         );
       });
     }
+    // Fix up the UI if we got an inactive sensor from the URL parameters.
+    if (sensor && !sensor.active) {
+      showInActive = true;
+      // Force an update to sourceValue to set related reactive statements correctly.
+      let temp = sourceValue;
+      sourceValue = '';
+      sourceValue = temp;
+    }
   });
 
   function addRegion(detail) {