backend-plus 2.0.0-rc.14 → 2.0.0-rc.16

package/for-client/css/my-menu.styl

@@ -161,5 +161,9 @@ a.disabled
       font-size 80%
       text-align right
       color #777
+    > .json-container
+      position sticky
+      top 5%
+      bottom 5%
 
 

package/lib/backend-plus.d.ts

@@ -76,7 +76,7 @@ export interface ContextForDump extends Context {
     forDump?:boolean
 }
 
-export type InformProgressFunction=(opts:Error|{data:any}|{start:any}|{message:string}|{message?:string, lengthComputable:boolean, loaded:number, total:number, force?:boolean})=>void
+export type InformProgressFunction=(opts:Error|{data:any}|{start:any}|{message:string}|{idGroup?:string, message?:string, lengthComputable:boolean, loaded:number, total:number, force?:boolean})=>void
 
 export interface ProcedureContext extends Context{
     client:Client
@@ -370,6 +370,9 @@ export interface AppConfigBin {                                    // executable
 }
 
 export interface AppConfig {
+    package: {
+        version: string
+    }
     server: {
         "base-url": string                 // rool path in the url
         port: number                       // port of the API services

package/lib/backend-plus.js

@@ -461,7 +461,13 @@ AppBackend.prototype.setStaticConfig = function setStaticConfig(defConfigYamlStr
 }
 
 AppBackend.prototype.configList = function configList(){
-    var list=[this.staticConfig];
+    var list=[
+        {
+            package:{
+                version: packagejson.version
+            }
+        },
+        this.staticConfig];
     if(!this.staticConfig["client-setup"]?.title && fs.existsSync(this.rootPath+'/def-config.yaml')){
         console.log('DEPRECATED!!!!!!')
         console.error('ERROR el def-config hay que ponerlo dentro de staticConfig');
@@ -1546,17 +1552,17 @@ AppBackend.prototype.addProcedureServices = function addProcedureServices(forUnl
                                     });
                                 }else{
                                     if(progressInfo.lengthComputable){
-                                        if(new Date()-(context.lastMessageSended||0) > 500 || progressInfo.force){
-                                            context.lastMessageSended=new Date();
+                                        if (!context.lastMessageSended) {
+                                            context.lastMessageSended = {}
+                                        }
+                                        if(new Date()-(context.lastMessageSended[progressInfo.idGroup]||0) > 500 || progressInfo.force){
+                                            context.lastMessageSended[progressInfo.idGroup]=new Date();
                                             res.write(JSON.stringify({progress:progressInfo})+"\n");
                                             if(progressInfo.total){
                                                 var rate100=Math.floor(progressInfo.loaded*100/progressInfo.total);
                                                 var rate1000=Math.floor(progressInfo.loaded*1000/progressInfo.total);
-                                                if(rate100<1 && progressInfo.loaded>0){
-                                                    progress2send={message:'('+(rate1000||'½')+'‰)', ephemeral:true};
-                                                }else{
-                                                    progress2send={message:rate100+'%', ephemeral:true};
-                                                }
+                                                var message = rate100<1 && progressInfo.loaded>0 ? '('+(rate1000||'½')+'‰)' : rate100+'%';
+                                                progress2send={message, ephemeral:true, idGroup:progressInfo.idGroup};
                                             }
                                         }else{
                                             progress2send=null;
@@ -1929,6 +1935,9 @@ AppBackend.prototype.addUnloggedServices = function addUnloggedServices(mainApp,
     // http://localhost:3033/img/login-logo-icon.png
     mainApp.get(Path.posix.join(baseUrl,'/img/login-logo-icon.png'), async function(req,res,next){
         var buscar = [
+            'unlogged/img/login-logo-icon.svg', 
+            'dist/unlogged/img/login-logo-icon.svg', 
+            'dist/client/unlogged/img/login-logo-icon.svg', 
             'unlogged/img/login-logo-icon.png', 
             'dist/unlogged/img/login-logo-icon.png', 
             'dist/client/unlogged/img/login-logo-icon.png', 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "backend-plus",
   "description": "Backend for the anti Pareto rule",
-  "version": "2.0.0-rc.14",
+  "version": "2.0.0-rc.16",
   "author": "Codenautas <codenautas@googlegroups.com>",
   "license": "MIT",
   "repository": "codenautas/backend-plus",
@@ -49,7 +49,7 @@
     "js-yaml": "^4.1.0",
     "json4all": "^1.3.0-beta.1",
     "lazy-some": "^0.1.0",
-    "like-ar": "^0.4.0",
+    "like-ar": "^0.4.1",
     "login-plus": "^1.7.1",
     "memorystore": "^1.6.7",
     "mini-tools": "^1.12.1",
@@ -59,7 +59,7 @@
     "numeral": "^2.0.6",
     "pg-promise-strict": "^1.4.0",
     "pikaday": "^1.8.2",
-    "pug": "^3.0.2",
+    "pug": "^3.0.3",
     "read-yaml-promise": "^1.0.2",
     "regexplicit": "^0.1.3",
     "require-bro": "^0.3.1",
@@ -82,7 +82,7 @@
     "@types/js-yaml": "^4.0.9",
     "@types/mocha": "^10.0.6",
     "@types/multiparty": "~0.0.36",
-    "@types/node": "^20.12.11",
+    "@types/node": "^20.13.0",
     "@types/nodemailer": "^6.4.15",
     "@types/numeral": "~2.0.5",
     "@types/session-file-store": "^1.2.5",
@@ -99,8 +99,8 @@
     "kill-9": "~0.4.3",
     "mocha": "^10.4.0",
     "nyc": "^15.1.0",
-    "puppeteer": "^22.8.0",
-    "sinon": "^17.0.2",
+    "puppeteer": "^22.10.0",
+    "sinon": "^18.0.0",
     "supertest": "^7.0.0",
     "types.d.ts": "~0.6.21",
     "typescript": "^5.4.5",

package/unlogged/my-ajax.js

@@ -193,14 +193,17 @@ myAjax.ajaxPromise = function ajaxPromise(procedureDef,data,opts){
         }
         var result=[];
         var progress=procedureDef.progress!==false;
+        /** @type {Record<string,{ divBar, progressBar, progresIndicator, divBarLabel }>} */
+        var progressStruct = {}
         var divProgress;
-        var divBarProgress;
-        var progressBar;
-        var progressIndicator;
-        var divBarProgressLabel;
+        // var divBarProgress = {};
+        // var progressBar;
+        // var progressIndicator;
+        // var divBarProgressLabel = {};
         var onClose=function(){}
         var defaultInformProgress = function defaultInformProgress(progressInfo){
             if(progressInfo.message || progressInfo.end || progressInfo.start || progressInfo.loaded){
+                // progressInfo.idGroup
                 if(!divProgress){
                     var idAutoClose='id-auto-close-'+Math.random();
                     var checkAutoClose=html.input({type:'checkbox', id:idAutoClose, checked:myAjax.ajaxPromise.autoClose}).create();
@@ -235,8 +238,12 @@ myAjax.ajaxPromise = function ajaxPromise(procedureDef,data,opts){
                     }
                 }
             }
-            if(progressInfo.ephemeral && divBarProgressLabel){
-                divBarProgressLabel.textContent=progressInfo.message;
+            if (progressStruct[progressInfo.idGroup] == null) {
+                progressStruct[progressInfo.idGroup] = {}
+            }
+            var ps = progressStruct[progressInfo.idGroup];
+            if(progressInfo.ephemeral && ps.divBarLabel){
+                ps.divBarLabel.textContent = progressInfo.message;
             }else if(progressInfo.message || progressInfo.end){
                 var now=bestGlobals.datetime.now();
                 var elapsed = now.sub(tickTime);
@@ -265,23 +272,23 @@ myAjax.ajaxPromise = function ajaxPromise(procedureDef,data,opts){
                     );
                 }
             }
-            if(progressInfo.loaded){
-                if(!divBarProgress){
-                    divBarProgressLabel = html.div().create();
-                    progressIndicator=html.div({class:'indicator'},' ').create();
-                    progressBar=html.div({class:'progress-bar', style:'width:400px; height:8px;'},[progressIndicator]).create();
-                    divBarProgress = html.div([
-                        divBarProgressLabel,
-                        progressBar
+            if(progressInfo.loaded != null){
+                if(!ps.divBar){
+                    ps.divBarLabel = html.div().create();
+                    ps.progressIndicator=html.div({class:'indicator'},' ').create();
+                    ps.progressBar=html.div({class:'progress-bar', style:'width:400px; height:8px;'},[ps.progressIndicator]).create();
+                    ps.divBar = html.div([
+                        ps.divBarLabel,
+                        ps.progressBar
                     ]).create();
-                    divProgress.parentNode.insertBefore(divBarProgress, divProgress);
+                    divProgress.parentNode.insertBefore(ps.divBar, divProgress);
                 }
                 if(progressInfo.lengthComputable){
-                    progressIndicator.style.width=progressInfo.loaded*100/progressInfo.total+'%';
-                    progressIndicator.title=Math.round(progressInfo.loaded*100/progressInfo.total)+'%';
+                    ps.progressIndicator.style.width=progressInfo.loaded*100/progressInfo.total+'%';
+                    ps.progressIndicator.title=Math.round(progressInfo.loaded*100/progressInfo.total)+'%';
                 }else{
-                    progressIndicator.style.backgroundColor='#D4D';
-                    progressIndicator.title='N/D %';
+                    ps.progressIndicator.style.backgroundColor='#D4D';
+                    ps.progressIndicator.title='N/D %';
                 }
             }
         }
@@ -304,7 +311,6 @@ myAjax.ajaxPromise = function ajaxPromise(procedureDef,data,opts){
         }
         var controlLoggedIn = function controlLoggedIn(result, informNotLoggedIn){
             if(informNotLoggedIn || result && result[0]=="<" && result.match(/login/m)){
-                console.log('xxxxxxxxxxx',procedureDef.action)
                 my.informDetectedStatus('notLogged');
                 throw bestGlobals.changing(new Error(my.messages.notLogged),{displayed:true, isNotLoggedError:true});
             }
@@ -495,13 +501,27 @@ function agregar_json_default_ubicaciones(div, o, a){
     var table = div2.laTabla;
     var row = table.insertRow(-1);
     var cellName = row.insertCell(-1);
-    cellName.className='attr-name';
-    cellName.textContent = a; 
+    agregar_class_textInDiv(cellName, 'attr-name', a)
     var cell = row.insertCell(-1);
     cell.colSpan=99;
     return {title:cellName, data:cell, skip:o[a] == null}
 }
 
+/**
+ * 
+ * @param {HTMLTableDataElement} td
+ * @param {string|number} text
+ * @param {string} className
+ */
+function agregar_class_textInDiv(td, className, text){
+    var div = document.createElement('div');
+    td.className = className;
+    div.className = 'json-container';
+    div.textContent = text;
+    td.innerHTML = '';
+    td.appendChild(div);
+}
+
 /**
  * 
  * @param {HTMLElement} div 
@@ -524,9 +544,7 @@ function agregar_json(div, o, ubicaciones=agregar_json_default_ubicaciones){
                 if(o[a]!=null){
                     var row = table.insertRow(-1);
                     var cellName = row.insertCell(-1);
-                    cellName.className='row-num';
-                    // @ts-ignore numero y texto
-                    cellName.textContent = isNaN(a)?a:Number(a)+1; 
+                    agregar_class_textInDiv(cellName, 'row-num', isNaN(a)?a:Number(a)+1); 
                     agregar_json(row, o[a], function(div, _o, a){
                         // @ts-ignore sé que es Row
                         /** @type {HTMLTableRowElement} */
@@ -554,11 +572,9 @@ function agregar_json(div, o, ubicaciones=agregar_json_default_ubicaciones){
                 if(!cells.skip){
                     if(cells.title){
                         if(o instanceof Array && !isNaN(a)){
-                            cells.title.className='row-num';
-                            cells.title.textContent = Number(a) + 1; 
+                            agregar_class_textInDiv(cells.title, 'row-num', Number(a) + 1); 
                         }else{
-                            cells.title.className='attr-name';
-                            cells.title.textContent = a; 
+                            agregar_class_textInDiv(cells.title, 'attr-name', a); 
                         }
                     }
                     agregar_json(cells.data, o[a]);
@@ -566,13 +582,16 @@ function agregar_json(div, o, ubicaciones=agregar_json_default_ubicaciones){
             }
         }
     }else{
-        div.className='plain-content';
+        var textContent;
         if(typeof o == "boolean"){
-            div.textContent = o?'Sí':'No'
+            textContent = o ? 'Sí' : 'No'
         }else if(o && o instanceof Date && o.isRealDate){
-            div.textContent = o.toDmy();
+            textContent = o.toDmy();
         }else{
-            div.textContent = o.toLocaleString();
+            textContent = o.toLocaleString();
+        }
+        if (textContent) {
+            agregar_class_textInDiv(div, 'plain-content', textContent)
         }
     }
 }