@formio/js 5.0.0-rc.33 → 5.0.0-rc.35

package/lib/cjs/components/file/editForm/File.edit.display.js

@@ -5,4 +5,21 @@ exports.default = [
         key: 'placeholder',
         ignore: true
     },
+    {
+        type: 'checkbox',
+        label: 'Files Synchronization feature',
+        tooltip: 'Enable ability to control files synchronization. Files will be auto synced before submit.',
+        key: 'autoSync',
+        input: true,
+        conditional: {
+            json: {
+                in: [
+                    {
+                        var: 'data.storage'
+                    },
+                    ['s3', 'azure', 'googledrive']
+                ],
+            }
+        }
+    },
 ];

package/lib/cjs/components/textarea/TextArea.js

@@ -298,10 +298,10 @@ class TextAreaComponent extends TextField_1.default {
         if (this.options.readOnly || this.disabled) {
             if (this.refs.input && this.refs.input[index]) {
                 if (this.component.inputFormat === 'plain') {
-                    this.refs.input[index].innerText = this.interpolate(value, {}, { noeval: true });
+                    this.refs.input[index].innerText = this.isPlain ? value : this.interpolate(value, {}, { noeval: true });
                 }
                 else {
-                    this.setContent(this.refs.input[index], this.interpolate(value, {}, { noeval: true }), this.shouldSanitizeValue);
+                    this.setContent(this.refs.input[index], this.isPlain ? value : this.interpolate(value, {}, { noeval: true }), this.shouldSanitizeValue);
                 }
             }
         }

package/lib/cjs/components/textfield/TextField.js

@@ -65,7 +65,9 @@ class TextFieldComponent extends Input_1.default {
         return TextFieldComponent.conditionOperatorsSettings;
     }
     static get conditionOperatorsSettings() {
-        return Object.assign(Object.assign({}, super.conditionOperatorsSettings), { operators: [...super.conditionOperatorsSettings.operators, 'includes', 'notIncludes', 'endsWith', 'startsWith'] });
+        return Object.assign(Object.assign({}, super.conditionOperatorsSettings), { operators: [...super.conditionOperatorsSettings.operators, 'includes', 'notIncludes', 'endsWith', 'startsWith'], valueComponent(classComp) {
+                return Object.assign(Object.assign({}, classComp), { type: 'textfield' });
+            } });
     }
     static savedValueTypes(schema) {
         return FormioUtils.getComponentSavedTypes(schema) || [FormioUtils.componentValueTypes.string];

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

@@ -125,6 +125,9 @@ class TimeComponent extends TextField_1.default {
         return view ? (0, moment_1.default)(view, this.component.format).format(this.component.dataFormat) : view;
     }
     getValueAsString(value) {
+        if (Array.isArray(value) && this.component.multiple) {
+            return value.map(item => (0, moment_1.default)(item, this.component.dataFormat).format(this.component.format)).join(', ');
+        }
         return (value ? (0, moment_1.default)(value, this.component.dataFormat).format(this.component.format) : value) || '';
     }
     getInputMaskFromFormat(format) {

package/lib/cjs/providers/storage/azure.js

@@ -12,7 +12,7 @@ function azure(formio) {
                 xhr.setRequestHeader('Content-Type', file.type);
                 xhr.setRequestHeader('x-ms-blob-type', 'BlockBlob');
                 return file;
-            }, file, fileName, dir, progressCallback, groupPermissions, groupId, abortCallback).then(() => {
+            }, file, fileName, dir, progressCallback, groupPermissions, groupId, abortCallback).then((response) => {
                 return {
                     storage: 'azure',
                     name: xhr_1.default.path([dir, fileName]),
@@ -20,11 +20,16 @@ function azure(formio) {
                     type: file.type,
                     groupPermissions,
                     groupId,
+                    key: response.key,
                 };
             });
         },
         downloadFile(file) {
             return formio.makeRequest('file', `${formio.formUrl}/storage/azure?name=${xhr_1.default.trim(file.name)}`, 'GET');
+        },
+        deleteFile: function deleteFile(fileInfo) {
+            var url = `${formio.formUrl}/storage/azure?name=${xhr_1.default.trim(fileInfo.name)}&key=${xhr_1.default.trim(fileInfo.key)}`;
+            return formio.makeRequest('', url, 'delete');
         }
     };
 }

package/lib/cjs/providers/storage/base64.js

@@ -26,7 +26,7 @@ function base64() {
         downloadFile(file) {
             // Return the original as there is nothing to do.
             return Promise.resolve(file);
-        }
+        },
     };
 }
 base64.title = 'Base64';

package/lib/cjs/providers/storage/googleDrive.js

@@ -51,7 +51,11 @@ function googledrive(formio) {
             file.url =
                 `${formio.formUrl}/storage/gdrive?fileId=${file.id}&fileName=${file.originalName}${token ? `&x-jwt-token=${token}` : ''}`;
             return Promise.resolve(file);
-        }
+        },
+        deleteFile: function deleteFile(fileInfo) {
+            var url = ''.concat(formio.formUrl, `/storage/gdrive?id=${fileInfo.id}&name=${fileInfo.originalName}`);
+            return formio.makeRequest('', url, 'delete');
+        },
     };
 }
 googledrive.title = 'Google Drive';

package/lib/cjs/providers/storage/indexeddb.js

@@ -115,7 +115,7 @@ function indexeddb() {
                     };
                 });
             });
-        }
+        },
     };
 }
 indexeddb.title = 'IndexedDB';

package/lib/cjs/providers/storage/s3.js

@@ -142,7 +142,11 @@ function s3(formio) {
             else {
                 return Promise.resolve(file);
             }
-        }
+        },
+        deleteFile(fileInfo) {
+            const url = `${formio.formUrl}/storage/s3?bucket=${xhr_1.default.trim(fileInfo.bucket)}&key=${xhr_1.default.trim(fileInfo.key)}`;
+            return formio.makeRequest('', url, 'delete');
+        },
     };
 }
 s3.title = 'S3';

package/lib/cjs/providers/storage/xhr.js

@@ -61,6 +61,11 @@ const XHR = {
                 throw err;
             }
             if (!response.ok) {
+                if (response.status === 504) {
+                    const error = new Error('Network request failed');
+                    error.networkError = true;
+                    throw error;
+                }
                 const message = yield response.text();
                 throw new Error(message || 'Unable to sign file.');
             }
@@ -104,6 +109,11 @@ const XHR = {
                     if (xhr.status >= 200 && xhr.status < 300) {
                         resolve(serverResponse);
                     }
+                    else if (xhr.status === 504) {
+                        const error = new Error('Network request failed');
+                        error.networkError = true;
+                        reject(error);
+                    }
                     else {
                         reject(xhr.response || 'Unable to upload file');
                     }

package/lib/mjs/CDN.js

@@ -56,19 +56,25 @@ class CDN {
         this.updateUrls();
     }
     buildUrl(cdnUrl, lib, version) {
-        let url;
-        if (version === 'latest' || version === '') {
-            url = `${cdnUrl}/${lib}`;
+        let url = cdnUrl;
+        if (lib) {
+            url += `/${lib}`;
         }
-        else {
-            url = `${cdnUrl}/${lib}/${version}`;
+        if (version && version !== 'latest') {
+            url += `/${version}`;
         }
         return url;
     }
     updateUrls() {
         for (const lib in this.libs) {
             if (lib in this.overrides) {
-                this[lib] = this.buildUrl(this.overrides[lib], lib, this.libs[lib]);
+                if (typeof this.overrides[lib] === 'string') {
+                    this[lib] = this.buildUrl(this.overrides[lib], lib, this.libs[lib]);
+                }
+                else {
+                    const override = this.overrides[lib];
+                    this[lib] = this.buildUrl(override.cdn, override.lib || '', override.version || '');
+                }
             }
             else {
                 this[lib] = this.buildUrl(this.baseUrl, lib, this.libs[lib]);

package/lib/mjs/Webform.js

@@ -778,7 +778,10 @@ export default class Webform extends NestedDataComponent {
         this.component.input = false;
         this.addComponents();
         this.on('submitButton', options => {
-            this.submit(false, options).catch(e => e !== false && e !== undefined && console.log(e));
+            this.submit(false, options).catch(e => {
+                options.instance.loading = false;
+                return e !== false && e !== undefined && console.log(e);
+            });
         }, true);
         this.on('checkValidity', (data) => this.validate(data, { dirty: true, process: 'change' }), true);
         this.on('requestUrl', (args) => (this.submitUrl(args.url, args.headers)), true);

package/lib/mjs/Wizard.js

@@ -777,21 +777,18 @@ export default class Wizard extends Webform {
         }
     }
     setValue(submission, flags = {}, ignoreEstablishment) {
-        this._submission = submission;
-        if ((flags && flags.fromSubmission && (this.options.readOnly || this.editMode) && !this.isHtmlRenderMode()) ||
-            (flags && flags.fromSubmission && (this.prefixComps.length || this.suffixComps.length) && submission._id) ||
-            (this.options.server && (this.prefixComps.length || this.suffixComps.length))) {
-            this._data = submission.data;
-        }
-        if (!ignoreEstablishment) {
-            this.establishPages(submission.data);
-        }
         const changed = this.getPages({ all: true }).reduce((changed, page) => {
             return this.setNestedValue(page, submission.data, flags, changed) || changed;
         }, false);
+        this.mergeData(this.data, submission.data);
         if (changed) {
             this.pageFieldLogic(this.page);
         }
+        submission.data = this.data;
+        this._submission = submission;
+        if (!ignoreEstablishment) {
+            this.establishPages(submission.data);
+        }
         this.setEditMode(submission);
         return changed;
     }

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

@@ -173,7 +173,12 @@ export default class Component extends Element {
         return {
             operators: ['isEqual', 'isNotEqual', 'isEmpty', 'isNotEmpty'],
             valueComponent() {
-                return { type: 'textfield' };
+                return {
+                    type: 'textfield',
+                    widget: {
+                        type: 'input'
+                    }
+                };
             }
         };
     }

package/lib/mjs/components/_classes/nested/NestedComponent.js

@@ -520,7 +520,7 @@ export default class NestedComponent extends Field {
     clearOnHide(show) {
         super.clearOnHide(show);
         if (this.component.clearOnHide) {
-            if (this.allowData && !this.hasValue()) {
+            if (this.allowData && !this.hasValue() && !(this.options.server && !this.visible)) {
                 this.dataValue = this.defaultValue;
             }
             if (this.hasValue()) {

package/lib/mjs/components/container/fixtures/comp4.js

@@ -0,0 +1,43 @@
+export default {
+    type: 'form',
+    display: 'form',
+    components: [
+        {
+            label: 'Checkbox',
+            tableView: false,
+            key: 'checkbox',
+            type: 'checkbox',
+            input: true,
+        },
+        {
+            label: 'Container',
+            tableView: false,
+            key: 'container',
+            conditional: {
+                show: true,
+                when: 'checkbox',
+                eq: 'true',
+            },
+            type: 'container',
+            input: true,
+            components: [
+                {
+                    label: 'Text Field',
+                    applyMaskOn: 'change',
+                    tableView: true,
+                    key: 'textField',
+                    type: 'textfield',
+                    input: true,
+                },
+            ],
+        },
+        {
+            type: 'button',
+            label: 'Submit',
+            key: 'submit',
+            disableOnInvalid: true,
+            input: true,
+            tableView: false,
+        },
+    ],
+};

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

@@ -1,4 +1,5 @@
 import comp1 from './comp1';
 import comp2 from './comp2';
 import comp3 from './comp3';
-export { comp1, comp2, comp3 };
+import comp4 from './comp4';
+export { comp1, comp2, comp3, comp4 };

package/lib/mjs/components/datetime/DateTime.js

@@ -178,8 +178,14 @@ export default class DateTimeComponent extends Input {
         format += format.match(/z$/) ? '' : ' z';
         const timezone = this.timezone;
         if (value && !this.attached && timezone) {
+            if (Array.isArray(value) && this.component.multiple) {
+                return value.map(item => _.trim(FormioUtils.momentDate(item, format, timezone).format(format))).join(', ');
+            }
             return _.trim(FormioUtils.momentDate(value, format, timezone).format(format));
         }
+        if (Array.isArray(value) && this.component.multiple) {
+            return value.map(item => _.trim(moment(item).format(format))).join(', ');
+        }
         return (value ? _.trim(moment(value).format(format)) : value) || '';
     }
 }