LP1879517 FM editor field validator override example

Signed-off-by: Bill Erickson <berickxx@gmail.com>

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 af9f5f0..3919a2f 100644 (file)
--- 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
@@ -203,7 +203,7 @@
     </ng-container>
 
     <button type="button" class="btn btn-info" 
-      [disabled]="fmEditForm.invalid" *ngIf="mode != 'view'"
+      [disabled]="fmEditForm.invalid || fieldIsInvalid()" *ngIf="mode != 'view'"
       (click)="save()" i18n>Save</button>
   </div>
 </ng-template>

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 4ac2e2e..1731b22 100644 (file)
--- 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
@@ -73,6 +73,8 @@ export interface FmFieldOptions {
     // This supersedes all other isReadonly specifiers.
     isReadonlyOverride?: (field: string, record: IdlObject) => boolean;
 
+    isValidOverride: (field: string, record: IdlObject) => boolean;
+
     // Render the field using this custom template instead of chosing
     // from the default set of form inputs.
     customTemplate?: CustomFieldTemplate;
@@ -452,6 +454,23 @@ export class FmRecordEditorComponent
         });
     }
 
+    fieldIsInvalid(): boolean {
+
+        // todo: encapsulate this to avoid duplication w/ above.
+        const fields = this.idlDef.fields.filter(f =>
+            !f.virtual && !this.hiddenFieldsList.includes(f.name));
+
+        let invalid = false;
+        fields.forEach(field => {
+            const fieldOptions = this.fieldOptions[field.name] || {};
+            if (!fieldOptions.isValidOverride(field.name, this.record)) {
+                invalid = true;
+            }
+        });
+
+        return invalid;
+    }
+
     private constructOneField(field: any): Promise<any> {
 
         let promise = null;