From dc08afacf4249888b7cd98f7c9d340b46b0b4909 Mon Sep 17 00:00:00 2001 From: griest024 Date: Mon, 13 May 2024 23:57:58 -0400 Subject: [PATCH] feat(core): set state to error for operation failure (#2796) --- .../state/src/reducers/auth/auth.reducer.spec.ts | 12 ++++++------ .../auth/state/src/reducers/auth/auth.reducer.ts | 8 +++++++- .../src/reducers/reset-password/reducer.spec.ts | 8 ++++---- .../src/reducers/store-credit/reducer.spec.ts | 8 ++++---- .../reducers/category/category.reducer.spec.ts | 4 ++-- libs/core/state/src/operation/adapter.spec.ts | 4 ++-- libs/core/state/src/operation/adapter.ts | 2 +- .../state/src/reducers/payment/reducer.spec.ts | 12 ++++++------ .../src/reducers/store-credit/reducer.spec.ts | 4 ++-- .../state/src/reducers/address/reducer.spec.ts | 8 ++++---- .../state/src/reducers/customer/reducer.spec.ts | 16 ++++++++-------- .../src/reducers/order/order.reducer.spec.ts | 8 ++++---- .../src/reducers/product/product.reducer.spec.ts | 4 ++-- 13 files changed, 52 insertions(+), 46 deletions(-) diff --git a/libs/auth/state/src/reducers/auth/auth.reducer.spec.ts b/libs/auth/state/src/reducers/auth/auth.reducer.spec.ts index 43ab5621f1..e1aa596397 100644 --- a/libs/auth/state/src/reducers/auth/auth.reducer.spec.ts +++ b/libs/auth/state/src/reducers/auth/auth.reducer.spec.ts @@ -133,8 +133,8 @@ describe('@daffodil/auth/state | daffAuthReducer', () => { result = reducer(state, authCheckFailure); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); it('adds an error to state.daffErrors', () => { @@ -199,8 +199,8 @@ describe('@daffodil/auth/state | daffAuthReducer', () => { result = reducer(state, authServerSide); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); it('adds an error to state.daffErrors', () => { @@ -228,8 +228,8 @@ describe('@daffodil/auth/state | daffAuthReducer', () => { result = reducer(state, authStorageFailure); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); it('adds an error to state.daffErrors', () => { diff --git a/libs/auth/state/src/reducers/auth/auth.reducer.ts b/libs/auth/state/src/reducers/auth/auth.reducer.ts index 68d6a6d087..a694a38d31 100644 --- a/libs/auth/state/src/reducers/auth/auth.reducer.ts +++ b/libs/auth/state/src/reducers/auth/auth.reducer.ts @@ -32,12 +32,18 @@ export function daffAuthReducer( }; case DaffAuthActionTypes.AuthCheckFailureAction: - case DaffAuthActionTypes.AuthGuardLogoutAction: return { ...daffOperationFailed([action.errorMessage], state), loggedIn: false, }; + case DaffAuthActionTypes.AuthGuardLogoutAction: + return { + ...daffCompleteOperation(state), + daffErrors: [action.errorMessage], + loggedIn: false, + }; + case DaffAuthActionTypes.AuthServerSideAction: case DaffAuthActionTypes.AuthStorageFailureAction: return daffOperationFailed([action.errorMessage], state); diff --git a/libs/auth/state/src/reducers/reset-password/reducer.spec.ts b/libs/auth/state/src/reducers/reset-password/reducer.spec.ts index 85ea58f056..a81daff69c 100644 --- a/libs/auth/state/src/reducers/reset-password/reducer.spec.ts +++ b/libs/auth/state/src/reducers/reset-password/reducer.spec.ts @@ -93,8 +93,8 @@ describe('@daffodil/auth/state | daffAuthResetPasswordReducer', () => { result = reducer(state, authResetPasswordFailure); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); it('adds an error to state.daffErrors', () => { @@ -146,8 +146,8 @@ describe('@daffodil/auth/state | daffAuthResetPasswordReducer', () => { result = reducer(state, authSendResetEmailFailure); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); it('adds an error to state.daffErrors', () => { diff --git a/libs/cart-store-credit/state/src/reducers/store-credit/reducer.spec.ts b/libs/cart-store-credit/state/src/reducers/store-credit/reducer.spec.ts index af5e6c81cd..cb5ade988a 100644 --- a/libs/cart-store-credit/state/src/reducers/store-credit/reducer.spec.ts +++ b/libs/cart-store-credit/state/src/reducers/store-credit/reducer.spec.ts @@ -110,8 +110,8 @@ describe('@daffodil/cart-store-credit/state | daffCartStoreCreditReducer', () => expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); @@ -187,8 +187,8 @@ describe('@daffodil/cart-store-credit/state | daffCartStoreCreditReducer', () => expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); }); diff --git a/libs/category/state/src/reducers/category/category.reducer.spec.ts b/libs/category/state/src/reducers/category/category.reducer.spec.ts index f4214deee1..890f0c0de2 100644 --- a/libs/category/state/src/reducers/category/category.reducer.spec.ts +++ b/libs/category/state/src/reducers/category/category.reducer.spec.ts @@ -462,8 +462,8 @@ describe('@daffodil/category/state | daffCategoryReducer', () => { expect(result.daffErrors).toEqual([error]); }); - it('sets daffState to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets daffState to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); }); diff --git a/libs/core/state/src/operation/adapter.spec.ts b/libs/core/state/src/operation/adapter.spec.ts index e16d7000ca..b017aa26b5 100644 --- a/libs/core/state/src/operation/adapter.spec.ts +++ b/libs/core/state/src/operation/adapter.spec.ts @@ -94,8 +94,8 @@ describe('@daffodil/core/state | daffOperationFailed', () => { result = daffOperationFailed([error], state); }); - it('should set loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('should set loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); it('should add the error', () => { diff --git a/libs/core/state/src/operation/adapter.ts b/libs/core/state/src/operation/adapter.ts index 6ed2ac85bf..82875faac0 100644 --- a/libs/core/state/src/operation/adapter.ts +++ b/libs/core/state/src/operation/adapter.ts @@ -41,7 +41,7 @@ export function daffCompleteOperation (errors: T['daffErrors'], state: T): T { return { ...state, - daffState: DaffState.Stable, + daffState: DaffState.Error, daffErrors: errors, }; }; diff --git a/libs/customer-payment/state/src/reducers/payment/reducer.spec.ts b/libs/customer-payment/state/src/reducers/payment/reducer.spec.ts index b2d944ba24..bbf99aefec 100644 --- a/libs/customer-payment/state/src/reducers/payment/reducer.spec.ts +++ b/libs/customer-payment/state/src/reducers/payment/reducer.spec.ts @@ -124,8 +124,8 @@ describe('@daffodil/customer-payment/state | daffCustomerPaymentReducer', () => expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); @@ -201,8 +201,8 @@ describe('@daffodil/customer-payment/state | daffCustomerPaymentReducer', () => expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); @@ -422,8 +422,8 @@ describe('@daffodil/customer-payment/state | daffCustomerPaymentReducer', () => expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); }); diff --git a/libs/customer-store-credit/state/src/reducers/store-credit/reducer.spec.ts b/libs/customer-store-credit/state/src/reducers/store-credit/reducer.spec.ts index d028ebf691..8a14404376 100644 --- a/libs/customer-store-credit/state/src/reducers/store-credit/reducer.spec.ts +++ b/libs/customer-store-credit/state/src/reducers/store-credit/reducer.spec.ts @@ -111,8 +111,8 @@ describe('@daffodil/customer-store-credit/state | daffCustomerStoreCreditReducer expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); }); diff --git a/libs/customer/state/src/reducers/address/reducer.spec.ts b/libs/customer/state/src/reducers/address/reducer.spec.ts index 35ba8a38b0..79ea1d89f8 100644 --- a/libs/customer/state/src/reducers/address/reducer.spec.ts +++ b/libs/customer/state/src/reducers/address/reducer.spec.ts @@ -122,8 +122,8 @@ describe('@daffodil/customer/state | daffCustomerAddressReducer', () => { expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); @@ -199,8 +199,8 @@ describe('@daffodil/customer/state | daffCustomerAddressReducer', () => { expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); diff --git a/libs/customer/state/src/reducers/customer/reducer.spec.ts b/libs/customer/state/src/reducers/customer/reducer.spec.ts index cb26e9a202..004238063f 100644 --- a/libs/customer/state/src/reducers/customer/reducer.spec.ts +++ b/libs/customer/state/src/reducers/customer/reducer.spec.ts @@ -121,8 +121,8 @@ describe('@daffodil/customer/state | daffCustomerReducer', () => { expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); @@ -204,8 +204,8 @@ describe('@daffodil/customer/state | daffCustomerReducer', () => { expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); @@ -287,8 +287,8 @@ describe('@daffodil/customer/state | daffCustomerReducer', () => { expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); @@ -364,8 +364,8 @@ describe('@daffodil/customer/state | daffCustomerReducer', () => { expect(result.daffErrors.length).toEqual(1); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); diff --git a/libs/order/state/src/reducers/order/order.reducer.spec.ts b/libs/order/state/src/reducers/order/order.reducer.spec.ts index bf0f1fb650..b98fda2197 100644 --- a/libs/order/state/src/reducers/order/order.reducer.spec.ts +++ b/libs/order/state/src/reducers/order/order.reducer.spec.ts @@ -112,8 +112,8 @@ describe('@daffodil/order/state | daffOrderReducer', () => { expect(result.daffErrors).toEqual([mockError]); }); - it('sets loading to false', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); @@ -184,8 +184,8 @@ describe('@daffodil/order/state | daffOrderReducer', () => { expect(result.daffErrors).toEqual([mockError]); }); - it('sets loading to false', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); }); }); diff --git a/libs/product/state/src/reducers/product/product.reducer.spec.ts b/libs/product/state/src/reducers/product/product.reducer.spec.ts index b710f21500..5747bf58a3 100644 --- a/libs/product/state/src/reducers/product/product.reducer.spec.ts +++ b/libs/product/state/src/reducers/product/product.reducer.spec.ts @@ -126,8 +126,8 @@ describe('@daffodil/product/state | daffProductReducer', () => { result = daffProductReducer(state, productLoadFailure); }); - it('sets loading to stable', () => { - expect(result.daffState).toEqual(DaffState.Stable); + it('sets loading to error', () => { + expect(result.daffState).toEqual(DaffState.Error); }); it('stores the error', () => {