Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PM-11162] Assign To Collections Permission Update #11367

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
51d15cd
updated canEditCipher permission logic inside vault-items
Jingo88 Oct 2, 2024
be5ac61
Merge branch 'main' into PM-11162-assign-to-collections-perm
Jingo88 Oct 2, 2024
c852cd9
Merge branch 'main' into PM-11162-assign-to-collections-perm
Jingo88 Oct 2, 2024
a7eb84c
add permission logic to assign to collections for browser cipher edit
Jingo88 Oct 4, 2024
3812613
update spec for new perm logic in item details section
Jingo88 Oct 4, 2024
f53b337
Merge branch 'main' into PM-11162-assign-to-collections-perm
Jingo88 Oct 8, 2024
6308eca
updates to vault items and item details section to only disable and nโ€ฆ
Jingo88 Oct 9, 2024
97efd35
fix reversed logic for canEdit and canAssign in vault-items
Jingo88 Oct 9, 2024
65caab7
Merge branch 'main' into PM-11162-assign-to-collections-perm
Jingo88 Oct 14, 2024
2a93e72
update collections component to disable collections based on permissiโ€ฆ
Jingo88 Oct 14, 2024
8cd5cac
reduce logic for can assign for desktop
Jingo88 Oct 16, 2024
b94ee53
update naming for new cipherView getter
Jingo88 Oct 16, 2024
704b22f
merged latest, fixed conflicts
Jingo88 Oct 22, 2024
41b2cd4
merge latest, fix conflicts
Jingo88 Oct 28, 2024
a237e95
Merge branch 'main' into PM-11162-assign-to-collections-perm
Jingo88 Oct 31, 2024
5c598a4
do not show checkbox for cipher that has viewPassword false
Jingo88 Oct 31, 2024
03806ce
remove assign in browser for can edit except password
Jingo88 Nov 4, 2024
6589aa1
update error message for cli edit collections
Jingo88 Nov 5, 2024
7a5f0b1
Merge branch 'main' into PM-11162-assign-to-collections-perm
Jingo88 Nov 5, 2024
fcb68ce
remove excess space change
Jingo88 Nov 5, 2024
873e16c
updates to catch permissions before API call
Jingo88 Nov 6, 2024
2b8afdb
updated vault items so can edit except password does not get to assigโ€ฆ
Jingo88 Nov 7, 2024
2824e78
remove can edit except pw from assign to collections modal
Jingo88 Nov 8, 2024
4be508a
remove canEdit Except PW collections from edit item dropdown
Jingo88 Nov 8, 2024
ffc38d4
merged latest. fixed conflicts
Jingo88 Nov 8, 2024
b618f49
Merge branch 'main' into PM-11162-assign-to-collections-perm
Jingo88 Nov 11, 2024
9d2b125
updated CanEditItems helper
Jingo88 Nov 11, 2024
f2be128
Merge branch 'main' into PM-11162-assign-to-collections-perm
withinfocus Nov 11, 2024
0fa9f53
update comment
Jingo88 Nov 12, 2024
3530622
Merge branch 'main' into PM-11162-assign-to-collections-perm
kejaeger Nov 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,10 @@
}

const organization = this.allOrganizations.find((o) => o.id === cipher.organizationId);
return (organization.canEditAllCiphers && this.viewingOrgVault) || cipher.edit;
return (

Check warning on line 194 in apps/web/src/app/vault/components/vault-items/vault-items.component.ts

View check run for this annotation

Codecov / codecov/patch

apps/web/src/app/vault/components/vault-items/vault-items.component.ts#L194

Added line #L194 was not covered by tests
shane-melton marked this conversation as resolved.
Show resolved Hide resolved
(organization.canEditAllCiphers && this.viewingOrgVault) ||
(cipher.edit && cipher.viewPassword)
);
}

private refreshItems() {
Expand Down
Loading