Skip to content

Commit 319e830

Browse files
authored
Merge pull request #1070 from nasa/develop
Merge develop to master for v11.0.0
2 parents c8499dd + a11f80a commit 319e830

Some content is hidden

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

57 files changed

+3421
-1820
lines changed

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
12.18.0
1+
14.19.1

CHANGELOG.md

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,55 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10+
## [v11.0.0] - 2022-04-19
11+
12+
## Breaking Changes
13+
14+
This version of the dashboard requires Cumulus API v11.1.0
15+
16+
### Added
17+
18+
- **CUMULUS-2704**
19+
- Added option to create ORCA Reconciliation Report to dashboard
20+
21+
- **CUMULUS-2748**
22+
- Added ORCA Reconciliation Report display to dashboard
23+
24+
### Changed
25+
26+
- **CUMULUS-2903**
27+
- Bumped Node version from 12.18.0 to 14.19.1 to match Core
28+
1029
## [v10.0.0] - 2022-02-25
1130

1231
## Breaking Changes
1332

14-
This version of the dashboard requires Cumulus API v10.1.0
33+
This version of the dashboard requires Cumulus API v10.1.1
34+
35+
- **CUMULUS-2728**
36+
- Removes kibana links and Metrics integration. To get this functionality,
37+
use the Metric's ELK stack and custom Kibana displays.
38+
`KIBANAROOT` is still used to send the operator to the kibana instance where bulk operation queries and custom visualizations can be found.
39+
40+
The following variables have been removed and no longer serve any purpose in the application.
41+
42+
+ `ESROOT`
43+
+ `ES_CLOUDWATCH_TARGET_PATTERN`
44+
+ `ES_DISTRIBUTION_TARGET_PATTERN`
45+
+ `ES_PASSWORD`
46+
+ `ES_USER`
47+
+ `SHOW_DISTRIBUTION_API_METRICS`
48+
+ `SHOW_TEA_METRICS`
1549

1650
### Changed
1751

52+
- **CUMULUS-NONE**
53+
- Updates Cumulus development dependencies to v10.1.1 and upgrades localstack to 0.11.5 to work with latest Cumulus.
1854
- **CUMULUS-2843**
1955
- Create provider and create rule modals now dislpay the provider [rule]
2056
schema title directly as read from the Cumulus API.
2157

58+
2259
## [v9.0.0] - 2022-02-01
2360

2461
## Breaking Changes
@@ -1238,7 +1275,8 @@ Fix for serving the dashboard through the Cumulus API.
12381275
### Added
12391276

12401277
- Versioning and changelog [CUMULUS-197] by @kkelly51
1241-
[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v10.0.0...HEAD
1278+
[Unreleased]: https://github.com/nasa/cumulus-dashboard/compare/v11.0.0...HEAD
1279+
[v11.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v10.0.0...v11.0.0
12421280
[v10.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v9.0.0...v10.0.0
12431281
[v9.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v8.0.0...v9.0.0
12441282
[v8.0.0]: https://github.com/nasa/cumulus-dashboard/compare/v7.1.0...v8.0.0

README.md

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,7 @@ Setting the following environment variables can override the default values.
3434
| HIDE\_PDR | Whether to hide (or show) the PDR menu. | *true* |
3535
| LABELS | Choose `gitc` or `daac` localization. | *daac* |
3636
| STAGE | Identifier displayed at top of dashboard page: e.g. PROD, UAT | *development* |
37-
38-
Environment options to configure metrics displays. **All** of the below are optional configurations to display metrics on the Cumulus Dashboard.
39-
40-
| Env Name | Description | Default |
41-
| -----|----|---- |
42-
| ESROOT | Should point to an Elasticsearch endpoint. Must be set for distribution metrics to be displayed. | |
43-
| ES\_PASSWORD | Elasticsearch password, needed when protected by basic authorization. | |
44-
| ES\_USER | Elasticsearch username, needed when protected by basic authorization. | |
45-
| ES\_CLOUDWATCH\_TARGET\_PATTERN | The Elasticsearch target pattern to find cloudwatch events. e.g. `<daac>-cloudwatch-cumulus-<env>-*` | |
46-
| ES\_DISTRIBUTION\_TARGET\_PATTERN | The Elasticsearch target pattern to find s3 access log distribution events. e.g. `<daac>-distribution-<env>-*` | |
4737
| KIBANAROOT | \<optional\> Points to a Kibana endpoint. | |
48-
| SHOW\_DISTRIBUTION\_API\_METRICS | \<optional\> Display metrics from the Cumulus Distribution API. | *false* |
49-
| SHOW\_TEA\_METRICS | \<optional\> Display metrics from the Thin Egress Application (TEA). | *true* |
5038

5139

5240
## Quick start
@@ -81,7 +69,7 @@ Set the environment and build the dashboard with these commands:
8169
$ source production.env && ./bin/build_dashboard_via_docker.sh
8270
```
8371

84-
This script uses Docker Compose to build and copy the a compiled dashboard into the `./dist` directory. You can now deploy this directory to AWS behind [CloudFront](https://aws.amazon.com/cloudfront/). If you are in NGAP, follow the instructions for "Request Public or Protected Access to the APIs and Dashboard" on the earthdata wiki page [Using Cumulus with Private APIs](https://wiki.earthdata.nasa.gov/display/CUMULUS/Cumulus+Deployments+in+NGAP).
72+
This script uses Docker Compose to build and copy the compiled dashboard into the `./dist` directory. You can now deploy this directory to AWS behind [CloudFront](https://aws.amazon.com/cloudfront/). If you are in NGAP, follow the instructions for "Request Public or Protected Access to the APIs and Dashboard" on the earthdata wiki page [Using Cumulus with Private APIs](https://wiki.earthdata.nasa.gov/display/CUMULUS/Cumulus+Deployments+in+NGAP).
8573

8674

8775
### Run the dashboard locally via Docker Image
@@ -108,7 +96,7 @@ In this example, the dashboard would be available at `http://localhost:3000/` in
10896

10997
### Build the dashboard
11098

111-
The dashboard uses node v12.18.0. To build/run the dashboard on your local machine, install [nvm](https://github.com/creationix/nvm) and run `nvm install v12.18.0`.
99+
The dashboard uses node v14.19.1. To build/run the dashboard on your local machine, install [nvm](https://github.com/creationix/nvm) and run `nvm install v14.19.1`.
112100

113101
#### install requirements
114102
We use npm for local package management, to install the requirements:
@@ -211,7 +199,7 @@ Serve the cumulus API (separate terminal)
211199

212200
Serve the dashboard web application (another terminal)
213201
```bash
214-
$ [HIDE_PDR=false SHOW_DISTRIBUTION_API_METRICS=true ENABLE_RECOVERY=true ESROOT=http://example.com APIROOT=http://localhost:5001] npm run serve
202+
$ [HIDE_PDR=false ENABLE_RECOVERY=true APIROOT=http://localhost:5001] npm run serve
215203
```
216204

217205
If you're just testing dashboard code, you can generally run all of the above commands as a single docker-compose stack.
@@ -242,7 +230,7 @@ These are started and stopped with the commands:
242230
$ npm run stop-localstack
243231
```
244232

245-
After these containers are running, you can start a cumulus API locally in a terminal window `npm run serve-api`, the dashboard in another window. `[HIDE_PDR=false SHOW_DISTRIBUTION_API_METRICS=true ENABLE_RECOVERY=true ESROOT=http://example.com ES_CLOUDWATCH_TARGET_PATTERN=cwpattern ES_DISTRIBUTION_TARGET_PATTERN=distpattern APIROOT=http://localhost:5001] npm run serve` and finally cypress in a third window. `npm run cypress`.
233+
After these containers are running, you can start a cumulus API locally in a terminal window `npm run serve-api`, the dashboard in another window. `[HIDE_PDR=false ENABLE_RECOVERY=true APIROOT=http://localhost:5001] npm run serve` and finally cypress in a third window. `npm run cypress`.
246234

247235
Once the Docker app is running, If you would like to see sample data you can seed the database. This will load the same sample data into the application that is used during cypress testing.
248236
```bash
@@ -279,7 +267,7 @@ localstack_1 | Ready.
279267
you should be able to verify access to the local Cumulus API at http://localhost:5001/token
280268

281269

282-
Then you can run the dashboard locally (without Docker) `[HIDE_PDR=false SHOW_DISTRIBUTION_API_METRICS=true ESROOT=http://example.com APIROOT=http://localhost:5001] npm run serve` and open cypress tests `npm run cypress`.
270+
Then you can run the dashboard locally (without Docker) `[HIDE_PDR=false APIROOT=http://localhost:5001] npm run serve` and open cypress tests `npm run cypress`.
283271

284272
The Docker compose stack also includes a command to let a developer start all development containers with a single command.
285273

app/src/css/_base.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -745,6 +745,7 @@ a:active {
745745
margin-right: 2em;
746746
}
747747

748+
&--found,
748749
&--success {
749750
background-color: $light-green;
750751
}
@@ -754,6 +755,7 @@ a:active {
754755
background-color: $orange;
755756
}
756757

758+
&--notfound,
757759
&--failed {
758760
background-color: $error-red;
759761
}

app/src/css/_buttons.scss

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -798,6 +798,19 @@ $delete-btn-hover-bg-color: darken($error-red, 10%);
798798
font-size: 1.1em;
799799
line-height: 1.1em;
800800
box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.12);
801+
802+
&--check {
803+
background-color: transparent;
804+
box-shadow: none;
805+
pointer-events: none;
806+
&:before {
807+
content: '\f00c';
808+
font-family: 'FontAwesome';
809+
background-color: transparent;
810+
color: $black;
811+
font-weight: 900;
812+
}
813+
}
801814
&--download {
802815
&:before {
803816
content: '\f0ab';

app/src/js/actions/actions-metrics/apiGatewaySearch.js

Lines changed: 0 additions & 82 deletions
This file was deleted.

app/src/js/actions/actions-metrics/apiLambdaSearch.js

Lines changed: 0 additions & 68 deletions
This file was deleted.

app/src/js/actions/actions-metrics/s3AccessSearch.js

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)