[PM-11304] Ownership Not Defaulting To Org and Collection #4254

andrebispo5 · 2024-11-07T17:00:35Z

🎟️ Tracking

https://bitwarden.atlassian.net/browse/PM-11304

📔 Objective

Fix bug where the ownership and collection is not defaulting to the screen where it is being created at.
Also fixed the add item float button that wasn't showing for collection.

📸 Screenshots

Screen.Recording.2024-11-08.at.09.01.42.mov

⏰ Reminders before review

Contributor guidelines followed
All formatters and local linters executed and passed
Written new unit and / or integration tests where applicable
Used internationalization (i18n) for all UI strings
CI builds passed
Communicated to DevOps any deployment requirements
Updated any necessary documentation or informed the documentation team

🦮 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

…dd item folder

… folder

github-actions · 2024-11-07T17:06:05Z

Checkmarx One – Scan Summary & Details – 4c89ce87-953b-44a7-9521-0f5f267ab436

No New Or Fixed Issues Found

…ection # Conflicts: # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt

codecov · 2024-11-07T19:10:49Z

Codecov Report

Attention: Patch coverage is 64.51613% with 11 lines in your changes missing coverage. Please review.

Project coverage is 89.00%. Comparing base (f33296b) to head (2ecd65e).
Report is 12 commits behind head on main.

Files with missing lines	Patch %	Lines
...vault/feature/addedit/util/CipherViewExtensions.kt	70.58%	3 Missing and 2 partials ⚠️
...t/feature/itemlisting/VaultItemListingViewModel.kt	37.50%	4 Missing and 1 partial ⚠️
.../ui/vault/feature/addedit/VaultAddEditViewModel.kt	75.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4254      +/-   ##
==========================================
- Coverage   89.01%   89.00%   -0.02%     
==========================================
  Files         453      453              
  Lines       39049    39067      +18     
  Branches     5480     5485       +5     
==========================================
+ Hits        34758    34770      +12     
- Misses       2369     2374       +5     
- Partials     1922     1923       +1

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

david-livefront · 2024-11-07T21:55:08Z

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt

@@ -134,11 +134,16 @@ fun VaultAddEditState.ViewState.appendFolderAndOwnerData(
                ),
                selectedOwnerId = activeAccount.toSelectedOwnerId(
                    cipherView = currentContentState.common.originalCipher,
-                ),
+                )
+                    ?: collectionViewList.firstOrNull {


Since this is now chaining, can we clean up the formatting here:

selectedOwnerId = activeAccount .toSelectedOwnerId(cipherView = currentContentState.common.originalCipher) ?: collectionViewList .firstOrNull { it.id == currentContentState.common.selectedCollectionId } ?.organizationId,

david-livefront · 2024-11-07T21:56:37Z

...src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt

@@ -93,7 +94,8 @@ fun NavGraphBuilder.vaultItemListingDestinationAsRoot(
    onNavigateToVaultAddItemScreen: (
        cipherType: VaultItemCipherType,
        selectedFolderId: String?,
-    ) -> Unit,
+        selectedCollectionId: String?,
+        ) -> Unit,


This should not have the extra indentation.

david-livefront · 2024-11-07T21:57:17Z

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt

@@ -23,7 +23,8 @@ fun NavGraphBuilder.vaultGraph(
    onNavigateToVaultAddItemScreen: (
        vaultItemCipherType: VaultItemCipherType,
        selectedFolderId: String?,
-    ) -> Unit,
+        selectedCollectionId: String?,
+        ) -> Unit,


david-livefront · 2024-11-07T21:57:50Z

Code looks swell, just the minor formatting stuff

david-livefront · 2024-11-08T16:35:17Z

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt

-                    id = UUID.randomUUID().toString(),
+                    id = UUID
+                        .randomUUID()
+                        .toString(),


Any reason to make this change?

It was automatically formatted by the IDE after the file format.

Hmm, that should not happen as part of the formatter. To be clear, there is nothing wrong with this change but the regular auto-formatter does not normally do this. 🤔

I've updated to match yours, thanks

# Conflicts: # app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlocked/VaultUnlockedNavigation.kt # app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarNavigation.kt # app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreen.kt # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditNavigation.kt # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/util/CipherViewExtensions.kt # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreen.kt # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingViewModel.kt # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt # app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/vaultunlockednavbar/VaultUnlockedNavBarScreenTest.kt # app/src/test/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingScreenTest.kt

# Conflicts: # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt

david-livefront · 2024-11-12T17:48:55Z

app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt

+    private fun handleSshKeyCipherItemsFeatureFlagReceive(
+        action: VaultAddEditAction.Internal.SshKeyCipherItemsFeatureFlagReceive,
+    ) {
+        mutableStateFlow.update {


Can we add a test for this action

That was actually a merge mistake, I've already reverted it. Thanks for catching that!

andrebispo5 · 2024-11-13T11:46:36Z

@david-livefront Cleaned everything up it should be good now, thanks for the heads up! 👍

andrebispo5 added 7 commits November 6, 2024 16:55

[PM-11303] Add button visible inside folders

96a3aa9

[PM-11303] Add selected folder id navigation parameter to preselect a…

ad055f3

…dd item folder

[PM-11303] Add missing tests

a52588f

[PM-11304] Add collection Id to navigation params

b185412

[PM-11304] Enable fab for collection vault listings

96f118e

[PM-11304] Select owner and collection if creating cipher from an org…

9213ad2

… folder

[PM-11304] Update show add cipher fab button logic

3dc7657

andrebispo5 added 2 commits November 7, 2024 18:49

[PM-11303] Code cleanup

c70ff9b

Merge branch 'pm-11303/plus-icon-folders' into pm-11304/add-item-coll…

4aef4dd

…ection # Conflicts: # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/vault/VaultGraphNavigation.kt

david-livefront reviewed Nov 7, 2024

View reviewed changes

andrebispo5 changed the title ~~[PM-11304] Missing add cipher in collections~~ [PM-11304] Ownership Not Defaulting To Org and Collection Nov 8, 2024

andrebispo5 added 2 commits November 8, 2024 09:23

[PM-11304] Code clean up

0387f0b

[PM-11304] Lint

a0e3ae0

andrebispo5 marked this pull request as ready for review November 8, 2024 09:27

andrebispo5 requested review from brian-livefront, dseverns-livefront, ahaisting-livefront and a team as code owners November 8, 2024 09:27

andrebispo5 requested a review from david-livefront November 8, 2024 09:27

david-livefront reviewed Nov 8, 2024

View reviewed changes

andrebispo5 requested a review from david-livefront November 11, 2024 12:33

Base automatically changed from pm-11303/plus-icon-folders to main November 11, 2024 16:48

andrebispo5 added 3 commits November 12, 2024 10:32

Merge branch 'main' into pm-11304/add-item-collection

b2c3323

# Conflicts: # app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditViewModel.kt

[PM-11304] Fix merge

7bb0eb2

david-livefront reviewed Nov 12, 2024

View reviewed changes

[PM-11304] Fix merge, prevent ssh creation

e722c55

andrebispo5 requested a review from david-livefront November 13, 2024 11:33

[PM-11304] Revert unwanted wrap chained functions

2ecd65e

david-livefront approved these changes Nov 13, 2024

View reviewed changes

andrebispo5 added this pull request to the merge queue Nov 14, 2024

Merged via the queue into main with commit 40f33df Nov 14, 2024
9 checks passed

andrebispo5 deleted the pm-11304/add-item-collection branch November 14, 2024 08:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[PM-11304] Ownership Not Defaulting To Org and Collection #4254

[PM-11304] Ownership Not Defaulting To Org and Collection #4254

andrebispo5 commented Nov 7, 2024 •

edited

Loading

github-actions bot commented Nov 7, 2024 •

edited

Loading

codecov bot commented Nov 7, 2024 •

edited

Loading

david-livefront Nov 7, 2024

david-livefront Nov 7, 2024

david-livefront Nov 7, 2024

david-livefront commented Nov 7, 2024

david-livefront Nov 8, 2024

andrebispo5 Nov 11, 2024 •

edited

Loading

david-livefront Nov 11, 2024

david-livefront Nov 12, 2024

andrebispo5 Nov 13, 2024

david-livefront Nov 12, 2024

andrebispo5 Nov 13, 2024

andrebispo5 commented Nov 13, 2024

[PM-11304] Ownership Not Defaulting To Org and Collection #4254

[PM-11304] Ownership Not Defaulting To Org and Collection #4254

Conversation

andrebispo5 commented Nov 7, 2024 • edited Loading

🎟️ Tracking

📔 Objective

📸 Screenshots

⏰ Reminders before review

🦮 Reviewer guidelines

github-actions bot commented Nov 7, 2024 • edited Loading

No New Or Fixed Issues Found

codecov bot commented Nov 7, 2024 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

david-livefront commented Nov 7, 2024

Choose a reason for hiding this comment

andrebispo5 Nov 11, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrebispo5 commented Nov 13, 2024

andrebispo5 commented Nov 7, 2024 •

edited

Loading

github-actions bot commented Nov 7, 2024 •

edited

Loading

codecov bot commented Nov 7, 2024 •

edited

Loading

andrebispo5 Nov 11, 2024 •

edited

Loading