From 52d2676b6942b397bc025af6a99192e6ad606cb2 Mon Sep 17 00:00:00 2001 From: Sandesh Pandey Date: Mon, 23 Feb 2026 14:51:12 -0600 Subject: [PATCH 1/2] Recreate pull request for updated production branch (address comments for urban dashboard) --- .github/workflows/deploy-urban.yml | 5 +-- noaa-cpfp-point/script.js | 3 +- urban-dashboard/.env.local-sample | 1 - .../src/components/cards/dataset.jsx | 4 +- .../src/components/dataInsights/index.jsx | 37 +++++++++++-------- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/.github/workflows/deploy-urban.yml b/.github/workflows/deploy-urban.yml index cfa2a80d..9bd108a1 100644 --- a/.github/workflows/deploy-urban.yml +++ b/.github/workflows/deploy-urban.yml @@ -55,7 +55,6 @@ jobs: # Check for required variables [ -z "${{ secrets.REACT_APP_MAPBOX_ACCESS_TOKEN }}" ] && missing_vars+=("secrets.REACT_APP_MAPBOX_ACCESS_TOKEN") - [ -z "${{ secrets.REACT_APP_MAPBOX_STYLE_URL }}" ] && missing_vars+=("secrets.REACT_APP_MAPBOX_STYLE_URL") [ -z "${{ vars.REACT_APP_BASE_PATH_URBAN }}" ] && missing_vars+=("vars.REACT_APP_BASE_PATH_URBAN") [ -z "${{ secrets.DEPLOYMENT_ROLE_ARN }}" ] && missing_vars+=("secrets.DEPLOYMENT_ROLE_ARN") [ -z "${{ secrets.CF_DISTRIBUTION_ID }}" ] && missing_vars+=("secrets.CF_DISTRIBUTION_ID") @@ -73,10 +72,10 @@ jobs: working-directory: ./urban-dashboard env: REACT_APP_MAPBOX_TOKEN: ${{ secrets.REACT_APP_MAPBOX_ACCESS_TOKEN }} - REACT_APP_MAPBOX_STYLE_URL: ${{ secrets.REACT_APP_MAPBOX_STYLE_URL }} REACT_APP_BASE_PATH: ${{ vars.REACT_APP_BASE_PATH_URBAN }} PUBLIC_URL: ${{ vars.REACT_APP_BASE_PATH_URBAN }} - REACT_APP_BASEMAP_STYLES_MAPBOX_ID: ${{ secrets.REACT_APP_BASEMAP_STYLES_MAPBOX_ID}} + REACT_APP_GRAPES_DATASET_PAGE_URL: ${{ vars.REACT_APP_GRAPES_DATASET_PAGE_URL }} + REACT_APP_VULCAN_DATASET_PAGE_URL: ${{ vars.REACT_APP_VULCAN_DATASET_PAGE_URL }} run: | yarn yarn build diff --git a/noaa-cpfp-point/script.js b/noaa-cpfp-point/script.js index 316502b0..f27956d5 100644 --- a/noaa-cpfp-point/script.js +++ b/noaa-cpfp-point/script.js @@ -13,8 +13,7 @@ document.addEventListener("DOMContentLoaded", () => { container: "map", style: "mapbox://styles/mapbox/satellite-v9", center: [-98.585522, 1.8333333], // Centered on the US - zoom: 2, - projection: 'equirectangular' + zoom: 2 }); // Parse query parameters from the URL diff --git a/urban-dashboard/.env.local-sample b/urban-dashboard/.env.local-sample index 71c2cc57..b1668deb 100644 --- a/urban-dashboard/.env.local-sample +++ b/urban-dashboard/.env.local-sample @@ -1,5 +1,4 @@ REACT_APP_MAPBOX_TOKEN='xxxxxxxxxx' -REACT_APP_MAPBOX_STYLE_URL='mapbox://styles/xxxxxxxxx' PUBLIC_URL='xxxxxxx' REACT_APP_BASEMAP_STYLES_MAPBOX_ID='xxxxxxx' REACT_APP_DATA_URL='xxxxxxx' diff --git a/urban-dashboard/src/components/cards/dataset.jsx b/urban-dashboard/src/components/cards/dataset.jsx index a99f7c60..b68e6793 100644 --- a/urban-dashboard/src/components/cards/dataset.jsx +++ b/urban-dashboard/src/components/cards/dataset.jsx @@ -22,7 +22,7 @@ export function Grap2pesDatasetCard() {

{description} - Click here for more details. + Click here for more details.

) @@ -39,7 +39,7 @@ export function VulcanDatasetCard() {

{description} - Click here for more details. + Click here for more details.

) diff --git a/urban-dashboard/src/components/dataInsights/index.jsx b/urban-dashboard/src/components/dataInsights/index.jsx index a85b522b..aeb42feb 100644 --- a/urban-dashboard/src/components/dataInsights/index.jsx +++ b/urban-dashboard/src/components/dataInsights/index.jsx @@ -12,7 +12,7 @@ import { } from "chart.js"; import { Line, Pie } from "react-chartjs-2"; -import { Typography, Grid, Box } from "@mui/material"; +import { Typography, Grid, Box, Tooltip as MuiTooltip } from "@mui/material"; import "./index.css"; import { getVulcanData, getGra2pesData } from './helper/index' import { useConfig } from "../../context/configContext"; @@ -312,36 +312,43 @@ const GasEmissionsBySectorCard = ({ selection }) => { const Legend = () => { return ( - + {LegendItems.map((item, index) => ( - - {item.label} - + 12 ? item.label : ""} arrow placement="top"> + + {item.label} + + ))} From 464e8bd6432d52e8d87f38b1d4d3c0abccd78bf5 Mon Sep 17 00:00:00 2001 From: Sandesh Pandey Date: Mon, 23 Feb 2026 15:23:27 -0600 Subject: [PATCH 2/2] Add Grapes and vulcan url env vars in deployment script --- .github/workflows/deploy-urban.yml | 2 ++ .github/workflows/pr-preview.yml | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/deploy-urban.yml b/.github/workflows/deploy-urban.yml index 9bd108a1..c8822ad3 100644 --- a/.github/workflows/deploy-urban.yml +++ b/.github/workflows/deploy-urban.yml @@ -58,6 +58,8 @@ jobs: [ -z "${{ vars.REACT_APP_BASE_PATH_URBAN }}" ] && missing_vars+=("vars.REACT_APP_BASE_PATH_URBAN") [ -z "${{ secrets.DEPLOYMENT_ROLE_ARN }}" ] && missing_vars+=("secrets.DEPLOYMENT_ROLE_ARN") [ -z "${{ secrets.CF_DISTRIBUTION_ID }}" ] && missing_vars+=("secrets.CF_DISTRIBUTION_ID") + [ -z "${{ vars.REACT_APP_GRAPES_DATASET_PAGE_URL }}" ] && missing_vars+=("vars.REACT_APP_GRAPES_DATASET_PAGE_URL") + [ -z "${{ vars.REACT_APP_VULCAN_DATASET_PAGE_URL }}" ] && missing_vars+=("vars.REACT_APP_VULCAN_DATASET_PAGE_URL") # If any variables are missing, print them and exit with an error if [ ${#missing_vars[@]} -ne 0 ]; then diff --git a/.github/workflows/pr-preview.yml b/.github/workflows/pr-preview.yml index b9fd236e..568f55c7 100644 --- a/.github/workflows/pr-preview.yml +++ b/.github/workflows/pr-preview.yml @@ -136,6 +136,8 @@ jobs: [ -z "${{ secrets.REACT_APP_MAPBOX_ACCESS_TOKEN }}" ] && missing_vars+=("secrets.REACT_APP_MAPBOX_TOKEN") [ -z "${{ secrets.REACT_APP_MAPBOX_STYLE_URL }}" ] && missing_vars+=("secrets.REACT_APP_MAPBOX_STYLE_URL") [ -z "${{ vars.REACT_APP_BASE_PATH_URBAN }}" ] && missing_vars+=("vars.REACT_APP_BASE_PATH_URBAN") + [ -z "${{ vars.REACT_APP_GRAPES_DATASET_PAGE_URL }}" ] && missing_vars+=("vars.REACT_APP_GRAPES_DATASET_PAGE_URL") + [ -z "${{ vars.REACT_APP_VULCAN_DATASET_PAGE_URL }}" ] && missing_vars+=("vars.REACT_APP_VULCAN_DATASET_PAGE_URL") # If any variables are missing, print them and exit with an error if [ ${#missing_vars[@]} -ne 0 ]; then echo "Error: The following required variables are missing:" @@ -215,6 +217,8 @@ jobs: echo REACT_APP_BASEMAP_STYLES_MAPBOX_ID="${{ secrets.REACT_APP_BASEMAP_STYLES_MAPBOX_ID }}" >> ./urban-dashboard/.env echo REACT_APP_BASE_PATH="${{ vars.REACT_APP_BASE_PATH_URBAN }}/${{ env.PR_STRING }}" >> ./urban-dashboard/.env echo PUBLIC_URL="${{ vars.REACT_APP_BASE_PATH_URBAN }}/${{ env.PR_STRING }}" >> ./urban-dashboard/.env + echo REACT_APP_GRAPES_DATASET_PAGE_URL="${{ vars.REACT_APP_GRAPES_DATASET_PAGE_URL }}" >> ./urban-dashboard/.env + echo REACT_APP_VULCAN_DATASET_PAGE_URL="${{ vars.REACT_APP_VULCAN_DATASET_PAGE_URL }}" >> ./urban-dashboard/.env cd ./urban-dashboard set -a; source .env; set +a yarn @@ -272,6 +276,7 @@ jobs: aws s3 rm s3://${{ env.S3_BUCKET }}${{ vars.PUBLIC_URL_NOAA }}/${{ env.PR_STRING }}/ --recursive aws s3 rm s3://${{ env.S3_BUCKET }}${{ vars.PUBLIC_URL_NIST }}/${{ env.PR_STRING }}/ --recursive aws s3 rm s3://${{ env.S3_BUCKET }}${{ vars.PUBLIC_URL_GOES }}/${{ env.PR_STRING }}/ --recursive + aws s3 rm s3://${{ env.S3_BUCKET }}${{ vars.REACT_APP_BASE_PATH_URBAN }}/${{ env.PR_STRING }}/ --recursive - name: Remove PR comment run: |