Skip to content
Closed
23 changes: 23 additions & 0 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,26 @@ jobs:
# assignees:
body: |
Releasing ${{ steps.version.outputs.next_tag }}.
- name: Check out delphi epidata
uses: actions/checkout@v3
with:
token: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_PAT }}
repository: cmu-delphi/delphi-epidata
path: delphi-epidata
- name: Copy files
run: |
cp src/stores/descriptions.raw.txt src/stores/questions.raw.txt \
delphi-epidata/src/server/endpoints/covidcast_utils/
- name: Create pull request into epidata
uses: peter-evans/create-pull-request@v5
with:
path: delphi-epidata
token: ${{ secrets.CMU_DELPHI_DEPLOY_MACHINE_PAT }}
branch: www-covidcast-release/${{ steps.version.outputs.next_tag }}
commit-message: 'chore: sync to www-covidcast release ${{ steps.version.outputs.next_tag }}'
base: dev
title: Sync to www-covidcast release ${{ steps.version.outputs.next_tag }}
labels: chore
reviewers: krivard
body: |
Syncing covidcast_utils files to www-covidcast release ${{ steps.version.outputs.next_tag }}.
17 changes: 17 additions & 0 deletions .github/workflows/dependabot-assignments.yml
Original file line number Diff line number Diff line change
@@ -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}}
44 changes: 22 additions & 22 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "www-covidcast",
"version": "3.2.5",
"version": "3.2.6",
"private": true,
"license": "MIT",
"description": "",
Expand Down Expand Up @@ -118,12 +118,12 @@
"vega": "^5.23.0",
"vega-embed": "6.21.0",
"vega-lite": "^5.2.0",
"webpack": "^5.73.0",
"webpack": "^5.76.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^4.9.2"
},
"dependencies": {
"uikit": "^3.14.3"
"uikit": "^3.16.13"
},
"lint-staged": {
"*.{ts,js,svelte}": "eslint --cache --fix",
Expand Down
15 changes: 15 additions & 0 deletions src/blocks/RegionHexMap.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,27 @@
{/await}
{/each}
</HexGrid>
<div class="bottom-bar">
<div style="display:{$isMobileDevice ? 'none' : 'auto'}">Dashed vertical lines: month boundaries</div>
<div style="display:{$isMobileDevice ? 'none' : 'auto'}; margin-bottom: 0.5em">
Red vertical line: selected date
</div>
<div>Hex fill color: value at selected date</div>
</div>
<ColorLegend {sensor} level="state" gradientLength={$isMobileDevice ? 250 : 280}>
<DownloadMenu fileName="{sensor.name}_US_States_{formatDateISO(date.value)}" data={dumpData} absolutePos {sensor} />
</ColorLegend>
</div>

<style>
.bottom-bar {
display: flex;
flex-direction: column;
align-items: center;
margin-bottom: 0.5em;
position: relative;
}

.title,
.value {
font-size: 0.65rem;
Expand Down
8 changes: 8 additions & 0 deletions src/components/Search.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,14 @@
.clear-button.modern {
right: 0;
}
.uk-dropdown {
position: absolute;
display: none;
z-index: 1020;
}
.uk-dropdown.uk-open {
display: block;
}
.uk-search-input.modern {
background: white;
font-weight: 400;
Expand Down
4 changes: 3 additions & 1 deletion src/specs/lineSpec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -704,11 +704,13 @@ export function generateSparkLine({
formatType: 'cachedTime',
grid: true,
gridDash: [4, 4],
gridColor: color,
gridOpacity: 0.5,
labels: false,
ticks: false,
domain: false,
tickCount: {
interval: 'week',
interval: 'month',
step: 1,
},
},
Expand Down
2 changes: 1 addition & 1 deletion src/stores/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export interface SensorConfig {
name: string;
id: string;
signal: string;
signalTooltip: string;
signalTooltip?: string;
description: string;
extendedColorScale?: boolean;

Expand Down
8 changes: 4 additions & 4 deletions src/stores/params.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { timeDay, timeMonth, timeWeek } from 'd3-time';
import { timeDay, timeMonth } from 'd3-time';
import { formatAPITime, addMissing, fitRange, parseAPITime } from '../data';
import type { EpiDataRow } from '../data';
import { nationInfo } from '../data/regions';
Expand Down Expand Up @@ -36,8 +36,8 @@ export function resolveSensorTimeFrame(
return ALL_TIME_FRAME;
}

export const WINDOW_SIZE = 4; // months;
export const SPARKLINE_SIZE = 4; // weeks;
export const WINDOW_SIZE = 9; // months;
export const SPARKLINE_SIZE = 3; // months;

export class DateParam {
readonly timeValue: number;
Expand All @@ -52,7 +52,7 @@ export class DateParam {
this.value = date;
this.week = EpiWeek.fromDate(date);
this.allTimeFrame = ALL_TIME_FRAME;
this.sparkLineTimeFrame = TimeFrame.compute(date, (d, step) => timeWeek.offset(d, step), SPARKLINE_SIZE);
this.sparkLineTimeFrame = TimeFrame.compute(date, (d, step) => timeMonth.offset(d, step), SPARKLINE_SIZE);
this.windowTimeFrame = TimeFrame.compute(date, (d, step) => timeMonth.offset(d, step), WINDOW_SIZE);
}

Expand Down