Create Deployment Environments

.github/workflows/deploy-to-production.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
+    environment: production
 
     env:
       ADMG_ACCESS_TOKEN: ${{ secrets.ADMG_ACCESS_TOKEN }}
@@ -17,7 +18,7 @@ jobs:
       GATSBY_CPU_COUNT: 2
       GATSBY_MAPBOX_TOKEN: ${{ secrets.GATSBY_MAPBOX_TOKEN }}
       GA_MEASUREMENT_ID: ${{ secrets.GA_MEASUREMENT_ID }}
-      GATSBY_ADMG_API: ${{ secrets.GATSBY_ADMG_API }}
+      GATSBY_ADMG_API: ${{ vars.GATSBY_ADMG_API }}
 
     steps:
       - name: Cancel Previous Runs

.github/workflows/deploy-to-staging.yml

@@ -11,6 +11,7 @@ on:
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
+    environment: staging
 
     if: ${{ github.event.workflow_run.conclusion == 'success' }}
 
@@ -22,7 +23,7 @@ jobs:
       GATSBY_CPU_COUNT: 2
       GATSBY_MAPBOX_TOKEN: ${{ secrets.GATSBY_MAPBOX_TOKEN }}
       GA_MEASUREMENT_ID: ${{ secrets.GA_MEASUREMENT_ID }}
-      GATSBY_ADMG_API: ${{ secrets.GATSBY_ADMG_API }}
+      GATSBY_ADMG_API: ${{ vars.GATSBY_ADMG_API }}
 
     steps:
       - name: Cancel Previous Runs

gatsby-node.js

@@ -42,12 +42,21 @@ exports.createSchemaCustomization = ({ actions }) => {
       geographical_regions: [geographical_region] @link
       iops: [iop] @link
       significant_events: [significant_event] @link
+    }
+    type cmr_science_keyword implements Node {
+      Term: String
+      Topic: String
+      Category: String
+      VariableLevel1: String
+      VariableLevel2: String
+      VariableLevel3: String
     }
      type doi implements Node {
        cmr_entry_title: String
        doi: String
        long_name: String
-       cmr_science_keywords: String
+       cmr_data_formats: [String]
+       cmr_science_keywords: [cmr_science_keyword]
        campaigns: [campaign] @link
        instruments: [instrument] @link
        platforms: [platform] @link
@@ -295,3 +304,57 @@ exports.onCreateWebpackConfig = ({ stage, loaders, actions }) => {
     })
   }
 }
+
+exports.createResolvers = ({ createResolvers }) => {
+  const resolvers = {
+    doi: {
+      cmr_data_formats: {
+        resolve: source => {
+          // parse strings and log errors for arrays in string format
+          return typeof source.cmr_data_formats === "string"
+            ? source.cmr_data_formats &&
+              !source.cmr_data_formats.includes("null") &&
+              source.cmr_data_formats.split("[")[1]
+              ? source.cmr_data_formats
+                  ?.split("[")[1]
+                  .split("]")[0]
+                  .split(",")
+                  .map(s =>
+                    s
+                      .replace(/[^a-zA-Z ]/g, "")
+                      .replace(/^\s+|\s+$|\s+(?=\s)/g, "")
+                  )
+                  .filter(f => f !== "")
+              : []
+            : source.cmr_data_formats.filter(f => f !== "")
+        },
+      },
+      cmr_science_keywords: {
+        resolve: source => {
+          if (
+            source.cmr_science_keywords &&
+            typeof source.cmr_science_keywords === "string"
+          ) {
+            // The doi keywords are stored as a JSON string in the database
+            // parsing them here into an object
+            let keywords = []
+            try {
+              keywords = JSON.parse(source.cmr_science_keywords).filter(
+                keyword => keyword.term && keyword.term !== "Not provided"
+              )
+            } catch (e) {
+              if (source.cmr_science_keywords !== null) {
+                console.error(
+                  `ERROR: Could not parse ${source.cmr_science_keywords}`
+                )
+              }
+            }
+            return keywords
+          }
+          return source.cmr_science_keywords
+        },
+      },
+    },
+  }
+  createResolvers(resolvers)
+}

src/components/data-section.js

@@ -19,24 +19,13 @@ const DataSection = ({ id, dois, filterBy, category }) => {
   // manually parse the data formats string to derive array of objects
   const parsedDois = dois.map(doi => ({
     ...doi,
-    formats:
-      doi.formats && !doi.formats.includes("null") && doi.formats.split("[")[1]
-        ? doi.formats
-            ?.split("[")[1]
-            .split("]")[0]
-            .split(",")
-            .map(s =>
-              s.replace(/[^a-zA-Z ]/g, "").replace(/^\s+|\s+$|\s+(?=\s)/g, "")
-            )
-            .filter(f => f !== "")
-            .map(format => ({
-              id: format,
-              shortname: format,
-              longname: format,
-            }))
-        : [],
+    formats: doi.formats?.map(format => ({
+      id: format,
+      shortname: format,
+      longname: format,
+    })),
   }))
-
+  console.log(parsedDois)
   const clearFilters = () => setSelectedFilterIds([])
 
   const removeFilter = id =>
@@ -53,7 +42,7 @@ const DataSection = ({ id, dois, filterBy, category }) => {
   )
   const formatList = parsedDois.reduce(
     (acc, doi) => {
-      if (doi.formats.length > 0) {
+      if (doi.formats && doi.formats.length > 0) {
         for (const format of doi.formats) {
           if (!acc.unique.has(format.id)) {
             acc.unique.add(format.id)
@@ -72,7 +61,7 @@ const DataSection = ({ id, dois, filterBy, category }) => {
     platform: { options: platformList },
     format: { options: formatList },
   })
-
+  console.log({ formatList })
   return (
     <Section id={id}>
       <SectionHeader headline="Data Products" id={id} />
@@ -181,9 +170,10 @@ const DataSection = ({ id, dois, filterBy, category }) => {
                       )}
                     </div>
 
-                    {doi[filter1].length +
-                    doi[filter2].length +
-                    doi[filter3].length ? (
+                    {doi[filter1]?.length ??
+                    0 + doi[filter2]?.length ??
+                    0 + doi[filter3]?.length ??
+                    0 ? (
                       <div
                         css={`
                           display: flex;

src/components/modal.js

@@ -43,5 +43,5 @@ Modal.propTypes = {
   handleClose: PropTypes.func.isRequired,
   isOpen: PropTypes.bool.isRequired,
   children: PropTypes.element,
-  Custom: PropTypes.element,
+  Custom: PropTypes.func,
 }

src/components/release-banner.js

@@ -1,5 +1,4 @@
 import React, { useEffect, useState } from "react"
-import PropTypes from "prop-types"
 import styled from "styled-components"
 
 import { CloseIcon } from "../icons"
@@ -139,10 +138,4 @@ const ReleaseBanner = () => {
   )
 }
 
-ReleaseBanner.propTypes = {
-  shortname: PropTypes.string.isRequired,
-  children: PropTypes.element,
-  mode: PropTypes.string.isRequired,
-}
-
 export default ReleaseBanner

src/pages/explore/products.js

@@ -157,22 +157,12 @@ export default function ExploreProducts({ data, location }) {
   let shapedGcmdPhenomena = []
   let GcmdKeywordSet = new Set()
   for (const doi of allShapedDoi) {
-    // The doi keywords are stored as a JSON string in the database
-    // parsing them here into an object
-    let keywords = []
-    try {
-      keywords = JSON.parse(doi.keywords)
-    } catch (e) {
-      console.error(`ERROR: Could not parse ${doi.keywords}`)
-    }
-
     if (
-      keywords?.length &&
-      keywords != "null" &&
-      keywords != '"null"' &&
-      typeof keywords != "string"
+      doi.keywords?.length &&
+      doi.keywords != "null" &&
+      doi.keywords != '"null"'
     ) {
-      for (const keyword of keywords) {
+      for (const keyword of doi.keywords) {
         const shortname = `${[
           keyword.Term,
           keyword.VariableLevel1 ? keyword.VariableLevel1 : "",
@@ -428,7 +418,14 @@ export const query = graphql`
         doi
         id
         cmr_entry_title
-        keywords: cmr_science_keywords
+        keywords: cmr_science_keywords {
+          Term
+          Topic
+          Category
+          VariableLevel1
+          VariableLevel2
+          VariableLevel3
+        }
         shortname: cmr_short_name
         campaigns {
           id

src/utils/filter-utils.js

@@ -131,13 +131,7 @@ export function productsFilter(selectedFilterIds) {
     )
 
     const gcmdKeywords = new Set()
-    // const keywords = JSON.parse(product.keywords)
-    let keywords = []
-    try {
-      keywords = JSON.parse(product.keywords)
-    } catch (e) {
-      console.error(`ERROR: Could not parse ${product.keywords}`)
-    }
+    const { keywords } = product
 
     if (
       keywords?.length &&