From 2db51ca2431d3587339bbfde27589b80be138ed2 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Mon, 26 Oct 2020 13:27:12 -0700 Subject: [PATCH] Allow string for deployment icons and update a couple (#13076) * Update to colorized versions of bdc and container deployment icons * update edge * Allow string for icons --- extensions/arc/package.json | 15 +- .../asde-deployment/images/sqldb_edge.svg | 244 ++++++++++++++++-- .../images/sqldb_edge_inverse.svg | 10 - extensions/asde-deployment/package.json | 5 +- .../resource-deployment/images/sql_bdc.svg | 79 +++--- .../images/sql_bdc_inverse.svg | 46 ---- .../images/sql_server_container.svg | 19 +- .../images/sql_server_container_inverse.svg | 9 - extensions/resource-deployment/package.json | 20 +- .../resource-deployment/src/interfaces.ts | 2 +- .../src/services/resourceTypeService.ts | 10 +- 11 files changed, 288 insertions(+), 171 deletions(-) delete mode 100644 extensions/asde-deployment/images/sqldb_edge_inverse.svg delete mode 100644 extensions/resource-deployment/images/sql_bdc_inverse.svg delete mode 100644 extensions/resource-deployment/images/sql_server_container_inverse.svg diff --git a/extensions/arc/package.json b/extensions/arc/package.json index cc820129ce..da3be9d738 100644 --- a/extensions/arc/package.json +++ b/extensions/arc/package.json @@ -136,10 +136,7 @@ "displayName": "%resource.type.azure.arc.display.name%", "description": "%resource.type.azure.arc.description%", "platforms": "*", - "icon": { - "light": "./images/data_controller.svg", - "dark": "./images/data_controller.svg" - }, + "icon": "./images/data_controller.svg", "tags": ["Hybrid", "SQL Server", "PostgreSQL"], "providers": [ { @@ -512,10 +509,7 @@ "displayName": "%resource.type.arc.sql.display.name%", "description": "%resource.type.arc.sql.description%", "platforms": "*", - "icon": { - "light": "./images/miaa.svg", - "dark": "./images/miaa.svg" - }, + "icon": "./images/miaa.svg", "tags": ["Hybrid", "SQL Server"], "providers": [ { @@ -676,10 +670,7 @@ "displayName": "%resource.type.arc.postgres.display.name%", "description": "%resource.type.arc.postgres.description%", "platforms": "*", - "icon": { - "light": "./images/postgres.svg", - "dark": "./images/postgres.svg" - }, + "icon": "./images/postgres.svg", "tags": ["Hybrid", "PostgreSQL"], "providers": [ { diff --git a/extensions/asde-deployment/images/sqldb_edge.svg b/extensions/asde-deployment/images/sqldb_edge.svg index 7ecc616943..9817fb817b 100644 --- a/extensions/asde-deployment/images/sqldb_edge.svg +++ b/extensions/asde-deployment/images/sqldb_edge.svg @@ -1,20 +1,226 @@ - - - -Azure_SQL_Edge - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SQL_Database_Edge_100x + + + + + + + + + + + + + + diff --git a/extensions/asde-deployment/images/sqldb_edge_inverse.svg b/extensions/asde-deployment/images/sqldb_edge_inverse.svg deleted file mode 100644 index 4d079ad1ea..0000000000 --- a/extensions/asde-deployment/images/sqldb_edge_inverse.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/extensions/asde-deployment/package.json b/extensions/asde-deployment/package.json index 7c4d30cb77..12529e6c3c 100644 --- a/extensions/asde-deployment/package.json +++ b/extensions/asde-deployment/package.json @@ -24,10 +24,7 @@ "displayName": "%resource-type-sql-edge-display-name%", "description": "%resource-type-sql-edge-description%", "platforms": "*", - "icon": { - "light": "./images/sqldb_edge.svg", - "dark": "./images/sqldb_edge_inverse.svg" - }, + "icon": "./images/sqldb_edge.svg", "tags": [ "Hybrid", "SQL Server" diff --git a/extensions/resource-deployment/images/sql_bdc.svg b/extensions/resource-deployment/images/sql_bdc.svg index fcf1133186..07e4a1cca4 100644 --- a/extensions/resource-deployment/images/sql_bdc.svg +++ b/extensions/resource-deployment/images/sql_bdc.svg @@ -1,45 +1,38 @@ - - - - - - image/svg+xml - - sql_bigdata_cluster - - - - - + + + + + + + + + + + + + + + + + + + + + - sql_bigdata_cluster - - - + + + + + + + + + + + + + + + diff --git a/extensions/resource-deployment/images/sql_bdc_inverse.svg b/extensions/resource-deployment/images/sql_bdc_inverse.svg deleted file mode 100644 index dbc823e9f0..0000000000 --- a/extensions/resource-deployment/images/sql_bdc_inverse.svg +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - image/svg+xml - - sql_bigdata_cluster - - - - - - - sql_bigdata_cluster - - - - diff --git a/extensions/resource-deployment/images/sql_server_container.svg b/extensions/resource-deployment/images/sql_server_container.svg index cc58ed2cf4..0db011c54d 100644 --- a/extensions/resource-deployment/images/sql_server_container.svg +++ b/extensions/resource-deployment/images/sql_server_container.svg @@ -1,9 +1,12 @@ - - opac_command_icons_bv - - - - - - + + + + + + + + + + + diff --git a/extensions/resource-deployment/images/sql_server_container_inverse.svg b/extensions/resource-deployment/images/sql_server_container_inverse.svg deleted file mode 100644 index 65131e60bb..0000000000 --- a/extensions/resource-deployment/images/sql_server_container_inverse.svg +++ /dev/null @@ -1,9 +0,0 @@ - - opac_command_icons_bv - - - - - - - diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json index 3ce70b968f..bffb669a4c 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -70,10 +70,7 @@ "displayName": "%resource-type-sql-image-display-name%", "description": "%resource-type-sql-image-description%", "platforms": "*", - "icon": { - "light": "./images/sql_server_container.svg", - "dark": "./images/sql_server_container_inverse.svg" - }, + "icon": "./images/sql_server_container.svg", "tags": ["On-premises", "SQL Server"], "options": [ { @@ -202,10 +199,7 @@ "displayName": "%resource-type-sql-bdc-display-name%", "description": "%resource-type-sql-bdc-description%", "platforms": "*", - "icon": { - "light": "./images/sql_bdc.svg", - "dark": "./images/sql_bdc_inverse.svg" - }, + "icon": "./images/sql_bdc.svg", "tags": ["On-premises", "SQL Server"], "options": [ { @@ -400,10 +394,7 @@ "displayName": "%azure-sqldb-display-name%", "description": "%azure-sqldb-description%", "platforms": "*", - "icon": { - "light": "./images/azure-sql-db.svg", - "dark": "./images/azure-sql-db.svg" - }, + "icon": "./images/azure-sql-db.svg", "tags": ["SQL Server", "Cloud"], "okButtonText": [ { @@ -485,10 +476,7 @@ "displayName": "%azure-sqlvm-display-name%", "description": "%azure-sqlvm-description%", "platforms": "*", - "icon": { - "light": "./images/azure-sql-vm.svg", - "dark": "./images/azure-sql-vm.svg" - }, + "icon": "./images/azure-sql-vm.svg", "tags": ["SQL Server", "Cloud"], "providers": [ { diff --git a/extensions/resource-deployment/src/interfaces.ts b/extensions/resource-deployment/src/interfaces.ts index c0940fcee5..be458b589a 100644 --- a/extensions/resource-deployment/src/interfaces.ts +++ b/extensions/resource-deployment/src/interfaces.ts @@ -14,7 +14,7 @@ export interface ResourceType { displayName: string; description: string; platforms: string[] | '*'; - icon: { light: string; dark: string }; + icon: { light: string; dark: string } | string; options: ResourceTypeOption[]; providers: DeploymentProvider[]; agreement?: AgreementInfo; diff --git a/extensions/resource-deployment/src/services/resourceTypeService.ts b/extensions/resource-deployment/src/services/resourceTypeService.ts index 22e211b248..07c7f39b98 100644 --- a/extensions/resource-deployment/src/services/resourceTypeService.ts +++ b/extensions/resource-deployment/src/services/resourceTypeService.ts @@ -64,8 +64,12 @@ export class ResourceTypeService implements IResourceTypeService { } private updatePathProperties(resourceType: ResourceType, extensionPath: string): void { - resourceType.icon.dark = path.join(extensionPath, resourceType.icon.dark); - resourceType.icon.light = path.join(extensionPath, resourceType.icon.light); + if (typeof resourceType.icon === 'string') { + resourceType.icon = path.join(extensionPath, resourceType.icon); + } else { + resourceType.icon.dark = path.join(extensionPath, resourceType.icon.dark); + resourceType.icon.light = path.join(extensionPath, resourceType.icon.light); + } resourceType.providers.forEach((provider) => { if (instanceOfNotebookDeploymentProvider(provider)) { this.updateNotebookPath(provider, extensionPath); @@ -131,7 +135,7 @@ export class ResourceTypeService implements IResourceTypeService { private validateResourceType(resourceType: ResourceType, positionInfo: string, errorMessages: string[]): void { this.validateNameDisplayName(resourceType, 'resource type', positionInfo, errorMessages); - if (!resourceType.icon || !resourceType.icon.dark || !resourceType.icon.light) { + if (!resourceType.icon || (typeof resourceType.icon === 'object' && (!resourceType.icon.dark || !resourceType.icon.light))) { errorMessages.push(`Icon for resource type is not specified properly. ${positionInfo} `); }