-
Notifications
You must be signed in to change notification settings - Fork 1.9k
[PM-37808] Bulk Selection + Batch Bar for Desktop #21308
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
Open
nick-livefront
wants to merge
15
commits into
main
Choose a base branch
from
vault/pm-37808/desktop-vault-export
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
534e744
add selection and bulk actions for desktop
nick-livefront e7fd8c2
remove event, it's always truthy
nick-livefront d434504
Merge remote-tracking branch 'origin/main' into vault/pm-37808/desktoβ¦
nick-livefront d9da21d
add space beneath vault list when batch bar is active
nick-livefront bd7128c
lowercase selected in the bulk actions bar
nick-livefront 92b35aa
update archive messages for bulk dialog
nick-livefront 0fd3da8
add assign to collection translations
nick-livefront 0523f81
update deletion dialog for desktop
nick-livefront 3f61804
fix translation value change
nick-livefront 52ca8d8
fix translation change in bulk action tests
nick-livefront 7d2dde3
Merge remote-tracking branch 'origin/main' into vault/pm-37808/desktoβ¦
nick-livefront 267bd0f
align deletion dialog with web implementation
nick-livefront 18e4c55
remove duplicate translation keys
nick-livefront bf0d6e6
Merge branch 'main' of github.com:bitwarden/clients into vault/pm-378β¦
nick-livefront 4cb083c
Fix American spelling in personalItemsTransferWarningPlural locale stβ¦
nick-livefront File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -135,9 +135,21 @@ | |
| "attachments": { | ||
| "message": "Attachments" | ||
| }, | ||
| "attachmentsNeedFix": { | ||
| "message": "This item has old file attachments that need to be fixed." | ||
| }, | ||
| "viewItem": { | ||
| "message": "View item" | ||
| }, | ||
| "viewCollectionWithName": { | ||
| "message": "View collection - $NAME$", | ||
| "placeholders": { | ||
| "name": { | ||
| "content": "$1", | ||
| "example": "Collection1" | ||
| } | ||
| } | ||
| }, | ||
| "viewItemHeaderLogin": { | ||
| "message": "View Login", | ||
| "description": "Header for view login item type" | ||
|
|
@@ -341,6 +353,15 @@ | |
| "editItem": { | ||
| "message": "Edit item" | ||
| }, | ||
| "editItemWithName": { | ||
| "message": "Edit item - $NAME$", | ||
| "placeholders": { | ||
| "name": { | ||
| "content": "$1", | ||
| "example": "Google Login" | ||
| } | ||
| } | ||
| }, | ||
| "emailAddress": { | ||
| "message": "Email address" | ||
| }, | ||
|
|
@@ -809,6 +830,45 @@ | |
| "deleteItem": { | ||
| "message": "Delete item" | ||
| }, | ||
| "deleteItemsCount": { | ||
| "message": "Delete $COUNT$ items", | ||
| "placeholders": { | ||
| "count": { | ||
| "content": "$1", | ||
| "example": "3" | ||
| } | ||
| } | ||
| }, | ||
| "deleteItemDesc": { | ||
| "message": "This item will be sent to your trash. After 30 days there, it will be permanently deleted." | ||
| }, | ||
| "deleteItemsDesc": { | ||
| "message": "These items will be sent to your trash. After 30 days there, they will be permanently deleted." | ||
| }, | ||
| "deleteItemPermanently": { | ||
| "message": "Delete item permanently" | ||
| }, | ||
| "deleteItemsPermanentlyCount": { | ||
| "message": "Delete $COUNT$ items permanently", | ||
| "placeholders": { | ||
| "count": { | ||
| "content": "$1", | ||
| "example": "3" | ||
| } | ||
| } | ||
| }, | ||
| "deleteItemPermanentlyDesc": { | ||
| "message": "You will not be able to recover this item." | ||
| }, | ||
| "deleteItemsPermanentlyDesc": { | ||
| "message": "You will not be able to recover these items." | ||
| }, | ||
| "deleteSelection": { | ||
| "message": "Delete selection" | ||
| }, | ||
| "deleteItemsAndCollectionsDesc": { | ||
| "message": "The selected items and collections will be permanently deleted." | ||
| }, | ||
| "deleteFolder": { | ||
| "message": "Delete folder" | ||
| }, | ||
|
|
@@ -1812,15 +1872,6 @@ | |
| "message": "Copy security code", | ||
| "description": "Copy credit card security code (CVV)" | ||
| }, | ||
| "copyPrivateKey": { | ||
| "message": "Copy private key" | ||
| }, | ||
| "copyPublicKey": { | ||
| "message": "Copy public key" | ||
| }, | ||
| "copyFingerprint": { | ||
| "message": "Copy fingerprint" | ||
| }, | ||
|
Comment on lines
-1815
to
-1823
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. These were duplicate keys in the file |
||
| "cardNumber": { | ||
| "message": "card number" | ||
| }, | ||
|
|
@@ -2420,12 +2471,36 @@ | |
| "archivedItemRestored": { | ||
| "message": "Archived item restored" | ||
| }, | ||
| "archivedItemsRestored": { | ||
| "message": "Archived items restored" | ||
| }, | ||
| "restoredItem": { | ||
| "message": "Item restored" | ||
| }, | ||
| "restoredItems": { | ||
| "message": "Items restored" | ||
| }, | ||
| "permanentlyDelete": { | ||
| "message": "Permanently delete" | ||
| }, | ||
| "permanentlyDeletedItems": { | ||
| "message": "Items permanently deleted" | ||
| }, | ||
| "deletedItems": { | ||
| "message": "Items sent to trash" | ||
| }, | ||
| "deletedCollections": { | ||
| "message": "Deleted collections" | ||
| }, | ||
| "collectionDeleted": { | ||
| "message": "Collection deleted" | ||
| }, | ||
| "collectionsDeleted": { | ||
| "message": "Collections deleted" | ||
| }, | ||
| "movedItems": { | ||
| "message": "Items moved" | ||
| }, | ||
| "vaultTimeoutLogOutConfirmation": { | ||
| "message": "Logging out will remove all access to your vault and requires online authentication after the timeout period. Are you sure you want to use this setting?" | ||
| }, | ||
|
|
@@ -4650,9 +4725,6 @@ | |
| } | ||
| } | ||
| }, | ||
| "personalItemTransferWarningSingular": { | ||
| "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item." | ||
| }, | ||
| "personalItemWithOrgTransferWarningSingular": { | ||
| "message": "1 item will be permanently transferred to $ORG$. You will no longer own this item.", | ||
| "placeholders": { | ||
|
|
@@ -4662,6 +4734,31 @@ | |
| } | ||
| } | ||
| }, | ||
| "personalItemTransferWarningSingular": { | ||
| "message": "1 item will be permanently transferred to the selected organization. You will no longer own this item." | ||
| }, | ||
| "personalItemsTransferWarningPlural": { | ||
| "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to the selected organization. You will no longer own these items.", | ||
| "placeholders": { | ||
| "personal_items_count": { | ||
| "content": "$1", | ||
| "example": "2" | ||
| } | ||
| } | ||
| }, | ||
| "personalItemsWithOrgTransferWarningPlural": { | ||
| "message": "$PERSONAL_ITEMS_COUNT$ items will be permanently transferred to $ORG$. You will no longer own these items.", | ||
| "placeholders": { | ||
| "personal_items_count": { | ||
| "content": "$1", | ||
| "example": "2" | ||
| }, | ||
| "org": { | ||
| "content": "$2", | ||
| "example": "Organization name" | ||
| } | ||
| } | ||
| }, | ||
| "successfullyAssignedCollections": { | ||
| "message": "Successfully assigned collections" | ||
| }, | ||
|
|
@@ -4814,6 +4911,47 @@ | |
| "unArchiveAndSave": { | ||
| "message": "Unarchive and save" | ||
| }, | ||
| "archiveItemsPlural": { | ||
| "message": "Archive $NUM$ items", | ||
| "description": "Title of the archive items dialog when multiple items are selected", | ||
| "placeholders": { | ||
| "num": { | ||
| "content": "$1", | ||
| "example": "5" | ||
| } | ||
| } | ||
| }, | ||
| "archiveItemsSingular": { | ||
| "message": "Archive $NUM$ item", | ||
| "description": "Title of the archive items dialog when a single item is selected", | ||
| "placeholders": { | ||
| "num": { | ||
| "content": "$1", | ||
| "example": "1" | ||
| } | ||
| } | ||
| }, | ||
| "archiveItemsPluralDescription": { | ||
| "message": "Once archived, these items will be excluded from search results and autofill suggestions." | ||
| }, | ||
| "bulkArchiveItems": { | ||
| "message": "Items archived" | ||
| }, | ||
| "bulkUnarchiveItems": { | ||
| "message": "Items unarchived" | ||
| }, | ||
| "moveSelectedItemsDesc": { | ||
| "message": "Choose a folder that you would like to add the $COUNT$ selected item(s) to.", | ||
| "placeholders": { | ||
| "count": { | ||
| "content": "$1", | ||
| "example": "150" | ||
| } | ||
| } | ||
| }, | ||
| "selectFolder": { | ||
| "message": "Select folder" | ||
| }, | ||
| "restartPremium": { | ||
| "message": "Restart Premium" | ||
| }, | ||
|
|
@@ -5366,5 +5504,26 @@ | |
| }, | ||
| "cannotSaveItemNoConfirmedOrgs": { | ||
| "message": "Unable to save item. You must be confirmed to the organization to save items." | ||
| }, | ||
| "addToFolder": { | ||
| "message": "Add to folder" | ||
| }, | ||
| "deleteCollection": { | ||
| "message": "Delete collection" | ||
| }, | ||
| "deleteCollectionsCount": { | ||
| "message": "Delete $COUNT$ collections", | ||
| "placeholders": { | ||
| "count": { | ||
| "content": "$1", | ||
| "example": "3" | ||
| } | ||
| } | ||
| }, | ||
| "deleteCollectionDesc": { | ||
| "message": "This collection will be permanently deleted." | ||
| }, | ||
| "deleteCollectionsDesc": { | ||
| "message": "These collections will be permanently deleted." | ||
| } | ||
| } | ||
28 changes: 28 additions & 0 deletions
28
...p/src/vault/app/vault-v3/bulk-action-dialogs/assign-collections-desktop-dialog.adapter.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| import { Injectable, inject } from "@angular/core"; | ||
| import { lastValueFrom } from "rxjs"; | ||
|
|
||
| import { DialogService } from "@bitwarden/components"; | ||
| import { | ||
| AssignCollectionsDialogRef, | ||
| AssignCollectionsParams, | ||
| AssignCollectionsResult, | ||
| CollectionAssignmentParams, | ||
| CollectionAssignmentResult, | ||
| } from "@bitwarden/vault"; | ||
|
|
||
| import { AssignCollectionsDesktopComponent } from "../../vault/assign-collections"; | ||
|
|
||
| @Injectable() | ||
| export class AssignCollectionsDesktopDialogAdapter implements AssignCollectionsDialogRef { | ||
| private readonly dialogService = inject(DialogService); | ||
|
|
||
| async open(params: AssignCollectionsParams): Promise<AssignCollectionsResult> { | ||
| const dialog = AssignCollectionsDesktopComponent.open(this.dialogService, { | ||
| data: params as CollectionAssignmentParams, | ||
| }); | ||
| const result = await lastValueFrom(dialog.closed); | ||
| return result === CollectionAssignmentResult.Saved | ||
| ? AssignCollectionsResult.Saved | ||
| : AssignCollectionsResult.Canceled; | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 think we can use the opportunity to align to the new dialog designs. I already started with this for the web e1868e7
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.
Added e7fd8c2. You have
BulkDeleteServicein theapps/web, could it be moved tolibs/vaultso that I could reuse that as well?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.
Yeah that makes sense
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.
Moved here 4964f6a