Merge pull request #774 from NASA-IMPACT/develop

Production update (20th Aug)

Author: willemarcel

package.json

@@ -79,7 +79,7 @@
     "babel-plugin-istanbul": "^6.1.1",
     "babel-plugin-styled-components": "^2.1.4",
     "babel-preset-gatsby": "^3.13.2",
-    "eslint": "^8.10.0",
+    "eslint": "^8.57.1",
     "eslint-config-prettier": "^8.4.0",
     "eslint-config-react-app": "^7.0.0",
     "eslint-plugin-inclusive-language": "^2.2.0",

src/components/button.js

@@ -45,7 +45,6 @@ const Button = React.forwardRef(
       : mode === NEGATIVE
       ? POSITIVE
       : NEGATIVE
-    console.log(overrideMode)
     return (
       <Clickable
         as={as}

src/components/cards/campaign-card.js

@@ -56,6 +56,12 @@ export default function CampaignCard({ shortname, mode }) {
   `)
 
   const campaign = data.allCampaign.nodes.find(x => x.shortname === shortname)
+  // this is a temporary fix for the issue #770 that will help us to debug it
+  if (!campaign) {
+    console.log(`Campaign ${shortname} not found`)
+    return null
+  }
+
   return (
     <Card
       image={campaign.logo}

src/components/cards/instrument-card.js

@@ -49,6 +49,11 @@ export default function InstrumentCard({ shortname }) {
   const instrument = data.allInstrument.nodes.find(
     x => x.shortname === shortname
   )
+  // this is a temporary fix for the issue #770 that will help us to debug it
+  if (!instrument) {
+    console.log(`Instrument ${shortname} not found.`)
+    return null
+  }
 
   return (
     <Card

src/components/explore/filter-by-textinput.js

@@ -36,7 +36,7 @@ const FilterByTextInput = React.forwardRef(
         `}
       >
         <IconButton
-          data-cy="submit"
+          id="submit"
           icon={<SearchIcon color={colors[NEGATIVE].text} />}
           type="submit"
         />

src/templates/campaign/__tests__/__snapshots__/program-info-section.test.js.snap

@@ -234,11 +234,42 @@ exports[`Program Info Section renders logo when present in props 1`] = `
           >
             NASA Data Repository
           </label>
-          <div
-            data-cy="program-info-content-text"
-          >
-            Currently unavailable
-          </div>
+          <p>
+            <a
+              className="sc-eqUAAy jxHsRt"
+              data-cy="program-info-content-link"
+              href="https://daac.ornl.gov/"
+              rel="noopener noreferrer"
+              target="_blank"
+            >
+              <span
+                className="external-link___StyledSpan-sc-1dh0bmj-0 bnwLCF"
+              >
+                ORNL DAAC
+              </span>
+              <svg
+                height="16"
+                role="img"
+                version="1.1"
+                viewBox="0 0 16 16"
+                width="16"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <title>
+                  External Link
+                </title>
+                <rect
+                  fill="none"
+                  height="16"
+                  width="16"
+                />
+                <path
+                  d="M3,5h4V3H1v12h12V9h-2v4H3V5z M16,8V0L8,0v2h4.587L6.294,8.294l1.413,1.413L14,3.413V8H16z"
+                  fill="#aac9ff"
+                />
+              </svg>
+            </a>
+          </p>
         </div>
         <div
           data-cy="program-info-content"
@@ -414,11 +445,42 @@ exports[`Program Info Section renders placeholder when no logo is available 1`]
           >
             NASA Data Repository
           </label>
-          <div
-            data-cy="program-info-content-text"
-          >
-            Currently unavailable
-          </div>
+          <p>
+            <a
+              className="sc-eqUAAy jxHsRt"
+              data-cy="program-info-content-link"
+              href="https://daac.ornl.gov/"
+              rel="noopener noreferrer"
+              target="_blank"
+            >
+              <span
+                className="external-link___StyledSpan-sc-1dh0bmj-0 bnwLCF"
+              >
+                ORNL DAAC
+              </span>
+              <svg
+                height="16"
+                role="img"
+                version="1.1"
+                viewBox="0 0 16 16"
+                width="16"
+                xmlns="http://www.w3.org/2000/svg"
+              >
+                <title>
+                  External Link
+                </title>
+                <rect
+                  fill="none"
+                  height="16"
+                  width="16"
+                />
+                <path
+                  d="M3,5h4V3H1v12h12V9h-2v4H3V5z M16,8V0L8,0v2h4.587L6.294,8.294l1.413,1.413L14,3.413V8H16z"
+                  fill="#aac9ff"
+                />
+              </svg>
+            </a>
+          </p>
         </div>
         <div
           data-cy="program-info-content"

src/templates/campaign/__tests__/program-info-section.test.js

@@ -36,6 +36,14 @@ const testImage = {
     },
   },
 }
+const testRepositories = [
+  {
+    id: "1183964c-6517-4e25-89ca-68b1b409aed6",
+    shortname: "ORNL DAAC",
+    longname: "Oak Ridge National Laboratory DAAC (ORNL)",
+    url: "https://daac.ornl.gov/",
+  },
+]
 
 describe("Program Info Section", () => {
   it("renders logo when present in props", () => {
@@ -49,7 +57,7 @@ describe("Program Info Section", () => {
         programLead={testString}
         leadInvestigator={testString}
         dataManager={testString}
-        repositoryWebsite={testUrl}
+        repositories={testRepositories}
         partnerOrgListing={testString}
         publicationLink={testUrl}
       />
@@ -78,14 +86,14 @@ describe("Program Info Section", () => {
         programLead={testString}
         leadInvestigator={testString}
         dataManager={testString}
-        repositoryWebsite={testUrl}
+        repositories={testRepositories}
         partnerOrgListing={testString}
         publicationLink={testUrl}
       />
     )
     const tree = component.toJSON()
     const instance = component.root
-    expect(instance.findByType("svg")).toBeDefined()
+    expect(instance.findAllByType("svg").length).toBe(2)
     expect(tree).toMatchSnapshot()
   })
 })

src/templates/campaign/program-info-section.js

@@ -37,8 +37,15 @@ const ProgramInfoSection = ({
     { label: "Data Manager / Technical Contact", info: dataManager },
     {
       label: "NASA Data Repository",
-      info: repositories && repositories[0]?.shortname,
-      link: repositories && repositories[0]?.url,
+      info: repositories
+        ? repositories[0]?.url.startsWith("http")
+          ? repositories[0]?.shortname
+          : repositories[0]?.longname
+        : null,
+      link:
+        repositories && repositories[0]?.url.startsWith("http")
+          ? repositories[0]?.url
+          : null,
     },
     { label: "Partner Organizations", info: partnerOrgListing },
     {
@@ -159,6 +166,7 @@ ProgramInfoSection.propTypes = {
   repositories: PropTypes.arrayOf(
     PropTypes.shape({
       shortname: PropTypes.string.isRequired,
+      longname: PropTypes.string.isRequired,
       url: PropTypes.string.isRequired,
     }).isRequired
   ).isRequired,

src/utils/constants.js

@@ -45,4 +45,5 @@ export const MOVING_PLATFORMS = [
   "Drifting Buoy",
   "Ships/Boats",
   "Saildrone",
+  "Air Platforms",
 ]