Merge pull request #3915 from cloudfoundry-incubator/fix-store-init-s…

…tate catalogue: fixed initial state that was overwritten
cloudfoundry · Sep 24, 2019 · 2399903 · 2399903
2 parents 97257b0 + 7fe6a02
commit 2399903
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.store-setup.ts b/src/frontend/packages/core/src/core/entity-catalogue/entity-catalogue.store-setup.ts
@@ -1,3 +1,4 @@
+import { IRequestTypeState } from '../../../../store/src/app-state';
 import { entityCatalogue } from './entity-catalogue.service';
 
 // FIXME: These should be removed/come from the entity catalogue - STRAT-151
@@ -14,7 +15,7 @@ export function getAllEntityStoreKeys() {
   ];
 }
 
-export function getDefaultStateFromEntityCatalogue<T = any>(entityKeys: string[], defaultState: T) {
+export function getDefaultStateFromEntityCatalogue<T = any>(entityKeys: string[], defaultState: T, initialState: IRequestTypeState) {
   return entityKeys.reduce((currentState, entityKey) => {
     if (currentState[entityKey]) {
       return currentState;
@@ -23,5 +24,5 @@ export function getDefaultStateFromEntityCatalogue<T = any>(entityKeys: string[]
       ...currentState,
       [entityKey]: defaultState
     };
-  }, {}) as T;
+  }, initialState) as T;
 }
diff --git a/...tend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.ts b/...tend/packages/store/src/reducers/api-request-data-reducer/request-data-reducer.factory.ts
@@ -15,7 +15,7 @@ export function requestDataReducerFactory(actions: IRequestArray): ActionReducer
   return function entitiesReducer(state = {}, action: Action): Record<string, any> {
     switch (action.type) {
       case InitCatalogueEntitiesAction.ACTION_TYPE:
-        return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {});
+        return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {}, state);
       case successAction:
         const success = action as ISuccessRequestAction;
         if (!success.apiAction.updatingKey && success.requestType === 'delete') {

diff --git a/src/frontend/packages/store/src/reducers/api-request-reducer/request-reducer.factory.ts b/src/frontend/packages/store/src/reducers/api-request-reducer/request-reducer.factory.ts
@@ -26,7 +26,7 @@ export function requestReducerFactory(actions: IRequestArray) {
   return function apiRequestReducer(state = {}, action: Action) {
     switch (action.type) {
       case InitCatalogueEntitiesAction.ACTION_TYPE:
-        return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {});
+        return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {}, state);
       case startAction:
         return startRequest(state, action as StartRequestAction);
       case successAction:

diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination.reducer.ts
@@ -100,7 +100,7 @@ function paginate(action, state = {}, updatePagination) {
   }
 
   if (action.type === InitCatalogueEntitiesAction.ACTION_TYPE) {
-    return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {});
+    return getDefaultStateFromEntityCatalogue((action as InitCatalogueEntitiesAction).entityKeys, {}, state);
   }
 
   if (action.type === CREATE_PAGINATION) {