data.RecordFactory: createField() => re-add support for nested fields #…

…6250
neomjs · Jan 18, 2025 · 71f64b5 · 71f64b5
1 parent 2890a0c
commit 71f64b5
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 31 deletions.
diff --git a/examples/table/nestedRecordFields/EditUserDialog.mjs b/examples/table/nestedRecordFields/EditUserDialog.mjs
@@ -89,9 +89,9 @@ class EditUserDialog extends Dialog {
             await me.timeout(20);
 
             me.getItem('country-field')  .value   = record.country;
-            me.getItem('firstname-field').value   = record.user.firstname;
-            me.getItem('lastname-field') .value   = record.user.lastname;
-            me.getItem('selected-field') .checked = record.annotations.selected
+            me.getItem('firstname-field').value   = record['user.firstname'];
+            me.getItem('lastname-field') .value   = record['user.lastname'];
+            me.getItem('selected-field') .checked = record['annotations.selected'];
         }
     }
 
@@ -106,14 +106,14 @@ class EditUserDialog extends Dialog {
      * @param {Object} data
      */
     onFirstnameFieldChange(data) {
-        this.record.user.firstname = data.value
+        this.record['user.firstname'] = data.value
     }
 
     /**
      * @param {Object} data
      */
     onLastnameFieldChange(data) {
-        this.record.user.lastname = data.value
+        this.record['user.lastname'] = data.value
     }
 
     /**
@@ -124,11 +124,11 @@ class EditUserDialog extends Dialog {
             store = me.getStateProvider().getStore('mainStore');
 
         if (data.value === false) {
-            me.record.annotations.selected = false
+            me.record['annotations.selected'] = false
         } else {
             // Assuming we want to support a single row selection
             store.items.forEach(record => {
-                record.annotations.selected = record === me.record ? data.value : false
+                record['annotations.selected'] = record === me.record ? data.value : false
             })
         }
     }

diff --git a/examples/table/nestedRecordFields/MainContainerStateProvider.mjs b/examples/table/nestedRecordFields/MainContainerStateProvider.mjs
@@ -2,7 +2,7 @@ import MainStore     from './MainStore.mjs';
 import StateProvider from '../../../src/state/Provider.mjs';
 import Store         from '../../../src/data/Store.mjs';
 
-const countrySymbol = Symbol.for('country');
+const dataSymbol = Symbol.for('data');
 
 /**
  * @class Neo.examples.table.nestedRecordFields.MainContainerStateProvider
@@ -51,7 +51,7 @@ class MainContainerStateProvider extends StateProvider {
                 country = record.country;
 
                 // hack resetting the current value to get a new record change
-                record[countrySymbol] = null;
+                record[dataSymbol].country = null;
 
                 record.country = country
             })

diff --git a/examples/table/nestedRecordFields/MainModel.mjs b/examples/table/nestedRecordFields/MainModel.mjs
@@ -13,7 +13,7 @@ class MainModel extends Model {
             type: 'Object',
 
             fields: [{
-                name        : 'annotations.selected',
+                name        : 'selected',
                 type        : 'Boolean',
                 defaultValue: false
             }]
@@ -28,10 +28,10 @@ class MainModel extends Model {
             type: 'Object',
 
             fields: [{
-                name: 'user.firstname',
+                name: 'firstname',
                 type: 'String'
             }, {
-                name: 'user.lastname',
+                name: 'lastname',
                 type: 'String'
             }]
         }]

diff --git a/src/data/RecordFactory.mjs b/src/data/RecordFactory.mjs
@@ -43,32 +43,35 @@ class RecordFactory extends Base {
      * @param {String} data.path=''
      */
     createField({field, me, model, path=''}) {
-        let fieldName = field.name.split('.').pop(),
-            fieldPath, properties,
-            value;
+        let fieldName = field.name,
+            fieldPath = path === '' ? fieldName : `${path}.${fieldName}`,
+            properties;
 
         if (field.fields) {
             field.fields.forEach(childField => {
-                fieldPath = path.split('.');
-                fieldPath = fieldPath.filter(Boolean);
-                fieldPath.push(field.name);
-
-                this.createField({field: childField, me, model, path: fieldPath.join('.')})
+                this.createField({field: childField, me, model, path: fieldPath})
             })
         } else {
-            if (value === undefined && Object.hasOwn(field, 'defaultValue')) {
-                value = field.defaultValue
-            }
-
             properties = {
-                [fieldName]: {
+                [fieldPath]: {
                     configurable: true,
                     enumerable  : true,
                     get() {
+                        if (model.hasNestedFields) {
+                            return Neo.ns(fieldPath, false, this[dataSymbol])
+                        }
+
                         return this[dataSymbol][fieldName]
                     },
                     set(value) {
-                        let oldValue = this[dataSymbol][fieldName];
+                        let me = this,
+                            oldValue;
+
+                        if (model.hasNestedFields) {
+                            oldValue = Neo.ns(fieldPath, false, me[dataSymbol])
+                        } else {
+                            oldValue = me[dataSymbol][fieldName]
+                        }
 
                         value = instance.parseRecordValue(me, field, value);
 
@@ -95,7 +98,7 @@ class RecordFactory extends Base {
                 }
             }
 
-            Object.defineProperties(path ? Neo.ns(path, true, me) : me, properties)
+            Object.defineProperties(me, properties)
         }
     }
 

diff --git a/src/grid/View.mjs b/src/grid/View.mjs
@@ -388,7 +388,7 @@ class GridView extends Component {
             cellCls     = ['neo-grid-cell'],
             colspan     = record[me.colspanField],
             {dataField} = column,
-            fieldValue  = Neo.ns(dataField, false, record),
+            fieldValue  = record[dataField],
             cellConfig, rendererOutput;
 
         if (fieldValue === null || fieldValue === undefined) {
@@ -495,7 +495,7 @@ class GridView extends Component {
             trCls.push('neo-even')
         }
 
-        if (selectedRows && Neo.ns(me.selectedRecordField, false, record)) {
+        if (selectedRows && record[me.selectedRecordField]) {
             NeoArray.add(selectedRows, id)
         }
 

diff --git a/src/table/View.mjs b/src/table/View.mjs
@@ -104,7 +104,7 @@ class View extends Component {
             cellCls     = ['neo-table-cell'],
             colspan     = record[me.colspanField],
             {dataField} = column,
-            fieldValue  = Neo.ns(dataField, false, record),
+            fieldValue  = record[dataField],
             hasStore    = tableContainer.store?.model, // todo: remove as soon as all tables use stores (examples table)
             {vdom}      = me,
             cellConfig, rendererOutput;
@@ -206,7 +206,7 @@ class View extends Component {
 
         me.recordVnodeMap[id] = rowIndex;
 
-        if (selectedRows && Neo.ns(me.selectedRecordField, false, record)) {
+        if (selectedRows && record[me.selectedRecordField]) {
             NeoArray.add(selectedRows, id)
         }