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

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

@@ -3,4 +3,21 @@ export 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/mjs/components/textarea/TextArea.js

@@ -293,10 +293,10 @@ export default class TextAreaComponent extends TextFieldComponent {
         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/mjs/components/textfield/TextField.js

@@ -40,6 +40,12 @@ export default class TextFieldComponent extends Input {
         return {
             ...super.conditionOperatorsSettings,
             operators: [...super.conditionOperatorsSettings.operators, 'includes', 'notIncludes', 'endsWith', 'startsWith'],
+            valueComponent(classComp) {
+                return {
+                    ...classComp,
+                    type: 'textfield',
+                };
+            }
         };
     }
     static savedValueTypes(schema) {

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

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

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

@@ -7,7 +7,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.path([dir, fileName]),
@@ -15,11 +15,16 @@ function azure(formio) {
                     type: file.type,
                     groupPermissions,
                     groupId,
+                    key: response.key,
                 };
             });
         },
         downloadFile(file) {
             return formio.makeRequest('file', `${formio.formUrl}/storage/azure?name=${XHR.trim(file.name)}`, 'GET');
+        },
+        deleteFile: function deleteFile(fileInfo) {
+            var url = `${formio.formUrl}/storage/azure?name=${XHR.trim(fileInfo.name)}&key=${XHR.trim(fileInfo.key)}`;
+            return formio.makeRequest('', url, 'delete');
         }
     };
 }

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

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

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

@@ -49,7 +49,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/mjs/providers/storage/indexeddb.js

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

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

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

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

@@ -48,6 +48,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 = await response.text();
             throw new Error(message || 'Unable to sign file.');
         }
@@ -90,6 +95,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.34",
+  "version": "5.0.0-rc.35",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "exports": {
@@ -81,7 +81,7 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "^3.0.0-rc.19",
+    "@formio/bootstrap": "^3.0.0-rc.20",
     "@formio/choices.js": "^10.2.0",
     "@formio/core": "^2.0.0-rc.2",
     "@formio/text-mask-addons": "^3.8.0-formio.2",