ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix missing icon issue (#12928)

Browse Source 
* fix missing icon issue

* move the logic to renderServerIcon
This commit is contained in:
Alan Ren
2020-10-15 12:01:35 -07:00
committed by GitHub
parent b460b7834c
commit 545a5504e0
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/sql/workbench/services/objectExplorer/browser/asyncServerTreeRenderer.ts
View File

@@ -24,6 +24,8 @@ import { ServerTreeElement } from 'sql/workbench/services/objectExplorer/browser
import { DefaultServerGroupColor } from 'sql/workbench/services/serverGroup/common/serverGroupViewModel'; import { DefaultServerGroupColor } from 'sql/workbench/services/serverGroup/common/serverGroupViewModel';
import { withNullAsUndefined } from 'vs/base/common/types'; import { withNullAsUndefined } from 'vs/base/common/types';
const DefaultConnectionIconClass = 'server-page';
class ConnectionProfileGroupTemplate extends Disposable { class ConnectionProfileGroupTemplate extends Disposable {
private _root: HTMLElement; private _root: HTMLElement;
private _nameContainer: HTMLElement; private _nameContainer: HTMLElement;
@@ -92,7 +94,7 @@ class ConnectionProfileTemplate extends Disposable {
super(); super();
container.parentElement!.classList.add('connection-profile'); container.parentElement!.classList.add('connection-profile');
this._root = dom.append(container, dom.$('.connection-tile')); this._root = dom.append(container, dom.$('.connection-tile'));
this._icon = dom.append(this._root, dom.$('div.icon server-page')); this._icon = dom.append(this._root, dom.$('div.icon'));
this._connectionStatusBadge = dom.append(this._icon, dom.$('div.connection-status-badge')); this._connectionStatusBadge = dom.append(this._icon, dom.$('div.connection-status-badge'));
this._label = dom.append(this._root, dom.$('div.label')); this._label = dom.append(this._root, dom.$('div.label'));
} }
@@ -108,9 +110,8 @@ class ConnectionProfileTemplate extends Disposable {
} }
} }
let iconPath: IconPath | undefined = getIconPath(element, this._connectionManagementService); const iconPath: IconPath | undefined = getIconPath(element, this._connectionManagementService);
renderServerIcon(this._icon, iconPath); renderServerIcon(this._icon, iconPath);
let label = element.title; let label = element.title;
if (!element.isConnectionOptionsValid) { if (!element.isConnectionOptionsValid) {
label = localize('loading', "Loading..."); label = localize('loading', "Loading...");
@@ -287,6 +288,13 @@ function getIconPath(connection: ConnectionProfile, connectionManagementService:
function renderServerIcon(element: HTMLElement, iconPath?: IconPath): void { function renderServerIcon(element: HTMLElement, iconPath?: IconPath): void {
if (!element) { return; } if (!element) { return; }
if (iconPath) { if (iconPath) {
element.classList.remove(DefaultConnectionIconClass);
iconRenderer.putIcon(element, iconPath); iconRenderer.putIcon(element, iconPath);
} else {
// use default connection icon if iconPath is not available
element.classList.add(DefaultConnectionIconClass);
// the icon css class is applied to the node by ID selector
// clear the id to avoid icon mismatch when drag&drop in OE tree because of element reusing by the tree component.
element.id = '';
} }
} }