From 6f192f9af52bfa78e228ea39c6d11033c8922a88 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Tue, 9 Feb 2021 08:37:30 -0800 Subject: [PATCH] Fix ModelView addItem/withItem ordering (#14205) --- .../src/dialogs/createProjectFromDatabaseDialog.ts | 4 ++-- src/sql/workbench/browser/modelComponents/viewBase.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts b/extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts index 61ae545dbd..19a3a13c13 100644 --- a/extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts +++ b/extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts @@ -152,7 +152,7 @@ export class CreateProjectFromDatabaseDialog { }).component(); const connectionRow = view.modelBuilder.flexContainer().withItems([serverLabel, sourceConnectionTextBox], { flex: '0 0 auto', CSSStyles: { 'margin-right': '10px', 'margin-bottom': '-5px', 'margin-top': '-10px' } }).withLayout({ flexFlow: 'row', alignItems: 'center' }).component(); - connectionRow.insertItem(selectConnectionButton, 2, { CSSStyles: { 'margin-right': '0px', 'margin-bottom': '-5px', 'margin-top': '-10px' } }); + connectionRow.addItem(selectConnectionButton, { CSSStyles: { 'margin-right': '0px', 'margin-bottom': '-5px', 'margin-top': '-10px' } }); return connectionRow; } @@ -293,7 +293,7 @@ export class CreateProjectFromDatabaseDialog { }).component(); const projectLocationRow = view.modelBuilder.flexContainer().withItems([projectLocationLabel, this.projectLocationTextBox], { flex: '0 0 auto', CSSStyles: { 'margin-right': '10px', 'margin-bottom': '-10px' } }).withLayout({ flexFlow: 'row', alignItems: 'center' }).component(); - projectLocationRow.insertItem(browseFolderButton, 2, { CSSStyles: { 'margin-right': '0px', 'margin-bottom': '-10px' } }); + projectLocationRow.addItem(browseFolderButton, { CSSStyles: { 'margin-right': '0px', 'margin-bottom': '-10px' } }); return projectLocationRow; } diff --git a/src/sql/workbench/browser/modelComponents/viewBase.ts b/src/sql/workbench/browser/modelComponents/viewBase.ts index bf3f1357a1..f45fa9e25b 100644 --- a/src/sql/workbench/browser/modelComponents/viewBase.ts +++ b/src/sql/workbench/browser/modelComponents/viewBase.ts @@ -75,7 +75,7 @@ export abstract class ViewBase extends AngularDisposable implements IModelView { initial: true }; }); - this.addToContainer(component.id, items); + this.addToContainer(component.id, items, true); } return descriptor;