From 3edf76154969e810d137112aae58533416b379d4 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 12 Jun 2018 17:33:08 -0400 Subject: [PATCH] bulk move --- src/app/app.module.ts | 3 ++ src/app/vault/bulk-delete.component.html | 2 +- src/app/vault/bulk-move.component.html | 30 ++++++++++++++++ src/app/vault/bulk-move.component.ts | 46 ++++++++++++++++++++++++ src/app/vault/vault.component.ts | 23 ++++++++++-- src/locales/en/messages.json | 9 +++++ 6 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 src/app/vault/bulk-move.component.html create mode 100644 src/app/vault/bulk-move.component.ts diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a62eea6336..f535650c37 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -36,6 +36,7 @@ import { ToolsComponent } from './tools/tools.component'; import { AddEditComponent } from './vault/add-edit.component'; import { AttachmentsComponent } from './vault/attachments.component'; import { BulkDeleteComponent } from './vault/bulk-delete.component'; +import { BulkMoveComponent } from './vault/bulk-move.component'; import { CiphersComponent } from './vault/ciphers.component'; import { CollectionsComponent } from './vault/collections.component'; import { FolderAddEditComponent } from './vault/folder-add-edit.component'; @@ -83,6 +84,7 @@ import { Folder } from 'jslib/models/domain'; BlurClickDirective, BoxRowDirective, BulkDeleteComponent, + BulkMoveComponent, CiphersComponent, CollectionsComponent, ExportComponent, @@ -118,6 +120,7 @@ import { Folder } from 'jslib/models/domain'; AddEditComponent, AttachmentsComponent, BulkDeleteComponent, + BulkMoveComponent, CollectionsComponent, FolderAddEditComponent, ModalComponent, diff --git a/src/app/vault/bulk-delete.component.html b/src/app/vault/bulk-delete.component.html index 0b26cec73c..be51815063 100644 --- a/src/app/vault/bulk-delete.component.html +++ b/src/app/vault/bulk-delete.component.html @@ -1,5 +1,5 @@
-
+

diff --git a/src/app/vault/bulk-move.component.html b/src/app/vault/bulk-move.component.html new file mode 100644 index 0000000000..ae79af8ffb --- /dev/null +++ b/src/app/vault/bulk-move.component.html @@ -0,0 +1,30 @@ +
+
+ +
+

+ {{'moveSelected' | i18n}} +

+ +
+
+

{{'moveSelectedItemsDesc' | i18n: cipherIds.length}}

+
+ + +
+
+
+ + +
+ +
+
diff --git a/src/app/vault/bulk-move.component.ts b/src/app/vault/bulk-move.component.ts new file mode 100644 index 0000000000..c5b6d62885 --- /dev/null +++ b/src/app/vault/bulk-move.component.ts @@ -0,0 +1,46 @@ +import { + Component, + EventEmitter, + Input, + OnInit, + Output, +} from '@angular/core'; + +import { ToasterService } from 'angular2-toaster'; +import { Angulartics2 } from 'angulartics2'; + +import { CipherService } from 'jslib/abstractions/cipher.service'; +import { FolderService } from 'jslib/abstractions/folder.service'; +import { I18nService } from 'jslib/abstractions/i18n.service'; + +import { FolderView } from 'jslib/models/view/folderView'; + +@Component({ + selector: 'app-vault-bulk-move', + templateUrl: 'bulk-move.component.html', +}) +export class BulkMoveComponent implements OnInit { + @Input() cipherIds: string[] = []; + @Output() onMoved = new EventEmitter(); + + folderId: string = null; + folders: FolderView[] = []; + formPromise: Promise; + + constructor(private analytics: Angulartics2, private cipherService: CipherService, + private toasterService: ToasterService, private i18nService: I18nService, + private folderService: FolderService) { } + + async ngOnInit() { + this.folders = await this.folderService.getAllDecrypted(); + this.folderId = this.folders[0].id; + } + + async submit() { + this.formPromise = this.cipherService.moveManyWithServer(this.cipherIds, this.folderId); + await this.formPromise; + this.onMoved.emit(); + this.analytics.eventTrack.next({ action: 'Bulk Moved Items' }); + this.toasterService.popAsync('success', null, this.i18nService.t('movedItems')); + } +} diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts index f7fa729091..5a893f6457 100644 --- a/src/app/vault/vault.component.ts +++ b/src/app/vault/vault.component.ts @@ -30,6 +30,7 @@ import { ShareComponent } from './share.component'; import { I18nService } from 'jslib/abstractions/i18n.service'; import { SyncService } from 'jslib/abstractions/sync.service'; +import { BulkMoveComponent } from './bulk-move.component'; @Component({ selector: 'app-vault', @@ -45,6 +46,7 @@ export class VaultComponent implements OnInit { @ViewChild('share', { read: ViewContainerRef }) shareModalRef: ViewContainerRef; @ViewChild('collections', { read: ViewContainerRef }) collectionsModalRef: ViewContainerRef; @ViewChild('bulkDeleteTemplate', { read: ViewContainerRef }) bulkDeleteModalRef: ViewContainerRef; + @ViewChild('bulkMoveTemplate', { read: ViewContainerRef }) bulkMoveModalRef: ViewContainerRef; cipherId: string = null; favorites: boolean = false; @@ -286,8 +288,7 @@ export class VaultComponent implements OnInit { const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent); this.modal = this.bulkDeleteModalRef.createComponent(factory).instance; - const childComponent = this.modal.show( - BulkDeleteComponent, this.bulkDeleteModalRef); + const childComponent = this.modal.show(BulkDeleteComponent, this.bulkDeleteModalRef); childComponent.cipherIds = this.ciphersComponent.getSelected(); childComponent.onDeleted.subscribe(async () => { @@ -305,7 +306,23 @@ export class VaultComponent implements OnInit { } bulkMove() { - // + if (this.modal != null) { + this.modal.close(); + } + + const factory = this.componentFactoryResolver.resolveComponentFactory(ModalComponent); + this.modal = this.bulkMoveModalRef.createComponent(factory).instance; + const childComponent = this.modal.show(BulkMoveComponent, this.bulkMoveModalRef); + + childComponent.cipherIds = this.ciphersComponent.getSelected(); + childComponent.onMoved.subscribe(async () => { + this.modal.close(); + await this.ciphersComponent.refresh(); + }); + + this.modal.onClosed.subscribe(() => { + this.modal = null; + }); } selectAll(select: boolean) { diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index c08293f28e..42d928849d 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -682,5 +682,14 @@ "example": "150" } } + }, + "moveSelectedItemsDesc": { + "message": "Choose a folder that you would like to move the $COUNT$ selected item(s) to.", + "placeholders": { + "count": { + "content": "$1", + "example": "150" + } + } } }