neo.mjs 8.37.0 → 8.39.0

package/apps/ServiceWorker.mjs

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

package/apps/portal/view/home/FooterContainer.mjs

@@ -107,7 +107,7 @@ class FooterContainer extends Container {
             }, {
                 module: Component,
                 cls   : ['neo-version'],
-                html  : 'v8.37.0'
+                html  : 'v8.39.0'
             }]
         }],
         /**

package/examples/ServiceWorker.mjs

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

package/package.json

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

package/src/DefaultConfig.mjs

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

package/src/data/RecordFactory.mjs

@@ -1,6 +1,5 @@
-import Base   from '../core/Base.mjs';
-import Logger from '../util/Logger.mjs';
-import Model  from './Model.mjs';
+import Base  from '../core/Base.mjs';
+import Model from './Model.mjs';
 
 const
     dataSymbol         = Symbol.for('data'),
@@ -83,9 +82,9 @@ class RecordFactory extends Base {
                     },
                     set(value) {
                         instance.setRecordFields({
-                            fields: {[fieldPath]: instance.parseRecordValue(this, field, value)},
+                            fields: {[fieldPath]: instance.parseRecordValue({record: this, field, value})},
                             model,
-                            record: this,
+                            record: this
                         })
                     }
                 }
@@ -152,10 +151,11 @@ class RecordFactory extends Base {
                         if (model.trackModifiedFields) {
                             me[originalDataSymbol] = {};
                             me.setOriginal(config)
+                        } else {
+                            me[isModifiedSymbol] = false
                         }
 
                         me.setSilent(config); // We do not want to fire change events when constructing
-                        me[isModifiedSymbol] = false
                     }
 
                     /**
@@ -165,15 +165,10 @@ class RecordFactory extends Base {
                     isModifiedField(fieldName) {
                         let me = this;
 
-                        // Check if the field getter does exist
-                        if (!Object.hasOwn(me.__proto__, fieldName)) {
-                            Logger.logError('The record does not contain the field', fieldName, me)
-                        }
-
                         if (model.trackModifiedFields) {
                             let dataScope, originalDataScope;
 
-                            if (model.hasNestedFields && fieldName.includes('.')) {
+                            if (model.hasNestedFields && fieldName?.includes('.')) {
                                 let nsArray = fieldName.split('.');
 
                                 fieldName         = nsArray.pop();
@@ -184,6 +179,14 @@ class RecordFactory extends Base {
                                 originalDataScope = me[originalDataSymbol]
                             }
 
+                            // Check if the field exists
+                            if (
+                                !model.getField(fieldName) &&        // Check for leaf fields (could be excluded inside the real data)
+                                !Object.hasOwn(dataScope, fieldName) // Check the data tree
+                            ) {
+                                console.error('The record does not contain the field', fieldName, me)
+                            }
+
                             return !Neo.isEqual(dataScope[fieldName], originalDataScope[fieldName])
                         }
 
@@ -272,16 +275,17 @@ class RecordFactory extends Base {
     }
 
     /**
-     * todo: parse value for more field types
-     * @param {Object} record
-     * @param {Object} field
-     * @param {*} value=null
-     * @param {Object} recordConfig=null
+     * @param {Object}  data
+     * @param {Object}  data.record
+     * @param {Object}  data.field
+     * @param {*}       [data.value=null]
+     * @param {Object}  [data.recordConfig=null]
+     * @param {Boolean} [data.useOriginalData=false]
      * @returns {*}
      */
-    parseRecordValue(record, field, value=null, recordConfig=null) {
+    parseRecordValue({record, field, value=null, recordConfig=null, useOriginalData=false}) {
         if (field.calculate) {
-            return field.calculate(record, field, recordConfig)
+            return field.calculate(record[useOriginalData ? originalDataSymbol : dataSymbol], field)
         }
 
         if (field.convert) {
@@ -411,7 +415,7 @@ class RecordFactory extends Base {
                 })
             } else if (fieldExists) {
                 oldValue = record[key];
-                value    = me.parseRecordValue(record, model.getField(key), value);
+                value    = me.parseRecordValue({record, field: model.getField(key), value});
 
                 if (!Neo.isEqual(oldValue, value)) {
                     me.setRecordData({fieldName: key, model, record, useOriginalData, value});
@@ -430,7 +434,7 @@ class RecordFactory extends Base {
         if (hasChangedFields) {
             calculatedFieldsMap.forEach((value, key) => {
                 oldValue = record[key];
-                value    = me.parseRecordValue(record, model.getField(key));
+                value    = me.parseRecordValue({record, field: model.getField(key), useOriginalData});
 
                 if (!Neo.isEqual(oldValue, value)) {
                     me.setRecordData({fieldName: key, model, record, useOriginalData, value});

package/src/grid/View.mjs

@@ -431,9 +431,21 @@ class GridView extends Component {
             cellCls                = ['neo-grid-cell'],
             colspan                = record[me.colspanField],
             {dataField}            = column,
+            {model}                = store,
             fieldValue             = record[dataField],
             cellConfig, rendererOutput;
 
+        if (!model.getField(dataField)) {
+            let nsArray   = dataField.split('.'),
+                fieldName = nsArray.pop();
+
+            fieldValue = Neo.ns(nsArray, false, record[Symbol.for('data')])?.[fieldName]
+        }
+
+        if (fieldValue === null || fieldValue === undefined) {
+            fieldValue = ''
+        }
+
         rendererOutput = column.renderer.call(column.rendererScope || column, {
             column,
             columnIndex,

package/src/grid/column/Base.mjs

@@ -74,10 +74,6 @@ class Column extends Base {
      * @returns {*}
      */
     cellRenderer({value}) {
-        if (value === null || value === undefined) {
-            return ''
-        }
-
         return value
     }
 }

package/src/table/View.mjs

@@ -128,11 +128,19 @@ class View extends Component {
             cellCls     = ['neo-table-cell'],
             colspan     = record[me.colspanField],
             {dataField} = column,
+            {model}     = me.store,
             fieldValue  = record[dataField],
-            hasStore    = tableContainer.store?.model, // todo: remove as soon as all tables use stores (examples table)
+            hasStore    = !!model, // todo: remove as soon as all tables use stores (examples table)
             {vdom}      = me,
             cellConfig, rendererOutput;
 
+        if (!model?.getField(dataField)) {
+            let nsArray   = dataField.split('.'),
+                fieldName = nsArray.pop();
+
+            fieldValue = Neo.ns(nsArray, false, record[Symbol.for('data')])?.[fieldName]
+        }
+
         if (fieldValue === null || fieldValue === undefined) {
             fieldValue = ''
         }

package/src/worker/Manager.mjs

@@ -8,7 +8,8 @@ import RemoteMethodAccess from './mixin/RemoteMethodAccess.mjs';
 const NeoConfig = Neo.config,
       devMode   = NeoConfig.environment === 'development';
 
-navigator.serviceWorker.addEventListener('controllerchange', function() {
+// Using ?. since SWs do not exist for http (only https)
+navigator.serviceWorker?.addEventListener('controllerchange', function() {
     window.location.reload()
 }, {once: true});