Merge pull request #44 from jucasoft/16.1.0

16.1.0

projects/ngrx-entity-crud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ngrx-entity-crud",
-  "version": "16.0.0",
+  "version": "16.1.0",
   "repository": "https://github.com/jucasoft/ngrx-entity-crud",
   "license": "MIT",
   "schematics": "./schematics/collection.json",

projects/ngrx-entity-crud/schematics/store/files/crud-store/singular/__clazz@dasherize__-store/__clazz@dasherize__.selectors.ts

@@ -14,5 +14,6 @@ export const {
   selectIsLoading,
   selectIsLoaded,
   selectResponses,
+  selectItemSelected,
 } = getSingeCrudSelectors<<%= clazz %>, object>(selectState)
 

projects/ngrx-entity-crud/src/lib/entity_state.ts

@@ -20,6 +20,7 @@ export function getInitialEntityCrudState<V>(): EntityCrudState<V> {
 export function getInitialSingleCrudState<V>(): EntitySingleCrudState<V> {
   return {
     item:null,
+    itemSelected:null,
     isLoading: false,
     isLoaded: false,
     error: null,

projects/ngrx-entity-crud/src/lib/models.ts

@@ -93,9 +93,9 @@ export interface OptRequestBase {
    * In questo modo sarà possibile analizzare l'andamento
    */
   dispatchResponse?: boolean;
-  
+
   /**
-  * used to override the root of the service 
+  * used to override the root of the service
   */
   basePath?: string;
 }
@@ -196,6 +196,13 @@ export interface EntityCrudBaseSelectors<T, V> {
    */
   selectResponses: (state: V) => OptResponse<T>[];
 
+  /**
+   * - used to select selectedItem
+   * - populated with action "...SelectedItems({item})",
+   * - local clone, does not match the instance in the store
+   * @param (state: V) => T
+   */
+  selectItemSelected: (state: V) => T;
 }
 
 export interface EntitySingleCrudSelectors<T, V> extends EntityCrudBaseSelectors<T, V> {
@@ -215,13 +222,6 @@ export interface EntityCrudSelectors<T, V> extends EntityCrudBaseSelectors<T, V>
    * @param (state: V) => string[] | number[]
    */
   selectIdsSelected: (state: V) => string[] | number[];
-  /**
-   * - used to select selectedItem
-   * - populated with action "...SelectedItems({item})",
-   * - local clone, does not match the instance in the store
-   * @param (state: V) => T
-   */
-  selectItemSelected: (state: V) => T;
   /**
    * - used to select selected item
    * - populated with action "...SelectedItems({item:{id:string ...}})",
@@ -278,7 +278,8 @@ export interface EntityCrudBaseState<T> {
 }
 
 export interface EntitySingleCrudState<T> extends EntityCrudBaseState<T> {
-  item: T
+  item: T;
+  itemSelected: T;
 }
 
 export interface EntityCrudState<T> extends EntityCrudBaseState<T>, EntityState<T> {
@@ -356,6 +357,14 @@ export interface SingularActions<T> {
    * @param item: T
    */
   Edit: ActionCreator<string, (props: { item: T; }) => { item: T; } & TypedAction<string>>;
+
+  /**
+   * - action used to identify a single item to select
+   * @example store.dispatch(actions.SelectItem(payload));
+   * @param item: T
+   */
+  SelectItem: ActionCreator<string, (props: { item: T; }) => { item: T; } & TypedAction<string>>;
+
 }
 
 export interface Actions<T> extends SingularActions<T> {
@@ -463,12 +472,6 @@ export interface Actions<T> extends SingularActions<T> {
   RemoveManySelected: ActionCreator<string, (props: { ids: string[]; }) => { ids: string[]; } & TypedAction<string>>;
   // TODO: doc
   RemoveAllSelected: ActionCreator<string>;
-  /**
-   * - action used to identify a single item to select
-   * @example store.dispatch(actions.SelectItem(payload));
-   * @param item: T
-   */
-  SelectItem: ActionCreator<string, (props: { item: T; }) => { item: T; } & TypedAction<string>>;
 
   /**
    * - action used to create an item on the store

projects/ngrx-entity-crud/src/lib/reducer.ts

@@ -498,14 +498,13 @@ export function createCrudReducerFactory<T>(adapter: EntityAdapter<T>) {
   };
 }
 
-
 export function createSingularCrudOns<T, S extends EntitySingleCrudState<T>>(initialState: S, actions: SingularActions<T>): { [key: string]: any } {
 
   const selectRequestOn = on(actions.SelectRequest, (state: S, {type}) => (
     {
       ...state,
       isLoading: true,
-      error: null
+      error: initialState.error
     }
   ));
 
@@ -573,6 +572,16 @@ export function createSingularCrudOns<T, S extends EntitySingleCrudState<T>>(ini
   );
 
   const resetOn = on(actions.Reset, (state: S) => ({...state, ...initialState}));
+
+  const selectItemOn = on(actions.SelectItem, (state: S, {type, item}) => {
+    const result = {
+      ...state,
+      itemSelected: item
+    };
+
+    return result;
+  });
+
   return {
     responseOn,
     resetResponsesOn,
@@ -585,6 +594,8 @@ export function createSingularCrudOns<T, S extends EntitySingleCrudState<T>>(ini
     editSuccessOn,
     editFailureOn,
 
+    selectItemOn,
+
     resetOn,
     editOn,
   };

projects/ngrx-entity-crud/src/lib/state_selectors.ts

@@ -23,12 +23,15 @@ export function getCrudBaseSelectors<T, V>(
   const selectLastCriteria: MemoizedSelector<V, ICriteria> = createSelector(selectState, getLastCriteria);
   const selectResponses: MemoizedSelector<V, OptResponse<T>[]> = createSelector(selectState, getRespones);
 
+  const selectItemSelected: MemoizedSelector<V, T> = createSelector(selectState, getItemSelected) as MemoizedSelector<V, T>;
+
   return {
     selectError,
     selectIsLoading,
     selectIsLoaded,
     selectLastCriteria,
     selectResponses,
+    selectItemSelected
   };
 }
 
@@ -40,7 +43,8 @@ export function getSingeCrudSelectors<T, V>(
     selectIsLoading,
     selectIsLoaded,
     selectLastCriteria,
-    selectResponses
+    selectResponses,
+    selectItemSelected
   } = getCrudBaseSelectors(selectState);
 
   const selectItem: MemoizedSelector<V, T> = createSelector(selectState, getItem) as MemoizedSelector<V, T>
@@ -50,7 +54,8 @@ export function getSingeCrudSelectors<T, V>(
     selectIsLoading,
     selectIsLoaded,
     selectLastCriteria,
-    selectResponses
+    selectResponses,
+    selectItemSelected
   };
 }
 
@@ -64,7 +69,6 @@ export function createCrudSelectorsFactory<T>(adapter) {
       getFilters
     );
 
-    const selectItemSelected: MemoizedSelector<V, T> = createSelector(selectState, getItemSelected) as MemoizedSelector<V, T>;
     const selectEntitiesSelected: MemoizedSelector<V, Dictionary<T>> = createSelector(selectState, getEntitiesSelected) as MemoizedSelector<V, Dictionary<T>>
     const selectItemsSelected: MemoizedSelector<V, T[]> = createSelector(selectEntitiesSelected, (entities: Dictionary<T>) => Object.values(entities)) as MemoizedSelector<V, T[]>
 
@@ -76,7 +80,8 @@ export function createCrudSelectorsFactory<T>(adapter) {
       selectIsLoading,
       selectIsLoaded,
       selectLastCriteria,
-      selectResponses
+      selectResponses,
+      selectItemSelected
     } = getCrudBaseSelectors(selectState);
 
     const {