Merge pull request #574 from NASA-IMPACT/issue-816/update-text

update aircraft to air-based platforms, apply linting

playwright/e2e/explore.spec.ts

@@ -265,11 +265,11 @@ test.describe("Explore", () => {
         .locator("xpath=..") // TODO
       expect(
         await hamsrCard.locator("[data-cy=shortname]").textContent()
-      ).toContain("HAMSR")
+      ).toMatch("HAMSR")
       expect(
         await hamsrCard.locator("[data-cy=longname]").textContent()
-      ).toContain(
-        "High Altitude Monolithic Microwave integrated Circuit(MMIC) Sounding Radiometer"
+      ).toMatch(
+        "High Altitude Monolithic Microwave integrated Circuit (MMIC) Sounding Radiometer"
       )
 
       await page.waitForSelector("[data-cy=instruments-card-footer]", {

src/pages/explore/platforms.js

@@ -1,7 +1,7 @@
 import React, { useState, useRef, useEffect } from "react"
 import PropTypes from "prop-types"
 import { graphql } from "gatsby"
-
+import { replaceCategoryInGrouped } from "../../utils/replace-category-name"
 import { NEGATIVE } from "../../utils/constants"
 import { colors } from "../../theme"
 import { selector } from "../../utils/filter-utils"
@@ -35,13 +35,19 @@ export default function ExplorePlatforms({ data, location }) {
     }
   }, [selectedFilterId])
 
-  const platformList = usePlatformList(
+  let platformList = usePlatformList(
     allPlatform.list,
     sortOrder,
     selectedFilterIds,
     searchResult
   )
 
+  // modify after receiving from hook
+  platformList = {
+    ...platformList,
+    grouped: replaceCategoryInGrouped(platformList.grouped),
+  }
+
   const addFilter = id => setFilter([...selectedFilterIds, id])
 
   const removeFilter = id => setFilter(selectedFilterIds.filter(f => f !== id))

src/utils/__tests__/use-platform-list.test.js

@@ -1,5 +1,5 @@
 import { renderHook } from "@testing-library/react-hooks"
-
+import { getCategoryName } from "../rename-category-test-util"
 import usePlatformList from "../use-platform-list"
 import { explorePlatformsQuery } from "../../../test/__fixtures__"
 
@@ -16,7 +16,9 @@ it("the default platform list (without filters)", () => {
   const firstPlatform = platformList.filtered[0]
   const lastPlatform = platformList.filtered[platformList.filtered.length - 1]
   const platformGroups = Object.keys(platformList.grouped)
-  const firstGroup = platformList.grouped[platformGroups[0]]
+  const firstGroup =
+    platformList.grouped[platformGroups[platformGroups.length - 1]]
+  console.log({ firstGroup })
 
   expect(platformList.filtered.length).toEqual(list.length)
   expect(platformGroups.length).toBeGreaterThanOrEqual(5)
@@ -48,7 +50,8 @@ it("the platform list sorted a > z (without filters)", () => {
   const firstPlatform = platformList.filtered[0]
   const lastPlatform = platformList.filtered[platformList.filtered.length - 1]
   const platformGroups = Object.keys(platformList.grouped)
-  const firstGroup = platformList.grouped[platformGroups[0]]
+  const firstGroup =
+    platformList.grouped[platformGroups[platformGroups.length - 1]]
 
   expect(platformList.filtered.length).toEqual(list.length)
   expect(platformGroups.length).toBeGreaterThanOrEqual(5)
@@ -80,7 +83,8 @@ it("the platform list sorted z > a (without filters)", () => {
   const firstPlatform = platformList.filtered[0]
   const lastPlatform = platformList.filtered[platformList.filtered.length - 1]
   const platformGroups = Object.keys(platformList.grouped)
-  const firstGroup = platformList.grouped[platformGroups[0]]
+  const firstGroup =
+    platformList.grouped[platformGroups[platformGroups.length - 1]]
 
   expect(platformList.filtered.length).toEqual(list.length)
   expect(platformGroups.length).toBeGreaterThanOrEqual(5)
@@ -115,7 +119,8 @@ it("the platform list with a filter selected", () => {
   const firstPlatform = platformList.filtered[0]
   const lastPlatform = platformList.filtered[platformList.filtered.length - 1]
   const platformGroups = Object.keys(platformList.grouped)
-  const firstGroup = platformList.grouped[platformGroups[0]]
+  const firstGroup =
+    platformList.grouped[platformGroups[platformGroups.length - 1]]
 
   expect(platformList.filtered.length).toBeLessThan(list.length)
   expect(platformGroups.length).toBeGreaterThanOrEqual(5)
@@ -137,7 +142,10 @@ it("the platform list with a filter selected", () => {
     expect(platform.instruments.map(x => x.id)).toContain(instrumentId)
   })
   platformGroups.forEach(group => {
-    platformList.grouped[group].forEach(platform => {
+    // Adjusting group name for the changed category name
+    const adjustedGroupName = getCategoryName(group)
+
+    platformList.grouped[adjustedGroupName].forEach(platform => {
       expect(platform.instruments.map(x => x.id)).toContain(instrumentId)
     })
   })

src/utils/rename-category-test-util.js

@@ -0,0 +1,4 @@
+export const getCategoryName = category => {
+  if (category === "Aircraft") return "Air-based platforms"
+  return category
+}

src/utils/replace-category-name.js

@@ -0,0 +1,10 @@
+export const replaceCategoryInGrouped = grouped => {
+  const updated = { ...grouped }
+
+  if (updated["Aircraft"]) {
+    updated["Air-based platforms"] = updated["Aircraft"]
+    delete updated["Aircraft"]
+  }
+
+  return updated
+}

src/utils/use-platform-list.js

@@ -1,10 +1,9 @@
 import { useState, useEffect } from "react"
-
 import { sortFunctions, platformFilter } from "../utils/filter-utils"
 
 // Setting these default search categories will ensure their order of appearance.
 const searchCategories = {
-  Aircraft: [],
+  "Air-based platforms": [],
   "Mobile land-based platforms": [],
   "Stationary land sites": [],
   "Water-based platforms": [],