FIO-9258: separated webform options from angular webform options, fix some eslint errors, fix form options type

projects/angular-formio/embed/src/builder.component.ts

@@ -1,5 +1,5 @@
 import { Component, ElementRef, Input, ViewChild, Output, EventEmitter, AfterViewInit } from '@angular/core';
-import { FormBuilder } from '@formio/js';
+import {Form, FormBuilder, Webform} from '@formio/js';
 import WebformBuilder from '@formio/js/lib/cjs/WebformBuilder';
 
 @Component({
@@ -8,8 +8,8 @@ import WebformBuilder from '@formio/js/lib/cjs/WebformBuilder';
 })
 export class FormioBuilder implements AfterViewInit {
     @ViewChild('formio') element: ElementRef;
-    @Input() form?: Object | null;
-    @Input() options?: Object = {};
+    @Input() form?: Form['options'] | null;
+    @Input() options?: FormBuilder['options'] = {};
     @Output() change = new EventEmitter<any>();
     @Output() ready = new EventEmitter<any>();
     @Output() error = new EventEmitter<any>();
@@ -65,4 +65,4 @@ export class FormioBuilder implements AfterViewInit {
             this.ready.emit(this.instance);
         }).catch((err) => this.error.emit(err));
     }
-}
+}

projects/angular-formio/embed/src/formio.component.ts

@@ -1,17 +1,17 @@
 import { Component, ViewChild, ElementRef, Input, Output, EventEmitter, OnChanges, AfterViewInit } from '@angular/core';
-import { FormioCore as Formio, Webform } from '@formio/js';
-import { Form, Submission } from '@formio/core/types'
+import { FormioCore as Formio, Webform, Form } from '@formio/js';
+import { Form as formType, Submission } from '@formio/core/types';
 
 @Component({
     selector: 'formio',
     template: '<div #formio></div>'
 })
 export class FormioComponent implements AfterViewInit {
     @Input() src?: string;
-    @Input() form?: Form | null;
+    @Input() form?: formType | null;
     @Input() submission?: Submission | null;
     @Input() url?: string;
-    @Input() options?: Webform["options"] = {};
+    @Input() options?: Form['options'] = {};
     @Output() ready = new EventEmitter<Webform>();
     @Output() submit = new EventEmitter<object>();
     @Output() error = new EventEmitter<any>();
@@ -33,4 +33,4 @@ export class FormioComponent implements AfterViewInit {
             form.on('change', (event) => this.change.emit(event));
         }).catch((err) => this.error.emit(err));
     }
-}
+}

projects/angular-formio/src/FormioBaseComponent.ts

@@ -2,10 +2,10 @@ import { Component, ElementRef, EventEmitter, Input, NgZone, OnChanges, OnDestro
 import { FormioService } from './formio.service';
 import { FormioAlerts } from './components/alerts/formio.alerts';
 import { FormioAppConfig } from './formio.config';
-import { FormioError, FormioForm, FormioOptions, FormioRefreshValue } from './formio.common';
+import {AngularFormioOptions, FormioError, FormioForm, FormioRefreshValue} from './formio.common';
 import { assign, get, isEmpty } from 'lodash';
 import { CustomTagsService } from './custom-tags.service';
-import { Utils } from '@formio/js';
+import {Form, Utils, Webform} from '@formio/js';
 import { AlertsPosition } from './types/alerts-position';
 const { Evaluator, fastCloneDeep } = Utils;
 
@@ -18,7 +18,7 @@ export class FormioBaseComponent implements OnInit, OnChanges, OnDestroy {
   @Input() src?: string;
   @Input() url?: string;
   @Input() service?: FormioService;
-  @Input() options?: FormioOptions;
+  @Input() options?: Form['options'] & AngularFormioOptions;
   @Input() noeval ? = Evaluator.noeval;
   @Input() formioOptions?: any;
   @Input() renderOptions?: any;
@@ -34,7 +34,7 @@ export class FormioBaseComponent implements OnInit, OnChanges, OnDestroy {
   @Input() hooks?: any = {};
   @Input() renderer?: any;
   @Input() watchSubmissionErrors ? = false;
-  @Input() dataTableActions? : any = []
+  @Input() dataTableActions?: any = [];
   @Output() render = new EventEmitter<object>();
   @Output() customEvent = new EventEmitter<object>();
   @Output() fileUploadingStatus = new EventEmitter<string>();
@@ -213,7 +213,7 @@ export class FormioBaseComponent implements OnInit, OnChanges, OnDestroy {
     }
 
     const extraTags = this.customTags ? this.customTags.tags : [];
-    const defaultOptions: FormioOptions = {
+    const defaultOptions: Form['options'] & AngularFormioOptions = {
       errors: {
         message: 'Please fix the following errors before submitting.'
       },

projects/angular-formio/src/components/formbuilder/formbuilder.component.ts

@@ -14,8 +14,8 @@ import {
 } from '@angular/core';
 import { FormioAppConfig } from '../../formio.config';
 import {
+  AngularFormioOptions,
   FormioForm,
-  FormioOptions
 } from '../../formio.common';
 import { Formio, FormBuilder, Utils } from '@formio/js';
 import { assign } from 'lodash';
@@ -38,7 +38,7 @@ export class FormBuilderComponent implements OnInit, OnChanges, OnDestroy {
   public componentAdding = false;
   private refreshSubscription: Subscription;
   @Input() form?: FormioForm;
-  @Input() options?: FormioOptions;
+  @Input() options?: FormBuilder['options'] & AngularFormioOptions;
   @Input() formbuilder?: any;
   @Input() noeval ? = false;
   @Input() refresh?: Observable<void>;

projects/angular-formio/src/formio.common.ts

@@ -18,12 +18,12 @@ export interface AccessSetting {
 }
 
 export interface FormioReport {
-  form: string,
-  roles: object,
-  access: object,
-  metadata: object,
-  data: object,
-  project: string,
+  form: string;
+  roles: object;
+  access: object;
+  metadata: object;
+  data: object;
+  project: string;
 }
 
 export interface FormioForm {
@@ -38,7 +38,7 @@ export interface FormioForm {
   tags?: string[];
   access?: AccessSetting[];
   submissionAccess?: AccessSetting[];
-  report?: FormioReport
+  report?: FormioReport;
 }
 
 export interface ComponentInstance {
@@ -78,13 +78,9 @@ export interface FormioHookOptions {
   beforeSubmit: FormioBeforeSubmit;
 }
 
-export interface FormioOptions {
+export interface AngularFormioOptions {
   errors?: ErrorsOptions;
   alerts?: AlertsOptions;
   alertsPosition?: AlertsPosition;
   disableAlerts?: boolean;
-  i18n?: object;
-  fileService?: object;
-  hooks?: FormioHookOptions;
-  sanitizeConfig?: any;
 }