Skip to content

Commit 727d8ae

Browse files
authored
Merge pull request #884 from nasa/develop
Develop -> Master Release v3.0.0
2 parents 1f8d11d + ba812ea commit 727d8ae

File tree

99 files changed

+7435
-4755
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+7435
-4755
lines changed

.circleci/config.yml

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ jobs:
99
- checkout
1010

1111
- run:
12-
name: Install dependencies
12+
name: Install Dependencies
1313
command: |
1414
export NVM_DIR="/opt/circleci/.nvm"
1515
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
1616
nvm install v12.18.0
1717
nvm alias default v12.18.0
1818
npm install -g npm
19-
npm ci
19+
npm ci --no-optional
2020
2121
- run:
22-
name: Run audit-ci
22+
name: Run Audit-CI
2323
command: |
2424
export NVM_DIR="/opt/circleci/.nvm"
2525
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
2626
npm run audit-ci
2727
2828
- run:
29-
name: Test dashboard build
29+
name: Build Dashboard
3030
command: |
3131
# build dashboard
3232
docker run --rm \
@@ -38,7 +38,7 @@ jobs:
3838
npm run build
3939
4040
- run:
41-
name: Run tests
41+
name: Run Unit Tests
4242
command: |
4343
docker run --rm \
4444
-v /home/circleci/.cache:/root/.cache \
@@ -48,16 +48,11 @@ jobs:
4848
npm run test
4949
5050
- run:
51-
name: Run end-to-end tests.
51+
name: Run End-To-End Tests
5252
command: |
5353
echo $(pwd) && \
5454
npm run e2e-tests
5555
56-
- run:
57-
name: Run Validation Tests
58-
command: |
59-
npm run validation-tests
60-
6156
- store_artifacts:
6257
path: ~/cumulus-dashboard/cypress/screenshots
6358

@@ -71,18 +66,18 @@ jobs:
7166
- checkout
7267

7368
- run:
74-
name: Install awscli
69+
name: Install AWSCLI
7570
command: sudo pip install awscli
7671

7772
- run:
78-
name: Install dependencies
73+
name: Install Dependencies
7974
command: |
8075
export NVM_DIR="/opt/circleci/.nvm"
8176
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
8277
nvm install v12.18.0
8378
nvm alias default v12.18.0
8479
npm install -g npm
85-
npm ci
80+
npm ci --no-optional
8681
8782
- run:
8883
# This has to be done in a separate step, like this, because Circle CI
@@ -123,6 +118,7 @@ jobs:
123118
-v /home/circleci/.cache:/root/.cache \
124119
-v $(pwd):/home \
125120
--workdir /home \
121+
-e AWS_REGION=${SANDBOX_AWS_REGION} \
126122
-e APIROOT=${SANDBOX_API_ROOT} \
127123
node:12.18.0 \
128124
npm run build
@@ -147,6 +143,7 @@ jobs:
147143
-v /home/circleci/.cache:/root/.cache \
148144
-v $(pwd):/home \
149145
--workdir /home \
146+
-e AWS_REGION=${SIT_AWS_REGION} \
150147
-e APIROOT=${SIT_API_ROOT} \
151148
node:12.18.0 \
152149
npm run build

CHANGELOG.md

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,68 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10+
## [v3.0.0]
11+
12+
### Fixed
13+
- **CUMULUS-2226**
14+
- Loading and sorting the Failed Granules table no longer causes the screen to jump to the top of the table.
15+
16+
- **CUMULUS-2242** and **CUMULUS-2177**
17+
- building with `npm run build` will now build a distribution that can be served from behind cloudfront.
18+
- Fixed bug in nginx config that allows the application to run in the continer built by `bin/build_dashboard_image.sh`.
19+
- Overhauled the README.md and added a "Quick start" section
20+
21+
- **CUMULUS-1873**
22+
- Clear selected items in table when filter is applied
23+
24+
- **CUMULUS-2249**
25+
- clear infix search parameter when Search component is unmounted
26+
27+
- **CUMULUS-2238**
28+
- Fix "Date and Time Range" CSS on Chrome and Firefox. Dropdowns now display icons correctly and elements don't shift when selected.
29+
30+
- **CUMULUS-2147**
31+
- clear execution errors from granules list when async commands are completed
32+
33+
- **CUMULUS-2135**
34+
- Pagination table header UI CSS tweaks
35+
36+
### Added
37+
38+
- **CUMULUS-2091**
39+
- Add Tooltip component
40+
- Add blue tooltip for timestamp values in the table
41+
42+
- **CUMULUS-2200**
43+
- Add Granule List page. Use Granule Inventory reports for generating granule CSVs
44+
45+
- **CUMULUS-2225**
46+
- Rename "Type" column "Error Type" on Failed Granules and Home pages and allow sorting
47+
- Add Error Type filter to Failed Granules page
48+
49+
- **CUMULUS-2218**
50+
- Add `Bulk Reingest` to Bulk Granules actions
51+
52+
### Changed
53+
54+
- **CUMULUS-2063**
55+
- Updates the dashboard to use alpha version `@cumulus/[email protected]` for testing.
56+
- Code changes to allow for private CMR collections to have links to the MMT.
57+
- **CUMULUS-2215**
58+
- Omits unnecesary statistics request when building the option list of collection names on the granules page.
59+
- **CUMULUS-2171**
60+
- Allows filtering of the Granule Inventory List CSV download based on Granule IDs, Status, and Collection.
61+
- **CUMULUS-2242**
62+
- Moves cypress testing to run against production build in CI.
63+
- renames helper scripts to better describe their purposes
64+
- `./bin/build_in_docker.sh` -> `./bin/build_dashboard_via_docker.sh`
65+
- `./bin/build_docker_image.sh` -> `./bin/build_dashboard_image.sh`
66+
67+
### Removed
68+
-**CUMULUS-2242**
69+
- Removes unnecessary validation tests.
70+
- Removes README.md documentation for NGAP Sandbox Metrics Development
71+
1072
## [v2.0.0]
1173

1274
### BREAKING CHANGES
@@ -625,7 +687,9 @@ Fix for serving the dashboard through the Cumulus API.
625687

626688
- Versioning and changelog [CUMULUS-197] by @kkelly51
627689

628-
[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v1.10.0...HEAD
690+
[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v3.0.0...HEAD
691+
[v3.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v2.0.0...v3.0.0
692+
[v2.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v1.10.0...v2.0.0
629693
[v1.10.0]: https://github.com/nasa/cumulus-dashboard/compare/v1.9.0...v1.10.0
630694
[v1.9.0]: https://github.com/nasa/cumulus-dashboard/compare/v1.8.1...v1.9.0
631695
[v1.8.1]: https://github.com/nasa/cumulus-dashboard/compare/v1.8.0...v1.8.1

DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ The basic steps to follow are:
194194

195195
This is a two step process, where you use [`npm link`](https://docs.npmjs.com/cli-commands/link.html) to prepare the @cumulus/api by running `npm link` in the `cumulus/packages/api` directory and then use it in the dashboard project by running `npm link @cumulus/api` in the dashboard root directory.
196196

197-
When you have done this, you need to make sure that you only use the LocalStack/Elasticsearch portion of the docker-compose containers, e.g. run `npm run start-localstack` and `npm run serve-api` in order to run the linked version of the @cumulus/api. Do all of your development locally including running unit and integration tests. When you are satisfied with the changes to the Cumulus core code (and when that is merged) you can do an alpha release of the code by building an alpha release of the package `npm version prerelease --preid=alpha` and then publishing to npm with a tag of `alpha`. `npm publish --tag next`. This will upload the contents of your `cumulus/packages/api` to npm with a version that looks like `1.18.1-alpha.0` and a tag of `next`.
197+
When you have done this, you need to make sure that you only use the LocalStack/Elasticsearch portion of the docker-compose containers, e.g. run `npm run start-localstack` and `npm run serve-api` in order to run the linked version of the @cumulus/api. Do all of your development locally including running unit and integration tests. When you are satisfied with the changes to the Cumulus core code (and when that is merged) you can do an alpha release of the code by building an alpha release of the package `npm version prerelease --preid=alpha` and then publishing to npm with a tag of `next`. `npm publish --tag next`. This will upload the contents of your `cumulus/packages/api` to npm with a version that looks like `1.18.1-alpha.0` and a tag of `next`.
198198

199199
2. Update the dashboard to use the alpha package for CI.
200200

0 commit comments

Comments
 (0)