@formio/js 5.0.0-dev.5749.8f49547 → 5.0.0-dev.5750.5b1284a

package/lib/cjs/CDN.js

@@ -64,7 +64,8 @@ class CDN {
             url += `/${lib}`;
         }
         // Only attach the version if this is the hosted cdn.
-        if (cdnUrl.match(/cdn\.(test-)?form.io/) && version && version !== 'latest') {
+        if (cdnUrl.includes('form.io') &&
+            version && version !== 'latest') {
             url += `/${version}`;
         }
         return url;

package/lib/cjs/components/_classes/nestedarray/NestedArrayComponent.d.ts

@@ -15,5 +15,6 @@ export default class NestedArrayComponent extends NestedDataComponent {
     _getEmailTableHeader(options: any): string;
     _getEmailTableBody(options: any): string;
     getComponents(rowIndex: any): any;
+    removeSubmissionMetadataRow(index: any): void;
 }
 import NestedDataComponent from '../nesteddata/NestedDataComponent';

package/lib/cjs/components/_classes/nestedarray/NestedArrayComponent.js

@@ -218,5 +218,11 @@ class NestedArrayComponent extends NestedDataComponent_1.default {
         }
         return super.getComponents();
     }
+    removeSubmissionMetadataRow(index) {
+        const componentMetadata = lodash_1.default.get(this.root, `submission.metadata.selectData.${this.path}`, null);
+        if (lodash_1.default.isArray(componentMetadata)) {
+            componentMetadata.splice(index, 1);
+        }
+    }
 }
 exports.default = NestedArrayComponent;

package/lib/cjs/components/datagrid/DataGrid.js

@@ -440,6 +440,7 @@ class DataGridComponent extends NestedArrayComponent_1.default {
         this.splice(index, flags);
         this.emit('dataGridDeleteRow', { index });
         const [row] = this.rows.splice(index, 1);
+        this.removeSubmissionMetadataRow(index);
         this.removeRowComponents(row);
         this.updateRowsComponents(index);
         this.setValue(this.dataValue, flags);

package/lib/cjs/components/datagrid/fixtures/comp11.d.ts

@@ -0,0 +1,50 @@
+declare namespace _default {
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        reorder: boolean;
+        addAnotherPosition: string;
+        layoutFixed: boolean;
+        enableRowGroups: boolean;
+        initEmpty: boolean;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        components: {
+            label: string;
+            widget: string;
+            tableView: boolean;
+            data: {
+                values: {
+                    label: string;
+                    value: string;
+                }[];
+            };
+            validateWhenHidden: boolean;
+            key: string;
+            type: string;
+            input: boolean;
+            defaultValue: string;
+        }[];
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        reorder?: undefined;
+        addAnotherPosition?: undefined;
+        layoutFixed?: undefined;
+        enableRowGroups?: undefined;
+        initEmpty?: undefined;
+        components?: undefined;
+    })[];
+}
+export default _default;

package/lib/cjs/components/datagrid/fixtures/comp11.js

@@ -0,0 +1,55 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = {
+    title: 'Select in Data Grid',
+    name: 'selectInDataGrid',
+    path: 'selectInDataGrid',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Data Grid',
+            reorder: false,
+            addAnotherPosition: 'bottom',
+            layoutFixed: false,
+            enableRowGroups: false,
+            initEmpty: false,
+            tableView: false,
+            key: 'dataGrid',
+            type: 'datagrid',
+            input: true,
+            components: [
+                {
+                    label: 'Select',
+                    widget: 'choicesjs',
+                    tableView: true,
+                    data: {
+                        values: [
+                            {
+                                label: 'Individual',
+                                value: 'individual'
+                            },
+                            {
+                                label: 'Entity',
+                                value: 'entity'
+                            }
+                        ]
+                    },
+                    validateWhenHidden: false,
+                    key: 'select',
+                    type: 'select',
+                    input: true,
+                    defaultValue: 'entity'
+                },
+            ]
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false
+        }
+    ]
+};

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

@@ -8,6 +8,7 @@ import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
 import comp10 from './comp10';
+import comp11 from './comp11';
 import withCollapsibleRowGroups from './comp-with-collapsible-groups';
 import withConditionalFieldsAndValidations from './comp-with-conditional-components-and-validations';
 import withDefValue from './comp-with-def-value';
@@ -18,4 +19,4 @@ import withAllowCalculateOverride from './comp-with-allow-calculate-override';
 import twoWithAllowCalculatedOverride from './two-comp-with-allow-calculate-override';
 import withCheckboxes from './comp-with-checkboxes';
 import withReorder from './comp-with-reorder';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes, withReorder };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes, withReorder };

package/lib/cjs/components/datagrid/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.withReorder = exports.withCheckboxes = exports.twoWithAllowCalculatedOverride = exports.withAllowCalculateOverride = exports.modalWithRequiredFields = exports.withRowGroupsAndDefValue = exports.withLogic = exports.withDefValue = exports.withConditionalFieldsAndValidations = exports.withCollapsibleRowGroups = exports.comp10 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.withReorder = exports.withCheckboxes = exports.twoWithAllowCalculatedOverride = exports.withAllowCalculateOverride = exports.modalWithRequiredFields = exports.withRowGroupsAndDefValue = exports.withLogic = exports.withDefValue = exports.withConditionalFieldsAndValidations = exports.withCollapsibleRowGroups = 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"));
@@ -24,6 +24,8 @@ const comp9_1 = __importDefault(require("./comp9"));
 exports.comp9 = comp9_1.default;
 const comp10_1 = __importDefault(require("./comp10"));
 exports.comp10 = comp10_1.default;
+const comp11_1 = __importDefault(require("./comp11"));
+exports.comp11 = comp11_1.default;
 const comp_with_def_value_1 = __importDefault(require("./comp-with-def-value"));
 exports.withDefValue = comp_with_def_value_1.default;
 const comp_row_groups_with_def_value_1 = __importDefault(require("./comp-row-groups-with-def-value"));

package/lib/cjs/components/editgrid/EditGrid.js

@@ -895,6 +895,7 @@ class EditGridComponent extends NestedArrayComponent_1.default {
         }
         this.clearErrors(rowIndex);
         this.baseRemoveRow(rowIndex);
+        this.removeSubmissionMetadataRow(rowIndex);
         this.splice(rowIndex);
         this.emit('editGridDeleteRow', {
             index: rowIndex

package/lib/mjs/CDN.js

@@ -63,7 +63,8 @@ class CDN {
             url += `/${lib}`;
         }
         // Only attach the version if this is the hosted cdn.
-        if (cdnUrl.match(/cdn\.(test-)?form.io/) && version && version !== 'latest') {
+        if (cdnUrl.includes('form.io') &&
+            version && version !== 'latest') {
             url += `/${version}`;
         }
         return url;

package/lib/mjs/components/_classes/nestedarray/NestedArrayComponent.d.ts

@@ -15,5 +15,6 @@ export default class NestedArrayComponent extends NestedDataComponent {
     _getEmailTableHeader(options: any): string;
     _getEmailTableBody(options: any): string;
     getComponents(rowIndex: any): any;
+    removeSubmissionMetadataRow(index: any): void;
 }
 import NestedDataComponent from '../nesteddata/NestedDataComponent';

package/lib/mjs/components/_classes/nestedarray/NestedArrayComponent.js

@@ -214,4 +214,10 @@ export default class NestedArrayComponent extends NestedDataComponent {
         }
         return super.getComponents();
     }
+    removeSubmissionMetadataRow(index) {
+        const componentMetadata = _.get(this.root, `submission.metadata.selectData.${this.path}`, null);
+        if (_.isArray(componentMetadata)) {
+            componentMetadata.splice(index, 1);
+        }
+    }
 }

package/lib/mjs/components/datagrid/DataGrid.js

@@ -436,6 +436,7 @@ export default class DataGridComponent extends NestedArrayComponent {
         this.splice(index, flags);
         this.emit('dataGridDeleteRow', { index });
         const [row] = this.rows.splice(index, 1);
+        this.removeSubmissionMetadataRow(index);
         this.removeRowComponents(row);
         this.updateRowsComponents(index);
         this.setValue(this.dataValue, flags);

package/lib/mjs/components/datagrid/fixtures/comp11.d.ts

@@ -0,0 +1,50 @@
+declare namespace _default {
+    let title: string;
+    let name: string;
+    let path: string;
+    let type: string;
+    let display: string;
+    let components: ({
+        label: string;
+        reorder: boolean;
+        addAnotherPosition: string;
+        layoutFixed: boolean;
+        enableRowGroups: boolean;
+        initEmpty: boolean;
+        tableView: boolean;
+        key: string;
+        type: string;
+        input: boolean;
+        components: {
+            label: string;
+            widget: string;
+            tableView: boolean;
+            data: {
+                values: {
+                    label: string;
+                    value: string;
+                }[];
+            };
+            validateWhenHidden: boolean;
+            key: string;
+            type: string;
+            input: boolean;
+            defaultValue: string;
+        }[];
+        disableOnInvalid?: undefined;
+    } | {
+        type: string;
+        label: string;
+        key: string;
+        disableOnInvalid: boolean;
+        input: boolean;
+        tableView: boolean;
+        reorder?: undefined;
+        addAnotherPosition?: undefined;
+        layoutFixed?: undefined;
+        enableRowGroups?: undefined;
+        initEmpty?: undefined;
+        components?: undefined;
+    })[];
+}
+export default _default;

package/lib/mjs/components/datagrid/fixtures/comp11.js

@@ -0,0 +1,53 @@
+export default {
+    title: 'Select in Data Grid',
+    name: 'selectInDataGrid',
+    path: 'selectInDataGrid',
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Data Grid',
+            reorder: false,
+            addAnotherPosition: 'bottom',
+            layoutFixed: false,
+            enableRowGroups: false,
+            initEmpty: false,
+            tableView: false,
+            key: 'dataGrid',
+            type: 'datagrid',
+            input: true,
+            components: [
+                {
+                    label: 'Select',
+                    widget: 'choicesjs',
+                    tableView: true,
+                    data: {
+                        values: [
+                            {
+                                label: 'Individual',
+                                value: 'individual'
+                            },
+                            {
+                                label: 'Entity',
+                                value: 'entity'
+                            }
+                        ]
+                    },
+                    validateWhenHidden: false,
+                    key: 'select',
+                    type: 'select',
+                    input: true,
+                    defaultValue: 'entity'
+                },
+            ]
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false
+        }
+    ]
+};

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

@@ -8,6 +8,7 @@ import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
 import comp10 from './comp10';
+import comp11 from './comp11';
 import withCollapsibleRowGroups from './comp-with-collapsible-groups';
 import withConditionalFieldsAndValidations from './comp-with-conditional-components-and-validations';
 import withDefValue from './comp-with-def-value';
@@ -18,4 +19,4 @@ import withAllowCalculateOverride from './comp-with-allow-calculate-override';
 import twoWithAllowCalculatedOverride from './two-comp-with-allow-calculate-override';
 import withCheckboxes from './comp-with-checkboxes';
 import withReorder from './comp-with-reorder';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes, withReorder };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes, withReorder };

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

@@ -8,6 +8,7 @@ import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
 import comp10 from './comp10';
+import comp11 from './comp11';
 import withDefValue from './comp-with-def-value';
 import withRowGroupsAndDefValue from './comp-row-groups-with-def-value';
 import modalWithRequiredFields from './comp-modal-with-required-fields';
@@ -18,4 +19,4 @@ import withAllowCalculateOverride from './comp-with-allow-calculate-override';
 import twoWithAllowCalculatedOverride from './two-comp-with-allow-calculate-override';
 import withCheckboxes from './comp-with-checkboxes';
 import withReorder from './comp-with-reorder';
-export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes, withReorder };
+export { comp1, comp2, comp3, comp4, comp5, comp6, comp7, comp8, comp9, comp10, comp11, withCollapsibleRowGroups, withConditionalFieldsAndValidations, withDefValue, withLogic, withRowGroupsAndDefValue, modalWithRequiredFields, withAllowCalculateOverride, twoWithAllowCalculatedOverride, withCheckboxes, withReorder };

package/lib/mjs/components/editgrid/EditGrid.js

@@ -885,6 +885,7 @@ export default class EditGridComponent extends NestedArrayComponent {
         }
         this.clearErrors(rowIndex);
         this.baseRemoveRow(rowIndex);
+        this.removeSubmissionMetadataRow(rowIndex);
         this.splice(rowIndex);
         this.emit('editGridDeleteRow', {
             index: rowIndex

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5749.8f49547",
+  "version": "5.0.0-dev.5750.5b1284a",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {