@websy/websy-designs 1.7.8 → 1.7.10

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

@@ -131,6 +131,30 @@ class AuthHelper {
       res.redirect('/login')
     }      
   }
+  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 (permissions[req.params.entity] && permissions[req.params.entity][req.method] === true) {
+      next()
+    }
+    else {
+      res.status(403)
+      res.json('User does not have permissions to ....')
+    }    
+  }
 }
 
 module.exports = AuthHelper

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

@@ -2,9 +2,8 @@ const express = require('express')
 const router = express.Router()
 // const PG = require('../helpers/dbHelper')
 // const dbHelper = new PG()
-// const AuthHelper = require('../helpers/auth')
 
-function APIRoutes (dbHelper) {
+function APIRoutes (dbHelper, authHelper) {  
   router.delete('/:entity/:id', (req, res) => {
     const sql = `DELETE FROM ${req.params.entity} WHERE ${dbHelper.buildWhereWithId(req.params.entity, req.params.id)}`
     dbHelper.execute(sql).then(response => res.json(response), err => res.json(err))
@@ -44,7 +43,7 @@ function APIRoutes (dbHelper) {
       }      
     }, err => res.json(err))
   })
-  router.post('/:entity', (req, res) => {
+  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)

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

@@ -26,6 +26,7 @@ module.exports = function (options) {
     app.set('trust proxy', 1)
     process.env.wdRoot = __dirname
     let version = options.version || 'v1'
+    process.env.WD_VERSION = version
     app.use(bodyParser.json({limit: '5mb'}))
     app.use(bodyParser.urlencoded({limit: '5mb', extended: true}))
     app.use(bodyParser.raw({limit: '5mb'}))
@@ -172,7 +173,7 @@ module.exports = function (options) {
         }
         app.use(protectedRoutes)
         if (options.useAPI === true) {
-          app.use('/api', protectedRoutes, require(`./routes/${version}/api`)(dbHelper)) 
+          app.use('/api', protectedRoutes, require(`./routes/${version}/api`)(dbHelper, app.authHelper)) 
         }
         if (options.useShop === true) {
           app.use('/shop', protectedRoutes, require(`./routes/${version}/shop`)(dbHelper, options.dbEngine, app))

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

@@ -6055,7 +6055,13 @@ class WebsyTable3 {
             <div id="${this.elementId}_hScrollContainer" class="websy-h-scroll-container">
               <div id="${this.elementId}_hScrollHandle" class="websy-scroll-handle websy-scroll-handle-x"></div>
             </div>
-            <div id="${this.elementId}_touchScroller" class="websy-table-touch-scroller hidden"></div>
+      `
+      if (this.isTouchDevice === true) {
+        html += `
+            <div id="${this.elementId}_touchScroller" class="websy-table-touch-scroller"></div>
+        `
+      }
+      html += `            
           </div>     
           <div id="${this.elementId}_errorContainer" class='websy-vis-error-container'>
             <div>
@@ -6079,7 +6085,7 @@ class WebsyTable3 {
       el.addEventListener('click', this.handleClick.bind(this))
       el.addEventListener('mousedown', this.handleMouseDown.bind(this))
       el.addEventListener('touchstart', this.handleTouchStart.bind(this))
-      window.addEventListener('touchmove', this.handleTouchMove.bind(this))
+      el.addEventListener('touchmove', this.handleTouchMove.bind(this))
       window.addEventListener('touchend', this.handleTouchEnd.bind(this))
       window.addEventListener('mousemove', this.handleMouseMove.bind(this))
       window.addEventListener('mouseup', this.handleMouseUp.bind(this))
@@ -6212,12 +6218,12 @@ class WebsyTable3 {
         }
         if (sizingColumns[sizeIndex].showAsLink === true && cell.value.trim() !== '') {
           cell.value = `
-            <a href='${cell.value}' target='${sizingColumns[sizeIndex].openInNewTab === true ? '_blank' : '_self'}'>${cell.displayText || sizingColumns[sizeIndex].linkText || cell.value}</a>
+            <a href="${cell.value}" target='${sizingColumns[sizeIndex].openInNewTab === true ? '_blank' : '_self'}'>${cell.displayText || sizingColumns[sizeIndex].linkText || cell.value}</a>
           `
         }
         if (sizingColumns[sizeIndex].showAsRouterLink === true && cell.value.trim() !== '') {
           cell.value = `
-            <a data-view='${(cell.link || cell.value).replace(/'/g, '\'')}' class='websy-trigger'>${cell.value}</a>
+            <a data-view="${(cell.link || cell.value).replace(/'/g, '\'')}" class='websy-trigger'>${cell.value}</a>
           `
         }
         if (sizingColumns[sizeIndex].showAsImage === true) {
@@ -6623,8 +6629,8 @@ class WebsyTable3 {
       this.isPerpetual = true
       // this.perpetualScroll()	
       this.touchStartTime = null
-      const touchScrollEl = document.getElementById(`${this.elementId}_touchScroller`)
-      touchScrollEl.classList.add('hidden')
+      // const touchScrollEl = document.getElementById(`${this.elementId}_touchScroller`)
+      // touchScrollEl.classList.add('hidden')
     }
   }
   handleTouchMove (event) {
@@ -6635,6 +6641,12 @@ class WebsyTable3 {
       if (typeof event.targetTouches !== 'undefined' && event.targetTouches.length > 0) {
         let deltaX = (this.mouseXStart - event.targetTouches[0].pageX)
         let deltaY = (this.mouseYStart - event.targetTouches[0].pageY)
+        const hScrollContainerEl = document.getElementById(`${this.elementId}_hScrollContainer`)
+        const vScrollContainerEl = document.getElementById(`${this.elementId}_vScrollContainer`)
+        const hScrollHandleEl = document.getElementById(`${this.elementId}_hScrollHandle`)    
+        const vScrollHandleEl = document.getElementById(`${this.elementId}_vScrollHandle`)    
+        let translatedDeltaX = deltaX * (hScrollHandleEl.getBoundingClientRect().width / vScrollContainerEl.getBoundingClientRect().width)
+        let translatedDeltaY = deltaY * (vScrollHandleEl.getBoundingClientRect().height / vScrollContainerEl.getBoundingClientRect().height)
         // need to adjust the delta so that it scrolls at a reasonable speed/distance
         const scrollHandleXEl = document.getElementById(`${this.elementId}_hScrollHandle`)
         const scrollHandleYEl = document.getElementById(`${this.elementId}_vScrollHandle`)
@@ -6644,7 +6656,7 @@ class WebsyTable3 {
         // else {
         //   this.isTouchScrolling = false
         // }
-        console.log('delta init', deltaY)
+        console.log('delta', this.mouseYStart, event.targetTouches[0].pageY, deltaY)
         // deltaX = deltaX * (scrollHandleXEl.offsetWidth / this.sizes.scrollableWidth)
         // deltaY = deltaY * (scrollHandleYEl.offsetHeight / this.sizes.bodyHeight)
         // console.log('delta', deltaY)
@@ -6659,11 +6671,13 @@ class WebsyTable3 {
         // delta = Math.max(-10, delta)		
         if (this.isTouchScrolling === true) {			
           // this.$scope.scrollTop += (delta / (this.$scope.layout.qHyperCube.qSize.qcy / this.$scope.rowsToLoad / (this.$scope.totalSpaceAvailable / 250)))          		
-          if (Math.abs(deltaX) > Math.abs(deltaY) && deltaX > 10) {
-            this.scrollX(Math.max(-5, Math.min(5, deltaX)))
+          if (Math.abs(deltaX) > Math.abs(deltaY) && deltaX > 20) {
+            // this.scrollX(Math.max(-5, Math.min(5, translatedDeltaX)))
+            this.scrollX(translatedDeltaX)
           }
-          else {
-            this.scrollY(Math.max(-5, Math.min(5, deltaY)))
+          else if (deltaY > 20) {
+            // this.scrollY(Math.max(-5, Math.min(5, translatedDeltaY)))
+            this.scrollY(translatedDeltaY)
           }
         }		
       }
@@ -6683,8 +6697,8 @@ class WebsyTable3 {
       this.isPerpetual = false
       this.mouseYStart = event.targetTouches[0].pageY
       this.mouseXStart = event.targetTouches[0].pageX    
-      const touchScrollEl = document.getElementById(`${this.elementId}_touchScroller`)
-      touchScrollEl.classList.remove('hidden')
+      // const touchScrollEl = document.getElementById(`${this.elementId}_touchScroller`)
+      // touchScrollEl.classList.remove('hidden')
       const handleYEl = document.getElementById(`${this.elementId}_vScrollHandle`)
       this.handleYStart = handleYEl.offsetTop
       const handleXEl = document.getElementById(`${this.elementId}_hScrollHandle`)
@@ -6987,7 +7001,8 @@ class WebsyChart {
       brushHeight: 50,
       minBandWidth: 30,
       maxBandWidth: 100,
-      allowUnevenBands: true
+      allowUnevenBands: true,
+      balancedMinMax: false
     }
     this.elementId = elementId
     this.options = Object.assign({}, DEFAULTS, options)
@@ -7527,14 +7542,14 @@ else {
     this.options.data.bottom = { data: [] }
   }  
   if (this.options.orientation === 'vertical') {
-    this.leftAxisLayer.attr('class', 'y-axis')
-    this.rightAxisLayer.attr('class', 'y-axis')
-    this.bottomAxisLayer.attr('class', 'x-axis')
+    this.leftAxisLayer && this.leftAxisLayer.attr('class', 'y-axis')
+    this.rightAxisLayer && this.rightAxisLayer.attr('class', 'y-axis')
+    this.bottomAxisLayer && this.bottomAxisLayer.attr('class', 'x-axis')
   }
   else {
-    this.leftAxisLayer.attr('class', 'x-axis')
-    this.rightAxisLayer.attr('class', 'x-axis')
-    this.bottomAxisLayer.attr('class', 'y-axis')
+    this.leftAxisLayer && this.leftAxisLayer.attr('class', 'x-axis')
+    this.rightAxisLayer && this.rightAxisLayer.attr('class', 'x-axis')
+    this.bottomAxisLayer && this.bottomAxisLayer.attr('class', 'y-axis')
   }
   const el = document.getElementById(this.elementId)
   if (el) {
@@ -7650,6 +7665,22 @@ else {
       if (this.options.data.right.formatter) {
         this.longestRight = this.options.data.right.formatter(this.options.data.right.max).toString()
       }
+    } 
+    // Check to see if we need to balance the min and max values
+    if (this.options.balancedMinMax) {
+      if (this.options.orientation === 'horizontal') {
+        let biggestBottom = Math.max(Math.abs(this.options.data.bottom.min, this.options.data.bottom.max))
+        this.options.data.bottom.min = 1 - biggestBottom
+        this.options.data.bottom.max = biggestBottom
+      }
+      else {
+        let biggestLeft = Math.max(Math.abs(this.options.data.left.min, this.options.data.left.max))
+        this.options.data.left.min = 1 - biggestLeft
+        this.options.data.left.max = biggestLeft
+        let biggestRight = Math.max(Math.abs(this.options.data.right.min, this.options.data.right.max))
+        this.options.data.right.min = 1 - biggestRight
+        this.options.data.right.max = biggestRight
+      }
     }    
     // establish the space needed for the various axes    
     // this.options.margin.axisLeft = this.longestLeft * ((this.options.data.left && this.options.data.left.fontSize) || this.options.fontSize) * 0.7
@@ -7831,7 +7862,7 @@ else {
     //   }
     // }    
     // Translate the layers
-    const leftBrushAdjustment = this.brushNeeded === true ? this.options.brushHeight + 5 : 0
+    const leftBrushAdjustment = this.brushNeeded === true ? this.options.brushHeight : 0
     this.leftAxisLayer
       .attr('transform', `translate(${leftBrushAdjustment + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
       .style('font-size', (this.options.data.left && this.options.data.left.fontSize) || this.options.fontSize)
@@ -7848,23 +7879,23 @@ else {
     this.bottomAxisLabel
       .attr('transform', `translate(${leftBrushAdjustment + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop + this.plotHeight})`)
     this.plotArea
-      .attr('transform', `translate(${leftBrushAdjustment - 5 + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
+      .attr('transform', `translate(${leftBrushAdjustment + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
     this.areaLayer
-      .attr('transform', `translate(${leftBrushAdjustment - 5 + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
+      .attr('transform', `translate(${leftBrushAdjustment + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
     this.lineLayer
-      .attr('transform', `translate(${leftBrushAdjustment - 5 + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
+      .attr('transform', `translate(${leftBrushAdjustment + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
     this.barLayer
-      .attr('transform', `translate(${leftBrushAdjustment - 5 + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
+      .attr('transform', `translate(${leftBrushAdjustment + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
     this.labelLayer
-      .attr('transform', `translate(${leftBrushAdjustment - 5 + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
+      .attr('transform', `translate(${leftBrushAdjustment + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
     this.symbolLayer
-      .attr('transform', `translate(${leftBrushAdjustment - 5 + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
+      .attr('transform', `translate(${leftBrushAdjustment + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
     this.refLineLayer
-      .attr('transform', `translate(${leftBrushAdjustment - 5 + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
+      .attr('transform', `translate(${leftBrushAdjustment + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
     this.trackingLineLayer
-      .attr('transform', `translate(${leftBrushAdjustment - 5 + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)         
+      .attr('transform', `translate(${leftBrushAdjustment + this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)         
     this.clip
-      .attr('transform', `translate(${(leftBrushAdjustment - 5) + this.options.margin.left + this.options.margin.axisLeft}, 0)`)
+      .attr('transform', `translate(${(leftBrushAdjustment) + this.options.margin.left + this.options.margin.axisLeft}, 0)`)
       .attr('width', this.plotWidth)
       .attr('height', this.plotHeight + this.options.margin.top + this.options.margin.axisTop)   
     if (this.options.orientation === 'horizontal') {
@@ -8421,9 +8452,9 @@ function getBarWidth (d, i, yAxis, xAxis) {
   let output
   if (this.options.orientation === 'horizontal') {    
     // output = this[`${yAxis}Axis`](Math.abs(d.y.value))
-    output = this[`${yAxis}Axis`](Math.abs(d.y.value))
+    // output = this[`${yAxis}Axis`](Math.abs(d.y.value))
     // output = (this[`${yAxis}Axis`](0)) + this[`${yAxis}Axis`](Math.abs(d.y.value))
-    // output = (this[`${yAxis}Axis`](0)) - this[`${yAxis}Axis`](Math.abs(d.y.value))
+    output = (this[`${yAxis}Axis`](0)) - this[`${yAxis}Axis`](Math.abs(d.y.value))
   }
   else {
     let x = getBarX.call(this, d, i, yAxis, xAxis)
@@ -8459,11 +8490,21 @@ function getBarX (d, i, yAxis, xAxis) {
       let accH = getBarWidth.call(this, {x: d.x, y: { value: d.y.accumulative }}, i, yAxis, xAxis)      
       let h = getBarWidth.call(this, d, i, yAxis, xAxis)      
       // output = (this[`${yAxis}Axis`](0)) + ((accH + h) * (d.y.accumulative > 0 ? 0 : 1))
-      output = (this[`${yAxis}Axis`](0)) + ((accH) * (d.y.accumulative > 0 ? 1 : 0))
+      if (d.y.value >= 0) {
+        output = (this[`${yAxis}Axis`](0)) + ((Math.abs(accH)) * (d.y.accumulative > 0 ? 1 : 0)) 
+      }
+      else {
+        output = (this[`${yAxis}Axis`](0)) - ((Math.abs(accH) + Math.abs(h)) * (d.y.accumulative > 0 ? 1 : 0))
+      }      
     }
     else {
       let h = getBarWidth.call(this, d, i, yAxis, xAxis)
-      output = (this[`${yAxis}Axis`](0)) + (h * (d.y.value > 0 ? 0 : 1))
+      if (d.y.value >= 0) {
+        output = (this[`${yAxis}Axis`](0))
+      }
+      else {
+        output = (this[`${yAxis}Axis`](0)) + h
+      }
     }
   }
   else {
@@ -8648,27 +8689,28 @@ if (this.options.showLabels === true || series.showLabels === true) {
         if (that.options.grouping === 'stacked' && series.labelPosition !== 'outside') {
           this.setAttribute('text-anchor', 'middle')
         }
-        else if (that.plotWidth - getLabelX.call(that, d) < this.getComputedTextLength()) {
+        else if (that.plotWidth - getLabelX.call(that, d) < this.getComputedTextLength()) {          
           this.setAttribute('text-anchor', 'end')
           this.setAttribute('x', +(this.getAttribute('x')) - 8)                  
           this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color))
         } 
-        else if (d.y.value < 0 && d.y.value !== that.options.data[yAxis].min) {
-          this.setAttribute('text-anchor', 'end')
-          this.setAttribute('x', +(this.getAttribute('x')) - 8)                  
-          this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'))
-        }     
-        else if (d.y.value < 0 && d.y.value === that.options.data[yAxis].min) {
+        else if (d.y.value < 0 && this.getAttribute('x') < 0) {
           this.setAttribute('text-anchor', 'start')
-          this.setAttribute('x', +(this.getAttribute('x')) + 8)                  
+          this.setAttribute('x', Math.max(+(this.getAttribute('x')) + 8, 8))                  
           this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color))
         }  
+        else if (d.y.value < 0 && this.getAttribute('x') > 0) {          
+          this.setAttribute('text-anchor', 'end')
+          this.setAttribute('x', +(this.getAttribute('x')) - 8)                  
+          this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'))
+        }             
         else if (series.labelPosition === 'outside') {
           this.setAttribute('text-anchor', 'start')
           this.setAttribute('x', +(this.getAttribute('x')) + 8)                  
           this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'))
         }
-        else {                  
+        else {              
+          this.setAttribute('text-anchor', 'start')         
           this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'))
         }
       }
@@ -8705,16 +8747,16 @@ if (this.options.showLabels === true || series.showLabels === true) {
           this.setAttribute('x', +(this.getAttribute('x')) - 8)                  
           this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color))
         }  
-        else if (d.y.value < 0 && d.y.value !== that.options.data[yAxis].min) {
-          this.setAttribute('text-anchor', 'end')
-          this.setAttribute('x', +(this.getAttribute('x')) - 8)                  
-          this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'))
-        }
-        else if (d.y.value < 0 && d.y.value === that.options.data[yAxis].min) {
+        else if (d.y.value < 0 && this.getAttribute('x') < 0) {
           this.setAttribute('text-anchor', 'start')
-          this.setAttribute('x', +(this.getAttribute('x')) + 8)                  
+          this.setAttribute('x', Math.max(+(this.getAttribute('x')) + 8, 8))                  
           this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color))
         }  
+        else if (d.y.value < 0 && this.getAttribute('x') > 0) {          
+          this.setAttribute('text-anchor', 'end')
+          this.setAttribute('x', +(this.getAttribute('x')) - 8)                  
+          this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'))
+        } 
         else if (series.labelPosition === 'outside') {
           this.setAttribute('text-anchor', 'start')
           this.setAttribute('x', +(this.getAttribute('x')) + 8)