@websy/websy-designs 1.11.12 → 1.11.14

package/dist/server/helpers/v1/authHelper.js

@@ -121,13 +121,13 @@ class AuthHelper {
     })    
   }
   isLoggedIn (req, res, next) {
-    // console.log(req.session)
+    console.log(req.session)
     if (req.session && req.session.user && req.session.user.isAnonymous !== true) {      
-      // console.log('in condition D')
+      console.log('in condition D')
       next()
     }
     else {
-      // console.log('in condition E')
+      console.log('in condition E')
       res.redirect('/login')
     }      
   }

package/dist/server/helpers/v1/pgHelper.js

@@ -294,7 +294,6 @@ class PGHelper {
     return sql
   }
   buildWhere (input, entity) {   
-    console.log('input is', input)
     if (typeof input === 'undefined' || input.trim() === '') {
       return '1=1'
     }
@@ -308,7 +307,7 @@ class PGHelper {
       // console.log('where input', input)
       // console.log('splitter is', this.options.fieldValueSeparator)
       let list = input.split(';').map(d => {
-        let parts = d.split(this.options.fieldValueSeparator)
+        let parts = d.split(this.options.fieldValueSeparator)             
         if (parts.length === 2) {
           let partValues = parts[1]
           partValues = partValues.split('|')
@@ -322,12 +321,11 @@ class PGHelper {
             else if (parts[1].indexOf('%') !== -1) {
               return `LOWER(${entity ? entity + '.' : ''}${parts[0]}) LIKE '${parts[1]}'`
             }
-            else {
+            else {              
               return `${entity ? entity + '.' : ''}${parts[0]} = '${parts[1]}'`
             } 
           }  
-          else {
-            console.log(`${entity ? entity + '.' : ''}${parts[0]} IN ('${partValues.join('\',\'')}')`)
+          else {            
             return `${entity ? entity + '.' : ''}${parts[0]} IN ('${partValues.join('\',\'')}')`
           }         
         }  
@@ -337,9 +335,7 @@ class PGHelper {
             return `${entity ? entity + '.' : ''}${parts[0]} <> '${parts[1]}'`
           }
         }              
-      })
-      console.log('list is')
-      console.log(list)
+      })      
       return `
         ${list.length > 0 ? list.join(' AND ') : ''}
       `

package/dist/server/websy-designs-server.js

@@ -67,7 +67,9 @@ module.exports = function (options) {
     app.use('/pdf', require(`./routes/${version}/pdf`))
     if (options.useDB === true) {            
       const dbHelper = require(`./helpers/${version}/${options.dbEngine}Helper`)
-      dbHelper.init(options.dbOnError || {}).then(() => {                       
+      let dbOptions = options.dbEngine === 'pg' ? options.dbOptions : options.dbOnError || {}
+      
+      dbHelper.init(dbOptions).then(() => {                       
         app.set('trust proxy', 1)
         app.use(cookieParser(process.env.SESSION_SECRET))
         let cookieConfig = {
@@ -149,23 +151,23 @@ module.exports = function (options) {
             } 
             else {
               let excludedRoutes = process.env.EXCLUDED_ROUTES.split(',')
-              // console.log('secure routes', secureRoutes)
-              // console.log('excluded routes', excludedRoutes)
-              // console.log('path', req.path)
-              // console.log('index of', excludedRoutes.indexOf(req.path))  
+              console.log('secure routes', secureRoutes)
+              console.log('excluded routes', excludedRoutes)
+              console.log('path', req.path)
+              console.log('index of', excludedRoutes.indexOf(req.path))  
               if (secureRoutes === true) {
                 excludedRoutes.push('/resources', '/scripts', '/styles', '/external', '/templates', '/fonts')
               } 
               if (secureRoutes === false && excludedRoutes.indexOf('/' + req.path.split('/')[1]) !== -1) {         
-                // console.log('in condition A')       
+                console.log('in condition A')       
                 app.authHelper.isLoggedIn(req, res, next)
               }
               else if (secureRoutes === true && excludedRoutes.indexOf('/' + req.path.split('/')[1]) === -1) {
-                // console.log('in condition B')
+                console.log('in condition B')
                 app.authHelper.isLoggedIn(req, res, next)
               }
               else {
-                // console.log('in condition C')
+                console.log('in condition C')
                 next()
               }
               // secureRoutes === false && excludedRoutes.indexOf(req.path) !== -1 && app.authHelper.isLoggedIn(req, res, next)

package/dist/websy-designs-es6.debug.js

@@ -4197,8 +4197,11 @@ class WebsyResultList {
     const html = this.buildHTML(d, startIndex)
     const el = document.getElementById(this.elementId)
     el.innerHTML += html.replace(/\n/g, '')
+    if (this.options.onAppend) {
+      this.options.onAppend()
+    }
   }
-  buildHTML (d, startIndex = 0, inputTemplate, locator = []) {
+  buildHTML (d = [], startIndex = 0, inputTemplate, locator = []) {
     let html = ``
     if (this.options.template) {      
       if (d.length > 0) {
@@ -4435,7 +4438,10 @@ class WebsyResultList {
   resize () {
     const html = this.buildHTML(this.rows)
     const el = document.getElementById(this.elementId)
-    el.innerHTML = html.replace(/\n/g, '')    
+    el.innerHTML = html.replace(/\n/g, '')  
+    if (this.options.onResize) {
+      this.options.onResize()
+    }  
   }
 }
 
@@ -5906,7 +5912,7 @@ class WebsyTable {
     }
   }
   hideLoading () {
-    this.loadingDialog.hide()
+    this.loadingDialog && this.loadingDialog.hide()
   }
   internalSort (column, colIndex) {
     this.options.columns.forEach((c, i) => {
@@ -6052,7 +6058,7 @@ class WebsyTable {
     this._isRendered = true
   } 
   showLoading (options) {
-    this.loadingDialog.show(options)
+    this.loadingDialog && this.loadingDialog.show(options)
   }
 }
 

package/dist/websy-designs-es6.js

@@ -3962,11 +3962,15 @@ var WebsyResultList = /*#__PURE__*/function () {
       var html = this.buildHTML(d, startIndex);
       var el = document.getElementById(this.elementId);
       el.innerHTML += html.replace(/\n/g, '');
+      if (this.options.onAppend) {
+        this.options.onAppend();
+      }
     }
   }, {
     key: "buildHTML",
-    value: function buildHTML(d) {
+    value: function buildHTML() {
       var _this28 = this;
+      var d = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
       var startIndex = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
       var inputTemplate = arguments.length > 2 ? arguments[2] : undefined;
       var locator = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
@@ -4216,6 +4220,9 @@ var WebsyResultList = /*#__PURE__*/function () {
       var html = this.buildHTML(this.rows);
       var el = document.getElementById(this.elementId);
       el.innerHTML = html.replace(/\n/g, '');
+      if (this.options.onResize) {
+        this.options.onResize();
+      }
     }
   }]);
   return WebsyResultList;
@@ -5742,7 +5749,7 @@ var WebsyTable = /*#__PURE__*/function () {
   }, {
     key: "hideLoading",
     value: function hideLoading() {
-      this.loadingDialog.hide();
+      this.loadingDialog && this.loadingDialog.hide();
     }
   }, {
     key: "internalSort",
@@ -5876,7 +5883,7 @@ var WebsyTable = /*#__PURE__*/function () {
   }, {
     key: "showLoading",
     value: function showLoading(options) {
-      this.loadingDialog.show(options);
+      this.loadingDialog && this.loadingDialog.show(options);
     }
   }]);
   return WebsyTable;