Skip to content

Commit

Permalink
Merge pull request #884 from nasa/develop
Browse files Browse the repository at this point in the history
Develop -> Master Release v3.0.0
  • Loading branch information
kkelly51 authored Nov 16, 2020
2 parents 1f8d11d + ba812ea commit 727d8ae
Show file tree
Hide file tree
Showing 99 changed files with 7,435 additions and 4,755 deletions.
25 changes: 11 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,24 @@ jobs:
- checkout

- run:
name: Install dependencies
name: Install Dependencies
command: |
export NVM_DIR="/opt/circleci/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
nvm install v12.18.0
nvm alias default v12.18.0
npm install -g npm
npm ci
npm ci --no-optional
- run:
name: Run audit-ci
name: Run Audit-CI
command: |
export NVM_DIR="/opt/circleci/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
npm run audit-ci
- run:
name: Test dashboard build
name: Build Dashboard
command: |
# build dashboard
docker run --rm \
Expand All @@ -38,7 +38,7 @@ jobs:
npm run build
- run:
name: Run tests
name: Run Unit Tests
command: |
docker run --rm \
-v /home/circleci/.cache:/root/.cache \
Expand All @@ -48,16 +48,11 @@ jobs:
npm run test
- run:
name: Run end-to-end tests.
name: Run End-To-End Tests
command: |
echo $(pwd) && \
npm run e2e-tests
- run:
name: Run Validation Tests
command: |
npm run validation-tests
- store_artifacts:
path: ~/cumulus-dashboard/cypress/screenshots

Expand All @@ -71,18 +66,18 @@ jobs:
- checkout

- run:
name: Install awscli
name: Install AWSCLI
command: sudo pip install awscli

- run:
name: Install dependencies
name: Install Dependencies
command: |
export NVM_DIR="/opt/circleci/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
nvm install v12.18.0
nvm alias default v12.18.0
npm install -g npm
npm ci
npm ci --no-optional
- run:
# This has to be done in a separate step, like this, because Circle CI
Expand Down Expand Up @@ -123,6 +118,7 @@ jobs:
-v /home/circleci/.cache:/root/.cache \
-v $(pwd):/home \
--workdir /home \
-e AWS_REGION=${SANDBOX_AWS_REGION} \
-e APIROOT=${SANDBOX_API_ROOT} \
node:12.18.0 \
npm run build
Expand All @@ -147,6 +143,7 @@ jobs:
-v /home/circleci/.cache:/root/.cache \
-v $(pwd):/home \
--workdir /home \
-e AWS_REGION=${SIT_AWS_REGION} \
-e APIROOT=${SIT_API_ROOT} \
node:12.18.0 \
npm run build
Expand Down
66 changes: 65 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,68 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

## [v3.0.0]

### Fixed
- **CUMULUS-2226**
- Loading and sorting the Failed Granules table no longer causes the screen to jump to the top of the table.

- **CUMULUS-2242** and **CUMULUS-2177**
- building with `npm run build` will now build a distribution that can be served from behind cloudfront.
- Fixed bug in nginx config that allows the application to run in the continer built by `bin/build_dashboard_image.sh`.
- Overhauled the README.md and added a "Quick start" section

- **CUMULUS-1873**
- Clear selected items in table when filter is applied

- **CUMULUS-2249**
- clear infix search parameter when Search component is unmounted

- **CUMULUS-2238**
- Fix "Date and Time Range" CSS on Chrome and Firefox. Dropdowns now display icons correctly and elements don't shift when selected.

- **CUMULUS-2147**
- clear execution errors from granules list when async commands are completed

- **CUMULUS-2135**
- Pagination table header UI CSS tweaks

### Added

- **CUMULUS-2091**
- Add Tooltip component
- Add blue tooltip for timestamp values in the table

- **CUMULUS-2200**
- Add Granule List page. Use Granule Inventory reports for generating granule CSVs

- **CUMULUS-2225**
- Rename "Type" column "Error Type" on Failed Granules and Home pages and allow sorting
- Add Error Type filter to Failed Granules page

- **CUMULUS-2218**
- Add `Bulk Reingest` to Bulk Granules actions

### Changed

- **CUMULUS-2063**
- Updates the dashboard to use alpha version `@cumulus/[email protected]` for testing.
- Code changes to allow for private CMR collections to have links to the MMT.
- **CUMULUS-2215**
- Omits unnecesary statistics request when building the option list of collection names on the granules page.
- **CUMULUS-2171**
- Allows filtering of the Granule Inventory List CSV download based on Granule IDs, Status, and Collection.
- **CUMULUS-2242**
- Moves cypress testing to run against production build in CI.
- renames helper scripts to better describe their purposes
- `./bin/build_in_docker.sh` -> `./bin/build_dashboard_via_docker.sh`
- `./bin/build_docker_image.sh` -> `./bin/build_dashboard_image.sh`

### Removed
-**CUMULUS-2242**
- Removes unnecessary validation tests.
- Removes README.md documentation for NGAP Sandbox Metrics Development

## [v2.0.0]

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

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

[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v1.10.0...HEAD
[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v3.0.0...HEAD
[v3.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v2.0.0...v3.0.0
[v2.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v1.10.0...v2.0.0
[v1.10.0]: https://github.com/nasa/cumulus-dashboard/compare/v1.9.0...v1.10.0
[v1.9.0]: https://github.com/nasa/cumulus-dashboard/compare/v1.8.1...v1.9.0
[v1.8.1]: https://github.com/nasa/cumulus-dashboard/compare/v1.8.0...v1.8.1
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ The basic steps to follow are:

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.

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`.
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`.

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

Expand Down
Loading

0 comments on commit 727d8ae

Please sign in to comment.