refactor(*/pipeline): Convert clone server group execution details to…

… react (#4359)
spinnaker · Nov 3, 2017 · 25ff3a1 · 25ff3a1
1 parent 95fae04
commit 25ff3a1
Show file tree

Hide file tree

Showing 19 changed files with 136 additions and 427 deletions.
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/awsCloneServerGroupStage.js b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/awsCloneServerGroupStage.js
@@ -8,14 +8,12 @@ import { ACCOUNT_SERVICE, LIST_EXTRACTOR_SERVICE, StageConstants } from '@spinna
 module.exports = angular.module('spinnaker.amazon.pipeline.stage.cloneServerGroupStage', [
   ACCOUNT_SERVICE,
   LIST_EXTRACTOR_SERVICE,
-  require('./cloneServerGroupExecutionDetails.controller.js').name,
 ])
   .config(function(pipelineConfigProvider) {
     pipelineConfigProvider.registerStage({
       provides: 'cloneServerGroup',
       cloudProvider: 'aws',
       templateUrl: require('./cloneServerGroupStage.html'),
-      executionDetailsUrl: require('./cloneServerGroupExecutionDetails.html'),
       executionStepLabelUrl: require('./cloneServerGroupStepLabel.html'),
       accountExtractor: (stage) => stage.context.credentials,
       validators: [

diff --git a/...mazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js b/...mazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js
diff --git a/...modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.html b/...modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.html
diff --git a/app/scripts/modules/cloudfoundry/pipeline/stages/cloneServerGroup/cfCloneServerGroupStage.js b/app/scripts/modules/cloudfoundry/pipeline/stages/cloneServerGroup/cfCloneServerGroupStage.js
@@ -8,14 +8,12 @@ import { ACCOUNT_SERVICE, NAMING_SERVICE, StageConstants } from '@spinnaker/core
 module.exports = angular.module('spinnaker.cf.pipeline.stage.cloneServerGroupStage', [
   ACCOUNT_SERVICE,
   NAMING_SERVICE,
-  require('./cloneServerGroupExecutionDetails.controller.js').name,
 ])
   .config(function(pipelineConfigProvider) {
     pipelineConfigProvider.registerStage({
       provides: 'cloneServerGroup',
       cloudProvider: 'cf',
       templateUrl: require('./cloneServerGroupStage.html'),
-      executionDetailsUrl: require('./cloneServerGroupExecutionDetails.html'),
       executionStepLabelUrl: require('./cloneServerGroupStepLabel.html'),
       validators: [
         { type: 'requiredField', fieldName: 'targetCluster', fieldLabel: 'cluster' },

diff --git a/...udfoundry/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js b/...udfoundry/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js
diff --git a/...dules/cloudfoundry/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.html b/...dules/cloudfoundry/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.html
diff --git a/app/scripts/modules/core/src/delivery/details/StageDetails.tsx b/app/scripts/modules/core/src/delivery/details/StageDetails.tsx
@@ -18,6 +18,7 @@ export interface IStageDetailsProps {
 export interface IStageDetailsState {
   configSections?: string[];
   executionDetailsSections?: IExecutionDetailsSection[];
+  provider: string;
   sourceUrl?: string;
 }
 
@@ -46,7 +47,7 @@ export class StageDetails extends React.Component<IStageDetailsProps, IStageDeta
         sourceUrl = stageConfig.executionDetailsUrl || require('./defaultExecutionDetails.html');
       }
     }
-    return { configSections, executionDetailsSections, sourceUrl };
+    return { configSections, executionDetailsSections, provider: stageConfig.cloudProvider, sourceUrl };
   }
 
   public componentWillReceiveProps() {
@@ -55,9 +56,9 @@ export class StageDetails extends React.Component<IStageDetailsProps, IStageDeta
 
   public render(): React.ReactElement<StageDetails> {
     const { application, execution, stage } = this.props;
-    const { executionDetailsSections, sourceUrl, configSections } = this.state;
+    const { executionDetailsSections, provider, sourceUrl, configSections } = this.state;
     const { StageDetailsWrapper } = NgReact;
-    const detailsProps = { application, execution, stage };
+    const detailsProps = { application, execution, provider, stage };
 
     return (
       <div className="stage-details">

diff --git a/app/scripts/modules/core/src/domain/IExecutionStage.ts b/app/scripts/modules/core/src/domain/IExecutionStage.ts
@@ -39,6 +39,7 @@ export interface IExecutionDetailsComponentProps {
   application: Application;
   detailsSections: IExecutionDetailsSection[];
   execution: IExecution;
+  provider: string;
   stage: IExecutionStage;
 }