bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-06 00:13:28 +00:00
Code Issues Releases Wiki Activity

[PM-22635] Only Show Assign to Collections Bulk Menu Option When Item Selected Is Editable (#15217)

Browse Source 
* assign to collections option in bulk menu only shows when editable item selected and user has editable collections
This commit is contained in:
Jason Ng
2025-06-26 14:53:26 -04:00
committed by GitHub
parent cf2c8733ca
commit 25005b602e
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/web/src/app/vault/components/vault-items/vault-items.component.ts
View File

@@ -382,19 +382,22 @@ export class VaultItemsComponent {
} }
if (this.selection.selected.length === 0) { if (this.selection.selected.length === 0) {
return true; return false;
} }
const hasPersonalItems = this.hasPersonalItems(); const hasPersonalItems = this.hasPersonalItems();
const uniqueCipherOrgIds = this.getUniqueOrganizationIds(); const uniqueCipherOrgIds = this.getUniqueOrganizationIds();
const hasEditableCollections = this.allCollections.some((collection) => {
return !collection.readOnly;
});
// Return false if items are from different organizations // Return false if items are from different organizations
if (uniqueCipherOrgIds.size > 1) { if (uniqueCipherOrgIds.size > 1) {
return false; return false;
} }
// If all items are personal, return based on personal items // If all selected items are personal, return based on personal items
if (uniqueCipherOrgIds.size === 0) { if (uniqueCipherOrgIds.size === 0 && hasEditableCollections) {
return hasPersonalItems; return hasPersonalItems;
} }
@@ -406,7 +409,11 @@ export class VaultItemsComponent {
const collectionNotSelected = const collectionNotSelected =
this.selection.selected.filter((item) => item.collection).length === 0; this.selection.selected.filter((item) => item.collection).length === 0;
return (canEditOrManageAllCiphers || this.allCiphersHaveEditAccess()) && collectionNotSelected; return (
(canEditOrManageAllCiphers || this.allCiphersHaveEditAccess()) &&
collectionNotSelected &&
hasEditableCollections
);
} }
/** /**