From 265946b12f37ccea3a71118915e51f36a01e34f0 Mon Sep 17 00:00:00 2001
From: Zhiqing Qiu <michaeljqzq@users.noreply.github.com>
Date: Thu, 23 May 2019 22:40:57 +0800
Subject: [PATCH] fix(provider/azure): Fix UI for Azure Load Balancer in server
 group configuration (#7055)

---
 .../details/loadBalancerDetail.controller.js           |  3 ++-
 .../azure/loadBalancer/details/loadBalancerDetail.html | 10 +++++-----
 .../configure/serverGroupCommandBuilder.service.js     |  6 ++++--
 .../advancedSettingsSelector.directive.html            |  2 +-
 .../azure/serverGroup/serverGroup.transformer.js       |  2 +-
 .../azure/serverGroup/serverGroup.transformer.spec.js  |  9 +++++++++
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js
index 487bcfd670c..97a10f743bb 100644
--- a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js
+++ b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.controller.js
@@ -92,7 +92,7 @@ module.exports = angular
                 $scope.securityGroups = _.sortBy(securityGroups, 'name');
               }
 
-              if ($scope.loadBalancer.loadBalancerType) {
+              if ($scope.loadBalancer.loadBalancerType && $scope.loadBalancer.loadBalancerType.includes('_')) {
                 const type = $scope.loadBalancer.loadBalancerType;
                 $scope.loadBalancer.loadBalancerType = type
                   .split('_')
@@ -157,6 +157,7 @@ module.exports = angular
         const command = {
           cloudProvider: 'azure',
           loadBalancerName: $scope.loadBalancer.name,
+          loadBalancerType: $scope.loadBalancer.loadBalancerType,
           credentials: $scope.loadBalancer.account,
           region: loadBalancer.region,
           appName: app.name,
diff --git a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html
index 24cf9af5ea8..7173c9e7a4b 100644
--- a/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html
+++ b/app/scripts/modules/azure/loadBalancer/details/loadBalancerDetail.html
@@ -38,7 +38,7 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
               class="disabled"
               tooltip="You must detach all server groups before you can delete this load balancer."
             >
-              <a href ng-click="ctrl.deleteLoadBalancer()">Delete Load Balancer</a>
+              <a href>Delete Load Balancer</a>
             </li>
           </ul>
         </div>
@@ -57,10 +57,10 @@ <h3 class="horizontal middle space-between flex-1" select-on-dbl-click>
           <account-tag account="loadBalancer.account" pad="right" provider="loadBalancer.type"></account-tag>
           {{loadBalancer.region}}
         </dd>
-        <dt>VNet</dt>
-        <dd>{{loadBalancer.elb.vnet}}</dd>
-        <dt>Subnet</dt>
-        <dd>{{loadBalancer.elb.subnet}}</dd>
+        <dt ng-if="loadBalancer.loadBalancerType !== 'Azure Load Balancer'">VNet</dt>
+        <dd ng-if="loadBalancer.loadBalancerType !== 'Azure Load Balancer'">{{loadBalancer.elb.vnet}}</dd>
+        <dt ng-if="loadBalancer.loadBalancerType !== 'Azure Load Balancer'">Subnet</dt>
+        <dd ng-if="loadBalancer.loadBalancerType !== 'Azure Load Balancer'">{{loadBalancer.elb.subnet}}</dd>
       </dl>
       <dl class="horizontal-when-filters-collapsed">
         <dt ng-if="loadBalancer.serverGroups">Server Groups</dt>
diff --git a/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js
index f21b592ae05..6bdd0cb56e5 100644
--- a/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js
+++ b/app/scripts/modules/azure/serverGroup/configure/serverGroupCommandBuilder.service.js
@@ -83,13 +83,16 @@ module.exports = angular
           selectedSubnets: serverGroup.selectedVnetSubnets,
           selectedVnet: serverGroup.selectedVnet,
           securityGroups: serverGroup.securityGroups,
-          loadBalancerName: serverGroup.appGatewayName,
+          loadBalancerName: serverGroup.loadBalancerName,
           loadBalancerType: serverGroup.loadBalancerType,
           securityGroupName: serverGroup.securityGroupName,
           region: serverGroup.region,
           vnet: serverGroup.vnet,
           vnetResourceGroup: serverGroup.vnetResourceGroup,
           subnet: serverGroup.subnet,
+          zones: serverGroup.zones,
+          zonesEnabled: serverGroup.zones && serverGroup.zones.length > 0,
+          instanceTags: {},
           sku: serverGroup.sku,
           capacity: {
             min: serverGroup.capacity.min,
@@ -97,7 +100,6 @@ module.exports = angular
             desired: serverGroup.capacity.desired,
           },
           tags: [],
-          instanceTags: serverGroup.instanceTags,
           instanceType: serverGroup.sku.name,
           selectedProvider: 'azure',
           source: {
diff --git a/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.html b/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.html
index 68b93519149..4d74726fe05 100644
--- a/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.html
+++ b/app/scripts/modules/azure/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.html
@@ -45,7 +45,7 @@
         />
       </div>
     </div>
-    <div class="form-group">
+    <div class="form-group" ng-if="adv.command.loadBalancerType === 'Azure Application Gateway'">
       <div class="col-md-4 sm-label-right">
         <input type="checkbox" ng-model="adv.command.enableInboundNAT" ng-disabled="adv.command.zonesEnabled" />
       </div>
diff --git a/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js b/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js
index 328cc69d057..bf2c4c0cd19 100644
--- a/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js
+++ b/app/scripts/modules/azure/serverGroup/serverGroup.transformer.js
@@ -72,7 +72,7 @@ module.exports = angular
         account: command.credentials,
         selectedProvider: 'azure',
         vnet: command.vnet,
-        vnetResourceGroup: command.vnetResourceGroup,
+        vnetResourceGroup: command.selectedVnet.resourceGroup,
         subnet: command.subnet,
         capacity: {
           useSourceCapacity: false,
diff --git a/app/scripts/modules/azure/serverGroup/serverGroup.transformer.spec.js b/app/scripts/modules/azure/serverGroup/serverGroup.transformer.spec.js
index f564fe9b386..a8a8ea8ddcd 100644
--- a/app/scripts/modules/azure/serverGroup/serverGroup.transformer.spec.js
+++ b/app/scripts/modules/azure/serverGroup/serverGroup.transformer.spec.js
@@ -24,6 +24,7 @@ describe('azureServerGroupTransformer', function() {
           sku: 'Server2016',
           version: '12.0.0.1',
         },
+        selectedVnet: {},
         viewState: {
           mode: 'create',
         },
@@ -47,6 +48,7 @@ describe('azureServerGroupTransformer', function() {
           sku: 'Server2016',
           version: '12.0.0.1',
         },
+        selectedVnet: {},
         viewState: {
           mode: 'create',
         },
@@ -70,6 +72,7 @@ describe('azureServerGroupTransformer', function() {
           sku: 'Server2016',
           version: '12.0.0.1',
         },
+        selectedVnet: {},
         viewState: {
           mode: 'create',
         },
@@ -94,6 +97,7 @@ describe('azureServerGroupTransformer', function() {
           sku: 'Server2016',
           version: '12.0.0.1',
         },
+        selectedVnet: {},
         viewState: {
           mode: 'create',
         },
@@ -118,6 +122,7 @@ describe('azureServerGroupTransformer', function() {
           sku: 'Server2016',
           version: '12.0.0.1',
         },
+        selectedVnet: {},
         viewState: {
           mode: 'create',
         },
@@ -154,6 +159,7 @@ describe('azureServerGroupTransformer', function() {
           sku: 'Server2016',
           version: '12.0.0.1',
         },
+        selectedVnet: {},
         viewState: {
           mode: 'create',
         },
@@ -182,6 +188,7 @@ describe('azureServerGroupTransformer', function() {
           sku: 'Server2016',
           version: '12.0.0.1',
         },
+        selectedVnet: {},
         viewState: {
           mode: 'create',
         },
@@ -209,6 +216,7 @@ describe('azureServerGroupTransformer', function() {
           sku: 'Server2016',
           version: '12.0.0.1',
         },
+        selectedVnet: {},
         viewState: {
           mode: 'create',
         },
@@ -233,6 +241,7 @@ describe('azureServerGroupTransformer', function() {
           sku: 'Server2016',
           version: '12.0.0.1',
         },
+        selectedVnet: {},
         viewState: {
           mode: 'create',
         },