Skip to content

Commit 3e70a09

Browse files
willemarcelwillemarcel
authored
Merge pull request #726 from NASA-IMPACT/develop
Production update - Feb 7th
2 parents 98067ad + 2614568 commit 3e70a09

File tree

23 files changed

+259
-256
lines changed

23 files changed

+259
-256
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
node-version: ${{ steps.nvm.outputs.NVMRC }}
4040

4141
- name: Cache node modules
42-
uses: actions/cache@v2
42+
uses: actions/cache@v4
4343
env:
4444
cache-name: cache-node-modules
4545
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
node-version: ${{ steps.nvm.outputs.NVMRC }}
4545

4646
- name: Cache node modules
47-
uses: actions/cache@v2
47+
uses: actions/cache@v4
4848
env:
4949
cache-name: cache-node-modules
5050
with:

‎.github/workflows/e2e.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,20 @@ jobs:
4040
node-version: ${{ steps.nvm.outputs.NVMRC }}
4141

4242
- name: Cache node modules
43-
uses: actions/cache@v2
43+
uses: actions/cache@v4
4444
with:
4545
path: node_modules
4646
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
4747

4848
- name: Cache Gatsby .cache folder
49-
uses: actions/cache@v2
49+
uses: actions/cache@v4
5050
with:
5151
path: .cache
5252
key: ${{ runner.os }}-gatsby-cache-${{ hashFiles('yarn.lock') }}
5353

5454
- name: Cache Gatsby public folder
5555
id: cache-build
56-
uses: actions/cache@v2
56+
uses: actions/cache@v4
5757
with:
5858
path: public
5959
key: ${{ runner.os }}-gatsby-build-${{ hashFiles('yarn.lock') }}-${{ hashFiles('src/**') }}
@@ -95,19 +95,19 @@ jobs:
9595
node-version: ${{ steps.nvm.outputs.NVMRC }}
9696

9797
- name: Restore node modules
98-
uses: actions/cache@v2
98+
uses: actions/cache@v4
9999
with:
100100
path: node_modules
101101
key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
102102

103103
- name: Restore Gatsby .cache folder
104-
uses: actions/cache@v2
104+
uses: actions/cache@v4
105105
with:
106106
path: .cache
107107
key: ${{ runner.os }}-gatsby-cache-${{ hashFiles('yarn.lock') }}
108108

109109
- name: Restore Gatsby public folder
110-
uses: actions/cache@v2
110+
uses: actions/cache@v4
111111
with:
112112
path: public
113113
key: ${{ runner.os }}-gatsby-build-${{ hashFiles('yarn.lock') }}-${{ hashFiles('src/**') }}
@@ -149,7 +149,7 @@ jobs:
149149
uses: actions/checkout@v2
150150

151151
- name: Restore Gatsby public folder
152-
uses: actions/cache@v2
152+
uses: actions/cache@v4
153153
with:
154154
path: public
155155
key: ${{ runner.os }}-gatsby-build-${{ hashFiles('yarn.lock') }}-${{ hashFiles('src/**') }}

‎.github/workflows/lint-and-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
with:
2828
node-version: ${{ steps.nvm.outputs.NVMRC }}
2929
- name: Cache node modules
30-
uses: actions/cache@v2
30+
uses: actions/cache@v4
3131
env:
3232
cache-name: cache-node-modules
3333
with:
@@ -64,7 +64,7 @@ jobs:
6464
node-version: ${{ steps.nvm.outputs.NVMRC }}
6565

6666
- name: Cache node modules
67-
uses: actions/cache@v2
67+
uses: actions/cache@v4
6868
env:
6969
cache-name: cache-node-modules
7070
with:

‎package.json‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
2-
"name": "airborne-inventory",
2+
"name": "admg-casei-frontend",
33
"private": true,
4-
"description": "A centralized airborne data inventory",
5-
"version": "0.1.0",
4+
"description": "A gatsby frontend for CASEI, the Catalog of Archived Suborbital Earth Science Investigations | NASA ADMG",
5+
"version": "1.1.0",
66
"contributors": [
7-
"Necoline Hubner <necoline@developmentseed.org>",
7+
"Necoline Hubner",
88
"Alice Rühl <alice@developmentseed.org>",
9-
"Edward Keeble <edward@developmentseed.org>",
10-
"Tammo Feldman <tammo@developmentseed.org>",
11-
"Matt Robinson <matthew@developmentseed.org>"
9+
"Edward Keeble",
10+
"Tammo Feldman",
11+
"Matt Robinson",
12+
"Heidi Mok",
13+
"Wille Mercel <wille@developmentseed.org>",
14+
"Lane Goodman <lane@developmentseed.org>"
1215
],
1316
"dependencies": {
1417
"@custom-react-hooks/use-fetch": "^1.5.1",
@@ -69,7 +72,7 @@
6972
"@babel/eslint-parser": "^7.25.1",
7073
"@babel/preset-env": "^7.25.3",
7174
"@babel/preset-typescript": "^7.24.7",
72-
"@playwright/test": "1.31.2",
75+
"@playwright/test": "1.50.1",
7376
"@quickbaseoss/babel-plugin-styled-components-css-namespace": "^1.0.1",
7477
"@testing-library/react-hooks": "^7.0.2",
7578
"axe-core": "^4.4.1",
@@ -117,16 +120,16 @@
117120
},
118121
"repository": {
119122
"type": "git",
120-
"url": "http://github.com/developmentseed/airborne-metadata-catalog-internal"
123+
"url": "https://github.com/NASA-IMPACT/admg-casei"
121124
},
122125
"bugs": {
123-
"url": "http://github.com/developmentseed/airborne-metadata-catalog-internal/issues"
126+
"url": "https://github.com/NASA-IMPACT/admg-casei/issues"
124127
},
125128
"resolutions": {
126-
"playwright": "1.31.2"
129+
"playwright": "1.50.1"
127130
},
128131
"overrides": {
129-
"playwright": "1.31.2"
132+
"playwright": "1.50.1"
130133
},
131134
"browserslist": "> 0.25%, not dead"
132135
}

‎playwright/e2e/campaign.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ test.describe("Campaign", () => {
3232
await expect(statsValues.nth(1)).toContainText("8")
3333
await expect(statsValues.nth(2)).toBeVisible()
3434

35-
await expect(page.locator("[data-cy=mapboxgl-map]")).toBeVisible()
35+
await expect(page.locator("[data-cy=mapboxgl-map]").nth(0)).toBeVisible()
3636

3737
const inpageNavItems = await page.locator("[data-cy=inpage-nav] a")
3838
await expect(inpageNavItems).toHaveCount(7)

‎playwright/e2e/instrument.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ test.describe('Instrument', () => {
5959
await expect(dataProductDivs.nth(0).locator('[data-cy=doi-label]')).toBeVisible();
6060
await expect(dataProductDivs.nth(0).locator('[data-cy=doi-link]')).toBeVisible();
6161

62-
await expect(page.locator('[data-cy=data-product-campaigns] [data-cy=doi-campaign-label]')).toHaveText('Campaigns');
63-
await expect(page.locator('[data-cy=data-product-platforms] [data-cy=doi-platform-label]')).toHaveText('Platforms');
62+
await expect(page.locator('[data-cy=data-product-campaigns] [data-cy=doi-campaign-label]').nth(0)).toHaveText('Campaigns');
63+
await expect(page.locator('[data-cy=data-product-platforms] [data-cy=doi-platform-label]').nth(0)).toHaveText('Platforms');
6464

6565
await expect(page.locator('[data-cy=entities-section]')).toBeVisible();
6666
await expect(page.locator('[data-cy=entities-section] h2')).toHaveText('Instrument Operation');

‎src/components/__tests__/__snapshots__/card.test.js.snap‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
exports[`Card renders card with tag 1`] = `
44
<div
5-
className="card___StyledDiv-sc-16fz0z7-1 jcRYMA"
5+
className="card___StyledDiv-sc-199er4f-1 ksYdma"
66
>
77
<a
8-
className="card___StyledLink-sc-16fz0z7-2 dDHGTR"
8+
className="card___StyledLink-sc-199er4f-2 hEcjMv"
99
data-cy="campaigns-card"
1010
>
1111
<div
12-
className="card__CardHeader-sc-16fz0z7-0 qvFHz"
12+
className="card__CardHeader-sc-199er4f-0 fCOuox"
1313
>
1414
<div
15-
className="card___StyledDiv2-sc-16fz0z7-4 eUlfwF"
15+
className="card___StyledDiv2-sc-199er4f-4 eFIIcT"
1616
>
1717
<svg
1818
height="80"
@@ -36,7 +36,7 @@ exports[`Card renders card with tag 1`] = `
3636
</div>
3737
<div>
3838
<big
39-
className="cardtest___StyledBig-sc-1cx8i5d-0 kGDInE"
39+
className="cardtest___StyledBig-sc-10uuj19-0 fXZjqB"
4040
data-cy="shortname"
4141
>
4242
GCPEx
@@ -53,7 +53,7 @@ exports[`Card renders card with tag 1`] = `
5353
</p>
5454
</div>
5555
<div
56-
className="card___StyledDiv3-sc-16fz0z7-5 iJZYOB"
56+
className="card___StyledDiv3-sc-199er4f-5 jEVnrf"
5757
data-cy="stationary-tag"
5858
>
5959
Stationary
@@ -64,17 +64,17 @@ exports[`Card renders card with tag 1`] = `
6464

6565
exports[`Card renders plain card 1`] = `
6666
<div
67-
className="card___StyledDiv-sc-16fz0z7-1 jcRYMA"
67+
className="card___StyledDiv-sc-199er4f-1 ksYdma"
6868
>
6969
<a
70-
className="card___StyledLink-sc-16fz0z7-2 dDHGTR"
70+
className="card___StyledLink-sc-199er4f-2 hEcjMv"
7171
data-cy="campaigns-card"
7272
>
7373
<div
74-
className="card__CardHeader-sc-16fz0z7-0 qvFHz"
74+
className="card__CardHeader-sc-199er4f-0 fCOuox"
7575
>
7676
<div
77-
className="card___StyledDiv2-sc-16fz0z7-4 eUlfwF"
77+
className="card___StyledDiv2-sc-199er4f-4 eFIIcT"
7878
>
7979
<svg
8080
height="80"
@@ -98,7 +98,7 @@ exports[`Card renders plain card 1`] = `
9898
</div>
9999
<div>
100100
<big
101-
className="cardtest___StyledBig-sc-1cx8i5d-0 kGDInE"
101+
className="cardtest___StyledBig-sc-10uuj19-0 fXZjqB"
102102
data-cy="shortname"
103103
>
104104
GCPEx
@@ -120,17 +120,17 @@ exports[`Card renders plain card 1`] = `
120120

121121
exports[`Card renders with footer list 1`] = `
122122
<div
123-
className="card___StyledDiv-sc-16fz0z7-1 jcRYMA"
123+
className="card___StyledDiv-sc-199er4f-1 ksYdma"
124124
>
125125
<a
126-
className="card___StyledLink-sc-16fz0z7-2 dDHGTR"
126+
className="card___StyledLink-sc-199er4f-2 hEcjMv"
127127
data-cy="campaigns-card"
128128
>
129129
<div
130-
className="card__CardHeader-sc-16fz0z7-0 qvFHz"
130+
className="card__CardHeader-sc-199er4f-0 fCOuox"
131131
>
132132
<div
133-
className="card___StyledDiv2-sc-16fz0z7-4 eUlfwF"
133+
className="card___StyledDiv2-sc-199er4f-4 eFIIcT"
134134
>
135135
<svg
136136
height="80"
@@ -154,7 +154,7 @@ exports[`Card renders with footer list 1`] = `
154154
</div>
155155
<div>
156156
<big
157-
className="cardtest___StyledBig-sc-1cx8i5d-0 kGDInE"
157+
className="cardtest___StyledBig-sc-10uuj19-0 fXZjqB"
158158
data-cy="shortname"
159159
>
160160
GCPEx

‎src/components/__tests__/__snapshots__/chip.test.js.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
exports[`Chip renders with action 1`] = `
44
<div
5-
className="chip___StyledDiv-sc-4ga8fx-0 gxafbr"
5+
className="chip___StyledDiv-sc-1ph9zik-0 dAFZLv"
66
data-cy="filter-chip"
77
>
88
<small
@@ -11,14 +11,14 @@ exports[`Chip renders with action 1`] = `
1111
Weather
1212
</small>
1313
<button
14-
className="button__Clickable-sc-1yw7vig-0 button___StyledClickable2-sc-1yw7vig-1 cpFIXP ZpXgf"
14+
className="button__Clickable-sc-1c81fec-0 button___StyledClickable2-sc-1c81fec-1 dsHorc gpewNA"
1515
data-cy="remove-filter"
1616
onClick={[Function]}
1717
type="button"
1818
>
1919
<span
2020
aria-label="remove-filter-icon"
21-
className="button___StyledSpan-sc-1yw7vig-3 lgIojE"
21+
className="button___StyledSpan-sc-1c81fec-3 gThnOP"
2222
role="img"
2323
>
2424
<svg
@@ -39,7 +39,7 @@ exports[`Chip renders with action 1`] = `
3939

4040
exports[`Chip renders without action 1`] = `
4141
<div
42-
className="chip___StyledDiv-sc-4ga8fx-0 gxafbr"
42+
className="chip___StyledDiv-sc-1ph9zik-0 dAFZLv"
4343
data-cy="filter-chip"
4444
>
4545
<small

0 commit comments

Comments
 (0)