From bd67ea5d5268501e7d32d8857014bf4965ab0896 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Mar 2023 17:11:32 +0000 Subject: [PATCH 01/12] build(deps-dev): bump webpack from 5.73.0 to 5.76.0 Bumps [webpack](https://github.com/webpack/webpack) from 5.73.0 to 5.76.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.73.0...v5.76.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- package-lock.json | 26 +++++++++++++------------- package.json | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 44ed564e..9f521d93 100644 --- a/package-lock.json +++ b/package-lock.json @@ -90,7 +90,7 @@ "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" } @@ -15538,9 +15538,9 @@ "dev": true }, "node_modules/webpack": { - "version": "5.73.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz", - "integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==", + "version": "5.76.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz", + "integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==", "dev": true, "dependencies": { "@types/eslint-scope": "^3.7.3", @@ -15548,11 +15548,11 @@ "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/wasm-edit": "1.11.1", "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.4.1", + "acorn": "^8.7.1", "acorn-import-assertions": "^1.7.6", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.9.3", + "enhanced-resolve": "^5.10.0", "es-module-lexer": "^0.9.0", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -15565,7 +15565,7 @@ "schema-utils": "^3.1.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.3.1", + "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, "bin": { @@ -27727,9 +27727,9 @@ "dev": true }, "webpack": { - "version": "5.73.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.73.0.tgz", - "integrity": "sha512-svjudQRPPa0YiOYa2lM/Gacw0r6PvxptHj4FuEKQ2kX05ZLkjbVc5MnPs6its5j7IZljnIqSVo/OsY2X0IpHGA==", + "version": "5.76.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.76.0.tgz", + "integrity": "sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.3", @@ -27737,11 +27737,11 @@ "@webassemblyjs/ast": "1.11.1", "@webassemblyjs/wasm-edit": "1.11.1", "@webassemblyjs/wasm-parser": "1.11.1", - "acorn": "^8.4.1", + "acorn": "^8.7.1", "acorn-import-assertions": "^1.7.6", "browserslist": "^4.14.5", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.9.3", + "enhanced-resolve": "^5.10.0", "es-module-lexer": "^0.9.0", "eslint-scope": "5.1.1", "events": "^3.2.0", @@ -27754,7 +27754,7 @@ "schema-utils": "^3.1.0", "tapable": "^2.1.1", "terser-webpack-plugin": "^5.1.3", - "watchpack": "^2.3.1", + "watchpack": "^2.4.0", "webpack-sources": "^3.2.3" }, "dependencies": { diff --git a/package.json b/package.json index f07a1413..a95690bb 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "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" }, From d9deb6c65f8c125ae3f00b657d5137cefbb0a530 Mon Sep 17 00:00:00 2001 From: Kathryn Mazaitis Date: Fri, 31 Mar 2023 16:10:14 -0400 Subject: [PATCH 02/12] update uikit --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9f521d93..d50bed3d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "3.2.5", "license": "MIT", "dependencies": { - "uikit": "^3.14.3" + "uikit": "^3.16.13" }, "devDependencies": { "@babel/core": "^7.18.6", @@ -14532,9 +14532,9 @@ } }, "node_modules/uikit": { - "version": "3.14.3", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.14.3.tgz", - "integrity": "sha512-bNuMwczwGxIV0jGlkB/PCGsFem0st+4o5TmyTFYQtmdve9yg8iL/ZrW59/FzeBoQoFeh0PXgcwYzKdsrONaP9Q==" + "version": "3.16.13", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.16.13.tgz", + "integrity": "sha512-v5CpeWYkMMJvSiJqzNLwrCN9O7y27sJDv08Ri7fHEyUm7U4nW/z70NBxLiflqCNRb1Bbj5YNjgyUuRg0AlXVxw==" }, "node_modules/unicode-canonical-property-names-ecmascript": { "version": "2.0.0", @@ -26853,9 +26853,9 @@ "dev": true }, "uikit": { - "version": "3.14.3", - "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.14.3.tgz", - "integrity": "sha512-bNuMwczwGxIV0jGlkB/PCGsFem0st+4o5TmyTFYQtmdve9yg8iL/ZrW59/FzeBoQoFeh0PXgcwYzKdsrONaP9Q==" + "version": "3.16.13", + "resolved": "https://registry.npmjs.org/uikit/-/uikit-3.16.13.tgz", + "integrity": "sha512-v5CpeWYkMMJvSiJqzNLwrCN9O7y27sJDv08Ri7fHEyUm7U4nW/z70NBxLiflqCNRb1Bbj5YNjgyUuRg0AlXVxw==" }, "unicode-canonical-property-names-ecmascript": { "version": "2.0.0", diff --git a/package.json b/package.json index a95690bb..571ac142 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,7 @@ "webpack-dev-server": "^4.9.2" }, "dependencies": { - "uikit": "^3.14.3" + "uikit": "^3.16.13" }, "lint-staged": { "*.{ts,js,svelte}": "eslint --cache --fix", From 733d3c4ea78237d8b9c689c50f3add733017a0fb Mon Sep 17 00:00:00 2001 From: Kathryn Mazaitis Date: Fri, 31 Mar 2023 17:38:29 -0400 Subject: [PATCH 03/12] fix failing unit test for constants --- src/stores/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stores/constants.ts b/src/stores/constants.ts index f8439aee..80b9398b 100644 --- a/src/stores/constants.ts +++ b/src/stores/constants.ts @@ -15,7 +15,7 @@ export interface SensorConfig { name: string; id: string; signal: string; - signalTooltip: string; + signalTooltip?: string; description: string; extendedColorScale?: boolean; From 9491259e1a24af40d0474294dd2e2e92cb30f839 Mon Sep 17 00:00:00 2001 From: Kathryn Mazaitis Date: Fri, 31 Mar 2023 17:39:56 -0400 Subject: [PATCH 04/12] fix location search * location dropdown no longer affects flow of nav bar * clear and location icons display at correct line * works on covidcast location, covidcast indicator, and ctis pages * does not work on dashboard builder yet --- src/components/Search.svelte | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/Search.svelte b/src/components/Search.svelte index 416fb65f..9a1230ed 100644 --- a/src/components/Search.svelte +++ b/src/components/Search.svelte @@ -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; From 3c9602b64e6d971f42d7ca2be4e62860f9099223 Mon Sep 17 00:00:00 2001 From: Kathryn Mazaitis Date: Mon, 24 Apr 2023 14:43:06 -0400 Subject: [PATCH 05/12] Expand sparklines for non-pandemic use * Switch sparkline length from 4 weeks to 3 months * Switch window length from 4 months to 9 months * Increase visibility of y-axis gridlines * Switch y-axis gridlines from marking weeks to marking months * Add feature descriptions to hexmap legend --- src/blocks/RegionHexMap.svelte | 15 +++++++++++++++ src/specs/lineSpec.ts | 4 +++- src/stores/params.ts | 8 ++++---- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/blocks/RegionHexMap.svelte b/src/blocks/RegionHexMap.svelte index ac9c83e0..d1de02e1 100644 --- a/src/blocks/RegionHexMap.svelte +++ b/src/blocks/RegionHexMap.svelte @@ -145,12 +145,27 @@ {/await} {/each} +
+
Dashed vertical lines: month boundaries
+
+ Red vertical line: selected date +
+
Hex fill color: value at selected date
+