diff --git a/package-lock.json b/package-lock.json
index a00b9759cc8fa38d083570ada0f2c1e10816f4be..450cdf9e1f790d22ccfb8a239dee3badd7307ba4 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 4005b06e0fa951b933480414e5965b08db8a27d8..167551998d8fd78f2f71223044c4e975791c1f17 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",
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 ac634aeb3aec1eca084872d2118d18333022e1bd..0aba014de97b7abdad0ab82ba2f1464f00840b0d 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-->
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 20def652d177c30fec9b8b7eebdb039386283954..586f8b5e5b34feb378f76a3b4f8313843a6a7859 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));
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 732995e819b8a7ccf123369a03c49278b31f4e39..60d54fb65b3fa206e886e9d9416b426d9ec4942a 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 2d00f65c7946d01be385fdc372b8075064bd6cd3..f3be163cb6f009d0026206f9cf4bc76693f55691 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 b09473bb0a84a316a9b7b9e067dd49b22bae80ed..26ad64eb8629321a7c7658aa07f2ad915991e87d 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(
diff --git a/projects/nshmp-apps/src/styles/styles.scss b/projects/nshmp-apps/src/styles/styles.scss
index b1c04f069c882432a964388f34a24d47bb82ab95..f638fad9cd5b65f4d285d661edd8a78bd665041b 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;