From 92ed8305640e642146907379183ce9c91668565b Mon Sep 17 00:00:00 2001 From: Alex Ma Date: Tue, 15 Sep 2020 14:41:10 -0700 Subject: [PATCH] Portal links for main branch (#12319) * first commit * json field added * message genericized * order changed * removed summary page text * fixed url --- .../images/azure-sql-db.svg | 24 +++++++ extensions/resource-deployment/package.json | 65 +++++++++++++++++++ .../resource-deployment/package.nls.json | 12 +++- .../resource-deployment/src/interfaces.ts | 1 + .../src/ui/resourceTypePickerDialog.ts | 8 +++ 5 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 extensions/resource-deployment/images/azure-sql-db.svg diff --git a/extensions/resource-deployment/images/azure-sql-db.svg b/extensions/resource-deployment/images/azure-sql-db.svg new file mode 100644 index 0000000000..c100d8351c --- /dev/null +++ b/extensions/resource-deployment/images/azure-sql-db.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 7a44bea1aa..0fb35aa32a 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -391,6 +391,71 @@ "when": "version=sql2019" } ] + }, + { + "name": "sql-azure-setup", + "displayName": "%azure-sqldb-display-name%", + "description": "%azure-sqldb-description%", + "platforms": "*", + "icon": { + "light": "./images/azure-sql-db.svg", + "dark": "./images/azure-sql-db.svg" + }, + "okButtonText": "%azure-sqldb-ok-button-text%", + "options": [ + { + "name": "resource-type", + "displayName": "%resource-type-display-name%", + "values": [ + { + "name": "single-database", + "displayName": "%sql-azure-single-database-display-name%" + }, + { + "name": "elastic-pool", + "displayName": "%sql-azure-elastic-pool-display-name%" + }, + { + "name": "database-server", + "displayName": "%sql-azure-database-server-display-name%" + } + ] + } + ], + "providers": [ + { + "webPageUrl": "https://portal.azure.com/#create/Microsoft.SQLDatabase", + "requiredTools": [], + "when": "resource-type=single-database" + }, + { + "webPageUrl": "https://portal.azure.com/#create/Microsoft.SQLElasticDatabasePool", + "requiredTools": [], + "when": "resource-type=elastic-pool" + }, + { + "webPageUrl": "https://portal.azure.com/#create/Microsoft.SQLServer", + "requiredTools": [], + "when": "resource-type=database-server" + } + ], + "agreement": { + "template": "%azure-sqldb-agreement%", + "links": [ + { + "text": "%microsoft-privacy-statement%", + "url": "https://go.microsoft.com/fwlink/?LinkId=853010" + }, + { + "text": "%azure-sqldb-agreement-sqldb-eula%", + "url": "https://azure.microsoft.com/support/legal/" + }, + { + "text": "%azure-sqldb-agreement-azdata-eula%", + "url": "https://aka.ms/eula-azdata-en" + } + ] + } } ] }, diff --git a/extensions/resource-deployment/package.nls.json b/extensions/resource-deployment/package.nls.json index 7021520e4b..87264d27d9 100644 --- a/extensions/resource-deployment/package.nls.json +++ b/extensions/resource-deployment/package.nls.json @@ -46,5 +46,15 @@ "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-sqldb-display-name": "Azure SQL Database", + "azure-sqldb-description": "Select a resource type and then you will be taken to the Azure portal to create the Azure resource.", + "azure-sqldb-ok-button-text": "Create in Azure portal", + "resource-type-display-name": "Resource Type", + "sql-azure-single-database-display-name": "Single Database", + "sql-azure-elastic-pool-display-name": "Elastic Pool", + "sql-azure-database-server-display-name": "Database Server", + "azure-sqldb-agreement": "I accept {0}, {1} and {2}.", + "azure-sqldb-agreement-sqldb-eula": "Azure SQL DB License Terms", + "azure-sqldb-agreement-azdata-eula": "azdata License Terms" } diff --git a/extensions/resource-deployment/src/interfaces.ts b/extensions/resource-deployment/src/interfaces.ts index e94aef2aff..1d6a4b7b36 100644 --- a/extensions/resource-deployment/src/interfaces.ts +++ b/extensions/resource-deployment/src/interfaces.ts @@ -18,6 +18,7 @@ export interface ResourceType { providers: DeploymentProvider[]; agreement?: AgreementInfo; displayIndex?: number; + okButtonText?: string; getProvider(selectedOptions: { option: string, value: string }[]): DeploymentProvider | undefined; } diff --git a/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts b/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts index adf80e4d6b..76b4409d73 100644 --- a/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts +++ b/extensions/resource-deployment/src/ui/resourceTypePickerDialog.ts @@ -176,6 +176,14 @@ 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) {