@websy/websy-designs 1.11.11 → 1.11.13

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 = {

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

@@ -2087,7 +2087,12 @@ class WebsyDropdown {
           labelEl.innerHTML = item.label
           labelEl.setAttribute('data-info', item.label)
           inputEl.value = item.value 
-        }        
+        }
+        else if (this.selectedItems[0]) {
+          labelEl.innerHTML = dataToUse[this.selectedItems[0]].label
+          labelEl.setAttribute('data-info', dataToUse[this.selectedItems[0]].label)
+          inputEl.value = dataToUse[this.selectedItems[0]].value 
+        }         
       }
       else if (this.selectedItems.length > 1) {
         if (this.options.showCompleteSelectedList === true) {
@@ -2116,10 +2121,12 @@ class WebsyDropdown {
     if (this.options.onSearch) {
       dataToUse = this.options.items
     }
+    let item
     if (typeof index !== 'undefined' && index !== null) {
       let pos = this.selectedItems.indexOf(index)      
       if (this.options.multiSelect === false) {
         this.selectedItems = [index]
+        item = dataToUse[index]
       }
       else {
         if (pos !== -1) {
@@ -2127,11 +2134,10 @@ class WebsyDropdown {
         }
         else {
           this.selectedItems.push(index)
+          item = dataToUse[index]
         }
       } 
-    }    
-    // const item = this.options.items[index]
-    const item = dataToUse[index]
+    }        
     this.updateHeader(item)
     if (item && this.options.onItemSelected) {
       this.options.onItemSelected(item, this.selectedItems, dataToUse, this.options)
@@ -4192,7 +4198,7 @@ class WebsyResultList {
     const el = document.getElementById(this.elementId)
     el.innerHTML += html.replace(/\n/g, '')
   }
-  buildHTML (d, startIndex = 0, inputTemplate, locator = []) {
+  buildHTML (d = [], startIndex = 0, inputTemplate, locator = []) {
     let html = ``
     if (this.options.template) {      
       if (d.length > 0) {

package/dist/websy-designs-es6.js

@@ -2069,6 +2069,10 @@ var WebsyDropdown = /*#__PURE__*/function () {
             labelEl.innerHTML = item.label;
             labelEl.setAttribute('data-info', item.label);
             inputEl.value = item.value;
+          } else if (this.selectedItems[0]) {
+            labelEl.innerHTML = dataToUse[this.selectedItems[0]].label;
+            labelEl.setAttribute('data-info', dataToUse[this.selectedItems[0]].label);
+            inputEl.value = dataToUse[this.selectedItems[0]].value;
           }
         } else if (this.selectedItems.length > 1) {
           if (this.options.showCompleteSelectedList === true) {
@@ -2103,20 +2107,21 @@ var WebsyDropdown = /*#__PURE__*/function () {
       if (this.options.onSearch) {
         dataToUse = this.options.items;
       }
+      var item;
       if (typeof index !== 'undefined' && index !== null) {
         var pos = this.selectedItems.indexOf(index);
         if (this.options.multiSelect === false) {
           this.selectedItems = [index];
+          item = dataToUse[index];
         } else {
           if (pos !== -1) {
             this.selectedItems.splice(pos, 1);
           } else {
             this.selectedItems.push(index);
+            item = dataToUse[index];
           }
         }
       }
-      // const item = this.options.items[index]
-      var item = dataToUse[index];
       this.updateHeader(item);
       if (item && this.options.onItemSelected) {
         this.options.onItemSelected(item, this.selectedItems, dataToUse, this.options);
@@ -3960,8 +3965,9 @@ var WebsyResultList = /*#__PURE__*/function () {
     }
   }, {
     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] : [];