@questwork/vue-q-list-vue3 3.1.2 → 3.1.4

package/dist/q-list.min.js.LICENSE.txt

@@ -1,3 +1,24 @@
+Name: @questwork/q-utilities
+Version: 0.1.17
+License: MIT
+Private: false
+Description: Questwork QUtilities
+Author: Questwork Consulting Limited <info@questwork.com> (https://questwork.com/)
+License Copyright:
+===
+
+Copyright 2019 Questwork Consulting Limited
+
+This project is free software released under the MIT/X11 license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
 Name: moment
 Version: 2.30.1
 License: MIT
@@ -103,25 +124,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
----
-
-Name: @questwork/q-utilities
-Version: 0.1.12
-License: MIT
-Private: false
-Description: Questwork QUtilities
-Author: Questwork Consulting Limited <info@questwork.com> (https://questwork.com/)
-License Copyright:
-===
-
-Copyright 2019 Questwork Consulting Limited
-
-This project is free software released under the MIT/X11 license:
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE.

package/lib/helpers/checkIfUsingTemplateCompiler.js

@@ -0,0 +1,9 @@
+
+function checkIfUsingTemplateCompiler(key) {
+  key = key.trim()
+  return (key.indexOf('{{') === 0) || (key.indexOf('<%') === 0)
+}
+
+module.exports = {
+  checkIfUsingTemplateCompiler
+}

package/lib/helpers/getValue.js

@@ -1,19 +1,14 @@
-const { getValueByKeys} = require('@questwork/q-utilities')
+const { getValueByKeys: _getValueByKeys } = require('@questwork/q-utilities')
 
-function getValue(key, value) {
-  return getValueByKeys(key.split('.'), value)
-  // return getValueInObj({ keys: key.split('.'), obj: value })
+function getValue(key, data) {
+  if (data && typeof data.get === 'function') {
+    return data.get(key)
+  }
+  return getValueByKeys(key, data)
 }
 
-function getValueInObj({ keys, obj }) {
-  if (keys.length === 0) {
-    return obj
-  }
-  const firstKey = keys.shift()
-  if (obj && obj.hasOwnProperty(firstKey)) {
-    return getValueInObj({ keys, obj: obj[firstKey] })
-  }
-  return obj
+function getValueByKeys(key, value) {
+  return _getValueByKeys(key.split('.'), value)
 }
 
 module.exports = {

package/lib/helpers/index.js

@@ -1,3 +1,4 @@
+const { checkIfUsingTemplateCompiler } = require('./checkIfUsingTemplateCompiler')
 const { getPopupPosition } = require('./getPopupPosition')
 const { getTitle } = require('./getTitle')
 const { getTooltipPosition } = require('./getTooltipPosition')
@@ -5,6 +6,7 @@ const { getValidation } = require('./getValidation')
 const { getValue } = require('./getValue')
 
 module.exports = {
+  checkIfUsingTemplateCompiler,
   getPopupPosition,
   getTitle,
   getTooltipPosition,

package/lib/models/qListButton/qListButton.js

@@ -1,4 +1,7 @@
+const { getValidation, getValue, checkIfUsingTemplateCompiler } = require('../../helpers')
 const { KeyValueObject } = require('../keyValueObject')
+const { TemplateCompiler } = require('@questwork/q-utilities')
+
 class QListButton {
   constructor(options = {}) {
     options = options || {}
@@ -10,7 +13,6 @@ class QListButton {
     this.endpoint = options.endpoint
     this.httpMethod = options.httpMethod
     this.icon = options.icon
-    this.label = options.label
     this.linkTarget = options.linkTarget
     this.onClick = options.onClick
     this.owner = options.owner
@@ -21,6 +23,8 @@ class QListButton {
     this.showLabel = options.showLabel
     this.title = options.title
     this.url = options.url
+    this._templateCompiler = TemplateCompiler.init(this.qRow)
+    this.label = this.getLabel(options.label)
   }
 
   static init(options) {
@@ -75,6 +79,13 @@ class QListButton {
     }
   }
 
+  getLabel(label = '') {
+    if (checkIfUsingTemplateCompiler(label)) {
+      return this._templateCompiler.pipe(label)
+    }
+    return label
+  }
+
   makeCss() {
     return `__q-list-button ${this.css.element || ''}`
   }
@@ -87,154 +98,19 @@ class QListButton {
 
     return getValidation({
       rule: visibleRule,
-      qRow: this.qRow,
+      data: this.qRow,
     })
   }
 }
 
-// function getValidation({ rule, qRow }) {
-//   const { key = '', value } = rule
-//   const [valueAttribute] = Object.keys(value)
-
-//   if (!key) {
-//     switch(valueAttribute) {
-//       case '$and': {
-//         const arr = value['$and']
-//         return arr.reduce((acc, item) => {
-//           return acc && getValidation({ rule: item, qRow})
-//         }, true)
-//       }
-//       case '$or': {
-//         const arr = value['$or']
-//         return arr.reduce((acc, item) => {
-//           return acc || getValidation({ rule: item, qRow})
-//         }, false)
-//       }
-//     }
-//     return false
-//   } 
 
-//   const rowValue = qRow.get(key)
-//   switch (valueAttribute) {
-//     case '$empty': {
-//       return !rowValue === value['$empty']
-//     }
-//     case '$lte': {
-//       return rowValue <= value['$lte']
-//     }
-//   }
-//   return false
+// function getDataByKey(key, data) {
+//   return data.get(key)
 // }
 
-function _getValidation(rule, data, getDataByKey) {
-  if (!rule) {
-    return true
-  }
-  if (!getDataByKey || typeof getDataByKey !== 'function') {
-    return false
-  }
-  const { key = '', value } = rule
-  const [valueAttribute] = Object.keys(value)
-
-  if (!key) {
-    switch (valueAttribute) {
-      case '$and': {
-        const arr = value['$and']
-        return arr.reduce((acc, item) => (acc && _getValidation(item, data, getDataByKey)), true)
-      }
-      case '$or': {
-        const arr = value['$or']
-        return arr.reduce((acc, item) => (acc || _getValidation(item, data, getDataByKey)), false)
-      }
-      default:
-        return false
-    }
-  }
-
-  const rowValue = getDataByKey(key, data)
-  switch (valueAttribute) {
-    case '$empty': {
-      return !rowValue === !!value['$empty']
-    }
-    case '$eq': {
-      return rowValue === value['$eq']
-    }
-    case '$gt': {
-      return rowValue > value['$gt']
-    }
-    case '$gte': {
-      return rowValue >= value['$gte']
-    }
-    case '$lt': {
-      return rowValue < value['$lt']
-    }
-    case '$lte': {
-      return rowValue <= value['$lte']
-    }
-    case '$in': {
-      debugger
-      console.log('rowValuda', rowValue)
-      if (Array.isArray(rowValue)) {
-        return !!rowValue.find((e) => (value['$in'].includes(e)))
-      }
-      if (typeof rowValue !== 'object') {
-        return !!value['$in'].includes(rowValue)
-      }
-      return false
-    }
-    case '$inValue': {
-      const result = getDataByKey(value['$inValue'], data)
-      const _value = Array.isArray(result) ? result : []
-      if (Array.isArray(rowValue)) {
-        return !!rowValue.find((e) => (_value.includes(e)))
-      }
-      if (typeof rowValue === 'string') {
-        return !!_value.includes(rowValue)
-      }
-      return false
-    }
-    case '$ne': {
-      return rowValue !== value['$ne']
-    }
-    case '$notIn': {
-      if (Array.isArray(rowValue)) {
-        return !rowValue.find((e) => (value['$notIn'].includes(e)))
-      }
-      if (typeof rowValue !== 'object') {
-        return !value['$notIn'].includes(rowValue)
-      }
-      return false
-    }
-    case '$notInValue': {
-      const result = getDataByKey(value['$notInValue'], data)
-      const _value = Array.isArray(result) ? result : []
-      if (Array.isArray(rowValue)) {
-        return !rowValue.find((e) => (_value.includes(e)))
-      }
-      if (typeof rowValue !== 'object') {
-        return !_value.includes(rowValue)
-      }
-      return false
-    }
-    case '$range': {
-      const [min, max] = value['$range']
-      if (typeof min === 'number' && typeof max === 'number' && rowValue >= min && rowValue <= max) {
-        return true
-      }
-      return false
-    }
-    default:
-      return false
-  }
-}
-
-function getDataByKey(key, data) {
-  return data.get(key)
-}
-
-function getValidation({ rule, qRow }) {
-  return _getValidation(rule, qRow, getDataByKey)
-}
+// function getValidation({ rule, qRow }) {
+//   return _getValidation(rule, qRow, getDataByKey, KeyValueObject)
+// }
 
 module.exports = {
   QListButton

package/lib/models/qRow/qRow.js

@@ -84,8 +84,17 @@ class QRow {
         // return this[realKey]
       }
       // check if regular expr
-      if (_useTemplateCompiler(key)) {
-        return this._templateCompiler.pipe(key)
+      if (_hasTemplateDelimiters(key)) {
+        const regex = /(\{\{ \w+\((['"])(.*?)\2\) \}\})|([^{]+)/g
+        const result = key.match(regex)?.filter(Boolean) || [key]
+        return result.reduce((acc, k) => {
+          if (_hasTemplateDelimiters(k)) {
+            acc += this._templateCompiler.pipe(k)
+          } else {
+            acc += k
+          }
+          return acc
+        }, '')
       }
       if (key.includes('.')) {
         const arr = key.split('.')
@@ -227,9 +236,14 @@ function setShouldBeVisible(shouldBeVisible) {
   }
 }
 
-function _useTemplateCompiler(key) {
+function _hasTemplateDelimiters(key) {
   key = key.trim()
-  return (key.indexOf('{{') === 0) || (key.indexOf('<%') === 0)
+  // Check for {{ }} pattern
+  const doubleCurlyRegex = /\{\{.*?\}\}/
+  // Check for <% %> pattern
+  const anglePercentRegex = /<%.*?%>/
+  
+  return doubleCurlyRegex.test(key) || anglePercentRegex.test(key)
 }
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@questwork/vue-q-list-vue3",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "description": "Questwork vue component for displaying a list",
   "exports": {
     ".": {
@@ -16,7 +16,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@questwork/q-utilities": "^0.1.12"
+    "@questwork/q-utilities": "^0.1.16"
   },
   "devDependencies": {
     "@babel/core": "^7.17.8",