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

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

Merged
merged 4 commits into from May 7, 2024

Conversation

shane-melton
Copy link
Member

@shane-melton shane-melton commented May 3, 2024

Type of change

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

Objective

The cipher collections dialog was partially broken after come conflicting merges (#8027 and #6794), this PR addresses those leftover conflicts.

Code changes

  • Fetch the V1 flexible collection feature flag from the component internally instead of passing it via props.
  • Undo additionally filtering of collections for the org vault cipher collections dialog. The dialog in the org vault is supposed to show every collection, with readonly collections being disabled and sorted at the bottom. (see [AC-2161] update cipher collections org vault modal #8027)

Screenshots

Before you submit

  • Please add unit tests where it makes sense to do so (encouraged but not required)
  • If this change requires a documentation update - notify the documentation team
  • If this change has particular deployment requirements - notify the DevOps team
  • Ensure that all UI additions follow WCAG AA requirements

@shane-melton shane-melton requested review from a team as code owners May 3, 2024 23:25
@github-actions github-actions bot added the needs-qa Marks a PR as requiring QA approval label May 3, 2024
@shane-melton shane-melton requested review from Jingo88 and removed request for gbubemismith May 3, 2024 23:25
Copy link

codecov bot commented May 3, 2024

Codecov Report

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

❗ No coverage uploaded for pull request base (main@be51f19). Click here to learn what that means.

Files Patch % Lines
.../admin-console/components/collections.component.ts 0.00% 4 Missing ⚠️
...lt/popup/components/vault/collections.component.ts 0.00% 1 Missing ⚠️
...sktop/src/vault/app/vault/collections.component.ts 0.00% 1 Missing ⚠️
...pp/vault/individual-vault/collections.component.ts 66.66% 0 Missing and 1 partial ⚠️
...b/src/app/vault/org-vault/collections.component.ts 50.00% 0 Missing and 1 partial ⚠️
...pps/web/src/app/vault/org-vault/vault.component.ts 0.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##             main    #9036   +/-   ##
=======================================
  Coverage        ?   27.75%           
=======================================
  Files           ?     2419           
  Lines           ?    69915           
  Branches        ?    13013           
=======================================
  Hits            ?    19402           
  Misses          ?    49012           
  Partials        ?     1501           

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

Copy link
Contributor

github-actions bot commented May 3, 2024

Logo
Checkmarx One – Scan Summary & Details9b14ebb3-dd17-4fc8-95bb-022be98cf581

No New Or Fixed Issues Found

@shane-melton shane-melton removed the needs-qa Marks a PR as requiring QA approval label May 7, 2024
@shane-melton shane-melton merged commit c241aba into main May 7, 2024
61 of 63 checks passed
@shane-melton shane-melton deleted the vault/ac-2555/collection-dialog-fixes branch May 7, 2024 17:00
MGibson1 pushed a commit that referenced this pull request May 13, 2024
* [AC-2555] Fix missing feature flags in CollectionsComponent

* [AC-2555] Do not filter collections when opening the cipher collections dialog in the org vault

(cherry picked from commit c241aba)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants