@kalisio/kdk 2.1.7 → 2.1.8

package/core/client/utils/utils.content.js

@@ -1,185 +1,185 @@
-import _ from 'lodash'
-import logger from 'loglevel'
-import sift from 'sift'
-import { Store } from '../store.js'
-
-const Handlers = ['handler', 'visible', 'hidden', 'disabled', 'on.listener']
-// Some bindings are not managed when reading content from config but externally on-demand, e.g. by KContent or KAction
-// The content 'reserved' property is also used to recurse at caller level
-const ReservedBindings = ['content', 'visible', 'hidden', 'route']
-
-// Check if an object has a property according to its path.
-// Similar to lodash has function which causes a bug in production build with Vue proxy objects
-// It appears that with proxy objects it is safer to use the in operator or Reflect.has()
-function hasProperty (object, path) {
-  const keys = path.split('.')
-  let currentObject = object
-  for (const key of keys) {
-    if (!currentObject || !(key in currentObject)) {
-      return false
-    }
-    currentObject = currentObject[key]
-  }
-  return true
-}
-
-export function filterContent (content, filter) {
-  // Handle non object content
-  if (typeof content !== 'object') return content
-  // Handle array and object case
-  const isArray = Array.isArray(content)
-  const modes = _.keys(content)
-  let filteredContent = content
-  if (!isArray) {
-    // Recurse ?
-    if (filteredContent.content) {
-      filteredContent.content = filterContent(filteredContent.content, filter)
-    } else {
-      modes.forEach(mode => {
-        const contentForMode = filteredContent[mode]
-        filteredContent[mode] = filterContent(contentForMode, filter)
-      })
-    }
-    filteredContent = [filteredContent]
-  } else {
-    filteredContent.forEach(item => {
-      // Recurse ?
-      if (item.content) {
-        item.content = filterContent(item.content, filter)
-      }
-    })
-  }
-  // Apply filtering
-  filteredContent = filteredContent.filter(sift(filter))
-  return (isArray ? filteredContent : filteredContent[0])
-}
-
-// Perform binding between a configuration object and a given context object
-export function bindContent (content, context, omit = []) {
-  const components = _.flatMapDeep(content)
-  _.forEach(components, (component) => {
-    // Process component handlers
-    Handlers.forEach(handler => bindHandler(component, handler, context))
-    // Then process component props
-    // It allows to write any property like { label: ':xxx' } and bind it
-    // to a component property from the context like we do for handler
-    bindProperties(component, context, omit)
-    // Recursively bind the props/handlers on the sub content object
-    if (component.content) bindContent(component.content, context, omit)
-  })
-  return content
-}
-
-export function bindProperties (item, context, omit = []) {
-  if (Array.isArray(item)) {
-    for (let i = 0; i < item.length; i++) {
-      item[i] = bindProperties(item[i], context)
-    }
-  } else if (typeof item === 'object') {
-    _.forOwn(item, (value, key) => {
-      // Bind required properties only
-      if (!ReservedBindings.includes(key) && !omit.includes(key)) {
-        if (typeof value === 'string') {
-          item[key] = getBoundValue(value, context)
-        } else {
-          item[key] = bindProperties(value, context)
-        }
-      }
-    })
-  }
-  return item
-}
-
-export function bindHandler (component, path, context) {
-  const handler = _.get(component, path)
-  // Could be an array if multiple handlers to be called
-  if (Array.isArray(handler)) {
-    // Process all array elements, manage the case where the handler is simply a function/property name
-    const handlers = handler.map(h => generateHandler(context, h.name || h, h.params))
-    // In that specific case the result is a boolean AND operation
-    _.set(component, path, (...args) => handlers.reduce((result, h) => result && h(...args), true))
-  } else if (handler && typeof handler === 'object') {
-    // Could be a structure with name and possibly params specified
-    // :xxx is reserved for binding to internal property not function call
-    if (handler.name) {
-      if (!handler.name.startsWith(':')) {
-        _.set(component, path, generateHandler(context, handler.name, handler.params))
-      }
-    } else {
-      logger.debug(`[KDK] invalid handler binding for ${handler}: you must provide the name to the function to be called`)
-    }
-  } else if ((typeof handler === 'string') && !handler.startsWith(':')) {
-    // Or only name if no params are specified
-    // :xxx is reserved for binding to internal property not function call
-    _.set(component, path, generateHandler(context, handler))
-  }
-  // Get back processed handler function
-  return _.get(component, path)
-}
-
-export function generateHandler (context, name, params) {
-  // When the handler can be a simple getter, eg is visible use case,
-  // we allow a property value instead of a function and a logical NOT
-  const isNot = name.startsWith('!')
-  if (isNot) name = name.substring(1)
-  return (...args) => {
-    let result
-    const handler = _.get(context, name)
-    // Function call or property value read ?
-    if (typeof handler === 'function') {
-      // Provided parameters or simply forward arguments ?
-      result = (params ? handler(...bindParams(params, context)) : handler(...args))
-    } else {
-      result = handler
-    }
-    // Logical NOT to be performed ?
-    return (isNot ? !result : result)
-  }
-}
-
-export function bindParams (params, context) {
-  // A parameter like :xxx means xxx is a property of the component, not a static value
-  // In that case remove trailing : and get property value dynamically
-  if (_.isNil(params)) {
-    return params
-  } else if (Array.isArray(params)) {
-    return params.map(param => bindParams(param, context))
-  } else if (typeof params === 'object') {
-    return _.mapValues(params, (value, key) => bindParams(value, context))
-  } else {
-    return getBoundValue(params, context)
-  }
-}
-
-export function getBoundValue (value, context) {
-  if ((typeof value === 'string') && value.startsWith(':')) {
-    // From store or context ?
-    if (value.startsWith(':store.')) {
-      const path = value.replace(':store.', '')
-      if (Store.has(path)) return Store.get(path)
-    } else if (value.startsWith(':storeRef.')) {
-      const path = value.replace(':storeRef.', '')
-      // FIXME: we should test if the path exists but this causes
-      // a bug in production build with Vue proxy objects
-      // if (Store.has(path)) return Store.getRef(path)
-      if (hasProperty(Store, path)) return Store.getRef(path)
-      // Workaround if not possible to correctly check the path first
-      // but it causes problems with values initialized to null
-      // const result = Store.getRef(path)
-      // if (!_.isNil(result)) return result
-    } else {
-      const path = value.substring(1)
-      // FIXME: we should test if the path exists but this causes
-      // a bug in production build with Vue proxy objects
-      // if (_.has(context, path)) return _.get(context, path)
-      if (hasProperty(context, path)) return _.get(context, path)
-      // Workaround if not possible to correctly check the path first
-      // but it causes problems with values initialized to null
-      // const result = _.get(context, path)
-      // if (!_.isNil(result)) return result
-    }
-    // Bound value not found
-    return undefined
-  }
-  return value
-}
+import _ from 'lodash'
+import logger from 'loglevel'
+import sift from 'sift'
+import { Store } from '../store.js'
+
+const Handlers = ['handler', 'visible', 'hidden', 'disabled', 'on.listener']
+// Some bindings are not managed when reading content from config but externally on-demand, e.g. by KContent or KAction
+// The content 'reserved' property is also used to recurse at caller level
+const ReservedBindings = ['content', 'visible', 'hidden', 'route']
+
+// Check if an object has a property according to its path.
+// Similar to lodash has function which causes a bug in production build with Vue proxy objects
+// It appears that with proxy objects it is safer to use the in operator or Reflect.has()
+function hasProperty (object, path) {
+  const keys = path.split('.')
+  let currentObject = object
+  for (const key of keys) {
+    if (!currentObject || !(key in currentObject)) {
+      return false
+    }
+    currentObject = currentObject[key]
+  }
+  return true
+}
+
+export function filterContent (content, filter) {
+  // Handle non object content
+  if (typeof content !== 'object') return content
+  // Handle array and object case
+  const isArray = Array.isArray(content)
+  const modes = _.keys(content)
+  let filteredContent = content
+  if (!isArray) {
+    // Recurse ?
+    if (filteredContent.content) {
+      filteredContent.content = filterContent(filteredContent.content, filter)
+    } else {
+      modes.forEach(mode => {
+        const contentForMode = filteredContent[mode]
+        filteredContent[mode] = filterContent(contentForMode, filter)
+      })
+    }
+    filteredContent = [filteredContent]
+  } else {
+    filteredContent.forEach(item => {
+      // Recurse ?
+      if (item.content) {
+        item.content = filterContent(item.content, filter)
+      }
+    })
+  }
+  // Apply filtering
+  filteredContent = filteredContent.filter(sift(filter))
+  return (isArray ? filteredContent : filteredContent[0])
+}
+
+// Perform binding between a configuration object and a given context object
+export function bindContent (content, context, omit = []) {
+  const components = _.flatMapDeep(content)
+  _.forEach(components, (component) => {
+    // Process component handlers
+    Handlers.forEach(handler => bindHandler(component, handler, context))
+    // Then process component props
+    // It allows to write any property like { label: ':xxx' } and bind it
+    // to a component property from the context like we do for handler
+    bindProperties(component, context, omit)
+    // Recursively bind the props/handlers on the sub content object
+    if (component.content) bindContent(component.content, context, omit)
+  })
+  return content
+}
+
+export function bindProperties (item, context, omit = []) {
+  if (Array.isArray(item)) {
+    for (let i = 0; i < item.length; i++) {
+      item[i] = bindProperties(item[i], context)
+    }
+  } else if (typeof item === 'object') {
+    _.forOwn(item, (value, key) => {
+      // Bind required properties only
+      if (!ReservedBindings.includes(key) && !omit.includes(key)) {
+        if (typeof value === 'string') {
+          item[key] = getBoundValue(value, context)
+        } else {
+          item[key] = bindProperties(value, context)
+        }
+      }
+    })
+  }
+  return item
+}
+
+export function bindHandler (component, path, context) {
+  const handler = _.get(component, path)
+  // Could be an array if multiple handlers to be called
+  if (Array.isArray(handler)) {
+    // Process all array elements, manage the case where the handler is simply a function/property name
+    const handlers = handler.map(h => generateHandler(context, h.name || h, h.params))
+    // In that specific case the result is a boolean AND operation
+    _.set(component, path, (...args) => handlers.reduce((result, h) => result && h(...args), true))
+  } else if (handler && typeof handler === 'object') {
+    // Could be a structure with name and possibly params specified
+    // :xxx is reserved for binding to internal property not function call
+    if (handler.name) {
+      if (!handler.name.startsWith(':')) {
+        _.set(component, path, generateHandler(context, handler.name, handler.params))
+      }
+    } else {
+      logger.debug(`[KDK] invalid handler binding for ${handler}: you must provide the name to the function to be called`)
+    }
+  } else if ((typeof handler === 'string') && !handler.startsWith(':')) {
+    // Or only name if no params are specified
+    // :xxx is reserved for binding to internal property not function call
+    _.set(component, path, generateHandler(context, handler))
+  }
+  // Get back processed handler function
+  return _.get(component, path)
+}
+
+export function generateHandler (context, name, params) {
+  // When the handler can be a simple getter, eg is visible use case,
+  // we allow a property value instead of a function and a logical NOT
+  const isNot = name.startsWith('!')
+  if (isNot) name = name.substring(1)
+  return (...args) => {
+    let result
+    const handler = _.get(context, name)
+    // Function call or property value read ?
+    if (typeof handler === 'function') {
+      // Provided parameters or simply forward arguments ?
+      result = (params ? handler(...bindParams(params, context)) : handler(...args))
+    } else {
+      result = handler
+    }
+    // Logical NOT to be performed ?
+    return (isNot ? !result : result)
+  }
+}
+
+export function bindParams (params, context) {
+  // A parameter like :xxx means xxx is a property of the component, not a static value
+  // In that case remove trailing : and get property value dynamically
+  if (_.isNil(params)) {
+    return params
+  } else if (Array.isArray(params)) {
+    return params.map(param => bindParams(param, context))
+  } else if (typeof params === 'object') {
+    return _.mapValues(params, (value, key) => bindParams(value, context))
+  } else {
+    return getBoundValue(params, context)
+  }
+}
+
+export function getBoundValue (value, context) {
+  if ((typeof value === 'string') && value.startsWith(':')) {
+    // From store or context ?
+    if (value.startsWith(':store.')) {
+      const path = value.replace(':store.', '')
+      if (Store.has(path)) return Store.get(path)
+    } else if (value.startsWith(':storeRef.')) {
+      const path = value.replace(':storeRef.', '')
+      // FIXME: we should test if the path exists but this causes
+      // a bug in production build with Vue proxy objects
+      // if (Store.has(path)) return Store.getRef(path)
+      if (hasProperty(Store, path)) return Store.getRef(path)
+      // Workaround if not possible to correctly check the path first
+      // but it causes problems with values initialized to null
+      // const result = Store.getRef(path)
+      // if (!_.isNil(result)) return result
+    } else {
+      const path = value.substring(1)
+      // FIXME: we should test if the path exists but this causes
+      // a bug in production build with Vue proxy objects
+      // if (_.has(context, path)) return _.get(context, path)
+      if (hasProperty(context, path)) return _.get(context, path)
+      // Workaround if not possible to correctly check the path first
+      // but it causes problems with values initialized to null
+      // const result = _.get(context, path)
+      // if (!_.isNil(result)) return result
+    }
+    // Bound value not found
+    return undefined
+  }
+  return value
+}

package/core/client/utils/utils.locale.js

@@ -1,28 +1,28 @@
-import _ from 'lodash'
-import config from 'config'
-
-export function getLocale () {
-  const locale =
-    navigator.language ||
-    navigator.languages[0] ||
-    navigator.browserLanguage ||
-    navigator.userLanguage ||
-    navigator.systemLanguage
-
-  if (locale) {
-    // see https://www.ietf.org/rfc/bcp/bcp47.txt
-    const languageCodes = _.split(locale, '-')
-    if (languageCodes.length > 0) return languageCodes[0]
-  }
-  // return undefined by default
-}
-
-export function getAppLocale () {
-  const localeConfig = config.locale || {}
-  const localeBrowser = getLocale()
-  return localeConfig.default || localeBrowser
-}
-
-export function getAppFallbackLocale () {
-  return config.fallbackLocale || 'en'
-}
+import _ from 'lodash'
+import config from 'config'
+
+export function getLocale () {
+  const locale =
+    navigator.language ||
+    navigator.languages[0] ||
+    navigator.browserLanguage ||
+    navigator.userLanguage ||
+    navigator.systemLanguage
+
+  if (locale) {
+    // see https://www.ietf.org/rfc/bcp/bcp47.txt
+    const languageCodes = _.split(locale, '-')
+    if (languageCodes.length > 0) return languageCodes[0]
+  }
+  // return undefined by default
+}
+
+export function getAppLocale () {
+  const localeConfig = config.locale || {}
+  const localeBrowser = getLocale()
+  return localeConfig.default || localeBrowser
+}
+
+export function getAppFallbackLocale () {
+  return config.fallbackLocale || 'en'
+}

package/core/client/utils/utils.platform.js

@@ -1,11 +1,11 @@
-import { Platform } from 'quasar'
-
-export function getPlatform () {
-  return Object.assign(Platform.is, {
-    touch: Platform.has.touch,
-    storage: Platform.has.webStorage,
-    iframe: Platform.within.frame,
-    agent: Platform.userAgent
-  })
-}
-
+import { Platform } from 'quasar'
+
+export function getPlatform () {
+  return Object.assign(Platform.is, {
+    touch: Platform.has.touch,
+    storage: Platform.has.webStorage,
+    iframe: Platform.within.frame,
+    agent: Platform.userAgent
+  })
+}
+

package/core/client/utils/utils.push.js

@@ -1,53 +1,53 @@
-import {
-  checkPrerequisites,
-  getPushSubscription,
-  subscribePushNotifications,
-  requestNotificationPermission,
-  addSubscription
-} from '@kalisio/feathers-webpush/client.js'
-import { Notify } from 'quasar'
-import logger from 'loglevel'
-import _ from 'lodash'
-import moment from 'moment'
-import { i18n } from '../i18n.js'
-import { Store } from '../store.js'
-import { api } from '../api.js'
-import { getPlatform } from './utils.platform.js'
-
-export async function subscribeToPushNotifications () {
-  // Check prerequisites & notification permission
-  try {
-    await checkPrerequisites()
-    await requestNotificationPermission()
-  } catch (error) {
-    Notify.create({ type: 'negative', message: i18n.t(`errors.${error.code}`) })
-    return
-  }
-  // Data
-  const userService = api.service('api/users')
-  const platform = getPlatform()
-  const date = moment.utc().toISOString()
-  const currentSubscription = await getPushSubscription()
-  const user = Store.get('user')
-  // Check if user is already subscribed
-  if (currentSubscription && _.find(_.get(user, 'subscriptions', []), subscription => subscription.endpoint === currentSubscription.endpoint)) {
-    // Patch subscription connection date
-    const subscriptions = _.map(user.subscriptions, subscription => {
-      if (subscription.endpoint === currentSubscription.endpoint) subscription.lastActivity = date
-      return subscription
-    })
-    userService.patch(Store.user._id, { subscriptions: subscriptions })
-    logger.debug(`New connection date registered on ${date} with subscription endpoint: ${currentSubscription.endpoint}`)
-    return
-  }
-  // Subscribe to web webpush notifications
-  const subscription = await subscribePushNotifications(Store.get('capabilities.api.vapidPublicKey'))
-  // Set platform informations
-  subscription.browser = { name: platform.name, version: platform.version }
-  subscription.platform = platform.platform
-  subscription.lastActivity = date
-  // Patch user subscriptions
-  await addSubscription(user, subscription, 'subscriptions')
-  userService.patch(Store.user._id, { subscriptions: user.subscriptions })
-  logger.debug(`New webpush subscription registered with endpoint: ${subscription.endpoint}`)
-}
+import {
+  checkPrerequisites,
+  getPushSubscription,
+  subscribePushNotifications,
+  requestNotificationPermission,
+  addSubscription
+} from '@kalisio/feathers-webpush/client.js'
+import { Notify } from 'quasar'
+import logger from 'loglevel'
+import _ from 'lodash'
+import moment from 'moment'
+import { i18n } from '../i18n.js'
+import { Store } from '../store.js'
+import { api } from '../api.js'
+import { getPlatform } from './utils.platform.js'
+
+export async function subscribeToPushNotifications () {
+  // Check prerequisites & notification permission
+  try {
+    await checkPrerequisites()
+    await requestNotificationPermission()
+  } catch (error) {
+    Notify.create({ type: 'negative', message: i18n.t(`errors.${error.code}`) })
+    return
+  }
+  // Data
+  const userService = api.service('api/users')
+  const platform = getPlatform()
+  const date = moment.utc().toISOString()
+  const currentSubscription = await getPushSubscription()
+  const user = Store.get('user')
+  // Check if user is already subscribed
+  if (currentSubscription && _.find(_.get(user, 'subscriptions', []), subscription => subscription.endpoint === currentSubscription.endpoint)) {
+    // Patch subscription connection date
+    const subscriptions = _.map(user.subscriptions, subscription => {
+      if (subscription.endpoint === currentSubscription.endpoint) subscription.lastActivity = date
+      return subscription
+    })
+    userService.patch(Store.user._id, { subscriptions: subscriptions })
+    logger.debug(`New connection date registered on ${date} with subscription endpoint: ${currentSubscription.endpoint}`)
+    return
+  }
+  // Subscribe to web webpush notifications
+  const subscription = await subscribePushNotifications(Store.get('capabilities.api.vapidPublicKey'))
+  // Set platform informations
+  subscription.browser = { name: platform.name, version: platform.version }
+  subscription.platform = platform.platform
+  subscription.lastActivity = date
+  // Patch user subscriptions
+  await addSubscription(user, subscription, 'subscriptions')
+  userService.patch(Store.user._id, { subscriptions: user.subscriptions })
+  logger.debug(`New webpush subscription registered with endpoint: ${subscription.endpoint}`)
+}