@verisoft/store 18.1.0 → 18.3.0

package/src/lib/detail-state/detail.reducer.ts

@@ -1,122 +1,147 @@
-import { ActionCreator, createReducer, on, ReducerTypes } from '@ngrx/store';
-import {
-  createInitDetailAction,
-  createLoadDetailFailureAction,
-  createLoadDetailSuccessAction,
-  createResetStateAction,
-  createSaveDetailAction,
-  createSaveDetailFailureAction,
-  createSaveDetailSuccessAction,
-  createUpdateDetailAction,
-  createUpdateFormStateAction,
-} from './detail.actions';
-import {
-  DetailState,
-  INITIAL_DETAIL_STATE,
-  INITIAL_SAVE_ITEM_STATE,
-} from './detail.models';
-
-export function createDetailReducers<
-  T = any,
-  TState extends DetailState<T> = DetailState<T>
->(
-  detailRepository: string,
-  initialState: TState = INITIAL_DETAIL_STATE as unknown as TState,
-  ...ons: ReducerTypes<TState, readonly ActionCreator[]>[]
-) {
-  return createReducer(
-    initialState,
-    on(createInitDetailAction(detailRepository), (state) => {
-      return {
-        ...state,
-        loaded: false,
-        error: null,
-      };
-    }),
-
-    on(createLoadDetailSuccessAction(detailRepository), (state, { item }) => {
-      return {
-        ...state,
-        loaded: true,
-        item,
-      };
-    }),
-
-    on(createLoadDetailFailureAction(detailRepository), (state, { error }) => {
-      return {
-        ...state,
-        loaded: true,
-        error,
-      };
-    }),
-
-    on(createUpdateDetailAction(detailRepository), (state, { item }) => {
-      return {
-        ...state,
-        item,
-        formState: {
-          dirty: true,
-          valid: state.formState?.valid ?? true,
-        },
-      };
-    }),
-
-    on(
-      createUpdateFormStateAction(detailRepository),
-      (state, { formState }) => {
-        return {
-          ...state,
-          formState,
-        };
-      }
-    ),
-
-    on(createSaveDetailSuccessAction(detailRepository), (state) => {
-      return {
-        ...state,
-        formState: {
-          dirty: false,
-          valid: state.formState?.valid ?? true,
-        },
-      };
-    }),
-    on(createResetStateAction(detailRepository), () => {
-      return {
-        ...(initialState as any),
-      };
-    }),
-    ...ons
-  );
-}
-
-export function createSaveDetailReducers(
-  detailRepository: string,
-  initialState = INITIAL_SAVE_ITEM_STATE
-) {
-  return createReducer(
-    initialState,
-
-    on(createSaveDetailAction(detailRepository), (state) => {
-      return {
-        ...state,
-        saveInProgress: true,
-      };
-    }),
-
-    on(createSaveDetailSuccessAction(detailRepository), (state, { item }) => {
-      return {
-        ...state,
-        item,
-        saveInProgress: false,
-      };
-    }),
-
-    on(createSaveDetailFailureAction(detailRepository), (state, { error }) => {
-      return {
-        ...state,
-        error,
-        saveInProgress: false,
-      };
-    })
-  );
-}
+import { ActionCreator, createReducer, on, ReducerTypes } from '@ngrx/store';
+import {
+  createInitDetailAction,
+  createInitNewDetailAction,
+  createLoadDetailFailureAction,
+  createLoadDetailSuccessAction,
+  createResetStateAction,
+  createSaveDetailAction,
+  createSaveDetailFailureAction,
+  createSaveDetailSuccessAction,
+  createUpdateDetailAction,
+  createUpdateDetailSetErrorsAction,
+  createUpdateFormStateAction,
+} from './detail.actions';
+import {
+  DetailState,
+  INITIAL_DETAIL_STATE,
+  INITIAL_SAVE_ITEM_STATE,
+} from './detail.models';
+
+export function createDetailReducers<
+  T = any,
+  TState extends DetailState<T> = DetailState<T>
+>(
+  detailRepository: string,
+  initialState: TState = INITIAL_DETAIL_STATE as unknown as TState,
+  ...ons: ReducerTypes<TState, readonly ActionCreator[]>[]
+) {
+  return createReducer(
+    initialState,
+    on(createInitDetailAction(detailRepository), (state) => {
+      return {
+        ...state,
+        loaded: false,
+        error: null,
+      };
+    }),
+
+    on(createInitNewDetailAction(detailRepository), (state) => {
+      return {
+        ...state,
+        loaded: false,
+        error: null,
+      };
+    }),
+
+    on(createLoadDetailSuccessAction(detailRepository), (state, { item }) => {
+      return {
+        ...state,
+        loaded: true,
+        item,
+      };
+    }),
+
+    on(createLoadDetailFailureAction(detailRepository), (state, { error }) => {
+      return {
+        ...state,
+        loaded: true,
+        error,
+      };
+    }),
+
+    on(createUpdateDetailAction(detailRepository), (state, { item }) => {
+      return {
+        ...state,
+        item,
+        formState: {
+          dirty: true,
+          valid: state.formState?.valid ?? true,
+        },
+      };
+    }),
+
+    on(createUpdateDetailSetErrorsAction(detailRepository), (state, { error }) => {
+      return {
+        ...state,
+        backendValidationErrors: error
+      }
+    }),
+
+    on(
+      createUpdateFormStateAction(detailRepository),
+      (state, { formState }) => {
+        return {
+          ...state,
+          formState,
+        };
+      }
+    ),
+
+    on(createSaveDetailSuccessAction(detailRepository), (state) => {
+      return {
+        ...state,
+        formState: {
+          dirty: false,
+          valid: state.formState?.valid ?? true,
+        },
+      };
+    }),
+    
+    on(createResetStateAction(detailRepository), () => {
+      return {
+        ...(initialState as any),
+      };
+    }),
+    
+    on(createSaveDetailFailureAction(detailRepository), (state, { error }) => {
+      return {
+        ...state,
+        backendValidationErrors: error.error
+      }
+    }),
+    ...ons
+  );
+}
+
+export function createSaveDetailReducers(
+  detailRepository: string,
+  initialState = INITIAL_SAVE_ITEM_STATE
+) {
+  return createReducer(
+    initialState,
+
+    on(createSaveDetailAction(detailRepository), (state) => {
+      return {
+        ...state,
+        saveInProgress: true,
+      };
+    }),
+
+    on(createSaveDetailSuccessAction(detailRepository), (state, { item }) => {
+      return {
+        ...state,
+        item,
+        saveInProgress: false,
+      };
+    }),
+
+    on(createSaveDetailFailureAction(detailRepository), (state, { error }) => {
+      return {
+        ...state,
+        error,
+        saveInProgress: false,
+      };
+    })
+  );
+}

package/src/lib/table-state/actions.ts

@@ -1,93 +1,93 @@
-import { createAction, props } from '@ngrx/store';
-import { Page, Sort } from '@verisoft/core';
-
-enum TablePageAction {
-  GET_PAGE = 'Get page',
-  CREATE_STATIC_FILTER = 'Create static filter',
-  DATA_LOAD_SUCCESS = 'Data load success',
-  DATA_LOAD_ERROR = 'Data load error',
-  REFRESH_PAGE = 'Refresh page',
-  FILTER_PAGE = 'Filter page',
-  CHANGE_PAGE_SIZE = 'Change page size',
-  SORT_PAGE = 'Sort page',
-  DESTROY = 'Destroy',
-  SELECT_ITEMS = 'Select items',
-  REMOVE_RANGE = 'Remove range',
-}
-
-export function createGetPageTableAction<T = any>(tableRepository: string) {
-  return createAction(
-    `${tableRepository} ${TablePageAction.GET_PAGE}`,
-    props<{
-      page: number;
-      size: number;
-      id?: string | null;
-      filter?: Partial<T>;
-      sort?: Sort<T>[];
-    }>()
-  );
-}
-
-export function createStaticFilterTableAction<T = any>(
-  tableRepository: string
-) {
-  return createAction(
-    `${tableRepository} ${TablePageAction.CREATE_STATIC_FILTER}`,
-    props<{
-      filter?: Partial<T>;
-    }>()
-  );
-}
-
-export function createDataLoadSuccessTableAction<T>(tableRepository: string) {
-  return createAction(
-    `${tableRepository} ${TablePageAction.DATA_LOAD_SUCCESS}`,
-    props<{ gPage: Page<T> }>()
-  );
-}
-
-export function createDataLoadErrorTableAction(tableRepository: string) {
-  return createAction(
-    `${tableRepository} ${TablePageAction.DATA_LOAD_ERROR}`,
-    props<{ error: any }>()
-  );
-}
-
-export function createChangePageSizeTableAction(tableRepository: string) {
-  return createAction(
-    `${tableRepository} ${TablePageAction.CHANGE_PAGE_SIZE}`,
-    props<{ size: number }>()
-  );
-}
-
-// TODO: use action in delete item effect
-export function createRefreshPageTableAction(tableRepository: string) {
-  return createAction(`${tableRepository} ${TablePageAction.REFRESH_PAGE}`);
-}
-
-export function createFilterPageTableAction<T>(tableRepository: string) {
-  return createAction(
-    `${tableRepository} ${TablePageAction.REFRESH_PAGE}`,
-    props<{ filter: Partial<T> }>()
-  );
-}
-
-export function createResetTableFilterAction(tableRepository: string) {
-  return createAction(`${tableRepository} ${TablePageAction.REFRESH_PAGE}`);
-}
-
-export function createDestroyTableAction(tableRepository: string) {
-  return createAction(`${tableRepository} ${TablePageAction.DESTROY}`);
-}
-
-export function createSelectItemsTableAction<T>(tableRepository: string) {
-  return createAction(
-    `${tableRepository} ${TablePageAction.SELECT_ITEMS}`,
-    props<{ selectedItems: T[] }>()
-  );
-}
-
-export function createRemoveRangeTableAction(tableRepository: string) {
-  return createAction(`${tableRepository} ${TablePageAction.REMOVE_RANGE}`
-  );
+import { createAction, props } from '@ngrx/store';
+import { Page, Sort } from '@verisoft/core';
+
+enum TablePageAction {
+  GET_PAGE = 'Get page',
+  CREATE_STATIC_FILTER = 'Create static filter',
+  DATA_LOAD_SUCCESS = 'Data load success',
+  DATA_LOAD_ERROR = 'Data load error',
+  REFRESH_PAGE = 'Refresh page',
+  FILTER_PAGE = 'Filter page',
+  CHANGE_PAGE_SIZE = 'Change page size',
+  SORT_PAGE = 'Sort page',
+  DESTROY = 'Destroy',
+  SELECT_ITEMS = 'Select items',
+  REMOVE_RANGE = 'Remove range',
+}
+
+export function createGetPageTableAction<T = any>(tableRepository: string) {
+  return createAction(
+    `${tableRepository} ${TablePageAction.GET_PAGE}`,
+    props<{
+      page: number;
+      size: number;
+      id?: string | null;
+      filter?: Partial<T>;
+      sort?: Sort[];
+    }>()
+  );
+}
+
+export function createStaticFilterTableAction<T = any>(
+  tableRepository: string
+) {
+  return createAction(
+    `${tableRepository} ${TablePageAction.CREATE_STATIC_FILTER}`,
+    props<{
+      filter?: Partial<T>;
+    }>()
+  );
+}
+
+export function createDataLoadSuccessTableAction<T>(tableRepository: string) {
+  return createAction(
+    `${tableRepository} ${TablePageAction.DATA_LOAD_SUCCESS}`,
+    props<{ gPage: Page<T> }>()
+  );
+}
+
+export function createDataLoadErrorTableAction(tableRepository: string) {
+  return createAction(
+    `${tableRepository} ${TablePageAction.DATA_LOAD_ERROR}`,
+    props<{ error: any }>()
+  );
+}
+
+export function createChangePageSizeTableAction(tableRepository: string) {
+  return createAction(
+    `${tableRepository} ${TablePageAction.CHANGE_PAGE_SIZE}`,
+    props<{ size: number }>()
+  );
+}
+
+// TODO: use action in delete item effect
+export function createRefreshPageTableAction(tableRepository: string) {
+  return createAction(`${tableRepository} ${TablePageAction.REFRESH_PAGE}`);
+}
+
+export function createFilterPageTableAction<T>(tableRepository: string) {
+  return createAction(
+    `${tableRepository} ${TablePageAction.REFRESH_PAGE}`,
+    props<{ filter: Partial<T> }>()
+  );
+}
+
+export function createResetTableFilterAction(tableRepository: string) {
+  return createAction(`${tableRepository} ${TablePageAction.REFRESH_PAGE}`);
+}
+
+export function createDestroyTableAction(tableRepository: string) {
+  return createAction(`${tableRepository} ${TablePageAction.DESTROY}`);
+}
+
+export function createSelectItemsTableAction<T>(tableRepository: string) {
+  return createAction(
+    `${tableRepository} ${TablePageAction.SELECT_ITEMS}`,
+    props<{ selectedItems: T[] }>()
+  );
+}
+
+export function createRemoveRangeTableAction(tableRepository: string) {
+  return createAction(`${tableRepository} ${TablePageAction.REMOVE_RANGE}`
+  );
 }

package/src/lib/table-state/effects.ts

@@ -1,100 +1,100 @@
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import {  createFeatureSelector, createSelector, Store } from '@ngrx/store';
-import { BaseHttpService, DEFAULT_SEARCH_LIMIT, Page, RequestParams } from '@verisoft/core';
-import { catchError, map, Observable, of, switchMap, withLatestFrom } from 'rxjs';
-import {
-  createGetPageTableAction,
-  createDataLoadSuccessTableAction,
-  createDataLoadErrorTableAction,
-  createRemoveRangeTableAction,
-} from './actions';
-import { TableState } from './models';
-
-export interface CreateGetPageActionConfig<T> {
-  service?: BaseHttpService<T>;
-  fetchList?: (requestParams: RequestParams<any>) => Observable<Page<T>>;
-  snackbar?: any;
-  ngrxFeatureKey?: string;
-  requireFilters?: boolean;
-}
-
-export function createGetPageTableEffect<T>(
-  tableRepository: string,
-  actions$: Actions,
-  config: CreateGetPageActionConfig<T>
-) {
-  return createEffect(() => {
-    return actions$.pipe(
-      ofType(createGetPageTableAction(tableRepository)),
-      switchMap(({ page, filter, sort, size }) => {
-        const requestParams: RequestParams<any> = {
-          page,
-          sort,
-          filter,
-          size,
-        };
-
-        const params = config.service?.createParams(requestParams) ?? requestParams;
-
-        const fetchList$: Observable<Page<T>> = (config.service?.fetchList(
-          params
-        ) ?? config.fetchList?.(params)) as Observable<Page<T>>;
-        if (!fetchList$) {
-          throw new Error('Service or fetchList$ must by defined.');
-        }
-
-        return fetchList$.pipe(
-          map((gPage) => {
-            const p = { ...gPage, number: page };
-            return createDataLoadSuccessTableAction(tableRepository)({
-              gPage: p,
-            });
-          }),
-          catchError((error) => {
-            config.snackbar?.showError(error.message);
-            return of(
-              createDataLoadErrorTableAction(tableRepository)({ error })
-            );
-          })
-        );
-      })
-    );
-  });
-}
-
-export function createRemoveRangeTableEffect<T>(
-  tableRepository: string,
-  ngrxFeatureKey: string,
-  actions$: Actions,
-  store$: Store<any>,
-  config: CreateGetPageActionConfig<T>
-) {
-  return createEffect(() => {
-    if(!config?.service) {
-      throw new Error('Service must be defined!');
-    }
-
-    const selectedItems = createSelector(
-      createFeatureSelector<any>(ngrxFeatureKey),
-      (state: any) => {
-        return (state?.[tableRepository] as TableState<any>)?.selectedItems as any;
-      }
-    );
-
-    return actions$.pipe(
-      ofType(createRemoveRangeTableAction(tableRepository)),
-      withLatestFrom(selectedItems),
-      switchMap(([, {selectedItems}]) => {
-        return config.service!.removeRange(selectedItems).pipe(
-          map(() => { 
-            return createGetPageTableAction(tableRepository)
-            ({ page: 0, size: DEFAULT_SEARCH_LIMIT })
-          }),
-          catchError(error => { 
-            return of(createDataLoadErrorTableAction(tableRepository)({ error }))
-          })
-        );
-      })
-    );
-  });
-}
+import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {  createFeatureSelector, createSelector, Store } from '@ngrx/store';
+import { BaseHttpService, DEFAULT_SEARCH_LIMIT, Page, RequestParams } from '@verisoft/core';
+import { catchError, map, Observable, of, switchMap, withLatestFrom } from 'rxjs';
+import {
+  createGetPageTableAction,
+  createDataLoadSuccessTableAction,
+  createDataLoadErrorTableAction,
+  createRemoveRangeTableAction,
+} from './actions';
+import { TableState } from './models';
+
+export interface CreateGetPageActionConfig<T> {
+  service?: BaseHttpService<T>;
+  fetchList?: (requestParams: RequestParams<any>) => Observable<Page<T>>;
+  snackbar?: any;
+  ngrxFeatureKey?: string;
+  requireFilters?: boolean;
+}
+
+export function createGetPageTableEffect<T>(
+  tableRepository: string,
+  actions$: Actions,
+  config: CreateGetPageActionConfig<T>
+) {
+  return createEffect(() => {
+    return actions$.pipe(
+      ofType(createGetPageTableAction(tableRepository)),
+      switchMap(({ page, filter, sort, size }) => {
+        const requestParams: RequestParams<any> = {
+          offset: page * size,
+          limit: size,
+          sort,
+          filter,
+        };
+
+        const params = config.service?.createParams(requestParams) ?? requestParams;
+
+        const fetchList$: Observable<Page<T>> = (config.service?.fetchList(
+          params
+        ) ?? config.fetchList?.(params)) as Observable<Page<T>>;
+        if (!fetchList$) {
+          throw new Error('Service or fetchList$ must by defined.');
+        }
+
+        return fetchList$.pipe(
+          map((gPage) => {
+            const p = { ...gPage, number: page };
+            return createDataLoadSuccessTableAction(tableRepository)({
+              gPage: p,
+            });
+          }),
+          catchError((error) => {
+            config.snackbar?.showError(error.message);
+            return of(
+              createDataLoadErrorTableAction(tableRepository)({ error })
+            );
+          })
+        );
+      })
+    );
+  });
+}
+
+export function createRemoveRangeTableEffect<T>(
+  tableRepository: string,
+  ngrxFeatureKey: string,
+  actions$: Actions,
+  store$: Store<any>,
+  config: CreateGetPageActionConfig<T>
+) {
+  return createEffect(() => {
+    if(!config?.service) {
+      throw new Error('Service must be defined!');
+    }
+
+    const selectedItems = createSelector(
+      createFeatureSelector<any>(ngrxFeatureKey),
+      (state: any) => {
+        return (state?.[tableRepository] as TableState<any>)?.selectedItems as any;
+      }
+    );
+
+    return actions$.pipe(
+      ofType(createRemoveRangeTableAction(tableRepository)),
+      withLatestFrom(selectedItems),
+      switchMap(([, { selectedItems }]) => {
+        return config.service!.removeRange(selectedItems).pipe(
+          map(() => {
+            return createGetPageTableAction(tableRepository)
+            ({ page: 0, size: DEFAULT_SEARCH_LIMIT })
+          }),
+          catchError(error => {
+            return of(createDataLoadErrorTableAction(tableRepository)({ error }))
+          })
+        );
+      })
+    );
+  });
+}