fix(cf): Clone sg modal appears. Removed unused lb code. (#6915)

Co-authored-by: Jason Chu <jchu@pivotal.io>
spinnaker · May 6, 2019 · f646a5a · f646a5a
1 parent fc6c843
commit f646a5a
Show file tree

Hide file tree

Showing 13 changed files with 191 additions and 318 deletions.
diff --git a/app/scripts/modules/cloudfoundry/src/cf.module.ts b/app/scripts/modules/cloudfoundry/src/cf.module.ts
@@ -15,7 +15,7 @@ import {
   cfServerGroupDetailsGetter,
   CloudFoundryCreateServerGroupModal,
   CloudFoundryServerGroupActions,
-  CloudFoundryServerGroupCommandBuilder,
+  CloudFoundryServerGroupCommandBuilderShim,
   CloudFoundryServerGroupTransformer,
   EvironmentVariablesSection,
   HealthCheckSection,
@@ -71,7 +71,7 @@ CloudProviderRegistry.registerProvider('cloudfoundry', {
       EvironmentVariablesSection,
     ],
     CloneServerGroupModal: CloudFoundryCreateServerGroupModal,
-    commandBuilder: CloudFoundryServerGroupCommandBuilder,
+    commandBuilder: CloudFoundryServerGroupCommandBuilderShim,
     scalingActivitiesEnabled: false, // FIXME enable?
   },
   instance: {

diff --git a/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryServerGroup.ts b/app/scripts/modules/cloudfoundry/src/domain/ICloudFoundryServerGroup.ts
@@ -5,13 +5,13 @@ import { ICloudFoundryInstance } from 'cloudfoundry/domain/ICloudFoundryInstance
 
 export interface ICloudFoundryServerGroup extends IServerGroup {
   appsManagerUri?: string;
-  metricsUri?: string;
-  memory: number;
   diskQuota: number;
   healthCheckType: string;
   healthCheckHttpEndpoint: string;
   state: 'STARTED' | 'STOPPED';
   instances: ICloudFoundryInstance[];
+  metricsUri?: string;
+  memory: number;
   space: ICloudFoundrySpace;
   droplet?: ICloudFoundryDroplet;
   serviceInstances: ICloudFoundryServiceInstance[];

diff --git a/...s/modules/cloudfoundry/src/loadBalancer/configure/cloudFoundryLoadBalancerCreateModal.tsx b/...s/modules/cloudfoundry/src/loadBalancer/configure/cloudFoundryLoadBalancerCreateModal.tsx
diff --git a/...dfoundry/src/pipeline/stages/cloneServerGroup/CloudfoundryCloneServerGroupStageConfig.tsx b/...dfoundry/src/pipeline/stages/cloneServerGroup/CloudfoundryCloneServerGroupStageConfig.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { IStageConfigProps, StageConstants } from '@spinnaker/core';
 
 import { CloudFoundryCreateServerGroupModal } from 'cloudfoundry/serverGroup/configure/wizard/CreateServerGroupModal';
-import { CloudFoundryReactInjector } from 'cloudfoundry/reactShims';
+import { CloudFoundryServerGroupCommandBuilder } from 'cloudfoundry/serverGroup/configure';
 
 export interface ICloudfoundryCloneServerGroupStageConfigState {
   buttonText: string;
@@ -47,16 +47,13 @@ export class CloudfoundryCloneServerGroupStageConfig extends React.Component<
   private addCluster = () => {
     const { application, stage, pipeline } = this.props;
     const title = 'Clone Cluster';
-    CloudFoundryReactInjector.cfServerGroupCommandBuilder
-      .buildCloneServerGroupCommandFromPipeline(stage, pipeline)
-      .then((command: any) => {
-        return CloudFoundryCreateServerGroupModal.show({
-          application,
-          command,
-          isSourceConstant: false,
-          title,
-        });
-      })
+    const command = CloudFoundryServerGroupCommandBuilder.buildCloneServerGroupCommandFromPipeline(stage, pipeline);
+    CloudFoundryCreateServerGroupModal.show({
+      application,
+      command,
+      isSourceConstant: false,
+      title,
+    })
       .then(this.handleResult)
       .catch(() => {});
   };
@@ -82,7 +79,7 @@ export class CloudfoundryCloneServerGroupStageConfig extends React.Component<
               <tr>
                 <td>{stage.source ? stage.source.account : ''}</td>
                 <td>{stage.source ? stage.source.region : ''}</td>
-                <td>{stage.source ? stage.source.targetCluster : ''}</td>
+                <td>{stage.source ? stage.source.clusterName : ''}</td>
                 <td>{stage.source ? cloneTargets.filter(t => t.val === stage.source.target).map(t => t.label) : ''}</td>
               </tr>
             </tbody>

diff --git a/app/scripts/modules/cloudfoundry/src/reactShims/cf.react.injector.ts b/app/scripts/modules/cloudfoundry/src/reactShims/cf.react.injector.ts
diff --git a/app/scripts/modules/cloudfoundry/src/reactShims/cf.react.module.ts b/app/scripts/modules/cloudfoundry/src/reactShims/cf.react.module.ts
diff --git a/app/scripts/modules/cloudfoundry/src/reactShims/index.ts b/app/scripts/modules/cloudfoundry/src/reactShims/index.ts
diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/index.ts b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/index.ts
@@ -1,3 +1,4 @@
 export * from './serverGroupConfigurationModel.cf';
 export * from './serverGroupCommandBuilder.service.cf';
+export * from './serverGroupCommandBuilderShim.service.cf';
 export * from './wizard/CreateServerGroupModal';