Merge pull request #38 from restorecommerce/refactor/state-anagement

chore: improved actions naming
restorecommerce · Aug 14, 2023 · 6a3a7dd · 6a3a7dd
2 parents 069badb + 7abf529
commit 6a3a7dd
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 5 deletions.
diff --git a/packages/core/state/src/lib/+state/account/account.actions.ts b/packages/core/state/src/lib/+state/account/account.actions.ts
@@ -17,3 +17,5 @@ export const findUserByTokenError = createAction(
   '[ACCOUNT] Find user by token request error',
   props<{ error: string }>()
 );
+
+export const resetAccountState = createAction('[ACCOUNT] Reset account state');
diff --git a/packages/core/state/src/lib/+state/account/account.effects.ts b/packages/core/state/src/lib/+state/account/account.effects.ts
@@ -6,6 +6,7 @@ import { ENotificationTypes } from '@console-core/types';
 
 import { AccountService } from '../../services';
 import { AppFacade } from '../app';
+import * as authnActions from '../authn/authn.actions';
 
 import * as accountActions from './account.actions';
 
@@ -47,6 +48,13 @@ export class AccountEffects {
     { dispatch: false }
   );
 
+  resetAccountState$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(authnActions.signOut),
+      map(() => accountActions.resetAccountState())
+    );
+  });
+
   constructor(
     private readonly actions$: Actions,
     private readonly accountService: AccountService,

diff --git a/packages/core/state/src/lib/+state/account/account.reducer.ts b/packages/core/state/src/lib/+state/account/account.reducer.ts
@@ -36,6 +36,12 @@ const reducer = createReducer<IAccountState>(
       actionStatus: EActionStatus.FAILED,
       error,
     })
+  ),
+  on(
+    accountActions.resetAccountState,
+    (): IAccountState => ({
+      ...initialState,
+    })
   )
 );
 

diff --git a/packages/core/state/src/lib/+state/app/app.actions.ts b/packages/core/state/src/lib/+state/app/app.actions.ts
@@ -7,4 +7,4 @@ export const addNotification = createAction(
   props<{ payload: TNewNotification }>()
 );
 
-export const clearNotification = createAction('[APP] Clear notification');
+export const clearNotifications = createAction('[APP] Clear notifications');
diff --git a/packages/core/state/src/lib/+state/app/app.effects.ts b/packages/core/state/src/lib/+state/app/app.effects.ts
@@ -9,11 +9,11 @@ import * as appActions from './app.actions';
 
 @Injectable()
 export class AppEffects {
-  clearNotification$ = createEffect(() => {
+  clearNotifications$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(appActions.addNotification),
       delay(STORE.config.app.notifications.delay),
-      switchMap(() => of(appActions.clearNotification()))
+      switchMap(() => of(appActions.clearNotifications()))
     );
   });
 

diff --git a/packages/core/state/src/lib/+state/app/app.reducer.ts b/packages/core/state/src/lib/+state/app/app.reducer.ts
@@ -37,7 +37,7 @@ const reducer = createReducer<IAppState>(
     };
   }),
   on(
-    appActions.clearNotification,
+    appActions.clearNotifications,
     (state): IAppState => ({
       ...state,
       notifications: state.notifications.filter(

diff --git a/packages/core/state/src/lib/+state/authn/authn.actions.ts b/packages/core/state/src/lib/+state/authn/authn.actions.ts
@@ -76,3 +76,5 @@ export const confirmPasswordError = createAction(
 );
 
 export const signOut = createAction('[AUTHN] Sign out');
+
+export const resetAuthnState = createAction('[AUTHN] Reset authn state');
diff --git a/packages/core/state/src/lib/+state/authn/authn.effects.ts b/packages/core/state/src/lib/+state/authn/authn.effects.ts
@@ -294,6 +294,13 @@ export class AuthnEffects {
     { dispatch: false }
   );
 
+  resetAuthnState$ = createEffect(() => {
+    return this.actions$.pipe(
+      ofType(authnActions.signOut),
+      map(() => authnActions.resetAuthnState())
+    );
+  });
+
   constructor(
     private readonly router: Router,
     private readonly activatedRoute: ActivatedRoute,

diff --git a/packages/core/state/src/lib/+state/authn/authn.reducer.ts b/packages/core/state/src/lib/+state/authn/authn.reducer.ts
@@ -140,9 +140,16 @@ const reducer = createReducer<IAuthnState>(
   ),
   on(
     authnActions.signOut,
+    (state): IAuthnState => ({
+      ...state,
+      isAuthenticated: false,
+      actionStatus: EActionStatus.SUCCEEDED,
+    })
+  ),
+  on(
+    authnActions.resetAuthnState,
     (_): IAuthnState => ({
       ...initialState,
-      actionStatus: EActionStatus.SUCCEEDED,
     })
   )
 );