neo.mjs 5.17.0 → 5.17.1

package/apps/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='5.17.0'
+         * @member {String} version='5.17.1'
          */
-        version: '5.17.0'
+        version: '5.17.1'
     }
 
     /**

package/examples/ServiceWorker.mjs

@@ -20,9 +20,9 @@ class ServiceWorker extends ServiceBase {
          */
         singleton: true,
         /**
-         * @member {String} version='5.17.0'
+         * @member {String} version='5.17.1'
          */
-        version: '5.17.0'
+        version: '5.17.1'
     }
 
     /**

package/examples/form/field/fileupload/MainContainer.mjs

@@ -140,6 +140,21 @@ class MainContainer extends ConfigurationViewport {
                     xls : 1,
                     pdf : 1
                 }
+            }, {
+                module            : FileUploadField,
+                id                : 'my-failing-document-status-test',
+                uploadUrl         : 'http://127.0.0.1:3000/file-upload-test',
+                documentStatusUrl : 'http://127.0.0.1:3000/document-status-fails?documentId={documentId}',
+                documentDeleteUrl : 'http://127.0.0.1:3000/document-delete?documentId={documentId}',
+                downloadUrl       : 'http://127.0.0.1:3000/getDocument?documentId={documentId}',
+                width             : 350,
+                maxSize           : '10mb',
+                types             : {
+                    png : 1,
+                    jpg : 1,
+                    xls : 1,
+                    pdf : 1
+                }
             }]
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "neo.mjs",
-    "version": "5.17.0",
+    "version": "5.17.1",
     "description": "The webworkers driven UI framework",
     "type": "module",
     "repository": {

package/src/DefaultConfig.mjs

@@ -245,12 +245,12 @@ const DefaultConfig = {
     useVdomWorker: true,
     /**
      * buildScripts/injectPackageVersion.mjs will update this value
-     * @default '5.17.0'
+     * @default '5.17.1'
      * @memberOf! module:Neo
      * @name config.version
      * @type String
      */
-    version: '5.17.0'
+    version: '5.17.1'
 };
 
 Object.assign(DefaultConfig, {

package/src/form/field/FileUpload.mjs

@@ -134,7 +134,7 @@ class FileUpload extends Base {
          * An Object containing a default set of headers to be passed to the server on every HTTP request.
          * @member {Object} headers
          */
-        headers : {},
+        headers_ : {},
 
         /**
          * An Object which allows the status text returned from the {@link #property-documentStatusUrl} to be
@@ -217,7 +217,7 @@ class FileUpload extends Base {
          *
          * @member {String} downloadUrl
          */
-        downloadUrl : null,
+        downloadUrl_ : null,
 
         /**
          * The URL of the file status reporting service.
@@ -246,7 +246,7 @@ class FileUpload extends Base {
          *
          * @member {String} documentStatusUrl
          */
-        documentStatusUrl : null,
+        documentStatusUrl_ : null,
 
         /**
          * The polling interval *in milliseconds* to wait between asking the server how the document scan
@@ -279,7 +279,7 @@ class FileUpload extends Base {
          *
          * @member {String} documentDeleteUrl
          */
-        documentDeleteUrl : null,
+        documentDeleteUrl_ : null,
 
         /**
          * @member {String} state_=null
@@ -589,17 +589,12 @@ class FileUpload extends Base {
                         me.state = 'ready';
                         break;
                     default:
-                        const { fileName, size } = serverJson;
-
-                        if (fileName) {
-                            me.vdom.cn[1].cn[0].innerHTML = fileName;
-                            me.fileSize = me.formatSize(size);
-                        }
                         me.state = status;
                 }
             }
             else {
-                me.error = `${documentStatusError}: ${statusResponse.statusText}`;
+                me.error = `${me.documentStatusError}: ${statusResponse.statusText || `Server error ${statusResponse.status}`}`;
+                me.state = 'deleted';
             }
         }
     }
@@ -659,7 +654,7 @@ class FileUpload extends Base {
                 break;
             case 'not-downloadable':
                 status.innerHTML = me.preExistingDocument ?
-                me.fileSize : `${successfullyUploaded} \u2022 ${me.fileSize}`;
+                me.fileSize : `${me.successfullyUploaded} \u2022 ${me.fileSize}`;
                 break;
             case 'deleted':
                 status.innerHTML = me.fileWasDeleted;
@@ -694,18 +689,24 @@ class FileUpload extends Base {
     }
 
     beforeGetDocumentStatusUrl(documentStatusUrl) {
+        const me = this;
+
         return typeof documentStatusUrl === 'function'? documentStatusUrl.call(me, me) : me.createUrl(documentStatusUrl, {
             [me.documentIdParameter] : me.documentId
         });
     }
 
     beforeGetDocumentDeleteUrl(documentDeleteUrl) {
+        const me = this;
+
         return typeof documentDeleteUrl === 'function'? documentDeleteUrl.call(me, me) : me.createUrl(documentDeleteUrl, {
             [me.documentIdParameter] : me.documentId
         });
     }
 
     beforeGetDownloadUrl(downloadUrl) {
+        const me = this;
+
         return typeof downloadUrl === 'function'? downloadUrl.call(me, me) : me.createUrl(downloadUrl, {
             [me.documentIdParameter] : me.documentId
         });
@@ -758,7 +759,9 @@ class FileUpload extends Base {
      * @returns {Boolean}
      */
     validate() {
-        const { isValid, cls } = this;
+        const
+            { cls } = this,
+            isValid = this.isValid();
 
         NeoArray.toggle(cls, 'neo-invalid', !isValid);
         this.cls = cls;
@@ -766,13 +769,13 @@ class FileUpload extends Base {
         return isValid;
     }
 
-    get isValid() {
+    isValid() {
         const me = this;
 
-        return !me.error &&
-               ((me.state === 'ready' && !me.required) ||
-               (me.state === 'downloadable') ||
-               (me.state === 'not-downloadable'));
+        return !me.error &&  !(me.state === 'ready' && me.required) ||
+               (    (me.state === 'downloadable') ||
+                    (me.state === 'not-downloadable')
+               );
     }
 }