devol
/
bitwarden-estensione-browser
mirror of https://github.com/bitwarden/browser
1
0
Fork 0
Code Issues 1 Releases Wiki Activity

Fix delete projects cancel bug (#7437)

This commit is contained in:
Thomas Avery 2024-01-09 09:35:44 -06:00 committed by GitHub
parent e3f20d81e2
commit a5df12105b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
bitwarden_license/bit-web/src/app/secrets-manager/projects/projects/projects.component.ts
View File

@ -84,10 +84,9 @@ export class ProjectsComponent implements OnInit {
} }
async openDeleteProjectDialog(projects: ProjectListView[]) { async openDeleteProjectDialog(projects: ProjectListView[]) {
if (projects.some((project) => project.write == false)) { let projectsToDelete = projects;
const readOnlyProjects = projects.filter((project) => project.write == false); const readOnlyProjects = projects.filter((project) => project.write == false);
const writeProjects = projects.filter((project) => project.write); if (readOnlyProjects.length > 0) {
const dialogRef = this.dialogService.open<unknown, BulkConfirmationDetails>( const dialogRef = this.dialogService.open<unknown, BulkConfirmationDetails>(
BulkConfirmationDialogComponent, BulkConfirmationDialogComponent,
{ {
@ -102,20 +101,17 @@ export class ProjectsComponent implements OnInit {
const result = await lastValueFrom(dialogRef.closed); const result = await lastValueFrom(dialogRef.closed);
if (result == BulkConfirmationResult.Continue) { if (result !== BulkConfirmationResult.Continue) {
this.dialogService.open<unknown, ProjectDeleteOperation>(ProjectDeleteDialogComponent, { return;
data: {
projects: writeProjects,
},
});
} }
} else { projectsToDelete = projects.filter((project) => project.write);
this.dialogService.open<unknown, ProjectDeleteOperation>(ProjectDeleteDialogComponent, {
data: {
projects,
},
});
} }
this.dialogService.open<unknown, ProjectDeleteOperation>(ProjectDeleteDialogComponent, {
data: {
projects: projectsToDelete,
},
});
} }
private getBulkConfirmationDetails(projects: ProjectListView[]): BulkConfirmationStatus[] { private getBulkConfirmationDetails(projects: ProjectListView[]): BulkConfirmationStatus[] {