Merge pull request #984 from Eastern-Research-Group/feature/726_more-…

…climate-tab-changes Feature/726 more climate tab changes
Eastern-Research-Group · Jun 27, 2024 · 684c0d6 · 684c0d6
2 parents 950712f + 4e057b1
commit 684c0d6
Show file tree

Hide file tree

Showing 4 changed files with 107 additions and 27 deletions.
diff --git a/app/client/src/components/shared/WaterbodyInfo.tsx b/app/client/src/components/shared/WaterbodyInfo.tsx
@@ -1066,32 +1066,41 @@ function WaterbodyInfo({
   );
 
   // jsx
-  const sewerOverflowsContent = (
-    <ListContent
-      rows={[
-        {
-          label: 'Permit Status',
-          value: attributes.permit_status_code,
-        },
-        {
-          label: 'Permit Type',
-          value: attributes.permit_type_code,
-        },
-        {
-          label: 'Latitude/Longitude',
-          value: `${toFixedFloat(
-            parseFloat(attributes.facility_lat),
-            5,
-          )}, ${toFixedFloat(parseFloat(attributes.facility_lon), 5)}`,
-        },
-        {
-          label: 'NPDES ID',
-          value: attributes.npdes_id,
-        },
-      ]}
-      styles={listContentStyles}
-    />
-  );
+  const sewerOverflowsContent = () => {
+    const echoLookups = lookupFiles?.extremeWeatherConfig?.data?.echoLookups;
+    if (!echoLookups) return null;
+
+    const { permit_status_code, permit_type_code } = attributes;
+    return (
+      <ListContent
+        rows={[
+          {
+            label: 'Permit Status',
+            value:
+              echoLookups.permitStatus?.[permit_status_code] ??
+              permit_status_code,
+          },
+          {
+            label: 'Permit Type',
+            value:
+              echoLookups.permitType?.[permit_type_code] ?? permit_type_code,
+          },
+          {
+            label: 'Latitude/Longitude',
+            value: `${toFixedFloat(
+              parseFloat(attributes.facility_lat),
+              5,
+            )}, ${toFixedFloat(parseFloat(attributes.facility_lon), 5)}`,
+          },
+          {
+            label: 'NPDES ID',
+            value: attributes.npdes_id,
+          },
+        ]}
+        styles={listContentStyles}
+      />
+    );
+  };
 
   // jsx
   const storageTankContent = (
@@ -1401,7 +1410,7 @@ function WaterbodyInfo({
   if (type === 'Protected Areas') content = protectedAreaContent;
   if (type === 'Demographic Indicators') content = ejscreenContent;
   if (type === 'Pollutant Storage Tank') content = storageTankContent;
-  if (type === 'Combined Sewer Overflow') content = sewerOverflowsContent;
+  if (type === 'Combined Sewer Overflow') content = sewerOverflowsContent();
   if (type === 'Wells') content = wellsContent;
   if (type === 'Dams') content = damsContent();
   if (type === 'Congressional District') {

diff --git a/app/client/src/types/index.ts b/app/client/src/types/index.ts
@@ -261,6 +261,10 @@ export type ExtremeWeatherConfigState = {
   status: 'fetching' | 'failure' | 'success';
   data: {
     currentWeatherDefaults: ExtremeWeatherRow[];
+    echoLookups: {
+      permitStatus: { [key: string]: string };
+      permitType: { [key: string]: string };
+    };
     historicalDefaults: ExtremeWeatherRow[];
     historicalRangeDefaults: ExtremeWeatherRow[];
     potentiallyVulnerableDefaults: ExtremeWeatherRow[];

diff --git a/app/server/app/public/data/community/extreme-weather.json b/app/server/app/public/data/community/extreme-weather.json
@@ -123,6 +123,27 @@
     }
   ],
 
+  "echoLookups": {
+    "permitStatus": {
+      "none": "Any",
+      "EFF": "Effective",
+      "EXP": "Expired",
+      "ADC": "Administratively Continued",
+      "PND": "Pending",
+      "RET": "Retired",
+      "NON": "Not Needed",
+      "TRM": "Terminated"
+    },
+
+    "permitType": {
+      "none": "Any",
+      "NPD": "NPDES Individual Permit",
+      "NGP": "NPDES Master General Permit",
+      "GPC": "General Permit Covered Facility",
+      "UFT": "Unpermitted Facility"
+    }
+  },
+
   "historicalDefaults": [
     {
       "id": "fire",

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,51 @@
 # Change Log
 
+## 2.10.0 (July 2024)
+
+### Added
+
+- Added the Extreme Weather tab.
+
+- Added GRTS success stories to the Restore tab of the community page.
+
+- Added the ability to search for monitoring locations and waterbodies (these results open to their respective reports in a new tab).
+
+### Changed
+
+- Updated One EPA Template footer links.
+
+- Updated the links for monitoring locations to automatically open to the advanced tab of the WQP page.
+
+- Updated the sitemap to have examples for dynamic pages (i.e., waterbody report, monitoring report, etc.).
+
+- Updated the waterbody report page to list all cycles for the waterbody (including links to that specific cycle).
+
+- Moved more config files to S3 bucket.
+
+- Fixed issue of waterbody report page not always loading. Switched to `summarize=N` for calls to attains actions service.
+
+- Fixed issue with GA4 not logging correctly.
+
+- Fixed issue of layer list not always loading in full screen view.
+
+- Fixed issue of the legend for the land cover layer being scrunched.
+
+- Fixed issue of highcharts tooltip overflowing container.
+
+- Fixed issue of infinite loading spinners when searching for a bad location.
+
+- Fixed issue of error message disappearing immediately when searching for a bad location.
+
+- Fixed issue of USGS sensors no longer showing in list views.
+
+### Chores
+
+- Updated dependencies.
+
+- Updated ArcGIS JS API.
+
+- Created a github action for building production.
+
 ## 2.9.0 (February 2024)
 
 ### Changed