@websy/websy-designs 1.8.1 → 1.9.0

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

@@ -133,27 +133,32 @@ class AuthHelper {
   }
   checkPermissions (req, res, next) {
     console.log('hello')
-    const permissions = {
-      entities: {
-        POST: false,
-        PUT: true,
-        GET: true,
-        DELETE: true
-      },
-      item: {
-        POST: true,
-        PUT: true,
-        GET: true,
-        DELETE: true
+    if (process.env.USE_PERMISSIONS === 'true' || process.env.USE_PERMISSIONS === true) {
+      const permissions = {
+        entities: {
+          POST: false,
+          PUT: true,
+          GET: true,
+          DELETE: true
+        },
+        item: {
+          POST: true,
+          PUT: true,
+          GET: true,
+          DELETE: true
+        }
+      }    
+      if (permissions[req.params.entity] && permissions[req.params.entity][req.method] === true) {
+        next()
       }
-    }    
-    if (permissions[req.params.entity] && permissions[req.params.entity][req.method] === true) {
-      next()
+      else {
+        res.status(403)
+        res.json('User does not have permissions to ....')
+      } 
     }
     else {
-      res.status(403)
-      res.json('User does not have permissions to ....')
-    }    
+      next()
+    }       
   }
 }
 

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

@@ -110,6 +110,13 @@ class PGHelper {
   buildInsert (entity, data, user) {
     delete data[(this.options.entityConfig[entity] && this.options.entityConfig[entity].idColumn) || 'id']
     // data.create_user = user
+    if (process.env.CREATE_USER_FIELD && process.env.USERID_FIELD && user) {
+      data[process.env.CREATE_USER_FIELD] = user[process.env.USERID_FIELD || 'id']
+      data[process.env.EDIT_USER_FIELD] = user[process.env.USERID_FIELD || 'id']      
+    }
+    if (process.env.EDIT_DATE_FIELD) {
+      data[process.env.EDIT_DATE_FIELD] = (new Date()).toISOString()
+    }
     return `
       INSERT INTO ${entity} (${Object.keys(data).join(',')})
       VALUES (${Object.values(data).map(d => (d === null ? `${d}` : `'${d}'`)).join(',')})

package/dist/server/routes/v1/api.js

@@ -46,7 +46,12 @@ function APIRoutes (dbHelper, authHelper) {
   router.post('/:entity', authHelper.checkPermissions, (req, res) => {
     // const sql = dbHelper.buildInsert(req.params.entity, req.body, req.session.passport.user.id)
     console.log(req.body)
-    const sql = dbHelper.buildInsert(req.params.entity, req.body)
+    console.log(req.session)
+    let user
+    if (req.session && req.session.user) {
+      user = req.session.user
+    }
+    const sql = dbHelper.buildInsert(req.params.entity, req.body, user)
     console.log(sql)
     dbHelper.execute(sql).then(response => res.json(response), err => {
       res.statusCode = 404

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

@@ -1,10 +1,7 @@
 const express = require('express')
 const bodyParser = require('body-parser')
-// const cookie = require('cookie')
 const cookieParser = require('cookie-parser')
 const expressSession = require('express-session')
-// const sessionHelper = require('./helpers/v1/sessionHelper')
-// const DBSession = require(process.env.EXPRESS_SESSION_CONNECT)(expressSession)
 
 module.exports = function (options) {
   return new Promise((resolve, reject) => {
@@ -150,12 +147,15 @@ module.exports = function (options) {
               // 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 === false && excludedRoutes.indexOf(req.path) !== -1) {         
+              // 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')       
                 app.authHelper.isLoggedIn(req, res, next)
               }
-              else if (secureRoutes === true && excludedRoutes.indexOf(req.path) === -1) {
+              else if (secureRoutes === true && excludedRoutes.indexOf('/' + req.path.split('/')[1]) === -1) {
                 // console.log('in condition B')
                 app.authHelper.isLoggedIn(req, res, next)
               }

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

@@ -233,7 +233,7 @@ class ButtonGroup {
         let activeClass = ''
         if (this.options.activeItem !== -1) {
           activeClass = i === this.options.activeItem ? 'active' : 'inactive'
-        }
+        }        
         return `
           <${this.options.tag} ${(t.attributes || []).join(' ')} data-id="${t.id || t.label}" data-index="${i}" class="websy-button-group-item ${(t.classes || []).join(' ')} ${this.options.style}-style ${activeClass}">${t.label}</${this.options.tag}>
         `
@@ -1553,24 +1553,47 @@ class WebsyDropdown {
           <div id='${this.elementId}_mask' class='websy-dropdown-mask'></div>
           <div id='${this.elementId}_content' class='websy-dropdown-content'>
       `
-      if (this.options.customActions.length > 0) {
+      if (this.options.customActions.length > 0 || this.options.customButtons.length > 0) {
         html += `
           <div class='websy-dropdown-action-container'>
+        `
+        if (this.options.customActions.length > 0) {
+          html += `
             ${this.options.actionsTitle || ''}
             <button class='websy-dropdown-action-button'>
               ${this.options.actionsIcon}
             </button>
-            <ul id='${this.elementId}_actionContainer'>
-        `
-        this.options.customActions.forEach((a, i) => {
+          `
+        }
+        if (this.options.customButtons.length > 0) {
           html += `
-            <li class='websy-dropdown-custom-action' data-index='${i}'>${a.label}</li>
+            <div class='websy-dropdown-additional-buttons'>
           `
-        })
-        html += `
-            </ul>
-          </div>
-        `
+          this.options.customButtons.forEach((b, i) => {
+            html += `
+              <button class='websy-dropdown-custom-button' data-index='${i}'>
+                ${b.label}
+              </button>
+            `
+          })
+          html += `
+            </div>
+          `
+        }
+        if (this.options.customActions.length > 0) {
+          html += `            
+              <ul id='${this.elementId}_actionContainer'>
+          `
+          this.options.customActions.forEach((a, i) => {
+            html += `
+              <li class='websy-dropdown-custom-action' data-index='${i}'>${a.label}</li>
+            `
+          })
+          html += `
+              </ul>
+            </div>
+          `
+        }
       }
       if (this.options.disableSearch !== true) {
         html += `
@@ -1590,7 +1613,9 @@ class WebsyDropdown {
       `
       el.innerHTML = html
       const scrollEl = document.getElementById(`${this.elementId}_itemsContainer`)
-      scrollEl.addEventListener('scroll', this.handleScroll.bind(this))
+      if (scrollEl) {
+        scrollEl.addEventListener('scroll', this.handleScroll.bind(this))
+      }      
       this.render()
     }
     else {
@@ -1638,7 +1663,20 @@ class WebsyDropdown {
       this.options.onClearSelected()
     }
   }
-  close () {
+  close () {  
+    this.hide()     
+    const searchEl = document.getElementById(`${this.elementId}_search`)
+    if (searchEl) {
+      if (searchEl.value.length > 0 && this.options.onCancelSearch) {            
+        this.options.onCancelSearch('')
+        searchEl.value = ''
+      }      
+    }
+    if (this.options.onClose) {
+      this.options.onClose(this.elementId)
+    }
+  }
+  hide () {
     const maskEl = document.getElementById(`${this.elementId}_mask`)
     const contentEl = document.getElementById(`${this.elementId}_content`)
     const scrollEl = document.getElementById(`${this.elementId}_itemsContainer`)
@@ -1659,17 +1697,7 @@ class WebsyDropdown {
     if (contentEl) {
       contentEl.classList.remove('active')
       contentEl.classList.remove('on-top')    
-    }    
-    const searchEl = document.getElementById(`${this.elementId}_search`)
-    if (searchEl) {
-      if (searchEl.value.length > 0 && this.options.onCancelSearch) {            
-        this.options.onCancelSearch('')
-        searchEl.value = ''
-      }      
-    }
-    if (this.options.onClose) {
-      this.options.onClose(this.elementId)
-    }
+    } 
   }
   handleClick (event) {
     if (this.options.disabled === true) {
@@ -1698,6 +1726,12 @@ class WebsyDropdown {
         this.options.customActions[actionIndex].fn()
       }
     }
+    else if (event.target.classList.contains('websy-dropdown-custom-button')) {
+      const actionIndex = +event.target.getAttribute('data-index')
+      if (this.options.customButtons[actionIndex] && this.options.customButtons[actionIndex].fn) {
+        this.options.customButtons[actionIndex].fn()
+      }
+    }
     else if (event.target.classList.contains('websy-dropdown-action-button')) {
       const el = document.getElementById(`${this.elementId}_actionContainer`)
       if (el) {
@@ -1995,7 +2029,7 @@ class WebsyDropdown {
 class WebsyForm {
   constructor (elementId, options) {
     const defaults = {
-      submit: { text: 'Save', classes: '' },
+      submit: { text: 'Save', classes: [] },
       useRecaptcha: false,
       clearAfterSave: false,
       fields: [],
@@ -2066,6 +2100,10 @@ class WebsyForm {
       }
     })
   }
+  clear () {
+    const formEl = document.getElementById(`${this.elementId}Form`)    
+    formEl.reset()
+  }
   get data () {
     const formEl = document.getElementById(`${this.elementId}Form`)    
     const data = {}
@@ -4048,7 +4086,9 @@ class WebsyRouter {
     if (typeof params === 'undefined') {
       return
     }
-    this.previousParams = Object.assign({}, this.currentParams)
+    if (reloadView === false) {
+      this.previousParams = Object.assign({}, this.currentParams)      
+    }
     const output = {
       path: '',
       items: {}
@@ -4063,7 +4103,9 @@ class WebsyRouter {
       path = this.buildUrlPath(output.items)
     }
     output.path = path
-    this.currentParams = output
+    if (reloadView === false) {
+      this.currentParams = output      
+    }
     let inputPath = this.currentView
     if (this.options.urlPrefix) {
       inputPath = `/${this.options.urlPrefix}/${inputPath}`
@@ -6027,7 +6069,8 @@ class WebsyTable3 {
       allowPivoting: false,
       searchIcon: `<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 512 512"><title>ionicons-v5-f</title><path d="M221.09,64A157.09,157.09,0,1,0,378.18,221.09,157.1,157.1,0,0,0,221.09,64Z" style="fill:none;stroke:#000;stroke-miterlimit:10;stroke-width:32px"/><line x1="338.29" y1="338.29" x2="448" y2="448" style="fill:none;stroke:#000;stroke-linecap:round;stroke-miterlimit:10;stroke-width:32px"/></svg>`,
       plusIcon: WebsyDesigns.Icons.PlusFilled,
-      minusIcon: WebsyDesigns.Icons.MinusFilled      
+      minusIcon: WebsyDesigns.Icons.MinusFilled,
+      disableInternalLoader: false  
     }
     this.options = Object.assign({}, DEFAULTS, options)
     this.isTouchDevice = ('ontouchstart' in window) || (navigator.maxTouchPoints > 0) || (navigator.msMaxTouchPoints > 0)
@@ -6191,7 +6234,7 @@ class WebsyTable3 {
         bodyHtml += `<td 
           class='websy-table-cell ${sizeIndex < this.pinnedColumns ? 'pinned' : 'unpinned'} ${(cell.classes || []).join(' ')} ${(sizingColumns[sizeIndex].classes || []).join(' ')}'
           style='${style}'
-          data-info='${cell.value}'
+          data-info='${cell.value.replace(/'/g, '`')}'
           colspan='${cell.colspan || 1}'
           rowspan='${cell.rowspan || 1}'
           data-row-index='${rowIndex}'
@@ -6413,6 +6456,9 @@ class WebsyTable3 {
             columnsForSizing[colIndex].actualWidth = 0
           }
           columnsForSizing[colIndex].actualWidth = Math.min(Math.max(columnsForSizing[colIndex].actualWidth, colSize.width), maxWidth)          
+          // if (columnsForSizing[colIndex].width) {
+          //   columnsForSizing[colIndex].actualWidth = columnsForSizing[colIndex].width
+          // }
           columnsForSizing[colIndex].cellHeight = colSize.height   
           if (colIndex >= this.pinnedColumns) {
             firstNonPinnedColumnWidth = columnsForSizing[colIndex].actualWidth
@@ -7054,7 +7100,9 @@ class WebsyTable3 {
     }
   }
   showLoading (options) {
-    this.loadingDialog.show(options)
+    if (this.options.disableInternalLoader !== true) {      
+      this.loadingDialog.show(options)
+    }
   }
 }