diff --git a/apps/showcase/src/components/showcase/tanstack/backend.service.ts b/apps/showcase/src/components/showcase/tanstack/backend.service.ts
index 4ed3932fe5..369025fc26 100644
--- a/apps/showcase/src/components/showcase/tanstack/backend.service.ts
+++ b/apps/showcase/src/components/showcase/tanstack/backend.service.ts
@@ -1,9 +1,11 @@
-import { computed, effect, inject, Injectable, signal} from '@angular/core';
+import { inject, Injectable, signal} from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { Contact } from './contact';
+import { Contact, type ContactWithoutId } from './contact';
 import { URL } from './config';
-import { injectInfiniteQuery, injectMutation, injectQuery, injectQueryClient } from '@tanstack/angular-query-experimental';
 import { lastValueFrom, tap } from 'rxjs';
+import { Store } from '@ngrx/store';
+import { selectAllContact, selectContactStorePendingStatus } from './store/contact/contact.selectors';
+import { setContactEntitiesFromApi } from './store/contact/contact.actions';
 
 interface ContactResponse {
   data: Contact[];
@@ -18,152 +20,27 @@ interface ContactResponse {
 export class BackEndService {
   /// Tanstack query usage
   private readonly http = inject(HttpClient);
-  public queryClient = injectQueryClient();
   public currentId = signal('1');
   public filter = signal('');
   public currentStart = signal(0);
   public currentLimit = signal(5);
   public currentPage = signal(1);
 
-  public contact = injectQuery(() => ({
-    queryKey: ['contact', this.currentId()],
-    queryFn: () => {
-      // console.log('in getContact$ with id', id);
-      return lastValueFrom(this.http.get<Contact>(`${URL}/${this.currentId()}`));
-    },
-    staleTime: 60 * 1000, // 1 minute
-    initialData: () => this.queryClient.getQueryData<Contact[] | undefined>(['contacts', ''])?.find((contact) => contact.id === this.currentId()),
-    initialDataUpdatedAt: () => this.queryClient.getQueryState(['contacts', ''])?.dataUpdatedAt
-  }));
+  // store solution
+  public readonly store = inject(Store);
 
-  public contacts = injectQuery(() => ({
-    queryKey: ['contacts', this.filter()],
-    queryFn: () => {
-      // console.log('in getContact$ with id', id);
-      return lastValueFrom(this.http.get<Contact[]>(`${URL}?q=${this.filter()}`));
-    },
-    staleTime: 60 * 1000 // 1 min
-  }));
+  public allContact = this.store.select(selectAllContact);
 
-  public mutationSave = injectMutation(() => ({
-    mutationFn: (contact: Contact) => {
-      // console.log('Save mutate contact:', contact);
-      return lastValueFrom(this.saveFn(contact));
-    },
-    onMutate: async (contact) => {
-      // cancel potential queries
-      await this.queryClient.cancelQueries({ queryKey: ['contacts'] });
-
-
-      const savedCache = this.queryClient.getQueryData(['contacts', '']);
-      // console.log('savedCache', savedCache);
-      this.queryClient.setQueryData(['contacts', ''], (contacts: Contact[]) => {
-        if (contact.id) {
-          return contacts.map((contactCache) =>
-            contactCache.id === contact.id ? contact : contactCache
-          );
-        }
-        // optimistic update
-        return contacts.concat({ ...contact, id: Math.random().toString() });
-      });
-      return () => {
-        this.queryClient.setQueryData(['contacts', ''], savedCache);
-      };
-    },
-    onSuccess: (data: Contact, contact: Contact, restoreCache: () => void) => {
-      // Should we update the cache of a "contact" here ?
-      restoreCache();
-      this.queryClient.setQueryData(['contact', data.id], data);
-      this.queryClient.setQueryData(['contacts', ''], (contactsCache: Contact[]) => {
-        if (contact.id) {
-          return contactsCache.map((contactCache) =>
-            contactCache.id === contact.id ? contact : contactCache
-          );
-        }
-        return contactsCache.concat(data);
-      });
-    },
-    onError: async (_error, variables, context) => {
-      context?.();
-      await this.settledFn(variables.id);
-    }
-  }));
-
-  public mutationDelete = injectMutation(() => ({
-    mutationFn: (id: string) => {
-      // console.log('Save mutate contact:', contact);
-      return lastValueFrom(this.removeFn(id));
-    },
-    onMutate: (id: string) => {
-      const savedCache = this.queryClient.getQueryData<Contact[]>(['contacts', '']);
-      // console.log('savedCache', savedCache);
-      this.queryClient.setQueryData(['contacts', ''], (contacts: Contact[]) =>
-        // optimistic update
-        contacts.filter((contactCached) => contactCached.id !== id)
-      );
-      return () => {
-        this.queryClient.setQueryData(['contacts', ''], savedCache);
-      };
-    },
-    onError: async (_error, variables, context) => {
-      context?.();
-      await this.settledFn(variables);
-    },
-    onSettled: (_data: Contact | undefined, _error, variables, _context) => this.settledFn(variables)
-  }));
-
-  public infiniteQuery = injectInfiniteQuery(() => ({
-    queryKey: ['contacts'],
-    queryFn: ({ pageParam }) => {
-      return lastValueFrom(this.getInfiniteContacts(pageParam));
-    },
-    initialPageParam: this.currentPage(),
-    getPreviousPageParam: (firstPage) => firstPage.prev ?? undefined,
-    getNextPageParam: (lastPage) => lastPage.next ?? undefined
-  }));
-
-
-  public nextButtonDisabled = computed(
-    () => !this.#hasNextPage() || this.#isFetchingNextPage()
-  );
-  public nextButtonText = computed(() =>
-    this.#isFetchingNextPage()
-      ? 'Loading more...'
-      : this.#hasNextPage()
-        ? 'Load newer'
-        : 'Nothing more to load'
-  );
-  public previousButtonDisabled = computed(
-    () => !this.#hasPreviousPage() || this.#isFetchingNextPage()
-  );
-  public previousButtonText = computed(() =>
-    this.#isFetchingPreviousPage()
-      ? 'Loading more...'
-      : this.#hasPreviousPage()
-        ? 'Load Older'
-        : 'Nothing more to load'
-  );
-
-  readonly #hasPreviousPage = this.infiniteQuery.hasPreviousPage;
-  readonly #hasNextPage = this.infiniteQuery.hasNextPage;
-  readonly #isFetchingPreviousPage = this.infiniteQuery.isFetchingPreviousPage;
-  readonly #isFetchingNextPage = this.infiniteQuery.isFetchingNextPage;
+  public isPending = this.store.select(selectContactStorePendingStatus);
 
+  public isFailing = this.store.select(selectContactStorePendingStatus);
 
   constructor() {
-    effect(async () => { if (!this.nextButtonDisabled()) {
-      await this.fetchNextPage();
-    }});
-  }
-
-  public async settledFn(contactId: string | undefined) {
-    await this.queryClient.invalidateQueries({ queryKey: ['contacts']});
-    if (contactId) {
-      await this.queryClient.invalidateQueries({ queryKey: ['contact', contactId]});
-    }
+    // store solution
+    this.store.dispatch(setContactEntitiesFromApi({call: lastValueFrom(this.http.get<Contact[]>(`${URL}?q=`))}));
   }
 
-  public saveFn(contact: Contact) {
+  public saveFn(contact: ContactWithoutId) {
     if (contact.id) {
       return this.http.put<Contact>(`${URL}/${contact.id}`, contact);
     }
@@ -177,12 +54,4 @@ export class BackEndService {
   public getInfiniteContacts(pageParam: number) {
     return this.http.get<ContactResponse>(`${URL}?_page=${pageParam.toString()}&_per_page=${this.currentLimit().toString()}`).pipe(tap(() => this.currentPage.set(pageParam)));
   }
-
-  public async fetchNextPage() {
-    // Do nothing if already fetching
-    if (this.infiniteQuery.isFetching()) {
-      return;
-    }
-    await this.infiniteQuery.fetchNextPage();
-  }
 }
diff --git a/apps/showcase/src/components/showcase/tanstack/contact.ts b/apps/showcase/src/components/showcase/tanstack/contact.ts
index 40fe2aab46..3de56e804a 100644
--- a/apps/showcase/src/components/showcase/tanstack/contact.ts
+++ b/apps/showcase/src/components/showcase/tanstack/contact.ts
@@ -1,6 +1,13 @@
 export interface Contact {
+  id: string;
+  firstName: string;
+  lastName: string;
+}
+
+export interface ContactWithoutId {
   id?: string;
   firstName: string;
   lastName: string;
 }
 
+
diff --git a/apps/showcase/src/components/showcase/tanstack/store/contact/contact.actions.ts b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.actions.ts
new file mode 100644
index 0000000000..3ec18aa36c
--- /dev/null
+++ b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.actions.ts
@@ -0,0 +1,78 @@
+import {
+  asyncProps,
+  AsyncRequest,
+  FailAsyncStoreItemEntitiesActionPayload,
+  FromApiActionPayload,
+  SetActionPayload,
+  SetAsyncStoreItemEntitiesActionPayload,
+  UpdateActionPayload,
+  UpdateAsyncStoreItemEntitiesActionPayloadWithId
+} from '@o3r/core';
+
+import {createAction, props} from '@ngrx/store';
+// import {ContactModel} from './contact.state';
+import {ContactStateDetails} from './contact.state';
+import type { Contact } from '../../contact';
+
+/** StateDetailsActions */
+const ACTION_SET = '[Contact] set';
+const ACTION_UPDATE = '[Contact] update';
+const ACTION_RESET = '[Contact] reset';
+const ACTION_CANCEL_REQUEST = '[Contact] cancel request';
+
+/** Entity Actions */
+const ACTION_CLEAR_ENTITIES = '[Contact] clear entities';
+const ACTION_UPDATE_ENTITIES = '[Contact] update entities';
+const ACTION_UPSERT_ENTITIES = '[Contact] upsert entities';
+const ACTION_SET_ENTITIES = '[Contact] set entities';
+const ACTION_FAIL_ENTITIES = '[Contact] fail entities';
+
+/** Async Actions */
+const ACTION_SET_ENTITIES_FROM_API = '[Contact] set entities from api';
+const ACTION_UPDATE_ENTITIES_FROM_API = '[Contact] update entities from api';
+const ACTION_UPSERT_ENTITIES_FROM_API = '[Contact] upsert entities from api';
+
+/** Action to clear the StateDetails of the store and replace it */
+export const setContact = createAction(ACTION_SET, props<SetActionPayload<ContactStateDetails>>());
+
+/** Action to change a part or the whole object in the store. */
+export const updateContact = createAction(ACTION_UPDATE, props<UpdateActionPayload<ContactStateDetails>>());
+
+/** Action to reset the whole state, by returning it to initial state. */
+export const resetContact = createAction(ACTION_RESET);
+
+/** Action to cancel a Request ID registered in the store. Can happen from effect based on a switchMap for instance */
+export const cancelContactRequest = createAction(ACTION_CANCEL_REQUEST, props<AsyncRequest>());
+
+/** Action to clear all contact and fill the store with the payload */
+export const setContactEntities = createAction(ACTION_SET_ENTITIES, props<SetAsyncStoreItemEntitiesActionPayload<Contact>>());
+
+/** Action to update contact with known IDs, ignore the new ones */
+export const updateContactEntities = createAction(ACTION_UPDATE_ENTITIES, props<UpdateAsyncStoreItemEntitiesActionPayloadWithId<Contact>>());
+
+/** Action to update contact with known IDs, insert the new ones */
+export const upsertContactEntities = createAction(ACTION_UPSERT_ENTITIES, props<SetAsyncStoreItemEntitiesActionPayload<Contact>>());
+
+/** Action to empty the list of entities, keeping the global state */
+export const clearContactEntities = createAction(ACTION_CLEAR_ENTITIES);
+
+/** Action to update failureStatus for every ContactModel */
+export const failContactEntities = createAction(ACTION_FAIL_ENTITIES, props<FailAsyncStoreItemEntitiesActionPayload<any>>());
+
+/**
+ * Action to put the global status of the store in a pending state. Call SET action with the list of ContactModels received, when this action resolves.
+ * If the call fails, dispatch FAIL_ENTITIES action
+ */
+export const setContactEntitiesFromApi = createAction(ACTION_SET_ENTITIES_FROM_API, asyncProps<FromApiActionPayload<Contact[]>>());
+
+/**
+ * Action to change isPending status of elements to be updated with a request. Call UPDATE action with the list of ContactModels received, when this action resolves.
+ * If the call fails, dispatch FAIL_ENTITIES action
+ */
+export const updateContactEntitiesFromApi = createAction(ACTION_UPDATE_ENTITIES_FROM_API, asyncProps<FromApiActionPayload<Contact[]> & { ids: string[] }>());
+
+/**
+ * Action to put global status of the store in a pending state. Call UPSERT action with the list of ContactModels received, when this action resolves.
+ * If the call fails, dispatch FAIL_ENTITIES action
+ */
+export const upsertContactEntitiesFromApi = createAction(ACTION_UPSERT_ENTITIES_FROM_API, asyncProps<FromApiActionPayload<Contact[]>>());
diff --git a/apps/showcase/src/components/showcase/tanstack/store/contact/contact.effect.ts b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.effect.ts
new file mode 100644
index 0000000000..2ac0dbdc41
--- /dev/null
+++ b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.effect.ts
@@ -0,0 +1,66 @@
+import {Injectable} from '@angular/core';
+import {Actions, createEffect, ofType} from '@ngrx/effects';
+import {from, of} from 'rxjs';
+import {catchError, map, mergeMap} from 'rxjs/operators';
+import {fromApiEffectSwitchMap} from '@o3r/core';
+import {
+  cancelContactRequest,
+  failContactEntities,
+  setContactEntities, setContactEntitiesFromApi,
+  updateContactEntities, updateContactEntitiesFromApi,
+  upsertContactEntities, upsertContactEntitiesFromApi
+} from './contact.actions';
+
+/**
+ * Service to handle async Contact actions
+ */
+@Injectable()
+export class ContactEffect {
+
+  /**
+   * Set the entities with the reply content, dispatch failContactEntities if it catches a failure
+   */
+  public setEntitiesFromApi$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(setContactEntitiesFromApi),
+      fromApiEffectSwitchMap(
+        (reply, action) => setContactEntities({entities: reply, requestId: action.requestId}),
+        (error, action) => of(failContactEntities({error, requestId: action.requestId})),
+        cancelContactRequest
+      )
+    )
+  );
+
+  /**
+   * Update the entities with the reply content, dispatch failContactEntities if it catches a failure
+   */
+  public updateEntitiesFromApi$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(updateContactEntitiesFromApi),
+      mergeMap((payload) =>
+        from(payload.call).pipe(
+          map((reply) => updateContactEntities({entities: reply, requestId: payload.requestId})),
+          catchError((err) => of(failContactEntities({ids: payload.ids, error: err, requestId: payload.requestId})))
+        )
+      )
+    )
+  );
+
+  /**
+   * Upsert the entities with the reply content, dispatch failContactEntities if it catches a failure
+   */
+  public upsertEntitiesFromApi$ = createEffect(() =>
+    this.actions$.pipe(
+      ofType(upsertContactEntitiesFromApi),
+      mergeMap((payload) =>
+        from(payload.call).pipe(
+          map((reply) => upsertContactEntities({entities: reply, requestId: payload.requestId})),
+          catchError((err) => of(failContactEntities({error: err, requestId: payload.requestId})))
+        )
+      )
+    )
+  );
+
+  constructor(protected actions$: Actions) {
+  }
+}
diff --git a/apps/showcase/src/components/showcase/tanstack/store/contact/contact.module.ts b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.module.ts
new file mode 100644
index 0000000000..9803fa8011
--- /dev/null
+++ b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.module.ts
@@ -0,0 +1,34 @@
+import { InjectionToken, ModuleWithProviders, NgModule } from '@angular/core';
+import { Action, ActionReducer, StoreModule } from '@ngrx/store';
+
+import { EffectsModule } from '@ngrx/effects';
+import { ContactEffect } from './contact.effect';
+import { contactReducer } from './contact.reducer';
+import { CONTACT_STORE_NAME, ContactState } from './contact.state';
+
+/** Token of the Contact reducer */
+export const CONTACT_REDUCER_TOKEN = new InjectionToken<ActionReducer<ContactState, Action>>('Feature Contact Reducer');
+
+/** Provide default reducer for Contact store */
+export function getDefaultContactReducer() {
+  return contactReducer;
+}
+
+@NgModule({
+  imports: [
+    StoreModule.forFeature(CONTACT_STORE_NAME, CONTACT_REDUCER_TOKEN), EffectsModule.forFeature([ContactEffect])
+  ],
+  providers: [
+    { provide: CONTACT_REDUCER_TOKEN, useFactory: getDefaultContactReducer }
+  ]
+})
+export class ContactStoreModule {
+  public static forRoot<T extends ContactState>(reducerFactory: () => ActionReducer<T, Action>): ModuleWithProviders<ContactStoreModule> {
+    return {
+      ngModule: ContactStoreModule,
+      providers: [
+        { provide: CONTACT_REDUCER_TOKEN, useFactory: reducerFactory }
+      ]
+    };
+  }
+}
diff --git a/apps/showcase/src/components/showcase/tanstack/store/contact/contact.reducer.spec.ts b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.reducer.spec.ts
new file mode 100644
index 0000000000..3fd2d24d18
--- /dev/null
+++ b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.reducer.spec.ts
@@ -0,0 +1,121 @@
+import * as actions from './contact.actions';
+import {contactInitialState, contactReducer} from './contact.reducer';
+import {ContactState} from './contact.state';
+
+describe('Contact Store reducer', () => {
+
+  let entitiesState: ContactState;
+  const firstContact: any = {id: 'contact1', genericItems: []};
+  const secondContact: any = {id: 'contact2', genericItems: []};
+  const contactReply: any = [firstContact];
+
+  it('should have the correct initial state', () => {
+    expect(contactInitialState.ids.length).toBe(0);
+  });
+
+
+  it('should by default return the initial state', () => {
+    const state = contactReducer(contactInitialState, {type: 'fake'} as any);
+    expect(state).toEqual(contactInitialState);
+  });
+
+  describe('Actions on state details', () => {
+    beforeEach(() => {
+      entitiesState = contactReducer(contactInitialState, actions.setContactEntities({entities: [firstContact, secondContact]}));
+    });
+
+    it('SET action should clear current state details and return a state with the new one', () => {
+      const firstState = contactReducer(entitiesState, actions.setContact({stateDetails: {requestIds: []}}));
+      const secondState = contactReducer(firstState, actions.setContact({stateDetails: {requestIds: [], isPending: false}}));
+      expect(secondState.isPending).toEqual(false);
+    });
+
+    it('UPDATE should update the state details without modifying entities', () => {
+      const firstState = contactReducer(entitiesState, actions.setContact({stateDetails: {requestIds: []}}));
+      const secondState = contactReducer(firstState, actions.updateContact({stateDetails: {isPending: false}}));
+      expect(secondState.isPending).toEqual(false);
+    });
+
+    it('RESET action should return initial state', () => {
+      const state = contactReducer(entitiesState, actions.resetContact());
+      expect(state).toEqual(contactInitialState);
+    });
+
+    it('FAIL action should update the isPending to false and the isFailure to true', () => {
+      const state = contactReducer({...contactInitialState, isPending: true}, actions.failContactEntities({}));
+      expect(state.ids.length).toBe(0);
+      expect(state.isPending).toBe(false);
+      expect(state.isFailure).toBe(true);
+    });
+  });
+
+  describe('Entity actions', () => {
+    it('SET_ENTITIES action should clear current entities and set new ones', () => {
+      const firstState = contactReducer(contactInitialState, actions.setContactEntities({entities: [firstContact]}));
+      const secondState = contactReducer(firstState, actions.setContactEntities({entities: [secondContact]}));
+      expect(secondState.ids.length).toEqual(1);
+      expect((secondState.ids as string[]).find((id) => (id === firstContact.id))).toBeUndefined();
+      expect((secondState.ids as string[]).find((id) => (id === secondContact.id))).toBeDefined();
+    });
+
+    it('UPDATE_ENTITTIES action should only update existing entities', () => {
+      const firstContactUpdated = {...firstContact, genericField: 'genericId'};
+      const firstState = contactReducer(contactInitialState, actions.setContactEntities({entities: [firstContact]}));
+      const secondState = contactReducer(firstState,
+        actions.updateContactEntities({entities: [firstContactUpdated, secondContact]}));
+      expect(secondState.ids.length).toEqual(1);
+      expect((secondState.ids as string[]).find((id) => (id === firstContact.id))).toBeDefined();
+      expect((secondState.ids as string[]).find((id) => (id === secondContact.id))).toBeUndefined();
+    });
+
+    it('UPSERT_ENTITIES action should update existing entities and add the new ones', () => {
+      const firstContactUpdated = {...firstContact, genericField: 'genericId'};
+      const firstState = contactReducer(contactInitialState, actions.setContactEntities({entities: [firstContact]}));
+      const secondState = contactReducer(firstState,
+        actions.upsertContactEntities({entities: [firstContactUpdated, secondContact]}));
+      expect(secondState.ids.length).toEqual(2);
+      expect((secondState.ids as string[]).find((id) => (id === firstContact.id))).toBeDefined();
+      expect((secondState.ids as string[]).find((id) => (id === secondContact.id))).toBeDefined();
+    });
+
+    it('CLEAR_ENTITIES action should clear only the entities', () => {
+      const firstState = contactReducer(contactInitialState, actions.setContactEntities({entities: [firstContact, secondContact]}));
+      const secondState = contactReducer(firstState, actions.setContact({stateDetails: {requestIds: [], isPending: false}}));
+      const thirdState = contactReducer(secondState, actions.clearContactEntities());
+      expect(thirdState.ids.length).toEqual(0);
+    });
+
+    it('FAIL_ENTITIES action should update the isPending to false and the isFailure to true', () => {
+      const state = contactReducer({...contactInitialState, isPending: true}, actions.failContactEntities({}));
+      expect(state.ids.length).toBe(0);
+      expect(state.isPending).toBe(false);
+      expect(state.isFailure).toBe(true);
+    });
+
+    it('FAIL_ENTITIES action should update the global isPending to false in case there are some newIds in the payload', () => {
+      const firstState = contactReducer(contactInitialState, actions.setContactEntities({entities: [firstContact]}));
+      const secondState = contactReducer({...firstState, isPending : true},
+        actions.failContactEntities({error: 'dummy error', ids: [secondContact.id]}));
+      expect(secondState.isPending).toBe(false);
+      expect(secondState.isFailure).toBe(true);
+    });
+  });
+
+  describe('API call actions', () => {
+    it('SET_ENTITIES_FROM_API action should clear current entities and set new ones', () => {
+      const firstState = contactReducer(contactInitialState, actions.setContactEntitiesFromApi({call: Promise.resolve(contactReply), requestId: 'test'}));
+      expect(firstState.isPending).toEqual(true);
+    });
+    it('UPDATE_ENTITIES_FROM_API action should clear current entities and set new ones', () => {
+      const firstState = contactReducer(contactInitialState, actions.setContactEntities({entities: [firstContact]}));
+      const secondState = contactReducer(firstState,
+        actions.updateContactEntitiesFromApi({call: Promise.resolve(contactReply), ids: [firstContact.id], requestId: 'test'}));
+      expect(secondState.isPending).toBeFalsy();
+      expect(secondState.entities[firstContact.id]!.isPending).toEqual(true);
+    });
+    it('UPSERT_ENTITIES_FROM_API action should clear current entities and set new ones', () => {
+      const firstState = contactReducer(contactInitialState, actions.upsertContactEntitiesFromApi({call: Promise.resolve(contactReply), requestId: 'test'}));
+      expect(firstState.isPending).toEqual(true);
+    });
+  });
+});
diff --git a/apps/showcase/src/components/showcase/tanstack/store/contact/contact.reducer.ts b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.reducer.ts
new file mode 100644
index 0000000000..e2929141f0
--- /dev/null
+++ b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.reducer.ts
@@ -0,0 +1,69 @@
+import {ActionCreator, createReducer, on, ReducerTypes} from '@ngrx/store';
+import {createEntityAdapter} from '@ngrx/entity';
+import {asyncStoreItemAdapter, createEntityAsyncRequestAdapter} from '@o3r/core';
+import * as actions from './contact.actions';
+import {ContactModel, ContactState, ContactStateDetails} from './contact.state';
+
+/**
+ * Contact Store adapter
+ */
+export const contactAdapter = createEntityAsyncRequestAdapter(createEntityAdapter<ContactModel>({
+  selectId: (model) => model.id
+}));
+
+/**
+ * Contact Store initial value
+ */
+export const contactInitialState: ContactState = contactAdapter.getInitialState<ContactStateDetails>({
+  requestIds: []
+});
+
+/**
+ * List of basic actions for Contact Store
+ */
+export const contactReducerFeatures: ReducerTypes<ContactState, ActionCreator[]>[] = [
+  on(actions.resetContact, () => contactInitialState),
+
+  on(actions.setContact, (state, payload) => ({ids: state.ids, entities: state.entities, ...payload.stateDetails})),
+
+  on(actions.cancelContactRequest, (state, action) => asyncStoreItemAdapter.resolveRequest(state, action.requestId)),
+
+  on(actions.updateContact, (state, payload) => ({...state, ...payload.stateDetails})),
+
+  on(actions.setContactEntities, (state, payload) =>
+    contactAdapter.addMany(
+      payload.entities.map((entity) => asyncStoreItemAdapter.initialize(entity)),
+      contactAdapter.removeAll(asyncStoreItemAdapter.resolveRequest(state, payload.requestId)))
+  ),
+
+  on(actions.updateContactEntities, (state, payload) =>
+    contactAdapter.resolveRequestMany(state, payload.entities, payload.requestId)
+  ),
+
+  on(actions.upsertContactEntities, (state, payload) =>
+    contactAdapter.upsertMany(
+      payload.entities.map((entity) => asyncStoreItemAdapter.initialize(entity)),
+      asyncStoreItemAdapter.resolveRequest(state, payload.requestId)
+    )
+  ),
+
+  on(actions.clearContactEntities, (state) => contactAdapter.removeAll(state)),
+
+  on(actions.failContactEntities, (state, payload) =>
+    contactAdapter.failRequestMany(state, payload && payload.ids, payload.requestId)
+  ),
+
+  on(actions.setContactEntitiesFromApi, actions.upsertContactEntitiesFromApi, (state, payload) =>
+    asyncStoreItemAdapter.addRequest(state, payload.requestId)),
+
+  on(actions.updateContactEntitiesFromApi, (state, payload) =>
+    contactAdapter.addRequestMany(state, payload.ids, payload.requestId))
+];
+
+/**
+ * Contact Store reducer
+ */
+export const contactReducer = createReducer(
+  contactInitialState,
+  ...contactReducerFeatures
+);
diff --git a/apps/showcase/src/components/showcase/tanstack/store/contact/contact.selectors.spec.ts b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.selectors.spec.ts
new file mode 100644
index 0000000000..86638597d6
--- /dev/null
+++ b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.selectors.spec.ts
@@ -0,0 +1,10 @@
+import {contactInitialState} from './contact.reducer';
+import * as selectors from './contact.selectors';
+
+describe('Contact Selectors tests', () => {
+  it('should provide the pending status of the store', () => {
+    expect(selectors.selectContactStorePendingStatus.projector(contactInitialState)).toBeFalsy();
+    expect(selectors.selectContactStorePendingStatus.projector({...contactInitialState, isPending: false})).toBe(false);
+    expect(selectors.selectContactStorePendingStatus.projector({...contactInitialState, isPending: true})).toBe(true);
+  });
+});
diff --git a/apps/showcase/src/components/showcase/tanstack/store/contact/contact.selectors.ts b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.selectors.ts
new file mode 100644
index 0000000000..d7b1e0e797
--- /dev/null
+++ b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.selectors.ts
@@ -0,0 +1,26 @@
+import {createFeatureSelector, createSelector} from '@ngrx/store';
+import {contactAdapter} from './contact.reducer';
+import {CONTACT_STORE_NAME, ContactState} from './contact.state';
+
+const {selectIds, selectEntities, selectAll, selectTotal} = contactAdapter.getSelectors();
+
+/** Select Contact State */
+export const selectContactState = createFeatureSelector<ContactState>(CONTACT_STORE_NAME);
+
+/** Select the array of Contact ids */
+export const selectContactIds = createSelector(selectContactState, selectIds);
+
+/** Select the array of Contact */
+export const selectAllContact = createSelector(selectContactState, selectAll);
+
+/** Select the dictionary of Contact entities */
+export const selectContactEntities = createSelector(selectContactState, selectEntities);
+
+/** Select the total Contact count */
+export const selectContactTotal = createSelector(selectContactState, selectTotal);
+
+/** Select the store pending status */
+export const selectContactStorePendingStatus = createSelector(selectContactState, (state) => state.isPending || false);
+
+export const selectContactStoreFailureStatus = createSelector(selectContactState, (state) => state.isFailure || false);
+
diff --git a/apps/showcase/src/components/showcase/tanstack/store/contact/contact.state.ts b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.state.ts
new file mode 100644
index 0000000000..864bef04dc
--- /dev/null
+++ b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.state.ts
@@ -0,0 +1,31 @@
+import {EntityState} from '@ngrx/entity';
+import {AsyncStoreItem} from '@o3r/core';
+import type { Contact } from '../../contact';
+
+/**
+ * Contact model
+ */
+export interface ContactModel extends AsyncStoreItem, Contact {}
+
+/**
+ * Contact state details
+ */
+export interface ContactStateDetails extends AsyncStoreItem {}
+
+/**
+ * Contact store state
+ */
+export interface ContactState extends EntityState<ContactModel>, ContactStateDetails {}
+
+/**
+ * Name of the Contact Store
+ */
+export const CONTACT_STORE_NAME = 'contact';
+
+/**
+ * Contact Store Interface
+ */
+export interface ContactStore {
+  /** Contact state */
+  [CONTACT_STORE_NAME]: ContactState;
+}
diff --git a/apps/showcase/src/components/showcase/tanstack/store/contact/contact.sync.ts b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.sync.ts
new file mode 100644
index 0000000000..2b84ee327b
--- /dev/null
+++ b/apps/showcase/src/components/showcase/tanstack/store/contact/contact.sync.ts
@@ -0,0 +1,25 @@
+import { ContactModel } from './contact.state';
+
+
+import {asyncEntitySerializer, Serializer} from '@o3r/core';
+import {contactAdapter, contactInitialState} from './contact.reducer';
+import {ContactState} from './contact.state';
+
+export const contactStorageSerializer = asyncEntitySerializer;
+
+export const contactStorageDeserializer = (rawObject: any) => {
+  if (!rawObject || !rawObject.ids) {
+    return contactInitialState;
+  }
+  const storeObject = contactAdapter.getInitialState(rawObject);
+  for (const id of rawObject.ids) {
+    storeObject.entities[id] = rawObject.entities[id] as ContactModel;
+
+  }
+  return storeObject;
+};
+
+export const contactStorageSync: Serializer<ContactState> = {
+  serialize: contactStorageSerializer,
+  deserialize: contactStorageDeserializer
+};
diff --git a/apps/showcase/src/components/showcase/tanstack/store/contact/index.ts b/apps/showcase/src/components/showcase/tanstack/store/contact/index.ts
new file mode 100644
index 0000000000..643678cb1a
--- /dev/null
+++ b/apps/showcase/src/components/showcase/tanstack/store/contact/index.ts
@@ -0,0 +1,7 @@
+export * from './contact.actions';
+export * from './contact.effect';
+export * from './contact.module';
+export * from './contact.reducer';
+export * from './contact.selectors';
+export * from './contact.state';
+export * from './contact.sync';
diff --git a/apps/showcase/src/components/showcase/tanstack/store/petstore/petstore.actions.ts b/apps/showcase/src/components/showcase/tanstack/store/petstore/petstore.actions.ts
index b5ca32edb3..1bb5930dfb 100644
--- a/apps/showcase/src/components/showcase/tanstack/store/petstore/petstore.actions.ts
+++ b/apps/showcase/src/components/showcase/tanstack/store/petstore/petstore.actions.ts
@@ -24,12 +24,12 @@ const ACTION_UPDATE_ENTITIES = '[Petstore] update entities';
 const ACTION_UPSERT_ENTITIES = '[Petstore] upsert entities';
 const ACTION_SET_ENTITIES = '[Petstore] set entities';
 const ACTION_FAIL_ENTITIES = '[Petstore] fail entities';
-const ACTION_CREATE_ENTITIES_FROM_API = '[Petstore] create entity';
 
 /** Async Actions */
 const ACTION_SET_ENTITIES_FROM_API = '[Petstore] set entities from api';
 const ACTION_UPDATE_ENTITIES_FROM_API = '[Petstore] update entities from api';
 const ACTION_UPSERT_ENTITIES_FROM_API = '[Petstore] upsert entities from api';
+const ACTION_CREATE_ENTITIES_FROM_API = '[Petstore] create entity';
 
 
 /** Action to clear the StateDetails of the store and replace it */
diff --git a/apps/showcase/src/components/showcase/tanstack/store/petstore/petstore.selectors.ts b/apps/showcase/src/components/showcase/tanstack/store/petstore/petstore.selectors.ts
index 80ae1a0ee7..590f3b5827 100644
--- a/apps/showcase/src/components/showcase/tanstack/store/petstore/petstore.selectors.ts
+++ b/apps/showcase/src/components/showcase/tanstack/store/petstore/petstore.selectors.ts
@@ -21,3 +21,6 @@ export const selectPetstoreTotal = createSelector(selectPetstoreState, selectTot
 
 /** Select the store pending status */
 export const selectPetstoreStorePendingStatus = createSelector(selectPetstoreState, (state) => state.isPending || false);
+
+/** Select the store pending status */
+export const selectPetstoreStoreFailingStatus = createSelector(selectPetstoreState, (state) => state.isFailure || false);
diff --git a/apps/showcase/src/components/showcase/tanstack/tanstack-pres.component.ts b/apps/showcase/src/components/showcase/tanstack/tanstack-pres.component.ts
index ea5f10ca97..1266b5a6d9 100644
--- a/apps/showcase/src/components/showcase/tanstack/tanstack-pres.component.ts
+++ b/apps/showcase/src/components/showcase/tanstack/tanstack-pres.component.ts
@@ -6,6 +6,8 @@ import { OtterPickerPresComponent } from '../../utilities';
 import { TanstackService } from './tanstack.service';
 import { AngularQueryDevtools } from '@tanstack/angular-query-devtools-experimental';
 import { AsyncPipe, JsonPipe } from '@angular/common';
+import { PetstoreStoreModule } from './store/petstore/index';
+import { ContactStoreModule } from './store/contact/index';
 
 
 @O3rComponent({ componentType: 'Component' })
@@ -20,7 +22,9 @@ import { AsyncPipe, JsonPipe } from '@angular/common';
     NgbPaginationPages,
     AngularQueryDevtools,
     JsonPipe,
-    AsyncPipe
+    AsyncPipe,
+    PetstoreStoreModule,
+    ContactStoreModule
   ],
   providers: [TanstackService],
   templateUrl: './tanstack-pres.template.html',
diff --git a/apps/showcase/src/components/showcase/tanstack/tanstack-pres.template.html b/apps/showcase/src/components/showcase/tanstack/tanstack-pres.template.html
index 20b8e99dd2..9f984f0e12 100644
--- a/apps/showcase/src/components/showcase/tanstack/tanstack-pres.template.html
+++ b/apps/showcase/src/components/showcase/tanstack/tanstack-pres.template.html
@@ -1,5 +1,11 @@
 <div class="card mb-3">
   <div class="card-body">
+    <span>isloading here:</span>
+    {{ service.isLoading | async}}
+    <span>was it here?</span>
+    <span>isFailing here:</span>
+    {{ service.isFailing | async}}
+    <span>was it here?</span>
     <form>
       <div class="row gap-3">
         <label for="pet-name" class="col-xs-3 col-sm-auto col-form-label">Name</label>
@@ -41,34 +47,22 @@
           />
         </div>
         <div class="col-xs-3 col-sm-auto d-flex justify-content-center align-items-center visual-testing-ignore">
-          @if (service.mutationAdd.isPending()) {
-            <span>Adding Pet...</span>
-          } @else if (service.mutationAdd.isError()) {
-            <div>An error occurred: {{ service.mutationAdd.error()?.message }}</div>
-          }
-          @if (service.mutationDelete.isPending()) {
-            <span>Deleting Pet...</span>
-          } @else if (service.mutationDelete.isError()) {
-            <div>An error occurred: {{ service.mutationDelete.error()?.message }}</div>
-          }
-          @if (service.pets.isPending()) {
+
+          @if (service.isLoading | async) {
             <div class="spinner-border" role="status">
               <span class="visually-hidden">Loading...</span>
             </div>
           }
-          @switch (service.pets.status()) {
-            @case ('error') {
-              <div class="text-danger">
-                Failed to load the list
-                <button class="btn btn-md btn-danger" (click)="service.reload()">Retry</button>
-              </div>
-            }
-            @default {
-              @if (service.pets.isFetching()) {
-                Refreshing...
-              }
-            }
+          @if (service.isFailing | async) {
+            <div class="text-danger">
+              Reload
+              <button class="btn btn-md btn-danger" (click)="service.reload()">Reload</button>
+            </div>
           }
+          <div class="text-danger">
+            Reload
+            <button class="btn btn-md btn-danger" (click)="service.reload()">Reload</button>
+          </div>
         </div>
       </div>
     </form>
@@ -151,7 +145,7 @@
   </div>
 </div>
 
-<div>
+<!-- <div>
   @if (this.service.backend.infiniteQuery.isPending()) {
     <p>Loading...</p>
   } @else if (this.service.backend.infiniteQuery.isError()) {
@@ -175,8 +169,11 @@
         : null
     }}
   </div>
-</div>
+</div> -->
 
-{{ service.isLoading | async}}
+All Pets:
+{{service.pets() | json}}
+All Contacts:
+{{service.backend.allContact | async | json}}
 
 <angular-query-devtools initialIsOpen />
diff --git a/apps/showcase/src/components/showcase/tanstack/tanstack.service.ts b/apps/showcase/src/components/showcase/tanstack/tanstack.service.ts
index be67271f66..451a2eac67 100644
--- a/apps/showcase/src/components/showcase/tanstack/tanstack.service.ts
+++ b/apps/showcase/src/components/showcase/tanstack/tanstack.service.ts
@@ -1,4 +1,4 @@
-import { computed, inject, Injectable, signal } from '@angular/core';
+import { computed, inject, Injectable, type OnInit, signal } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
 import { DfMedia } from '@design-factory/design-factory';
 import { PetApi} from '@ama-sdk/showcase-sdk';
@@ -7,14 +7,12 @@ import { Store } from '@ngrx/store';
 
 const FILTER_PAG_REGEX = /[^0-9]/g;
 
-// Tanstack
-import {injectMutation, injectQuery, injectQueryClient, type QueryClient } from '@tanstack/angular-query-experimental';
 import { BackEndService } from './backend.service';
-import { setPetstoreEntityFromApi } from './store/petstore/petstore.actions';
-import { selectPetstoreStorePendingStatus } from './store/petstore/petstore.selectors';
+import { setPetstoreEntitiesFromApi/* , setPetstoreEntityFromApi*/, upsertPetstoreEntitiesFromApi } from './store/petstore/petstore.actions';
+import { selectAllPetstore, selectPetstoreStoreFailingStatus, selectPetstoreStorePendingStatus } from './store/petstore/petstore.selectors';
 
 @Injectable()
-export class TanstackService {
+export class TanstackService implements OnInit {
   private readonly petStoreApi = inject(PetApi);
   private readonly mediaService = inject(DfMedia);
   public readonly backend = inject(BackEndService);
@@ -45,71 +43,17 @@ export class TanstackService {
    */
   public currentPage = signal(1);
 
-
-  public queryClient = injectQueryClient();
-
   public isLoading = this.store.select(selectPetstoreStorePendingStatus);
 
+  public isFailing = this.store.select(selectPetstoreStoreFailingStatus);
 
-  /**
-   * Complete list of pets retrieved from the API
-   */
-  public pets = injectQuery(() => ({
-    queryKey: ['findPetsByStatus', {status: 'available'}],
-    // eslint-disable-next-line @typescript-eslint/no-shadow
-    queryFn: ({signal}) =>
-      this.petStoreApi.findPetsByStatus({status: 'available'}, {signal}).then((pets: Pet[]) =>
-        pets.filter((p: Pet) => p.category?.name === 'otter').sort((a: Pet, b: Pet) => a.id && b.id && a.id - b.id || 0)),
-    initialData: []
-  }));
-
-
-  public mutationUploadFile = injectMutation((client: QueryClient) => ({
-    mutationFn: (petFile: {petId: number; body: any}) => this.petStoreApi.uploadFile(petFile),
-    onSuccess: async () => {
-      // Invalidate and refetch by using the client directly
-      await client.invalidateQueries({ queryKey: ['findPetsByStatus'] });
-    }
-  }));
-
-
-  public mutationAdd = injectMutation((client: QueryClient) => ({
-    mutationFn: (pet: Pet) => this.petStoreApi.addPet({
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      Pet: pet
-    }),
-    onSuccess: async (_data: any, pet: Pet, _context: any) => {
-      if (pet.photoUrls.length) {
-        const filePath = `${this.baseUrl}${pet.photoUrls[0]}`;
-        const blob = await (await fetch(filePath)).blob();
-        this.mutationUploadFile.mutate({petId: pet.id, body: new File([blob], filePath, {type: blob.type})});
-      } else {
-        await client.invalidateQueries({ queryKey: ['findPetsByStatus'] });
-      }
-    }
-  }));
-
-  public mutationDelete = injectMutation((client: QueryClient) => ({
-    mutationFn: async (petId: number) => {
-      try {
-        await this.petStoreApi.deletePet({petId});
-      } catch (ex) {
-        // The backend respond with incorrect header application/json while the response is just a string
-        // console.log('ex', ex);
-        // We need to parse the string and return true only when the error is not an error.
-      }
-      return true;
-    },
-    onSuccess: async () => {
-      await client.invalidateQueries({ queryKey: ['findPetsByStatus'] });
-    }
-  }));
+  public pets = signal<Pet[]>([]);
 
   /**
    * List of pets filtered according to search term
    */
   public filteredPets = computed(() => {
-    let pets = this.pets.data();
+    let pets = this.pets();
     if (this.searchTerm()) {
       const matchString = new RegExp(this.searchTerm().replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&'), 'i');
       const matchTag = (tag: Tag) => tag.name && matchString.test(tag.name);
@@ -142,15 +86,38 @@ export class TanstackService {
   /** Base URL where the images can be fetched */
   public baseUrl = location.href.split('/#', 1)[0];
 
+  constructor() {
+    this.store.select(selectAllPetstore).subscribe((pets) => this.pets.set(pets));
+  }
+
+
   private getNextId() {
-    return this.pets.data().reduce((maxId: number, pet: Pet) => pet.id && pet.id < Number.MAX_SAFE_INTEGER ? Math.max(maxId, pet.id) : maxId, 0) + 1;
+    return this.pets().reduce((maxId: number, pet: Pet) => pet.id && pet.id < Number.MAX_SAFE_INTEGER ? Math.max(maxId, pet.id) : maxId, 0) + 1;
   }
 
+  // eslint-disable-next-line @angular-eslint/contextual-lifecycle, @typescript-eslint/explicit-member-accessibility
+  async ngOnInit(): Promise<void> {
+    await this.reload();
+  }
+
+  // How to abort the queries ?
+  public loadPets = async (/* abortSignal: AbortSignal*/) => {
+    const call = this.petStoreApi.findPetsByStatus({status: 'available'}/* , {signal: abortSignal}*/).then((pets: Pet[]) =>
+      pets.filter((p: Pet) => p.category?.name === 'otter').sort((a: Pet, b: Pet) => a.id && b.id && a.id - b.id || 0));
+    this.store.dispatch(setPetstoreEntitiesFromApi({call}));
+    try {
+      await call;
+    } catch (e) {
+      // eslint-disable-next-line no-console
+      console.log('error', e);
+    }
+  };
+
   /**
    * Trigger a full reload of the list of pets by calling the API
    */
   public async reload() {
-    await this.queryClient.invalidateQueries({ queryKey: ['findPetsByStatus'] });
+    await this.loadPets();
   }
 
 
@@ -166,15 +133,26 @@ export class TanstackService {
       status: 'available',
       photoUrls: this.petName() ? [this.petImage()] : []
     };
-    // this.mutationAdd.mutate(pet);
-    // this.store.dispatch()
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    this.store.dispatch(setPetstoreEntityFromApi({call: this.petStoreApi.addPet({Pet: pet})}));
+    // this.store.dispatch(setPetstoreEntityFromApi({call: this.petStoreApi.addPet({Pet: pet})}));
+
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    this.store.dispatch(upsertPetstoreEntitiesFromApi({call: this.petStoreApi.addPet({Pet: pet}).then(p => new Array<Pet>(p))}));
   }
 
-  public delete(petToDelete: Pet) {
+  // TODO
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  public async delete(petToDelete: Pet) {
     if (petToDelete.id) {
-      this.mutationDelete.mutate(petToDelete.id);
+      const call = this.petStoreApi.deletePet({petId: petToDelete.id});
+      // this.store.dispatch()  // here we need to create a new action to delete the elements
+      // an optimistic update would be to remove the element directly in the store
+      try {
+        await call;
+      } catch (error) {
+        // process with the error of deleting
+      }
+      await this.reload(); // because one element has been deleted
     }
   }
 
diff --git a/yarn.lock b/yarn.lock
index 5a78e741e5..4528910a4f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3480,8 +3480,8 @@ __metadata:
   linkType: hard
 
 "@csstools/selector-specificity@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "@csstools/selector-specificity@npm:3.0.2"
+  version: 3.0.3
+  resolution: "@csstools/selector-specificity@npm:3.0.3"
   peerDependencies:
     postcss-selector-parser: ^6.0.13
   checksum: 10/287f17aefe2f22a39cb1c01d45d9e2c4c8c7cf11d9af67c44fe14fa2ed2e11178406661d1b6b023c8a447cdb08933ac134352a0c1452d409af4e7db2570684f3
@@ -4224,7 +4224,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.6.1":
+"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
   version: 4.10.0
   resolution: "@eslint-community/regexpp@npm:4.10.0"
   checksum: 10/8c36169c815fc5d726078e8c71a5b592957ee60d08c6470f9ce0187c8046af1a00afbda0a065cc40ff18d5d83f82aed9793c6818f7304a74a7488dc9f3ecbd42
@@ -5990,88 +5990,88 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nrwl/angular@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nrwl/angular@npm:18.1.3"
+"@nrwl/angular@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nrwl/angular@npm:18.3.4"
   dependencies:
-    "@nx/angular": "npm:18.1.3"
+    "@nx/angular": "npm:18.3.4"
     tslib: "npm:^2.3.0"
-  checksum: 10/f36a3fd8e5429ad9b06b58a709ce41c43af758c279441f53798545454253744a3e8315bd467c0abada80d0daf8e640714c944c84bbd2b3cb7e34fa121f3a101d
+  checksum: 10/c492f3b804c745353754055918984e42994cd7e50528fb297b220d2bc7ee21f7707547fd9d0d23b4ee832d17d69980d7529785c2ee2e63b150862d78f0fe1ff3
   languageName: node
   linkType: hard
 
-"@nrwl/devkit@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nrwl/devkit@npm:18.1.3"
+"@nrwl/devkit@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nrwl/devkit@npm:18.3.4"
   dependencies:
-    "@nx/devkit": "npm:18.1.3"
-  checksum: 10/82f2dd6997c7ec9de78a73bdb2245cb5dd04c8e30e9b9bb05b07d2557ee88b232ce7b90bc08cecc30267b4e8ed4f0b64a1cc2f8aa6d6357c0c1f4dda5833e40a
+    "@nx/devkit": "npm:18.3.4"
+  checksum: 10/8741f48cc93cb81f3964a1220f1382d7441e87a200f3aa58e4e1af4d5b54c32da435e021cd503e62d1d36fdc08fe03ee042882e1aa0abc4af08cf3e35d5c090d
   languageName: node
   linkType: hard
 
-"@nrwl/eslint-plugin-nx@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nrwl/eslint-plugin-nx@npm:18.1.3"
+"@nrwl/eslint-plugin-nx@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nrwl/eslint-plugin-nx@npm:18.3.4"
   dependencies:
-    "@nx/eslint-plugin": "npm:18.1.3"
-  checksum: 10/4ba4fc558a49f1f2ced62e6c6c8c580b7611a0c2714e1e49b8cb27a0f9313fd7df2db665ff4993865ae47ac1691768cd52fbae2f3dd0895290ffe09a8f445fc5
+    "@nx/eslint-plugin": "npm:18.3.4"
+  checksum: 10/d66e89aabf077efd6ce83380c6adb20b774e28d299ac39a0f94c8a7ff9eaae47124e6b77388ec015b8ae1c7ffedc039a79fa223c8f006859c2b8662a20e80022
   languageName: node
   linkType: hard
 
-"@nrwl/jest@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nrwl/jest@npm:18.1.3"
+"@nrwl/jest@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nrwl/jest@npm:18.3.4"
   dependencies:
-    "@nx/jest": "npm:18.1.3"
-  checksum: 10/afad42a8ffb99d8b80fe3a1dd968d625ce3cd03fb2bb11ab3c75f6c30b02da9468f1c52856b5ba3a8a3dbfc2fd24311cf463879253fddb80616ec879395b0b39
+    "@nx/jest": "npm:18.3.4"
+  checksum: 10/481c2d57ccfe1f33e3304473f0221ca04da7b48b4ab5941e2748fe7083ed1e30d4c448b40042c8a77e37c435e29241a62bcd70edd61d4262dd10001ce7053946
   languageName: node
   linkType: hard
 
-"@nrwl/js@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nrwl/js@npm:18.1.3"
+"@nrwl/js@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nrwl/js@npm:18.3.4"
   dependencies:
-    "@nx/js": "npm:18.1.3"
-  checksum: 10/f0a2e0bff17abd5ce6e37095bee2c147d9c6a44cf6d27b030563cc94354c44caf9b9d8ac0104097af07971686b007f8b74467927182effaa0983ff92867356d3
+    "@nx/js": "npm:18.3.4"
+  checksum: 10/9b478c3b4cb52c6b0b4a027ab960d6c9ac4b8c2274c977363183f7e38d7f3e4405151a6b141135bfa626f04df35592e974757d6a1b7675933552ea8132e8ef81
   languageName: node
   linkType: hard
 
-"@nrwl/tao@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nrwl/tao@npm:18.1.3"
+"@nrwl/tao@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nrwl/tao@npm:18.3.4"
   dependencies:
-    nx: "npm:18.1.3"
+    nx: "npm:18.3.4"
     tslib: "npm:^2.3.0"
   bin:
     tao: index.js
-  checksum: 10/338bf2cf323dc1accf252ce6650f182b8550948cf647005178679ed36ef8e5ec49ef11f20f249b83e1be671fac9f1b6c186662a4412a0c086068209de0afdd58
+  checksum: 10/4aae6ddf4835244f91d2d7df0fc95b1f2b84aa8b6ec9af197e8f2b4e42fa402d4be467e9e584dbeebc490928ba2e0968da4cbb9cf233271b9752098e4626921a
   languageName: node
   linkType: hard
 
-"@nrwl/web@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nrwl/web@npm:18.1.3"
+"@nrwl/web@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nrwl/web@npm:18.3.4"
   dependencies:
-    "@nx/web": "npm:18.1.3"
-  checksum: 10/60647b958b2c6be0720f7ede846b7f6deff4d83aba64b53403006330edc81c945cb1d7fef265b2a84355cef76ca653e53efebd8865b0cd4ee710e2eb10bb9213
+    "@nx/web": "npm:18.3.4"
+  checksum: 10/323acd32513da18f1a6f89c7f879495be0ecff62bbd09091a8f1dcf54a7bc393a2a10c21b9c02cc3dceb04500858f27e2e5dad8e3315e9f2d7833e6b02ed081c
   languageName: node
   linkType: hard
 
-"@nrwl/webpack@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nrwl/webpack@npm:18.1.3"
+"@nrwl/webpack@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nrwl/webpack@npm:18.3.4"
   dependencies:
-    "@nx/webpack": "npm:18.1.3"
-  checksum: 10/4cfb8899bac23f085c69940b66782379537eb0a3be2508464b45584cbe8670a47f666a7e497416419ed482d28b0807ecac65b628188a8c68a0dac96144aec6bb
+    "@nx/webpack": "npm:18.3.4"
+  checksum: 10/feaed2848a23587d7da3cfcbe0f8c39dfb9354f455ab07e528f437c0c03383f7985974376acffe5b004a1c54bfe8f6e95de39a4c4b190ba9a9b4062c6ff1d603
   languageName: node
   linkType: hard
 
-"@nrwl/workspace@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nrwl/workspace@npm:18.1.3"
+"@nrwl/workspace@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nrwl/workspace@npm:18.3.4"
   dependencies:
-    "@nx/workspace": "npm:18.1.3"
-  checksum: 10/514d767fca84218bceb3761e98693251ccf3a0376ee5f7296927deb631f6a3020afc95cd53e4b947d1fefa20de4b79828477065fba32fd9ec0d5ce2722d577da
+    "@nx/workspace": "npm:18.3.4"
+  checksum: 10/8d23521887e05afeb9a4364f8123237391c666aa9b915e337be9d01567a943e5a5bb15c8a219bb2964469f8269a337d51e82aa4b7ac946a6dd0a2d23aed9fb6a
   languageName: node
   linkType: hard
 
@@ -6088,17 +6088,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nx/angular@npm:18.1.3, @nx/angular@npm:~18.1.0":
-  version: 18.1.3
-  resolution: "@nx/angular@npm:18.1.3"
-  dependencies:
-    "@nrwl/angular": "npm:18.1.3"
-    "@nx/devkit": "npm:18.1.3"
-    "@nx/eslint": "npm:18.1.3"
-    "@nx/js": "npm:18.1.3"
-    "@nx/web": "npm:18.1.3"
-    "@nx/webpack": "npm:18.1.3"
-    "@nx/workspace": "npm:18.1.3"
+"@nx/angular@npm:18.3.4, @nx/angular@npm:~18.3.0":
+  version: 18.3.4
+  resolution: "@nx/angular@npm:18.3.4"
+  dependencies:
+    "@nrwl/angular": "npm:18.3.4"
+    "@nx/devkit": "npm:18.3.4"
+    "@nx/eslint": "npm:18.3.4"
+    "@nx/js": "npm:18.3.4"
+    "@nx/web": "npm:18.3.4"
+    "@nx/webpack": "npm:18.3.4"
+    "@nx/workspace": "npm:18.3.4"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     "@typescript-eslint/type-utils": "npm:^7.3.0"
     chalk: "npm:^4.1.0"
@@ -6121,15 +6121,15 @@ __metadata:
   peerDependenciesMeta:
     esbuild:
       optional: true
-  checksum: 10/5c8fdd0d7d19f55cea16d74a3289cbe30a311c29619f905b38d8a70f58d555d8d1ca080311df88fef2d99c89b6761aed3bbfd595211174193822baa39e12cd2c
+  checksum: 10/4e2ef335e7811ed8358bb5b9c0bd360c6eaadf8c948262cf1d890d6f00aa1baa56347a7bf1d886856b4e08c3f17bb682c912d4e626943d4dce353cf364a148e7
   languageName: node
   linkType: hard
 
-"@nx/devkit@npm:18.1.3, @nx/devkit@npm:~18.1.0":
-  version: 18.1.3
-  resolution: "@nx/devkit@npm:18.1.3"
+"@nx/devkit@npm:18.3.4, @nx/devkit@npm:^17.2.8 || ^18.0.0":
+  version: 18.3.4
+  resolution: "@nx/devkit@npm:18.3.4"
   dependencies:
-    "@nrwl/devkit": "npm:18.1.3"
+    "@nrwl/devkit": "npm:18.3.4"
     ejs: "npm:^3.1.7"
     enquirer: "npm:~2.3.6"
     ignore: "npm:^5.0.4"
@@ -6138,20 +6138,20 @@ __metadata:
     tslib: "npm:^2.3.0"
     yargs-parser: "npm:21.1.1"
   peerDependencies:
-    nx: ">= 16 <= 18"
-  checksum: 10/7e84be5b3126051a485e2cf14d689473df626dbee9792aa23c4ded6a6c8fec671b981f678a1228b6d00a5ad8a5023915be7bb44bb111f7c3a90664058d60591f
+    nx: ">= 16 <= 19"
+  checksum: 10/a547004c1e5d934db8a0a27653bba9ca781e86c1590a9839a6e9befb41f9a5957fb3f3479216698d873008b9be681e415e15e795314a9406c909ed9c0c7021ab
   languageName: node
   linkType: hard
 
-"@nx/eslint-plugin@npm:18.1.3, @nx/eslint-plugin@npm:~18.1.0":
-  version: 18.1.3
-  resolution: "@nx/eslint-plugin@npm:18.1.3"
+"@nx/eslint-plugin@npm:18.3.4, @nx/eslint-plugin@npm:~18.3.0":
+  version: 18.3.4
+  resolution: "@nx/eslint-plugin@npm:18.3.4"
   dependencies:
-    "@nrwl/eslint-plugin-nx": "npm:18.1.3"
-    "@nx/devkit": "npm:18.1.3"
-    "@nx/js": "npm:18.1.3"
-    "@typescript-eslint/type-utils": "npm:^6.13.2"
-    "@typescript-eslint/utils": "npm:^6.13.2"
+    "@nrwl/eslint-plugin-nx": "npm:18.3.4"
+    "@nx/devkit": "npm:18.3.4"
+    "@nx/js": "npm:18.3.4"
+    "@typescript-eslint/type-utils": "npm:^7.3.0"
+    "@typescript-eslint/utils": "npm:^7.3.0"
     chalk: "npm:^4.1.0"
     confusing-browser-globals: "npm:^1.0.9"
     jsonc-eslint-parser: "npm:^2.1.0"
@@ -6163,17 +6163,17 @@ __metadata:
   peerDependenciesMeta:
     eslint-config-prettier:
       optional: true
-  checksum: 10/6f125550ec744d07d1f3519a5b40d01749eb95985e4da5c3f7a23d9622bf21ff2fe728316d74b758e8bf29b33c0b6235dd52b3ee6726e62b6579c133d697d5c8
+  checksum: 10/2faf222944b66ce54e180c067cee095165c9e6904b1c5176b6058f4a01aaae3b3378bccd7d23471c9b8f9309aac29d1542688c2f118eb89ff07833d1b2234d9c
   languageName: node
   linkType: hard
 
-"@nx/eslint@npm:18.1.3, @nx/eslint@npm:~18.1.0":
-  version: 18.1.3
-  resolution: "@nx/eslint@npm:18.1.3"
+"@nx/eslint@npm:18.3.4, @nx/eslint@npm:~18.3.0":
+  version: 18.3.4
+  resolution: "@nx/eslint@npm:18.3.4"
   dependencies:
-    "@nx/devkit": "npm:18.1.3"
-    "@nx/js": "npm:18.1.3"
-    "@nx/linter": "npm:18.1.3"
+    "@nx/devkit": "npm:18.3.4"
+    "@nx/js": "npm:18.3.4"
+    "@nx/linter": "npm:18.3.4"
     eslint: "npm:^8.0.0"
     tslib: "npm:^2.3.0"
     typescript: "npm:~5.4.2"
@@ -6182,19 +6182,19 @@ __metadata:
   peerDependenciesMeta:
     js-yaml:
       optional: true
-  checksum: 10/46eea087d91ce10cc9d50dbb0c7a49ebe636422aff34b8797e72a73bd005758f199a7a03f02fcf95c3612b493ff54dd15e0a2934507cb21aaae4cde7219ddb98
+  checksum: 10/9b3c2247ce3db67742728c015e44b5b472c2a54047ac8a0180a6f5fe9b5c57f06a133dae24bd39644d2b9d063877e62ecc135eb5ff0c80e214e7f4df6f6d3d98
   languageName: node
   linkType: hard
 
-"@nx/jest@npm:18.1.3, @nx/jest@npm:~18.1.0":
-  version: 18.1.3
-  resolution: "@nx/jest@npm:18.1.3"
+"@nx/jest@npm:18.3.4, @nx/jest@npm:~18.3.0":
+  version: 18.3.4
+  resolution: "@nx/jest@npm:18.3.4"
   dependencies:
     "@jest/reporters": "npm:^29.4.1"
     "@jest/test-result": "npm:^29.4.1"
-    "@nrwl/jest": "npm:18.1.3"
-    "@nx/devkit": "npm:18.1.3"
-    "@nx/js": "npm:18.1.3"
+    "@nrwl/jest": "npm:18.3.4"
+    "@nx/devkit": "npm:18.3.4"
+    "@nx/js": "npm:18.3.4"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     chalk: "npm:^4.1.0"
     identity-obj-proxy: "npm:3.0.0"
@@ -6205,13 +6205,13 @@ __metadata:
     resolve.exports: "npm:1.1.0"
     tslib: "npm:^2.3.0"
     yargs-parser: "npm:21.1.1"
-  checksum: 10/ef249eea9f389e8c98f5f9e84903f1f8fc8be035575e9f0d8c5f07325fa61db9dd870794dbdaa9c46df79d158ab2eedf8e4fade356df52ea682dfb9c3914f38d
+  checksum: 10/4afe7c1cfbf12cf13245d1da154f3f10b78830e56a73c9c4994ac466c72d6b4914a25e6449280e777e891e7e48d616354f0359e7d35b0fd5fe62a630b66277c1
   languageName: node
   linkType: hard
 
-"@nx/js@npm:18.1.3, @nx/js@npm:~18.1.0":
-  version: 18.1.3
-  resolution: "@nx/js@npm:18.1.3"
+"@nx/js@npm:18.3.4, @nx/js@npm:~18.3.0":
+  version: 18.3.4
+  resolution: "@nx/js@npm:18.3.4"
   dependencies:
     "@babel/core": "npm:^7.23.2"
     "@babel/plugin-proposal-decorators": "npm:^7.22.7"
@@ -6220,9 +6220,9 @@ __metadata:
     "@babel/preset-env": "npm:^7.23.2"
     "@babel/preset-typescript": "npm:^7.22.5"
     "@babel/runtime": "npm:^7.22.6"
-    "@nrwl/js": "npm:18.1.3"
-    "@nx/devkit": "npm:18.1.3"
-    "@nx/workspace": "npm:18.1.3"
+    "@nrwl/js": "npm:18.3.4"
+    "@nx/devkit": "npm:18.3.4"
+    "@nx/workspace": "npm:18.3.4"
     "@phenomnomnominal/tsquery": "npm:~5.0.1"
     babel-plugin-const-enum: "npm:^1.0.1"
     babel-plugin-macros: "npm:^2.8.0"
@@ -6248,112 +6248,112 @@ __metadata:
   peerDependenciesMeta:
     verdaccio:
       optional: true
-  checksum: 10/fa80ac503676259df0dc640e0e2661fd51070cf1568b1848aa240a9406c981e07b55289da820ff5c490b4002499fe47b9f25ef341487b45c7d20dbc8ac9e97ba
+  checksum: 10/b4f20dc21096f0f3c6865d246abc59b648dd710dfd3d8be19fdf14e61d34d609dbd3daa7dff5d7077595a39102428c7f4b66d1f1a9a7e50edf22b6372a1d78f2
   languageName: node
   linkType: hard
 
-"@nx/linter@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/linter@npm:18.1.3"
+"@nx/linter@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/linter@npm:18.3.4"
   dependencies:
-    "@nx/eslint": "npm:18.1.3"
-  checksum: 10/e807bfbdabfbac666e07815b8494e365414e7a1a04740413a8448dcbc30fe903de0b9fc8086a3cd594983c84eb6a5bf038188ed4f0d9d964e62d61ac09df8c90
+    "@nx/eslint": "npm:18.3.4"
+  checksum: 10/12e8cda6eb315e3e55ef52c0b42fbd7c0cd654c8a17c212aa7e14bd9e630560579437c85fca0f71b948dbaecb6f563178c00b79156d428682d3b665221861d9c
   languageName: node
   linkType: hard
 
-"@nx/nx-darwin-arm64@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/nx-darwin-arm64@npm:18.1.3"
+"@nx/nx-darwin-arm64@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/nx-darwin-arm64@npm:18.3.4"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@nx/nx-darwin-x64@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/nx-darwin-x64@npm:18.1.3"
+"@nx/nx-darwin-x64@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/nx-darwin-x64@npm:18.3.4"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@nx/nx-freebsd-x64@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/nx-freebsd-x64@npm:18.1.3"
+"@nx/nx-freebsd-x64@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/nx-freebsd-x64@npm:18.3.4"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm-gnueabihf@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.1.3"
+"@nx/nx-linux-arm-gnueabihf@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/nx-linux-arm-gnueabihf@npm:18.3.4"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm64-gnu@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/nx-linux-arm64-gnu@npm:18.1.3"
+"@nx/nx-linux-arm64-gnu@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/nx-linux-arm64-gnu@npm:18.3.4"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-arm64-musl@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/nx-linux-arm64-musl@npm:18.1.3"
+"@nx/nx-linux-arm64-musl@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/nx-linux-arm64-musl@npm:18.3.4"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-x64-gnu@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/nx-linux-x64-gnu@npm:18.1.3"
+"@nx/nx-linux-x64-gnu@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/nx-linux-x64-gnu@npm:18.3.4"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@nx/nx-linux-x64-musl@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/nx-linux-x64-musl@npm:18.1.3"
+"@nx/nx-linux-x64-musl@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/nx-linux-x64-musl@npm:18.3.4"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@nx/nx-win32-arm64-msvc@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/nx-win32-arm64-msvc@npm:18.1.3"
+"@nx/nx-win32-arm64-msvc@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/nx-win32-arm64-msvc@npm:18.3.4"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@nx/nx-win32-x64-msvc@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/nx-win32-x64-msvc@npm:18.1.3"
+"@nx/nx-win32-x64-msvc@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/nx-win32-x64-msvc@npm:18.3.4"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@nx/web@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/web@npm:18.1.3"
+"@nx/web@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/web@npm:18.3.4"
   dependencies:
-    "@nrwl/web": "npm:18.1.3"
-    "@nx/devkit": "npm:18.1.3"
-    "@nx/js": "npm:18.1.3"
+    "@nrwl/web": "npm:18.3.4"
+    "@nx/devkit": "npm:18.3.4"
+    "@nx/js": "npm:18.3.4"
     chalk: "npm:^4.1.0"
     detect-port: "npm:^1.5.1"
     http-server: "npm:^14.1.0"
     tslib: "npm:^2.3.0"
-  checksum: 10/d5254855738c074469af2996476467435a2585d0aaa3b00066f7180e48bc03adb004cba5e0e9a6f3f7c06d3e48ce055836854457bc63a6308cbac160a790b9de
+  checksum: 10/6718aa91d2ca031ec56c4579038f839e6c4f6f73823f9a0706fd68a6f2fe39e584133503f91c2afade5e90dbb12c756c6e6bfdafb703f7e71f231141b1b3a5f6
   languageName: node
   linkType: hard
 
-"@nx/webpack@npm:18.1.3":
-  version: 18.1.3
-  resolution: "@nx/webpack@npm:18.1.3"
+"@nx/webpack@npm:18.3.4":
+  version: 18.3.4
+  resolution: "@nx/webpack@npm:18.3.4"
   dependencies:
     "@babel/core": "npm:^7.23.2"
-    "@nrwl/webpack": "npm:18.1.3"
-    "@nx/devkit": "npm:18.1.3"
-    "@nx/js": "npm:18.1.3"
+    "@nrwl/webpack": "npm:18.3.4"
+    "@nx/devkit": "npm:18.3.4"
+    "@nx/js": "npm:18.3.4"
     ajv: "npm:^8.12.0"
     autoprefixer: "npm:^10.4.9"
     babel-loader: "npm:^9.1.2"
@@ -6387,22 +6387,22 @@ __metadata:
     webpack-dev-server: "npm:^4.9.3"
     webpack-node-externals: "npm:^3.0.0"
     webpack-subresource-integrity: "npm:^5.1.0"
-  checksum: 10/a597dbfb68de738b76014de3634bd9ee6ae2994afe6682ae4f2b41243263153d64233aeedadd9119379e30c66c3b96906afc839ee29f2ed43492497bf8c3c0ba
+  checksum: 10/bf6b9b9804cda9525249170d126aad7a8017b6a0b0b0c90870d252057a891f9a6f4d25996efeb5217f843cadee14983311a496ad9279743200dd47621f9cb521
   languageName: node
   linkType: hard
 
-"@nx/workspace@npm:18.1.3, @nx/workspace@npm:~18.1.0":
-  version: 18.1.3
-  resolution: "@nx/workspace@npm:18.1.3"
+"@nx/workspace@npm:18.3.4, @nx/workspace@npm:~18.3.0":
+  version: 18.3.4
+  resolution: "@nx/workspace@npm:18.3.4"
   dependencies:
-    "@nrwl/workspace": "npm:18.1.3"
-    "@nx/devkit": "npm:18.1.3"
+    "@nrwl/workspace": "npm:18.3.4"
+    "@nx/devkit": "npm:18.3.4"
     chalk: "npm:^4.1.0"
     enquirer: "npm:~2.3.6"
-    nx: "npm:18.1.3"
+    nx: "npm:18.3.4"
     tslib: "npm:^2.3.0"
     yargs-parser: "npm:21.1.1"
-  checksum: 10/1b16f504ee977e29582326f6c2b2fd33df634557975d4c5d2446d6f6f3ea8e5583ccf08289b87c6c3934077d87fd85dcc55d0824e4cc9037b0cba75b3f60464b
+  checksum: 10/fd171376db1aba7febf5d9bd48ad2bb10dece14efbe892a62cd7bc68eab52c0a213b299ed1f4191c79434a51ddbece3c8f3d9de00e1833c6c135c7210e8b48b9
   languageName: node
   linkType: hard
 
@@ -10726,14 +10726,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sigstore/verify@npm:^1.1.0":
-  version: 1.1.1
-  resolution: "@sigstore/verify@npm:1.1.1"
+"@sigstore/verify@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "@sigstore/verify@npm:1.2.0"
   dependencies:
-    "@sigstore/bundle": "npm:^2.2.0"
+    "@sigstore/bundle": "npm:^2.3.1"
     "@sigstore/core": "npm:^1.1.0"
-    "@sigstore/protobuf-specs": "npm:^0.3.0"
-  checksum: 10/9086ddb2c050a14758f6633ddf09c69072fe1e4dca9a9da1e5983e788bd415b85d15315b6a1f001013eb0dcc404c3781a0698fff0fe290d1e5571450c4998e04
+    "@sigstore/protobuf-specs": "npm:^0.3.1"
+  checksum: 10/f93728c425528120b1863f04ed2fdd55915ad0c773153e623bd4d32137067d85f2e139bd14e8779883394ae502f1fd0e2094d559eac4225d31ee617127218720
   languageName: node
   linkType: hard
 
@@ -12515,13 +12515,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/scheduler@npm:*":
-  version: 0.23.0
-  resolution: "@types/scheduler@npm:0.23.0"
-  checksum: 10/874d753aa65c17760dfc460a91e6df24009bde37bfd427a031577b30262f7770c1b8f71a21366c7dbc76111967384cf4090a31d65315155180ef14bd7acccb32
-  languageName: node
-  linkType: hard
-
 "@types/scheduler@npm:^0.16":
   version: 0.16.8
   resolution: "@types/scheduler@npm:0.16.8"
@@ -12781,16 +12774,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:7.7.0":
-  version: 7.7.0
-  resolution: "@typescript-eslint/scope-manager@npm:7.7.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:7.7.0"
-    "@typescript-eslint/visitor-keys": "npm:7.7.0"
-  checksum: 10/c8890aaf99b57543774e50549c5b178c13695b21a6b30c65292268137fe5e6856cc0e050c118b47b5835dd8a48c96e042fc75891a7f6093a0b94b6b3b251afd9
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/scope-manager@npm:7.4.0":
   version: 7.4.0
   resolution: "@typescript-eslint/scope-manager@npm:7.4.0"
@@ -12801,6 +12784,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:7.7.1":
+  version: 7.7.1
+  resolution: "@typescript-eslint/scope-manager@npm:7.7.1"
+  dependencies:
+    "@typescript-eslint/types": "npm:7.7.1"
+    "@typescript-eslint/visitor-keys": "npm:7.7.1"
+  checksum: 10/7823cd15e7205d2c0d9e69432717c385b2ecd7559d5edba79113c2e97c6c5e8ca3dae9343a734bc740be97e096bfcb9dfb81a3da697f9fbf5600a56a42cf70e9
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/type-utils@npm:7.2.0":
   version: 7.2.0
   resolution: "@typescript-eslint/type-utils@npm:7.2.0"
@@ -12835,20 +12828,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:^6.13.2, @typescript-eslint/type-utils@npm:^6.9.1":
-  version: 6.21.0
-  resolution: "@typescript-eslint/type-utils@npm:6.21.0"
+"@typescript-eslint/type-utils@npm:^7.3.0":
+  version: 7.7.1
+  resolution: "@typescript-eslint/type-utils@npm:7.7.1"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.21.0"
-    "@typescript-eslint/utils": "npm:6.21.0"
+    "@typescript-eslint/typescript-estree": "npm:7.7.1"
+    "@typescript-eslint/utils": "npm:7.7.1"
     debug: "npm:^4.3.4"
-    ts-api-utils: "npm:^1.0.1"
+    ts-api-utils: "npm:^1.3.0"
   peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
+    eslint: ^8.56.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10/d03fb3ee1caa71f3ce053505f1866268d7ed79ffb7fed18623f4a1253f5b8f2ffc92636d6fd08fcbaf5bd265a6de77bf192c53105131e4724643dfc910d705fc
+  checksum: 10/c64dfd3e535741270012d289d1327e487df877adfa8a9920b1f8d6616f3b7159ef8ee1d6b62e866b6a5c64d675c5008e87f4ea20b5fc032e95f197a749d38ae6
   languageName: node
   linkType: hard
 
@@ -12873,13 +12866,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:7.3.1":
-  version: 7.3.1
-  resolution: "@typescript-eslint/types@npm:7.3.1"
-  checksum: 10/c9c8eae1cf937cececd99a253bd65eb71b40206e79cf917ad9c3b3ab80cc7ce5fefb2804f9fd2a70e7438951f0d1e63df3031fc61e3a08dfef5fde208a12e0ed
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/types@npm:7.4.0, @typescript-eslint/types@npm:^7.2.0":
   version: 7.4.0
   resolution: "@typescript-eslint/types@npm:7.4.0"
@@ -12887,6 +12873,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:7.7.1":
+  version: 7.7.1
+  resolution: "@typescript-eslint/types@npm:7.7.1"
+  checksum: 10/a1ecbaf3b8a5243394d421644f2b3eb164feea645e36dd07f1afb5008598201f19c7988141fc162c647f380dda7cf571017c0eabbbc4c5432b0143383853e134
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:5.62.0":
   version: 5.62.0
   resolution: "@typescript-eslint/typescript-estree@npm:5.62.0"
@@ -12943,25 +12936,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:7.7.0":
-  version: 7.7.0
-  resolution: "@typescript-eslint/typescript-estree@npm:7.7.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:7.7.0"
-    "@typescript-eslint/visitor-keys": "npm:7.7.0"
-    debug: "npm:^4.3.4"
-    globby: "npm:^11.1.0"
-    is-glob: "npm:^4.0.3"
-    minimatch: "npm:^9.0.4"
-    semver: "npm:^7.6.0"
-    ts-api-utils: "npm:^1.3.0"
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 10/363ad9864b56394b4000dff7c2b77d0ea52042c3c20e3b86c0f3c66044915632d9890255527c6f3a5ef056886dec72e38fbcfce49d4ad092c160440f54128230
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/typescript-estree@npm:7.4.0":
   version: 7.4.0
   resolution: "@typescript-eslint/typescript-estree@npm:7.4.0"
@@ -12981,20 +12955,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.21.0, @typescript-eslint/utils@npm:^6.13.2, @typescript-eslint/utils@npm:^6.21.0":
-  version: 6.21.0
-  resolution: "@typescript-eslint/utils@npm:6.21.0"
+"@typescript-eslint/typescript-estree@npm:7.7.1":
+  version: 7.7.1
+  resolution: "@typescript-eslint/typescript-estree@npm:7.7.1"
   dependencies:
-    "@eslint-community/eslint-utils": "npm:^4.4.0"
-    "@types/json-schema": "npm:^7.0.12"
-    "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.21.0"
-    "@typescript-eslint/types": "npm:6.21.0"
-    "@typescript-eslint/typescript-estree": "npm:6.21.0"
-    semver: "npm:^7.5.4"
-  peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  checksum: 10/b404a2c55a425a79d054346ae123087d30c7ecf7ed7abcf680c47bf70c1de4fabadc63434f3f460b2fa63df76bc9e4a0b9fa2383bb8a9fcd62733fb5c4e4f3e3
+    "@typescript-eslint/types": "npm:7.7.1"
+    "@typescript-eslint/visitor-keys": "npm:7.7.1"
+    debug: "npm:^4.3.4"
+    globby: "npm:^11.1.0"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:^9.0.4"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10/df5fe6c573b15e8058b88d1535eeca11115118adc54225f511d2762d74e2d453205ba27e63f6666cb5f3dc73d639208a183fb05db1f75063b115d52b1fae3e20
   languageName: node
   linkType: hard
 
@@ -13032,6 +13008,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/utils@npm:7.7.1, @typescript-eslint/utils@npm:^7.3.0, @typescript-eslint/utils@npm:~7.7.0":
+  version: 7.7.1
+  resolution: "@typescript-eslint/utils@npm:7.7.1"
+  dependencies:
+    "@eslint-community/eslint-utils": "npm:^4.4.0"
+    "@types/json-schema": "npm:^7.0.15"
+    "@types/semver": "npm:^7.5.8"
+    "@typescript-eslint/scope-manager": "npm:7.7.1"
+    "@typescript-eslint/types": "npm:7.7.1"
+    "@typescript-eslint/typescript-estree": "npm:7.7.1"
+    semver: "npm:^7.6.0"
+  peerDependencies:
+    eslint: ^8.56.0
+  checksum: 10/5a352c3a849300b5d676bf5f451418a2fb0cd3ab515f3733521ad03cf047849c52c76f6e5d2406e08f6d0dbad3a4708b490f909c91a1a9e3d73060a750b3bca2
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/utils@npm:^5.10.0":
   version: 5.62.0
   resolution: "@typescript-eslint/utils@npm:5.62.0"
@@ -13050,20 +13043,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:~7.3.0":
-  version: 7.3.1
-  resolution: "@typescript-eslint/utils@npm:7.3.1"
+"@typescript-eslint/utils@npm:^6.21.0":
+  version: 6.21.0
+  resolution: "@typescript-eslint/utils@npm:6.21.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:7.3.1"
-    "@typescript-eslint/types": "npm:7.3.1"
-    "@typescript-eslint/typescript-estree": "npm:7.3.1"
+    "@typescript-eslint/scope-manager": "npm:6.21.0"
+    "@typescript-eslint/types": "npm:6.21.0"
+    "@typescript-eslint/typescript-estree": "npm:6.21.0"
     semver: "npm:^7.5.4"
   peerDependencies:
-    eslint: ^8.56.0
-  checksum: 10/234d9d65fe5d0f4a31345bd8f5a6f2879a578b3a531a14c2b3edaa7fb587c71d26249f86c41857382c0405384dc104955c02b588b3cee6fc2734f1ae40aef07b
+    eslint: ^7.0.0 || ^8.0.0
+  checksum: 10/b404a2c55a425a79d054346ae123087d30c7ecf7ed7abcf680c47bf70c1de4fabadc63434f3f460b2fa63df76bc9e4a0b9fa2383bb8a9fcd62733fb5c4e4f3e3
   languageName: node
   linkType: hard
 
@@ -13097,16 +13090,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:7.7.0":
-  version: 7.7.0
-  resolution: "@typescript-eslint/visitor-keys@npm:7.7.0"
-  dependencies:
-    "@typescript-eslint/types": "npm:7.7.0"
-    eslint-visitor-keys: "npm:^3.4.3"
-  checksum: 10/9f03591ab60b0b164f6bb222b5d5ae75f73fbe7f264be9318f770be9dc5dff8138d34701928940ffc18924058ae80754a738a1e623912a297d57a8a59cdfb41d
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:7.4.0":
   version: 7.4.0
   resolution: "@typescript-eslint/visitor-keys@npm:7.4.0"
@@ -13117,6 +13100,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:7.7.1":
+  version: 7.7.1
+  resolution: "@typescript-eslint/visitor-keys@npm:7.7.1"
+  dependencies:
+    "@typescript-eslint/types": "npm:7.7.1"
+    eslint-visitor-keys: "npm:^3.4.3"
+  checksum: 10/dcc5748b10bb1b169516b33e87b6d86b562e25725a95e5ac515cb197589d9667aaa7cfffa93234095a73c80addb6dd88e2a9ab01d2be0c274254b5be1ca4057a
+  languageName: node
+  linkType: hard
+
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
@@ -17796,6 +17789,37 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-object-atoms@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "es-object-atoms@npm:1.0.0"
+  dependencies:
+    es-errors: "npm:^1.3.0"
+  checksum: 10/f8910cf477e53c0615f685c5c96210591841850871b81924fcf256bfbaa68c254457d994a4308c60d15b20805e7f61ce6abc669375e01a5349391a8c1767584f
+  languageName: node
+  linkType: hard
+
+"es-set-tostringtag@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "es-set-tostringtag@npm:2.0.3"
+  dependencies:
+    get-intrinsic: "npm:^1.2.4"
+    has-tostringtag: "npm:^1.0.2"
+    hasown: "npm:^2.0.1"
+  checksum: 10/7227fa48a41c0ce83e0377b11130d324ac797390688135b8da5c28994c0165be8b252e15cd1de41e1325e5a5412511586960213e88f9ab4a5e7d028895db5129
+  languageName: node
+  linkType: hard
+
+"es-to-primitive@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "es-to-primitive@npm:1.2.1"
+  dependencies:
+    is-callable: "npm:^1.1.4"
+    is-date-object: "npm:^1.0.1"
+    is-symbol: "npm:^1.0.2"
+  checksum: 10/74aeeefe2714cf99bb40cab7ce3012d74e1e2c1bd60d0a913b467b269edde6e176ca644b5ba03a5b865fb044a29bca05671cd445c85ca2cdc2de155d7fc8fe9b
+  languageName: node
+  linkType: hard
+
 "es-vary@npm:^0.1.1":
   version: 0.1.2
   resolution: "es-vary@npm:0.1.2"
@@ -20363,13 +20387,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hexoid@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "hexoid@npm:1.0.0"
-  checksum: 10/f2271b8b6b0e13fb5a1eccf740f53ce8bae689c80b9498b854c447f9dc94f75f44e0de064c0e4660ecdbfa8942bb2b69973fdcb080187b45bbb409a3c71f19d4
-  languageName: node
-  linkType: hard
-
 "highlight.js@npm:^11.8.0":
   version: 11.9.0
   resolution: "highlight.js@npm:11.9.0"
@@ -23886,15 +23903,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime@npm:^2.0.3":
-  version: 2.6.0
-  resolution: "mime@npm:2.6.0"
-  bin:
-    mime: cli.js
-  checksum: 10/7da117808b5cd0203bb1b5e33445c330fe213f4d8ee2402a84d62adbde9716ca4fb90dd6d9ab4e77a4128c6c5c24a9c4c9f6a4d720b095b1b342132d02dba58d
-  languageName: node
-  linkType: hard
-
 "mime@npm:4.0.1":
   version: 4.0.1
   resolution: "mime@npm:4.0.1"
@@ -23904,6 +23912,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mime@npm:^2.0.3":
+  version: 2.6.0
+  resolution: "mime@npm:2.6.0"
+  bin:
+    mime: cli.js
+  checksum: 10/7da117808b5cd0203bb1b5e33445c330fe213f4d8ee2402a84d62adbde9716ca4fb90dd6d9ab4e77a4128c6c5c24a9c4c9f6a4d720b095b1b342132d02dba58d
+  languageName: node
+  linkType: hard
+
 "mimic-fn@npm:^2.1.0":
   version: 2.1.0
   resolution: "mimic-fn@npm:2.1.0"
@@ -24838,21 +24855,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nx@npm:18.1.3, nx@npm:~18.1.0":
-  version: 18.1.3
-  resolution: "nx@npm:18.1.3"
-  dependencies:
-    "@nrwl/tao": "npm:18.1.3"
-    "@nx/nx-darwin-arm64": "npm:18.1.3"
-    "@nx/nx-darwin-x64": "npm:18.1.3"
-    "@nx/nx-freebsd-x64": "npm:18.1.3"
-    "@nx/nx-linux-arm-gnueabihf": "npm:18.1.3"
-    "@nx/nx-linux-arm64-gnu": "npm:18.1.3"
-    "@nx/nx-linux-arm64-musl": "npm:18.1.3"
-    "@nx/nx-linux-x64-gnu": "npm:18.1.3"
-    "@nx/nx-linux-x64-musl": "npm:18.1.3"
-    "@nx/nx-win32-arm64-msvc": "npm:18.1.3"
-    "@nx/nx-win32-x64-msvc": "npm:18.1.3"
+"nx@npm:18.3.4, nx@npm:^17.2.8 || ^18.0.0, nx@npm:~18.3.0":
+  version: 18.3.4
+  resolution: "nx@npm:18.3.4"
+  dependencies:
+    "@nrwl/tao": "npm:18.3.4"
+    "@nx/nx-darwin-arm64": "npm:18.3.4"
+    "@nx/nx-darwin-x64": "npm:18.3.4"
+    "@nx/nx-freebsd-x64": "npm:18.3.4"
+    "@nx/nx-linux-arm-gnueabihf": "npm:18.3.4"
+    "@nx/nx-linux-arm64-gnu": "npm:18.3.4"
+    "@nx/nx-linux-arm64-musl": "npm:18.3.4"
+    "@nx/nx-linux-x64-gnu": "npm:18.3.4"
+    "@nx/nx-linux-x64-musl": "npm:18.3.4"
+    "@nx/nx-win32-arm64-msvc": "npm:18.3.4"
+    "@nx/nx-win32-x64-msvc": "npm:18.3.4"
     "@yarnpkg/lockfile": "npm:^1.1.0"
     "@yarnpkg/parsers": "npm:3.0.0-rc.46"
     "@zkochan/js-yaml": "npm:0.0.6"
@@ -24918,7 +24935,7 @@ __metadata:
   bin:
     nx: bin/nx.js
     nx-cloud: bin/nx-cloud.js
-  checksum: 10/216b91cda546c949fb4cc64ee036d1510482ceb6668f6f157d5c25c47dae179e26792867b163a68ca735f90559dfb04f7c811c791ef4d26cdd8799c498fec880
+  checksum: 10/7f1255c04ad4a558f3eed0d134742742d5571cf25628cb7acb178f70b3c5561bdfd6f5dee634625df6dba93edc02900a2eb139439eaa262c59f05985b11d6dd0
   languageName: node
   linkType: hard
 
@@ -28993,6 +29010,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stoppable@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "stoppable@npm:1.1.0"
+  checksum: 10/63104fcbdece130bc4906fd982061e763d2ef48065ed1ab29895e5ad00552c625f8a4c50c9cd2e3bfa805c8a2c3bfdda0f07c5ae39694bd2d5cb0bee1618d1e9
+  languageName: node
+  linkType: hard
+
 "store2@npm:^2.14.2":
   version: 2.14.3
   resolution: "store2@npm:2.14.3"