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

Add multiple ModelView child items at once (#14047)

Browse Source
This commit is contained in:
Charles Gagnon
2021-01-26 15:33:45 -08:00
committed by GitHub
parent d828a1f042
commit e79a80590a
10 changed files with 120 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/api/browser/mainThreadModelView.ts
View File

@@ -51,9 +51,9 @@ export class MainThreadModelView extends Disposable implements MainThreadModelVi
return this.execModelViewAction(handle, (modelView) => modelView.clearContainer(componentId));
}
$addToContainer(handle: number, containerId: string, item: IItemConfig, index?: number): Thenable<void> {
$addToContainer(handle: number, containerId: string, items: { itemConfig: IItemConfig, index?: number }[]): Thenable<void> {
return this.execModelViewAction(handle,
(modelView) => modelView.addToContainer(containerId, item, index));
(modelView) => modelView.addToContainer(containerId, items));
}
$removeFromContainer(handle: number, containerId: string, item: IItemConfig): Thenable<void> {

33
src/sql/workbench/api/common/extHostModelView.ts
View File

@@ -707,9 +707,12 @@ class ComponentWrapper implements azdata.Component {
}
public addItems(items: Array<azdata.Component>, itemLayout?: any): void {
for (let item of items) {
this.addItem(item, itemLayout);
}
const itemConfigs = items.map(item => {
return {
itemConfig: this.createAndAddItemConfig(item, itemLayout).toIItemConfig()
};
});
this._proxy.$addToContainer(this._handle, this.id, itemConfigs).then(undefined, (err) => this.handleError(err));
}
public removeItemAt(index: number): boolean {
@@ -735,11 +738,22 @@ class ComponentWrapper implements azdata.Component {
}
public addItem(item: azdata.Component, itemLayout?: any, index?: number): void {
let itemImpl = item as ComponentWrapper;
const config = this.createAndAddItemConfig(item, itemLayout, index);
this._proxy.$addToContainer(this._handle, this.id, [{ itemConfig: config.toIItemConfig(), index }]).then(undefined, (err) => this.handleError(err));
}
/**
* Creates the internal item config for the component and adds it to the list of child configs for this component.
* @param item The child component to add
* @param itemLayout The optional layout to apply to the child component
* @param index The optional index to insert the child component at
*/
private createAndAddItemConfig(item: azdata.Component, itemLayout?: any, index?: number): InternalItemConfig {
const itemImpl = item as ComponentWrapper;
if (!itemImpl) {
throw new Error(nls.localize('unknownComponentType', "Unknown component type. Must use ModelBuilder to create objects"));
}
let config = new InternalItemConfig(itemImpl, itemLayout);
const config = new InternalItemConfig(itemImpl, itemLayout);
if (index !== undefined && index >= 0 && index <= this.items.length) {
this.itemConfigs.splice(index, 0, config);
} else if (!index) {
@@ -747,7 +761,7 @@ class ComponentWrapper implements azdata.Component {
} else {
throw new Error(nls.localize('invalidIndex', "The index {0} is invalid.", index));
}
this._proxy.$addToContainer(this._handle, this.id, config.toIItemConfig(), index).then(undefined, (err) => this.handleError(err));
return config;
}
public setLayout(layout: any): Thenable<void> {
@@ -1591,14 +1605,16 @@ class DeclarativeTableWrapper extends ComponentWrapper implements azdata.Declara
// data property though since the caller would still expect that to contain
// the Component objects they created
const properties = assign({}, this.properties);
const componentsToAdd: ComponentWrapper[] = [];
if (properties.data?.length > 0) {
properties.data = properties.data.map((row: any[]) => row.map(cell => {
if (cell instanceof ComponentWrapper) {
// First ensure that we register the component using addItem
// such that it gets added to the ModelStore. We don't want to
// make the table component an actual container since that exposes
// a lot of functionality we don't need.
this.addItem(cell);
componentsToAdd.push(cell);
return cell.id;
}
return cell;
@@ -1611,13 +1627,14 @@ class DeclarativeTableWrapper extends ComponentWrapper implements azdata.Declara
// such that it gets added to the ModelStore. We don't want to
// make the table component an actual container since that exposes
// a lot of functionality we don't need.
this.addItem(cell.value);
componentsToAdd.push(cell.value);
return { value: cell.value.id, ariaLabel: cell.ariaLabel, style: cell.style };
}
return cell;
}));
}
}
this.addItems(componentsToAdd);
return properties;
}
}

2
src/sql/workbench/api/common/sqlExtHost.protocol.ts
View File

@@ -777,7 +777,7 @@ export interface MainThreadModelViewShape extends IDisposable {
$registerProvider(id: string): void;
$initializeModel(handle: number, rootComponent: IComponentShape): Thenable<void>;
$clearContainer(handle: number, componentId: string): Thenable<void>;
$addToContainer(handle: number, containerId: string, item: IItemConfig, index?: number): Thenable<void>;
$addToContainer(handle: number, containerId: string, items: { itemConfig: IItemConfig, index?: number }[]): Thenable<void>;
$removeFromContainer(handle: number, containerId: string, item: IItemConfig): Thenable<void>;
$setLayout(handle: number, componentId: string, layout: any): Thenable<void>;
$setItemLayout(handle: number, componentId: string, item: IItemConfig): Thenable<void>;