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

Revert "Do ModelView initialization actions before others (#11512)" (#11677)

Browse Source 
This reverts commit 9bdd5f2899b36a44bca4add1f05164cf1489929b.
This commit is contained in:
Charles Gagnon
2020-08-06 08:47:33 -07:00
committed by GitHub
parent 9c67832880
commit 9bdfa57be6
3 changed files with 24 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/sql/workbench/browser/modelComponents/viewBase.ts
View File

@@ -58,12 +58,12 @@ export abstract class ViewBase extends AngularDisposable implements IModelView {
throw new Error(nls.localize('componentTypeNotRegistered', "Could not find component for type {0}", ModelComponentTypes[component.type]));
}
let descriptor = this.modelStore.createComponentDescriptor(typeId, component.id);
this.setProperties(component.id, component.properties, true);
this.setLayout(component.id, component.layout, true);
this.registerEvent(component.id, true);
this.setProperties(component.id, component.properties);
this.setLayout(component.id, component.layout);
this.registerEvent(component.id);
if (component.itemConfigs) {
for (let item of component.itemConfigs) {
this.addToContainer(component.id, item, undefined, true);
this.addToContainer(component.id, item);
}
}
@@ -82,12 +82,12 @@ export abstract class ViewBase extends AngularDisposable implements IModelView {
this.queueAction(componentId, (component) => component.clearContainer());
}
addToContainer(containerId: string, itemConfig: IItemConfig, index?: number, isInitialization?: boolean): void {
addToContainer(containerId: string, itemConfig: IItemConfig, index?: number): void {
// Do not return the promise as this should be non-blocking
this.queueAction(containerId, (component) => {
let childDescriptor = this.defineComponent(itemConfig.componentShape);
component.addToContainer(childDescriptor, itemConfig.config, index);
}, isInitialization);
});
}
removeFromContainer(containerId: string, itemConfig: IItemConfig): void {
@@ -98,11 +98,11 @@ export abstract class ViewBase extends AngularDisposable implements IModelView {
});
}
setLayout(componentId: string, layout: any, isInitialization?: boolean): void {
setLayout(componentId: string, layout: any): void {
if (!layout) {
return;
}
this.queueAction(componentId, (component) => component.setLayout(layout), isInitialization);
this.queueAction(componentId, (component) => component.setLayout(layout));
}
setItemLayout(containerId: string, itemConfig: IItemConfig): void {
@@ -112,24 +112,24 @@ export abstract class ViewBase extends AngularDisposable implements IModelView {
});
}
setProperties(componentId: string, properties: { [key: string]: any; }, isInitialization?: boolean): void {
setProperties(componentId: string, properties: { [key: string]: any; }): void {
if (!properties) {
return;
}
this.queueAction(componentId, (component) => component.setProperties(properties), isInitialization);
this.queueAction(componentId, (component) => component.setProperties(properties));
}
refreshDataProvider(componentId: string, item: any): void {
this.queueAction(componentId, (component) => component.refreshDataProvider(item));
}
private queueAction<T>(componentId: string, action: (component: IComponent) => T, isInitialization?: boolean): void {
this.modelStore.eventuallyRunOnComponent(componentId, action, isInitialization).catch(err => {
private queueAction<T>(componentId: string, action: (component: IComponent) => T): void {
this.modelStore.eventuallyRunOnComponent(componentId, action).catch(err => {
// TODO add error handling
});
}
registerEvent(componentId: string, isInitialization?: boolean) {
registerEvent(componentId: string) {
this.queueAction(componentId, (component) => {
this._register(component.registerEventHandler(e => {
let modelViewEvent: IModelViewEventArgs = assign({
@@ -138,7 +138,7 @@ export abstract class ViewBase extends AngularDisposable implements IModelView {
}, e);
this._onEventEmitter.fire(modelViewEvent);
}));
}, isInitialization);
});
}
public get onEvent(): Event<IModelViewEventArgs> {