From f27ed6fdad7d94c0420a350fd542a3180eec2eae Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 14 Aug 2019 16:45:20 -0400 Subject: [PATCH] LP1840050 FM Editor WIP Signed-off-by: Bill Erickson --- .../share/fm-editor/fm-editor-action.component.ts | 31 +++++++++++++++++++ .../app/share/fm-editor/fm-editor.component.html | 18 ++++++++++- .../src/app/share/fm-editor/fm-editor.component.ts | 35 ++++++++++++++++++++-- .../src/app/share/fm-editor/fm-editor.module.ts | 7 +++-- 4 files changed, 86 insertions(+), 5 deletions(-) create mode 100644 Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor-action.component.ts diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor-action.component.ts b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor-action.component.ts new file mode 100644 index 0000000000..298856d684 --- /dev/null +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor-action.component.ts @@ -0,0 +1,31 @@ +import {Component, Input, Output, EventEmitter, Host, OnInit} from '@angular/core'; +import {FmRecordEditorComponent} from './fm-editor.component'; + +@Component({ + selector: 'eg-fm-record-editor-action', + template: '' // no-op +}) + +export class FmRecordEditorActionComponent implements OnInit { + + // unique identifier + @Input() key: string; + + @Input() label: string; + + @Input() buttonCss = 'btn-outline-dark'; + + // Emits the 'key' of the clicked action. + @Output() actionClick: EventEmitter; + + @Input() disabled: boolean; + + constructor(@Host() private editor: FmRecordEditorComponent) { + this.actionClick = new EventEmitter(); + } + + ngOnInit() { + this.editor.actions.push(this); + } +} + diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html index 2621b3e948..afae0effb1 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html @@ -4,6 +4,11 @@ + + +

Record Editor: {{recordLabel}}

@@ -141,7 +146,7 @@ [required]="field.isRequired()" [entries]="field.linkedValues" [asyncDataSource]="field.linkedValuesSource" - [startId]="record[field.name]()" + [selectedId]="record[field.name]()" (onChange)="record[field.name]($event ? $event.id : null)"> @@ -160,12 +165,23 @@
+ + + + + + diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts index 674d348737..aa65a9313c 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts @@ -11,6 +11,8 @@ import {StringComponent} from '@eg/share/string/string.component'; import {NgbModal} from '@ng-bootstrap/ng-bootstrap'; import {ComboboxEntry} from '@eg/share/combobox/combobox.component'; import {TranslateComponent} from '@eg/share/translate/translate.component'; +import {FmRecordEditorActionComponent} from './fm-editor-action.component'; +import {ConfirmDialogComponent} from '@eg/share/dialog/confirm.component'; interface CustomFieldTemplate { @@ -125,6 +127,9 @@ export class FmRecordEditorComponent // Emit the modified object when the save action completes. @Output() recordSaved = new EventEmitter(); + // Emit the modified object when the save action completes. + @Output() recordDeleted = new EventEmitter(); + // Emit the original object when the save action is canceled. @Output() recordCanceled = new EventEmitter(); @@ -134,6 +139,7 @@ export class FmRecordEditorComponent @ViewChild('translator') private translator: TranslateComponent; @ViewChild('successStr') successStr: StringComponent; @ViewChild('failStr') failStr: StringComponent; + @ViewChild('confirmDel') confirmDel: ConfirmDialogComponent; // IDL info for the the selected IDL class idlDef: any; @@ -159,7 +165,7 @@ export class FmRecordEditorComponent // is actionable. This allows the caller to use both @Input()'s // without each clobbering the other. - // Record ID to view/update. + // Record ID to view/update. _recordId: any = null; @Input() set recordId(id: any) { if (id) { @@ -195,6 +201,8 @@ export class FmRecordEditorComponent return this._record; } + actions: FmRecordEditorActionComponent[] = []; + initDone: boolean; // Comma-separated list of field names defining the order in which @@ -202,6 +210,9 @@ export class FmRecordEditorComponent // will be rendered alphabetically by label after the named fields. @Input() fieldOrder: string; + // When true, show a delete button and support delete operations. + @Input() showDelete: boolean; + constructor( private modal: NgbModal, // required for passing to parent private idl: IdlService, @@ -332,7 +343,8 @@ export class FmRecordEditorComponent // Modifies the provided FM record in place, replacing JS values // with IDL-compatible values. convertDatatypesToIdl(rec: IdlObject) { - const fields = this.idlDef.fields; + const fields = this.idlDef.fields.filter(f => !f.virtual); + fields.forEach(field => { if (field.datatype === 'bool') { if (rec[field.name]() === true) { @@ -566,6 +578,25 @@ export class FmRecordEditorComponent ); } + remove() { + this.confirmDel.open().subscribe(confirmed => { + if (!confirmed) { return; } + const recToRemove = this.idl.clone(this.record); + this.pcrud.remove(recToRemove).toPromise().then( + result => { + this.recordDeleted.emit(result); + this.successStr.current().then(msg => this.toast.success(msg)); + if (this.isDialog()) { this.close(result); } + }, + error => { + this.recordError.emit(error); + this.failStr.current().then(msg => this.toast.warning(msg)); + if (this.isDialog()) { this.error(error); } + } + ); + }); + } + cancel() { this.recordCanceled.emit(this.record); this.close(); diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.module.ts b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.module.ts index 7be4cf8525..6e9c5c3ec8 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.module.ts +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.module.ts @@ -4,11 +4,13 @@ import {CommonWidgetsModule} from '@eg/share/common-widgets.module'; import {StringModule} from '@eg/share/string/string.module'; import {TranslateModule} from '@eg/share/translate/translate.module'; import {FmRecordEditorComponent} from './fm-editor.component'; +import {FmRecordEditorActionComponent} from './fm-editor-action.component'; @NgModule({ declarations: [ - FmRecordEditorComponent + FmRecordEditorComponent, + FmRecordEditorActionComponent ], imports: [ EgCommonModule, @@ -17,7 +19,8 @@ import {FmRecordEditorComponent} from './fm-editor.component'; CommonWidgetsModule ], exports: [ - FmRecordEditorComponent + FmRecordEditorComponent, + FmRecordEditorActionComponent ], providers: [ ] -- 2.11.0