Skip to content

Commit

Permalink
Merge branch 'main' into add/modeling
Browse files Browse the repository at this point in the history
  • Loading branch information
abkfenris committed Nov 15, 2022
2 parents b817b09 + 564f1af commit 9da7ee2
Show file tree
Hide file tree
Showing 5 changed files with 209 additions and 208 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ jobs:
git diff --exit-code && echo 'Already Deployed' || (git commit -am 'Upgrade Mariners Dashboard to ${{ steps.tagName.outputs.tag }}' && git push)
- name: Create Sentry Release
uses: getsentry/action-release@v1.2.0
uses: getsentry/action-release@v1.2.1
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
Expand Down Expand Up @@ -347,7 +347,7 @@ jobs:
git diff --exit-code && echo 'Already Deployed' || (git commit -am 'Upgrade Mariners Dashboard dev deployment to ${{ steps.tagName.outputs.tag }}' && git push)
- name: Create Sentry Release
uses: getsentry/action-release@v1.1.6
uses: getsentry/action-release@v1.2.1
env:
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#syntax=docker/dockerfile:1.2
FROM node:19.0.0-alpine@sha256:88f6aa846169ea75341059f3104d6c5ebeac4be861a5adcf0489fccb55573ea7 as develop
FROM node:19.1.0-alpine@sha256:c59fb39150e4a7ae14dfd42d3f9874398c7941784b73049c2d274115f00d36c8 as develop

RUN mkdir -p /usr/src/app
WORKDIR /usr/src/app
Expand All @@ -20,7 +20,7 @@ ARG REACT_APP_ERDDAP_SERVICE

RUN yarn build

FROM nginx:1.23.2-alpine@sha256:bffb4330be734e3268087e28ca51f6ae926f7d4406c7f5b5ab50c5e22570dc32
FROM nginx:1.23.2-alpine@sha256:455c39afebd4d98ef26dd70284aa86e6810b0485af5f4f222b19b89758cabf1e

COPY --from=buildstep /usr/src/app/build /usr/share/nginx/html

Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"@fortawesome/free-solid-svg-icons": "^6.2.0",
"@fortawesome/react-fontawesome": "^0.2.0",
"@gulfofmaine/tsstac": "0.1.2",
"@reduxjs/toolkit": "^1.8.6",
"@sentry/react": "^7.16.0",
"@sentry/tracing": "^7.16.0",
"@reduxjs/toolkit": "^1.9.0",
"@sentry/react": "^7.18.0",
"@sentry/tracing": "^7.18.0",
"@turf/bbox-polygon": "6.5.0",
"@turf/boolean-contains": "6.5.0",
"@turf/helpers": "6.5.0",
Expand All @@ -22,7 +22,7 @@
"highcharts": "^10",
"jsurl2": "^2.1.0",
"moment": "2.29.4",
"moment-timezone": "0.5.38",
"moment-timezone": "0.5.39",
"ol": "^7.1.0",
"prop-types": "^15.8.1",
"react": "16.14.0",
Expand All @@ -31,15 +31,15 @@
"react-ga": "^3.3.1",
"react-jsx-highcharts": "^4.3.2",
"react-query": "^3.39.2",
"react-redux": "8.0.4",
"react-router-dom": "6.4.2",
"react-redux": "8.0.5",
"react-router-dom": "6.4.3",
"react-scripts": "^5.0.1",
"react-select": "^5.5.6",
"react-select": "^5.6.1",
"react-use": "^17.4.0",
"reactstrap": "9.1.4",
"reactstrap": "9.1.5",
"redux-first-history": "^5.1.1",
"rlayers": "^1.4.4",
"sass": "^1.55.0"
"rlayers": "^1.4.5",
"sass": "^1.56.1"
},
"scripts": {
"start": "GENERATE_SOURCEMAP=false react-scripts start",
Expand All @@ -62,13 +62,13 @@
"@storybook/react": "^6.5.13",
"@types/enzyme": "3.10.12",
"@types/enzyme-adapter-react-16": "1.0.6",
"@types/jest": "29.2.0",
"@types/node": "18.11.5",
"@types/jest": "29.2.3",
"@types/node": "18.11.9",
"@types/react": "18.0.21",
"@types/react-dom": "18.0.6",
"@types/react-test-renderer": "18.0.0",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6",
"enzyme-adapter-react-16": "1.15.7",
"jest-fetch-mock": "3.0.3",
"react-test-renderer": "16.14.0",
"redux-devtools-extension": "2.13.9",
Expand All @@ -78,7 +78,7 @@
"webpack": "5"
},
"optionalDependencies": {
"cypress": "10.10.0"
"cypress": "11.0.1"
},
"prettier": {
"semi": false,
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Modeling/stac.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ export const StacCatalogItems = ({ cat }: { cat: ICatalog | ICollection }) => {

if (itemsQuery.data) {
return (
<UncontrolledAccordion stayOpen={true} defaultOpen={[]} open={"0"} flush={true}>
<UncontrolledAccordion stayOpen={true} defaultOpen={[]} flush={true}>
{itemsQuery.data.map((item) => (
<StacItem item={item} key={item.id} />
))}
Expand Down
Loading

0 comments on commit 9da7ee2

Please sign in to comment.