Merge pull request #3794 from cloudfoundry-incubator/fix-route-create

Fix domain dropdown on route creation
cloudfoundry · Aug 23, 2019 · 7d4ef89 · 7d4ef89
2 parents a1d8143 + dba9de6
commit 7d4ef89
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application.service.ts
@@ -265,18 +265,19 @@ export class ApplicationService {
     this.orgDomains$ = this.appOrg$.pipe(
       switchMap(org => {
         const domainsAction = new GetAllOrganizationDomains(org.metadata.guid, this.cfGuid);
+        const paginationMonitor = this.paginationMonitorFactory.create(
+          domainsAction.paginationKey,
+          domainsAction
+        );
         return getPaginationObservables<APIResource<IDomain>>(
           {
             store: this.store,
             action: domainsAction,
-            paginationMonitor: this.paginationMonitorFactory.create(
-              domainsAction.paginationKey,
-              action
-            )
+            paginationMonitor
           },
           true
         ).entities$;
-      }),
+      })
     );
 
   }

diff --git a/src/frontend/packages/core/src/shared/monitors/pagination-monitor.ts b/src/frontend/packages/core/src/shared/monitors/pagination-monitor.ts
@@ -156,7 +156,6 @@ export class PaginationMonitor<T = any, Y extends AppState = GeneralEntityAppSta
       this.currentPage$ = this.createPageObservable(this.pagination$, schema);
     }
     this.currentPageError$ = this.createErrorObservable(this.pagination$);
-
   }
 
   private createPaginationObservable(

diff --git a/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts b/src/frontend/packages/store/src/reducers/pagination-reducer/pagination-reducer.helper.ts
@@ -132,6 +132,7 @@ export function getPaginationKeyFromAction(action: PaginatedAction) {
   return apiAction.paginationKey;
 }
 
+// TODO: This needs to be a service not just a function! - #3802
 export const getPaginationObservables = <T = any, Y extends AppState = AppState>(
   { store, action, paginationMonitor }: {
     store: Store<Y>,
@@ -143,7 +144,6 @@ export const getPaginationObservables = <T = any, Y extends AppState = AppState>
   const baseAction = Array.isArray(action) ? action[0] : action;
   const paginationKey = paginationMonitor.paginationKey;
   const entityKey = paginationMonitor.schema.key;
-
   // FIXME: This will reset pagination every time regardless of if we need to (or just want the pag settings/entities from pagination
   // section)
   if (baseAction.initialParams) {
-Original file line number
+Diff line change
@@ Expand Up @@
           this.currentPage$ = this.createPageObservable(this.pagination$, schema);
         }
         this.currentPageError$ = this.createErrorObservable(this.pagination$);
       }
       private createPaginationObservable(
@@ Expand Down @@