From e6f29038d18bbb21ea0002082b12de7433f1a9e0 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 11:10:32 -0700
Subject: [PATCH 1/5] 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 a00b9759c..450cdf9e1 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": "^19.2.4",
+ "@ghsc/nshmp-lib-ng": "^19.4.0",
"@ghsc/nshmp-template": "^19.3.1",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
@@ -4852,9 +4852,9 @@
}
},
"node_modules/@ghsc/nshmp-lib-ng": {
- "version": "19.2.4",
- "resolved": "https://code.usgs.gov/api/v4/projects/12416/packages/npm/@ghsc/nshmp-lib-ng/-/@ghsc/nshmp-lib-ng-19.2.4.tgz",
- "integrity": "sha1-N4Jt4u0it1h6Cr9lRov8ZRjz9YA=",
+ "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=",
"dependencies": {
"tslib": "^2.3.0"
},
diff --git a/package.json b/package.json
index 4005b06e0..167551998 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": "^19.2.4",
+ "@ghsc/nshmp-lib-ng": "^19.4.0",
"@ghsc/nshmp-template": "^19.3.1",
"@ghsc/nshmp-utils-ts": "^3.12.1",
"angular-plotly.js": "^6.0.0",
--
GitLab
From 86bcbc93fc9adbca9acb593665b9201bb1531a37 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 11:10:40 -0700
Subject: [PATCH 2/5] clean
---
.../hanging-wall-effects/components/plots/plots.component.html | 1 -
1 file changed, 1 deletion(-)
diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plots/plots.component.html b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plots/plots.component.html
index ac634aeb3..0aba014de 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plots/plots.component.html
+++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/components/plots/plots.component.html
@@ -13,7 +13,6 @@
<nshmp-lib-ng-plot [plot]="groundMotionPlotData()" />
}
- <div>asdasda</div>
<mat-divider />
<!-- Fault plot and controls-->
--
GitLab
From 88353882b5865e27908a839386007be89cc9c93f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 11:11:12 -0700
Subject: [PATCH 3/5] use spinner ref
---
.../dynamic-compare/guards/dynamic-hazard-compare.guard.ts | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/guards/dynamic-hazard-compare.guard.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/guards/dynamic-hazard-compare.guard.ts
index 20def652d..586f8b5e5 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/guards/dynamic-hazard-compare.guard.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/guards/dynamic-hazard-compare.guard.ts
@@ -37,12 +37,13 @@ export class DynamicHazardCompareGuard {
| Promise<boolean | UrlTree>
| boolean
| UrlTree {
- this.spinnerService.remove();
- this.spinnerService.show('Checking for comparable models');
+ const spinnerRef = this.spinnerService.show(
+ 'Checking for comparable models',
+ );
return this.hasComparableModels$.pipe(
map(hasComparableModels => {
- this.spinnerService.remove();
+ spinnerRef.close();
if (!hasComparableModels) {
this.nshmpService.throwError$(new Error(this.errorMessage));
--
GitLab
From e7ac20f0336f296be44e50bf80dacce151f7e277 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 11:11:22 -0700
Subject: [PATCH 4/5] add warning
---
.../dev/hazard/dynamic-compare/services/app.service.ts | 9 +++++++--
.../src/app/hazard/disagg/services/app.service.ts | 7 ++++++-
.../src/app/hazard/dynamic/services/app.service.ts | 7 ++++++-
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/app.service.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/app.service.ts
index 732995e81..60d54fb65 100644
--- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/app.service.ts
+++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/services/app.service.ts
@@ -185,7 +185,12 @@ export class AppService
* Call the hazard service.
*/
callService(): void {
- this.spinnerService.show(SpinnerService.MESSAGE_SERVICE);
+ const spinnerRef = this.spinnerService.show(
+ `${SpinnerService.MESSAGE_SERVICE}
+ <br>
+ (Could take 30+ seconds)
+ `,
+ );
const form = this.formGroup.getRawValue();
const modelUrl = this.serviceCallUrl(
@@ -235,7 +240,7 @@ export class AppService
this.updateState({serviceCallInfo, serviceResponses});
this.createPlots();
- this.spinnerService.remove();
+ spinnerRef.close();
});
}
diff --git a/projects/nshmp-apps/src/app/hazard/disagg/services/app.service.ts b/projects/nshmp-apps/src/app/hazard/disagg/services/app.service.ts
index 2d00f65c7..f3be163cb 100644
--- a/projects/nshmp-apps/src/app/hazard/disagg/services/app.service.ts
+++ b/projects/nshmp-apps/src/app/hazard/disagg/services/app.service.ts
@@ -205,7 +205,12 @@ export class AppService
}
callService(): void {
- const spinnerRef = this.spinnerService.show(SpinnerService.MESSAGE_SERVICE);
+ const spinnerRef = this.spinnerService.show(
+ `${SpinnerService.MESSAGE_SERVICE}
+ <br>
+ (Could take 30+ seconds)
+ `,
+ );
const values = this.formGroup.getRawValue();
const service = this.nshmService();
diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/services/app.service.ts b/projects/nshmp-apps/src/app/hazard/dynamic/services/app.service.ts
index b09473bb0..26ad64eb8 100644
--- a/projects/nshmp-apps/src/app/hazard/dynamic/services/app.service.ts
+++ b/projects/nshmp-apps/src/app/hazard/dynamic/services/app.service.ts
@@ -199,7 +199,12 @@ export class AppService
* Call the hazard service.
*/
callService(): void {
- const spinnerRef = this.spinnerService.show(SpinnerService.MESSAGE_SERVICE);
+ const spinnerRef = this.spinnerService.show(
+ `${SpinnerService.MESSAGE_SERVICE}
+ <br>
+ (Could take 30+ seconds)
+ `,
+ );
const values = this.formGroup.getRawValue();
const service = this.state().nshmServices.find(
--
GitLab
From 443f9f9349af9188e1e883604705cf2130557650 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 24 Jan 2025 11:11:29 -0700
Subject: [PATCH 5/5] add style
---
projects/nshmp-apps/src/styles/styles.scss | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/projects/nshmp-apps/src/styles/styles.scss b/projects/nshmp-apps/src/styles/styles.scss
index b1c04f069..f638fad9c 100644
--- a/projects/nshmp-apps/src/styles/styles.scss
+++ b/projects/nshmp-apps/src/styles/styles.scss
@@ -52,6 +52,10 @@ a {
}
}
+.nshmp-plotly-plot {
+ height: unset !important;
+}
+
body.dark-mode {
mat-tab-group mat-tab-header {
--mdc-tab-indicator-focus-indicator-color: white;
--
GitLab