@formio/js 5.0.0-dev.5719.d2d4a61 → 5.0.0-dev.5720.5431de8

package/lib/cjs/Form.js

@@ -31,6 +31,7 @@ const Formio_1 = require("./Formio");
 const displays_1 = __importDefault(require("./displays"));
 const templates_1 = __importDefault(require("./templates"));
 const FormioUtils = __importStar(require("./utils/utils"));
+const lodash_1 = __importDefault(require("lodash"));
 class Form extends Element_1.default {
     constructor(elementOrForm, formOrOptions, options = {}) {
         let element, form, formOptions;
@@ -224,6 +225,7 @@ class Form extends Element_1.default {
                     this.instance = this.instance || this.create(form.display);
                     const options = this.getFormInitOptions(formParam, form);
                     this.instance.setUrl(formParam, options);
+                    lodash_1.default.set(form, 'config.myApiUrl', options.project);
                     this.instance.nosubmit = false;
                     this._form = this.instance.form = form;
                     if (submission) {

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

@@ -12,8 +12,6 @@ export default class NestedArrayComponent extends NestedDataComponent {
     hasAddButton(): any;
     getComponent(path: any, fn: any, originalPath: any): any;
     everyComponent(fn: any, rowIndex: any, options?: {}): void;
-    _getEmailTableHeader(options: any): string;
-    _getEmailTableBody(options: any): string;
     getComponents(rowIndex: any): any;
 }
 import NestedDataComponent from '../nesteddata/NestedDataComponent';

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

@@ -149,60 +149,39 @@ class NestedArrayComponent extends NestedDataComponent_1.default {
             }
         });
     }
-    _getEmailTableHeader(options) {
-        let row = '';
-        const getHeaderCell = (component) => {
-            if (!component.isInputComponent || !component.visible || component.skipInEmail) {
-                return '';
-            }
-            const label = component.label || component.key;
-            return `<th style="padding: 5px 10px;">${label}</th>`;
-        };
-        const components = this.getComponents(0);
-        for (const component of components) {
-            if (component.isInputComponent) {
-                row += getHeaderCell(component);
-            }
-            else if ((0, utils_1.isLayoutComponent)(component) && typeof component.everyComponent === 'function') {
-                component.everyComponent((comp) => {
-                    row += getHeaderCell(comp);
-                }, options);
-            }
-        }
-        return `<thead><tr>${row}</tr></thead>`;
-    }
-    _getEmailTableBody(options) {
-        const getBodyCell = (component) => {
-            if (!component.isInputComponent || !component.visible || component.skipInEmail) {
-                return '';
-            }
-            return `<td style="padding: 5px 10px;">${component.getView(component.dataValue, options)}</td>`;
-        };
-        const rows = [];
-        for (const { components } of this.iteratableRows) {
-            let row = '';
-            for (const component of components) {
-                if (component.isInputComponent) {
-                    row += getBodyCell(component);
-                }
-                else if ((0, utils_1.isLayoutComponent)(component) && typeof component.everyComponent === 'function') {
-                    component.everyComponent((comp) => {
-                        row += getBodyCell(comp);
-                    }, options);
-                }
-            }
-            rows.push(`<tr>${row}</tr>`);
-        }
-        return `<tbody>${rows.join('')}</tbody>`;
-    }
     getValueAsString(value, options) {
+        var _a;
         if (options === null || options === void 0 ? void 0 : options.email) {
-            return `
+            let result = (`
         <table border="1" style="width:100%">
-          ${this._getEmailTableHeader(options)}
-          ${this._getEmailTableBody(options)}
+          <thead>
+            <tr>
+      `);
+            (_a = this.component.components) === null || _a === void 0 ? void 0 : _a.forEach((component) => {
+                const label = component.label || component.key;
+                result += `<th style="padding: 5px 10px;">${label}</th>`;
+            });
+            result += (`
+          </tr>
+        </thead>
+        <tbody>
+      `);
+            this.iteratableRows.forEach(({ components }) => {
+                result += '<tr>';
+                lodash_1.default.each(components, (component) => {
+                    result += '<td style="padding:5px 10px;">';
+                    if (component.isInputComponent && component.visible && !component.skipInEmail) {
+                        result += component.getView(component.dataValue, options);
+                    }
+                    result += '</td>';
+                });
+                result += '</tr>';
+            });
+            result += (`
+          </tbody>
         </table>
-      `;
+      `);
+            return result;
         }
         if (!value || !value.length) {
             return '';

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

@@ -14,9 +14,8 @@ import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
 import comp16 from './comp16';
-import comp17 from './comp17';
 import compOpenWhenEmpty from './comp-openWhenEmpty';
 import withOpenWhenEmptyAndConditions from './comp-with-conditions-and-openWhenEmpty';
 import compWithCustomDefaultValue from './comp-with-custom-default-value';
 import compTestEvents from './comp-test-events';
-export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };
+export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };

package/lib/cjs/components/editgrid/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.compTestEvents = exports.compWithCustomDefaultValue = exports.withOpenWhenEmptyAndConditions = exports.compOpenWhenEmpty = exports.comp17 = exports.comp16 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = exports.comp3 = exports.comp2 = exports.comp1 = void 0;
+exports.compTestEvents = exports.compWithCustomDefaultValue = exports.withOpenWhenEmptyAndConditions = exports.compOpenWhenEmpty = exports.comp16 = exports.comp9 = exports.comp8 = exports.comp7 = exports.comp6 = exports.comp5 = exports.comp4 = exports.comp15 = exports.comp14 = exports.comp13 = exports.comp12 = exports.comp11 = exports.comp10 = 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"));
@@ -36,8 +36,6 @@ const comp15_1 = __importDefault(require("./comp15"));
 exports.comp15 = comp15_1.default;
 const comp16_1 = __importDefault(require("./comp16"));
 exports.comp16 = comp16_1.default;
-const comp17_1 = __importDefault(require("./comp17"));
-exports.comp17 = comp17_1.default;
 const comp_with_conditions_and_openWhenEmpty_1 = __importDefault(require("./comp-with-conditions-and-openWhenEmpty"));
 exports.withOpenWhenEmptyAndConditions = comp_with_conditions_and_openWhenEmpty_1.default;
 const comp_openWhenEmpty_1 = __importDefault(require("./comp-openWhenEmpty"));

package/lib/mjs/Form.js

@@ -3,6 +3,7 @@ import { Formio } from './Formio';
 import Displays from './displays';
 import templates from './templates';
 import * as FormioUtils from './utils/utils';
+import _ from "lodash";
 export default class Form extends Element {
     /**
      * Represents a JSON value.
@@ -293,6 +294,7 @@ export default class Form extends Element {
                     this.instance = this.instance || this.create(form.display);
                     const options = this.getFormInitOptions(formParam, form);
                     this.instance.setUrl(formParam, options);
+                    _.set(form, 'config.myApiUrl', options.project);
                     this.instance.nosubmit = false;
                     this._form = this.instance.form = form;
                     if (submission) {

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

@@ -12,8 +12,6 @@ export default class NestedArrayComponent extends NestedDataComponent {
     hasAddButton(): any;
     getComponent(path: any, fn: any, originalPath: any): any;
     everyComponent(fn: any, rowIndex: any, options?: {}): void;
-    _getEmailTableHeader(options: any): string;
-    _getEmailTableBody(options: any): string;
     getComponents(rowIndex: any): any;
 }
 import NestedDataComponent from '../nesteddata/NestedDataComponent';

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

@@ -1,6 +1,6 @@
 'use strict';
 import _ from 'lodash';
-import { componentValueTypes, getStringFromComponentPath, isLayoutComponent } from '../../../utils/utils';
+import { componentValueTypes, getStringFromComponentPath } from '../../../utils/utils';
 import Component from '../component/Component';
 import NestedDataComponent from '../nesteddata/NestedDataComponent';
 export default class NestedArrayComponent extends NestedDataComponent {
@@ -145,60 +145,38 @@ export default class NestedArrayComponent extends NestedDataComponent {
             }
         });
     }
-    _getEmailTableHeader(options) {
-        let row = '';
-        const getHeaderCell = (component) => {
-            if (!component.isInputComponent || !component.visible || component.skipInEmail) {
-                return '';
-            }
-            const label = component.label || component.key;
-            return `<th style="padding: 5px 10px;">${label}</th>`;
-        };
-        const components = this.getComponents(0);
-        for (const component of components) {
-            if (component.isInputComponent) {
-                row += getHeaderCell(component);
-            }
-            else if (isLayoutComponent(component) && typeof component.everyComponent === 'function') {
-                component.everyComponent((comp) => {
-                    row += getHeaderCell(comp);
-                }, options);
-            }
-        }
-        return `<thead><tr>${row}</tr></thead>`;
-    }
-    _getEmailTableBody(options) {
-        const getBodyCell = (component) => {
-            if (!component.isInputComponent || !component.visible || component.skipInEmail) {
-                return '';
-            }
-            return `<td style="padding: 5px 10px;">${component.getView(component.dataValue, options)}</td>`;
-        };
-        const rows = [];
-        for (const { components } of this.iteratableRows) {
-            let row = '';
-            for (const component of components) {
-                if (component.isInputComponent) {
-                    row += getBodyCell(component);
-                }
-                else if (isLayoutComponent(component) && typeof component.everyComponent === 'function') {
-                    component.everyComponent((comp) => {
-                        row += getBodyCell(comp);
-                    }, options);
-                }
-            }
-            rows.push(`<tr>${row}</tr>`);
-        }
-        return `<tbody>${rows.join('')}</tbody>`;
-    }
     getValueAsString(value, options) {
         if (options?.email) {
-            return `
+            let result = (`
         <table border="1" style="width:100%">
-          ${this._getEmailTableHeader(options)}
-          ${this._getEmailTableBody(options)}
+          <thead>
+            <tr>
+      `);
+            this.component.components?.forEach((component) => {
+                const label = component.label || component.key;
+                result += `<th style="padding: 5px 10px;">${label}</th>`;
+            });
+            result += (`
+          </tr>
+        </thead>
+        <tbody>
+      `);
+            this.iteratableRows.forEach(({ components }) => {
+                result += '<tr>';
+                _.each(components, (component) => {
+                    result += '<td style="padding:5px 10px;">';
+                    if (component.isInputComponent && component.visible && !component.skipInEmail) {
+                        result += component.getView(component.dataValue, options);
+                    }
+                    result += '</td>';
+                });
+                result += '</tr>';
+            });
+            result += (`
+          </tbody>
         </table>
-      `;
+      `);
+            return result;
         }
         if (!value || !value.length) {
             return '';

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

@@ -14,9 +14,8 @@ import comp7 from './comp7';
 import comp8 from './comp8';
 import comp9 from './comp9';
 import comp16 from './comp16';
-import comp17 from './comp17';
 import compOpenWhenEmpty from './comp-openWhenEmpty';
 import withOpenWhenEmptyAndConditions from './comp-with-conditions-and-openWhenEmpty';
 import compWithCustomDefaultValue from './comp-with-custom-default-value';
 import compTestEvents from './comp-test-events';
-export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };
+export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };

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

@@ -14,9 +14,8 @@ import comp13 from './comp13';
 import comp14 from './comp14';
 import comp15 from './comp15';
 import comp16 from './comp16';
-import comp17 from './comp17';
 import withOpenWhenEmptyAndConditions from './comp-with-conditions-and-openWhenEmpty';
 import compOpenWhenEmpty from './comp-openWhenEmpty';
 import compWithCustomDefaultValue from './comp-with-custom-default-value';
 import compTestEvents from './comp-test-events';
-export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, comp17, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };
+export { comp1, comp2, comp3, comp10, comp11, comp12, comp13, comp14, comp15, comp4, comp5, comp6, comp7, comp8, comp9, comp16, compOpenWhenEmpty, withOpenWhenEmptyAndConditions, compWithCustomDefaultValue, compTestEvents };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-dev.5719.d2d4a61",
+  "version": "5.0.0-dev.5720.5431de8",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {

package/lib/cjs/components/editgrid/fixtures/comp17.d.ts

@@ -1,80 +0,0 @@
-declare namespace _default {
-    let type: string;
-    let display: string;
-    let components: ({
-        label: string;
-        tableView: boolean;
-        rowDrafts: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        components: {
-            collapsible: boolean;
-            key: string;
-            type: string;
-            label: string;
-            input: boolean;
-            tableView: boolean;
-            components: {
-                label: string;
-                columns: ({
-                    components: {
-                        label: string;
-                        optionsLabelPosition: string;
-                        inline: boolean;
-                        tableView: boolean;
-                        values: {
-                            label: string;
-                            value: string;
-                            shortcut: string;
-                        }[];
-                        key: string;
-                        type: string;
-                        input: boolean;
-                    }[];
-                    width: number;
-                    offset: number;
-                    push: number;
-                    pull: number;
-                    size: string;
-                    currentWidth: number;
-                } | {
-                    components: {
-                        label: string;
-                        applyMaskOn: string;
-                        autoExpand: boolean;
-                        tableView: boolean;
-                        key: string;
-                        conditional: {
-                            show: boolean;
-                            conjunction: string;
-                        };
-                        type: string;
-                        input: boolean;
-                    }[];
-                    width: number;
-                    offset: number;
-                    push: number;
-                    pull: number;
-                    size: string;
-                    currentWidth: number;
-                })[];
-                key: string;
-                type: string;
-                input: boolean;
-                tableView: boolean;
-            }[];
-        }[];
-        disableOnInvalid?: undefined;
-    } | {
-        type: string;
-        label: string;
-        key: string;
-        disableOnInvalid: boolean;
-        input: boolean;
-        tableView: boolean;
-        rowDrafts?: undefined;
-        components?: undefined;
-    })[];
-}
-export default _default;

package/lib/cjs/components/editgrid/fixtures/comp17.js

@@ -1,99 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    type: 'form',
-    display: 'form',
-    components: [
-        {
-            label: 'Edit Grid',
-            tableView: false,
-            rowDrafts: false,
-            key: 'editGrid',
-            type: 'editgrid',
-            input: true,
-            components: [
-                {
-                    collapsible: false,
-                    key: 'panel',
-                    type: 'panel',
-                    label: 'Panel',
-                    input: false,
-                    tableView: false,
-                    components: [
-                        {
-                            label: 'Columns',
-                            columns: [
-                                {
-                                    components: [
-                                        {
-                                            label: 'Radio',
-                                            optionsLabelPosition: 'right',
-                                            inline: false,
-                                            tableView: true,
-                                            values: [
-                                                {
-                                                    label: 'yes',
-                                                    value: 'yes',
-                                                    shortcut: ''
-                                                },
-                                                {
-                                                    label: 'no',
-                                                    value: 'no',
-                                                    shortcut: ''
-                                                }
-                                            ],
-                                            key: 'radio',
-                                            type: 'radio',
-                                            input: true
-                                        }
-                                    ],
-                                    width: 6,
-                                    offset: 0,
-                                    push: 0,
-                                    pull: 0,
-                                    size: 'md',
-                                    currentWidth: 6
-                                },
-                                {
-                                    components: [
-                                        {
-                                            label: 'Text Area',
-                                            applyMaskOn: 'change',
-                                            autoExpand: false,
-                                            tableView: true,
-                                            key: 'textArea',
-                                            conditional: {
-                                                show: true,
-                                                conjunction: 'all'
-                                            },
-                                            type: 'textarea',
-                                            input: true
-                                        }
-                                    ],
-                                    width: 6,
-                                    offset: 0,
-                                    push: 0,
-                                    pull: 0,
-                                    size: 'md',
-                                    currentWidth: 6
-                                }
-                            ],
-                            key: 'columns',
-                            type: 'columns',
-                            input: false,
-                            tableView: false
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            type: 'button',
-            label: 'Submit',
-            key: 'submit',
-            disableOnInvalid: true,
-            input: true,
-            tableView: false
-        }
-    ]
-};

package/lib/mjs/components/editgrid/fixtures/comp17.d.ts

@@ -1,80 +0,0 @@
-declare namespace _default {
-    let type: string;
-    let display: string;
-    let components: ({
-        label: string;
-        tableView: boolean;
-        rowDrafts: boolean;
-        key: string;
-        type: string;
-        input: boolean;
-        components: {
-            collapsible: boolean;
-            key: string;
-            type: string;
-            label: string;
-            input: boolean;
-            tableView: boolean;
-            components: {
-                label: string;
-                columns: ({
-                    components: {
-                        label: string;
-                        optionsLabelPosition: string;
-                        inline: boolean;
-                        tableView: boolean;
-                        values: {
-                            label: string;
-                            value: string;
-                            shortcut: string;
-                        }[];
-                        key: string;
-                        type: string;
-                        input: boolean;
-                    }[];
-                    width: number;
-                    offset: number;
-                    push: number;
-                    pull: number;
-                    size: string;
-                    currentWidth: number;
-                } | {
-                    components: {
-                        label: string;
-                        applyMaskOn: string;
-                        autoExpand: boolean;
-                        tableView: boolean;
-                        key: string;
-                        conditional: {
-                            show: boolean;
-                            conjunction: string;
-                        };
-                        type: string;
-                        input: boolean;
-                    }[];
-                    width: number;
-                    offset: number;
-                    push: number;
-                    pull: number;
-                    size: string;
-                    currentWidth: number;
-                })[];
-                key: string;
-                type: string;
-                input: boolean;
-                tableView: boolean;
-            }[];
-        }[];
-        disableOnInvalid?: undefined;
-    } | {
-        type: string;
-        label: string;
-        key: string;
-        disableOnInvalid: boolean;
-        input: boolean;
-        tableView: boolean;
-        rowDrafts?: undefined;
-        components?: undefined;
-    })[];
-}
-export default _default;

package/lib/mjs/components/editgrid/fixtures/comp17.js

@@ -1,97 +0,0 @@
-export default {
-    type: 'form',
-    display: 'form',
-    components: [
-        {
-            label: 'Edit Grid',
-            tableView: false,
-            rowDrafts: false,
-            key: 'editGrid',
-            type: 'editgrid',
-            input: true,
-            components: [
-                {
-                    collapsible: false,
-                    key: 'panel',
-                    type: 'panel',
-                    label: 'Panel',
-                    input: false,
-                    tableView: false,
-                    components: [
-                        {
-                            label: 'Columns',
-                            columns: [
-                                {
-                                    components: [
-                                        {
-                                            label: 'Radio',
-                                            optionsLabelPosition: 'right',
-                                            inline: false,
-                                            tableView: true,
-                                            values: [
-                                                {
-                                                    label: 'yes',
-                                                    value: 'yes',
-                                                    shortcut: ''
-                                                },
-                                                {
-                                                    label: 'no',
-                                                    value: 'no',
-                                                    shortcut: ''
-                                                }
-                                            ],
-                                            key: 'radio',
-                                            type: 'radio',
-                                            input: true
-                                        }
-                                    ],
-                                    width: 6,
-                                    offset: 0,
-                                    push: 0,
-                                    pull: 0,
-                                    size: 'md',
-                                    currentWidth: 6
-                                },
-                                {
-                                    components: [
-                                        {
-                                            label: 'Text Area',
-                                            applyMaskOn: 'change',
-                                            autoExpand: false,
-                                            tableView: true,
-                                            key: 'textArea',
-                                            conditional: {
-                                                show: true,
-                                                conjunction: 'all'
-                                            },
-                                            type: 'textarea',
-                                            input: true
-                                        }
-                                    ],
-                                    width: 6,
-                                    offset: 0,
-                                    push: 0,
-                                    pull: 0,
-                                    size: 'md',
-                                    currentWidth: 6
-                                }
-                            ],
-                            key: 'columns',
-                            type: 'columns',
-                            input: false,
-                            tableView: false
-                        }
-                    ]
-                }
-            ]
-        },
-        {
-            type: 'button',
-            label: 'Submit',
-            key: 'submit',
-            disableOnInvalid: true,
-            input: true,
-            tableView: false
-        }
-    ]
-};