@questwork/vue-q-widget-vue3 3.1.0 → 3.1.2

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

@@ -1 +1,82 @@
-No third parties dependencies
+Name: @questwork/q-utilities
+Version: 0.1.0
+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: lodash
+Version: 4.17.21
+License: MIT
+Private: false
+Description: Lodash modular utilities.
+Repository: undefined
+Homepage: https://lodash.com/
+Author: John-David Dalton <john.david.dalton@gmail.com>
+Contributors:
+  John-David Dalton <john.david.dalton@gmail.com>
+  Mathias Bynens <mathias@qiwi.be>
+License Copyright:
+===
+
+Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
+
+Based on Underscore.js, copyright Jeremy Ashkenas,
+DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
+
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/lodash/lodash
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
+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.
+
+====
+
+Copyright and related rights for sample code are waived via CC0. Sample
+code is defined as all source code displayed within the prose of the
+documentation.
+
+CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+====
+
+Files located in the node_modules and vendor directories are externally
+maintained libraries used by this software which have their own
+licenses; we recommend you read them, as their terms may differ from the
+terms above.

package/lib/helpers/index.js

@@ -1,2 +1,3 @@
 export * from './controller'
+export * from './configHandler'
 export * from './utilities'

package/lib/helpers/utilities/convertString/convertString.js

@@ -0,0 +1,14 @@
+import { getValueByKeys } from '../getValueByKeys'
+
+import { convertString as _convertString } from '@questwork/q-utilities'
+
+function convertString(string, patternMatch, value) {
+  return _convertString(string, patternMatch, value, getValueByKeys)
+}
+
+export default {
+  convertString
+}
+export {
+  convertString
+}

package/lib/helpers/utilities/convertString/index.js

@@ -0,0 +1 @@
+export { convertString } from './convertString'

package/lib/helpers/utilities/getStringByArr/getStringByArr.js

@@ -0,0 +1,59 @@
+import { getValidation as _getValidation } from '../getValidation'
+import { getValueByKeys as _getValueByKeys } from '../getValueByKeys'
+
+function getStringByArr(arr, data) {
+  return _getStringByArr(arr, data, _getValueByKeys, _getValidation)
+}
+
+export default {
+  getStringByArr
+}
+export {
+  getStringByArr
+}
+
+function _getStringByArr(arr, data, getValueByKeys, getValidation) {
+  if (!Array.isArray(arr) || arr.length === 0) {
+    return ''
+  }
+  return arr.reduce((acc, item) => {
+    const { type, value = '', restriction, template } = item
+    if (getValidation({ rule: restriction, data })) {
+      switch (type) {
+        case ('label'): {
+          acc += (value.toString())
+          break
+        }
+        case ('value'): {
+          const _value = getValueByKeys({ keys: value.split('.'), obj: data }) || ''
+          acc += (_value.toString())
+          break
+        }
+        case ('array'): {
+          const _value = getValueByKeys({ keys: value.split('.'), obj: data }) || []
+          acc += _value.reduce((_acc, _item) => (_acc += getStringByArr(template, _item)), '')
+          break
+        }
+        case ('group'): {
+          acc += getStringByArr(template, data)
+          break
+        }
+        case ('ellipsis'): {
+          const { maxLength } = item
+          const _value = getValueByKeys({ keys: value.split('.'), obj: data }) || ''
+          if (_value.length <= maxLength) {
+            acc += (_value.toString())
+          } else {
+            acc += `${_value.substr(0, maxLength)}...`
+          }
+          break
+        }
+        default: {
+          acc += (value.toString())
+          break
+        }
+      }
+    }
+    return acc
+  }, '')
+}

package/lib/helpers/utilities/getStringByArr/index.js

@@ -0,0 +1 @@
+export { getStringByArr } from './getStringByArr'

package/lib/helpers/utilities/getValidation/getValidation.js

@@ -0,0 +1,19 @@
+import { getValueByKeys as _getValueByKeys } from '../getValueByKeys'
+import { KeyValueObject } from '../keyValueObject'
+import { getValidation as _getValidation } from '@questwork/q-utilities'
+
+function getValidation({ rule, data }) {
+  return _getValidation(rule, data, _getDataByKey, KeyValueObject)
+}
+
+function _getDataByKey(key, data) {
+  const keys = key.split('.')
+  return _getValueByKeys({ keys, obj: data })
+}
+
+export default {
+  getValidation
+}
+export {
+  getValidation
+}

package/lib/helpers/utilities/getValidation/index.js

@@ -0,0 +1 @@
+export { getValidation } from './getValidation'

package/lib/helpers/utilities/getValueByKeys/getValueByKeys.js

@@ -0,0 +1,13 @@
+
+import { getValueByKeys as _getValueByKeys } from '@questwork/q-utilities'
+
+function getValueByKeys({ keys, obj }) {
+  return _getValueByKeys(keys, obj)
+}
+
+export default {
+  getValueByKeys
+}
+export {
+  getValueByKeys
+}

package/lib/helpers/utilities/getValueByKeys/index.js

@@ -0,0 +1 @@
+export { getValueByKeys } from './getValueByKeys'

package/lib/helpers/utilities/index.js

@@ -1,2 +1,6 @@
-export * from './configHandler'
+export * from './convertString'
+export * from './getValidation'
+export * from './getValueByKeys'
+export * from './getStringByArr'
+export * from './keyValueObject'
 export * from './setId'

package/lib/helpers/utilities/keyValueObject/index.js

@@ -0,0 +1 @@
+export { KeyValueObject } from './keyValueObject'

package/lib/helpers/utilities/keyValueObject/keyValueObject.js

@@ -0,0 +1,7 @@
+'use strict'
+
+import { KeyValueObject } from '@questwork/q-utilities'
+
+export {
+  KeyValueObject
+}

package/lib/models/controller/controller.js

@@ -10,11 +10,16 @@ class Controller {
     this.initialState = opt.initialState
     this.name = opt.name
     this.saveStateKeys = opt.saveStateKeys || []
-    this.setLayout(opt.layout, opt.controllerHelpers)
+    this.setLayout(opt.layout)
   }
 
   get isValid() {
-    return !!this.id && !!this.layout
+    return !!this.id && this.isValidControllerHelpers
+  }
+
+  get isValidControllerHelpers() {
+    const { qUtilities } = this.controllerHelpers
+    return qUtilities && isFunction(qUtilities.convertString) && isFunction(qUtilities.getValidation)
   }
 
   static init(layout) {
@@ -41,7 +46,11 @@ class Controller {
     return this.state
   }
 
-  setLayout(layout, controllerHelpers) {
+  setLayout(layout) {
+    const controllerHelpers = {
+      ...this.controllerHelpers,
+      controller: this
+    }
     this.layout = NodeFactory.init({ layout, controllerHelpers })
   }
 
@@ -49,15 +58,22 @@ class Controller {
     this.elements = elements
   }
 
-  updateState(state) {
+  updateState(state = {}) {
     this.state = {
       ...this.state,
       ...state
     }
-    this.layout.updateElementState(this.state)
+    if (this.layout) {
+      this.layout.updateElementState(this.state)
+    }
   }
 }
 
+function isFunction(fun) {
+  return typeof fun === 'function'
+}
+
+
 export default {
   Controller
 }

package/lib/models/factories/nodeFactory.js

@@ -32,6 +32,7 @@ function initNode(layout, nodes, controllerHelpers) {
     }
     const i = (NODE_TYPE[nodeType]).init({
       ...layout,
+      controllerHelpers,
       permissionResult
     })
     if (i) {

package/lib/models/index.js

@@ -1,5 +1,4 @@
 export * from './configs'
-export * from './controllerHelpers'
 export * from './controller'
 export * from './factories'
 export * from './nodes'

package/lib/models/nodes/element.js

@@ -4,6 +4,7 @@ import { configHandler } from '../../helpers'
 class Element extends Node {
   constructor(opt = {}) {
     super(opt)
+    this.controllerHelpers = opt.controllerHelpers
     this.configPermissions = opt.configPermissions
     this.name = opt.name
     this.nodeType = opt.nodeType || 'Element'

package/lib/models/nodes/elements/qButton.js

@@ -3,6 +3,21 @@ import { Element } from '../element'
 class ElementQButton extends Element {
   constructor(opt = {}) {
     super(opt)
+    this.defaultStateName = {
+      qButton: 'qButton'
+    }
+  }
+
+  getConfig() {
+    let config = this.config || {}
+    if (this.state.qButton) {
+      const stateConfig = this.state.qButton
+      config = {
+        ...stateConfig,
+        ...config
+      }
+    }
+    return config
   }
 }
 

package/lib/models/nodes/elements/qForm.js

@@ -1,3 +1,4 @@
+import lodash from 'lodash'
 import { Element } from '../element'
 import { ElementQFormConfig } from '../../configs'
 
@@ -14,17 +15,30 @@ class ElementQForm extends Element {
     }
   }
 
-  getConfig(helpers) {
+  get isValid() {
+    return super.isValid && this.isValidHelpers
+  }
+
+  get isValidHelpers() {
+    const { qForm } = this.controllerHelpers || {}
+    const { NodeHelper } = qForm || {}
+    if (typeof NodeHelper !== 'function') {
+      console.log('invalid form helpers')
+      return false
+    }
+    return true
+  }
+
+  getConfig() {
     let config = this.config || {}
     if (this.state.qForm) {
-      const { lodash } = helpers.qUtilities
       const stateConfig = _getStateConfig(this.state.qForm)
       config = lodash.mergeWith(stateConfig, config || {}, _customizer)
     }
     return typeof ElementQFormConfig === 'function' ? ElementQFormConfig.init({
       ...config,
       helpers: {
-        ...helpers,
+        ...this.controllerHelpers,
         element: this
       },
     }) : {}

package/lib/models/nodes/elements/qGrid.js

@@ -9,7 +9,21 @@ class ElementQGrid extends Element {
     }
   }
 
-  getConfig(helpers) {
+  get isValid() {
+    return super.isValid && this.isValidHelpers
+  }
+
+  get isValidHelpers() {
+    const { qGrid } = this.controllerHelpers || {}
+    const { QItem, Cell } = qGrid || {}
+    if (typeof QItem !== 'function' || typeof Cell !== 'function') {
+      console.log('invalid grid helpers')
+      return false
+    }
+    return true
+  }
+
+  getConfig() {
     let config = this.config || {}
     if (this.state.qGrid) {
       const stateConfig = this.state.qGrid
@@ -21,7 +35,7 @@ class ElementQGrid extends Element {
     return typeof ElementQGridConfig === 'function' ? ElementQGridConfig.init({
       ...config,
       helpers: {
-        ...helpers,
+        ...this.controllerHelpers,
         element: this,
       },
     }) : {}

package/lib/models/nodes/elements/qHtml.js

@@ -3,6 +3,21 @@ import { Element } from '../element'
 class ElementQHtml extends Element {
   constructor(opt = {}) {
     super(opt)
+    this.defaultStateName = {
+      qHtml: 'qHtml'
+    }
+  }
+
+  getConfig() {
+    let config = this.config || {}
+    if (this.state.qHtml) {
+      const stateConfig = this.state.qHtml
+      config = {
+        ...stateConfig,
+        ...config
+      }
+    }
+    return config
   }
 }
 

package/lib/models/nodes/elements/qLabel.js

@@ -3,6 +3,21 @@ import { Element } from '../element'
 class ElementQLabel extends Element {
   constructor(opt = {}) {
     super(opt)
+    this.defaultStateName = {
+      qLabel: 'qLabel'
+    }
+  }
+
+  getConfig() {
+    let config = this.config || {}
+    if (this.state.qLabel) {
+      const stateConfig = this.state.qLabel
+      config = {
+        ...stateConfig,
+        ...config
+      }
+    }
+    return config
   }
 }
 

package/lib/models/nodes/elements/qList.js

@@ -11,19 +11,39 @@ class ElementQList extends Element {
     }
   }
 
-  getConfig(helpers) {
-    let config = this.config || {}
-    if (this.state.qList) {
-      const stateConfig = _getStateConfig(this.state.qList)
-      config = {
-        ...stateConfig,
-        ...config
-      }
+  get isValid() {
+    return super.isValid && this.isValidHelpers
+  }
+
+  get isValidHelpers() {
+    const { qList } = this.controllerHelpers || {}
+    const { QListBulkButton, QListButton, QRow } = qList || {}
+    if (typeof QListBulkButton !== 'function' || typeof QListButton !== 'function' || typeof QRow !== 'function') {
+      console.log('invalid list helpers')
+      return false
+    }
+    return true
+  }
+
+
+  getConfig() {
+    // let config = this.config || {}
+    // if (this.state.qList) {
+    //   const stateConfig = _getStateConfig(this.state.qList)
+    //   config = {
+    //     ...stateConfig,
+    //     ...config
+    //   }
+    // }
+    const config = {
+      ...(this.state.qList || {}),
+      ...(this.config || {}),
+      ...(this.state[this.name] || {})
     }
     return typeof ElementQListConfig === 'function' ? ElementQListConfig.init({
       ...config,
       helpers: {
-        ...helpers,
+        ...this.controllerHelpers,
         element: this
       },
     }) : {}

package/lib/models/nodes/elements/qPaginator.js

@@ -6,9 +6,27 @@ class ElementQPaginator extends Element {
     this.defaultStateName = {
       currentPage: 'currentPage',
       currentPageSize: 'currentPageSize',
+      qPaginator: 'qPaginator',
       totalRecords: 'totalRecords'
     }
   }
+
+  getConfig() {
+    return {
+      ...(this.state.qPaginator || {}),
+      ...(this.config || {}),
+      ...(this.state[this.name] || {})
+    }
+    // let config = this.config || {}
+    // if (this.state.qPaginator) {
+    //   const stateConfig = this.state.qPaginator
+    //   config = {
+    //     ...stateConfig,
+    //     ...config
+    //   }
+    // }
+    // return config
+  }
 }
 
 export default {

package/lib/models/nodes/elements/qTab.js

@@ -5,9 +5,22 @@ class ElementQTab extends Element {
     super(opt)
     this.defaultStateName = {
       active: 'active',
+      qTab: 'qTab',
       tabLayout: 'tabLayout'
     }
   }
+
+  getConfig() {
+    let config = this.config || {}
+    if (this.state.qTab) {
+      const stateConfig = this.state.qTab
+      config = {
+        ...stateConfig,
+        ...config
+      }
+    }
+    return config
+  }
 }
 
 export default {

package/package.json

@@ -1,8 +1,14 @@
 {
   "name": "@questwork/vue-q-widget-vue3",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "Questwork vue component Sample",
-  "main": "dist/q-widget.min.js",
+  "exports": {
+    ".": {
+      "import": "./dist/q-widget.min.js",
+      "require": "./dist/q-widget.min.js"
+    },
+    "./style.css": "./dist/q-widget.min.css"
+  },
   "author": {
     "name": "Questwork Consulting Limited",
     "email": "info@questwork.com",
@@ -19,52 +25,31 @@
     "@questwork/vue-q-list-vue3": "^3.1.0",
     "@questwork/vue-q-modal-vue3": "^3.1.0",
     "@questwork/vue-q-paginator-vue3": "^3.1.0",
-    "@storybook/addon-links": "^8.4.6",
-    "@storybook/addon-viewport": "^8.4.6",
-    "@storybook/source-loader": "^8.4.6",
-    "@storybook/test": "^8.4.6",
-    "@storybook/vue3": "^8.4.6",
-    "@storybook/vue3-vite": "^8.4.6",
+    "@storybook/addon-essentials": "^8.5.3",
+    "@storybook/addon-links": "^8.4.7",
+    "@storybook/vue3": "^8.4.7",
+    "@storybook/vue3-vite": "^8.4.7",
     "@vitejs/plugin-vue": "^5.2.1",
-    "babel-loader": "^8.2.4",
-    "chai": "^4.3.6",
-    "chromedriver": "^116.0.0",
-    "clean-webpack-plugin": "^3.0.0",
     "cross-env": "^7.0.3",
-    "css-loader": "^3.6.0",
-    "eslint": "^8.47.0",
+    "eslint": "8.47.0",
     "eslint-config-airbnb-base": "11.2.0",
     "eslint-plugin-import": "2.3.0",
-    "eslint-plugin-storybook": "^0.11.1",
-    "eslint-plugin-vue": "^8.0.3",
-    "file-loader": "^6.2.0",
-    "gulp": "^4.0.2",
-    "lodash": "^4.17.21",
+    "eslint-plugin-storybook": "^0.11.2",
+    "eslint-plugin-vue": "^9.32.0",
     "rollup-plugin-license": "^3.5.3",
-    "rollup-webpack-umd": "^0.1.2",
-    "sass": "^1.49.11",
-    "sass-loader": "^8.0.2",
-    "selenium-webdriver": "^4.11.1",
-    "sinon": "^9.2.4",
-    "sinon-chai": "^3.7.0",
-    "storybook": "^8.4.6",
-    "style-loader": "^1.3.0",
-    "underscore": "1.4.4",
-    "url-loader": "^4.1.1",
-    "vite": "^6.0.2",
+    "sass": "^1.83.4",
+    "storybook": "^8.4.7",
+    "vite": "5.4.11",
     "vite-plugin-commonjs": "^0.10.4",
-    "vite-plugin-lib-inject-css": "^2.1.1",
-    "vue": "^3.5.13",
-    "vue-loader": "^15.10.1",
-    "vue-template-compiler": "^2.6.14",
-    "webpack": "^5.71.0",
-    "webpack-cli": "^4.9.2",
-    "webpack-merge": "^4.2.2",
-    "webpack-node-externals": "^1.7.2"
+    "vue": "^3.5.13"
   },
   "engines": {
     "node": ">=10.0.0"
   },
+  "dependencies": {
+    "@questwork/q-utilities": "^0.1.0",
+    "lodash": "^4.17.21"
+  },
   "scripts": {
     "build": "vite build",
     "build:storybook": "storybook build -c .storybook -o storybook",