Skip to content

Baseline portal UI clean-up #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sihbher merged 1 commit into from
Apr 4, 2025
Merged

Baseline portal UI clean-up #774

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 5 additions & 23 deletions workload/portal-ui/portal-ui-baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,6 @@
"path": "subscriptions?api-version=2022-01-01"
}
},
{
"name": "avdServicePrincipal",
"type": "Microsoft.Solutions.GraphApiControl",
"condition": "[not(empty(steps('basics').resourceScope.subscription))]",
"request": {
"method": "GET",
"path": "/v1.0/serviceprincipals?$filter=appId eq '9cdead84-a844-4324-93f2-b2e6bb768d07'"
}
},
{
"name": "avdArmServicePrincipal",
"type": "Microsoft.Solutions.GraphApiControl",
"condition": "[not(empty(steps('basics').resourceScope.subscription))]",
"request": {
"method": "GET",
"path": "/v1.0/servicePrincipals?$filter=appId eq '50e95039-b200-4007-bc97-8d5790743a63'"
}
},
{
"name": "infoPreReq",
"type": "Microsoft.Common.InfoBox",
Expand Down Expand Up @@ -649,7 +631,7 @@
{
"name": "servicePrincipalSelector",
"type": "Microsoft.Common.Selector",
"visible": "[and(empty(first(steps('basics').avdServicePrincipal.value)), or(steps('managementPlane').managementPlaneHostPoolScaling.startVmOnConnect, steps('managementPlane').managementPlaneHostPoolScaling.scalingPlan))]",
"visible": "[or(steps('managementPlane').managementPlaneHostPoolScaling.startVmOnConnect, steps('managementPlane').managementPlaneHostPoolScaling.scalingPlan)]",
"label": "<b>Azure/Windows Virtual Desktop</b> Enterprise Application",
"keyPath": "displayName",
"value": "[steps('managementPlane').managementPlaneHostPoolScaling.servicePrincipalPickerBlade.transformed.selection]",
Expand Down Expand Up @@ -1336,7 +1318,7 @@
"required": true
},
"link": "[if(empty(steps('storage').storageAppAttach.servicePrincipalPickerBlade), 'Select Enterprise Application', first(map(steps('storage').storageAppAttach.servicePrincipalPickerBlade.transformed.selection, (sp) => sp.displayName)))]",
"visible": "[and(equals(steps('identity').identityDomainInformation.identityServiceProvider, 'EntraID'), steps('storage').storageAppAttach.appAttachStorageDeployment, empty(first(steps('basics').avdServicePrincipal.value)), empty(steps('managementPlane').managementPlaneHostPoolScaling.servicePrincipalPickerBlade))]"
"visible": "[and(equals(steps('identity').identityDomainInformation.identityServiceProvider, 'EntraID'), steps('storage').storageAppAttach.appAttachStorageDeployment, empty(steps('managementPlane').managementPlaneHostPoolScaling.servicePrincipalPickerBlade))]"
},
{
"name": "armServicePrincipalPickerBlade",
Expand Down Expand Up @@ -1383,7 +1365,7 @@
"required": true
},
"link": "[if(empty(steps('storage').storageAppAttach.armServicePrincipalPickerBlade), 'Select Enterprise Application', first(map(steps('storage').storageAppAttach.armServicePrincipalPickerBlade.transformed.selection, (sp) => sp.displayName)))]",
"visible": "[and(equals(steps('identity').identityDomainInformation.identityServiceProvider, 'EntraID'), steps('storage').storageAppAttach.appAttachStorageDeployment, empty(first(steps('basics').avdArmServicePrincipal.value)))]"
"visible": "[and(equals(steps('identity').identityDomainInformation.identityServiceProvider, 'EntraID'), steps('storage').storageAppAttach.appAttachStorageDeployment)]"
}
]
}
Expand Down Expand Up @@ -2773,8 +2755,8 @@
},
"outputs": {
"parameters": {
"avdServicePrincipalObjectId": "[if(empty(first(steps('basics').avdServicePrincipal.value)), if(or(steps('managementPlane').managementPlaneHostPoolScaling.scalingPlan, steps('managementPlane').managementPlaneHostPoolScaling.startVmOnConnect), first(map(steps('managementPlane').managementPlaneHostPoolScaling.servicePrincipalPickerBlade.transformed.selection, (sp) => sp.id)), if(and(equals(steps('identity').identityDomainInformation.identityServiceProvider, 'EntraID'), steps('storage').storageAppAttach.appAttachStorageDeployment), first(map(steps('storage').storageAppAttach.servicePrincipalPickerBlade.transformed.selection, (sp) => sp.id)), '')), first(steps('basics').avdServicePrincipal.value.id))]",
"avdArmServicePrincipalObjectId": "[if(and(equals(steps('identity').identityDomainInformation.identityServiceProvider, 'EntraID'), steps('storage').storageAppAttach.appAttachStorageDeployment), if(empty(first(steps('basics').avdArmServicePrincipal.value)), first(map(steps('storage').storageAppAttach.armServicePrincipalPickerBlade.transformed.selection, (sp) => sp.id)), first(steps('basics').avdArmServicePrincipal.value.id)), '')]",
"avdServicePrincipalObjectId": "[if(or(steps('managementPlane').managementPlaneHostPoolScaling.scalingPlan, steps('managementPlane').managementPlaneHostPoolScaling.startVmOnConnect), first(map(steps('managementPlane').managementPlaneHostPoolScaling.servicePrincipalPickerBlade.transformed.selection, (sp) => sp.id)), if(and(equals(steps('identity').identityDomainInformation.identityServiceProvider, 'EntraID'), steps('storage').storageAppAttach.appAttachStorageDeployment), first(map(steps('storage').storageAppAttach.servicePrincipalPickerBlade.transformed.selection, (sp) => sp.id)), ''))]",
"avdArmServicePrincipalObjectId": "[if(and(equals(steps('identity').identityDomainInformation.identityServiceProvider, 'EntraID'), steps('storage').storageAppAttach.appAttachStorageDeployment), first(map(steps('storage').storageAppAttach.armServicePrincipalPickerBlade.transformed.selection, (sp) => sp.id)), '')]",
"deploymentPrefix": "[steps('basics').deploymentSpecs.deploymentPrefix]",
"deploymentEnvironment": "[steps('basics').deploymentSpecs.deploymentEnvironment]",
"diskZeroTrust": "[steps('sessionHosts').sessionHostsSettingsSection.sessionHostDiskZeroTrust]",
Expand Down
Loading