mirror of
https://github.com/bitwarden/browser.git
synced 2024-11-07 09:31:31 +01:00
move folder add/edit to jslib
This commit is contained in:
parent
9d366856bb
commit
65d73f2727
2
jslib
2
jslib
@ -1 +1 @@
|
|||||||
Subproject commit 2782ae33fcd60f9b84396e54a7d08cfa583f47be
|
Subproject commit df9074a0e58a1b4a499a0682e964013b546d786f
|
@ -1,10 +1,4 @@
|
|||||||
import {
|
import { Component } from '@angular/core';
|
||||||
Component,
|
|
||||||
EventEmitter,
|
|
||||||
Input,
|
|
||||||
OnInit,
|
|
||||||
Output,
|
|
||||||
} from '@angular/core';
|
|
||||||
|
|
||||||
import { ToasterService } from 'angular2-toaster';
|
import { ToasterService } from 'angular2-toaster';
|
||||||
import { Angulartics2 } from 'angulartics2';
|
import { Angulartics2 } from 'angulartics2';
|
||||||
@ -13,72 +7,18 @@ import { FolderService } from 'jslib/abstractions/folder.service';
|
|||||||
import { I18nService } from 'jslib/abstractions/i18n.service';
|
import { I18nService } from 'jslib/abstractions/i18n.service';
|
||||||
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
|
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
|
||||||
|
|
||||||
import { FolderView } from 'jslib/models/view/folderView';
|
import {
|
||||||
|
FolderAddEditComponent as BaseFolderAddEditComponent,
|
||||||
|
} from 'jslib/angular/components/folder-add-edit.component';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-folder-add-edit',
|
selector: 'app-folder-add-edit',
|
||||||
templateUrl: 'folder-add-edit.component.html',
|
templateUrl: 'folder-add-edit.component.html',
|
||||||
})
|
})
|
||||||
export class FolderAddEditComponent implements OnInit {
|
export class FolderAddEditComponent extends BaseFolderAddEditComponent {
|
||||||
@Input() folderId: string;
|
constructor(folderService: FolderService, i18nService: I18nService,
|
||||||
@Output() onSavedFolder = new EventEmitter<FolderView>();
|
analytics: Angulartics2, toasterService: ToasterService,
|
||||||
@Output() onDeletedFolder = new EventEmitter<FolderView>();
|
platformUtilsService: PlatformUtilsService) {
|
||||||
|
super(folderService, i18nService, analytics, toasterService, platformUtilsService);
|
||||||
editMode: boolean = false;
|
|
||||||
folder: FolderView = new FolderView();
|
|
||||||
title: string;
|
|
||||||
formPromise: Promise<any>;
|
|
||||||
deletePromise: Promise<any>;
|
|
||||||
|
|
||||||
constructor(private folderService: FolderService, private i18nService: I18nService,
|
|
||||||
private analytics: Angulartics2, private toasterService: ToasterService,
|
|
||||||
private platformUtilsService: PlatformUtilsService) { }
|
|
||||||
|
|
||||||
async ngOnInit() {
|
|
||||||
this.editMode = this.folderId != null;
|
|
||||||
|
|
||||||
if (this.editMode) {
|
|
||||||
this.editMode = true;
|
|
||||||
this.title = this.i18nService.t('editFolder');
|
|
||||||
const folder = await this.folderService.get(this.folderId);
|
|
||||||
this.folder = await folder.decrypt();
|
|
||||||
} else {
|
|
||||||
this.title = this.i18nService.t('addFolder');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async submit() {
|
|
||||||
if (this.folder.name == null || this.folder.name === '') {
|
|
||||||
this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'),
|
|
||||||
this.i18nService.t('nameRequired'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const folder = await this.folderService.encrypt(this.folder);
|
|
||||||
this.formPromise = this.folderService.saveWithServer(folder);
|
|
||||||
await this.formPromise;
|
|
||||||
this.analytics.eventTrack.next({ action: this.editMode ? 'Edited Folder' : 'Added Folder' });
|
|
||||||
this.toasterService.popAsync('success', null,
|
|
||||||
this.i18nService.t(this.editMode ? 'editedFolder' : 'addedFolder'));
|
|
||||||
this.onSavedFolder.emit(this.folder);
|
|
||||||
} catch { }
|
|
||||||
}
|
|
||||||
|
|
||||||
async delete() {
|
|
||||||
const confirmed = await this.platformUtilsService.showDialog(
|
|
||||||
this.i18nService.t('deleteFolderConfirmation'), this.i18nService.t('deleteFolder'),
|
|
||||||
this.i18nService.t('yes'), this.i18nService.t('no'), 'warning');
|
|
||||||
if (!confirmed) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.deletePromise = this.folderService.deleteWithServer(this.folder.id);
|
|
||||||
await this.deletePromise;
|
|
||||||
this.analytics.eventTrack.next({ action: 'Deleted Folder' });
|
|
||||||
this.toasterService.popAsync('success', null, this.i18nService.t('deletedFolder'));
|
|
||||||
this.onDeletedFolder.emit(this.folder);
|
|
||||||
} catch { }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user