@formio/js 5.0.0-dev.5588.0f690c8 → 5.0.0-dev.5592.bb7e96a

package/dist/formio.utils.min.js.LICENSE.txt

@@ -12,6 +12,8 @@
 
 /*! @license DOMPurify 3.1.0 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.0/LICENSE */
 
+/*! @license DOMPurify 3.1.4 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.4/LICENSE */
+
 /*! formiojs v5.0.0-rc.43 | https://unpkg.com/formiojs@5.0.0-rc.43/LICENSE.txt */
 
 /**

package/lib/cjs/Webform.js

@@ -291,12 +291,19 @@ class Webform extends NestedDataComponent_1.default {
         // Set language after everything is established.
         this.language = this.i18next.language;
         // See if we need to restore the draft from a user.
-        if (this.options.saveDraft && !this.options.skipDraftRestore) {
+        if (this.options.saveDraft) {
             this.formReady.then(() => {
-                const user = Formio_1.Formio.getUser();
-                // Only restore a draft if the submission isn't explicitly set.
-                if (user && !this.submissionSet) {
-                    this.restoreDraft(user._id);
+                if (!this.options.skipDraftRestore) {
+                    const user = Formio_1.Formio.getUser();
+                    // Only restore a draft if the submission isn't explicitly set.
+                    if (user && !this.submissionSet) {
+                        this.restoreDraft(user._id);
+                    }
+                }
+                else {
+                    // Enable drafts
+                    this.draftEnabled = true;
+                    this.savingDraft = false;
                 }
             });
         }
@@ -750,7 +757,7 @@ class Webform extends NestedDataComponent_1.default {
         }
         const draft = (0, utils_1.fastCloneDeep)(this.submission);
         draft.state = 'draft';
-        if (!this.savingDraft) {
+        if (!this.savingDraft && !this.submitting) {
             this.emit('saveDraftBegin');
             this.savingDraft = true;
             this.formio.saveSubmission(draft).then((sub) => {
@@ -823,7 +830,9 @@ class Webform extends NestedDataComponent_1.default {
             };
         }
         // Metadata needs to be available before setValue
-        this._submission.metadata = submission.metadata || {};
+        this._submission.metadata = submission.metadata
+            ? lodash_1.default.cloneDeep(submission.metadata)
+            : {};
         this.editing = !!submission._id;
         // Set the timezone in the options if available.
         if (!this.options.submissionTimezone &&

package/lib/cjs/WebformBuilder.js

@@ -1119,16 +1119,11 @@ class WebformBuilder extends Component_1.default {
         const repeatablePaths = this.findRepeatablePaths();
         let hasInvalidComponents = false;
         this.webform.everyComponent((comp) => {
-            var _a;
             const path = comp.path;
-            const errors = comp.visibleErrors || [];
             if (repeatablePaths.includes(path)) {
-                comp.setCustomValidity(`API Key is not unique: ${comp.key}`);
+                comp.setCustomValidity(this.t('apiKey', { key: comp.key }));
                 hasInvalidComponents = true;
             }
-            else if (errors.length && ((_a = errors[0].message) === null || _a === void 0 ? void 0 : _a.startsWith('API Key is not unique'))) {
-                comp.setCustomValidity('');
-            }
         });
         this.emit('builderFormValidityChange', hasInvalidComponents);
     }

package/lib/cjs/components/_classes/component/Component.d.ts

@@ -492,10 +492,12 @@ declare class Component extends Element {
     /**
      * Add a new input error to this element.
      *
-     * @param message
-     * @param dirty
+     * @param {{level: string, message: string}[]} messages
      */
-    addMessages(messages: any): void;
+    addMessages(messages: {
+        level: string;
+        message: string;
+    }[]): void;
     setErrorClasses(elements: any, dirty: any, hasErrors: any, hasMessages: any, element?: any): void;
     setElementInvalid(element: any, invalid: any): void;
     clearOnHide(): void;

package/lib/cjs/components/_classes/component/Component.js

@@ -1831,8 +1831,7 @@ class Component extends Element_1.default {
     /**
      * Add a new input error to this element.
      *
-     * @param message
-     * @param dirty
+     * @param {{level: string, message: string}[]} messages
      */
     addMessages(messages) {
         if (!messages) {

package/lib/cjs/components/checkbox/Checkbox.js

@@ -179,15 +179,8 @@ class CheckBoxComponent extends Field_1.default {
         return value;
     }
     setValue(value, flags = {}) {
-        if (this.setCheckedState(value) !== undefined ||
-            (!this.input && value !== undefined && (this.visible || this.conditionallyVisible() || !this.component.clearOnHide))) {
-            const changed = this.updateValue(value, flags);
-            if (this.isHtmlRenderMode() && flags && flags.fromSubmission && changed) {
-                this.redraw();
-            }
-            return changed;
-        }
-        return false;
+        this.setCheckedState(value);
+        return super.setValue(value, flags);
     }
     getValueAsString(value) {
         const { name: componentName, value: componentValue } = this.component;

package/lib/cjs/components/checkbox/fixtures/comp5.d.ts

@@ -0,0 +1,34 @@
+declare namespace _default {
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        validateWhenHidden: boolean;
+        key: string;
+        conditional: {
+            show: boolean;
+            conjunction: string;
+            conditions: {
+                component: string;
+                operator: string;
+            }[];
+        };
+        type: string;
+        input: boolean;
+        applyMaskOn?: undefined;
+    } | {
+        label: string;
+        applyMaskOn: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        validateWhenHidden?: undefined;
+        conditional?: undefined;
+    })[];
+}
+export default _default;

package/lib/cjs/components/checkbox/fixtures/comp5.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    title: '7595',
+    name: '7595',
+    path: '7595',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Checkbox',
+            tableView: false,
+            validateWhenHidden: false,
+            key: 'checkboxBefore',
+            conditional: {
+                show: true,
+                conjunction: 'all',
+                conditions: [
+                    {
+                        component: 'textField',
+                        operator: 'isNotEmpty'
+                    }
+                ]
+            },
+            type: 'checkbox',
+            input: true
+        },
+        {
+            label: 'Text Field',
+            applyMaskOn: 'change',
+            tableView: true,
+            key: 'textField',
+            type: 'textfield',
+            input: true
+        },
+        {
+            label: 'Checkbox',
+            tableView: false,
+            validateWhenHidden: false,
+            key: 'checkboxAfter',
+            conditional: {
+                show: true,
+                conjunction: 'all',
+                conditions: [
+                    {
+                        component: 'textField',
+                        operator: 'isNotEmpty'
+                    }
+                ]
+            },
+            type: 'checkbox',
+            input: true
+        },
+    ]
+};

package/lib/cjs/components/checkbox/fixtures/index.d.ts

@@ -2,5 +2,6 @@ import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
 import comp4 from './comp4';
+import comp5 from './comp5';
 import customDefaultComponent from './customDefaultComponent';
-export { comp1, comp2, comp3, comp4, customDefaultComponent };
+export { comp1, comp2, comp3, comp4, comp5, customDefaultComponent };

package/lib/cjs/components/checkbox/fixtures/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.customDefaultComponent = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.customDefaultComponent = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const customDefaultComponent_1 = __importDefault(require("./customDefaultComponent"));
@@ -14,3 +14,5 @@ const comp3_1 = __importDefault(require("./comp3"));
 exports.comp3 = comp3_1.default;
 const comp4_1 = __importDefault(require("./comp4"));
 exports.comp4 = comp4_1.default;
+const comp5_1 = __importDefault(require("./comp5"));
+exports.comp5 = comp5_1.default;

package/lib/cjs/components/form/Form.js

@@ -206,6 +206,9 @@ class FormComponent extends Component_1.default {
         if (this.options.saveDraftThrottle) {
             options.saveDraftThrottle = this.options.saveDraftThrottle;
         }
+        if (this.options.skipDraftRestore) {
+            options.skipDraftRestore = this.options.skipDraftRestore;
+        }
         return options;
     }
     /* eslint-enable max-statements */
@@ -577,8 +580,9 @@ class FormComponent extends Component_1.default {
             this.subForm.triggerSaveDraft.cancel();
         }
         const isAlreadySubmitted = submission && submission._id && submission.form;
+        const isDraftSubmission = this.options.saveDraft && submission.state === 'draft';
         // This submission has already been submitted, so just return the reference data.
-        if (isAlreadySubmitted && !((_c = this.subForm) === null || _c === void 0 ? void 0 : _c.wizard)) {
+        if (isAlreadySubmitted && !((_c = this.subForm) === null || _c === void 0 ? void 0 : _c.wizard) && !isDraftSubmission) {
             this.dataValue = submission;
             return Promise.resolve(this.dataValue);
         }

package/lib/cjs/components/form/fixtures/comp7.d.ts

@@ -0,0 +1,36 @@
+declare namespace _default {
+    let _id: string;
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        src?: undefined;
+        disableOnInvalid?: undefined;
+    } | {
+        label: string;
+        tableView: boolean;
+        src: string;
+        key: string;
+        type: string;
+        input: boolean;
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        src?: undefined;
+    })[];
+    let project: string;
+    let machineName: string;
+}
+export default _default;

package/lib/cjs/components/form/fixtures/comp7.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    _id: '66051dae494c977c47028fac',
+    title: 'test draft parent',
+    name: 'testDraftParent',
+    path: 'testdraftparent',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Parent Form Field',
+            tableView: true,
+            key: 'parent',
+            type: 'textfield',
+            input: true,
+        },
+        {
+            label: 'Form',
+            tableView: true,
+            src: 'http://localhost:3000/idwqwhclwioyqbw/testdraftnested',
+            key: 'form',
+            type: 'form',
+            input: true,
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        },
+    ],
+    project: '63cead09be0090345b109e22',
+    machineName: 'idwqwhclwioyqbw:testdraftparent'
+};

package/lib/cjs/components/form/fixtures/comp8.d.ts

@@ -0,0 +1,26 @@
+declare namespace _default {
+    let _id: string;
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+    })[];
+    let project: string;
+    let machineName: string;
+}
+export default _default;

package/lib/cjs/components/form/fixtures/comp8.js

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    _id: '63e4deda12b88c4f05c125cf',
+    title: 'test draft nested',
+    name: 'testDraftNested',
+    path: 'testdraftnested',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Nested Form Field',
+            tableView: true,
+            key: 'nested',
+            type: 'textfield',
+            input: true,
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        },
+    ],
+    project: '63cead09be0090345b109e22',
+    machineName: 'idwqwhclwioyqbw:testdraftparent'
+};

package/lib/cjs/components/form/fixtures/index.d.ts

@@ -5,4 +5,6 @@ import comp3 from './comp3';
 import comp4 from './comp4';
 import comp5 from './comp5';
 import comp6 from './comp6';
-export { formModalEdit, comp1, comp2, comp3, comp4, comp5, comp6 };
+import comp7 from './comp7';
+import comp8 from './comp8';
+export { formModalEdit, comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8 };

package/lib/cjs/components/form/fixtures/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = exports.formModalEdit = void 0;
+exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = exports.formModalEdit = void 0;
 const formModalEdit_1 = __importDefault(require("./formModalEdit"));
 exports.formModalEdit = formModalEdit_1.default;
 const comp1_1 = __importDefault(require("./comp1"));
@@ -18,3 +18,7 @@ const comp5_1 = __importDefault(require("./comp5"));
 exports.comp5 = comp5_1.default;
 const comp6_1 = __importDefault(require("./comp6"));
 exports.comp6 = comp6_1.default;
+const comp7_1 = __importDefault(require("./comp7"));
+exports.comp7 = comp7_1.default;
+const comp8_1 = __importDefault(require("./comp8"));
+exports.comp8 = comp8_1.default;

package/lib/cjs/components/radio/Radio.d.ts

@@ -71,7 +71,7 @@ export default class RadioComponent extends ListComponent {
     detach(element: any): void;
     validateValueProperty(): boolean;
     validateValueAvailability(setting: any, value: any): boolean;
-    getValueAsString(value: any): any;
+    getValueAsString(value: any, options?: {}): any;
     setValueAt(index: any, value: any): void;
     loadItems(url: any, search: any, headers: any, options: any, method: any, body: any): void;
     loadItemsFromMetadata(): void;

package/lib/cjs/components/radio/Radio.js

@@ -226,17 +226,19 @@ class RadioComponent extends ListComponent_1.default {
         }
         return false;
     }
-    getValueAsString(value) {
+    getValueAsString(value, options = {}) {
         if (lodash_1.default.isObject(value)) {
             value = JSON.stringify(value);
         }
         else if (!lodash_1.default.isString(value)) {
             value = lodash_1.default.toString(value);
         }
-        if (this.component.dataSrc !== 'values') {
+        const isModalPreviewWithUrlDataSource = options.modalPreview && this.component.dataSrc === 'url';
+        if (this.component.dataSrc !== 'values' && !isModalPreviewWithUrlDataSource) {
             return value;
         }
-        const option = lodash_1.default.find(this.component.values, (v) => v.value === value);
+        const values = isModalPreviewWithUrlDataSource ? this.loadedOptions : this.component.values;
+        const option = lodash_1.default.find(values, (v) => v.value === value);
         if (!value) {
             return lodash_1.default.get(option, 'label', '');
         }

package/lib/cjs/components/recaptcha/editForm/ReCaptcha.edit.display.d.ts

@@ -7,6 +7,9 @@ declare const _default: ({
         label: string;
         value: string;
     }[];
+    validate: {
+        required: boolean;
+    };
     weight: number;
     input?: undefined;
     dataSrc?: undefined;
@@ -28,6 +31,7 @@ declare const _default: ({
         custom(context: any): any[];
     };
     values?: undefined;
+    validate?: undefined;
     ignore?: undefined;
 } | {
     key: string;
@@ -36,6 +40,7 @@ declare const _default: ({
     tooltip?: undefined;
     type?: undefined;
     values?: undefined;
+    validate?: undefined;
     weight?: undefined;
     input?: undefined;
     dataSrc?: undefined;

package/lib/cjs/components/recaptcha/editForm/ReCaptcha.edit.display.js

@@ -17,6 +17,9 @@ exports.default = [
                 value: 'buttonClick'
             }
         ],
+        validate: {
+            required: true
+        },
         weight: 650
     },
     {

package/lib/cjs/components/select/Select.js

@@ -228,9 +228,10 @@ class SelectComponent extends ListComponent_1.default {
     }
     selectValueAndLabel(data) {
         const value = this.getOptionValue((this.isEntireObjectDisplay() && !this.itemValue(data)) ? data : this.itemValue(data));
+        const readOnlyResourceLabelData = this.options.readOnly && (this.component.dataSrc === 'resource' || this.component.dataSrc === 'url') && this.selectData;
         return {
             value,
-            label: this.itemTemplate((this.isEntireObjectDisplay() && !lodash_1.default.isObject(data.data)) ? { data: data } : data, value)
+            label: this.itemTemplate((this.isEntireObjectDisplay() && !lodash_1.default.isObject(data.data)) ? { data: data } : readOnlyResourceLabelData || data, value)
         };
     }
     itemTemplate(data, value) {
@@ -1470,6 +1471,10 @@ class SelectComponent extends ListComponent_1.default {
     asString(value, options = {}) {
         var _a;
         value = value !== null && value !== void 0 ? value : this.getValue();
+        if (options.modalPreview && this.selectData) {
+            const { label } = this.selectValueAndLabel(value);
+            return label;
+        }
         //need to convert values to strings to be able to compare values with available options that are strings
         const convertToString = (data, valueProperty) => {
             if (valueProperty) {

package/lib/cjs/components/select/editForm/Select.edit.data.js

@@ -5,15 +5,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = __importDefault(require("lodash"));
 const utils_1 = require("../../../utils/utils");
-const calculateSelectData = (context) => {
+const calculateSingleSelectData = (context, defaultValue) => {
     const { instance, data } = context;
-    const rawDefaultValue = instance.downloadedResources.find(resource => lodash_1.default.get(resource, data.valueProperty) === instance.getValue());
+    const rawDefaultValue = instance.downloadedResources.find(resource => lodash_1.default.get(resource, data.valueProperty) === defaultValue);
     const options = { data: {}, noeval: true };
     instance.interpolate(data.template, {
         item: rawDefaultValue,
     }, options);
     return options.data.item;
 };
+const calculateSelectData = (context) => {
+    const { instance } = context;
+    const defaultValue = instance.getValue();
+    if (instance.component.multiple) {
+        const multiSelectData = {};
+        (defaultValue !== null && defaultValue !== void 0 ? defaultValue : []).forEach((defaultValueItem) => {
+            multiSelectData[defaultValueItem] = calculateSingleSelectData(context, defaultValueItem);
+        });
+        return multiSelectData;
+    }
+    else {
+        return calculateSingleSelectData(context, defaultValue);
+    }
+};
 const setSelectData = (context) => {
     // Wait before downloadedResources will be set
     setTimeout(() => {

package/lib/cjs/components/select/fixtures/comp22.js

@@ -8,7 +8,7 @@ exports.default = {
     display: 'form',
     components: [{
             label: 'Select',
-            widget: 'choicesjs',
+            widget: 'html5',
             tableView: true,
             dataSrc: 'url',
             data: {

package/lib/cjs/components/select/fixtures/comp23.d.ts

@@ -0,0 +1,58 @@
+declare namespace _default {
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        widget: string;
+        tableView: boolean;
+        dataSrc: string;
+        data: {
+            url: string;
+            headers: {
+                key: string;
+                value: string;
+            }[];
+        };
+        multiple: boolean;
+        valueProperty: string;
+        validateWhenHidden: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        defaultValue: string[];
+        selectValues: string;
+        disableLimit: boolean;
+        noRefreshOnScroll: boolean;
+        selectData: {
+            value1: {
+                label: string;
+            };
+            value3: {
+                label: string;
+            };
+        };
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        widget?: undefined;
+        dataSrc?: undefined;
+        data?: undefined;
+        multiple?: undefined;
+        valueProperty?: undefined;
+        validateWhenHidden?: undefined;
+        defaultValue?: undefined;
+        selectValues?: undefined;
+        disableLimit?: undefined;
+        noRefreshOnScroll?: undefined;
+        selectData?: undefined;
+    })[];
+}
+export default _default;

package/lib/cjs/components/select/fixtures/comp23.js

@@ -0,0 +1,49 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    title: 'FIO-8281',
+    name: 'fio8281',
+    path: 'fio8281',
+    type: 'form',
+    display: 'form',
+    components: [{
+            label: 'Select',
+            widget: 'choicesjs',
+            tableView: true,
+            dataSrc: 'url',
+            data: {
+                url: 'https://fake_url.com',
+                headers: [
+                    {
+                        key: '',
+                        value: ''
+                    },
+                ],
+            },
+            multiple: true,
+            valueProperty: 'value',
+            validateWhenHidden: false,
+            key: 'select',
+            type: 'select',
+            input: true,
+            defaultValue: ['value1', 'value3'],
+            selectValues: 'data',
+            disableLimit: false,
+            noRefreshOnScroll: false,
+            selectData: {
+                value1: {
+                    label: 'Label 1',
+                },
+                value3: {
+                    label: 'Label 3',
+                },
+            },
+        }, {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        }]
+};