From b158180ef466cc2e270213f12cc99c647065e18e Mon Sep 17 00:00:00 2001 From: Aasim Khan Date: Thu, 17 Sep 2020 17:37:41 -0700 Subject: [PATCH] Added portal link for Azure SQL (#12425) --- .../resource-deployment/images/azure-sql.svg | 24 +++++++++++++++++++ extensions/resource-deployment/package.json | 19 +++++++++++++++ .../resource-deployment/package.nls.json | 5 +++- .../resource-deployment/src/interfaces.ts | 1 + .../src/ui/resourceTypePickerDialog.ts | 9 +++++++ 5 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 extensions/resource-deployment/images/azure-sql.svg diff --git a/extensions/resource-deployment/images/azure-sql.svg b/extensions/resource-deployment/images/azure-sql.svg new file mode 100644 index 0000000000..c100d8351c --- /dev/null +++ b/extensions/resource-deployment/images/azure-sql.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + Icon-databases-130 + + + + + + \ No newline at end of file diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json index 990bcdb543..b835109419 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -391,6 +391,25 @@ "when": "version=sql2019" } ] + }, + { + "name": "azure-sql", + "displayIndex": 4, + "displayName": "%azure-sql-displayName%", + "description": "%azure-sql-description%", + "platforms": "*", + "okButtonText": "%azure-sql-ok-button-text%", + "icon": { + "light": "./images/azure-sql.svg", + "dark": "./images/azure-sql.svg" + }, + "options": [], + "providers": [ + { + "webPageUrl": "https://portal.azure.com/#create/Microsoft.AzureSQL", + "requiredTools": [] + } + ] } ] }, diff --git a/extensions/resource-deployment/package.nls.json b/extensions/resource-deployment/package.nls.json index 7021520e4b..f084f39f10 100644 --- a/extensions/resource-deployment/package.nls.json +++ b/extensions/resource-deployment/package.nls.json @@ -46,5 +46,8 @@ "bdc-agreement-azdata-eula": "azdata License Terms", "bdc-agreement-bdc-eula": "SQL Server License Terms", "deployment.configuration.title": "Deployment configuration", - "azdata-install-location-description": "Location of the azdata package used for the install command" + "azdata-install-location-description": "Location of the azdata package used for the install command", + "azure-sql-displayName":"Azure SQL", + "azure-sql-description":"Create a SQL Database, SQL Virtual Machine, or SQL Managed Instance by going to the Azure portal", + "azure-sql-ok-button-text": "Create in Azure portal" } diff --git a/extensions/resource-deployment/src/interfaces.ts b/extensions/resource-deployment/src/interfaces.ts index 251b103442..ef46ebc115 100644 --- a/extensions/resource-deployment/src/interfaces.ts +++ b/extensions/resource-deployment/src/interfaces.ts @@ -20,6 +20,7 @@ export interface ResourceType { agreement?: AgreementInfo; displayIndex?: number; getProvider(selectedOptions: { option: string, value: string }[]): DeploymentProvider | undefined; + okButtonText?: string; } export interface AgreementInfo { diff --git a/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts b/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts index a893239131..0fff105a1c 100644 --- a/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts +++ b/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts @@ -182,6 +182,15 @@ export class ResourceTypePickerDialog extends DialogBase { private selectResourceType(resourceType: ResourceType): void { this._selectedResourceType = resourceType; + + //handle special case when resource type has different OK button. + if (this._selectedResourceType.okButtonText) { + this._dialogObject.okButton.label = this._selectedResourceType.okButtonText; + } + else { + this._dialogObject.okButton.label = localize('deploymentDialog.OKButtonText', "Select"); + } + this._agreementCheckboxChecked = false; this._agreementContainer.clearItems(); if (resourceType.agreement) {