feat(cf): Display details in pipeline for services

spinnaker/spinnaker#3826 Co-Authored-By: Stu Pollock <spollock@pivotal.io>
spinnaker · Feb 22, 2019 · 39fe4c6 · 39fe4c6
1 parent e6a1206
commit 39fe4c6
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 51 deletions.
diff --git a/...udfoundry/src/pipeline/stages/deployService/CloudfoundryDeployServiceExecutionDetails.tsx b/...udfoundry/src/pipeline/stages/deployService/CloudfoundryDeployServiceExecutionDetails.tsx
diff --git a/...s/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts b/...s/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts
@@ -3,7 +3,7 @@ import { react2angular } from 'react2angular';
 
 import { CloudfoundryDeployServiceStageConfig } from './CloudfoundryDeployServiceStageConfig';
 import { ExecutionDetailsTasks, IStage, Registry } from '@spinnaker/core';
-import { CloudfoundryDeployServiceExecutionDetails } from './CloudfoundryDeployServiceExecutionDetails';
+import { CloudfoundryServiceExecutionDetails } from 'cloudfoundry/presentation';
 import { IServiceFieldValidatorConfig } from 'cloudfoundry/pipeline/config/validation/ServiceFieldValidatorConfig';
 
 class CloudFoundryDeployServiceStageCtrl implements IController {
@@ -78,7 +78,7 @@ module(CLOUD_FOUNDRY_DEPLOY_SERVICE_STAGE, [])
       cloudProvider: 'cloudfoundry',
       templateUrl: require('./cloudfoundryDeployServiceStage.html'),
       controller: 'cfDeployServiceStageCtrl',
-      executionDetailsSections: [CloudfoundryDeployServiceExecutionDetails, ExecutionDetailsTasks],
+      executionDetailsSections: [CloudfoundryServiceExecutionDetails, ExecutionDetailsTasks],
       defaultTimeoutMs: 30 * 60 * 1000,
       validators: [
         { type: 'requiredField', fieldName: 'credentials', fieldLabel: 'account' },

diff --git a/...foundry/src/pipeline/stages/destroyService/CloudfoundryDestroyServiceExecutionDetails.tsx b/...foundry/src/pipeline/stages/destroyService/CloudfoundryDestroyServiceExecutionDetails.tsx
diff --git a/...cloudfoundry/src/pipeline/stages/destroyService/cloudfoundryDestroyServiceStage.module.ts b/...cloudfoundry/src/pipeline/stages/destroyService/cloudfoundryDestroyServiceStage.module.ts
@@ -3,7 +3,7 @@ import { react2angular } from 'react2angular';
 
 import { CloudfoundryDestroyServiceStageConfig } from './CloudfoundryDestroyServiceStageConfig';
 import { ExecutionDetailsTasks, IStage, Registry } from '@spinnaker/core';
-import { CloudfoundryDestroyServiceExecutionDetails } from './CloudfoundryDestroyServiceExecutionDetails';
+import { CloudfoundryServiceExecutionDetails } from 'cloudfoundry/presentation';
 
 class CloudFoundryDestroyServiceStageCtrl implements IController {
   public static $inject = ['$scope'];
@@ -21,7 +21,7 @@ module(CLOUD_FOUNDRY_DESTROY_SERVICE_STAGE, [])
       cloudProvider: 'cloudfoundry',
       templateUrl: require('./cloudfoundryDestroyServiceStage.html'),
       controller: 'cfDestroyServiceStageCtrl',
-      executionDetailsSections: [CloudfoundryDestroyServiceExecutionDetails, ExecutionDetailsTasks],
+      executionDetailsSections: [CloudfoundryServiceExecutionDetails, ExecutionDetailsTasks],
       defaultTimeoutMs: 30 * 60 * 1000,
       validators: [
         { type: 'requiredField', fieldName: 'region' },

diff --git a/app/scripts/modules/cloudfoundry/src/presentation/index.ts b/app/scripts/modules/cloudfoundry/src/presentation/index.ts
@@ -1,2 +1,3 @@
-export * from './widgets';
 export * from './forms';
+export * from './pipeline';
+export * from './widgets';
diff --git a/app/scripts/modules/cloudfoundry/src/presentation/pipeline/index.ts b/app/scripts/modules/cloudfoundry/src/presentation/pipeline/index.ts
@@ -0,0 +1 @@
+export * from './stages';
diff --git a/...les/cloudfoundry/src/presentation/pipeline/stages/CloudfoundryServiceExecutionDetails.tsx b/...les/cloudfoundry/src/presentation/pipeline/stages/CloudfoundryServiceExecutionDetails.tsx
@@ -0,0 +1,51 @@
+import * as React from 'react';
+import { get } from 'lodash';
+
+import {
+  AccountTag,
+  ExecutionDetailsSection,
+  IExecutionDetailsSectionProps,
+  StageExecutionLogs,
+  StageFailureMessage,
+} from '@spinnaker/core';
+
+export function CloudfoundryServiceExecutionDetails(props: IExecutionDetailsSectionProps) {
+  const { stage } = props;
+  const { context } = stage;
+  const account = get(context, 'service.account', undefined);
+  const region = get(context, 'service.region', undefined);
+  const serviceInstanceName = get(context, 'service.instance.name', undefined);
+  return (
+    <ExecutionDetailsSection name={props.name} current={props.current}>
+      <div className="step-section-details">
+        <div className="row">
+          <div className="col-md-12">
+            <dl className="dl-horizontal">
+              <dt>Account</dt>
+              <dd>
+                <AccountTag account={account} />
+              </dd>
+              <dt>Region</dt>
+              <dd>
+                {region}
+                <br />
+              </dd>
+              <dt>Service Instance Name</dt>
+              <dd>
+                {serviceInstanceName}
+                <br />
+              </dd>
+            </dl>
+          </div>
+        </div>
+      </div>
+      <StageFailureMessage stage={stage} message={stage.failureMessage} />
+      <StageExecutionLogs stage={stage} />
+    </ExecutionDetailsSection>
+  );
+}
+
+// eslint-disable-next-line
+export namespace CloudfoundryServiceExecutionDetails {
+  export const title = 'cloudfoundryServiceConfig';
+}
diff --git a/app/scripts/modules/cloudfoundry/src/presentation/pipeline/stages/index.ts b/app/scripts/modules/cloudfoundry/src/presentation/pipeline/stages/index.ts
@@ -0,0 +1 @@
+export * from './CloudfoundryServiceExecutionDetails';