From 504c0981f9792aeac0efa17dd19d7683e073d737 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 11:39:58 -0700
Subject: [PATCH 01/15] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 450cdf9e1..1a8f5b1c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^19.4.0",
- "@ghsc/nshmp-template": "^19.3.1",
+ "@ghsc/nshmp-lib-ng": "^20.14.0",
+ "@ghsc/nshmp-template": "^20.20.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "19.4.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12416/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-19.4.0.tgz",
- "integrity": "sha1-odjGSToRIBUFvEYIhYj/YducyXo=",
+ "version": "20.14.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.14.0.tgz",
+ "integrity": "sha1-By2u9hHFFlKOeBmV1Xif1rE8KiY=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4864,9 +4864,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "19.3.1",
- "resolved": "https://code.usgs.gov/api/v4/projects/1416/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-19.3.1.tgz",
- "integrity": "sha1-OA7V7TF2Xigvplxf2NxOK7WxO2Q=",
+ "version": "20.20.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.20.0.tgz",
+ "integrity": "sha1-DXfjTcMArN7NU47Ywc02SjFccWw=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 167551998..0d67035c6 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^19.4.0",
- "@ghsc/nshmp-template": "^19.3.1",
+ "@ghsc/nshmp-lib-ng": "^20.14.0",
+ "@ghsc/nshmp-template": "^20.20.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From a9cc79e58e4921b39390b04c3f4882ca8159d0c1 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 11:40:33 -0700
Subject: [PATCH 02/15] add container
---
.../components/content/content.component.html | 14 ++++++----
.../components/content/content.component.html | 14 ++++++----
.../components/content/content.component.html | 28 +++++++++++--------
.../components/content/content.component.html | 28 +++++++++++--------
4 files changed, 48 insertions(+), 36 deletions(-)
diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
index 960fb1952..2cbd26cb3 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/content/content.component.html
@@ -13,12 +13,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="table()"
- filename="hanging-wall-effects.csv"
- buttonText="Export to CSV"
- title="Median Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="table()"
+ filename="hanging-wall-effects.csv"
+ buttonText="Export to CSV"
+ title="Median Data"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
index 2fcea6416..129750678 100644
--- a/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/distance/components/content/content.component.html
@@ -13,12 +13,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="table()"
- filename="gmm-distance-means.csv"
- buttonText="Export Means to CSV"
- title="Median Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="table()"
+ filename="gmm-distance-means.csv"
+ buttonText="Export Means to CSV"
+ title="Median Data"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
index ff48cf998..3903b9e6b 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/components/content/content.component.html
@@ -13,12 +13,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="meanTable()"
- filename="gmm-magnitude-means.csv"
- buttonText="Export Means as CSV"
- title="Median Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="meanTable()"
+ filename="gmm-magnitude-means.csv"
+ buttonText="Export Means as CSV"
+ title="Median Data"
+ />
+ </div>
</ng-template>
</mat-tab>
@@ -29,12 +31,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="sigmaTable()"
- filename="gmm-magnitude-sigmas.csv"
- buttonText="Export Sigmas as CSV"
- title="Sigma Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="sigmaTable()"
+ filename="gmm-magnitude-sigmas.csv"
+ buttonText="Export Sigmas as CSV"
+ title="Sigma Data"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
index 03f25db20..02e0cf3f6 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/content/content.component.html
@@ -13,12 +13,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="spectraTable()"
- filename="spectra-medians.csv"
- buttonText="Export Medians as CSV"
- title="Median Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="spectraTable()"
+ filename="spectra-medians.csv"
+ buttonText="Export Medians as CSV"
+ title="Median Data"
+ />
+ </div>
</ng-template>
</mat-tab>
@@ -29,12 +31,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="sigmaTable()"
- filename="spectra-sigmas.csv"
- buttonText="Export Sigmas as CSV"
- title="Sigma Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="sigmaTable()"
+ filename="spectra-sigmas.csv"
+ buttonText="Export Sigmas as CSV"
+ title="Sigma Data"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
--
GitLab
From 5426fc6cdf129b3b2ee13c6929cbf0109377b347 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 11:41:54 -0700
Subject: [PATCH 03/15] switch to class
---
.../components/about/about.component.html | 4 ++--
.../event-parameters/event-parameters.component.html | 3 +--
.../path-parameters/path-parameters.component.html | 1 -
.../disagg-contributors.component.html | 2 +-
.../components/disagg-data/disagg-data.component.html | 3 +--
.../disagg-summary/disagg-summary.component.html | 2 +-
.../disagg/components/plots/plots.component.html | 5 ++---
.../components/about/about.component.html | 4 ++--
.../control-panel/control-panel.component.html | 6 ++----
.../components/about/about.component.html | 2 +-
.../control-panel/control-panel.component.html | 3 +--
.../components/history/history.component.html | 2 +-
.../job-submitted/job-submitted.component.html | 5 ++---
.../components/about/about.component.html | 2 +-
.../control-panel/control-panel.component.html | 2 +-
.../control-panel/control-panel.component.html | 10 ++--------
.../model-maps/components/about/about.component.html | 2 +-
.../components/info-popup/info-popup.component.html | 4 ++--
18 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html
index c495d3ea9..437e586a4 100644
--- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/components/about/about.component.html
@@ -34,7 +34,7 @@
<li>
<div>
- <button mat-raised-button color="primary">Add Curve</button>
+ <button mat-raised-button class="primary">Add Curve</button>
</div>
<span>
@@ -61,7 +61,7 @@
<li>
<div>
- <button mat-raised-button color="warn">Clear Plot</button>
+ <button mat-raised-button class="error">Clear Plot</button>
</div>
<span>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
index f8987d501..8c312367d 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/event-parameters/event-parameters.component.html
@@ -77,9 +77,8 @@
<!-- Event Parameters: centered down dip -->
<div class="grid-col-8">
<mat-checkbox
- class="down-dip-checkbox"
+ class="primary down-dip-checkbox"
[formControl]="form.controls.zHypCentered"
- color="primary"
>
Centered down-dip
</mat-checkbox>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
index 06b0961a4..039313107 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/path-parameters/path-parameters.component.html
@@ -66,7 +66,6 @@
<div class="grid-row">
<mat-checkbox
class="grid-col-12 rjb-rrup-checkbox"
- color="primary"
[formControl]="form.controls.derivePathParams"
>
Derive R<sub>JB</sub> and R<sub>RUP</sub>
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
index 7367b3299..0869c5450 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-contributors/disagg-contributors.component.html
@@ -7,7 +7,7 @@
<div class="print-display-none">
<button
mat-raised-button
- color="primary"
+ class="primary"
(click)="
service.saveContributions(componentData(), form.getRawValue())
"
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html
index 60fad1379..70b49caef 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-data/disagg-data.component.html
@@ -4,9 +4,8 @@
<!-- Export button -->
<div class="print-display-none">
<button
- class="export-button"
+ class="primary export-button"
mat-raised-button
- color="primary"
[disabled]="componentData().data === null"
(click)="service.saveComponentData()"
>
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html
index a49c9e9a6..19a0147c0 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/disagg-summary/disagg-summary.component.html
@@ -6,7 +6,7 @@
<div class="print-display-none">
<button
mat-raised-button
- color="primary"
+ class="primary"
(click)="service.saveSummary(componentData(), form.getRawValue())"
>
Export as Text
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html
index edd15e955..57ffd0284 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.html
@@ -3,7 +3,7 @@
<div>
<button
mat-raised-button
- color="primary"
+ class="primary"
[disabled]="disaggData() === null"
(click)="exportReport()"
>
@@ -14,9 +14,8 @@
<!-- Export summary button -->
<div>
<button
- class="export-button"
+ class="primary export-button"
mat-raised-button
- color="primary"
[disabled]="disaggData() === null"
(click)="service.saveSummaryReport()"
>
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html
index 12a9708f4..7d566fa0a 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/about/about.component.html
@@ -31,7 +31,7 @@
<li>
<div>
- <button mat-raised-button color="primary">Show Logs</button>
+ <button mat-raised-button class="primary">Show Logs</button>
</div>
<span>
@@ -58,7 +58,7 @@
<li>
<div>
- <button mat-raised-button color="warn">Terminate Job</button>
+ <button mat-raised-button class="error">Terminate Job</button>
</div>
<span>
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
index d5ded724e..2396d198d 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/control-panel/control-panel.component.html
@@ -13,9 +13,8 @@
>
<div class="grid-col-6 padding-x-1">
<button
- class="grid-col-12"
+ class="primary grid-col-12"
mat-raised-button
- color="primary"
type="submit"
[disabled]="form?.invalid"
>
@@ -25,9 +24,8 @@
<div class="grid-col-6 padding-x-1">
<button
- class="grid-col-12"
+ class="error grid-col-12"
mat-raised-button
- color="warn"
type="button"
[disabled]="logResponse() === null"
(click)="service.callJobInfoService()"
diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html
index d37f102ff..964d2a464 100644
--- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/about/about.component.html
@@ -34,7 +34,7 @@
<li>
<div>
- <button mat-raised-button color="primary">Get Job History</button>
+ <button mat-raised-button class="primary">Get Job History</button>
</div>
<span>
diff --git a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
index 905b0609c..e5ce74a03 100644
--- a/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/haz-job-history/components/control-panel/control-panel.component.html
@@ -27,9 +27,8 @@
>
<div class="grid-col-12 padding-x-1">
<button
- class="grid-col-12"
+ class="primary grid-col-12"
mat-raised-button
- color="primary"
type="submit"
[disabled]="form.invalid"
>
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
index c3018fa9a..a9d1ea24a 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/history/history.component.html
@@ -96,7 +96,7 @@
<div class="padding-y-2">
<button
mat-raised-button
- color="primary"
+ class="primary"
type="button"
[disabled]="history().length === 0"
(click)="service.clearHistory()"
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html
index 4ea7f4b9b..8841a66f1 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/job-submitted/job-submitted.component.html
@@ -30,7 +30,7 @@
@if (serviceResponse?.response; as response) {
<button
mat-raised-button
- color="primary"
+ class="primary"
(click)="checkJob(response)"
>
Check on Job
@@ -43,10 +43,9 @@
<div mat-dialog-actions>
<button
- class="float-right"
+ class="secondary float-right"
mat-raised-button
[mat-dialog-close]="true"
- color="accent"
>
Close
</button>
diff --git a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html
index d1f384294..3fe991168 100644
--- a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/about/about.component.html
@@ -34,7 +34,7 @@
<li>
<div>
- <button mat-raised-button color="warn">Terminate Job</button>
+ <button mat-raised-button class="error">Terminate Job</button>
</div>
<span>
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
index 1defdd802..31658e813 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/control-panel/control-panel.component.html
@@ -120,7 +120,7 @@
extended
(click)="service.addLocationForm()"
type="button"
- color="secondary"
+ class="secondary"
>
<mat-icon>add</mat-icon>
Add additional location
diff --git a/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html
index 36c03aa08..1c5323702 100644
--- a/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/source/mfd/components/control-panel/control-panel.component.html
@@ -49,20 +49,14 @@
<div class="plot-options">
<!-- Cumulative -->
<div class="grid-row">
- <mat-slide-toggle
- color="primary"
- [formControl]="formGroup.controls.cumulative"
- >
+ <mat-slide-toggle [formControl]="formGroup.controls.cumulative">
Cumulative
</mat-slide-toggle>
</div>
<!-- Weighted MFDs -->
<div class="grid-row">
- <mat-slide-toggle
- color="primary"
- [formControl]="formGroup.controls.weightedMfds"
- >
+ <mat-slide-toggle [formControl]="formGroup.controls.weightedMfds">
Weighted MFDs
</mat-slide-toggle>
</div>
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html
index ab077dcbb..67b23cb0e 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/about/about.component.html
@@ -23,7 +23,7 @@
<ul class="icon-list">
<li>
<div>
- <mat-slide-toggle color="primary" />
+ <mat-slide-toggle />
</div>
<span> Click on the toggle to toggle visibility of that layer. </span>
diff --git a/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html b/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html
index 9fa0c207b..d96409433 100644
--- a/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html
+++ b/projects/nshmp-apps/src/app/source/model-maps/components/info-popup/info-popup.component.html
@@ -48,7 +48,7 @@
</mat-card-content>
<mat-card-footer align="end">
- <button mat-raised-button color="primary" (click)="close()">
+ <button mat-raised-button class="primary" (click)="close()">
Close
</button>
</mat-card-footer>
@@ -105,7 +105,7 @@
</mat-card-content>
<mat-card-footer align="end">
- <button mat-raised-button color="primary" (click)="close()">
+ <button mat-raised-button class="primary" (click)="close()">
Close
</button>
</mat-card-footer>
--
GitLab
From 9e465bc103d83e9686c026f0c3249407f6b34af2 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 11:42:01 -0700
Subject: [PATCH 04/15] check data
---
.../hazard/disagg/components/content/content.component.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/content/content.component.html b/projects/nshmp-apps/src/app/hazard/disagg/components/content/content.component.html
index 20799cc7d..13d3163e5 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/content/content.component.html
@@ -60,7 +60,7 @@
<mat-expansion-panel
class="contributions print-full-page print-page-break"
[expanded]="componentData()?.sources.length > 0"
- [disabled]="componentData()?.sources.length === 0"
+ [disabled]="disaggData() === null"
>
<mat-expansion-panel-header>
<mat-panel-title
@@ -76,7 +76,7 @@
<mat-expansion-panel
class="print-display-none"
[expanded]="componentData()?.data.length > 0"
- [disabled]="componentData()?.data.length === 0"
+ [disabled]="disaggData() === null"
>
<mat-expansion-panel-header>
<mat-panel-title
--
GitLab
From 0eaff8df033f91c77fce4a9582e98ee11d17774f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 11:43:56 -0700
Subject: [PATCH 05/15] add container
---
.../components/content/content.component.html | 29 +++++++++++--------
.../components/content/content.component.html | 8 +++--
.../components/data/data.component.html | 18 ++++++------
.../components/content/content.component.html | 8 +++--
.../components/content/content.component.html | 28 ++++++++++--------
5 files changed, 54 insertions(+), 37 deletions(-)
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html b/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
index 50e496fd4..851d05287 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/components/content/content.component.html
@@ -13,12 +13,15 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="hazardTableData()"
- [filename]="hazardFilename() | lowercase"
- buttonText="Export Hazard as CSV"
- title="Hazard Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="hazardTableData()"
+ [filename]="hazardFilename() | lowercase"
+ buttonText="Export Hazard as CSV"
+ title="Hazard Data"
+ class="grid-container-widescreen"
+ />
+ </div>
</ng-template>
</mat-tab>
@@ -29,12 +32,14 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="spectraTableData()"
- [filename]="spectraFilename() | lowercase"
- buttonText="Export Response Spectra as CSV"
- title="Response Spectra Data"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="spectraTableData()"
+ [filename]="spectraFilename() | lowercase"
+ buttonText="Export Response Spectra as CSV"
+ title="Response Spectra Data"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html b/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
index 37f191ef2..254823e31 100644
--- a/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/hazard/static/components/content/content.component.html
@@ -13,7 +13,9 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <app-curve-data />
+ <div class="grid-container-widescreen">
+ <app-curve-data />
+ </div>
</ng-template>
</mat-tab>
@@ -24,7 +26,9 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <app-spectrum-data />
+ <div class="grid-container-widescreen">
+ <app-spectrum-data />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.html b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.html
index 3a01a24d4..8080c78fa 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.html
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.html
@@ -1,13 +1,13 @@
-@for (table of tables(); track table) {
- <nshmp-lib-ng-data-table-panel
- [table]="table.tables"
- filename="geophysical-profiles.csv"
- buttonText="Export to CSV"
- [title]="table.title"
- />
-}
-
<div class="grid-container-widescreen">
+ @for (table of tables(); track table) {
+ <nshmp-lib-ng-data-table-panel
+ [table]="table.tables"
+ filename="geophysical-profiles.csv"
+ buttonText="Export to CSV"
+ [title]="table.title"
+ />
+ }
+
<mat-accordion>
<mat-expansion-panel expanded>
<mat-expansion-panel-header>
diff --git a/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html b/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
index aea11d8ac..c8253e42b 100644
--- a/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/source/mfd/components/content/content.component.html
@@ -13,7 +13,9 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <app-logic-tree />
+ <div class="grid-container-widescreen">
+ <app-logic-tree />
+ </div>
</ng-template>
</mat-tab>
@@ -24,7 +26,9 @@
[disabled]="hasData() === false"
>
<ng-template matTabContent>
- <app-data />
+ <div class="grid-container-widescreen">
+ <app-data />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
diff --git a/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html b/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
index edd8a3d07..31cffd512 100644
--- a/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/source/rates/components/content/content.component.html
@@ -9,24 +9,28 @@
<!-- Rate data -->
<mat-tab label="Rate Data" [disabled]="hasData() === false">
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="rateTableData()"
- buttonText="Export rates as CSV"
- title="Rates"
- filename="rates {{ parameters() }}.csv"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="rateTableData()"
+ buttonText="Export rates as CSV"
+ title="Rates"
+ filename="rates {{ parameters() }}.csv"
+ />
+ </div>
</ng-template>
</mat-tab>
<!-- Probability data -->
<mat-tab label="Probability Data" [disabled]="hasData() === false">
<ng-template matTabContent>
- <nshmp-lib-ng-data-table-panel
- [table]="probabilityTableData()"
- buttonText="Export probabilities as CSV"
- title="Probabilities"
- filename="probabilities {{ parameters() }}.csv"
- />
+ <div class="grid-container-widescreen">
+ <nshmp-lib-ng-data-table-panel
+ [table]="probabilityTableData()"
+ buttonText="Export probabilities as CSV"
+ title="Probabilities"
+ filename="probabilities {{ parameters() }}.csv"
+ />
+ </div>
</ng-template>
</mat-tab>
</mat-tab-group>
--
GitLab
From 8c4c4b039fcf54e285cde015fdf40ad95045e661 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 11:44:31 -0700
Subject: [PATCH 06/15] use material 3
---
.../components/plots/plots.component.scss | 5 ++++
.../curve-data/curve-data.component.scss | 3 --
.../spectrum-data.component.scss | 3 --
.../components/content/content.component.scss | 6 +---
.../snack-bar/snack-bar.component.scss | 1 +
.../components/config/config.component.scss | 6 +++-
.../components/data/data.component.scss | 5 ++--
.../components/content/content.component.scss | 28 ++-----------------
.../nshmp-apps/src/styles/_code-block.scss | 5 ----
.../src/styles/_parameter-summary.scss | 23 +++++----------
.../nshmp-apps/src/styles/_scrolling.scss | 2 +-
11 files changed, 24 insertions(+), 63 deletions(-)
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.scss b/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.scss
index e69de29bb..a8c5521a0 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.scss
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/plots/plots.component.scss
@@ -0,0 +1,5 @@
+@use '@ghsc/nshmp-template/styles/variables';
+
+button {
+ margin-bottom: variables.$form-field-padding-bottom;
+}
diff --git a/projects/nshmp-apps/src/app/hazard/static/components/curve-data/curve-data.component.scss b/projects/nshmp-apps/src/app/hazard/static/components/curve-data/curve-data.component.scss
index 9e74c7b70..e69de29bb 100644
--- a/projects/nshmp-apps/src/app/hazard/static/components/curve-data/curve-data.component.scss
+++ b/projects/nshmp-apps/src/app/hazard/static/components/curve-data/curve-data.component.scss
@@ -1,3 +0,0 @@
-.data-table-container {
- padding: 1em clamp(0.25em, 0.1em + 1vw, 1em);
-}
diff --git a/projects/nshmp-apps/src/app/hazard/static/components/spectrum-data/spectrum-data.component.scss b/projects/nshmp-apps/src/app/hazard/static/components/spectrum-data/spectrum-data.component.scss
index 9e74c7b70..e69de29bb 100644
--- a/projects/nshmp-apps/src/app/hazard/static/components/spectrum-data/spectrum-data.component.scss
+++ b/projects/nshmp-apps/src/app/hazard/static/components/spectrum-data/spectrum-data.component.scss
@@ -1,3 +0,0 @@
-.data-table-container {
- padding: 1em clamp(0.25em, 0.1em + 1vw, 1em);
-}
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
index 6639d9e4c..a1c7d1783 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/content/content.component.scss
@@ -26,7 +26,7 @@ $toolbarHeight: 3.5em;
}
.logs-toolbar {
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent);
+ background-color: variables.$nshmp-secondary-color;
font-size: clamp(8px, 6px + 1vw, 14px);
font-weight: normal;
height: $toolbarHeight;
@@ -66,7 +66,3 @@ $toolbarHeight: 3.5em;
font-weight: bold;
font-style: italic;
}
-
-body.dark-mode :host .logs-toolbar {
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent, 900);
-}
diff --git a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss
index df192e283..b5adf4e0d 100644
--- a/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/check-haz-jobs/components/snack-bar/snack-bar.component.scss
@@ -1,4 +1,5 @@
@use '@ghsc/nshmp-template/styles/mixins';
+@use '@angular/material' as mat;
:host {
display: flex;
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
index 4683b5f22..74ca37a77 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/config/config.component.scss
@@ -41,7 +41,11 @@
padding-top: 2em;
}
+tr {
+ background-color: variables.$nshmp-secondary-color;
+}
+
tr:hover {
cursor: pointer;
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent);
+ background-color: var(--mat-sys-surface-container-highest);
}
diff --git a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
index 71bd80d31..42f443f76 100644
--- a/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
+++ b/projects/nshmp-apps/src/app/ncm/geophysical-profiles/components/data/data.component.scss
@@ -7,12 +7,11 @@ td {
body.dark-mode :host {
table {
- color: mat.m2-get-color-from-palette(variables.$nshmp-accent, 200);
+ color: variables.$nshmp-on-primary-color;
th,
td {
- border: 1px solid
- mat.m2-get-color-from-palette(variables.$nshmp-accent, 700);
+ border: 1px solid var(--mat-sys-surface-container-highest);
border-left: 0;
border-right: 0;
}
diff --git a/projects/nshmp-apps/src/app/services/components/content/content.component.scss b/projects/nshmp-apps/src/app/services/components/content/content.component.scss
index ff5faac12..ec8d1ba1c 100644
--- a/projects/nshmp-apps/src/app/services/components/content/content.component.scss
+++ b/projects/nshmp-apps/src/app/services/components/content/content.component.scss
@@ -64,7 +64,7 @@ $sidenav-width: 300px;
$sidenav-collapsed-width: 65px;
mat-sidenav {
- background-color: #fafafa;
+ background-color: variables.$nshmp-secondary-color;
border-right: unset;
width: $sidenav-width;
@@ -84,15 +84,7 @@ mat-sidenav {
}
mat-nav-list {
- border-right: solid 3px variables.$theme-color;
-
- a {
- @include mat.list-typography(
- mat.m2-define-typography-config(
- $body-2: mat.m2-define-typography-level($font-size: 14px)
- )
- );
- }
+ border-right: solid 3px variables.$nshmp-primary-color;
a.active {
@include mat.list-overrides(
@@ -100,15 +92,6 @@ mat-sidenav {
list-item-supporting-text-color: #3d5e80,
)
);
-
- @include mat.list-typography(
- mat.m2-define-typography-config(
- $body-2: mat.m2-define-typography-level(
- $font-size: 14px,
- $font-weight: 800
- )
- )
- );
}
}
}
@@ -122,13 +105,6 @@ mat-sidenav.collapsed {
}
body.dark-mode :host {
- mat-sidenav {
- background-color: mat.m2-get-color-from-palette(
- variables.$nshmp-accent,
- 800
- );
- }
-
.card-section h4 {
color: rgba(255, 255, 255, 0.7);
}
diff --git a/projects/nshmp-apps/src/styles/_code-block.scss b/projects/nshmp-apps/src/styles/_code-block.scss
index 5a35435a8..eaa0ef9af 100644
--- a/projects/nshmp-apps/src/styles/_code-block.scss
+++ b/projects/nshmp-apps/src/styles/_code-block.scss
@@ -2,13 +2,8 @@
@use '@ghsc/nshmp-template/styles/variables';
.code-block {
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent);
font-size: clamp(8px, 6px + 1vw, 14px);
line-height: clamp(0.75em, 0.5em + 1vw, 1.5em);
overflow-x: scroll;
padding: 0 1em;
}
-
-body.dark-mode .code-block {
- background-color: mat.m2-get-color-from-palette(variables.$nshmp-accent, 700);
-}
diff --git a/projects/nshmp-apps/src/styles/_parameter-summary.scss b/projects/nshmp-apps/src/styles/_parameter-summary.scss
index cbf815ad0..df71d76c2 100644
--- a/projects/nshmp-apps/src/styles/_parameter-summary.scss
+++ b/projects/nshmp-apps/src/styles/_parameter-summary.scss
@@ -1,20 +1,15 @@
@use '@angular/material' as mat;
-$list-typography: mat.m2-define-typography-config(
- $body-1:
- mat.m2-define-typography-level(
- $font-size: 14px,
- $line-height: 18px,
- ),
-);
-
.parameter-summary {
- mat-list.parameter-list {
- @include mat.list-typography($list-typography);
+ @include mat.list-overrides(
+ (
+ list-item-label-text-size: 14px,
+ list-item-one-line-container-height: 2em,
+ )
+ );
+ mat-list.parameter-list {
mat-list-item {
- height: 2em;
-
.parameter {
font-weight: 700;
}
@@ -24,9 +19,5 @@ $list-typography: mat.m2-define-typography-config(
height: 1em;
padding-left: 1.5em;
}
-
- .indent-list.font-small {
- @include mat.list-typography($list-typography);
- }
}
}
diff --git a/projects/nshmp-apps/src/styles/_scrolling.scss b/projects/nshmp-apps/src/styles/_scrolling.scss
index d7d2ada65..0ec9a4fe6 100644
--- a/projects/nshmp-apps/src/styles/_scrolling.scss
+++ b/projects/nshmp-apps/src/styles/_scrolling.scss
@@ -31,7 +31,7 @@ $spacing: 1em !default;
}
}
-$dark-mode-accent: mat.m2-get-color-from-palette(variables.$nshmp-accent, 800);
+$dark-mode-accent: variables.$nshmp-secondary-color;
body.dark-mode {
.horizontal-scrolling {
--
GitLab
From 6e976367578d5287e0a1e964eae46e6269579ff6 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 11:44:45 -0700
Subject: [PATCH 07/15] remove form field component
---
.../components/form/form.component.html | 1058 ++++++++---------
.../components/form/form.component.ts | 2 -
.../components/content/content.component.html | 58 +-
.../components/content/content.component.ts | 2 -
4 files changed, 548 insertions(+), 572 deletions(-)
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
index 83b088897..55a9eb56b 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.html
@@ -1,567 +1,549 @@
<div>
- <nshmp-template-form-fields>
- <form
- class="settings-section width-full"
- [formGroup]="form"
- (submit)="service.callService()"
- >
- <mat-accordion multi>
- <!-- Import section -->
- <mat-expansion-panel expanded>
- <mat-expansion-panel-header>
- <mat-panel-title>Configuration Import</mat-panel-title>
- </mat-expansion-panel-header>
-
- <mat-divider />
-
- <div class="settings-subsection import-section">
- <div class="settings-subsection--section">
- <!-- Import: file upload -->
- <div>
- Already have the below information? <br />
- Import the
- <a (click)="service.activeTab(configTab().position)">
- configuration
- </a>
- as
- <a (click)="service.activeTab(jsonTab().position)">JSON</a>
- or
- <a (click)="service.activeTab(yamlTab().position)">YAML</a>
- </div>
- <br />
- <input
- #configEl
- type="file"
- accept=".json,.yml,.yaml"
- (change)="importConfigFile()"
- />
+ <form
+ class="settings-section width-full"
+ [formGroup]="form"
+ (submit)="service.callService()"
+ >
+ <mat-accordion multi>
+ <!-- Import section -->
+ <mat-expansion-panel expanded>
+ <mat-expansion-panel-header>
+ <mat-panel-title>Configuration Import</mat-panel-title>
+ </mat-expansion-panel-header>
+
+ <mat-divider />
+
+ <div class="settings-subsection import-section">
+ <div class="settings-subsection--section">
+ <!-- Import: file upload -->
+ <div>
+ Already have the below information? <br />
+ Import the
+ <a (click)="service.activeTab(configTab().position)">
+ configuration
+ </a>
+ as
+ <a (click)="service.activeTab(jsonTab().position)">JSON</a>
+ or
+ <a (click)="service.activeTab(yamlTab().position)">YAML</a>
</div>
+ <br />
+ <input
+ #configEl
+ type="file"
+ accept=".json,.yml,.yaml"
+ (change)="importConfigFile()"
+ />
</div>
- </mat-expansion-panel>
-
- <!-- Cloud config-->
- <mat-expansion-panel expanded>
- <mat-expansion-panel-header>
- <mat-panel-title>Cloud Configuration</mat-panel-title>
- </mat-expansion-panel-header>
-
- <mat-divider />
-
- <div class="settings-subsection aws-section">
- <div class="settings-subsection--section">
- <!-- AWS information: instance type -->
- <mat-form-field class="grid-col-12 tablet:grid-col-6">
- <mat-label>
- AWS EC2 Isntance Type
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.cloudConfig.controls.instanceType
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Memory icon">memory</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for AWS EC2 isntance type info"
- href="https://aws.amazon.com/ec2/instance-types/"
- target="__blank"
- color="primary"
- >
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-hint> The AWS EC2 instance type </mat-hint>
- <mat-error>Must not contain spaces</mat-error>
- </mat-form-field>
-
- <p>Common instance types:</p>
- <ul class="usa-list">
- @for (instance of commonInstances; track instance) {
- <li>
- {{ instance.type }}
- (CPU: {{ instance.cpu }}, Memory: {{ instance.mem }} GB)
- </li>
- }
- </ul>
- </div>
+ </div>
+ </mat-expansion-panel>
+
+ <!-- Cloud config-->
+ <mat-expansion-panel expanded>
+ <mat-expansion-panel-header>
+ <mat-panel-title>Cloud Configuration</mat-panel-title>
+ </mat-expansion-panel-header>
+
+ <mat-divider />
+
+ <div class="settings-subsection aws-section">
+ <div class="settings-subsection--section">
+ <!-- AWS information: instance type -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-6">
+ <mat-label>
+ AWS EC2 Isntance Type
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="form.controls.cloudConfig.controls.instanceType"
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Memory icon">memory</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for AWS EC2 isntance type info"
+ href="https://aws.amazon.com/ec2/instance-types/"
+ target="__blank"
+ class="primary"
+ >
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-hint> The AWS EC2 instance type </mat-hint>
+ <mat-error>Must not contain spaces</mat-error>
+ </mat-form-field>
+
+ <p>Common instance types:</p>
+ <ul class="usa-list">
+ @for (instance of commonInstances; track instance) {
+ <li>
+ {{ instance.type }}
+ (CPU: {{ instance.cpu }}, Memory: {{ instance.mem }} GB)
+ </li>
+ }
+ </ul>
</div>
- </mat-expansion-panel>
-
- <!-- NSHMP Config section -->
- <mat-expansion-panel expanded>
- <mat-expansion-panel-header>
- <mat-panel-title>NSHMP Configuration</mat-panel-title>
- </mat-expansion-panel-header>
- <mat-divider />
- <div class="settings-subsection program-section">
- <div class="settings-subsection--section">
- <!-- NSHMP config: email -->
- <mat-form-field class="grid-col-12 tablet:grid-col-6">
- <mat-label
- >Email <span class="form-required">*</span></mat-label
- >
- <input
- matInput
- [formControl]="form.controls.nshmpConfig.controls.email"
- />
- <span matPrefix>
- <mat-icon aria-label="Email icon">email</mat-icon>
- </span>
- <mat-error>Must be a valid USGS email</mat-error>
- <mat-hint>Email to recieve notifications from AWS</mat-hint>
- </mat-form-field>
-
- <mat-divider />
-
- <!-- NSHMP config: Source code -->
- <div class="settings-subsection padding-top-1">
- <mat-label class="settings-subsection--label">
- nshmp-haz Source Code
- </mat-label>
- <div class="settings-subsection--section">
- <!-- NSHMP config: source code Git URL -->
- <mat-form-field class="grid-col-12 tablet:grid-col-12">
- <mat-label>
- Source Code Git URL
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.sourceCodeGitUrl
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for GitLab git clone URL info"
- href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
- target="__blank"
- color="primary"
- >
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-error>
- Must be a valid URL ending in <code>.git</code>
- </mat-error>
- <mat-hint>The Git URL to the nshmp-haz repository</mat-hint>
- </mat-form-field>
-
- <!-- NSHMP config: source code SHA -->
- <mat-form-field class="grid-col-12 tablet:grid-col-6">
- <mat-label>
- Source Code Branch, Tag, or Commit
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.sourceCodeSha
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <mat-hint>
- The branch, tag, or commit of the nshmp-haz repository
- </mat-hint>
- <mat-error>Must not contain spaces</mat-error>
- </mat-form-field>
-
- <!-- NSHMP config: class name -->
- <mat-form-field class="grid-col-12 tablet:grid-col-6">
- <mat-label>
- Class Name to Run<span class="form-required">*</span>
- </mat-label>
- <mat-select
- [formControl]="
- form.controls.nshmpConfig.controls.className
- "
- >
- @for (class of nshmpHazClasses; track class) {
- <mat-option [value]="class">
- {{ class }}
- </mat-option>
- }
- </mat-select>
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for list of Java classes to run"
- href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/src/main/java/gov/usgs/earthquake/nshmp"
- target="__blank"
- color="primary"
+ </div>
+ </mat-expansion-panel>
+
+ <!-- NSHMP Config section -->
+ <mat-expansion-panel expanded>
+ <mat-expansion-panel-header>
+ <mat-panel-title>NSHMP Configuration</mat-panel-title>
+ </mat-expansion-panel-header>
+ <mat-divider />
+ <div class="settings-subsection program-section">
+ <div class="settings-subsection--section">
+ <!-- NSHMP config: email -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-6">
+ <mat-label>Email <span class="form-required">*</span></mat-label>
+ <input
+ matInput
+ [formControl]="form.controls.nshmpConfig.controls.email"
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Email icon">email</mat-icon>
+ </span>
+ <mat-error>Must be a valid USGS email</mat-error>
+ <mat-hint>Email to recieve notifications from AWS</mat-hint>
+ </mat-form-field>
+
+ <mat-divider />
+
+ <!-- NSHMP config: Source code -->
+ <div class="settings-subsection padding-top-1">
+ <mat-label class="settings-subsection--label">
+ nshmp-haz Source Code
+ </mat-label>
+ <div class="settings-subsection--section">
+ <!-- NSHMP config: source code Git URL -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-12">
+ <mat-label>
+ Source Code Git URL
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="
+ form.controls.nshmpConfig.controls.sourceCodeGitUrl
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for GitLab git clone URL info"
+ href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
+ target="__blank"
+ c="primary"
+ >
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-error>
+ Must be a valid URL ending in <code>.git</code>
+ </mat-error>
+ <mat-hint>The Git URL to the nshmp-haz repository</mat-hint>
+ </mat-form-field>
+
+ <!-- NSHMP config: source code SHA -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-6">
+ <mat-label>
+ Source Code Branch, Tag, or Commit
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="
+ form.controls.nshmpConfig.controls.sourceCodeSha
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <mat-hint>
+ The branch, tag, or commit of the nshmp-haz repository
+ </mat-hint>
+ <mat-error>Must not contain spaces</mat-error>
+ </mat-form-field>
+
+ <!-- NSHMP config: class name -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-6">
+ <mat-label>
+ Class Name to Run<span class="form-required">*</span>
+ </mat-label>
+ <mat-select
+ [formControl]="form.controls.nshmpConfig.controls.className"
+ >
+ @for (class of nshmpHazClasses; track class) {
+ <mat-option [value]="class">
+ {{ class }}
+ </mat-option>
+ }
+ </mat-select>
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for list of Java classes to run"
+ href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/src/main/java/gov/usgs/earthquake/nshmp"
+ target="__blank"
+ >
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-hint>Java class name of class to run</mat-hint>
+ </mat-form-field>
+
+ <!-- NSHMP config: nshmp-lib -->
+ <div class="settings-subsection margin-top-1">
+ <mat-label class="settings-subsection--label">
+ <mat-slide-toggle
+ [formControl]="form.controls.overrideNshmpLib"
+ class="lib-toggle"
>
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-hint>Java class name of class to run</mat-hint>
- </mat-form-field>
-
- <!-- NSHMP config: nshmp-lib -->
- <div class="settings-subsection margin-top-1">
- <mat-label class="settings-subsection--label">
- <mat-slide-toggle
- [formControl]="form.controls.overrideNshmpLib"
- color="primary"
- class="lib-toggle"
+ Provide nshmp-lib Dependency
+ </mat-slide-toggle>
+ </mat-label>
+ <div class="settings-subsection--section">
+ <!-- NSHMP config: nshmp-lib Git URL -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-8">
+ <mat-label>
+ nshmp-lib Git URL
+ @if (form.value.overrideNshmpLib) {
+ <span class="form-required"> * </span>
+ }
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="
+ form.controls.nshmpConfig.controls.nshmpLibGitUrl
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for GitLab git clone URL info"
+ href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
+ target="__blank"
>
- Provide nshmp-lib Dependency
- </mat-slide-toggle>
- </mat-label>
- <div class="settings-subsection--section">
- <!-- NSHMP config: nshmp-lib Git URL -->
- <mat-form-field class="grid-col-12 tablet:grid-col-8">
- <mat-label>
- nshmp-lib Git URL
- @if (form.value.overrideNshmpLib) {
- <span class="form-required"> * </span>
- }
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.nshmpLibGitUrl
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for GitLab git clone URL info"
- href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
- target="__blank"
- color="primary"
- >
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-error>
- Must be a valid URL ending in <code>.git</code>
- </mat-error>
- <mat-hint
- >The Git URL to the nshmp-lib repository</mat-hint
- >
- </mat-form-field>
-
- <!-- NSHMP config: nshmp-lib source code SHA -->
- <mat-form-field
- class="grid-col-12 tablet:grid-col-4 margin-bottom-1"
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-error>
+ Must be a valid URL ending in <code>.git</code>
+ </mat-error>
+ <mat-hint
+ >The Git URL to the nshmp-lib repository</mat-hint
>
- <mat-label>
- nshmp-lib Branch, Tag, or Commit
- @if (form.value.overrideNshmpLib) {
- <span class="form-required"> * </span>
- }
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.nshmpLibSha
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <mat-error>
- Must be a valid URL ending in <code>.git</code>
- </mat-error>
- <mat-hint>
- The branch, tag, or commit of the nshmp-lib repository
- </mat-hint>
- </mat-form-field>
- </div>
- </div>
- </div>
- </div>
+ </mat-form-field>
- <mat-divider />
-
- <div class="settings-subsection">
- <mat-label class="settings-subsection--label">
- National Seismic Hazard Model
- </mat-label>
- <div class="settings-subsection--section">
- <!-- NSHMP config: model Git URL -->
- <mat-form-field class="grid-col-12">
- <mat-label>
- National Seismic Hazard Model Git URL
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.modelGitUrl
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Plot icon">show_chart</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for GitLab URL info"
- href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
- target="__blank"
- color="primary"
+ <!-- NSHMP config: nshmp-lib source code SHA -->
+ <mat-form-field
+ class="grid-col-12 tablet:grid-col-4 margin-bottom-1"
>
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-hint>The Git URL to the NSHM repository</mat-hint>
- <mat-error>
- Must be a valid URL ending in <code>.git</code>
- </mat-error>
- </mat-form-field>
-
- <!-- NSHMP config: model SHA -->
- <mat-form-field class="grid-col-12 tablet:grid-col-6">
- <mat-label>
- Model Branch, Tag, or Commit
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.modelSha
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Code icon">code</mat-icon>
- </span>
- <mat-error>Must not contain spaces</mat-error>
- <mat-hint>
- The branch, tag, or commit of the NSHM repository
- </mat-hint>
- </mat-form-field>
-
- <!-- NSHMP config: model path -->
- <mat-form-field
- class="grid-col-12 tablet:grid-col-6 margin-bottom-1"
- >
- <mat-label>NSHM Path Inside Tarball</mat-label>
- <input
- matInput
- type="text"
- [formControl]="
- form.controls.nshmpConfig.controls.modelPath
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Folder icon">folder</mat-icon>
- </span>
- <mat-error>Must not contain spaces</mat-error>
- <mat-hint>Path inside tarball to model</mat-hint>
- </mat-form-field>
+ <mat-label>
+ nshmp-lib Branch, Tag, or Commit
+ @if (form.value.overrideNshmpLib) {
+ <span class="form-required"> * </span>
+ }
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="
+ form.controls.nshmpConfig.controls.nshmpLibSha
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <mat-error>
+ Must be a valid URL ending in <code>.git</code>
+ </mat-error>
+ <mat-hint>
+ The branch, tag, or commit of the nshmp-lib repository
+ </mat-hint>
+ </mat-form-field>
+ </div>
</div>
</div>
+ </div>
- <mat-divider />
-
- <!-- NSHMP config: site file -->
- <div class="settings-subsection padding-top-1">
- <mat-label class="settings-subsection--label"
- >Site File</mat-label
+ <mat-divider />
+
+ <div class="settings-subsection">
+ <mat-label class="settings-subsection--label">
+ National Seismic Hazard Model
+ </mat-label>
+ <div class="settings-subsection--section">
+ <!-- NSHMP config: model Git URL -->
+ <mat-form-field class="grid-col-12">
+ <mat-label>
+ National Seismic Hazard Model Git URL
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="
+ form.controls.nshmpConfig.controls.modelGitUrl
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Plot icon">show_chart</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for GitLab URL info"
+ href="https://docs.gitlab.com/ee/gitlab-basics/start-using-git.html#clone-with-https"
+ target="__blank"
+ >
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-hint>The Git URL to the NSHM repository</mat-hint>
+ <mat-error>
+ Must be a valid URL ending in <code>.git</code>
+ </mat-error>
+ </mat-form-field>
+
+ <!-- NSHMP config: model SHA -->
+ <mat-form-field class="grid-col-12 tablet:grid-col-6">
+ <mat-label>
+ Model Branch, Tag, or Commit
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="form.controls.nshmpConfig.controls.modelSha"
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Code icon">code</mat-icon>
+ </span>
+ <mat-error>Must not contain spaces</mat-error>
+ <mat-hint>
+ The branch, tag, or commit of the NSHM repository
+ </mat-hint>
+ </mat-form-field>
+
+ <!-- NSHMP config: model path -->
+ <mat-form-field
+ class="grid-col-12 tablet:grid-col-6 margin-bottom-1"
>
- <div class="settings-subsection--section">
- <div class="grid-col-12 padding-top-1">
- Upload CSV or GeoJSON
- <a
- href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Site-Specification.md"
- target="__blank"
- >
- Site File
- </a>
- <br />
- <input
- #uploadSiteFileEl
- class="padding-y-1"
- type="file"
- accept=".geojson,.csv"
- (change)="importSiteFile()"
- />
- </div>
+ <mat-label>NSHM Path Inside Tarball</mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="form.controls.nshmpConfig.controls.modelPath"
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Folder icon">folder</mat-icon>
+ </span>
+ <mat-error>Must not contain spaces</mat-error>
+ <mat-hint>Path inside tarball to model</mat-hint>
+ </mat-form-field>
+ </div>
+ </div>
- <mat-form-field class="grid-col-12 padding-top-2">
- <mat-label>
- URL to nshmp-haz Site File.
- <span class="form-required">*</span>
- </mat-label>
- <input
- matInput
- [formControl]="
- form.controls.nshmpConfig.controls.siteFileUrl
- "
- />
- <span matPrefix>
- <mat-icon aria-label="Note icon">note_add</mat-icon>
- </span>
- <a
- matSuffix
- mat-icon-button
- matTooltip="Click for site file info"
- href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Site-Specification.md"
- target="__blank"
- color="primary"
- >
- <mat-icon aria-label="Info icon">info</mat-icon>
- </a>
- <mat-error> Must be a valid URL </mat-error>
- <mat-hint
- >The URL to a GeoJSON or CSV file to run with</mat-hint
- >
- </mat-form-field>
+ <mat-divider />
+
+ <!-- NSHMP config: site file -->
+ <div class="settings-subsection padding-top-1">
+ <mat-label class="settings-subsection--label"
+ >Site File</mat-label
+ >
+ <div class="settings-subsection--section">
+ <div class="grid-col-12 padding-top-1">
+ Upload CSV or GeoJSON
+ <a
+ href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Site-Specification.md"
+ target="__blank"
+ >
+ Site File
+ </a>
+ <br />
+ <input
+ #uploadSiteFileEl
+ class="padding-y-1"
+ type="file"
+ accept=".geojson,.csv"
+ (change)="importSiteFile()"
+ />
</div>
+
+ <mat-form-field class="grid-col-12 padding-top-2">
+ <mat-label>
+ URL to nshmp-haz Site File.
+ <span class="form-required">*</span>
+ </mat-label>
+ <input
+ matInput
+ [formControl]="
+ form.controls.nshmpConfig.controls.siteFileUrl
+ "
+ />
+ <span matPrefix>
+ <mat-icon aria-label="Note icon">note_add</mat-icon>
+ </span>
+ <a
+ matSuffix
+ mat-icon-button
+ matTooltip="Click for site file info"
+ href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Site-Specification.md"
+ target="__blank"
+ >
+ <mat-icon aria-label="Info icon">info</mat-icon>
+ </a>
+ <mat-error> Must be a valid URL </mat-error>
+ <mat-hint
+ >The URL to a GeoJSON or CSV file to run with</mat-hint
+ >
+ </mat-form-field>
</div>
</div>
</div>
- </mat-expansion-panel>
-
- <!-- Map config -->
- <mat-expansion-panel expanded>
- <mat-expansion-panel-header>
- <mat-panel-title>GMT Map Configuration</mat-panel-title>
- </mat-expansion-panel-header>
-
- <mat-divider />
-
- <div class="settings-subsection">
- <div class="settings-subsection--section">
- <!-- Map config: Title -->
- <mat-form-field class="grid-col-12">
- <mat-label> Title (Optional)</mat-label>
- <input
- matInput
- type="text"
- [formControl]="form.controls.mapConfig.controls.title"
- />
- <mat-hint>First row of GMT hazard map title</mat-hint>
- </mat-form-field>
-
- <!-- Map config: Region -->
- <mat-form-field class="grid-col-12 margin-bottom-neg-1">
- <mat-label> Region (Optional)</mat-label>
- <mat-select
- [formControl]="form.controls.mapConfig.controls.region"
- >
- @for (keyValue of mapRegions; track keyValue) {
- <mat-option [value]="keyValue.value">
- {{ keyValue.key }}
- </mat-option>
- }
- </mat-select>
- <mat-hint>Region bounds, default is based on data</mat-hint>
- </mat-form-field>
- </div>
+ </div>
+ </mat-expansion-panel>
+
+ <!-- Map config -->
+ <mat-expansion-panel expanded>
+ <mat-expansion-panel-header>
+ <mat-panel-title>GMT Map Configuration</mat-panel-title>
+ </mat-expansion-panel-header>
+
+ <mat-divider />
+
+ <div class="settings-subsection">
+ <div class="settings-subsection--section">
+ <!-- Map config: Title -->
+ <mat-form-field class="grid-col-12">
+ <mat-label> Title (Optional)</mat-label>
+ <input
+ matInput
+ type="text"
+ [formControl]="form.controls.mapConfig.controls.title"
+ />
+ <mat-hint>First row of GMT hazard map title</mat-hint>
+ </mat-form-field>
+
+ <!-- Map config: Region -->
+ <mat-form-field class="grid-col-12 margin-bottom-neg-1">
+ <mat-label> Region (Optional)</mat-label>
+ <mat-select
+ [formControl]="form.controls.mapConfig.controls.region"
+ >
+ @for (keyValue of mapRegions; track keyValue) {
+ <mat-option [value]="keyValue.value">
+ {{ keyValue.key }}
+ </mat-option>
+ }
+ </mat-select>
+ <mat-hint>Region bounds, default is based on data</mat-hint>
+ </mat-form-field>
</div>
- </mat-expansion-panel>
-
- <!-- Calc Config section -->
- <mat-expansion-panel expanded>
- <mat-expansion-panel-header>
- <mat-panel-title>Calc Configuration</mat-panel-title>
- </mat-expansion-panel-header>
-
- <mat-divider />
-
- <div class="settings-subsection program-section">
- <div class="settings-subsection--section">
- <!-- Calc config: config file -->
- <div class="settings-subsection padding-top-1">
- <mat-label class="settings-subsection--label">
- Calculation Configuration File
- </mat-label>
-
- <div class="settings-subsection--section padding-top-1">
- <div class="grid-col-12">
- Upload nshmp-haz
- <a
- href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Calculation-Configuration.md"
- target="__blank"
- >
- Calculation Configuration File
- </a>
- <br />
- <input
- #calcConfigEl
- class="padding-y-1"
- type="file"
- accept=".json"
- (change)="importCalcConfigFile()"
- />
- </div>
+ </div>
+ </mat-expansion-panel>
+
+ <!-- Calc Config section -->
+ <mat-expansion-panel expanded>
+ <mat-expansion-panel-header>
+ <mat-panel-title>Calc Configuration</mat-panel-title>
+ </mat-expansion-panel-header>
+
+ <mat-divider />
+
+ <div class="settings-subsection program-section">
+ <div class="settings-subsection--section">
+ <!-- Calc config: config file -->
+ <div class="settings-subsection padding-top-1">
+ <mat-label class="settings-subsection--label">
+ Calculation Configuration File
+ </mat-label>
+
+ <div class="settings-subsection--section padding-top-1">
+ <div class="grid-col-12">
+ Upload nshmp-haz
+ <a
+ href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Calculation-Configuration.md"
+ target="__blank"
+ >
+ Calculation Configuration File
+ </a>
+ <br />
+ <input
+ #calcConfigEl
+ class="padding-y-1"
+ type="file"
+ accept=".json"
+ (change)="importCalcConfigFile()"
+ />
+ </div>
- <div class="grid-col-12 padding-y-2">
- <mat-expansion-panel
- [disabled]="calcConfig() === null"
- [expanded]="calcConfig() !== null"
- >
- <mat-expansion-panel-header>
- <mat-panel-title
- >Calculation Configuration</mat-panel-title
- >
- <mat-panel-description>
- Imported configuration
- </mat-panel-description>
- </mat-expansion-panel-header>
-
- @for (calcConfig of calcConfig(); track calcConfig) {
- <div>
- <pre class="code-block">
+ <div class="grid-col-12 padding-y-2">
+ <mat-expansion-panel
+ [disabled]="calcConfig() === null"
+ [expanded]="calcConfig() !== null"
+ >
+ <mat-expansion-panel-header>
+ <mat-panel-title
+ >Calculation Configuration</mat-panel-title
+ >
+ <mat-panel-description>
+ Imported configuration
+ </mat-panel-description>
+ </mat-expansion-panel-header>
+
+ @for (calcConfig of calcConfig(); track calcConfig) {
+ <div>
+ <pre class="code-block">
<code>
{{ calcConfigJson(calcConfig) }}
</code>
</pre>
- </div>
- }
- </mat-expansion-panel>
- </div>
+ </div>
+ }
+ </mat-expansion-panel>
</div>
</div>
</div>
</div>
- </mat-expansion-panel>
- </mat-accordion>
-
- <mat-divider />
-
- <!-- Buttons -->
- <div class="padding-y-2 grid-col-12">
- <button
- mat-raised-button
- color="primary"
- type="submit"
- [disabled]="form.invalid"
- >
- Submit Job
- </button>
- <button
- class="float-right"
- mat-raised-button
- color="warn"
- type="reset"
- (click)="service.resetForm()"
- [disabled]="form.pristine"
- >
- Reset
- </button>
- </div>
- </form>
- </nshmp-template-form-fields>
+ </div>
+ </mat-expansion-panel>
+ </mat-accordion>
+
+ <mat-divider />
+
+ <!-- Buttons -->
+ <div class="padding-y-2 grid-col-12">
+ <button
+ mat-raised-button
+ class="primary"
+ type="submit"
+ [disabled]="form.invalid"
+ >
+ Submit Job
+ </button>
+ <button
+ class="error float-right"
+ mat-raised-button
+ type="reset"
+ (click)="service.resetForm()"
+ [disabled]="form.pristine"
+ >
+ Reset
+ </button>
+ </div>
+ </form>
</div>
diff --git a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.ts b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.ts
index cb48cdafd..a52da6d57 100644
--- a/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.ts
+++ b/projects/nshmp-apps/src/app/internal/aws/submit-haz-jobs/components/form/form.component.ts
@@ -33,7 +33,6 @@ import {MatSelect} from '@angular/material/select';
import {MatSlideToggle} from '@angular/material/slide-toggle';
import {MatTab} from '@angular/material/tabs';
import {MatTooltip} from '@angular/material/tooltip';
-import {NshmpTemplateFormFieldsComponent} from '@ghsc/nshmp-template';
import {CalcConfig} from '@ghsc/nshmp-utils-ts/libs/aws/run-nshmp-haz';
import {Subscription} from 'rxjs';
import * as YAML from 'yaml';
@@ -69,7 +68,6 @@ import {JobSubmittedComponent} from '../job-submitted/job-submitted.component';
MatSlideToggle,
MatExpansionPanelDescription,
MatButton,
- NshmpTemplateFormFieldsComponent,
ReactiveFormsModule,
MatIcon,
],
diff --git a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
index a741a9566..3aa380b25 100644
--- a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
+++ b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.html
@@ -1,32 +1,30 @@
-<nshmp-template-form-fields>
- <div class="grid-container center-x form">
- <form
- class="grid-col-10 tablet:grid-col-8"
- [formGroup]="form"
- (submit)="service.callJobInfoService()"
- >
- <mat-label class="label">AWS nshmp-haz Job ID</mat-label>
+<div class="grid-container center-x form">
+ <form
+ class="grid-col-10 tablet:grid-col-8"
+ [formGroup]="form"
+ (submit)="service.callJobInfoService()"
+ >
+ <mat-label class="label">AWS nshmp-haz Job ID</mat-label>
- <mat-form-field class="grid-col-12">
- <mat-label>Job ID <span class="form-required">*</span></mat-label>
- <input matInput type="text" [formControl]="form.controls.id" />
- <div matSuffix matTooltip="The id of the running job to terminate">
- <mat-icon aria-label="Info icon">info</mat-icon>
- </div>
- <mat-hint>The id of the running job to terminate</mat-hint>
- </mat-form-field>
-
- <!-- Buttons -->
- <div class="padding-y-2 grid-col-12">
- <button
- mat-raised-button
- color="warn"
- type="submit"
- [disabled]="form.invalid"
- >
- Terminate Job
- </button>
+ <mat-form-field class="grid-col-12">
+ <mat-label>Job ID <span class="form-required">*</span></mat-label>
+ <input matInput type="text" [formControl]="form.controls.id" />
+ <div matSuffix matTooltip="The id of the running job to terminate">
+ <mat-icon aria-label="Info icon">info</mat-icon>
</div>
- </form>
- </div>
-</nshmp-template-form-fields>
+ <mat-hint>The id of the running job to terminate</mat-hint>
+ </mat-form-field>
+
+ <!-- Buttons -->
+ <div class="padding-y-2 grid-col-12">
+ <button
+ mat-raised-button
+ class="error"
+ type="submit"
+ [disabled]="form.invalid"
+ >
+ Terminate Job
+ </button>
+ </div>
+ </form>
+</div>
diff --git a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.ts b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.ts
index 38b8480ec..20faf9311 100644
--- a/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.ts
+++ b/projects/nshmp-apps/src/app/internal/aws/terminate-haz-jobs/components/content/content.component.ts
@@ -9,7 +9,6 @@ import {
import {MatIcon} from '@angular/material/icon';
import {MatInput} from '@angular/material/input';
import {MatTooltip} from '@angular/material/tooltip';
-import {NshmpTemplateFormFieldsComponent} from '@ghsc/nshmp-template';
import {AppService} from '../../services/app.service';
@@ -24,7 +23,6 @@ import {AppService} from '../../services/app.service';
MatSuffix,
MatTooltip,
MatHint,
- NshmpTemplateFormFieldsComponent,
ReactiveFormsModule,
MatIcon,
],
--
GitLab
From 843e70ad7cabffea40f85b4730514309ccd622a9 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 11:44:58 -0700
Subject: [PATCH 08/15] test
---
.npmrc | 1 +
1 file changed, 1 insertion(+)
diff --git a/.npmrc b/.npmrc
index fcdbb5524..c717fa022 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1 +1,2 @@
@ghsc:registry=https://code.usgs.gov/api/v4/packages/npm/
+//code.usgs.gov/api/v4/packages/npm/:_authToken=${CI_JOB_TOKEN}
--
GitLab
From ee0281efdf41a9b73766bfa3291412fcf29acb9f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 13:21:34 -0700
Subject: [PATCH 09/15] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 1a8f5b1c3..9afc5608b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.14.0",
- "@ghsc/nshmp-template": "^20.20.0",
+ "@ghsc/nshmp-lib-ng": "^20.15.0",
+ "@ghsc/nshmp-template": "^20.22.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "20.14.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.14.0.tgz",
- "integrity": "sha1-By2u9hHFFlKOeBmV1Xif1rE8KiY=",
+ "version": "20.15.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.15.0.tgz",
+ "integrity": "sha1-HrTbEE5/6K7nTJ8pdeUK4LEavQg=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4864,9 +4864,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.20.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.20.0.tgz",
- "integrity": "sha1-DXfjTcMArN7NU47Ywc02SjFccWw=",
+ "version": "20.22.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.22.0.tgz",
+ "integrity": "sha1-KTNJVZkCidY5kN5MmfHVWtbDc5A=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 0d67035c6..77f7538d3 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.14.0",
- "@ghsc/nshmp-template": "^20.20.0",
+ "@ghsc/nshmp-lib-ng": "^20.15.0",
+ "@ghsc/nshmp-template": "^20.22.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From 9fc009f0545945e883b95b2971cb1f99aba88b3d Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 13:29:38 -0700
Subject: [PATCH 10/15] udpate deps
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 9afc5608b..cf5ca9975 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.15.0",
+ "@ghsc/nshmp-lib-ng": "^20.16.0",
"@ghsc/nshmp-template": "^20.22.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "20.15.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.15.0.tgz",
- "integrity": "sha1-HrTbEE5/6K7nTJ8pdeUK4LEavQg=",
+ "version": "20.16.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.16.0.tgz",
+ "integrity": "sha1-QwbM0PJYE/10u84Sy4Yf1BuNtvA=",
"dependencies": {
"tslib": "^2.3.0"
},
diff --git a/package.json b/package.json
index 77f7538d3..4b5fdfb63 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.15.0",
+ "@ghsc/nshmp-lib-ng": "^20.16.0",
"@ghsc/nshmp-template": "^20.22.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
--
GitLab
From 119d83792d5d4bf8dd97e807cff2c11c79c9b3cc Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 14:04:59 -0700
Subject: [PATCH 11/15] update deps
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index cf5ca9975..ac6430ce9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.16.0",
+ "@ghsc/nshmp-lib-ng": "^20.17.0",
"@ghsc/nshmp-template": "^20.22.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "20.16.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.16.0.tgz",
- "integrity": "sha1-QwbM0PJYE/10u84Sy4Yf1BuNtvA=",
+ "version": "20.17.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.17.0.tgz",
+ "integrity": "sha1-NlhA8q/lX73M89KFtzaLkYph4AY=",
"dependencies": {
"tslib": "^2.3.0"
},
diff --git a/package.json b/package.json
index 4b5fdfb63..11dc2de0c 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.16.0",
+ "@ghsc/nshmp-lib-ng": "^20.17.0",
"@ghsc/nshmp-template": "^20.22.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
--
GitLab
From 4fafe54af172c5b76d94bd79bb0637c6f4d7c7a1 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 14:30:42 -0700
Subject: [PATCH 12/15] adjust label text
---
.../event-parameters/event-parameters.component.scss | 10 ++++++++++
.../control-panel/control-panel.component.scss | 11 +++++++++++
2 files changed, 21 insertions(+)
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/components/event-parameters/event-parameters.component.scss b/projects/nshmp-apps/src/app/gmm/magnitude/components/event-parameters/event-parameters.component.scss
index e69de29bb..22e988044 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/components/event-parameters/event-parameters.component.scss
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/components/event-parameters/event-parameters.component.scss
@@ -0,0 +1,10 @@
+@use '@angular/material' as mat;
+
+.mmin-input,
+.mmax-input {
+ @include mat.form-field-overrides(
+ (
+ outlined-label-text-populated-size: 15px,
+ )
+ );
+}
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.scss b/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.scss
index c11660db5..3f2d58fdd 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.scss
+++ b/projects/nshmp-apps/src/app/hazard/disagg/components/control-panel/control-panel.component.scss
@@ -1,3 +1,5 @@
+@use '@angular/material' as mat;
+
.disagg-target-selector {
mat-radio-group {
display: flex;
@@ -10,3 +12,12 @@
}
}
}
+
+.disagg-target-return-period,
+.disagg-target-iml {
+ @include mat.form-field-overrides(
+ (
+ outlined-label-text-populated-size: 13px,
+ )
+ );
+}
--
GitLab
From 53b03d4f61a46d316c0b73cb565c368c01bff4b3 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 14:30:53 -0700
Subject: [PATCH 13/15] update deps
---
package-lock.json | 8 ++++----
package.json | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index ac6430ce9..f6421362a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.17.0",
+ "@ghsc/nshmp-lib-ng": "^20.18.0",
"@ghsc/nshmp-template": "^20.22.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "20.17.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.17.0.tgz",
- "integrity": "sha1-NlhA8q/lX73M89KFtzaLkYph4AY=",
+ "version": "20.18.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.18.0.tgz",
+ "integrity": "sha1-8bm1JMsq4tt18KlcaCpQAxmNK4U=",
"dependencies": {
"tslib": "^2.3.0"
},
diff --git a/package.json b/package.json
index 11dc2de0c..fcb79f3b5 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.17.0",
+ "@ghsc/nshmp-lib-ng": "^20.18.0",
"@ghsc/nshmp-template": "^20.22.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
--
GitLab
From 0652f8a49af75185887a8e9125cd530d052ecaef Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 3 Feb 2025 17:01:22 -0700
Subject: [PATCH 14/15] update deps
---
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index f6421362a..5cc6dafc1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.18.0",
- "@ghsc/nshmp-template": "^20.22.0",
+ "@ghsc/nshmp-lib-ng": "^20.22.0",
+ "@ghsc/nshmp-template": "^20.24.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "20.18.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.18.0.tgz",
- "integrity": "sha1-8bm1JMsq4tt18KlcaCpQAxmNK4U=",
+ "version": "20.22.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.22.0.tgz",
+ "integrity": "sha1-XZ0okKeY9g1lPb5+7vZHGRPjm7E=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4864,9 +4864,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.22.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.22.0.tgz",
- "integrity": "sha1-KTNJVZkCidY5kN5MmfHVWtbDc5A=",
+ "version": "20.24.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.24.0.tgz",
+ "integrity": "sha1-gVOcnxdbroczsbJTED6nat1eweg=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index fcb79f3b5..5571923ee 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.18.0",
- "@ghsc/nshmp-template": "^20.22.0",
+ "@ghsc/nshmp-lib-ng": "^20.22.0",
+ "@ghsc/nshmp-template": "^20.24.0",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab
From ecffc32d26768ceb8196a7d8eb807864daf09015 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Tue, 4 Feb 2025 09:27:35 -0700
Subject: [PATCH 15/15] update deps
---
.npmrc | 1 -
package-lock.json | 16 ++++++++--------
package.json | 4 ++--
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/.npmrc b/.npmrc
index c717fa022..fcdbb5524 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,2 +1 @@
@ghsc:registry=https://code.usgs.gov/api/v4/packages/npm/
-//code.usgs.gov/api/v4/packages/npm/:_authToken=${CI_JOB_TOKEN}
diff --git a/package-lock.json b/package-lock.json
index 5cc6dafc1..03e00508c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,8 +21,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.22.0",
- "@ghsc/nshmp-template": "^20.24.0",
+ "@ghsc/nshmp-lib-ng": "^19.5.0",
+ "@ghsc/nshmp-template": "^19.4.1",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "20.22.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/12417/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-20.22.0.tgz",
- "integrity": "sha1-XZ0okKeY9g1lPb5+7vZHGRPjm7E=",
+ "version": "19.5.0",
+ "resolved": "https://code.usgs.gov/api/v4/projects/12416/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-19.5.0.tgz",
+ "integrity": "sha1-K2Qtr5ddaK3UE94WDinenzVyggc=",
"dependencies": {
"tslib": "^2.3.0"
},
@@ -4864,9 +4864,9 @@
}
},
"node_modules/@ghsc/nshmp-template": {
- "version": "20.24.0",
- "resolved": "https://code.usgs.gov/api/v4/projects/2650/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-20.24.0.tgz",
- "integrity": "sha1-gVOcnxdbroczsbJTED6nat1eweg=",
+ "version": "19.4.1",
+ "resolved": "https://code.usgs.gov/api/v4/projects/1416/packages/npm/@ghsc/nshmp-template/-/@ghsc/nshmp-template-19.4.1.tgz",
+ "integrity": "sha1-RMZHQ3AxjUKNLdAYAlXEpInVSUU=",
"dependencies": {
"tslib": "^2.3.1"
},
diff --git a/package.json b/package.json
index 5571923ee..514b40bf5 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
"@bluehalo/ngx-leaflet": "^19.0.0",
"@compodoc/compodoc": "^1.1.26",
"@ghsc/disagg-d3": "^0.13.0",
- "@ghsc/nshmp-lib-ng": "^20.22.0",
- "@ghsc/nshmp-template": "^20.24.0",
+ "@ghsc/nshmp-lib-ng": "^19.5.0",
+ "@ghsc/nshmp-template": "^19.4.1",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
"d3": "^7.9.0",
--
GitLab