github-starred/android
2
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2026-03-09 03:33:36 -05:00
Code Issues 144 Packages Projects Releases 116 Wiki Activity

[PR #1944] [MERGED] [SG-79] Add filter to search and preselect org in new cipher #3241

New Issue
Closed
opened 2025-11-26 23:30:09 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-26 23:30:09 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/bitwarden/android/pull/1944
Author: @mpbw2
Created: 6/7/2022
Status: ✅ Merged
Merged: 6/8/2022
Merged by: @mpbw2

Base: master ← Head: bugfix-vaultfilter

📝 Commits (3)

📊 Changes

8 files changed (+141 additions, -13 deletions)

View changed files

📝 src/App/Pages/Vault/AddEditPage.xaml.cs (+2 -0)
📝 src/App/Pages/Vault/CiphersPage.xaml (+25 -0)
📝 src/App/Pages/Vault/CiphersPage.xaml.cs (+3 -1)
📝 src/App/Pages/Vault/CiphersPageViewModel.cs (+93 -4)
📝 src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml (+1 -1)
📝 src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs (+1 -1)
📝 src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs (+6 -6)
📝 src/App/Styles/Base.xaml (+10 -0)

📄 Description

Type of change

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

Objective

  • SG-362 Added vault org filter support to cipher search page
  • SG-356 Pre-select org when creating new cipher from org-filtered list

Code changes

  • GroupingsPage.xaml: Updated button style
  • GroupingsPage.xaml.cs: Pass selected org ID to AddEditPage
  • GroupingsPageViewModel.cs: Make GetVaultFilterOrgId() public
  • AddEditPage.xaml.cs: Add support for organizationId in constructor
  • CiphersPage.xaml/xaml.cs/ViewModel.cs: Added UI & logic for displaying & handling vault filter options & selection
  • Base.xaml: Added new list-row-button-text style to fix color of vault filter button to match mocks

Before you submit

  • I have checked for formatting errors (dotnet tool run dotnet-format --check) (required)
  • I have added unit tests where it makes sense to do so (encouraged but not required)
  • This change requires a documentation update (notify the documentation team)
  • This change has particular deployment requirements (notify the DevOps team)

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/bitwarden/android/pull/1944 **Author:** [@mpbw2](https://github.com/mpbw2) **Created:** 6/7/2022 **Status:** ✅ Merged **Merged:** 6/8/2022 **Merged by:** [@mpbw2](https://github.com/mpbw2) **Base:** `master` ← **Head:** `bugfix-vaultfilter` --- ### 📝 Commits (3) - [`0ddb56e`](https://github.com/bitwarden/android/commit/0ddb56ed659c319c52371526d905177fff7a5ed2) Add filter to search and preselect org in new cipher - [`40b1200`](https://github.com/bitwarden/android/commit/40b1200bee2e3506ca787f72f12ba465c5edf856) formatting - [`2b080ad`](https://github.com/bitwarden/android/commit/2b080adbd07aaa2899a945ee171ab4945250dbd9) fixes ### 📊 Changes **8 files changed** (+141 additions, -13 deletions) <details> <summary>View changed files</summary> 📝 `src/App/Pages/Vault/AddEditPage.xaml.cs` (+2 -0) 📝 `src/App/Pages/Vault/CiphersPage.xaml` (+25 -0) 📝 `src/App/Pages/Vault/CiphersPage.xaml.cs` (+3 -1) 📝 `src/App/Pages/Vault/CiphersPageViewModel.cs` (+93 -4) 📝 `src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml` (+1 -1) 📝 `src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs` (+1 -1) 📝 `src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs` (+6 -6) 📝 `src/App/Styles/Base.xaml` (+10 -0) </details> ### 📄 Description ## Type of change - [X] Bug fix - [X] New feature development - [ ] Tech debt (refactoring, code cleanup, dependency upgrades, etc) - [ ] Build/deploy pipeline (DevOps) - [ ] Other ## Objective <!--Describe what the purpose of this PR is. For example: what bug you're fixing or what new feature you're adding--> - [SG-362] Added vault org filter support to cipher search page - [SG-356] Pre-select org when creating new cipher from org-filtered list ## Code changes <!--Explain the changes you've made to each file or major component. This should help the reviewer understand your changes--> <!--Also refer to any related changes or PRs in other repositories--> * **GroupingsPage.xaml:** Updated button style * **GroupingsPage.xaml.cs:** Pass selected org ID to `AddEditPage` * **GroupingsPageViewModel.cs:** Make `GetVaultFilterOrgId()` public * **AddEditPage.xaml.cs:** Add support for `organizationId` in constructor * **CiphersPage.xaml/xaml.cs/ViewModel.cs:** Added UI & logic for displaying & handling vault filter options & selection * **Base.xaml:** Added new `list-row-button-text` style to fix color of vault filter button to match mocks ## Before you submit - [ ] I have checked for formatting errors (`dotnet tool run dotnet-format --check`) (required) - [ ] I have added **unit tests** where it makes sense to do so (encouraged but not required) - [ ] This change requires a **documentation update** (notify the documentation team) - [ ] This change has particular **deployment requirements** (notify the DevOps team) [SG-362]: https://bitwarden.atlassian.net/browse/SG-362?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ [SG-356]: https://bitwarden.atlassian.net/browse/SG-356?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-26 23:30:09 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
app:authenticator
app:password-manager
bug
bug-passkey
customer-support
duplicate
enhancement
good first issue
help wanted
needs-reply
needs-response
pull-request
Mirrored from GitHub Pull Request
 question
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/android#3241
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?