From e20a75eb0c085e1e89d28a7b15ce0148a75e32bd Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 23 Oct 2018 10:33:40 -0400 Subject: [PATCH] use share component from jslib --- jslib | 2 +- src/app/vault/share.component.ts | 88 +++----------------------------- 2 files changed, 9 insertions(+), 81 deletions(-) diff --git a/jslib b/jslib index 0a36a211c3..89c23522d5 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 0a36a211c355ada433ce9b0560c5ab85a6cead23 +Subproject commit 89c23522d5697c722dcbe7d074cd12ebb6dc8783 diff --git a/src/app/vault/share.component.ts b/src/app/vault/share.component.ts index 74c979589e..336610fa98 100644 --- a/src/app/vault/share.component.ts +++ b/src/app/vault/share.component.ts @@ -1,94 +1,33 @@ import { Component, - EventEmitter, - Input, OnDestroy, - OnInit, - Output, } from '@angular/core'; -import { ToasterService } from 'angular2-toaster'; -import { Angulartics2 } from 'angulartics2'; - import { CipherService } from 'jslib/abstractions/cipher.service'; import { CollectionService } from 'jslib/abstractions/collection.service'; import { I18nService } from 'jslib/abstractions/i18n.service'; +import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { UserService } from 'jslib/abstractions/user.service'; -import { Organization } from 'jslib/models/domain/organization'; -import { CipherView } from 'jslib/models/view/cipherView'; import { CollectionView } from 'jslib/models/view/collectionView'; +import { ShareComponent as BaseShareComponent } from 'jslib/angular/components/share.component'; + @Component({ selector: 'app-vault-share', templateUrl: 'share.component.html', }) -export class ShareComponent implements OnInit, OnDestroy { - @Input() cipherId: string; - @Input() organizationId: string; - @Output() onSharedCipher = new EventEmitter(); - - formPromise: Promise; - cipher: CipherView; - collections: CollectionView[] = []; - organizations: Organization[] = []; - - private writeableCollections: CollectionView[] = []; - - constructor(private collectionService: CollectionService, private analytics: Angulartics2, - private toasterService: ToasterService, private i18nService: I18nService, - private userService: UserService, private cipherService: CipherService) { } - - async ngOnInit() { - const cipherDomain = await this.cipherService.get(this.cipherId); - this.cipher = await cipherDomain.decrypt(); - const allCollections = await this.collectionService.getAllDecrypted(); - this.writeableCollections = allCollections.filter((c) => !c.readOnly); - this.organizations = await this.userService.getAllOrganizations(); - if (this.organizationId == null && this.organizations.length > 0) { - this.organizationId = this.organizations[0].id; - } - this.filterCollections(); +export class ShareComponent extends BaseShareComponent implements OnDestroy { + constructor(collectionService: CollectionService, platformUtilsService: PlatformUtilsService, + i18nService: I18nService, userService: UserService, + cipherService: CipherService) { + super(collectionService, platformUtilsService, i18nService, userService, cipherService); } ngOnDestroy() { this.selectAll(false); } - filterCollections() { - this.selectAll(false); - if (this.organizationId == null || this.writeableCollections.length === 0) { - this.collections = []; - } else { - this.collections = this.writeableCollections.filter((c) => c.organizationId === this.organizationId); - } - } - - async submit() { - const cipherDomain = await this.cipherService.get(this.cipherId); - const cipherView = await cipherDomain.decrypt(); - - const attachmentPromises: Array> = []; - if (cipherView.attachments != null) { - for (const attachment of cipherView.attachments) { - const promise = this.cipherService.shareAttachmentWithServer(attachment, - cipherView.id, this.organizationId); - attachmentPromises.push(promise); - } - } - - const checkedCollectionIds = this.collections.filter((c) => (c as any).checked).map((c) => c.id); - try { - this.formPromise = Promise.all(attachmentPromises).then(async () => { - await this.cipherService.shareWithServer(cipherView, this.organizationId, checkedCollectionIds); - this.onSharedCipher.emit(); - this.analytics.eventTrack.next({ action: 'Shared Cipher' }); - this.toasterService.popAsync('success', null, this.i18nService.t('sharedItem')); - }); - await this.formPromise; - } catch { } - } - check(c: CollectionView, select?: boolean) { (c as any).checked = select == null ? !(c as any).checked : select; } @@ -97,15 +36,4 @@ export class ShareComponent implements OnInit, OnDestroy { const collections = select ? this.collections : this.writeableCollections; collections.forEach((c) => this.check(c, select)); } - - get canSave() { - if (this.collections != null) { - for (let i = 0; i < this.collections.length; i++) { - if ((this.collections[i] as any).checked) { - return true; - } - } - } - return false; - } }