backend-plus 1.16.19 → 1.16.21

package/for-client/my-tables.js

@@ -846,11 +846,11 @@ myOwn.DataColumnGrid.prototype.cellAttributes = function cellAttributes(specific
             attr["my-mandatory"]="normal";
         }
     }
-    if(grid.connector.fixedField[fieldDef.name]){
+    if(grid.connector.fixedField[fieldDef.name] != null){
         attr["inherited-pk-column"]="yes";
     }
     if(fieldDef.referencesField){
-        if(grid.connector.fixedField[fieldDef.referencesField]){
+        if(grid.connector.fixedField[fieldDef.referencesField] != null){
             attr["inherited-pk-column"]="yes";
         }
         if(grid.def.field[fieldDef.referencesField].isPk){
@@ -1001,45 +1001,17 @@ myOwn.DataColumnGrid.prototype.td = function td(depot, iColumn, tr, saveRow){
                 if(grid.modes.saveByField){
                     saveRow(depot,{visiblyLogErrors:false});
                 }
-                var promiseArray = [];
-                if(fieldDef.references){
-                    //busco FKs que tengan referencien a la tabla, que tengan como source a fieldDef y tengan displayFields
-                    grid.def.foreignKeys.filter(function(fkDef){
+                var promiseChain = Promise.resolve();
+                if (fieldDef.references) {
+                    promiseChain.then(grid.setInheritedFields(depot, function(fkDef){
                         return fkDef.references == fieldDef.references && 
                         fkDef.fields.find(function(field){
                             return field.source == fieldDef.name
                         }) &&
-                        fkDef.displayFields.length
-                    }).forEach(function(fkDef){
-                        var fixedFields = fkDef.fields.map(function(field){
-                            return {fieldName: field.target, value: depot.row[field.source]};
-                        })
-                        var dummyElement = html.div().create();
-                        var Connector = my.offline.mode?my.TableConnectorLocal:my.TableConnector;
-                        var myConnector = new Connector({
-                            my:my, 
-                            tableName: fieldDef.references,
-                            getElementToDisplayCount:function(){ return dummyElement }
-                        }, {fixedFields: fixedFields});
-                        myConnector.getStructure();
-                        //cargo registro y actualizo displayFields
-                        promiseArray.push(
-                            myConnector.getData().then(function(data){
-                                var referencedRow = data[0];
-                                fkDef.displayFields.forEach(function(displayFieldName){
-                                    var lookupValue=referencedRow?referencedRow[displayFieldName]:null;
-                                    var fieldName = fkDef.alias + '__' + displayFieldName;
-                                    depot.row[fieldName]=lookupValue;
-                                    if(depot.rowControls[fieldName]){
-                                        depot.rowControls[fieldName].setTypedValue(lookupValue);
-                                    }
-                                })
-                                
-                            })
-                        )
-                    });
+                        fkDef.displayFields.length >= 0 
+                    }));
                 }
-                Promise.all(promiseArray).then(function(){
+                promiseChain.then(function(){
                     grid.updateRowData(depot,true);
                 });
             }
@@ -2008,8 +1980,8 @@ myOwn.TableGrid.prototype.prepareGrid = function prepareGrid(){
     grid.actualName = (grid.def.gridAlias || grid.def.name) + (grid.connector.fixedFields.length ? '-' + JSON4all.stringify(grid.connector.fixedFields.map(function(pair){ return pair.value; })) : '')
     var captionTitle = grid.def.title;
     grid.connector.fixedFields.forEach(function(pair){
-        var toCaption = grid.def.field[pair.fieldName].toCaption || my.config.config['grid-smart-caption']
-        if(toCaption && pair.value){
+        var toCaption = grid.def.field[pair.fieldName].toCaption ?? my.config.config['grid-smart-caption']
+        if(toCaption && pair.value != null){
             var typeName = grid.def.field[pair.fieldName].typeName;
             captionTitle += ' '
             if(toCaption == 'labeled' || toCaption != 'alone' && (typeName == 'boolean' || typeName == 'integer' || typeName == 'bigint' || typeName == 'decimal')){
@@ -2061,6 +2033,43 @@ myOwn.TableGrid.prototype.prepareGrid = function prepareGrid(){
                 // [html.tr([html.th([buttonInsert]),grid.dom.footInfo])]
         ]).create();
     }
+    grid.setInheritedFields = function(depot, filterFun){
+        var promiseArray = [];
+        grid.def.foreignKeys.filter(filterFun||(x=>x)).forEach(function(fkDef){
+            var fixedFields = fkDef.fields.map(function(field){
+                return {fieldName: field.target, value: depot.row[field.source]};
+            })
+            var dummyElement = html.div().create();
+            var Connector = my.offline.mode?my.TableConnectorLocal:my.TableConnector;
+            var myConnector = new Connector({
+                my:my, 
+                tableName: fkDef.references,
+                getElementToDisplayCount:function(){ return dummyElement }
+            }, {fixedFields: fixedFields});
+            myConnector.getStructure();
+            //cargo registro y actualizo displayFields
+            promiseArray.push(
+                myConnector.getData().then(function(data){
+                    var referencedRow = data[0];
+                    grid.def.fields.forEach(function(fieldDef){
+                        var foreignFieldName =  fieldDef.references == fkDef.references ? fieldDef.referencedName : fieldDef.inherited ? fieldDef.name : null;
+                        if (referencedRow && foreignFieldName in referencedRow) {
+                            var lookupValue = referencedRow[foreignFieldName];
+                            var fieldName = fieldDef.name;
+                            depot.row[fieldName]=lookupValue;
+                            if(fieldDef.inherited){
+                                depot.rowPendingForUpdate[fieldName] = lookupValue;
+                            }
+                            if(depot.rowControls[fieldName]){
+                                depot.rowControls[fieldName].setTypedValue(lookupValue);
+                            }
+                        }
+                    })
+                })
+            )
+        });
+        return Promise.all(promiseArray);
+    }
     grid.dom.main.innerHTML='';
     grid.dom.main.appendChild(grid.dom.table);
 };
@@ -2201,8 +2210,12 @@ myOwn.TableGrid.prototype.displayGrid = function displayGrid(){
                 grid.my.clientSides[grid.def.clientSide].prepare(depot);
             };
             depot.clientSidePrepared=true;
-            grid.my.clientSides[grid.def.clientSide].update(depot);
         }
+        grid.setInheritedFields(depot).then(function(){
+            if(grid.def.clientSide){
+                grid.my.clientSides[grid.def.clientSide].update(depot);
+            }
+        });
     };
     var changeIoStatus = function changeIoStatus(depot,newStatus, objectWithFieldsOrListOfFieldNames, title){
         var fieldNames=typeof objectWithFieldsOrListOfFieldNames === "string"?[objectWithFieldsOrListOfFieldNames]:(

package/lib/backend-plus.d.ts

@@ -199,6 +199,7 @@ export type FieldDefinition = EditableDbDefinition & {
     inJoin?:string /* alias from sql.join; implies inTable:false */
     transformer?:string
     table?:string
+    inherited?:boolean
 } & ({} | {
     sequence:SequenceDefinition
     nullable:true

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for typed controls",
-  "version": "1.16.19",
+  "version": "1.16.21",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -31,7 +31,7 @@
     "@upgraded/locate-path": "^6.0.0-alfa.1",
     "ajax-best-promise": "^0.3.7",
     "backend-skins": "^0.1.15",
-    "best-globals": "^1.0.3",
+    "best-globals": "^1.0.4",
     "big.js": "^6.2.1",
     "body-parser": "^1.20.1",
     "cast-error": "^0.1.0",
@@ -78,11 +78,11 @@
     "@types/expect.js": "~0.3.29",
     "@types/express": "^4.17.15",
     "@types/express-useragent": "^1.0.2",
-    "@types/fs-extra": "^9.0.13",
+    "@types/fs-extra": "^11.0.0",
     "@types/js-yaml": "^4.0.5",
     "@types/mocha": "^10.0.1",
     "@types/multiparty": "~0.0.33",
-    "@types/node": "^18.11.17",
+    "@types/node": "^18.11.18",
     "@types/nodemailer": "^6.4.7",
     "@types/numeral": "~2.0.2",
     "@types/session-file-store": "^1.2.2",
@@ -102,7 +102,7 @@
     "puppeteer": "^19.4.1",
     "sinon": "^15.0.1",
     "supertest": "^6.3.3",
-    "types.d.ts": "~0.6.9",
+    "types.d.ts": "~0.6.11",
     "typescript": "^4.9.4",
     "why-is-node-running": "^2.2.2"
   },

package/unlogged/my-ajax.js

@@ -582,7 +582,7 @@ function noChange(x){ return x; }
 myAjax.UriSearchToObjectParams={
 	i                :{ showInMenu:true , encode:function(value,menu){ return menu.name?(menu.parents||[]).concat(menu.name).join(','):value }},
 	fc               :{                   encode:function(x){ return JSON.stringify(x); }, U:function(x){ return JSON.parse(x)}  },
-	ff               :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return JSON.parse(x)}  },
+	ff               :{                   encode:function(x){ return json4all.stringify(x); }, decode:function(x){ return json4all.parse(x)}  },
 	up               :{                   encode:function(x){ return json4all.stringify(x); }, decode:function(x){ return json4all.parse(x)}  },
 	pf               :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return JSON.parse(x)}  },
 	today            :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return bestGlobals.date.iso((x+'').substr(0,10))}  },
@@ -592,7 +592,7 @@ myAjax.UriSearchToObjectParams={
 	showParams       :{ hide:true       },
     parents          :{ hide:true       },
     button           :{ hide:true       },
-    fixedFields      :{ varName:'ff'    , encode:function(pairs){ return JSON.stringify(likeAr.toPlainObject(pairs, 'fieldName')); }},
+    fixedFields      :{ varName:'ff'    , encode:function(pairs){ return json4all.stringify(likeAr.toPlainObject(pairs, 'fieldName')); }},
 	detailing        :{                   encode:function(x){ return JSON.stringify(x); }, decode:function(x){ return JSON.parse(x)}  },
 }