@formio/js 5.0.0-dev.5718.37a9ce7 → 5.0.0-dev.5720.4409b3f

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

@@ -264,6 +264,16 @@ class RadioComponent extends ListComponent_1.default {
         if (method.toUpperCase() === 'GET') {
             body = null;
         }
+        const limit = this.component.limit || 100;
+        const skip = this.isScrollLoading ? this.selectOptions.length : 0;
+        // Allow for url interpolation.
+        url = this.sanitize(this.interpolate(url, {
+            formioBase: Formio_1.Formio.getBaseUrl(),
+            search,
+            limit,
+            skip,
+            page: Math.abs(Math.floor(skip / limit))
+        }), this.shouldSanitizeValue);
         // Set ignoreCache if it is
         options.ignoreCache = this.component.ignoreCache;
         // Make the request.
@@ -295,14 +305,15 @@ class RadioComponent extends ListComponent_1.default {
     setItems(items) {
         const listData = [];
         items === null || items === void 0 ? void 0 : items.forEach((item, i) => {
+            const valueAtProperty = lodash_1.default.get(item, this.component.valueProperty);
             this.loadedOptions[i] = {
-                value: this.component.valueProperty ? item[this.component.valueProperty] : item,
-                label: this.component.valueProperty ? this.itemTemplate(item, item[this.component.valueProperty]) : this.itemTemplate(item, item, i)
+                value: this.component.valueProperty ? valueAtProperty : item,
+                label: this.component.valueProperty ? this.itemTemplate(item, valueAtProperty) : this.itemTemplate(item, item, i)
             };
-            listData.push(this.templateData[this.component.valueProperty ? item[this.component.valueProperty] : i]);
-            if ((this.component.valueProperty || !this.isRadio) && (lodash_1.default.isUndefined(item[this.component.valueProperty]) ||
-                (!this.isRadio && lodash_1.default.isObject(item[this.component.valueProperty])) ||
-                (!this.isRadio && lodash_1.default.isBoolean(item[this.component.valueProperty])))) {
+            listData.push(this.templateData[this.component.valueProperty ? valueAtProperty : i]);
+            if ((this.component.valueProperty || !this.isRadio) && (lodash_1.default.isUndefined(valueAtProperty) ||
+                (!this.isRadio && lodash_1.default.isObject(valueAtProperty)) ||
+                (!this.isRadio && lodash_1.default.isBoolean(valueAtProperty)))) {
                 this.loadedOptions[i].invalid = true;
             }
         });

package/lib/cjs/components/radio/fixtures/comp12.d.ts

@@ -0,0 +1,29 @@
+declare namespace _default {
+    let components: {
+        label: string;
+        optionsLabelPosition: string;
+        tableView: boolean;
+        dataSrc: string;
+        values: {
+            label: string;
+            value: string;
+            shortcut: string;
+        }[];
+        valueProperty: string;
+        validateWhenHidden: boolean;
+        key: string;
+        type: string;
+        data: {
+            url: string;
+            headers: {
+                key: string;
+                value: string;
+            }[];
+        };
+        template: string;
+        authenticate: boolean;
+        input: boolean;
+        inputType: string;
+    }[];
+}
+export default _default;

package/lib/cjs/components/radio/fixtures/comp12.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    components: [
+        {
+            "label": "Select Boxes",
+            "optionsLabelPosition": "right",
+            "tableView": false,
+            "dataSrc": "url",
+            "values": [
+                {
+                    "label": "",
+                    "value": "",
+                    "shortcut": ""
+                }
+            ],
+            "valueProperty": "data.name",
+            "validateWhenHidden": false,
+            "key": "selectBoxes",
+            "type": "selectboxes",
+            "data": {
+                "url": "https://remote-dev.form.io/projectId/name/submission",
+                "headers": [
+                    {
+                        "key": "",
+                        "value": ""
+                    }
+                ]
+            },
+            "template": "<span>{{ item.data.name }}</span>",
+            "authenticate": true,
+            "input": true,
+            "inputType": "checkbox"
+        }
+    ]
+};

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

@@ -9,4 +9,5 @@ import comp8 from './comp8';
 import comp9 from './comp9';
 import comp10 from './comp10';
 import comp11 from './comp11';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11 };
+import comp12 from './comp12';
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12 };

package/lib/cjs/components/radio/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.comp11 = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.comp12 = exports.comp11 = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
 const comp1_1 = __importDefault(require("./comp1"));
 exports.comp1 = comp1_1.default;
 const comp2_1 = __importDefault(require("./comp2"));
@@ -26,3 +26,5 @@ const comp10_1 = __importDefault(require("./comp10"));
 exports.comp10 = comp10_1.default;
 const comp11_1 = __importDefault(require("./comp11"));
 exports.comp11 = comp11_1.default;
+const comp12_1 = __importDefault(require("./comp12"));
+exports.comp12 = comp12_1.default;

package/lib/cjs/components/select/Select.d.ts

@@ -9,9 +9,47 @@ export default class SelectComponent extends ListComponent {
     };
     static get serverConditionSettings(): {
         valueComponent(classComp: any): any;
+        dataTypeOperators: {
+            number: string[];
+        };
+        dataTypeValueComponents: {
+            number: {
+                lessThan: () => {
+                    type: string;
+                };
+                greaterThan: () => {
+                    type: string;
+                };
+                lessThanOrEqual: () => {
+                    type: string;
+                };
+                greaterThanOrEqual: () => {
+                    type: string;
+                };
+            };
+        };
     };
     static get conditionOperatorsSettings(): {
         valueComponent(classComp: any): any;
+        dataTypeOperators: {
+            number: string[];
+        };
+        dataTypeValueComponents: {
+            number: {
+                lessThan: () => {
+                    type: string;
+                };
+                greaterThan: () => {
+                    type: string;
+                };
+                lessThanOrEqual: () => {
+                    type: string;
+                };
+                greaterThanOrEqual: () => {
+                    type: string;
+                };
+            };
+        };
     };
     static savedValueTypes(schema: any): any[];
     templateData: {} | undefined;

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

@@ -62,6 +62,7 @@ class SelectComponent extends ListComponent_1.default {
         return SelectComponent.conditionOperatorsSettings;
     }
     static get conditionOperatorsSettings() {
+        const numberType = () => ({ type: 'number' });
         return Object.assign(Object.assign({}, super.conditionOperatorsSettings), { valueComponent(classComp) {
                 const valueComp = Object.assign(Object.assign({}, classComp), { type: 'select' });
                 if ((0, utils_1.isSelectResourceWithObjectValue)(classComp)) {
@@ -76,6 +77,15 @@ class SelectComponent extends ListComponent_1.default {
           `;
                 }
                 return valueComp;
+            }, dataTypeOperators: {
+                number: ['lessThan', 'greaterThan', 'lessThanOrEqual', 'greaterThanOrEqual'],
+            }, dataTypeValueComponents: {
+                number: {
+                    lessThan: numberType,
+                    greaterThan: numberType,
+                    lessThanOrEqual: numberType,
+                    greaterThanOrEqual: numberType,
+                },
             } });
     }
     static savedValueTypes(schema) {
@@ -526,13 +536,13 @@ class SelectComponent extends ListComponent_1.default {
             skip,
         };
         // Allow for url interpolation.
-        url = this.interpolate(url, {
+        url = this.sanitize(this.interpolate(url, {
             formioBase: Formio_1.Formio.getBaseUrl(),
             search,
             limit,
             skip,
             page: Math.abs(Math.floor(skip / limit))
-        });
+        }), this.shouldSanitizeValue);
         // Add search capability.
         if (this.component.searchField && search) {
             const searchValue = Array.isArray(search)

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

@@ -0,0 +1,44 @@
+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;
+        data: {
+            values: {
+                label: string;
+                value: string;
+            }[];
+        };
+        dataType: string;
+        key: string;
+        type: string;
+        input: boolean;
+        applyMaskOn?: undefined;
+        conditional?: undefined;
+    } | {
+        label: string;
+        applyMaskOn: string;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        conditional: {
+            show: boolean;
+            conjunction: string;
+            conditions: {
+                component: string;
+                operator: string;
+                value: number;
+            }[];
+        };
+        widget?: undefined;
+        data?: undefined;
+        dataType?: undefined;
+    })[];
+}
+export default _default;

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

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    title: 'FIO-8072',
+    name: 'fio8072',
+    path: 'fio8072',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Select',
+            widget: 'choicesjs',
+            tableView: true,
+            data: {
+                values: [
+                    {
+                        label: 'A',
+                        value: '1',
+                    },
+                    {
+                        label: 'B',
+                        value: '2',
+                    },
+                    {
+                        label: 'C',
+                        value: '10',
+                    },
+                    {
+                        label: 'D',
+                        value: '1d',
+                    },
+                ],
+            },
+            dataType: 'number',
+            key: 'select',
+            type: 'select',
+            input: true,
+        },
+        {
+            label: 'Text Field',
+            applyMaskOn: 'change',
+            tableView: true,
+            key: 'textField',
+            type: 'textfield',
+            input: true,
+            conditional: {
+                show: true,
+                conjunction: 'all',
+                conditions: [
+                    {
+                        component: 'select',
+                        operator: 'lessThan',
+                        value: 5,
+                    },
+                ],
+            },
+        },
+    ],
+};

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

@@ -21,5 +21,6 @@ import comp21 from './comp21';
 import comp22 from './comp22';
 import comp23 from './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 };
+import comp25 from './comp25';
+export { comp1, comp2, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, comp12, comp13, comp14, comp15, comp16, comp17, comp18, comp19, comp20, comp21, comp22, comp23, comp24, comp25 };
 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.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;
+exports.comp25 = 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"));
@@ -53,3 +53,5 @@ const comp23_1 = __importDefault(require("./comp23"));
 exports.comp23 = comp23_1.default;
 const comp24_1 = __importDefault(require("./comp24"));
 exports.comp24 = comp24_1.default;
+const comp25_1 = __importDefault(require("./comp25"));
+exports.comp25 = comp25_1.default;

package/lib/cjs/components/time/Time.d.ts

@@ -1,12 +1,12 @@
 export default class TimeComponent extends TextFieldComponent {
-    rawData: string | never[];
+    rawData: any;
     get dataFormat(): any;
     get skipMaskValidation(): boolean;
     isNotCompleteInput(value: any): any;
     removeValue(index: any): void;
     resetRawData(index: any): void;
     setRawValue(value: any, index: any): void;
-    getRawValue(index: any): string | never[];
+    getRawValue(index: any): any;
     getValueAt(index: any): any;
     setValueAt(index: any, value: any): void;
     getStringAsValue(view: any): any;

package/lib/cjs/components/time/Time.js

@@ -30,7 +30,8 @@ class TimeComponent extends TextField_1.default {
         this.component.inputType = isEdgeBrowser && edgeVersion <= 18
             ? 'text'
             : (this.component.inputType || 'time');
-        this.rawData = this.component.multiple ? [] : this.emptyValue;
+        // If default value is given then the raw data needs to be set
+        this.rawData = this.component.multiple ? [] : this.getValueAsString(this.defaultValue) || this.emptyValue;
     }
     static get builderInfo() {
         return {
@@ -61,7 +62,7 @@ class TimeComponent extends TextField_1.default {
         return value;
     }
     get validationValue() {
-        if (Array.isArray(this.rawData) && !this.rawData.length || !this.rawData) {
+        if ((Array.isArray(this.rawData) && !this.rawData.length) || !this.rawData) {
             return this.dataValue;
         }
         return this.rawData;

package/lib/cjs/components/time/fixtures/comp4.d.ts

@@ -0,0 +1,166 @@
+declare namespace _default {
+    let type: string;
+    let display: string;
+    let components: {
+        title: string;
+        breadcrumbClickable: boolean;
+        buttonSettings: {
+            previous: boolean;
+            cancel: boolean;
+            next: boolean;
+        };
+        navigateOnEnter: boolean;
+        saveOnEnter: boolean;
+        scrollToTop: boolean;
+        collapsible: boolean;
+        key: string;
+        type: string;
+        label: string;
+        components: {
+            label: string;
+            disabled: boolean;
+            alwaysEnabled: boolean;
+            tableView: boolean;
+            defaultValue: string;
+            key: string;
+            type: string;
+            input: boolean;
+            inputMask: string;
+            hideOnChildrenHidden: boolean;
+            id: string;
+            placeholder: string;
+            prefix: string;
+            customClass: string;
+            suffix: string;
+            multiple: boolean;
+            protected: boolean;
+            unique: boolean;
+            persistent: boolean;
+            hidden: boolean;
+            clearOnHide: boolean;
+            refreshOn: string;
+            redrawOn: string;
+            modalEdit: boolean;
+            dataGridLabel: boolean;
+            labelPosition: string;
+            description: string;
+            errorLabel: string;
+            tooltip: string;
+            hideLabel: boolean;
+            tabindex: string;
+            autofocus: boolean;
+            dbIndex: boolean;
+            customDefaultValue: string;
+            calculateValue: string;
+            calculateServer: boolean;
+            widget: {
+                type: string;
+            };
+            attributes: {};
+            validateOn: string;
+            validate: {
+                required: boolean;
+                custom: string;
+                customPrivate: boolean;
+                strictDateValidation: boolean;
+                multiple: boolean;
+                unique: boolean;
+                minLength: string;
+                maxLength: string;
+                pattern: string;
+            };
+            conditional: {
+                show: null;
+                when: null;
+                eq: string;
+            };
+            overlay: {
+                style: string;
+                left: string;
+                top: string;
+                width: string;
+                height: string;
+            };
+            allowCalculateOverride: boolean;
+            encrypted: boolean;
+            showCharCount: boolean;
+            showWordCount: boolean;
+            properties: {};
+            allowMultipleMasks: boolean;
+            addons: never[];
+            mask: boolean;
+            inputType: string;
+            inputFormat: string;
+            displayMask: string;
+            spellcheck: boolean;
+            truncateMultipleSpaces: boolean;
+            format: string;
+            dataFormat: string;
+        }[];
+        input: boolean;
+        tableView: boolean;
+        id: string;
+        placeholder: string;
+        prefix: string;
+        customClass: string;
+        suffix: string;
+        multiple: boolean;
+        defaultValue: null;
+        protected: boolean;
+        unique: boolean;
+        persistent: boolean;
+        hidden: boolean;
+        clearOnHide: boolean;
+        refreshOn: string;
+        redrawOn: string;
+        modalEdit: boolean;
+        dataGridLabel: boolean;
+        labelPosition: string;
+        description: string;
+        errorLabel: string;
+        tooltip: string;
+        hideLabel: boolean;
+        tabindex: string;
+        disabled: boolean;
+        autofocus: boolean;
+        dbIndex: boolean;
+        customDefaultValue: string;
+        calculateValue: string;
+        calculateServer: boolean;
+        widget: null;
+        attributes: {};
+        validateOn: string;
+        validate: {
+            required: boolean;
+            custom: string;
+            customPrivate: boolean;
+            strictDateValidation: boolean;
+            multiple: boolean;
+            unique: boolean;
+        };
+        conditional: {
+            show: null;
+            when: null;
+            eq: string;
+        };
+        overlay: {
+            style: string;
+            left: string;
+            top: string;
+            width: string;
+            height: string;
+        };
+        allowCalculateOverride: boolean;
+        encrypted: boolean;
+        showCharCount: boolean;
+        showWordCount: boolean;
+        properties: {};
+        allowMultipleMasks: boolean;
+        addons: never[];
+        tree: boolean;
+        lazyLoad: boolean;
+        theme: string;
+        breadcrumb: string;
+    }[];
+}
+export default _default;