updates

Author: Dany Contreras

workload/portal-ui/brownfield/portalUiNewSessionHosts.json

@@ -79,15 +79,31 @@
 									"list": "value|[*].{label:name, value:id}"
 								}
 							}
+						}					
+					]
+				},
+				{
+					"name": "sessionHosts",
+					"label": "Session Hosts",
+					"elements": [
+						{
+							"name": "resourceSkusApi",
+							"type": "Microsoft.Solutions.ArmApiControl",
+							"condition": "[and(not(empty(steps('basics').resourceScope.subscription)), not(empty(steps('basics').resourceScope.location)))]",
+							"request": {
+								"method": "GET",
+								"path": "[concat(steps('basics').resourceScope.subscription.id, '/providers/Microsoft.Compute/skus?api-version=2021-07-01&$filter=location eq ', decodeUriComponent('%27'), steps('basics').resourceScope.location.name, decodeUriComponent('%27'))]"
+							}
 						},
 						{
-							"name": "deployment",
+							"name": "naming",
 							"type": "Microsoft.Common.Section",
-							"label": "Deployment Details",
+							"label": "Virtual Machine Naming",
 							"elements": [
 								{
 									"name": "prefix",
 									"type": "Microsoft.Common.TextBox",
+									"visible": "[not(steps('sessionHosts').naming.customNaming)]",
 									"label": "Deployment Prefix",
 									"subLabel": "",
 									"defaultValue": "AVD1",
@@ -102,6 +118,7 @@
 									"name": "environment",
 									"type": "Microsoft.Common.DropDown",
 									"label": "Deployment Environment",
+									"visible": "[not(steps('sessionHosts').naming.customNaming)]",
 									"defaultValue": "Dev",
 									"toolTip": "The name of the resource group to deploy.",
 									"constraints": {
@@ -121,30 +138,7 @@
 											}
 										]
 									}
-								}
-							],
-							"visible": true
-						}						
-					]
-				},
-				{
-					"name": "sessionHosts",
-					"label": "Session Hosts",
-					"elements": [
-						{
-							"name": "resourceSkusApi",
-							"type": "Microsoft.Solutions.ArmApiControl",
-							"condition": "[and(not(empty(steps('basics').resourceScope.subscription)), not(empty(steps('basics').resourceScope.location)))]",
-							"request": {
-								"method": "GET",
-								"path": "[concat(steps('basics').resourceScope.subscription.id, '/providers/Microsoft.Compute/skus?api-version=2021-07-01&$filter=location eq ', decodeUriComponent('%27'), steps('basics').resourceScope.location.name, decodeUriComponent('%27'))]"
-							}
-						},
-						{
-							"name": "naming",
-							"type": "Microsoft.Common.Section",
-							"label": "Virtual Machine Naming",
-							"elements": [
+								},	
 								{
 									"name": "customNaming",
 									"type": "Microsoft.Common.CheckBox",
@@ -1027,8 +1021,8 @@
 				"hostPoolResourceId": "[steps('basics').hostPool.id]",
 				"location": "[steps('basics').resourceScope.location.name]",
 				"computeRgResourceGroupName": "[steps('basics').resourceGroup.name]",
-				"deploymentPrefix": "[steps('basics').deployment.prefix]",
-				"deploymentEnvironment": "[steps('basics').deployment.environment]",
+				"deploymentPrefix": "[if(not(steps('sessionHosts').naming.customNaming), steps('sessionHosts').naming.prefix, '')]", 
+				"deploymentEnvironment": "[if(not(steps('sessionHosts').naming.customNaming), steps('sessionHosts').naming.environment, '')]", 
 				"customNaming": "[steps('sessionHosts').naming.customNaming]",
 				"sessionHostCustomNamePrefix": "[if(steps('sessionHosts').naming.customNaming, steps('sessionHosts').naming.vmNamePrefix, 'notapp')]",
 				"count": "[steps('sessionHosts').naming.count]",