ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-15 09:35:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove logging and clone utlities (#5309)

Browse Source 
* remove log utility functions; remove custom mixin

* fix tests

* add log service as required by telemetry utils

* remove unused code

* replace some console.logs with logservice
This commit is contained in:
Anthony Dresser
2019-05-04 22:37:15 -07:00
committed by GitHub
parent df7645e4e5
commit ab0cd71d10
80 changed files with 439 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component.ts
View File

@@ -9,12 +9,10 @@ import {
} from '@angular/core';
import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive';
import { error } from 'sql/base/common/log';
import { AngularDisposable } from 'sql/base/node/lifecycle';
import { IComponent, IComponentConfig, IComponentDescriptor, IModelStore, COMPONENT_CONFIG } from './interfaces';
import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry';
import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
import * as colors from 'vs/platform/theme/common/colorRegistry';
import * as themeColors from 'vs/workbench/common/theme';
import { Registry } from 'vs/platform/registry/common/platform';
@@ -23,6 +21,8 @@ import { generateUuid } from 'vs/base/common/uuid';
import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService';
import { Event } from 'vs/base/common/event';
import { LayoutRequestParams } from 'sql/platform/dialog/dialogContainer.component';
import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
import { ILogService } from 'vs/platform/log/common/log';
const componentRegistry = <IComponentRegistry>Registry.as(Extensions.ComponentContribution);
@@ -58,13 +58,14 @@ export class ModelComponentWrapper extends AngularDisposable implements OnInit {
@Inject(forwardRef(() => ElementRef)) private _ref: ElementRef,
@Inject(forwardRef(() => ChangeDetectorRef)) private _changeref: ChangeDetectorRef,
@Inject(forwardRef(() => Injector)) private _injector: Injector,
@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService,
@Inject(IBootstrapParams) private _params: ModelComponentParams
@Inject(IThemeService) private themeService: IThemeService,
@Inject(ILogService) private readonly logService: ILogService,
@Inject(IBootstrapParams) params: ModelComponentParams
) {
super();
if (_params && _params.onLayoutRequested) {
this._modelViewId = _params.modelViewId;
_params.onLayoutRequested(layoutParams => {
if (params && params.onLayoutRequested) {
this._modelViewId = params.modelViewId;
params.onLayoutRequested(layoutParams => {
if (layoutParams && (layoutParams.alwaysRefresh || layoutParams.modelViewId === this._modelViewId)) {
this.layout();
}
@@ -73,14 +74,11 @@ export class ModelComponentWrapper extends AngularDisposable implements OnInit {
}
ngOnInit() {
let self = this;
this._register(self.themeService.onDidColorThemeChange((event: IColorTheme) => {
self.updateTheme(event);
}));
this._register(this.themeService.onThemeChange(event => this.updateTheme(event)));
}
ngAfterViewInit() {
this.updateTheme(this.themeService.getColorTheme());
this.updateTheme(this.themeService.getTheme());
if (this.componentHost) {
this.loadComponent();
}
@@ -114,14 +112,14 @@ export class ModelComponentWrapper extends AngularDisposable implements OnInit {
private loadComponent(): void {
if (!this.descriptor || !this.descriptor.type) {
error('No descriptor or type defined for this component');
this.logService.error('No descriptor or type defined for this component');
return;
}
let selector = componentRegistry.getCtorFromId(this.descriptor.type);
if (selector === undefined) {
error('No selector defined for type {0}', this.descriptor.type);
this.logService.error('No selector defined for type {0}', this.descriptor.type);
return;
}
@@ -139,7 +137,7 @@ export class ModelComponentWrapper extends AngularDisposable implements OnInit {
this._componentInstance.modelStore = this.modelStore;
this._changeref.detectChanges();
} catch (e) {
error('Error rendering component: {0}', e);
this.logService.error('Error rendering component: {0}', e);
return;
}
let el = <HTMLElement>componentRef.location.nativeElement;
@@ -149,13 +147,11 @@ export class ModelComponentWrapper extends AngularDisposable implements OnInit {
el.style.position = 'relative';
}
private updateTheme(theme: IColorTheme): void {
private updateTheme(theme: ITheme): void {
// TODO handle theming appropriately
let el = <HTMLElement>this._ref.nativeElement;
let borderColor = theme.getColor(themeColors.SIDE_BAR_BACKGROUND, true);
let backgroundColor = theme.getColor(colors.editorBackground, true);
let foregroundColor = theme.getColor(themeColors.SIDE_BAR_FOREGROUND, true);
let border = theme.getColor(colors.contrastBorder, true);
if (backgroundColor) {
el.style.backgroundColor = backgroundColor.toString();