Merge pull request #566 from nasa/release-v1.4.0

Dashboard v1.4.0 release

.circleci/config.yml

@@ -29,15 +29,15 @@ jobs:
             - ~/.cache
 
       # image node:8.11.4 has yarn version 1.6.0 and yarn >=1.12.3 is needed for audit
-      - run:
-          name: Run audit-ci
-          command: |
-            export NVM_DIR="/opt/circleci/.nvm"
-            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-            nvm install v8.11.4
-            nvm alias default v8.11.4
-            npm install -g yarn
-            yarn run audit-ci
+      # - run:
+      #     name: Run audit-ci
+      #     command: |
+      #       export NVM_DIR="/opt/circleci/.nvm"
+      #       [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+      #       nvm install v8.11.4
+      #       nvm alias default v8.11.4
+      #       npm install -g yarn
+      #       yarn run audit-ci
 
       - run:
           name: Test dashboard build
@@ -127,3 +127,113 @@ jobs:
               --workdir /home \
               cypress/base:8 \
               yarn cypress-ci
+
+  deploy:
+    machine: true
+    working_directory: ~/cumulus-dashboard
+    steps:
+      - checkout
+
+      # restore cache
+      - restore_cache:
+          keys:
+            - dashboard-{{ .Branch }}-{{ checksum "package.json" }}
+
+      - run:
+          name: Install awscli
+          command: sudo pip install awscli
+
+
+      - run:
+          name: Install dependencies
+          command: |
+            docker run --rm \
+              -v /home/circleci/.cache:/root/.cache \
+              -v $(pwd):/home \
+              --workdir /home \
+              node:8.11.4 \
+              yarn install --frozen-lockfile --cache-folder /root/.cache
+
+      - run:
+          # This has to be done in a separate step, like this, because Circle CI
+          # will not interpolate values when setting environment variables
+          name: Setup Sandbox Environment Variables
+          command: |
+            echo 'export AWS_ACCESS_KEY_ID="$SANDBOX_ACCESS_KEY_ID"' >> $BASH_ENV
+            echo 'export AWS_SECRET_ACCESS_KEY="$SANDBOX_SECRET_ACCESS_KEY"' >> $BASH_ENV
+
+      - run:
+          name: Build Sandbox Dist
+          command: |
+            docker run --rm \
+              -v /home/circleci/.cache:/root/.cache \
+              -v $(pwd):/home \
+              --workdir /home \
+              -e APIROOT=${SANDBOX_API} \
+              node:8.11.4 \
+              yarn run build
+
+      - run:
+          name: Deploy to S3
+          command: |
+            aws s3 sync $(pwd)/dist s3://${SANDBOX_DASHBOARD_BUCKET}
+
+      - run:
+          # This has to be done in a separate step, like this, because Circle CI
+          # will not interpolate values when setting environment variables
+          name: Setup Sandbox Environment Variables
+          command: |
+            echo 'export AWS_ACCESS_KEY_ID="$SANDBOX_ACCESS_KEY_ID"' >> $BASH_ENV
+            echo 'export AWS_SECRET_ACCESS_KEY="$SANDBOX_SECRET_ACCESS_KEY"' >> $BASH_ENV
+
+      - run:
+          name: Build Sandbox Dist
+          command: |
+            docker run --rm \
+              -v /home/circleci/.cache:/root/.cache \
+              -v $(pwd):/home \
+              --workdir /home \
+              -e APIROOT=${SANDBOX_API_ROOT} \
+              node:8.11.4 \
+              yarn run build
+
+      - run:
+          name: Deploy to Cumulus Sandbox
+          command: |
+            aws s3 sync $(pwd)/dist s3://${SANDBOX_DASHBOARD_BUCKET}
+
+      - run:
+          # This has to be done in a separate step, like this, because Circle CI
+          # will not interpolate values when setting environment variables
+          name: Setup SIT Environment Variables
+          command: |
+            echo 'export AWS_ACCESS_KEY_ID="$SIT_ACCESS_KEY_ID"' >> $BASH_ENV
+            echo 'export AWS_SECRET_ACCESS_KEY="$SIT_SECRET_ACCESS_KEY"' >> $BASH_ENV
+
+      - run:
+          name: Build SIT Dist
+          command: |
+            docker run --rm \
+              -v /home/circleci/.cache:/root/.cache \
+              -v $(pwd):/home \
+              --workdir /home \
+              -e APIROOT=${SIT_API_ROOT} \
+              node:8.11.4 \
+              yarn run build
+
+      - run:
+          name: Deploy to Cumulus SIT
+          command: |
+            aws s3 sync $(pwd)/dist s3://${SIT_DASHBOARD_BUCKET}
+
+workflows:
+  version: 2
+  build_test_deploy:
+    jobs:
+      - build
+      - deploy:
+          requires:
+            - build
+          filters:
+            branches:
+              only: develop

CHANGELOG.md

@@ -1,14 +1,44 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [v1.4.0] - 2019-04-19
+
+### BREAKING CHANGES
+
+- You must be using Cumulus API version 1.12.1 or above with this version of the dashboard.
+
+### Added
+
+- **CUMULUS-820**
+  - Added information from Cumulus vs CMR reconciliation report to page (files, collections, granules)
+  - Added ability to expand/collapse tables in reconciliation report output. Tables larger than 10 rows are collapsed by default.
+
+### Changed
+
+- Updated to `gulp-sass@^3` so Python build of `node-sass` library is not required. Removed unnecessary direct dependency on `node-sass` package.
+
+### Fixed
+
+- Updates to `./bin/build_in_docker.sh` (Fixes #562):
+  - Use `yarn` instead of `npm`.
+  - Updated script to run in `node:8-slim` Docker image instead of `node:slim`.
+  - Added ability to specify all environment variables for configuring dashboard when building via `./bin/build_in_docker.sh`.
+  - Removed install of unnecessary system packages.
+
+### Removed
+
+- **CUMULUS-997** - Removed the deprecated "associated collections" section from the individual provider pages
+
 ## [v1.3.0] - 2019-03-04
 
 ### Added
+
 - Execution details (inputs and outputs) are shown for executions and execution steps. [CUMULUS-692]
 - Link to parent workflow execution if any exists. [Cumulus-689]
 - Logs for specific workflow executions. [Cumulus-691]
@@ -19,37 +49,46 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Added warning message to granules `reingest` button to indicates that existing data will be overwritten. [Cumulus-792]
 
 ### Changed
+
 - Updated React to version 16.6.3
 - Updated all component classes using ES6 style [Cumulus-1096]
 
 ## [v1.2.0] - 2018-08-08
 
 ### Added
+
 - `Execute` option on granules to start a workflow with the granule as payload.
 - Dashboard menus now support `GITC` and `DAAC` labels. The dashboard also supports addition of new labels.
 
 ### Changed
+
 - The Rules add and edit forms are changed to a JSON editor box
 - All Rule fields are now editable on the dashboard
 
 ### Fixed
+
 - batch-async-command now collects all errors in a queue, rather than emptying the queue after the first error
 
 ## [v1.1.0] - 2018-04-20
+
 ### Added
+
 - Expandable errors. [CUMULUS-394]
 
 ### Changed
+
 - In `components/logs/viewer.js`, changed references to `type` to `level` to match cumulus v1 logging [CUMULUS-306].
 - Tests use ava instead of tape. [CUMULUS-418]
 - Remove `defaultVersion` from the config. To use a particular version of the API, just set that in the API URL.
 
 ## v1.0.1 - 2018-03-07
 
 ### Added
+
 - Versioning and changelog [CUMULUS-197] by @kkelly51
 
-[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v1.3.0...HEAD
+[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v1.4.0...HEAD
+[v1.4.0]: https://github.com/nasa/cumulus-dashboard/compare/v1.3.0...v1.4.0
 [v1.3.0]: https://github.com/nasa/cumulus-dashboard/compare/v1.2.0...v1.3.0
 [v1.2.0]: https://github.com/nasa/cumulus-dashboard/compare/v1.1.0...v1.2.0
 [v1.1.0]: https://github.com/nasa/cumulus-dashboard/compare/v1.0.1...v1.1.0

CONTRIBUTING.md

@@ -6,7 +6,7 @@ We're excited you would like to contribute to Cumulus! Whether you're finding bu
 
 ## Submitting an Issue
 
-If you have any questions or ideas, or notice any problems or bugs, first [search open issues](https://github.com/cumulus-nasa/cumulus-dashboard/issues) to see if the issue has already been submitted. We may already be working on the issue. If you think your issue is new, you're welcome to [create a new issue](https://github.com/cumulus-nasa/cumulus-dashboard/issues/new).
+If you have any questions or ideas, or notice any problems or bugs, first [search open issues](https://github.com/nasa/cumulus-dashboard/issues) to see if the issue has already been submitted. We may already be working on the issue. If you think your issue is new, you're welcome to [create a new issue](https://github.com/nasa/cumulus-dashboard/issues/new).
 
 ## Pull Requests
 
@@ -15,7 +15,7 @@ If you want to submit your own contributions, follow these steps:
 * Fork the Cumulus Dashboard repo
 * Create a new branch from the branch you'd like to contribute to
 * If an issue does't already exist, submit one (see above)
-* [Create a pull request](https://help.github.com/articles/creating-a-pull-request/) from your fork into the target branch of the cumulus-nasa/cumulus-dashboard repo
+* [Create a pull request](https://help.github.com/articles/creating-a-pull-request/) from your fork into the target branch of the nasa/cumulus-dashboard repo
 * Be sure to [mention the corresponding issue number](https://help.github.com/articles/closing-issues-using-keywords/) in the PR description, i.e. "Fixes Issue #10"
 * If your contribution requires a specific version of the Cumulus API, bump (or add) the version in `app/scripts/config/index.js`.
   * If you don't know the Cumulus API version (because it hasn't been released), create a one-line PR with the following attributes: