From 1150433c0a47ab287801e9bc751a5dee04c497e8 Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Thu, 6 Jun 2019 13:03:03 -0700 Subject: [PATCH] update the strings (#5904) * update the strings * PR comments and remove the workaround --- .../2019/CTP3-1/deploy-bdc-aks.ipynb} | 0 .../CTP3-1/deploy-bdc-existing-cluster.ipynb} | 0 .../2017/deploy-sql2017-image.ipynb} | 0 .../2019/deploy-sql2019-image.ipynb} | 0 extensions/resource-deployment/package.json | 18 ++++++---- .../resource-deployment/package.nls.json | 26 +++++++-------- .../resource-deployment/src/interfaces.ts | 1 - .../src/services/tools/azCLITool.ts | 2 +- .../src/services/tools/dockerTool.ts | 2 +- .../src/services/tools/kubectlTool.ts | 2 +- .../src/services/tools/mssqlctlTool.ts | 2 +- .../src/services/tools/pythonTool.ts | 26 --------------- .../src/services/toolsService.ts | 3 +- .../src/test/toolsService.test.ts | 3 +- .../src/ui/resourceDeploymentDialog.ts | 33 ++++++++----------- 15 files changed, 45 insertions(+), 73 deletions(-) rename extensions/resource-deployment/notebooks/{sql2019-ctp30-bdc-aks.ipynb => bdc/2019/CTP3-1/deploy-bdc-aks.ipynb} (100%) rename extensions/resource-deployment/notebooks/{sql2019-ctp30-bdc-existing-cluster.ipynb => bdc/2019/CTP3-1/deploy-bdc-existing-cluster.ipynb} (100%) rename extensions/resource-deployment/notebooks/{sql2017-image-docker.ipynb => docker/2017/deploy-sql2017-image.ipynb} (100%) rename extensions/resource-deployment/notebooks/{sql2019-image-docker.ipynb => docker/2019/deploy-sql2019-image.ipynb} (100%) delete mode 100644 extensions/resource-deployment/src/services/tools/pythonTool.ts diff --git a/extensions/resource-deployment/notebooks/sql2019-ctp30-bdc-aks.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/CTP3-1/deploy-bdc-aks.ipynb similarity index 100% rename from extensions/resource-deployment/notebooks/sql2019-ctp30-bdc-aks.ipynb rename to extensions/resource-deployment/notebooks/bdc/2019/CTP3-1/deploy-bdc-aks.ipynb diff --git a/extensions/resource-deployment/notebooks/sql2019-ctp30-bdc-existing-cluster.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/CTP3-1/deploy-bdc-existing-cluster.ipynb similarity index 100% rename from extensions/resource-deployment/notebooks/sql2019-ctp30-bdc-existing-cluster.ipynb rename to extensions/resource-deployment/notebooks/bdc/2019/CTP3-1/deploy-bdc-existing-cluster.ipynb diff --git a/extensions/resource-deployment/notebooks/sql2017-image-docker.ipynb b/extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb similarity index 100% rename from extensions/resource-deployment/notebooks/sql2017-image-docker.ipynb rename to extensions/resource-deployment/notebooks/docker/2017/deploy-sql2017-image.ipynb diff --git a/extensions/resource-deployment/notebooks/sql2019-image-docker.ipynb b/extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb similarity index 100% rename from extensions/resource-deployment/notebooks/sql2019-image-docker.ipynb rename to extensions/resource-deployment/notebooks/docker/2019/deploy-sql2019-image.ipynb diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json index 97fdfaaa63..3a4265d4d0 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -43,6 +43,12 @@ } ], "menus": { + "commandPalette": [ + { + "command": "azdata.resource.deploy", + "when": "false" + } + ], "dataExplorer/action": [ { "command": "azdata.resource.sql-image.deploy", @@ -125,8 +131,8 @@ "displayName": "%version-display-name%", "values": [ { - "name": "ctp3.0", - "displayName": "%sql-2019ctp30-display-name%" + "name": "ctp3.1", + "displayName": "%sql-2019ctp31-display-name%" } ] }, @@ -147,7 +153,7 @@ ], "providers": [ { - "notebook": "%bdc-ctp30-aks-notebook%", + "notebook": "%bdc-ctp31-aks-notebook%", "requiredTools": [ { "name": "kubectl" @@ -159,10 +165,10 @@ "name": "mssqlctl" } ], - "when": "target=aks&&version=ctp3.0" + "when": "target=aks&&version=ctp3.1" }, { - "notebook": "%bdc-ctp30-existing-cluster-notebook%", + "notebook": "%bdc-ctp31-existing-cluster-notebook%", "requiredTools": [ { "name": "kubectl" @@ -171,7 +177,7 @@ "name": "mssqlctl" } ], - "when": "target=existingCluster&&version=ctp3.0" + "when": "target=existingCluster&&version=ctp3.1" } ] } diff --git a/extensions/resource-deployment/package.nls.json b/extensions/resource-deployment/package.nls.json index 2328dabbde..c21c6b5ab4 100644 --- a/extensions/resource-deployment/package.nls.json +++ b/extensions/resource-deployment/package.nls.json @@ -1,23 +1,23 @@ { - "extension-displayName": "Resource Deployment extension for Azure Data Studio", - "extension-description": "Provides a notebook-based experience to deploy SQL Server and other Azure Data Services", + "extension-displayName": "SQL Server Deployment extension for Azure Data Studio", + "extension-description": "Provides a notebook-based experience to deploy Microsoft SQL Server", "deploy-sql-image-command-name": "Deploy SQL Server on Docker…", - "deploy-sql-bdc-command-name": "Deploy SQL Server Big Data Cluster…", + "deploy-sql-bdc-command-name": "Deploy SQL Server big data cluster…", "deploy-resource-command-name": "Deploy SQL Server…", - "deploy-resource-command-category": "Resource Deployment", - "resource-type-sql-image-display-name": "Container Image", - "resource-type-sql-image-description": "SQL Server container image on Docker", - "resource-type-sql-bdc-display-name": "Big Data Cluster", - "resource-type-sql-bdc-description": "SQL Server Big Data Cluster", + "deploy-resource-command-category": "Deployment", + "resource-type-sql-image-display-name": "SQL Server container image", + "resource-type-sql-image-description": "Run SQL Server container image with Docker", + "resource-type-sql-bdc-display-name": "SQL Server big data cluster", + "resource-type-sql-bdc-description": "SQL Server big data cluster allows you to deploy scalable clusters of SQL Server, Spark, and HDFS containers running on Kubernetes", "version-display-name": "Version", "sql-2017-display-name": "SQL Server 2017", "sql-2019-display-name": "SQL Server 2019", - "sql-2017-docker-notebook": "./notebooks/sql2017-image-docker.ipynb", - "sql-2019-docker-notebook": "./notebooks/sql2019-image-docker.ipynb", - "sql-2019ctp30-display-name": "SQL Server 2019 Big Data Cluster CTP 3.0", + "sql-2017-docker-notebook": "./notebooks/docker/2017/deploy-sql2017-image.ipynb", + "sql-2019-docker-notebook": "./notebooks/docker/2019/deploy-sql2019-image.ipynb", + "sql-2019ctp31-display-name": "SQL Server 2019 big data cluster CTP 3.1", "bdc-deployment-target": "Deployment target", "bdc-deployment-target-aks": "New Azure Kubernetes Service Cluster", "bdc-deployment-target-existing-cluster": "Existing Kubernetes Cluster", - "bdc-ctp30-aks-notebook": "./notebooks/sql2019-ctp30-bdc-aks.ipynb", - "bdc-ctp30-existing-cluster-notebook": "./notebooks/sql2019-ctp30-bdc-existing-cluster.ipynb" + "bdc-ctp31-aks-notebook": "./notebooks/bdc/2019/ctp3-1/deploy-bdc-aks.ipynb", + "bdc-ctp31-existing-cluster-notebook": "./notebooks/bdc/2019/ctp3-1/deploy-bdc-existing-cluster.ipynb" } \ No newline at end of file diff --git a/extensions/resource-deployment/src/interfaces.ts b/extensions/resource-deployment/src/interfaces.ts index bae922cbfa..b412a11a91 100644 --- a/extensions/resource-deployment/src/interfaces.ts +++ b/extensions/resource-deployment/src/interfaces.ts @@ -47,7 +47,6 @@ export enum ToolType { AzCli, KubeCtl, Docker, - Python, MSSQLCtl } diff --git a/extensions/resource-deployment/src/services/tools/azCLITool.ts b/extensions/resource-deployment/src/services/tools/azCLITool.ts index 8218269158..3116b42dfa 100644 --- a/extensions/resource-deployment/src/services/tools/azCLITool.ts +++ b/extensions/resource-deployment/src/services/tools/azCLITool.ts @@ -13,7 +13,7 @@ export class AzCliTool implements ITool { } get description(): string { - return localize('resourceDeployment.AzCLIDescription', 'Tool used for managing Azure services'); + return localize('resourceDeployment.AzCLIDescription', 'A command-line tool for managing Azure resources'); } get type(): ToolType { diff --git a/extensions/resource-deployment/src/services/tools/dockerTool.ts b/extensions/resource-deployment/src/services/tools/dockerTool.ts index 4406fe5780..d87231d6cd 100644 --- a/extensions/resource-deployment/src/services/tools/dockerTool.ts +++ b/extensions/resource-deployment/src/services/tools/dockerTool.ts @@ -13,7 +13,7 @@ export class DockerTool implements ITool { } get description(): string { - return localize('resourceDeployment.DockerDescription', 'Manages the containers'); + return localize('resourceDeployment.DockerDescription', 'Provides the ability to package and run an application in isolated containers'); } get type(): ToolType { diff --git a/extensions/resource-deployment/src/services/tools/kubectlTool.ts b/extensions/resource-deployment/src/services/tools/kubectlTool.ts index d4aa9f3627..4590498add 100644 --- a/extensions/resource-deployment/src/services/tools/kubectlTool.ts +++ b/extensions/resource-deployment/src/services/tools/kubectlTool.ts @@ -13,7 +13,7 @@ export class KubeCtlTool implements ITool { } get description(): string { - return localize('resourceDeployment.KubeCtlDescription', 'Tool used for managing the Kubernetes cluster'); + return localize('resourceDeployment.KubeCtlDescription', 'A command-line tool allows you to run commands against Kubernetes clusters'); } get type(): ToolType { diff --git a/extensions/resource-deployment/src/services/tools/mssqlctlTool.ts b/extensions/resource-deployment/src/services/tools/mssqlctlTool.ts index 70d5728941..9b4f66b818 100644 --- a/extensions/resource-deployment/src/services/tools/mssqlctlTool.ts +++ b/extensions/resource-deployment/src/services/tools/mssqlctlTool.ts @@ -13,7 +13,7 @@ export class MSSQLCtlTool implements ITool { } get description(): string { - return localize('resourceDeployment.MssqlCtlDescription', 'Command-line tool for installing and managing the SQL Server big data cluster'); + return localize('resourceDeployment.MssqlCtlDescription', 'A command-line utility written in Python that enables cluster administrators to bootstrap and manage the big data cluster via REST APIs'); } get type(): ToolType { diff --git a/extensions/resource-deployment/src/services/tools/pythonTool.ts b/extensions/resource-deployment/src/services/tools/pythonTool.ts deleted file mode 100644 index 08de51d0f3..0000000000 --- a/extensions/resource-deployment/src/services/tools/pythonTool.ts +++ /dev/null @@ -1,26 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -'use strict'; -import { ToolType, ITool } from '../../interfaces'; -import * as nls from 'vscode-nls'; -const localize = nls.loadMessageBundle(); - -export class PythonTool implements ITool { - get name(): string { - return 'python'; - } - - get description(): string { - return localize('resourceDeployment.PythonDescription', 'Required by notebook feature'); - } - - get type(): ToolType { - return ToolType.Python; - } - - get displayName(): string { - return localize('resourceDeployment.PythonDisplayName', 'Python'); - } -} \ No newline at end of file diff --git a/extensions/resource-deployment/src/services/toolsService.ts b/extensions/resource-deployment/src/services/toolsService.ts index 507e634cd4..b9d4615e59 100644 --- a/extensions/resource-deployment/src/services/toolsService.ts +++ b/extensions/resource-deployment/src/services/toolsService.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; import { ITool } from '../interfaces'; -import { PythonTool } from './tools/pythonTool'; import { DockerTool } from './tools/dockerTool'; import { AzCliTool } from './tools/azCliTool'; import { MSSQLCtlTool } from './tools/mssqlCtlTool'; @@ -16,7 +15,7 @@ export interface IToolsService { export class ToolsService implements IToolsService { constructor() { - this.SupportedTools = [new PythonTool(), new DockerTool(), new AzCliTool(), new MSSQLCtlTool(), new KubeCtlTool()]; + this.SupportedTools = [new DockerTool(), new AzCliTool(), new MSSQLCtlTool(), new KubeCtlTool()]; } private SupportedTools: ITool[]; diff --git a/extensions/resource-deployment/src/test/toolsService.test.ts b/extensions/resource-deployment/src/test/toolsService.test.ts index 9a3c91f0d2..a6d36a4ebb 100644 --- a/extensions/resource-deployment/src/test/toolsService.test.ts +++ b/extensions/resource-deployment/src/test/toolsService.test.ts @@ -20,8 +20,7 @@ suite('Tools Service Tests', function (): void { { name: 'azcli', type: ToolType.AzCli }, { name: 'docker', type: ToolType.Docker }, { name: 'kubectl', type: ToolType.KubeCtl }, - { name: 'mssqlctl', type: ToolType.MSSQLCtl }, - { name: 'python', type: ToolType.Python }]; + { name: 'mssqlctl', type: ToolType.MSSQLCtl }]; const missingTypes: string[] = []; diff --git a/extensions/resource-deployment/src/ui/resourceDeploymentDialog.ts b/extensions/resource-deployment/src/ui/resourceDeploymentDialog.ts index 02aff36a6c..d8f6745f0d 100644 --- a/extensions/resource-deployment/src/ui/resourceDeploymentDialog.ts +++ b/extensions/resource-deployment/src/ui/resourceDeploymentDialog.ts @@ -32,9 +32,9 @@ export class ResourceDeploymentDialog { private resourceTypeService: IResourceTypeService, resourceType: ResourceType) { this._selectedResourceType = resourceType; - this._dialogObject = azdata.window.createModelViewDialog(localize('deploymentDialog.title', 'Select a configuration'), 'resourceDeploymentDialog', true); + this._dialogObject = azdata.window.createModelViewDialog(localize('deploymentDialog.title', 'Select the deployment options'), 'resourceDeploymentDialog', true); this._dialogObject.cancelButton.onClick(() => this.onCancel()); - this._dialogObject.okButton.label = localize('deploymentDialog.OKButtonText', 'Select'); + this._dialogObject.okButton.label = localize('deploymentDialog.OKButtonText', 'Open Notebook'); this._dialogObject.okButton.onClick(() => this.onComplete()); } @@ -89,11 +89,11 @@ export class ResourceDeploymentDialog { const form = formBuilder.withLayout({ width: '100%' }).component(); - if (this._selectedResourceType) { - this.selectResourceType(this._selectedResourceType); - } - - return view.initializeModel(form); + return view.initializeModel(form).then(() => { + if (this._selectedResourceType) { + this.selectResourceType(this._selectedResourceType); + } + }); }); this._dialogObject.content = [tab]; } @@ -160,18 +160,13 @@ export class ResourceDeploymentDialog { } private updateTools(): void { - // do a 10 ms delay to workaround the issue of first time load: - // during initialization this update to table will be processed prior to the table initialization update - // as a result the data will be overwritten, introduce a short delay so that the order of updates can be maintained. - setTimeout(() => { - const tools = this.getCurrentProvider().requiredTools; - const headerRowHeight = 28; - this._toolsTable.height = 25 * tools.length + headerRowHeight; - this._toolsTable.data = tools.map(toolRef => { - const tool = this.toolsService.getToolByName(toolRef.name)!; - return [tool.displayName, tool.description]; - }); - }, 10); + const tools = this.getCurrentProvider().requiredTools; + const headerRowHeight = 28; + this._toolsTable.height = 25 * tools.length + headerRowHeight; + this._toolsTable.data = tools.map(toolRef => { + const tool = this.toolsService.getToolByName(toolRef.name)!; + return [tool.displayName, tool.description]; + }); } private getCurrentProvider(): DeploymentProvider {