From 75c57977cf67a66dc548ed40e321df515759ed3d Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Mon, 17 Jun 2024 10:38:16 -0600 Subject: [PATCH] change to new import --- .../src/app/dev/aws/check-haz-jobs/state/app.effects.ts | 3 ++- .../src/app/dev/aws/haz-job-history/state/app.effect.ts | 3 ++- .../src/app/dev/aws/submit-haz-jobs/state/app.effects.ts | 3 ++- .../src/app/dev/aws/terminate-haz-jobs/state/app.effect.ts | 3 ++- .../src/app/dev/gmm/hanging-wall-effects/state/app.effects.ts | 3 ++- .../src/app/dev/hazard/dynamic-compare/state/app.effects.ts | 3 ++- .../src/app/dev/math/exceedance-explorer/state/app.effects.ts | 3 ++- projects/nshmp-apps/src/app/gmm/distance/state/app.effects.ts | 3 ++- projects/nshmp-apps/src/app/gmm/magnitude/state/app.effects.ts | 3 ++- projects/nshmp-apps/src/app/gmm/spectra/state/app.effects.ts | 3 ++- projects/nshmp-apps/src/app/hazard/disagg/state/app.effects.ts | 3 ++- .../nshmp-apps/src/app/hazard/dynamic/state/app.effects.ts | 3 ++- projects/nshmp-apps/src/app/hazard/static/state/app.effects.ts | 3 ++- projects/nshmp-apps/src/app/source/mfd/state/app.effects.ts | 3 ++- .../nshmp-apps/src/app/source/model-maps/state/app.effects.ts | 3 ++- 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.effects.ts b/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.effects.ts index 994337dfb..ecd00c162 100644 --- a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.effects.ts @@ -3,7 +3,8 @@ import {ActivatedRoute, Router} from '@angular/router'; import {AwsService, JobStatus} from '@ghsc/nshmp-lib-ng/aws'; import {NshmpService, SpinnerService} from '@ghsc/nshmp-lib-ng/nshmp'; import {Response} from '@ghsc/nshmp-utils-ts/libs/nshmp-ws-utils'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {MarkAsDirtyAction, SetValueAction} from 'ngrx-forms'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.effect.ts b/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.effect.ts index f14a4584b..a8293aebc 100644 --- a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.effect.ts +++ b/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.effect.ts @@ -3,7 +3,8 @@ import {ActivatedRoute, Router} from '@angular/router'; import {AwsService} from '@ghsc/nshmp-lib-ng/aws'; import {NshmpService} from '@ghsc/nshmp-lib-ng/nshmp'; import {DynamoDBItem} from '@ghsc/nshmp-utils-ts/libs/aws/run-nshmp-haz'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {MarkAsDirtyAction, SetValueAction} from 'ngrx-forms'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; diff --git a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/state/app.effects.ts b/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/state/app.effects.ts index 5b2bcecd8..8737bef22 100644 --- a/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/dev/aws/submit-haz-jobs/state/app.effects.ts @@ -6,7 +6,8 @@ import { RunNshmpHazResponseData, } from '@ghsc/nshmp-utils-ts/libs/aws/run-nshmp-haz'; import {Response} from '@ghsc/nshmp-utils-ts/libs/nshmp-ws-utils'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {select, Store} from '@ngrx/store'; import {MarkAsDirtyAction, SetValueAction} from 'ngrx-forms'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.effect.ts b/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.effect.ts index 880dfdfe0..374e5e1fa 100644 --- a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.effect.ts +++ b/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.effect.ts @@ -2,7 +2,8 @@ import {Injectable} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; import {AwsService, IdForm} from '@ghsc/nshmp-lib-ng/aws'; import {NshmpService} from '@ghsc/nshmp-lib-ng/nshmp'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {MarkAsDirtyAction, SetValueAction} from 'ngrx-forms'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; diff --git a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/state/app.effects.ts b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/state/app.effects.ts index 95e82330d..9b5aaca77 100644 --- a/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/dev/gmm/hanging-wall-effects/state/app.effects.ts @@ -9,7 +9,8 @@ import { GmmDistanceResponse, GmmDistanceUsage, } from '@ghsc/nshmp-utils-ts/libs/nshmp-ws/gmm-services'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; import {catchError, exhaustMap, map, mergeMap} from 'rxjs/operators'; diff --git a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/state/app.effects.ts b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/state/app.effects.ts index c2d58eb5d..8f4c7f8f6 100644 --- a/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/dev/hazard/dynamic-compare/state/app.effects.ts @@ -19,7 +19,8 @@ import {NshmMetadata} from '@ghsc/nshmp-utils-ts/libs/nshmp-haz/www/nshm-service import {Imt, NehrpSiteClass} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/gmm'; import {sourceTypeFromPascalCase} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/model'; import {NshmId} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/nshm'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {MarkAsDirtyAction, SetValueAction} from 'ngrx-forms'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; diff --git a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/state/app.effects.ts b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/state/app.effects.ts index a949412e4..8628ba989 100644 --- a/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/dev/math/exceedance-explorer/state/app.effects.ts @@ -1,6 +1,7 @@ import {Injectable} from '@angular/core'; import {NshmpService} from '@ghsc/nshmp-lib-ng/nshmp'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {catchError, map} from 'rxjs/operators'; diff --git a/projects/nshmp-apps/src/app/gmm/distance/state/app.effects.ts b/projects/nshmp-apps/src/app/gmm/distance/state/app.effects.ts index 1a432ebca..8a5dfef38 100644 --- a/projects/nshmp-apps/src/app/gmm/distance/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/gmm/distance/state/app.effects.ts @@ -6,7 +6,8 @@ import { GmmDistanceResponse, GmmDistanceUsage, } from '@ghsc/nshmp-utils-ts/libs/nshmp-ws/gmm-services'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; import {catchError, exhaustMap, map, mergeMap} from 'rxjs/operators'; diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/state/app.effects.ts b/projects/nshmp-apps/src/app/gmm/magnitude/state/app.effects.ts index 50e6bce27..a45bc5824 100644 --- a/projects/nshmp-apps/src/app/gmm/magnitude/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/gmm/magnitude/state/app.effects.ts @@ -6,7 +6,8 @@ import { GmmMagnitudeResponse, GmmMagnitudeUsage, } from '@ghsc/nshmp-utils-ts/libs/nshmp-ws/gmm-services'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; import {catchError, exhaustMap, map, mergeMap} from 'rxjs/operators'; diff --git a/projects/nshmp-apps/src/app/gmm/spectra/state/app.effects.ts b/projects/nshmp-apps/src/app/gmm/spectra/state/app.effects.ts index 2fe9f1ec6..c1b0809e7 100644 --- a/projects/nshmp-apps/src/app/gmm/spectra/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/gmm/spectra/state/app.effects.ts @@ -6,7 +6,8 @@ import { GmmSpectraResponse, GmmSpectraUsage, } from '@ghsc/nshmp-utils-ts/libs/nshmp-ws/gmm-services'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; import {catchError, exhaustMap, map, mergeMap} from 'rxjs/operators'; diff --git a/projects/nshmp-apps/src/app/hazard/disagg/state/app.effects.ts b/projects/nshmp-apps/src/app/hazard/disagg/state/app.effects.ts index 03ea80fd2..c6f8e4a68 100644 --- a/projects/nshmp-apps/src/app/hazard/disagg/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/hazard/disagg/state/app.effects.ts @@ -11,7 +11,8 @@ import { DisaggResponse, } from '@ghsc/nshmp-utils-ts/libs/nshmp-haz/www/disagg-service'; import {NshmId} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/nshm'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {MarkAsDirtyAction, SetValueAction} from 'ngrx-forms'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; diff --git a/projects/nshmp-apps/src/app/hazard/dynamic/state/app.effects.ts b/projects/nshmp-apps/src/app/hazard/dynamic/state/app.effects.ts index a7c26315a..5f3bcf106 100644 --- a/projects/nshmp-apps/src/app/hazard/dynamic/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/hazard/dynamic/state/app.effects.ts @@ -12,7 +12,8 @@ import { HazardRequestMetadata, } from '@ghsc/nshmp-utils-ts/libs/nshmp-haz/www/hazard-service'; import {NshmId} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/nshm'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {MarkAsDirtyAction, SetValueAction} from 'ngrx-forms'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; diff --git a/projects/nshmp-apps/src/app/hazard/static/state/app.effects.ts b/projects/nshmp-apps/src/app/hazard/static/state/app.effects.ts index b8a59ea62..1216451ab 100644 --- a/projects/nshmp-apps/src/app/hazard/static/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/hazard/static/state/app.effects.ts @@ -10,7 +10,8 @@ import {NshmpService, SpinnerService} from '@ghsc/nshmp-lib-ng/nshmp'; import {plotUtils} from '@ghsc/nshmp-lib-ng/plot'; import {NshmId} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/nshm'; import {StaticHazardResponse} from '@ghsc/nshmp-utils-ts/libs/nshmp-ws-static/hazard-service'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import {MarkAsDirtyAction, SetValueAction} from 'ngrx-forms'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; diff --git a/projects/nshmp-apps/src/app/source/mfd/state/app.effects.ts b/projects/nshmp-apps/src/app/source/mfd/state/app.effects.ts index 1159400c9..fa24b9497 100644 --- a/projects/nshmp-apps/src/app/source/mfd/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/source/mfd/state/app.effects.ts @@ -12,7 +12,8 @@ import { TectonicSettings, } from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/model'; import {NshmId} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/nshm'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import deepEqual from 'fast-deep-equal'; import {box, MarkAsDirtyAction, SetValueAction, unbox} from 'ngrx-forms'; diff --git a/projects/nshmp-apps/src/app/source/model-maps/state/app.effects.ts b/projects/nshmp-apps/src/app/source/model-maps/state/app.effects.ts index 751bb3427..d59624338 100644 --- a/projects/nshmp-apps/src/app/source/model-maps/state/app.effects.ts +++ b/projects/nshmp-apps/src/app/source/model-maps/state/app.effects.ts @@ -15,7 +15,8 @@ import { import {SourceLogicTreesMetadata} from '@ghsc/nshmp-utils-ts/libs/nshmp-haz/www/source-logic-trees-service'; import {Imt} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/gmm'; import {NshmId, nshmRegion} from '@ghsc/nshmp-utils-ts/libs/nshmp-lib/nshm'; -import {Actions, concatLatestFrom, createEffect, ofType} from '@ngrx/effects'; +import {Actions, createEffect, ofType} from '@ngrx/effects'; +import {concatLatestFrom} from '@ngrx/operators'; import {Store} from '@ngrx/store'; import * as L from 'leaflet'; import {environment} from 'projects/nshmp-apps/src/environments/environment'; -- GitLab