@formio/js 5.0.0-dev.5589.fd575d0 → 5.0.0-dev.5592.bb7e96a

package/lib/cjs/Webform.js

@@ -830,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/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

@@ -10,20 +10,30 @@ declare namespace _default {
         tableView: boolean;
         dataSrc: string;
         data: {
-            resource: string;
-        };
-        template: string;
-        validate: {
-            select: boolean;
+            url: string;
+            headers: {
+                key: string;
+                value: string;
+            }[];
         };
+        multiple: boolean;
+        valueProperty: string;
+        validateWhenHidden: boolean;
         key: string;
         type: string;
-        searchField: string;
         input: boolean;
+        defaultValue: string[];
+        selectValues: string;
+        disableLimit: boolean;
         noRefreshOnScroll: boolean;
-        addResource: boolean;
-        reference: boolean;
-        valueProperty: string;
+        selectData: {
+            value1: {
+                label: string;
+            };
+            value3: {
+                label: string;
+            };
+        };
         disableOnInvalid?: undefined;
     } | {
         type: string;
@@ -35,13 +45,14 @@ declare namespace _default {
         widget?: undefined;
         dataSrc?: undefined;
         data?: undefined;
-        template?: undefined;
-        validate?: undefined;
-        searchField?: undefined;
-        noRefreshOnScroll?: undefined;
-        addResource?: undefined;
-        reference?: 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

@@ -1,40 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
-    title: 'FIO-8234',
-    name: 'fio8234',
-    path: 'fio8234',
+    title: 'FIO-8281',
+    name: 'fio8281',
+    path: 'fio8281',
     type: 'form',
     display: 'form',
-    components: [
-        {
+    components: [{
             label: 'Select',
             widget: 'choicesjs',
             tableView: true,
-            dataSrc: 'resource',
+            dataSrc: 'url',
             data: {
-                resource: '665446284c9b0163c3e0c7e6',
-            },
-            template: '<span>{{ item.data.textField1 }}</span>',
-            validate: {
-                select: false,
+                url: 'https://fake_url.com',
+                headers: [
+                    {
+                        key: '',
+                        value: ''
+                    },
+                ],
             },
+            multiple: true,
+            valueProperty: 'value',
+            validateWhenHidden: false,
             key: 'select',
             type: 'select',
-            searchField: 'data.textField2__regex',
             input: true,
+            defaultValue: ['value1', 'value3'],
+            selectValues: 'data',
+            disableLimit: false,
             noRefreshOnScroll: false,
-            addResource: false,
-            reference: false,
-            valueProperty: 'data.textField2',
-        },
-        {
+            selectData: {
+                value1: {
+                    label: 'Label 1',
+                },
+                value3: {
+                    label: 'Label 3',
+                },
+            },
+        }, {
             type: 'button',
             label: 'Submit',
             key: 'submit',
             disableOnInvalid: true,
             input: true,
             tableView: false,
-        },
-    ],
+        }]
 };

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

@@ -0,0 +1,47 @@
+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: {
+            resource: string;
+        };
+        template: string;
+        validate: {
+            select: boolean;
+        };
+        key: string;
+        type: string;
+        searchField: string;
+        input: boolean;
+        noRefreshOnScroll: boolean;
+        addResource: boolean;
+        reference: boolean;
+        valueProperty: string;
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        widget?: undefined;
+        dataSrc?: undefined;
+        data?: undefined;
+        template?: undefined;
+        validate?: undefined;
+        searchField?: undefined;
+        noRefreshOnScroll?: undefined;
+        addResource?: undefined;
+        reference?: undefined;
+        valueProperty?: undefined;
+    })[];
+}
+export default _default;

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

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    title: 'FIO-8234',
+    name: 'fio8234',
+    path: 'fio8234',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Select',
+            widget: 'choicesjs',
+            tableView: true,
+            dataSrc: 'resource',
+            data: {
+                resource: '665446284c9b0163c3e0c7e6',
+            },
+            template: '<span>{{ item.data.textField1 }}</span>',
+            validate: {
+                select: false,
+            },
+            key: 'select',
+            type: 'select',
+            searchField: 'data.textField2__regex',
+            input: true,
+            noRefreshOnScroll: false,
+            addResource: false,
+            reference: false,
+            valueProperty: 'data.textField2',
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        },
+    ],
+};

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

@@ -20,5 +20,6 @@ import comp20 from './comp20';
 import comp21 from './comp21';
 import comp22 from './comp22';
 import comp23 from './comp23';
-export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23 };
+import comp24 from './comp24';
+export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24 };
 export { multiSelect, multiSelectOptions } from "./comp3";

package/lib/cjs/components/select/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.comp23 = exports.comp22 = exports.comp21 = exports.comp20 = exports.comp19 = exports.comp18 = exports.comp17 = exports.comp16 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp2 = exports.comp1 = exports.multiSelectOptions = exports.multiSelect = void 0;
+exports.comp24 = exports.comp23 = exports.comp22 = exports.comp21 = exports.comp20 = exports.comp19 = exports.comp18 = exports.comp17 = exports.comp16 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp2 = exports.comp1 = exports.multiSelectOptions = exports.multiSelect = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
@@ -51,3 +51,5 @@ const comp22_1 = __importDefault(require("./comp22"));
 exports.comp22 = comp22_1.default;
 const comp23_1 = __importDefault(require("./comp23"));
 exports.comp23 = comp23_1.default;
+const comp24_1 = __importDefault(require("./comp24"));
+exports.comp24 = comp24_1.default;

package/lib/mjs/Webform.js

@@ -834,7 +834,9 @@ export default class Webform extends NestedDataComponent {
             };
         }
         // Metadata needs to be available before setValue
-        this._submission.metadata = submission.metadata || {};
+        this._submission.metadata = submission.metadata
+            ? _.cloneDeep(submission.metadata)
+            : {};
         this.editing = !!submission._id;
         // Set the timezone in the options if available.
         if (!this.options.submissionTimezone &&

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

@@ -1,14 +1,28 @@
 import _ from 'lodash';
 import { eachComponent } from '../../../utils/utils';
-const calculateSelectData = (context) => {
+const calculateSingleSelectData = (context, defaultValue) => {
     const { instance, data } = context;
-    const rawDefaultValue = instance.downloadedResources.find(resource => _.get(resource, data.valueProperty) === instance.getValue());
+    const rawDefaultValue = instance.downloadedResources.find(resource => _.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 ?? []).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/mjs/components/select/fixtures/comp22.js

@@ -6,7 +6,7 @@ export default {
     display: 'form',
     components: [{
             label: 'Select',
-            widget: 'choicesjs',
+            widget: 'html5',
             tableView: true,
             dataSrc: 'url',
             data: {

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

@@ -10,20 +10,30 @@ declare namespace _default {
         tableView: boolean;
         dataSrc: string;
         data: {
-            resource: string;
-        };
-        template: string;
-        validate: {
-            select: boolean;
+            url: string;
+            headers: {
+                key: string;
+                value: string;
+            }[];
         };
+        multiple: boolean;
+        valueProperty: string;
+        validateWhenHidden: boolean;
         key: string;
         type: string;
-        searchField: string;
         input: boolean;
+        defaultValue: string[];
+        selectValues: string;
+        disableLimit: boolean;
         noRefreshOnScroll: boolean;
-        addResource: boolean;
-        reference: boolean;
-        valueProperty: string;
+        selectData: {
+            value1: {
+                label: string;
+            };
+            value3: {
+                label: string;
+            };
+        };
         disableOnInvalid?: undefined;
     } | {
         type: string;
@@ -35,13 +45,14 @@ declare namespace _default {
         widget?: undefined;
         dataSrc?: undefined;
         data?: undefined;
-        template?: undefined;
-        validate?: undefined;
-        searchField?: undefined;
-        noRefreshOnScroll?: undefined;
-        addResource?: undefined;
-        reference?: undefined;
+        multiple?: undefined;
         valueProperty?: undefined;
+        validateWhenHidden?: undefined;
+        defaultValue?: undefined;
+        selectValues?: undefined;
+        disableLimit?: undefined;
+        noRefreshOnScroll?: undefined;
+        selectData?: undefined;
     })[];
 }
 export default _default;

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

@@ -1,38 +1,47 @@
 export default {
-    title: 'FIO-8234',
-    name: 'fio8234',
-    path: 'fio8234',
+    title: 'FIO-8281',
+    name: 'fio8281',
+    path: 'fio8281',
     type: 'form',
     display: 'form',
-    components: [
-        {
+    components: [{
             label: 'Select',
             widget: 'choicesjs',
             tableView: true,
-            dataSrc: 'resource',
+            dataSrc: 'url',
             data: {
-                resource: '665446284c9b0163c3e0c7e6',
-            },
-            template: '<span>{{ item.data.textField1 }}</span>',
-            validate: {
-                select: false,
+                url: 'https://fake_url.com',
+                headers: [
+                    {
+                        key: '',
+                        value: ''
+                    },
+                ],
             },
+            multiple: true,
+            valueProperty: 'value',
+            validateWhenHidden: false,
             key: 'select',
             type: 'select',
-            searchField: 'data.textField2__regex',
             input: true,
+            defaultValue: ['value1', 'value3'],
+            selectValues: 'data',
+            disableLimit: false,
             noRefreshOnScroll: false,
-            addResource: false,
-            reference: false,
-            valueProperty: 'data.textField2',
-        },
-        {
+            selectData: {
+                value1: {
+                    label: 'Label 1',
+                },
+                value3: {
+                    label: 'Label 3',
+                },
+            },
+        }, {
             type: 'button',
             label: 'Submit',
             key: 'submit',
             disableOnInvalid: true,
             input: true,
             tableView: false,
-        },
-    ],
+        }]
 };

package/lib/mjs/components/select/fixtures/comp24.d.ts

@@ -0,0 +1,47 @@
+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: {
+            resource: string;
+        };
+        template: string;
+        validate: {
+            select: boolean;
+        };
+        key: string;
+        type: string;
+        searchField: string;
+        input: boolean;
+        noRefreshOnScroll: boolean;
+        addResource: boolean;
+        reference: boolean;
+        valueProperty: string;
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        widget?: undefined;
+        dataSrc?: undefined;
+        data?: undefined;
+        template?: undefined;
+        validate?: undefined;
+        searchField?: undefined;
+        noRefreshOnScroll?: undefined;
+        addResource?: undefined;
+        reference?: undefined;
+        valueProperty?: undefined;
+    })[];
+}
+export default _default;

package/lib/mjs/components/select/fixtures/comp24.js

@@ -0,0 +1,38 @@
+export default {
+    title: 'FIO-8234',
+    name: 'fio8234',
+    path: 'fio8234',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Select',
+            widget: 'choicesjs',
+            tableView: true,
+            dataSrc: 'resource',
+            data: {
+                resource: '665446284c9b0163c3e0c7e6',
+            },
+            template: '<span>{{ item.data.textField1 }}</span>',
+            validate: {
+                select: false,
+            },
+            key: 'select',
+            type: 'select',
+            searchField: 'data.textField2__regex',
+            input: true,
+            noRefreshOnScroll: false,
+            addResource: false,
+            reference: false,
+            valueProperty: 'data.textField2',
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        },
+    ],
+};

package/lib/mjs/components/select/fixtures/index.d.ts

@@ -20,5 +20,6 @@ import comp20 from './comp20';
 import comp21 from './comp21';
 import comp22 from './comp22';
 import comp23 from './comp23';
-export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23 };
+import comp24 from './comp24';
+export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24 };
 export { multiSelect, multiSelectOptions } from "./comp3";

package/lib/mjs/components/select/fixtures/index.js

@@ -21,4 +21,5 @@ import comp20 from './comp20';
 import comp21 from './comp21';
 import comp22 from './comp22';
 import comp23 from './comp23';
-export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23 };
+import comp24 from './comp24';
+export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5589.fd575d0",
+  "version": "5.0.0-dev.5592.bb7e96a",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -77,7 +77,7 @@
   "dependencies": {
     "@formio/bootstrap": "^3.0.0-rc.22",
     "@formio/choices.js": "^10.2.1",
-    "@formio/core": "^2.1.0-dev.tt.2",
+    "@formio/core": "2.0.0-dev.102.df37631",
     "@formio/text-mask-addons": "^3.8.0-formio.2",
     "@formio/vanilla-text-mask": "^5.1.1-formio.1",
     "abortcontroller-polyfill": "^1.7.5",
@@ -105,7 +105,7 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.44",
-    "quill": "^2.0.0",
+    "quill": "^2.0.0-rc.4",
     "signature_pad": "^4.2.0",
     "string-hash": "^1.1.3",
     "tippy.js": "^6.3.7",