@kalisio/kdk 2.1.6 → 2.1.7

package/core/client/components/viewer/KViewer.vue

@@ -1,30 +1,30 @@
-<template>
-  <div class="column justify-center full-width">
-    <KView
-      ref="view"
-      :values="object"
-      :schema="schema"
-    />
-  </div>
-</template>
-
-<script>
-import KView from '../form/KView.vue'
-import { baseViewer, service, objectProxy, schemaProxy } from '../../mixins'
-
-export default {
-  components: {
-    KView
-  },
-  mixins: [
-    baseViewer,
-    service,
-    objectProxy,
-    schemaProxy
-  ],
-  created () {
-    // Refresh the view
-    this.refresh()
-  }
-}
-</script>
+<template>
+  <div class="column justify-center full-width">
+    <KView
+      ref="view"
+      :values="object"
+      :schema="schema"
+    />
+  </div>
+</template>
+
+<script>
+import KView from '../form/KView.vue'
+import { baseViewer, service, objectProxy, schemaProxy } from '../../mixins'
+
+export default {
+  components: {
+    KView
+  },
+  mixins: [
+    baseViewer,
+    service,
+    objectProxy,
+    schemaProxy
+  ],
+  created () {
+    // Refresh the view
+    this.refresh()
+  }
+}
+</script>

package/core/client/composables/activity.js

@@ -1,67 +1,67 @@
-import _ from 'lodash'
-import config from 'config'
-import { ref, shallowRef, readonly, onBeforeUnmount } from 'vue'
-import { useStore } from './store.js'
-import { useSelection } from './selection.js'
-
-const kActivity = shallowRef(null)
-const kActivityName = ref(null)
-
-export function useActivity (name, options = {}) {
-  _.defaults(options, { selection: true })
-
-  // data
-  // state store
-  const activityState = useStore(`store.${name}.state`, options.state)
-  // options store
-  const activityOptions = useStore(`store.${name}.options`, config[name])
-
-  // functions
-  function setCurrentActivity (activity) {
-    if (kActivity.value === activity) return
-    kActivityName.value = activity ? name : null
-    kActivity.value = activity
-  }
-
-  // expose
-  const expose = {
-    state: activityState.store,
-    options: activityOptions.store,
-    setCurrentActivity
-  }
-  if (options.selection) {
-    Object.assign(expose, {
-      ...useSelection(kActivityName.value)
-    })
-  }
-
-  // Cleanup on destroy
-  onBeforeUnmount(() => setCurrentActivity(null))
-
-  return expose
-}
-
-export function useCurrentActivity (options = {}) {
-  _.defaults(options, { selection: true })
-
-  // expose
-  const expose = {
-    kActivity: readonly(kActivity),
-    kActivityName: readonly(kActivityName)
-  }
-  if (kActivityName.value) {
-    const activityState = useStore(`store.${kActivityName.value}.state`)
-    const activityOptions = useStore(`store.${kActivityName.value}.options`)
-
-    Object.assign(expose, {
-      state: activityState.store,
-      options: readonly(activityOptions.store)
-    })
-    if (options.selection) {
-      Object.assign(expose, {
-        ...useSelection(kActivityName.value)
-      })
-    }
-  }
-  return expose
-}
+import _ from 'lodash'
+import config from 'config'
+import { ref, shallowRef, readonly, onBeforeUnmount } from 'vue'
+import { useStore } from './store.js'
+import { useSelection } from './selection.js'
+
+const kActivity = shallowRef(null)
+const kActivityName = ref(null)
+
+export function useActivity (name, options = {}) {
+  _.defaults(options, { selection: true })
+
+  // data
+  // state store
+  const activityState = useStore(`store.${name}.state`, options.state)
+  // options store
+  const activityOptions = useStore(`store.${name}.options`, config[name])
+
+  // functions
+  function setCurrentActivity (activity) {
+    if (kActivity.value === activity) return
+    kActivityName.value = activity ? name : null
+    kActivity.value = activity
+  }
+
+  // expose
+  const expose = {
+    state: activityState.store,
+    options: activityOptions.store,
+    setCurrentActivity
+  }
+  if (options.selection) {
+    Object.assign(expose, {
+      ...useSelection(kActivityName.value)
+    })
+  }
+
+  // Cleanup on destroy
+  onBeforeUnmount(() => setCurrentActivity(null))
+
+  return expose
+}
+
+export function useCurrentActivity (options = {}) {
+  _.defaults(options, { selection: true })
+
+  // expose
+  const expose = {
+    kActivity: readonly(kActivity),
+    kActivityName: readonly(kActivityName)
+  }
+  if (kActivityName.value) {
+    const activityState = useStore(`store.${kActivityName.value}.state`)
+    const activityOptions = useStore(`store.${kActivityName.value}.options`)
+
+    Object.assign(expose, {
+      state: activityState.store,
+      options: readonly(activityOptions.store)
+    })
+    if (options.selection) {
+      Object.assign(expose, {
+        ...useSelection(kActivityName.value)
+      })
+    }
+  }
+  return expose
+}

package/core/client/composables/collection.js

@@ -1,181 +1,181 @@
-import _ from 'lodash'
-import logger from 'loglevel'
-import { ref, computed, watch, onBeforeMount, onBeforeUnmount } from 'vue'
-import { api } from '../api.js'
-import { getLocale } from '../utils/utils.locale.js'
-
-export function useCollection (options) {
-  _.defaults(options, {
-    // This value can be overriden in activities if they want to manage pagination by themselves
-    // nbItemsPerPage = 0 means that the client does not handle pagination and server defaults will be used
-    nbItemsPerPage: ref(12),
-    // This value indicate if items of each page replace or are appended to previous ones
-    appendItems: ref(false),
-    // Only invoke refresh at most once per every refreshThrottle milliseconds
-    refreshThrottle: ref(500),
-    // Refresh strategy to be used
-    listStrategy: ref('smart'),
-    // Item processor to be used
-    processor: ref()
-  })
-
-  // Data
-  const items = ref([])
-  const nbTotalItems = ref(0)
-  const currentPage = ref(1)
-  let itemListener = null
-
-  // Computed
-  const nbPages = computed(() => {
-    return options.nbItemsPerPage.value > 0
-      ? Math.ceil(nbTotalItems.value / options.nbItemsPerPage.value)
-      : 1
-  })
-
-  // Functions
-  function getService () {
-    const service = api.getService(options.service.value, options.contextId ? options.contextId.value : null)
-    if (!service) {
-      throw new Error('Cannot retrieve target service ' + options.service.value)
-    }
-    return service
-  }
-  function getCollectionBaseQuery () {
-    // This method should be overriden in collections
-    return options.baseQuery ? options.baseQuery.value : {}
-  }
-  function getCollectionFilterQuery () {
-    // This method should be overriden in collections
-    return options.filterQuery ? options.filterQuery.value : {}
-  }
-  function getCollectionPaginationQuery () {
-    // This method should be overriden in collections
-    return (options.nbItemsPerPage.value > 0
-      ? {
-          $limit: options.nbItemsPerPage.value,
-          $skip: (currentPage.value - 1) * options.nbItemsPerPage.value
-        }
-      : {})
-  }
-  function setCollectionItems (newItems) {
-    // Item processor defined ?
-    if (typeof options.processor.value === 'function') {
-      newItems = options.processor.value(newItems)
-    }
-    items.value = newItems
-  }
-  function subscribe (query) {
-    // Remove previous listener if any
-    unsubscribe()
-    itemListener = getService().watch({ listStrategy: options.listStrategy.value })
-      .find({ query })
-      .subscribe(response => {
-        // Manage GeoJson features collection as well
-        if (response.type === 'FeatureCollection') {
-          setCollectionItems(response.features)
-        } else if (options.appendItems.value) {
-          // Append the response ensuring there is no duplicates
-          setCollectionItems(_.unionBy(response.data, items.value, '_id'))
-          // We keep order from the updated list as depending on the sorting criteria a new item might have to be pushed on top of current items
-          const sortQuery = _.get(getCollectionBaseQuery(), '$sort')
-          if (sortQuery) {
-            // By default orderBy is case sensitive while using collation we want to perform case insensitive sort
-            setCollectionItems(_.orderBy(items.value,
-              // Sort function for each sort property
-              _.map(_.keys(sortQuery), property => {
-                return item => {
-                  const value = _.get(item, property)
-                  return (typeof value === 'string' ? value.toLowerCase() : value)
-                }
-              }),
-              // Sort order for each sort property
-              _.map(_.values(sortQuery), value => { return value > 0 ? 'asc' : 'desc' })))
-          }
-        } else {
-          setCollectionItems(response.data)
-        }
-        nbTotalItems.value = response.total
-      }, error => {
-        logger.error(error)
-      })
-  }
-
-  function unsubscribe () {
-    if (itemListener) {
-      itemListener.unsubscribe()
-      itemListener = null
-    }
-  }
-
-  const refreshCollection = _.throttle(() => {
-    const fullQuery = {
-      $locale: getLocale(),
-      ...getCollectionBaseQuery(),
-      ...getCollectionFilterQuery(),
-      ...getCollectionPaginationQuery()
-    }
-    subscribe(fullQuery)
-  }, options.refreshThrottle.value, { leading: false })
-
-  function resetCollection () {
-    // Reset pagination and start again refreshing the collection
-    setCollectionItems([])
-    currentPage.value = 1
-    refreshCollection()
-  }
-
-  function onItemsUpdated (updatedItems) {
-    // When we append items some items of the previous pages might have been updated.
-    // In this case we need to reset the full collection as Rx only tracks changes on the current page
-    updatedItems = (Array.isArray(updatedItems) ? updatedItems : [updatedItems])
-    // We keep order from the updated list as depending on the sorting criteria a new item might have to be pushed on top of current items
-    updatedItems = _.intersectionWith(items.value, updatedItems, (item1, item2) => (item1._id.toString() === item2._id.toString()))
-    if (updatedItems.length > 0) resetCollection()
-  }
-
-  // Lifecycle hooks
-  watch(options.service, resetCollection)
-  watch(options.listStrategy, resetCollection)
-  watch(options.nbItemsPerPage, resetCollection)
-  watch(options.appendItems, resetCollection)
-  // Some are not mandatory or initialized by default
-  if (options.contextId) watch(options.contextId, resetCollection)
-  if (options.baseQuery) watch(options.baseQuery, resetCollection)
-  if (options.filterQuery) watch(options.filterQuery, resetCollection)
-
-
-  onBeforeMount(() => {
-    if (options.appendItems.value) {
-      const service = getService()
-      service.on('patched', onItemsUpdated)
-      service.on('updated', onItemsUpdated)
-      service.on('removed', onItemsUpdated)
-    }
-  })
-
-  // Cleanup for appendItems
-  onBeforeUnmount(() => {
-    unsubscribe()
-    if (options.appendItems.value) {
-      const service = getService()
-      service.off('patched', onItemsUpdated)
-      service.off('updated', onItemsUpdated)
-      service.off('removed', onItemsUpdated)
-    }
-  })
-
-  return {
-    items,
-    nbTotalItems,
-    currentPage,
-    nbPages,
-    setCollectionItems,
-    subscribe,
-    unsubscribe,
-    getCollectionBaseQuery,
-    getCollectionFilterQuery,
-    getCollectionPaginationQuery,
-    resetCollection,
-    refreshCollection
-  }
-}
+import _ from 'lodash'
+import logger from 'loglevel'
+import { ref, computed, watch, onBeforeMount, onBeforeUnmount } from 'vue'
+import { api } from '../api.js'
+import { getLocale } from '../utils/utils.locale.js'
+
+export function useCollection (options) {
+  _.defaults(options, {
+    // This value can be overriden in activities if they want to manage pagination by themselves
+    // nbItemsPerPage = 0 means that the client does not handle pagination and server defaults will be used
+    nbItemsPerPage: ref(12),
+    // This value indicate if items of each page replace or are appended to previous ones
+    appendItems: ref(false),
+    // Only invoke refresh at most once per every refreshThrottle milliseconds
+    refreshThrottle: ref(500),
+    // Refresh strategy to be used
+    listStrategy: ref('smart'),
+    // Item processor to be used
+    processor: ref()
+  })
+
+  // Data
+  const items = ref([])
+  const nbTotalItems = ref(0)
+  const currentPage = ref(1)
+  let itemListener = null
+
+  // Computed
+  const nbPages = computed(() => {
+    return options.nbItemsPerPage.value > 0
+      ? Math.ceil(nbTotalItems.value / options.nbItemsPerPage.value)
+      : 1
+  })
+
+  // Functions
+  function getService () {
+    const service = api.getService(options.service.value, options.contextId ? options.contextId.value : null)
+    if (!service) {
+      throw new Error('Cannot retrieve target service ' + options.service.value)
+    }
+    return service
+  }
+  function getCollectionBaseQuery () {
+    // This method should be overriden in collections
+    return options.baseQuery ? options.baseQuery.value : {}
+  }
+  function getCollectionFilterQuery () {
+    // This method should be overriden in collections
+    return options.filterQuery ? options.filterQuery.value : {}
+  }
+  function getCollectionPaginationQuery () {
+    // This method should be overriden in collections
+    return (options.nbItemsPerPage.value > 0
+      ? {
+          $limit: options.nbItemsPerPage.value,
+          $skip: (currentPage.value - 1) * options.nbItemsPerPage.value
+        }
+      : {})
+  }
+  function setCollectionItems (newItems) {
+    // Item processor defined ?
+    if (typeof options.processor.value === 'function') {
+      newItems = options.processor.value(newItems)
+    }
+    items.value = newItems
+  }
+  function subscribe (query) {
+    // Remove previous listener if any
+    unsubscribe()
+    itemListener = getService().watch({ listStrategy: options.listStrategy.value })
+      .find({ query })
+      .subscribe(response => {
+        // Manage GeoJson features collection as well
+        if (response.type === 'FeatureCollection') {
+          setCollectionItems(response.features)
+        } else if (options.appendItems.value) {
+          // Append the response ensuring there is no duplicates
+          setCollectionItems(_.unionBy(response.data, items.value, '_id'))
+          // We keep order from the updated list as depending on the sorting criteria a new item might have to be pushed on top of current items
+          const sortQuery = _.get(getCollectionBaseQuery(), '$sort')
+          if (sortQuery) {
+            // By default orderBy is case sensitive while using collation we want to perform case insensitive sort
+            setCollectionItems(_.orderBy(items.value,
+              // Sort function for each sort property
+              _.map(_.keys(sortQuery), property => {
+                return item => {
+                  const value = _.get(item, property)
+                  return (typeof value === 'string' ? value.toLowerCase() : value)
+                }
+              }),
+              // Sort order for each sort property
+              _.map(_.values(sortQuery), value => { return value > 0 ? 'asc' : 'desc' })))
+          }
+        } else {
+          setCollectionItems(response.data)
+        }
+        nbTotalItems.value = response.total
+      }, error => {
+        logger.error(error)
+      })
+  }
+
+  function unsubscribe () {
+    if (itemListener) {
+      itemListener.unsubscribe()
+      itemListener = null
+    }
+  }
+
+  const refreshCollection = _.throttle(() => {
+    const fullQuery = {
+      $locale: getLocale(),
+      ...getCollectionBaseQuery(),
+      ...getCollectionFilterQuery(),
+      ...getCollectionPaginationQuery()
+    }
+    subscribe(fullQuery)
+  }, options.refreshThrottle.value, { leading: false })
+
+  function resetCollection () {
+    // Reset pagination and start again refreshing the collection
+    setCollectionItems([])
+    currentPage.value = 1
+    refreshCollection()
+  }
+
+  function onItemsUpdated (updatedItems) {
+    // When we append items some items of the previous pages might have been updated.
+    // In this case we need to reset the full collection as Rx only tracks changes on the current page
+    updatedItems = (Array.isArray(updatedItems) ? updatedItems : [updatedItems])
+    // We keep order from the updated list as depending on the sorting criteria a new item might have to be pushed on top of current items
+    updatedItems = _.intersectionWith(items.value, updatedItems, (item1, item2) => (item1._id.toString() === item2._id.toString()))
+    if (updatedItems.length > 0) resetCollection()
+  }
+
+  // Lifecycle hooks
+  watch(options.service, resetCollection)
+  watch(options.listStrategy, resetCollection)
+  watch(options.nbItemsPerPage, resetCollection)
+  watch(options.appendItems, resetCollection)
+  // Some are not mandatory or initialized by default
+  if (options.contextId) watch(options.contextId, resetCollection)
+  if (options.baseQuery) watch(options.baseQuery, resetCollection)
+  if (options.filterQuery) watch(options.filterQuery, resetCollection)
+
+
+  onBeforeMount(() => {
+    if (options.appendItems.value) {
+      const service = getService()
+      service.on('patched', onItemsUpdated)
+      service.on('updated', onItemsUpdated)
+      service.on('removed', onItemsUpdated)
+    }
+  })
+
+  // Cleanup for appendItems
+  onBeforeUnmount(() => {
+    unsubscribe()
+    if (options.appendItems.value) {
+      const service = getService()
+      service.off('patched', onItemsUpdated)
+      service.off('updated', onItemsUpdated)
+      service.off('removed', onItemsUpdated)
+    }
+  })
+
+  return {
+    items,
+    nbTotalItems,
+    currentPage,
+    nbPages,
+    setCollectionItems,
+    subscribe,
+    unsubscribe,
+    getCollectionBaseQuery,
+    getCollectionFilterQuery,
+    getCollectionPaginationQuery,
+    resetCollection,
+    refreshCollection
+  }
+}

package/core/client/composables/index.js

@@ -1,8 +1,8 @@
-export * from './activity.js'
-export * from './collection.js'
-export * from './pwa.js'
-export * from './session.js'
-export * from './schema.js'
-export * from './selection.js'
-export * from './store.js'
-export * from './version.js'
+export * from './activity.js'
+export * from './collection.js'
+export * from './pwa.js'
+export * from './session.js'
+export * from './schema.js'
+export * from './selection.js'
+export * from './store.js'
+export * from './version.js'