[AC-2161] update cipher collections org vault modal #8027

Jingo88 · 2024-02-21T15:35:00Z

- [ ] Bug fix
- [ X ] New feature development
- [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc)
- [ ] Build/deploy pipeline (DevOps)
- [ ] Other

Objective

When Org has Owners and Admins can manage all collections and items turned on

Owner can open the Edit Collections modal and add/remove collections associated with the cipher

When Org has Owners and Admins can manage all collections and items turned off

Owner can open the Edit Collections modal
Collections they have readOnly access to will be on the bottom
If the cipher does not have any Can Edit collections associated with it, the Owner will be blocked from updating that ciphers collections. When trying to save in this instance they will get an error toast

Code changes

vault.component - Added a sort for collections before opening the Modal. Update to show all collections instead of only editableCollections$. Pass in flexible collections flag to modal
collections.component.ts (individual)- Do not allow check to complete on readOnly cipher row
collections.component.ts (org) - use the canEditAllCiphers boolean to assess what endpoint to hit
collections.component.ts (admin-console) - access if org canEditAnyCollection is turned on/off
collections.component.html - Added disable to the checkbox of the readOnly cipher
canEditAllCiphers - added to loadCipher in org-vault collections component and submit in libs collections component

Recording

First Recording For Original Flow
https://github.com/bitwarden/clients/assets/8302660/28f6cf86-4bb7-4b5f-8eaf-4a0c169433d5

Second Recording For QA Bugs Found (AC-2283, AC-2279, AC-2280)

AC-2161_bugs_AC-2283_AC-2279_AC-2280.mov

… collections in the org vault edit collections modal

codecov · 2024-02-21T15:39:52Z

Codecov Report

Attention: Patch coverage is 8.16327% with 45 lines in your changes are missing coverage. Please review.

Project coverage is 26.22%. Comparing base (cd5dc09) to head (36f5c43).

❗ Current head 36f5c43 differs from pull request most recent head a744ade. Consider uploading reports for the commit a744ade to get more accurate results

Files	Patch %	Lines
...pps/web/src/app/vault/org-vault/vault.component.ts	0.00%	14 Missing ⚠️
...bs/common/src/vault/models/view/collection.view.ts	20.00%	8 Missing ⚠️
.../admin-console/components/collections.component.ts	0.00%	7 Missing ⚠️
...b/src/app/vault/org-vault/collections.component.ts	14.28%	5 Missing and 1 partial ⚠️
...pp/vault/individual-vault/collections.component.ts	20.00%	3 Missing and 1 partial ⚠️
...lt/popup/components/vault/collections.component.ts	0.00%	3 Missing ⚠️
...sktop/src/vault/app/vault/collections.component.ts	0.00%	3 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #8027      +/-   ##
==========================================
- Coverage   26.34%   26.22%   -0.12%     
==========================================
  Files        2286     2278       -8     
  Lines       66938    66817     -121     
  Branches    12577    12571       -6     
==========================================
- Hits        17635    17524     -111     
+ Misses      47930    47925       -5     
+ Partials     1373     1368       -5

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

bitwarden-bot · 2024-02-21T17:02:23Z

Checkmarx One – Scan Summary & Details – 56d484e0-54d3-4317-baed-29a8115e71b3

No New Or Fixed Issues Found

LRNcardozoWDF

LGTM!

shane-melton

We still have some odd behavior going on here and need to investigate some more before merging this.

shane-melton · 2024-02-23T01:03:07Z

apps/web/src/app/vault/org-vault/vault.component.ts

@@ -688,6 +688,15 @@ export class VaultComponent implements OnInit, OnDestroy {
        (c) => !c.readOnly && c.id != Unassigned,
      );
    }
+    collections = collections.sort((a, b) => {


issue / question: The collections list here is being filtered above to only show non-readonly collections. I think something unexpected is going on if you're able to get a mix of readonly and non-readonly collections to sort here.

Are you using the v1 flexible collections flag? And/or is the limit admin access to collections/items setting enabled?

…all collections in ciphers

…ed, readonly, and manage properties

…when in individual vault

shane-melton

Looking good, gave it go on my local environment as well and the dialog was behaving as expected in my tests, thank you!

eliykat

The CollectionsComponent base class is AC Team's only file here, and it doesn't look like we should own it. I assume it's a holdover from when we owned collections. But all its subclasses are all in vault code, and vault now owns collections, so please move this into your code ownership as well.

I am approving in the meantime to unblock you but I am relying on @shane-melton being happy with it.

… super.loadCipher

…cover custom users with manage access

shane-melton

I think this is pretty much there -- just two questions to make sure we're on the same page and this is behaving as we both expect.

apps/web/src/app/vault/org-vault/collections.component.ts

libs/angular/src/admin-console/components/collections.component.ts

apps/web/src/app/vault/org-vault/vault.component.ts

…ditCipherCollections for better updates to collections modal when flag is off

shane-melton

Looks ready to go to me! Thanks for all your work on this!

eliykat

Confirming @shane-melton 's review

…unassigned does not show in modal

Jingo88 added 2 commits February 20, 2024 11:21

updated collections component and vault component to disable readOnly…

1de7b08

… collections in the org vault edit collections modal

Merge branch 'main' into AC-2161-Update-Cipher-Collections

03491e4

Jingo88 requested a review from a team as a code owner February 21, 2024 15:35

Jingo88 requested a review from gbubemismith February 21, 2024 15:35

github-actions bot added the needs-qa Marks a PR as requiring QA approval label Feb 21, 2024

LRNcardozoWDF previously approved these changes Feb 21, 2024

View reviewed changes

shane-melton requested changes Feb 23, 2024

View reviewed changes

Jingo88 added 2 commits February 23, 2024 16:13

Merge branch 'main' into AC-2161-Update-Cipher-Collections

69b3ce4

update collections component to check if org allows Owners up manage …

8ee593b

…all collections in ciphers

Jingo88 dismissed LRNcardozoWDF’s stale review via 8ee593b February 26, 2024 18:24

Jingo88 requested a review from a team as a code owner February 26, 2024 18:24

Jingo88 requested review from addisonbeck and shane-melton February 26, 2024 18:24

Jingo88 added 5 commits February 28, 2024 10:13

Merge branch 'main' into AC-2161-Update-Cipher-Collections

d559a12

updated canEditItems logic

29d2e53

added a canEditItems method to check for flex collection flag, assign…

3a960a4

…ed, readonly, and manage properties

add logic to pass organization so canEditItems does not return false …

f299244

…when in individual vault

updated other collections components with org service import

0907d7e

shane-melton previously approved these changes Mar 6, 2024

View reviewed changes

eliykat previously approved these changes Mar 7, 2024

View reviewed changes

eliykat removed the request for review from addisonbeck March 7, 2024 03:04

Merge branch 'main' into AC-2161-Update-Cipher-Collections

325df09

Jingo88 dismissed stale reviews from eliykat and shane-melton via 6a84b89 March 7, 2024 21:28

Jingo88 force-pushed the AC-2161-Update-Cipher-Collections branch from 6a84b89 to 325df09 Compare March 7, 2024 21:34

Jingo88 changed the title ~~AC-2161 update cipher collections org vault modal~~ [AC-2161] update cipher collections org vault modal Mar 7, 2024

shane-melton previously approved these changes Mar 7, 2024

View reviewed changes

eliykat previously approved these changes Mar 8, 2024

View reviewed changes

Jingo88 added 2 commits March 13, 2024 12:50

update loadCipher method in collections component org vault to target…

9f955c7

… super.loadCipher

add canEditAllCiphers logic to submit in collections component so we …

6f8f2e3

…cover custom users with manage access

Jingo88 requested a review from shane-melton March 13, 2024 19:20

shane-melton reviewed Mar 13, 2024

View reviewed changes

apps/web/src/app/vault/org-vault/collections.component.ts Outdated Show resolved Hide resolved

libs/angular/src/admin-console/components/collections.component.ts Outdated Show resolved Hide resolved

shane-melton reviewed Mar 13, 2024

View reviewed changes

apps/web/src/app/vault/org-vault/vault.component.ts Outdated Show resolved Hide resolved

cleanup excess code in collectiosn component. remove filter in vaultE…

da4264f

…ditCipherCollections for better updates to collections modal when flag is off

Jingo88 requested a review from shane-melton March 14, 2024 14:39

shane-melton previously approved these changes Mar 14, 2024

View reviewed changes

Jingo88 removed the request for review from gbubemismith March 14, 2024 15:44

eliykat previously approved these changes Mar 14, 2024

View reviewed changes

Jingo88 added 3 commits March 15, 2024 14:21

Merge branch 'main' into AC-2161-Update-Cipher-Collections

e1ba2de

Merge branch 'main' into AC-2161-Update-Cipher-Collections

18263dd

change collections value in editCipherCollections for FC Flag off so …

b4d0f09

…unassigned does not show in modal

Jingo88 dismissed stale reviews from eliykat and shane-melton via b4d0f09 March 18, 2024 15:02

Jingo88 requested a review from shane-melton March 18, 2024 15:03

shane-melton previously approved these changes Mar 18, 2024

View reviewed changes

eliykat previously approved these changes Mar 19, 2024

View reviewed changes

check for unassigned ciphers added to org vault load method

7b538cb

Jingo88 dismissed stale reviews from eliykat and shane-melton via 7b538cb March 19, 2024 16:31

Jingo88 added 2 commits March 19, 2024 13:45

Merge branch 'main' into AC-2161-Update-Cipher-Collections

db42343

latest main. update collections component with missing await

36f5c43

shane-melton approved these changes Mar 19, 2024

View reviewed changes

eliykat approved these changes Mar 19, 2024

View reviewed changes

Jingo88 removed the needs-qa Marks a PR as requiring QA approval label Mar 21, 2024

Merge branch 'main' into AC-2161-Update-Cipher-Collections

a744ade

Jingo88 merged commit 8fd76ea into main Mar 21, 2024
60 of 61 checks passed

Jingo88 deleted the AC-2161-Update-Cipher-Collections branch March 21, 2024 15:54

shane-melton mentioned this pull request May 3, 2024

[AC-2555] Cipher collections dialog merge fixes #9036

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[AC-2161] update cipher collections org vault modal #8027

[AC-2161] update cipher collections org vault modal #8027

Jingo88 commented Feb 21, 2024 •

edited

Loading

codecov bot commented Feb 21, 2024 •

edited

Loading

bitwarden-bot commented Feb 21, 2024 •

edited

Loading

LRNcardozoWDF left a comment

shane-melton left a comment

shane-melton Feb 23, 2024

shane-melton left a comment

eliykat left a comment

shane-melton left a comment

shane-melton left a comment

eliykat left a comment

[AC-2161] update cipher collections org vault modal #8027

[AC-2161] update cipher collections org vault modal #8027

Conversation

Jingo88 commented Feb 21, 2024 • edited Loading

Objective

Code changes

Recording

codecov bot commented Feb 21, 2024 • edited Loading

Codecov Report

bitwarden-bot commented Feb 21, 2024 • edited Loading

No New Or Fixed Issues Found

LRNcardozoWDF left a comment

Choose a reason for hiding this comment

shane-melton left a comment

Choose a reason for hiding this comment

shane-melton Feb 23, 2024

Choose a reason for hiding this comment

shane-melton left a comment

Choose a reason for hiding this comment

eliykat left a comment

Choose a reason for hiding this comment

shane-melton left a comment

Choose a reason for hiding this comment

shane-melton left a comment

Choose a reason for hiding this comment

eliykat left a comment

Choose a reason for hiding this comment

Jingo88 commented Feb 21, 2024 •

edited

Loading

codecov bot commented Feb 21, 2024 •

edited

Loading

bitwarden-bot commented Feb 21, 2024 •

edited

Loading