-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
base: main
Are you sure you want to change the base?
Conversation
Codecov ReportAttention: Patch coverage is
✅ All tests successful. No failed tests found. Additional details and impacted files@@ Coverage Diff @@
## main #11367 +/- ##
==========================================
- Coverage 33.41% 33.41% -0.01%
==========================================
Files 2841 2841
Lines 89008 89024 +16
Branches 16979 16984 +5
==========================================
+ Hits 29744 29745 +1
- Misses 56927 56941 +14
- Partials 2337 2338 +1 ☔ View full report in Codecov by Sentry. |
No New Or Fixed Issues Found |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The change to vault-items
looks good!
However, we need to make a similar change to the item-details-section.component
for the new CipherForm. It also allows users to modify a cipher's collections without the "Assign To Collections" dialog so we need to adjust that component to disable the collections control when !cipher.viewPassword
return org.id === this.originalCipherView.organizationId; | ||
}); | ||
|
||
const filteredCollections = this.originalCipherView.collectionIds.find((id) => { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this.originalCipherView
can be null when creating a new cipher and this will throw.
filteredCollections?.length > 0 || | ||
(this.originalCipherView.edit && this.originalCipherView.viewPassword) | ||
) { | ||
this.showCollectionsControl = true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
libs/vault/src/cipher-form/components/item-details/item-details-section.component.ts
Show resolved
Hide resolved
apps/web/src/app/vault/components/vault-items/vault-items.component.ts
Outdated
Show resolved
Hide resolved
…ot remove assign to collections based on permissions
libs/angular/src/admin-console/components/collections.component.ts
Outdated
Show resolved
Hide resolved
if (cipher?.organizationId == null) { | ||
this.canAssignCollections = true; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't follow this - if the cipher isn't in an organization, you can't assign it to a collection.
libs/angular/src/admin-console/components/collections.component.ts
Outdated
Show resolved
Hide resolved
libs/angular/src/admin-console/components/collections.component.ts
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to go! There do seem to be a couple merge conflicts though
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This no longer affects any AC Team owned files, no approval needed from me 👍
libs/admin-console/src/common/collections/models/collection.view.ts
Outdated
Show resolved
Hide resolved
@@ -40,7 +40,7 @@ export class CollectionView implements View, ITreeNodeObject { | |||
} | |||
|
|||
// Applying excludeHidePassword false will remove collections with Can Edit Except Password Permissions |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
⛏️ Comment is outdated
🎟️ Tracking
PM-11162
📔 Objective
Only users with
Can Edit
permissions will be allowed toAssign To Collections
. If the user hasCan Edit Except Password
they should not seeAssign To Collections
in the menu of the item row.📸 Screen Recording
PM-11162.mov
Desktop Permissions
PM-11162-Desktop.mov
Screenshot of CLI error when trying to add collection to
Can Edit Except PW
item UPDATED (shows new error text)Removed Assign option from
Can Edit Except PW
items in browserPM-14165-browser-assign-remove.mov
⏰ Reminders before review
🦮 Reviewer guidelines
:+1:
) or similar for great changes:memo:
) or ℹ️ (:information_source:
) for notes or general info:question:
) for questions:thinking:
) or 💭 (:thought_balloon:
) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion:art:
) for suggestions / improvements:x:
) or:warning:
) for more significant problems or concerns needing attention:seedling:
) or ♻️ (:recycle:
) for future improvements or indications of technical debt:pick:
) for minor or nitpick changes