Merge branch 'main' into setting-up-new-data-provider

SatcherInstitute · Jun 5, 2024 · dd70c05 · dd70c05
2 parents cf5dbbf + c66e881
commit dd70c05
Show file tree

Hide file tree

Showing 46 changed files with 270 additions and 328 deletions.
diff --git a/airflow/dags/svi.py b/airflow/dags/svi.py
diff --git a/config/data_sources/cdc_svi_county.tf b/config/data_sources/cdc_svi_county.tf
diff --git a/exporter/requirements.txt b/exporter/requirements.txt
@@ -40,7 +40,7 @@ google-cloud-core==2.4.1
     #   -r requirements.in
     #   google-cloud-bigquery
     #   google-cloud-storage
-google-cloud-pubsub==2.21.1
+google-cloud-pubsub==2.21.2
     # via -r requirements.in
 google-cloud-storage==2.16.0
     # via -r requirements.in
@@ -94,7 +94,7 @@ packaging==21.3
     #   db-dtypes
     #   google-cloud-bigquery
     #   gunicorn
-pandas==2.2.2
+pandas==2.0.3
     # via
     #   -r requirements.in
     #   db-dtypes
@@ -123,7 +123,7 @@ python-dateutil==2.9.0.post0
     #   pandas
 pytz==2022.2.1
     # via pandas
-requests==2.32.2
+requests==2.32.3
     # via
     #   -r requirements.in
     #   google-api-core

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -19,8 +19,8 @@
 		"@fontsource/roboto": "^5.0.13",
 		"@fontsource/roboto-condensed": "^5.0.16",
 		"@fontsource/taviraj": "^5.0.20",
-		"@mui/icons-material": "^5.15.18",
-		"@mui/material": "^5.15.18",
+		"@mui/icons-material": "^5.15.19",
+		"@mui/material": "^5.15.19",
 		"@vitejs/plugin-react": "^4.3.0",
 		"axios": "^1.7.2",
 		"d3": "^7.8.5",
@@ -29,7 +29,7 @@
 		"env-cmd": "^10.1.0",
 		"history": "^5.3.0",
 		"html2canvas": "^1.4.1",
-		"jotai": "^2.8.2",
+		"jotai": "^2.8.3",
 		"jotai-location": "^0.5.5",
 		"lodash": "^4.17.21",
 		"lru-cache": "^10.2.2",
@@ -50,19 +50,19 @@
 		"use-react-screenshot": "^4.0.0",
 		"vega": "^5.29.0",
 		"vega-lite": "^5.18.1",
-		"vite": "^5.2.11",
+		"vite": "^5.2.12",
 		"vite-plugin-svgr": "^4.2.0",
 		"vite-tsconfig-paths": "^4.2.1"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "1.7.3",
 		"@playwright/test": "^1.44.1",
 		"@testing-library/jest-dom": "^5.17.0",
-		"@testing-library/react": "^15.0.7",
+		"@testing-library/react": "^16.0.0",
 		"@types/d3": "^7.4.0",
 		"@types/dataframe-js": "^1.4.3",
 		"@types/lodash": "^4.17.4",
-		"@types/node": "^20.12.12",
+		"@types/node": "^20.14.0",
 		"@types/react": "^18.3.3",
 		"@types/react-dom": "^18.3.0",
 		"@types/react-lazyload": "^3.2.0",

diff --git a/frontend/playwright-tests/drinking.nightly.spec.ts b/frontend/playwright-tests/drinking.nightly.spec.ts
@@ -12,7 +12,7 @@ test('Excessive Drinking Flow', async ({ page }) => {
   await page.getByRole('heading', { name: 'Lowest:' }).click()
   await page.getByRole('heading', { name: 'National overall:' }).click()
   await page
-    .locator('#highest-lowest-geos')
+    .locator('#extremes')
     .getByText('Excessive drinking cases')
     .click()
   await page.getByText('Consider the possible impact').click()

diff --git a/frontend/playwright-tests/hiv_prep.nightly.spec.ts b/frontend/playwright-tests/hiv_prep.nightly.spec.ts
@@ -103,18 +103,6 @@ test('HIV PrEP', async ({ page }) => {
   await page
     .getByRole('heading', { name: 'Breakdown summary for PrEP' })
     .click()
-  await page
-    .getByRole('figure', { name: 'Breakdown summary for PrEP' })
-    .locator('h4')
-    .click()
-  await page.getByRole('columnheader', { name: 'Sex' }).click()
-  await page
-    .getByRole('columnheader', { name: 'PrEP coverage', exact: true })
-    .click()
-  await page.getByRole('columnheader', { name: 'Share of total PrEP' }).click()
-  await page
-    .getByRole('columnheader', { name: 'PrEP-eligible population' })
-    .click()
   await page.getByRole('columnheader', { name: 'Sex' }).click()
   await page.getByRole('cell', { name: 'Female' }).click()
   await page.getByRole('cell', { name: 'Male', exact: true }).click()