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

[AC-1139] Deprecated Organization canEditAssignedCollections, canDeleteAssignedCollections, canViewAssignedCollections

Browse Source
This commit is contained in:
Rui Tome
2023-11-16 14:48:30 +00:00
parent ca1ef99054
commit 7ce712aa7c
6 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,7 +106,7 @@ export class VaultItemsComponent {
}
const organization = this.allOrganizations.find((o) => o.id === collection.organizationId);
return collection.canEdit(organization);
return collection.canEdit(organization, this.flexibleCollectionsEnabled);
}
protected canDeleteCollection(collection: CollectionView): boolean {

8
apps/web/src/app/vault/core/views/collection-admin.view.ts
View File

@@ -31,8 +31,12 @@ export class CollectionAdminView extends CollectionView {
this.assigned = response.assigned;
}
override canEdit(org: Organization): boolean {
return org?.canEditAnyCollection || (org?.canEditAssignedCollections && this.assigned);
override canEdit(org: Organization, flexibleCollectionsEnabled: boolean): boolean {
if (flexibleCollectionsEnabled) {
return org?.canEditAnyCollection;
} else {
return org?.canEditAnyCollection || (org?.canEditAssignedCollections && this.assigned);
}
}
override canDelete(org: Organization, flexibleCollectionsEnabled: boolean): boolean {

2
apps/web/src/app/vault/individual-vault/vault-header/vault-header.component.ts
View File

@@ -143,7 +143,7 @@ export class VaultHeaderComponent {
const organization = this.organizations.find(
(o) => o.id === this.collection?.node.organizationId
);
return this.collection.node.canEdit(organization);
return this.collection.node.canEdit(organization, this.flexibleCollectionsEnabled);
}
async editCollection(tab: CollectionDialogTabType): Promise<void> {

2
apps/web/src/app/vault/org-vault/vault-header/vault-header.component.ts
View File

@@ -152,7 +152,7 @@ export class VaultHeaderComponent {
}
// Otherwise, check if we can edit the specified collection
return this.collection.node.canEdit(this.organization);
return this.collection.node.canEdit(this.organization, this.flexibleCollectionsEnabled);
}
addCipher() {