From a5df12105b35b198bc5f757fe00e700e247f26c1 Mon Sep 17 00:00:00 2001 From: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> Date: Tue, 9 Jan 2024 09:35:44 -0600 Subject: [PATCH] Fix delete projects cancel bug (#7437) --- .../projects/projects/projects.component.ts | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts index 088c461e93..83541a3769 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts @@ -84,10 +84,9 @@ export class ProjectsComponent implements OnInit { } async openDeleteProjectDialog(projects: ProjectListView[]) { - if (projects.some((project) => project.write == false)) { - const readOnlyProjects = projects.filter((project) => project.write == false); - const writeProjects = projects.filter((project) => project.write); - + let projectsToDelete = projects; + const readOnlyProjects = projects.filter((project) => project.write == false); + if (readOnlyProjects.length > 0) { const dialogRef = this.dialogService.open( BulkConfirmationDialogComponent, { @@ -102,20 +101,17 @@ export class ProjectsComponent implements OnInit { const result = await lastValueFrom(dialogRef.closed); - if (result == BulkConfirmationResult.Continue) { - this.dialogService.open(ProjectDeleteDialogComponent, { - data: { - projects: writeProjects, - }, - }); + if (result !== BulkConfirmationResult.Continue) { + return; } - } else { - this.dialogService.open(ProjectDeleteDialogComponent, { - data: { - projects, - }, - }); + projectsToDelete = projects.filter((project) => project.write); } + + this.dialogService.open(ProjectDeleteDialogComponent, { + data: { + projects: projectsToDelete, + }, + }); } private getBulkConfirmationDetails(projects: ProjectListView[]): BulkConfirmationStatus[] {