Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-09-21 03:11:27 +02:00
Code Issues Projects Releases Wiki Activity

added logic around bulk access menu assign to collections. extra logic for the Edit and Delete as well for sub collections and items

Browse Source
This commit is contained in:
jng 2024-09-19 20:51:37 -04:00
parent fcac2315a6
commit f1b4783ab8
No known key found for this signature in database
GPG Key ID: AF822623CAD19C85
2 changed files with 38 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/web/src/app/vault/components/vault-items/vault-items.component.html
View File

@ -52,7 +52,9 @@
</button>
<button
*ngIf="
(showAdminActions || showAssignToCollections()) && bulkAssignToCollectionsAllowed
canAssignSelected &&
(showAdminActions || showAssignToCollections()) &&
bulkAssignToCollectionsAllowed
"
type="button"
bitMenuItem

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

@ -74,13 +74,18 @@ export class VaultItemsComponent {
protected selection = new SelectionModel<VaultItem>(true, [], true);
// Only show Edit Access from Bulk Menu if all selected collections can be managed
// And no items selected
// Or Custom User with Edit All permissions
get canEditSelected() {
const filteredSelectedItems = this.selection.selected.filter((item) => {
const organization = this.allOrganizations.find(
(o) => o.id === item.collection.organizationId,
);
return !item.collection.canEdit(organization);
if (item.collection) {
const organization = this.allOrganizations.find(
(o) => o.id === item.collection.organizationId,
);
return !item.collection.canEdit(organization);
} else if (item.cipher) {
return true;
}
});
if (filteredSelectedItems.length > 0) {
return false;
@ -92,10 +97,32 @@ export class VaultItemsComponent {
// Or Custom User with Delete All permissions
get canDeleteSelected() {
const filteredSelectedItems = this.selection.selected.filter((item) => {
const organization = this.allOrganizations.find(
(o) => o.id === item.collection.organizationId,
);
return item.collection.canEdit(organization) && !item.collection.canDelete(organization);
if (item.collection) {
const organization = this.allOrganizations.find(
(o) => o.id === item.collection.organizationId,
);
return item.collection?.canEdit(organization) && !item.collection?.canDelete(organization);
} else if (item.cipher) {
return !item.cipher.edit;
}
});
if (filteredSelectedItems.length > 0) {
return false;
}
return true;
}
// Only show Assign To Collections from Bulk Menu if all selected items can be managed
// And no collections selected
// Or Custom User with Delete All permissions
get canAssignSelected() {
const filteredSelectedItems = this.selection.selected.filter((item) => {
if (item.collection) {
return true;
} else if (item.cipher) {
return !item.cipher.edit;
}
});
if (filteredSelectedItems.length > 0) {