Merge pull request #961 from nasa/develop

nasa · May 3, 2021 · facb153 · facb153
2 parents 7ce3ff8 + 4f8446b
commit facb153
Show file tree

Hide file tree

Showing 55 changed files with 2,716 additions and 1,031 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,41 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [v6.0.0] - 2021-05-03
+
+## Breaking Changes
+
+This version of the dashboard requires Cumulus API `v8.1.0`
+
+## All Changes
+
+### Fixed
+
+- **CUMULUS-2449**
+  - Fixes issue where collections with forward slash in version name were not displayed
+
+### Added
+
+- **CUMULUS-2348**
+  - Implement Granule Recovery status
+  - Requires @cumulus/api@7.2.1-alpha.0
+
+- **CUMULUS-2435**
+  - Add step name to execution events
+
+### Changed
+
+- **CUMULUS-2282**
+  - Adds component that displays errors returned from a configured metrics
+    endpoint.  Specifically, letting a user know that they are unauthorized
+    when trying to retrieve data from ESROOT rather than just not showing the
+    data.
+  - Changes requestMiddleware and handleError.  Existing behavior is retained,
+    but when an error has no message in its response, we look to the error
+    message which has useful information to show the user.
+  - Upgrades Cypress testing software to 7.0.1
+  - Refactors home page and adds a new section header
+
 ## [v5.0.0] - 2021-03-23
 
 ## Breaking Changes
@@ -44,11 +79,22 @@ This version of the dashboard requires Cumulus API 7.0.0
 - **CUMULUS-2366**
   - Removes logs from dashboard display when metrics is not setup
 
+- **CUMULUS-2430**
+  - Overview KPI status cards: Change styling to new design
+
+- **CUMULUS-2056**
+  - Added Events link to Details section of Executions page
+  - On Events tab of Execution page, highlighted in the red the failed tasks
+  - On Events tab of Execution page, made tasks expandable to show event details
+
 ### Added
 
 - **CUMULUS-2297**
   - Add ability to show/hide columns on all tables
 
+- **CUMULUS-2430**
+  - Overview KPI status cards: Add tooltip to display full totals
+
 ## [v4.0.0] - 2021-01-13
 
 ## Breaking Changes
@@ -841,7 +887,8 @@ Fix for serving the dashboard through the Cumulus API.
 
 - Versioning and changelog [CUMULUS-197] by @kkelly51
 
-[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v5.0.0...HEAD
+[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v6.0.0...HEAD
+[v6.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v5.0.0...v6.0.0
 [v5.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v4.0.0...v5.0.0
 [v4.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v3.0.0...v4.0.0
 [v3.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v2.0.0...v3.0.0

diff --git a/README.md b/README.md
@@ -10,6 +10,7 @@ Code to generate and deploy the dashboard for the Cumulus API.
 - [Run the dashboard](#run-the-dashboard)
 - [Deployment](#deployment)
 - [Testing](#testing)
+- [Create a Dashboard Release](#create-a-dashboard-release)
 
 
 Other pages:
@@ -200,7 +201,7 @@ Serve the cumulus API (separate terminal)
 
 Serve the dashboard web application (another terminal)
 ```bash
-  $ [HIDE_PDR=false SHOW_DISTRIBUTION_API_METRICS=true ESROOT=http://example.com APIROOT=http://localhost:5001] npm run serve
+  $ [HIDE_PDR=false SHOW_DISTRIBUTION_API_METRICS=true ENABLE_RECOVERY=true ESROOT=http://example.com APIROOT=http://localhost:5001] npm run serve
 ```
 
 If you're just testing dashboard code, you can generally run all of the above commands as a single docker-compose stack.
@@ -325,7 +326,7 @@ The `master` branch is the branch where the source code of HEAD always reflects
 
 When the source code in the develop branch reaches a stable point and is ready to be released, all of the changes should be merged back into master and then tagged with a release number.
 
-## How to release
+## Create a Dashboard Release
 
 ### 1. Checkout `develop` branch
 
@@ -365,7 +366,7 @@ Create a PR for the `release-vX.X.X` branch against the `develop` branch. Verify
 
 ### 9. Create a pull request against the master branch
 
-Create a PR for the `develop` branch against the `master` branch. Verify that the Earthdata Bamboo CI build for the PR succeeds and then merge to `master`.
+Create a PR for the `develop` branch against the `master` branch. Verify that the Earthdata Bamboo CI build for the PR succeeds and then merge to `master`.  Do not create a squash merge, but use a merge commit.
 
 ### 10. Create a git tag for the release
 
@@ -387,4 +388,16 @@ Follow the [Github documentation to create a new release](https://help.github.co
 
 Create a PR for the `master` branch back into `develop` to bring the merge commit back into develop.
 
+It is likely that no branch plan will exist for the `master` branch.
+#### Create a bamboo branch plan for the release
+ - In the Cumulus Dashboard in Bamboo (<https://ci.earthdata.nasa.gov/browse/CUM-CDG>), click `Actions -> Configure Plan` in the top right.
+ - Next to `Plan branch` click the rightmost button that displays `Create Plan Branch` upon hover.
+ - Click `Create plan branch manually`.
+ - Choose Branch Name `master` and then click `create`.
+ - Verify that the build has started for this plan.
+
+
+
+
+
 <a name="bundlefootnote">1</a>: A dashboard bundle is just a ready-to-deploy compiled version of the dashboard and environment.
diff --git a/app/src/css/_base.scss b/app/src/css/_base.scss
@@ -451,10 +451,15 @@ a:active {
   margin-top: 0em;
 }
 
-.page__section.datetime{
+// MHS: These two are pretty specific and should be fixed in the future.
+.page__section#datetime {
   margin-bottom: 7.5em;
 }
 
+.page__section#listGranules {
+    margin-top: 2.5em;
+}
+
 .page__section--logs {
 
   .heading__wrapper--border {
@@ -685,11 +690,18 @@ a:active {
   background-color: $grey;
   margin-right: 0.5em;
 
+  &--granule {
+    width: 0.8rem;
+    height: 0.8rem;
+    margin-left: 0.8em;
+    margin-right: 2em;
+  }
+
   &--success {
     background-color: $light-green;
   }
 
-  &--orange {
+  &--running, &--orange {
     background-color: $orange;
   }
 
@@ -730,7 +742,7 @@ a:active {
     margin-right: 2em;
   }
   dt {
-    margin-right: 0.5em;
+    margin-right: 1.5em;
     color: $dark-grey;
   }
   .running,

diff --git a/app/src/css/_buttons.scss b/app/src/css/_buttons.scss
@@ -50,6 +50,18 @@ $delete-btn-hover-bg-color: darken($error-red, 10%);
     }
   }
 
+  &--events{
+    background-color: $light-green;
+    padding: .4em 1.5em .4em 1.5em;
+    float: right;
+
+    &:hover {
+      background-color: darken($light-green, 10%);
+      color: #fff;
+      border: 0;
+    }
+  }
+
   &--large{
     padding: .7em 2em;
     font-weight: $base-font-bold;
@@ -88,6 +100,24 @@ $delete-btn-hover-bg-color: darken($error-red, 10%);
     }
   }
 
+  &--failed {
+    background-color: $error-red;
+    position: relative;
+
+      &:before{
+        color: $white;
+        position: absolute;
+        font-family: 'FontAwesome';
+        font-weight: 900;
+        left: 10px;
+      }
+      &:hover {
+        background-color: $delete-btn-hover-bg-color;
+        color: #fff;
+        border: 0;
+      }
+  }
+
   &--primary, &--primary:visited {
     &:hover {
       background-color: darken($ocean-blue, 10%);
@@ -541,10 +571,18 @@ $delete-btn-hover-bg-color: darken($error-red, 10%);
       }
     }
 
+    &__bulkgranules--recovery {
+      background-color: $light-green;
+
+      &:before {
+        content: '\f247';
+      }
+    }
+
     &__kibana_open{
       background-color: $light-green;
       position: relative;
-      margin-top: 1em;
+      margin-top: .5em;
       display: inline-block;
 
       &:before{

diff --git a/app/src/css/_chart.scss b/app/src/css/_chart.scss
@@ -22,6 +22,8 @@
   fill: $light-grey;
 }
 
+/* Tooltips */
+
 .tooltip {
   margin-left: 1em;
   margin-top: 1em;
@@ -86,6 +88,8 @@
   }
 }
 
+/* Chart Graphic */
+
 .clusters rect {
   fill: transparent;
   stroke: #555;

diff --git a/app/src/css/_typography.scss b/app/src/css/_typography.scss
@@ -65,12 +65,12 @@ h1, h2, h3, h4, h5, h6 {
 
     }
 }
- 
+
 
 .with-description {
   margin-bottom: .1em;
 }
 
 .breadcrumb, .caption {
   font-size: 0.875em;
-}
+}
diff --git a/app/src/css/modules/_modals.scss b/app/src/css/modules/_modals.scss
@@ -156,11 +156,36 @@
     .modal-body {
       height: 100px;
       overflow-y: auto;
+      margin-left: 10px;
+      text-align: left;
     }
 
     .button__arrow--md:hover:after {
       left: 85%;
     }
+
+    ol {
+      counter-reset: my-counter;
+    }
+
+    ol li {
+      counter-increment: my-counter;
+      position: relative;
+    }
+
+    ol li::before {
+      content: counter(my-counter);
+      background: $ocean-blue;
+      border-radius: 50%;
+      color: white;
+      display: inline-block;
+      font-size: 1rem;
+      height: 2rem;
+      line-height: 2;
+      margin: 0.5rem;
+      text-align: center;
+      width: 2rem;
+    }
   }
 
   .bulk_granules__title.modal-title.h4 {
@@ -173,7 +198,7 @@
       }
   }
 
-  &.bulk_granules--operations, &.bulk_granules--delete, &.bulk_granules--reingest {
+  &.bulk_granules--operations, &.bulk_granules--delete, &.bulk_granules--reingest, &.bulk_granules--recovery {
     .modal-body {
       height: 425px;
     }