refactor(core/entityTag): Convert clusterTargetBuilder.service to pla…

…in JS
spinnaker · Apr 11, 2018 · 378f228 · 378f228
1 parent d9f313b
commit 378f228
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 21 deletions.
diff --git a/app/scripts/modules/amazon/src/serverGroup/details/AmazonServerGroupActions.tsx b/app/scripts/modules/amazon/src/serverGroup/details/AmazonServerGroupActions.tsx
@@ -4,6 +4,7 @@ import { Dropdown, Tooltip } from 'react-bootstrap';
 import { get, find, filter, orderBy } from 'lodash';
 
 import {
+  ClusterTargetBuilder,
   IOwnerOption,
   IServerGroupActionsProps,
   IServerGroupJob,
@@ -285,7 +286,7 @@ export class AmazonServerGroupActions extends React.Component<IAmazonServerGroup
 
     const { AddEntityTagLinks } = NgReact;
     const showEntityTags = SETTINGS.feature && SETTINGS.feature.entityTags;
-    const entityTagTargets: IOwnerOption[] = ReactInjector.clusterTargetBuilder.buildClusterTargets(serverGroup);
+    const entityTagTargets: IOwnerOption[] = ClusterTargetBuilder.buildClusterTargets(serverGroup);
 
     return (
       <Dropdown className="dropdown" id="server-group-actions-dropdown">

diff --git a/...entityTag/clusterTargetBuilder.service.ts → ...ore/src/entityTag/clusterTargetBuilder.ts b/...entityTag/clusterTargetBuilder.service.ts → ...ore/src/entityTag/clusterTargetBuilder.ts
@@ -1,12 +1,10 @@
-import { module } from 'angular';
-
 import { IServerGroup } from 'core/domain';
 import { NameUtils } from 'core/naming';
 
 import { IOwnerOption } from './EntityTagEditor';
 
 export class ClusterTargetBuilder {
-  public buildClusterTargets(serverGroup: IServerGroup): IOwnerOption[] {
+  public static buildClusterTargets(serverGroup: IServerGroup): IOwnerOption[] {
     const clusterName = NameUtils.getClusterNameFromServerGroupName(serverGroup.name);
     return [
       {
@@ -40,6 +38,3 @@ export class ClusterTargetBuilder {
     ];
   }
 }
-
-export const CLUSTER_TARGET_BUILDER = 'spinnaker.core.entityTag.clusterTargetBuilder';
-module(CLUSTER_TARGET_BUILDER, []).service('clusterTargetBuilder', ClusterTargetBuilder);
diff --git a/app/scripts/modules/core/src/entityTag/index.ts b/app/scripts/modules/core/src/entityTag/index.ts
@@ -1,6 +1,6 @@
 export * from './AddEntityTagLinks';
 export * from './EntityTagEditor';
-export * from './clusterTargetBuilder.service';
+export * from './clusterTargetBuilder';
 export * from './entityTags.read.service';
 export * from './entityTags.write.service';
 export * from './notifications';
diff --git a/app/scripts/modules/core/src/reactShims/react.injector.ts b/app/scripts/modules/core/src/reactShims/react.injector.ts
@@ -15,7 +15,6 @@ import { CancelModalService } from '../cancelModal/cancelModal.service';
 import { CloudProviderRegistry } from '../cloudProvider/cloudProvider.registry';
 import { ClusterFilterModel } from 'core/cluster/filter/clusterFilter.model';
 import { ClusterFilterService } from '../cluster/filter/clusterFilter.service';
-import { ClusterTargetBuilder } from '../entityTag/clusterTargetBuilder.service';
 import { CollapsibleSectionStateCache } from '../cache/collapsibleSectionStateCache';
 import { ConfirmationModalService } from '../confirmationModal/confirmationModal.service';
 import { EntityTagWriter } from '../entityTag';
@@ -98,7 +97,6 @@ export class CoreReactInject extends ReactInject {
   public get cloudProviderRegistry() { return this.$injector.get('cloudProviderRegistry') as CloudProviderRegistry; }
   public get clusterFilterModel() { return this.$injector.get('clusterFilterModel') as ClusterFilterModel; }
   public get clusterFilterService() { return this.$injector.get('clusterFilterService') as ClusterFilterService; }
-  public get clusterTargetBuilder() { return this.$injector.get('clusterTargetBuilder') as ClusterTargetBuilder; }
   public get collapsibleSectionStateCache() { return this.$injector.get('collapsibleSectionStateCache') as CollapsibleSectionStateCache; }
   public get confirmationModalService() { return this.$injector.get('confirmationModalService') as ConfirmationModalService; }
   public get entityTagWriter() { return this.$injector.get('entityTagWriter') as EntityTagWriter; }

diff --git a/app/scripts/modules/ecs/serverGroup/details/serverGroupDetails.ecs.controller.js b/app/scripts/modules/ecs/serverGroup/details/serverGroupDetails.ecs.controller.js
@@ -7,7 +7,6 @@ import { ECS_SERVER_GROUP_TRANSFORMER } from '../serverGroup.transformer';
 
 import {
   ACCOUNT_SERVICE,
-  CLUSTER_TARGET_BUILDER,
   CONFIRMATION_MODAL_SERVICE,
   OVERRIDE_REGISTRY,
   SERVER_GROUP_READER,
@@ -20,7 +19,6 @@ module.exports = angular
     require('@uirouter/angularjs').default,
     ACCOUNT_SERVICE,
     ECS_SERVER_GROUP_TRANSFORMER,
-    CLUSTER_TARGET_BUILDER,
     CONFIRMATION_MODAL_SERVICE,
     OVERRIDE_REGISTRY,
     SERVER_GROUP_READER,
@@ -41,7 +39,6 @@ module.exports = angular
     confirmationModalService,
     serverGroupWriter,
     subnetReader,
-    clusterTargetBuilder,
     ecsServerGroupTransformer,
     accountService,
     serverGroupWarningMessageService,

diff --git a/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.gce.controller.js b/app/scripts/modules/google/src/serverGroup/details/serverGroupDetails.gce.controller.js
@@ -4,8 +4,8 @@ const angular = require('angular');
 import _ from 'lodash';
 
 import {
-  CLUSTER_TARGET_BUILDER,
   CONFIRMATION_MODAL_SERVICE,
+  ClusterTargetBuilder,
   NETWORK_READ_SERVICE,
   SERVER_GROUP_READER,
   SERVER_GROUP_WARNING_MESSAGE_SERVICE,
@@ -26,7 +26,6 @@ module.exports = angular
     CONFIRMATION_MODAL_SERVICE,
     NETWORK_READ_SERVICE,
     SERVER_GROUP_WRITER,
-    CLUSTER_TARGET_BUILDER,
     require('google/common/xpnNaming.gce.service.js').name,
     require('./resize/resizeServerGroup.controller').name,
     require('./rollback/rollbackServerGroup.controller').name,
@@ -47,7 +46,6 @@ module.exports = angular
     serverGroupWriter,
     serverGroupWarningMessageService,
     networkReader,
-    clusterTargetBuilder,
     gceXpnNamingService,
   ) {
     this.state = {
@@ -540,6 +538,6 @@ module.exports = angular
     };
 
     let configureEntityTagTargets = () => {
-      this.entityTagTargets = clusterTargetBuilder.buildClusterTargets(this.serverGroup);
+      this.entityTagTargets = ClusterTargetBuilder.buildClusterTargets(this.serverGroup);
     };
   });
diff --git a/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.titus.controller.js b/app/scripts/modules/titus/src/serverGroup/details/serverGroupDetails.titus.controller.js
@@ -5,7 +5,7 @@ import _ from 'lodash';
 
 import {
   ACCOUNT_SERVICE,
-  CLUSTER_TARGET_BUILDER,
+  ClusterTargetBuilder,
   CONFIRMATION_MODAL_SERVICE,
   NameUtils,
   SERVER_GROUP_READER,
@@ -31,7 +31,6 @@ module.exports = angular
     SERVER_GROUP_WRITER,
     require('./resize/resizeServerGroup.controller').name,
     require('./rollback/rollbackServerGroup.controller').name,
-    CLUSTER_TARGET_BUILDER,
     SCALING_POLICY_MODULE,
   ])
   .controller('titusServerGroupDetailsCtrl', function(
@@ -46,7 +45,6 @@ module.exports = angular
     $uibModal,
     confirmationModalService,
     serverGroupWriter,
-    clusterTargetBuilder,
     awsServerGroupTransformer,
     serverGroupWarningMessageService,
     accountService,
@@ -217,7 +215,7 @@ module.exports = angular
     });
 
     let configureEntityTagTargets = () => {
-      this.entityTagTargets = clusterTargetBuilder.buildClusterTargets($scope.serverGroup);
+      this.entityTagTargets = ClusterTargetBuilder.buildClusterTargets($scope.serverGroup);
     };
 
     this.destroyServerGroup = function destroyServerGroup() {