Merge pull request #939 from Eastern-Research-Group/feature/672_addre…

…ss-codesmells feature/672 address codesmells
Eastern-Research-Group · Jan 30, 2024 · 3133eb7 · 3133eb7
2 parents f831dd5 + 21e88c0
commit 3133eb7
Show file tree

Hide file tree

Showing 62 changed files with 2,497 additions and 2,360 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,23 +38,24 @@
   "devDependencies": {
     "@cypress/instrument-cra": "1.4.0",
     "@esri/arcgis-rest-types": "3.7.0",
-    "@testing-library/jest-dom": "6.2.0",
+    "@testing-library/jest-dom": "6.3.0",
     "@testing-library/react": "14.1.2",
     "@testing-library/user-event": "14.5.2",
     "@types/file-saver": "2.0.7",
     "@types/jest": "29.5.11",
-    "@types/node": "20.10.7",
+    "@types/node": "20.11.10",
     "@types/papaparse": "5.3.14",
-    "@types/react": "18.2.47",
+    "@types/react": "18.2.48",
     "@types/react-dom": "18.2.18",
     "@types/react-ranger": "2.0.4",
     "@types/smoothscroll-polyfill": "0.3.3",
-    "@types/uuid": "9.0.7",
-    "husky": "8.0.3",
+    "@types/uuid": "9.0.8",
+    "eslint-config-react-app": "7.0.1",
+    "husky": "9.0.7",
     "lint-staged": "15.2.0",
-    "prettier": "3.1.1",
+    "prettier": "3.2.4",
     "typescript": "5.3.3",
-    "web-vitals": "3.5.1"
+    "web-vitals": "3.5.2"
   },
   "dependencies": {
     "@arcgis/core": "4.28.10",
@@ -67,11 +68,10 @@
     "@visx/glyph": "3.3.0",
     "@visx/legend": "3.5.0",
     "@visx/scale": "3.5.0",
-    "@visx/xychart": "3.5.1",
-    "eslint-config-react-app": "7.0.1",
+    "@visx/xychart": "3.8.0",
     "file-saver": "2.0.5",
     "glossary-panel": "github:Eastern-Research-Group/glossary",
-    "highcharts": "11.2.0",
+    "highcharts": "11.3.0",
     "highcharts-react-official": "3.2.1",
     "html-to-image": "1.11.11",
     "papaparse": "5.4.1",
@@ -82,14 +82,14 @@
     "react-dropzone": "14.2.3",
     "react-ranger": "2.1.0",
     "react-rnd": "10.4.1",
-    "react-router-dom": "6.21.1",
+    "react-router-dom": "6.21.3",
     "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.2",
+    "react-virtuoso": "4.6.3",
     "smoothscroll-polyfill": "0.4.4",
     "uuid": "9.0.1"
   },

diff --git a/app/client/public/index.html b/app/client/public/index.html
@@ -1464,7 +1464,6 @@ <h2>Follow.</h2>
     <!-- End EPA template script overrides-->
 
     <style>
-      .menu--main .menu__link,
       .menu--main .menu__link,
       .menu--main .menu__link:visited {
         color: #fff;

diff --git a/app/client/src/components/pages/Community.Routes.CommunityTabs.js b/app/client/src/components/pages/Community.Routes.CommunityTabs.js
@@ -497,7 +497,7 @@ function CommunityTabs() {
         <ul css={tabDotsStyles} aria-hidden="true">
           {tabs.map((tab, index) => {
             return (
-              <li key={index}>
+              <li key={tab.title}>
                 <button
                   css={tabDotStyles}
                   tabIndex="-1"

diff --git a/app/client/src/components/pages/Community.Tabs.IdentifiedIssues.js b/app/client/src/components/pages/Community.Tabs.IdentifiedIssues.js
@@ -516,15 +516,15 @@ function IdentifiedIssues() {
     )}')`;
   }
 
-  const [prevDischargersLayerFilter, setPrevDischagersLayerFilter] =
+  const [prevDischargersLayerFilter, setPrevDischargersLayerFilter] =
     useState('');
   if (
     dischargersLayer &&
     showDischargersLayer &&
     dischargersLayerFilter !== prevDischargersLayerFilter
   ) {
     dischargersLayer.definitionExpression = dischargersLayerFilter;
-    setPrevDischagersLayerFilter(dischargersLayerFilter);
+    setPrevDischargersLayerFilter(dischargersLayerFilter);
   }
 
   const [switchId] = useState(uniqueId('effluent-violations-switch-'));

diff --git a/app/client/src/components/pages/Community.Tabs.Protect.js b/app/client/src/components/pages/Community.Tabs.Protect.js
@@ -1216,29 +1216,29 @@ function Protect() {
 
                                 const protectionPlanLinks =
                                   filteredProtectionPlans?.length > 0
-                                    ? filteredProtectionPlans.map(
-                                        (plan, index) => {
-                                          if (plan?.url && plan.title) {
-                                            return (
-                                              <div key={index}>
-                                                <a
-                                                  href={plan.url}
-                                                  target="_blank"
-                                                  rel="noopener noreferrer"
-                                                >
-                                                  {plan.title}
-                                                </a>
-                                              </div>
-                                            );
-                                          }
-                                          return false;
-                                        },
-                                      )
+                                    ? filteredProtectionPlans.map((plan) => {
+                                        if (plan?.url && plan.title) {
+                                          return (
+                                            <div
+                                              key={`${plan.title}-${plan.url}`}
+                                            >
+                                              <a
+                                                href={plan.url}
+                                                target="_blank"
+                                                rel="noopener noreferrer"
+                                              >
+                                                {plan.title}
+                                              </a>
+                                            </div>
+                                          );
+                                        }
+                                        return false;
+                                      })
                                     : 'Document not available';
 
                                 return (
                                   <FeatureItem
-                                    key={index}
+                                    key={item.id}
                                     title={
                                       <>
                                         <strong>