Simplify service resolve

Need to rework polling on this, as it stands it a flashback whenever conents are filtered or sorted
ManageIQ · Jul 11, 2017 · 0b86615 · 0b86615
1 parent ab68f9d
commit 0b86615
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/client/app/services/service-explorer/service-explorer.component.js b/client/app/services/service-explorer/service-explorer.component.js
@@ -68,7 +68,7 @@ function ComponentController($state, ServicesState, Language, ListView, Chargeba
     Language.fixState(ServicesState.services, vm.toolbarConfig);
 
     resolveServices(vm.limit, 0);
-    Polling.start('serviceListPolling', pollUpdateServicesList, vm.pollingInterval);
+    // Polling.start('serviceListPolling', pollUpdateServicesList, vm.pollingInterval);
   };
 
   function getCardConfig() {
@@ -169,9 +169,9 @@ function ComponentController($state, ServicesState, Language, ListView, Chargeba
     PowerOperations.suspendService(item);
   }
 
-  function pollUpdateServicesList() {
-    resolveServices(vm.limit, vm.offset, true);
-  }
+  // function pollUpdateServicesList() {
+  //   resolveServices(vm.limit, vm.offset, true);
+  // }
 
   function viewSelected(viewId) {
     vm.viewType = viewId;
@@ -363,9 +363,6 @@ function ComponentController($state, ServicesState, Language, ListView, Chargeba
       ServicesState.getServices(
         limit,
         offset,
-        ServicesState.services.getFilters(),
-        ServicesState.services.getSort().currentField,
-        ServicesState.services.getSort().isAscending,
         refresh).then(querySuccess, queryFailure);
     });
 

diff --git a/client/app/services/services-state.service.js b/client/app/services/services-state.service.js
@@ -66,7 +66,7 @@ export function ServicesStateFactory(ListConfiguration, CollectionsApi, RBAC) {
     return CollectionsApi.query('services', options);
   }
 
-  function getServices(limit, offset, filters, sortField, sortAscending, refresh) {
+  function getServices(limit, offset, refresh) {
     const options = {
       expand: 'resources',
       limit: limit,
@@ -87,15 +87,13 @@ export function ServicesStateFactory(ListConfiguration, CollectionsApi, RBAC) {
         'service_resources',
         'tags',
       ],
-      filter: getQueryFilters(filters),
+      filter: getQueryFilters(services.getFilters()),
       auto_refresh: refresh,
     };
 
-    if (angular.isDefined(sortField)) {
-      options.sort_by = services.getSort().currentField.id;
-      options.sort_options = services.getSort().currentField.sortType === 'alpha' ? 'ignore_case' : '';
-      options.sort_order = sortAscending ? 'asc' : 'desc';
-    }
+    options.sort_by = services.getSort().currentField.id || '';
+    options.sort_options = services.getSort().currentField.sortType === 'alpha' ? 'ignore_case' : '';
+    options.sort_order = services.getSort().isAscending ? 'asc' : 'desc';
 
     return CollectionsApi.query('services', options);
   }