From 2027d7542f9a38d83883ede48042a8c7a5b81e49 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 18 Jul 2024 16:08:19 -0600
Subject: [PATCH] use utils
---
.../gmm/hanging-wall-effects/state/app.facade.ts | 13 +++++++------
.../math/exceedance-explorer/state/app.facade.ts | 10 ++++------
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/state/app.facade.ts b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/state/app.facade.ts
index af9bb86db..2b8c7eb6a 100644
--- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/state/app.facade.ts
+++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/state/app.facade.ts
@@ -13,6 +13,10 @@ import {
GmmDistanceUsage,
} from '@ghsc/nshmp-utils-ts/libs/nshmp-ws/gmm-services';
import {environment} from 'projects/nshmp-apps/src/environments/environment';
+import {
+ redrawPlots,
+ resetPlotSettings,
+} from 'projects/nshmp-apps/src/shared/utils/facade.utils';
import {catchError} from 'rxjs';
import {createPlots} from '../utils/response-handler.utils';
@@ -24,7 +28,6 @@ import {
initialState,
usageFormValues,
} from './app.state';
-import {redrawPlots} from 'projects/nshmp-apps/src/shared/utils/facade.utils';
@Injectable({providedIn: 'root'})
export class AppFacade {
@@ -130,11 +133,9 @@ export class AppFacade {
* Reset the plot settings.
*/
resetPlotSettings(): void {
- this.state().plots.forEach((plot, id) => {
- const defaultSettings = defaultPlots().get(id).settingsForm;
- plot.settingsForm.markAsPristine();
- plot.settingsForm.markAsUntouched();
- plot.settingsForm.patchValue(defaultSettings.getRawValue());
+ resetPlotSettings({
+ currentPlots: this.state().plots,
+ defaultPlots: defaultPlots(),
});
}
diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/state/app.facade.ts b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/state/app.facade.ts
index 6c8fb6f5f..7c9c6f5bb 100644
--- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/state/app.facade.ts
+++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/state/app.facade.ts
@@ -1,6 +1,7 @@
import {computed, Injectable, Signal, signal} from '@angular/core';
import {FormBuilder} from '@angular/forms';
import {NshmpPlot} from '@ghsc/nshmp-lib-no-ngrx/plot';
+import {resetPlotSettings} from 'projects/nshmp-apps/src/shared/utils/facade.utils';
import {ControlForm} from '../models/control-form.model';
import {Plots} from '../models/plots.model';
@@ -57,12 +58,9 @@ export class ExceedanceExplorerFacade {
* Reset the plot settings.
*/
resetSettings(): void {
- this.state().plots.forEach((plot, id) => {
- const defaultSettings =
- exceedanceExplorerDefaultPlots().get(id).settingsForm;
- plot.settingsForm.markAsUntouched();
- plot.settingsForm.markAsPristine();
- plot.settingsForm.patchValue(defaultSettings.getRawValue());
+ resetPlotSettings({
+ currentPlots: this.state().plots,
+ defaultPlots: exceedanceExplorerDefaultPlots(),
});
}
--
GitLab