Merge pull request #553 from georgetown-cset/dependabot-updates

Update many dependencies
georgetown-cset · Oct 31, 2024 · d8173ee · d8173ee
2 parents 0ddd701 + 6585507
commit d8173ee
Show file tree

Hide file tree

Showing 7 changed files with 3,484 additions and 2,413 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -58,7 +58,7 @@ jobs:
         npm install
         npm test -- --coverage --coverageReporters="json-summary" --coverageReporters="text" | tee ./coverage.txt
     - name: Report javascript coverage
-      uses: MishaKav/jest-coverage-comment@v1.0.25
+      uses: MishaKav/jest-coverage-comment@v1
       with:
         title: "JavaScript Coverage"
         summary-title: "Summary"

diff --git a/supply-chain/package-lock.json b/supply-chain/package-lock.json
diff --git a/supply-chain/package.json b/supply-chain/package.json
@@ -13,24 +13,25 @@
     "serve": "gatsby serve",
     "clean": "gatsby clean",
     "artifactregistry-login": "npx google-artifactregistry-auth",
+    "arlogin": "npm run artifactregistry-login",
     "test": "jest",
     "lint-css": "stylelint src/styles/*.scss --fix"
   },
   "dependencies": {
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@eto/eto-ui-components": "^1.1.52",
+    "@eto/eto-ui-components": "^1.10.0",
     "@mdx-js/mdx": "^2.1.13",
     "@mdx-js/react": "^2.1.13",
     "@mui/icons-material": "^5.15.11",
-    "@mui/material": "^5.11.11",
-    "gatsby": "^5.4.2",
+    "@mui/material": "^5.16.7",
+    "gatsby": "^5.11.0",
     "gatsby-plugin-emotion": "^8.4.0",
-    "gatsby-plugin-manifest": "^5.4.0",
-    "gatsby-plugin-mdx": "^5.6.0",
+    "gatsby-plugin-manifest": "^5.11.0",
+    "gatsby-plugin-mdx": "^5.11.0",
     "gatsby-plugin-plausible": "^0.0.7",
-    "gatsby-plugin-sass": "^6.6.0",
-    "gatsby-source-filesystem": "^5.4.0",
+    "gatsby-plugin-sass": "^6.11.0",
+    "gatsby-source-filesystem": "^5.11.0",
     "package.json": "^2.0.1",
     "plotly.js": "^2.29.1",
     "react": "^18.2.0",
@@ -43,14 +44,14 @@
     "sass": "^1.71.1"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^6.4.2",
-    "@testing-library/react": "^14.0.0",
+    "@testing-library/jest-dom": "^6.6.2",
+    "@testing-library/react": "^16.0.1",
     "babel-jest": "^29.7.0",
     "babel-preset-gatsby": "^2.22.1",
     "eslint": "^8.56.0",
     "eslint-config-react-app": "^7.0.1",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^29.6.2",
+    "jest": "^29.7.0",
     "jest-canvas-mock": "^2.5.2",
     "jest-environment-jsdom": "^29.7.0",
     "react-test-renderer": "^18.2.0"

diff --git a/supply-chain/src/components/__tests__/__snapshots__/dashboard.js.snap b/supply-chain/src/components/__tests__/__snapshots__/dashboard.js.snap
diff --git a/supply-chain/src/components/dashboard.js b/supply-chain/src/components/dashboard.js
@@ -281,10 +281,10 @@ const Dashboard = () => {
   const inputNodes = getInputNodes();
   const listOfFilters = [
     {val: "None", text: "None"},
-    {val: FILTER_INPUT, text: <span>Specific inputs <HelpTooltip text={tooltips[FILTER_INPUT]} iconStyle={{verticalAlign: "top", height: "23px"}}/></span>},
-    {val: FILTER_COUNTRY, text: <span>Supplier countries <HelpTooltip text={tooltips[FILTER_COUNTRY]} iconStyle={{verticalAlign: "top", height: "23px"}}/></span>},
-    {val: FILTER_ORG, text: <span>Supplier companies <HelpTooltip text={tooltips[FILTER_ORG]} iconStyle={{verticalAlign: "top", height: "23px"}}/></span>},
-    {val: FILTER_CONCENTRATION, text: <span>Market concentration <HelpTooltip text={tooltips[FILTER_CONCENTRATION]} iconStyle={{verticalAlign: "top", height: "23px"}}/></span>},
+    {val: FILTER_INPUT, text: <span style={{display: "flex"}}>Specific inputs <HelpTooltip smallIcon text={tooltips[FILTER_INPUT]} /></span>},
+    {val: FILTER_COUNTRY, text: <span style={{display: "flex"}}>Supplier countries <HelpTooltip smallIcon text={tooltips[FILTER_COUNTRY]} /></span>},
+    {val: FILTER_ORG, text: <span style={{display: "flex"}}>Supplier companies <HelpTooltip smallIcon text={tooltips[FILTER_ORG]} /></span>},
+    {val: FILTER_CONCENTRATION, text: <span style={{display: "flex"}}>Market concentration <HelpTooltip smallIcon text={tooltips[FILTER_CONCENTRATION]} /></span>},
   ];
   const filterKeys = [FILTER_CHOOSE, FILTER_INPUT, FILTER_COUNTRY, FILTER_ORG, FILTER_CONCENTRATION];
   const defaultFilterValues = {

diff --git a/supply-chain/src/components/input_detail.js b/supply-chain/src/components/input_detail.js
@@ -3,6 +3,7 @@ import Loadable from "react-loadable";
 import ReactMarkdown from 'react-markdown'
 import {HelpTooltip, PlotlyDefaults} from "@eto/eto-ui-components";
 import Typography from "@mui/material/Typography";
+import { MoreHoriz as MoreHorzIcon } from "@mui/icons-material";
 import mdxComponents from "../helpers/mdx_style";
 import { VariantsList } from "./input_list";
 import { nodeToMeta, variants } from "../../data/graph";
@@ -104,7 +105,10 @@ export const ProviderListing = (props) => {
               {providerMeta[org]["name"]}
               {!variant && providers[org] !== "Major" && <span> ({providers[org]} market share)</span>}
               {variant &&
-                <HelpTooltip iconType="more-info" text={"Provides: " + variantProviders[org].map(e => nodeToMeta[e].name).join(", ")} />
+                <HelpTooltip
+                  text={"Provides: " + variantProviders[org].map(e => nodeToMeta[e].name).join(", ")}
+                  Icon={MoreHorzIcon}
+                />
               }
             </Typography>
           </td>
@@ -134,12 +138,15 @@ export const ProviderListing = (props) => {
             const countryName = variant ? countryInfo : countryInfo.country;
             return (
               <td key={countryName}>
-                <Typography component="p">
+                <Typography component="p" className="whereisthis">
                   {countryFlags[countryName] && <span className="flag">{countryFlags[countryName]}</span>}
                   {countryName}
                   {!variant && countryInfo.value !== "Major" && <span> ({countryInfo.value})</span>}
                   {variant &&
-                    <HelpTooltip iconType="more-info" text={"Provides: " + variantProviders[countryName].map(e => nodeToMeta[e].name).join(", ")} />
+                    <HelpTooltip
+                      text={"Provides: " + variantProviders[countryName].map(e => nodeToMeta[e].name).join(", ")}
+                      Icon={MoreHorzIcon}
+                    />
                   }
                 </Typography>
               </td>
@@ -152,11 +159,16 @@ export const ProviderListing = (props) => {
   };
 
   const title = (isOrg ? "Notable supplier companies" : "Supplier Countries") + (variant ? " (Variants)" : "");
-  const helpText = <HelpTooltip text={
-    isOrg ? "Global companies with significant market share or otherwise notable capabilities." :
-    "Countries with significant global market share."}
-    iconStyle={{verticalAlign: "middle"}}
-  />
+  const helpText = (
+    <HelpTooltip
+      smallIcon
+      text={isOrg ?
+        "Global companies with significant market share or otherwise notable capabilities." :
+        "Countries with significant global market share."
+      }
+      iconStyle={{verticalAlign: "middle"}}
+    />
+  );
 
   const showTable = () => {
     return (variant === true) ? Object.keys(variantProviders).length > 0 : providers !== undefined
@@ -215,7 +227,7 @@ const InputDetail = (props) => {
             <div>
               <Typography component={"p"} variant={"h6"} className="provision-heading">
                 Supplier countries
-                <HelpTooltip text={"Countries with significant global market share."} iconStyle={{verticalAlign: "middle"}} />
+                <HelpTooltip smallIcon text={"Countries with significant global market share."} iconStyle={{verticalAlign: "middle"}} />
               </Typography>
               <BarGraph countries={graphCountries}/>
               {nodeToMeta[selectedNode].market_chart_caption &&

diff --git a/supply-chain/src/styles/styles.scss b/supply-chain/src/styles/styles.scss
@@ -41,6 +41,10 @@ EXCEPT the description box at the top. */
   a {
     text-decoration: underline;
   }
+
+  .MuiTypography-root {
+    font-family: GTZirkonLight;
+  }
 }
 
 /* Come back to this */
@@ -179,7 +183,7 @@ EXCEPT the description box at the top. */
   }
 
   .graph-node-icon {
-    color: var(--bright-blue);
+    fill: var(--bright-blue);
     margin-right: 5px;
   }
 
@@ -403,7 +407,11 @@ EXCEPT the description box at the top. */
 
   .graph-node-icon {
     margin-right: 5px;
-    color: var(--bright-blue);
+    fill: var(--bright-blue);
+  }
+
+  .selected-node-child .graph-node-icon {
+    fill: var(--black);
   }
 
   .lower-bar-wrapper {
@@ -467,6 +475,10 @@ EXCEPT the description box at the top. */
     .variants-heading.selected-node-child {
       background-color: unset;
     }
+
+    table .MuiTypography-root .helptooltip {
+      display: inline;
+    }
   }
 
   .provision-heading {