diff --git a/src/app/dars/store/actions.ts b/src/app/dars/store/actions.ts index 39496625b1739996941483cc87411abcee7788a4..83aba03482191d54a1dcf9f9a8158786971f6c1b 100644 --- a/src/app/dars/store/actions.ts +++ b/src/app/dars/store/actions.ts @@ -7,11 +7,14 @@ export enum DarsActionTypes { ErrorLoadingMetadata = '[DARS] Error Loading Metadata', StartLoadingMetadata = '[DARS] Start Loading Metadata', DoneLoadingMetadata = '[DARS] Done Loading Metadata', - ErrorLoadingAudit = '[DARS] Error Loading Audit', AddAuditMetadata = '[DARS] Add Audit Metadata', + + ErrorLoadingAudit = '[DARS] Error Loading Audit', StartLoadingAudit = '[DARS] Start Loading Audit', DoneLoadingAudit = '[DARS] Done Loading Audit', CloseAudit = '[DARS] Close Audit', + + PopulateDarsState = '[DARS] Done Loading state', } export class ErrorLoadingMetadata implements Action { @@ -43,6 +46,11 @@ export class AddAuditMetadata implements Action { ) {} } +export class PopulateDarsState implements Action { + public readonly type = DarsActionTypes.PopulateDarsState; + constructor(public payload: Partial<DARSState>) {} +} + export class StartLoadingAudit implements Action { public readonly type = DarsActionTypes.StartLoadingAudit; constructor(public payload: AuditMetadata) {} diff --git a/src/app/dars/store/effects.ts b/src/app/dars/store/effects.ts index b66617023880d760f1cce72711e634a4fd2cc71c..6e1940735f5440b3423f46a7152d9a6c2f954f7b 100644 --- a/src/app/dars/store/effects.ts +++ b/src/app/dars/store/effects.ts @@ -67,9 +67,13 @@ export class DARSEffects { } }); - return new darsActions.AddAuditMetadata({ - programMetadata, - whatIfMetadata, + return new darsActions.PopulateDarsState({ + metadata: { + status: 'Loaded', + programMetadata, + whatIfMetadata, + }, + alerts, }); }), diff --git a/src/app/dars/store/reducer.ts b/src/app/dars/store/reducer.ts index 735159cc076c5d670a87c1049f8b08a93010f67d..57cdf97de556058be825bf2b444f14c03e628e00 100644 --- a/src/app/dars/store/reducer.ts +++ b/src/app/dars/store/reducer.ts @@ -1,10 +1,11 @@ import { DARSState, INITIAL_DARS_STATE } from '@app/dars/store/state'; -import { DarsActionTypes } from './actions'; +import { DarsActionTypes, AddAuditMetadata } from './actions'; import * as darsActions from './actions'; type SupportedActions = | darsActions.ErrorLoadingMetadata | darsActions.AddAuditMetadata + | darsActions.PopulateDarsState | darsActions.StartLoadingAudit | darsActions.DoneLoadingAudit | darsActions.CloseAudit; @@ -14,6 +15,9 @@ export function darsReducer( action: SupportedActions, ): DARSState { switch (action.type) { + case DarsActionTypes.PopulateDarsState: { + return { ...state, ...action.payload }; + } case DarsActionTypes.ErrorLoadingMetadata: { return { ...state,