Merge pull request #982 from Eastern-Research-Group/feature/746_updat…

…e-dependencies Feature/746 update dependencies
Eastern-Research-Group · Jun 25, 2024 · 1ed9db6 · 1ed9db6
2 parents 0c09ac0 + 9e8e062
commit 1ed9db6
Show file tree

Hide file tree

Showing 21 changed files with 9,789 additions and 22,602 deletions.
diff --git a/app/client/package-lock.json b/app/client/package-lock.json
diff --git a/app/client/package.json b/app/client/package.json
@@ -38,61 +38,63 @@
   "devDependencies": {
     "@cypress/instrument-cra": "1.4.0",
     "@esri/arcgis-rest-types": "3.7.0",
-    "@testing-library/jest-dom": "6.3.0",
-    "@testing-library/react": "14.1.2",
+    "@testing-library/jest-dom": "6.4.6",
+    "@testing-library/react": "16.0.0",
     "@testing-library/user-event": "14.5.2",
     "@types/file-saver": "2.0.7",
-    "@types/jest": "29.5.11",
-    "@types/node": "20.11.10",
+    "@types/jest": "29.5.12",
+    "@types/node": "20.14.5",
     "@types/papaparse": "5.3.14",
-    "@types/react": "18.2.48",
-    "@types/react-dom": "18.2.18",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.0",
     "@types/react-ranger": "2.0.4",
-    "@types/smoothscroll-polyfill": "0.3.3",
+    "@types/smoothscroll-polyfill": "0.3.4",
     "@types/uuid": "9.0.8",
+    "ajv": "8.16.0",
     "eslint-config-react-app": "7.0.1",
-    "husky": "9.0.7",
-    "lint-staged": "15.2.0",
-    "prettier": "3.2.4",
-    "typescript": "5.3.3",
-    "web-vitals": "3.5.2"
+    "husky": "9.0.11",
+    "lint-staged": "15.2.7",
+    "prettier": "3.3.2",
+    "typescript": "5.4.5",
+    "web-vitals": "4.1.1"
   },
   "dependencies": {
-    "@arcgis/core": "4.28.10",
-    "@emotion/react": "11.11.3",
+    "@arcgis/core": "4.29.10",
+    "@emotion/react": "11.11.4",
     "@emotion/styled": "11.11.5",
-    "@mui/material": "5.15.16",
+    "@esri/calcite-components-react": "2.9.0",
+    "@mui/material": "5.15.20",
     "@radix-ui/react-dialog": "1.0.5",
     "@reach/tabs": "0.18.0",
     "@reach/tooltip": "0.18.0",
     "@reach/window-size": "0.18.0",
     "@visx/curve": "3.3.0",
     "@visx/glyph": "3.3.0",
-    "@visx/legend": "3.5.0",
+    "@visx/legend": "3.10.3",
     "@visx/scale": "3.5.0",
-    "@visx/xychart": "3.8.0",
+    "@visx/xychart": "3.11.0",
     "file-saver": "2.0.5",
     "glossary-panel": "github:Eastern-Research-Group/glossary",
-    "highcharts": "11.4.1",
+    "highcharts": "11.4.3",
     "highcharts-react-official": "3.2.1",
     "html-to-image": "1.11.11",
     "papaparse": "5.4.1",
     "pdf-lib": "1.17.1",
-    "react": "18.2.0",
+    "react": "18.3.1",
     "react-app-polyfill": "3.0.0",
-    "react-dom": "18.2.0",
+    "react-dom": "18.3.1",
     "react-dropzone": "14.2.3",
-    "react-rnd": "10.4.1",
-    "react-router-dom": "6.21.3",
+    "react-rnd": "10.4.11",
+    "react-router-dom": "6.23.1",
     "react-scripts": "5.0.1",
     "react-select": "5.8.0",
     "react-spring": "9.7.3",
     "react-sticky-box": "2.0.5",
     "react-switch": "7.0.0",
     "react-table": "7.8.0",
-    "react-virtuoso": "4.6.3",
+    "react-virtuoso": "4.7.11",
     "smoothscroll-polyfill": "0.4.4",
-    "uuid": "9.0.1"
+    "uuid": "10.0.0"
   },
   "lint-staged": {
     "src/**/*.{js,json,css,md}": "prettier --write",

diff --git a/app/client/src/components/shared/Accordion.tsx b/app/client/src/components/shared/Accordion.tsx
@@ -219,13 +219,6 @@ function AccordionList({
   );
 }
 
-// defaultProp set here just to satisfy flow, even though props are passed as a default function params
-AccordionList.defaultProps = {
-  expandDisabled: false,
-  sortOptions: [],
-  onSortChange: () => {},
-};
-
 const accordionItemContainerStyles = css`
   border-top: 1px solid #d8dfe2;
 `;

diff --git a/app/client/src/components/shared/DataContent.js b/app/client/src/components/shared/DataContent.js
@@ -216,7 +216,7 @@ function DataContent() {
                 </a>
                 {includeExit && (
                   <a
-                    class="exit-disclaimer"
+                    className="exit-disclaimer"
                     href="https://www.epa.gov/home/exit-epa"
                     target="_blank"
                     rel="noopener noreferrer"

diff --git a/app/client/src/components/shared/LocationSearch.js b/app/client/src/components/shared/LocationSearch.js
@@ -986,7 +986,7 @@ function LocationSearch({ route, label }: Props) {
                       role="menuitem"
                       className={`esri-search__source esri-menu__list-item ${secondClass}`}
                       tabIndex="-1"
-                      key={`source-key-${sourceIndex}`}
+                      key={`source-key-${source.name}`}
                       onClick={handleSourceSelect}
                       onKeyDown={handleSourceSelect}
                     >
@@ -1049,7 +1049,7 @@ function LocationSearch({ route, label }: Props) {
                   role="menu"
                   data-node-ref="_suggestionListNode"
                 >
-                  {filteredSuggestions.map((source, suggestIndex) => {
+                  {filteredSuggestions.map((source) => {
                     function findGroupName() {
                       if (
                         source.source.name === 'ArcGIS World Geocoding Service'
@@ -1085,7 +1085,7 @@ function LocationSearch({ route, label }: Props) {
                     const title = findGroupName();
                     return (
                       <LayerSuggestions
-                        key={`layer-suggestions-key-${suggestIndex}`}
+                        key={`layer-suggestions-key-${source.source.name}`}
                         title={title}
                         source={source}
                         startIndex={layerEndIndex - (source.results.length - 1)}

diff --git a/app/client/src/components/shared/Map.tsx b/app/client/src/components/shared/Map.tsx
@@ -21,7 +21,11 @@ type Props = {
   startingExtent?: Object | null;
 };
 
-function Map({ children, layers = null, startingExtent = null }: Props) {
+function Map({
+  children,
+  layers = null,
+  startingExtent = null,
+}: Readonly<Props>) {
   const { widgetLayers } = useAddSaveDataWidgetState();
   const { basemap, highlightOptions, homeWidget, mapView, setMapView } =
     useContext(LocationSearchContext);
@@ -104,7 +108,7 @@ function Map({ children, layers = null, startingExtent = null }: Props) {
               view={mapView}
               layers={layers}
             />
-            <MapMouseEvents map={map} view={mapView} />
+            <MapMouseEvents view={mapView} />
           </>
         )}
       </div>
@@ -125,7 +129,7 @@ export function MapContainer(props: Props) {
   );
 }
 
-export default function MapWrapper(props: Props) {
+export default function MapWrapper(props: Readonly<Props>) {
   return (
     <FullscreenProvider>
       <MapContainer {...props} />

diff --git a/app/client/src/components/shared/MapMouseEvents.tsx b/app/client/src/components/shared/MapMouseEvents.tsx
@@ -12,16 +12,18 @@ import { useMapHighlightState } from 'contexts/MapHighlight';
 import { useLayers } from 'contexts/Layers';
 import { LocationSearchContext } from 'contexts/locationSearch';
 import { useServicesContext } from 'contexts/LookupFiles';
-// config
-import { getPopupContent, graphicComparison } from 'utils/mapFunctions';
 // types
 import type {
   MonitoringFeatureUpdate,
   MonitoringFeatureUpdates,
   WatershedAttributes,
 } from 'types';
 // utils
-import { isInScale } from 'utils/mapFunctions';
+import {
+  getPopupContent,
+  graphicComparison,
+  isInScale,
+} from 'utils/mapFunctions';
 
 // --- types ---
 interface ClickEvent {
@@ -200,8 +202,6 @@ function updateGraphics(
 
 // --- components ---
 type Props = {
-  // map and view props auto passed from parent Map component by react-arcgis
-  map: any;
   view: any;
 };
 
@@ -223,10 +223,12 @@ function MapMouseEvents({ view }: Props) {
     (point: __esri.Point, boundaries: __esri.FeatureSet) => {
       view.closePopup();
       view.popup = new Popup({
-        collapseEnabled: false,
         location: point,
         title: 'Change to this location?',
         visible: true,
+        visibleElements: {
+          collapseButton: false,
+        },
         content: getPopupContent({
           navigate,
           resetData: () => {
@@ -293,10 +295,12 @@ function MapMouseEvents({ view }: Props) {
                 prioritizePopup(graphics, onTribePage);
                 setSelectedGraphic(graphic);
                 view.popup = new Popup({
-                  collapseEnabled: false,
                   features: graphics,
                   location: point,
                   visible: true,
+                  visibleElements: {
+                    collapseButton: false,
+                  },
                 });
               } else {
                 setSelectedGraphic(null);