From 539457cd50b3a08e27e0a45104c1b0be9f1a0d08 Mon Sep 17 00:00:00 2001
From: Jammy Louie <jlouie@pivotal.io>
Date: Thu, 7 Feb 2019 17:37:00 -0500
Subject: [PATCH] fix(cf): fix SG pipeline modal display issues (#6504)

---
 .../configure/wizard/CreateServerGroupModal.tsx        | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/CreateServerGroupModal.tsx b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/CreateServerGroupModal.tsx
index 0965616fd7f..ccf165e207e 100644
--- a/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/CreateServerGroupModal.tsx
+++ b/app/scripts/modules/cloudfoundry/src/serverGroup/configure/wizard/CreateServerGroupModal.tsx
@@ -36,6 +36,7 @@ export interface ICloudFoundryCreateServerGroupProps extends IModalComponentProp
 
 export interface ICloudFoundryCreateServerGroupState {
   artifactAccounts: IArtifactAccount[];
+  loading: boolean;
   requiresTemplateSelection: boolean;
   taskMonitor: TaskMonitor;
 }
@@ -58,6 +59,7 @@ export class CloudFoundryCreateServerGroupModal extends React.Component<
     super(props);
     this.state = {
       artifactAccounts: [],
+      loading: false,
       requiresTemplateSelection: get(props, 'command.viewState.requiresTemplateSelection', false),
       taskMonitor: new TaskMonitor({
         application: props.application,
@@ -76,6 +78,11 @@ export class CloudFoundryCreateServerGroupModal extends React.Component<
 
   private templateSelected = () => {
     this.setState({ requiresTemplateSelection: false });
+    this.initialize();
+  };
+
+  private initialize = () => {
+    this.setState({ loading: false });
   };
 
   private onTaskComplete = () => {
@@ -94,7 +101,7 @@ export class CloudFoundryCreateServerGroupModal extends React.Component<
   };
 
   public render(): React.ReactElement<CloudFoundryCreateServerGroupModal> {
-    const { artifactAccounts, requiresTemplateSelection, taskMonitor } = this.state;
+    const { artifactAccounts, loading, requiresTemplateSelection, taskMonitor } = this.state;
     const { application, command, dismissModal, isSourceConstant, serverGroup, title } = this.props;
 
     if (requiresTemplateSelection) {
@@ -112,6 +119,7 @@ export class CloudFoundryCreateServerGroupModal extends React.Component<
       <WizardModal<ICloudFoundryCreateServerGroupCommand>
         heading={title}
         initialValues={command}
+        loading={loading}
         taskMonitor={taskMonitor}
         dismissModal={dismissModal}
         closeModal={this.submit}