refactor(core): Remove angular from cluster filter service

spinnaker · Apr 16, 2018 · 76f0d5e · 76f0d5e
1 parent ce24118
commit 76f0d5e
Show file tree

Hide file tree

Showing 21 changed files with 99 additions and 135 deletions.
diff --git a/app/scripts/modules/canary/acaTask/acaTaskExecutionDetails.controller.js b/app/scripts/modules/canary/acaTask/acaTaskExecutionDetails.controller.js
@@ -2,20 +2,18 @@
 
 const angular = require('angular');
 
-import { CLUSTER_FILTER_SERVICE, SETTINGS } from '@spinnaker/core';
+import { ClusterState, SETTINGS } from '@spinnaker/core';
 
 module.exports = angular
   .module('spinnaker.canary.acaTask.details.controller', [
     require('@uirouter/angularjs').default,
-    CLUSTER_FILTER_SERVICE,
     require('../canary/canaryDeployment/canaryDeploymentHistory.service.js').name,
   ])
   .controller('acaTaskExecutionDetailsCtrl', function(
     $scope,
     $stateParams,
     executionDetailsSectionService,
     canaryDeploymentHistoryService,
-    clusterFilterService,
   ) {
     $scope.configSections = ['canarySummary', 'canaryConfig', 'canaryAnalysisHistory'];
 
@@ -70,7 +68,7 @@ module.exports = angular
       }
     };
 
-    this.overrideFiltersForUrl = r => clusterFilterService.overrideFiltersForUrl(r);
+    this.overrideFiltersForUrl = r => ClusterState.filterService.overrideFiltersForUrl(r);
 
     let initialize = () => executionDetailsSectionService.synchronizeSection($scope.configSections, initialized);
 

diff --git a/...pts/modules/canary/canary/canaryDeployment/canaryDeploymentExecutionDetails.controller.js b/...pts/modules/canary/canary/canaryDeployment/canaryDeploymentExecutionDetails.controller.js
@@ -2,12 +2,11 @@
 
 const angular = require('angular');
 
-import { CLUSTER_FILTER_SERVICE, URL_BUILDER_SERVICE } from '@spinnaker/core';
+import { ClusterState, URL_BUILDER_SERVICE } from '@spinnaker/core';
 
 module.exports = angular
   .module('spinnaker.canary.canaryDeployment.details.controller', [
     require('@uirouter/angularjs').default,
-    CLUSTER_FILTER_SERVICE,
     URL_BUILDER_SERVICE,
     require('./canaryDeploymentHistory.service.js').name,
   ])
@@ -17,7 +16,6 @@ module.exports = angular
     executionDetailsSectionService,
     canaryDeploymentHistoryService,
     urlBuilderService,
-    clusterFilterService,
   ) {
     $scope.configSections = ['canaryDeployment', 'canaryAnalysisHistory'];
 
@@ -84,7 +82,7 @@ module.exports = angular
       }
     };
 
-    this.overrideFiltersForUrl = r => clusterFilterService.overrideFiltersForUrl(r);
+    this.overrideFiltersForUrl = r => ClusterState.filterService.overrideFiltersForUrl(r);
 
     let initialize = () => executionDetailsSectionService.synchronizeSection($scope.configSections, initialized);
 

diff --git a/app/scripts/modules/core/src/cluster/AllClustersGroupings.tsx b/app/scripts/modules/core/src/cluster/AllClustersGroupings.tsx
@@ -1,19 +1,18 @@
 import { UIRouterContext } from '@uirouter/react-hybrid';
-import { IClusterSubgroup } from 'core/cluster/filter/clusterFilter.service';
 import { BindAll } from 'lodash-decorators';
 import * as React from 'react';
-import { Subscription } from 'rxjs';
-
 import { AutoSizer, CellMeasurer, CellMeasurerCache, List, ListRowProps } from 'react-virtualized';
+import { Subscription } from 'rxjs';
 
 import { ReactInjector } from 'core/reactShims';
 import { Application } from 'core/application';
 import { ClusterPod } from 'core/cluster/ClusterPod';
-import { IClusterGroup } from './filter/clusterFilter.service';
 import { Spinner } from 'core/widgets/spinners/Spinner';
 import { ISortFilter } from 'core/filterModel';
 import { ClusterState } from 'core/state';
 
+import { IClusterGroup, IClusterSubgroup } from './filter/ClusterFilterService';
+
 export interface IAllClustersGroupingsProps {
   app: Application;
   initialized: boolean;
@@ -28,7 +27,7 @@ export interface IAllClustersGroupingsState {
 @UIRouterContext
 @BindAll()
 export class AllClustersGroupings extends React.Component<IAllClustersGroupingsProps, IAllClustersGroupingsState> {
-  private clusterFilterService = ReactInjector.clusterFilterService;
+  private clusterFilterService = ClusterState.filterService;
   private clusterFilterModel = ClusterState.filterModel;
 
   private groupsSubscription: Subscription;

diff --git a/app/scripts/modules/core/src/cluster/ClusterPod.tsx b/app/scripts/modules/core/src/cluster/ClusterPod.tsx
@@ -8,7 +8,7 @@ import { Application } from 'core/application';
 import { EntityNotifications } from 'core/entityTag/notifications/EntityNotifications';
 import { IServerGroup } from 'core/domain';
 import { Tooltip } from 'core/presentation';
-import { IClusterSubgroup, IServerGroupSubgroup } from './filter/clusterFilter.service';
+import { IClusterSubgroup, IServerGroupSubgroup } from './filter/ClusterFilterService';
 import { ISortFilter } from 'core/filterModel';
 import { ClusterPodTitleWrapper } from 'core/cluster/ClusterPodTitleWrapper';
 

diff --git a/app/scripts/modules/core/src/cluster/ClusterPodTitleWrapper.tsx b/app/scripts/modules/core/src/cluster/ClusterPodTitleWrapper.tsx
@@ -4,7 +4,7 @@ import { BindAll } from 'lodash-decorators';
 import { Application } from 'core/application/application.model';
 import { ReactInjector } from 'core/reactShims';
 import { DefaultClusterPodTitle } from './DefaultClusterPodTitle';
-import { IClusterSubgroup } from './filter/clusterFilter.service';
+import { IClusterSubgroup } from './filter/ClusterFilterService';
 
 export interface IClusterPodTitleProps {
   grouping: IClusterSubgroup;

diff --git a/app/scripts/modules/core/src/cluster/allClusters.controller.js b/app/scripts/modules/core/src/cluster/allClusters.controller.js
@@ -3,7 +3,6 @@
 const angular = require('angular');
 
 import { CLOUD_PROVIDER_REGISTRY } from 'core/cloudProvider/cloudProvider.registry';
-import { CLUSTER_FILTER_SERVICE } from 'core/cluster/filter/clusterFilter.service';
 import { SERVER_GROUP_COMMAND_BUILDER_SERVICE } from 'core/serverGroup/configure/common/serverGroupCommandBuilder.service';
 import { INSIGHT_NGMODULE } from 'core/insight/insight.module';
 import { ClusterState } from 'core/state';
@@ -17,7 +16,6 @@ import './rollups.less';
 
 module.exports = angular
   .module('spinnaker.core.cluster.allClusters.controller', [
-    CLUSTER_FILTER_SERVICE,
     CLUSTER_FILTER,
     require('../account/account.module').name,
     PROVIDER_SELECTION_SERVICE,
@@ -35,15 +33,14 @@ module.exports = angular
     $uibModal,
     $timeout,
     providerSelectionService,
-    clusterFilterService,
     insightFilterStateModel,
     serverGroupCommandBuilder,
     cloudProviderRegistry,
     skinSelectionService,
   ) {
     this.$onInit = () => {
       insightFilterStateModel.filtersHidden = true; // hidden to prevent filter flashing for on-demand apps
-      const groupsUpdatedSubscription = clusterFilterService.groupsUpdatedStream.subscribe(() =>
+      const groupsUpdatedSubscription = ClusterState.filterService.groupsUpdatedStream.subscribe(() =>
         clusterGroupsUpdated(),
       );
       this.application = app;
@@ -81,7 +78,7 @@ module.exports = angular
       if (app.getDataSource('serverGroups').fetchOnDemand) {
         insightFilterStateModel.filtersHidden = true;
       }
-      clusterFilterService.updateClusterGroups(app);
+      ClusterState.filterService.updateClusterGroups(app);
       clusterGroupsUpdated();
       // Timeout because the updateClusterGroups method is debounced by 25ms
       $timeout(() => {
@@ -103,7 +100,7 @@ module.exports = angular
     };
 
     this.clearFilters = function() {
-      clusterFilterService.clearFilters();
+      ClusterState.filterService.clearFilters();
       updateClusterGroups();
     };