bumping versions and using ComponentWithIcon props to set icon size (#13517)

* bumping versions and using ComponentWithIcon props to set icon size

* combine withProps sections
This commit is contained in:
Vladimir Chernov
2020-11-23 21:41:45 +03:00
committed by GitHub
parent f44c714cf2
commit e0b1a3460d
2 changed files with 17 additions and 4 deletions

View File

@@ -2,7 +2,7 @@
"name": "sql-assessment", "name": "sql-assessment",
"displayName": "%displayName%", "displayName": "%displayName%",
"description": "%description%", "description": "%description%",
"version": "0.4.0", "version": "0.5.0",
"publisher": "Microsoft", "publisher": "Microsoft",
"preview": true, "preview": true,
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
@@ -10,7 +10,7 @@
"aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e", "aiKey": "AIF-37eefaf0-8022-4671-a3fb-64752724682e",
"engines": { "engines": {
"vscode": "^1.25.0", "vscode": "^1.25.0",
"azdata": ">=1.19.0" "azdata": ">=1.24.0"
}, },
"activationEvents": [ "activationEvents": [
"onDashboardOpen" "onDashboardOpen"

View File

@@ -106,11 +106,14 @@ export class SqlAssessmentMainTab extends SqlAssessmentTab {
dark: this.extensionContext.asAbsolutePath('resources/dark/database.svg'), dark: this.extensionContext.asAbsolutePath('resources/dark/database.svg'),
light: this.extensionContext.asAbsolutePath('resources/light/database.svg') light: this.extensionContext.asAbsolutePath('resources/light/database.svg')
}; };
const iconSize: number = 16;
const btnInvokeAssessment = view.modelBuilder.button() const btnInvokeAssessment = view.modelBuilder.button()
.withProperties<azdata.ButtonProperties>({ .withProperties<azdata.ButtonProperties>({
label: this.invokeAssessmentLabel, label: this.invokeAssessmentLabel,
iconPath: targetIconPath, iconPath: targetIconPath,
iconHeight: iconSize,
iconWidth: iconSize
}).component(); }).component();
const btnInvokeAssessmentLoading = view.modelBuilder.loadingComponent() const btnInvokeAssessmentLoading = view.modelBuilder.loadingComponent()
.withItem(btnInvokeAssessment) .withItem(btnInvokeAssessment)
@@ -141,6 +144,8 @@ export class SqlAssessmentMainTab extends SqlAssessmentTab {
.withProperties<azdata.ButtonProperties>({ .withProperties<azdata.ButtonProperties>({
label: this.getItemsLabel, label: this.getItemsLabel,
iconPath: targetIconPath, iconPath: targetIconPath,
iconHeight: iconSize,
iconWidth: iconSize
}).component(); }).component();
const btnGetAssessmentItemsLoading = view.modelBuilder.loadingComponent() const btnGetAssessmentItemsLoading = view.modelBuilder.loadingComponent()
.withItem(btnGetAssessmentItems) .withItem(btnGetAssessmentItems)
@@ -170,11 +175,13 @@ export class SqlAssessmentMainTab extends SqlAssessmentTab {
this.btnExportAsScript = view.modelBuilder.button() this.btnExportAsScript = view.modelBuilder.button()
.withProperties<azdata.ButtonProperties>({ .withProperties<azdata.ButtonProperties>({
label: localize('btnExportAsScript', "Export as script"), label: localize('btnExportAsScript', "Export as script"),
enabled: false,
iconPath: { iconPath: {
dark: this.extensionContext.asAbsolutePath('resources/dark/newquery_inverse.svg'), dark: this.extensionContext.asAbsolutePath('resources/dark/newquery_inverse.svg'),
light: this.extensionContext.asAbsolutePath('resources/light/newquery.svg') light: this.extensionContext.asAbsolutePath('resources/light/newquery.svg')
}, },
enabled: false iconHeight: iconSize,
iconWidth: iconSize
}).component(); }).component();
this.toDispose.push(this.btnExportAsScript.onDidClick(async () => { this.toDispose.push(this.btnExportAsScript.onDidClick(async () => {
this.engine.generateAssessmentScript(); this.engine.generateAssessmentScript();
@@ -183,11 +190,13 @@ export class SqlAssessmentMainTab extends SqlAssessmentTab {
this.btnHTMLExport = view.modelBuilder.button() this.btnHTMLExport = view.modelBuilder.button()
.withProperties<azdata.ButtonProperties>({ .withProperties<azdata.ButtonProperties>({
label: localize('btnGeneratehtmlreport', "Create HTML Report"), label: localize('btnGeneratehtmlreport', "Create HTML Report"),
enabled: false,
iconPath: { iconPath: {
dark: this.extensionContext.asAbsolutePath('resources/dark/book_inverse.svg'), dark: this.extensionContext.asAbsolutePath('resources/dark/book_inverse.svg'),
light: this.extensionContext.asAbsolutePath('resources/light/book.svg') light: this.extensionContext.asAbsolutePath('resources/light/book.svg')
}, },
enabled: false iconHeight: iconSize,
iconWidth: iconSize
}).component(); }).component();
this.toDispose.push(this.btnHTMLExport.onDidClick(async () => { this.toDispose.push(this.btnHTMLExport.onDidClick(async () => {
@@ -220,6 +229,8 @@ export class SqlAssessmentMainTab extends SqlAssessmentTab {
dark: this.extensionContext.asAbsolutePath('resources/dark/configuredashboard_inverse.svg'), dark: this.extensionContext.asAbsolutePath('resources/dark/configuredashboard_inverse.svg'),
light: this.extensionContext.asAbsolutePath('resources/light/configuredashboard.svg') light: this.extensionContext.asAbsolutePath('resources/light/configuredashboard.svg')
}, },
iconHeight: iconSize,
iconWidth: iconSize
}).component(); }).component();
this.toDispose.push(btnViewSamples.onDidClick(() => { this.toDispose.push(btnViewSamples.onDidClick(() => {
@@ -234,6 +245,8 @@ export class SqlAssessmentMainTab extends SqlAssessmentTab {
dark: this.extensionContext.asAbsolutePath('resources/dark/status_info.svg'), dark: this.extensionContext.asAbsolutePath('resources/dark/status_info.svg'),
light: this.extensionContext.asAbsolutePath('resources/light/status_info.svg') light: this.extensionContext.asAbsolutePath('resources/light/status_info.svg')
}, },
iconHeight: iconSize,
iconWidth: iconSize
}).component(); }).component();
this.toDispose.push(btnAPIDetails.onDidClick(async () => { this.toDispose.push(btnAPIDetails.onDidClick(async () => {
let infoArray: azdata.PropertiesContainerItem[] = []; let infoArray: azdata.PropertiesContainerItem[] = [];