From 5e62aea5d5e1ecfe5b8c341e1c452841e4617556 Mon Sep 17 00:00:00 2001 From: Kim Santiago <31145923+kisantia@users.noreply.github.com> Date: Wed, 2 Jun 2021 14:22:28 -1000 Subject: [PATCH] Filter out system dbs from create project from db dialog (#15610) * filter out system dbs from create project from db dialog * use includes instead of find --- .../src/dialogs/createProjectFromDatabaseDialog.ts | 4 +++- .../src/dialogs/publishDatabaseDialog.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts b/extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts index 1053f6714e..6dd3022c22 100644 --- a/extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts +++ b/extensions/sql-database-projects/src/dialogs/createProjectFromDatabaseDialog.ts @@ -228,7 +228,9 @@ export class CreateProjectFromDatabaseDialog { // populate database dropdown with the databases for this connection if (connectionId) { this.sourceDatabaseDropDown!.loading = true; - const databaseValues = await azdata.connection.listDatabases(connectionId); + const databaseValues = (await azdata.connection.listDatabases(connectionId)) + // filter out system dbs + .filter(db => !constants.systemDbs.includes(db)); this.sourceDatabaseDropDown!.values = databaseValues; this.sourceDatabaseDropDown!.loading = false; diff --git a/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts b/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts index 5dca9c8c0b..0babeb0a9d 100644 --- a/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts +++ b/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts @@ -521,7 +521,7 @@ export class PublishDatabaseDialog { if (connectionId) { const databaseValues = (await azdata.connection.listDatabases(connectionId)) // filter out system dbs - .filter(db => constants.systemDbs.find(systemdb => db === systemdb) === undefined); + .filter(db => !constants.systemDbs.includes(db)); this.targetDatabaseDropDown!.values = databaseValues; }