From 6b40c6ea1246c47fec804c8a25693e8bcb05409e Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 18 Jul 2024 10:55:45 -0600
Subject: [PATCH] use shared state
---
.../app/dev/aws/check-haz-jobs/state/app.state.ts | 13 ++-----------
.../app/dev/aws/haz-job-history/state/app.state.ts | 6 ++----
.../dev/aws/terminate-haz-jobs/state/app.state.ts | 2 +-
3 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.state.ts b/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.state.ts
index b97a34207..cc642375a 100644
--- a/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.state.ts
+++ b/projects/nshmp-apps/src/app/dev/aws/check-haz-jobs/state/app.state.ts
@@ -1,8 +1,6 @@
-import {JobHistoryRequestData} from '@ghsc/nshmp-lib-ng/aws';
-import {TerminateJobRequestData} from '@ghsc/nshmp-lib-no-ngrx/aws';
import {DynamoDBItem} from '@ghsc/nshmp-utils-ts/libs/aws/run-nshmp-haz';
import {Response} from '@ghsc/nshmp-utils-ts/libs/nshmp-ws-utils';
-import {EC2} from 'aws-sdk';
+import {TerminateJobState} from 'projects/nshmp-apps/src/shared/state/aws';
import {
GetLogsRequestData,
@@ -12,18 +10,11 @@ import {
/**
* Application NGRX state.
*/
-export interface AppState {
- /** Job history response */
- jobHistoryResponse: Response<JobHistoryRequestData, DynamoDBItem>;
+export interface AppState extends TerminateJobState<DynamoDBItem> {
/** Whether log service is loading */
serviceLoading: boolean;
/** Log service response. */
serviceResponse: Response<GetLogsRequestData, GetLogsResponseData>;
- /** Terminate job response */
- terminateJobResponse: Response<
- TerminateJobRequestData,
- EC2.InstanceStateChangeList
- >;
}
/**
diff --git a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.state.ts b/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.state.ts
index 7f68452ba..d6897b391 100644
--- a/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.state.ts
+++ b/projects/nshmp-apps/src/app/dev/aws/haz-job-history/state/app.state.ts
@@ -1,7 +1,6 @@
import {nshmpUtils} from '@ghsc/nshmp-lib-ng/nshmp';
-import {JobHistoryRequestData} from '@ghsc/nshmp-lib-no-ngrx/aws';
import {DynamoDBItem} from '@ghsc/nshmp-utils-ts/libs/aws/run-nshmp-haz';
-import {Response} from '@ghsc/nshmp-utils-ts/libs/nshmp-ws-utils';
+import {JobHistoryState} from 'projects/nshmp-apps/src/shared/state/aws';
import {ControlForm} from '../models/control-form.model';
@@ -14,9 +13,8 @@ export const DEFAULT_FORM_VALUES: ControlForm = {
/**
* Application state
*/
-export interface AppState {
+export interface AppState extends JobHistoryState<DynamoDBItem[]> {
filteredHistory: DynamoDBItem[];
- jobHistoryResponse: Response<JobHistoryRequestData, DynamoDBItem[]>;
}
/**
diff --git a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.state.ts b/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.state.ts
index c2565910f..73a541f0a 100644
--- a/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.state.ts
+++ b/projects/nshmp-apps/src/app/dev/aws/terminate-haz-jobs/state/app.state.ts
@@ -2,7 +2,7 @@ import {DynamoDBItem} from '@ghsc/nshmp-utils-ts/libs/aws/run-nshmp-haz';
import {TerminateJobState} from 'projects/nshmp-apps/src/shared/state/aws';
/**
- * Application NGRX state.
+ * Application state.
*/
export type AppState = TerminateJobState<DynamoDBItem>;
--
GitLab