Merge pull request #712 from NASA-IMPACT/develop

Production deploy

package.json

@@ -11,6 +11,7 @@
     "Matt Robinson <[email protected]>"
   ],
   "dependencies": {
+    "@custom-react-hooks/use-fetch": "^1.5.1",
     "@fontsource/titillium-web": "^4.5.2",
     "@gatsbyjs/reach-router": "^1.3.4",
     "@juggle/resize-observer": "^3.3.1",
@@ -31,6 +32,7 @@
     "@turf/envelope": "^7.1.0",
     "d3": "^7.3.0",
     "date-fns": "^2.28.0",
+    "deck.gl": "^9.0.33",
     "gatsby": "^5.13.7",
     "gatsby-plugin-csp": "^1.1.4",
     "gatsby-plugin-google-gtag": "5.13.1",

src/components/__tests__/__snapshots__/data-section.test.js.snap

@@ -210,12 +210,17 @@ exports[`Data Section matches snapshot 1`] = `
             CAMP2Ex P-3 Remotely Sensed Aerosol Data
           </label>
           <a
-            className="sc-eqUAAy gqBnyJ"
+            className="sc-eqUAAy jxHsRt"
             data-cy="doi-link"
             href="http://dx.doi.org/10.5067/Airborne/CAMP2Ex_Aerosol_AircraftRemoteSensing_P3_Data_1"
             rel="noopener noreferrer"
             target="_blank"
           >
+            <span
+              className="external-link___StyledSpan-sc-3ezy1s-0 LrNqW"
+            >
+              10.5067/Airborne/CAMP2Ex_Aerosol_AircraftRemoteSensing_P3_Data_1
+            </span>
             <svg
               height="16"
               role="img"
@@ -237,11 +242,6 @@ exports[`Data Section matches snapshot 1`] = `
                 fill="#aac9ff"
               />
             </svg>
-            <span
-              className="external-link___StyledSpan-sc-3ezy1s-0 LrNqW"
-            >
-              10.5067/Airborne/CAMP2Ex_Aerosol_AircraftRemoteSensing_P3_Data_1
-            </span>
           </a>
         </div>
         <div

src/components/__tests__/__snapshots__/footer.test.js.snap

@@ -116,12 +116,17 @@ exports[`Footer renders correctly 1`] = `
         </li>
         <li>
           <a
-            className="sc-aXZVg egnkfv"
+            className="sc-aXZVg gGyAQD"
             data-cy="api documentation-link"
             href="https://nasa-impact.github.io/admg-backend/documentation/api_doc.html"
             rel="noopener noreferrer"
             target="_blank"
           >
+            <span
+              className="external-link___StyledSpan-sc-3ezy1s-0 LrNqW"
+            >
+              API Documentation
+            </span>
             <svg
               height="16"
               role="img"
@@ -143,11 +148,6 @@ exports[`Footer renders correctly 1`] = `
                 fill="#aac9ff"
               />
             </svg>
-            <span
-              className="external-link___StyledSpan-sc-3ezy1s-0 LrNqW"
-            >
-              API Documentation
-            </span>
           </a>
         </li>
       </ul>
@@ -165,12 +165,17 @@ exports[`Footer renders correctly 1`] = `
       >
         <li>
           <a
-            className="sc-aXZVg egnkfv"
+            className="sc-aXZVg gGyAQD"
             data-cy="admg-website-link"
             href="https://earthdata.nasa.gov/esds/impact/admg"
             rel="noopener noreferrer"
             target="_blank"
           >
+            <span
+              className="external-link___StyledSpan-sc-3ezy1s-0 LrNqW"
+            >
+              ADMG Website
+            </span>
             <svg
               height="16"
               role="img"
@@ -192,21 +197,21 @@ exports[`Footer renders correctly 1`] = `
                 fill="#aac9ff"
               />
             </svg>
-            <span
-              className="external-link___StyledSpan-sc-3ezy1s-0 LrNqW"
-            >
-              ADMG Website
-            </span>
           </a>
         </li>
         <li>
           <a
-            className="sc-aXZVg egnkfv"
+            className="sc-aXZVg gGyAQD"
             data-cy="impact-website-link"
             href="https://earthdata.nasa.gov/esds/impact"
             rel="noopener noreferrer"
             target="_blank"
           >
+            <span
+              className="external-link___StyledSpan-sc-3ezy1s-0 LrNqW"
+            >
+              IMPACT Website
+            </span>
             <svg
               height="16"
               role="img"
@@ -228,11 +233,6 @@ exports[`Footer renders correctly 1`] = `
                 fill="#aac9ff"
               />
             </svg>
-            <span
-              className="external-link___StyledSpan-sc-3ezy1s-0 LrNqW"
-            >
-              IMPACT Website
-            </span>
           </a>
         </li>
       </ul>
@@ -514,12 +514,17 @@ exports[`Footer renders correctly 1`] = `
     , Built by
      
     <a
-      className="sc-aXZVg egnkfv"
+      className="sc-aXZVg gGyAQD"
       data-cy="devseed-website-link"
       href="https://www.developmentseed.org"
       rel="noopener noreferrer"
       target="_blank"
     >
+      <span
+        className="external-link___StyledSpan-sc-3ezy1s-0 LrNqW"
+      >
+        Development Seed
+      </span>
       <svg
         height="16"
         role="img"
@@ -541,11 +546,6 @@ exports[`Footer renders correctly 1`] = `
           fill="#aac9ff"
         />
       </svg>
-      <span
-        className="external-link___StyledSpan-sc-3ezy1s-0 LrNqW"
-      >
-        Development Seed
-      </span>
     </a>
     .
   </div>

src/components/timeline/__tests__/map.test.js → src/components/deployments/__tests__/map-legend.test.js

@@ -1,7 +1,7 @@
 import React from "react"
 import renderer, { act } from "react-test-renderer"
 
-import { MapLegend, PlatformStatus } from "../map"
+import { MapLegend, PlatformStatus } from "../map-legend"
 import { LineIcon } from "../../../icons"
 import {
   BalloonIcon,
@@ -19,6 +19,14 @@ describe("MapLegend", () => {
       <MapLegend
         platforms={[
           { name: "Falcon", type: "Jet" },
+          { name: "G-H", type: "Jet" },
+          { name: "ER-2", type: "Jet" },
+          { name: "DC-8", type: "Jet" },
+          { name: "Learjet", type: "Jet" },
+          { name: "OtterTwin", type: "Jet" },
+          { name: "Laserjet", type: "Jet" },
+          { name: "B-200", type: "Jet" },
+          { name: "ABC", type: "Jet" },
           { name: "Field Site", type: "static" },
           { name: "Field Site", type: "static" },
         ]}
@@ -28,14 +36,18 @@ describe("MapLegend", () => {
       />
     )
     const instance = element.root
-    expect(instance.findAllByType("input").length).toBe(2)
+    expect(instance.findAllByType("input").length).toBe(10)
     const b1 = instance.findAllByType("input")[0]
     expect(
       instance.findAllByType("input").every(i => !i.props.checked)
     ).toBeTruthy()
     act(() => b1.props.onClick())
     expect(fn).toHaveBeenCalledTimes(1)
-    expect(instance.findByType(LineIcon).props.size).toBe("text")
+    expect(instance.findAllByType(LineIcon)[0].props.size).toBe("text")
+    expect(instance.findAllByType(LineIcon)[0].props.color).toBe("#b2df8a")
+    expect(instance.findAllByType(LineIcon)[7].props.color).toBe("#e31a1c")
+    // test fallback color to the 9º moving platform
+    expect(instance.findAllByType(LineIcon)[8].props.color).toBe("#1a9b8c")
     expect(instance.findByType(FieldSiteIcon)).toBeTruthy()
   })
   it("render with one option selected", () => {

src/components/timeline/index.js → src/components/deployments/index.js

@@ -1 +1,2 @@
 export { TimelineChart } from "./timeline-chart"
+export { DeploymentMap } from "./map"