@kalisio/kdk 1.6.0 → 1.7.0

package/lib/map/api/hooks/hooks.catalog.js

@@ -49,12 +49,17 @@ let updateLayerReferences = exports.updateLayerReferences = (() => {
   };
 })();
 
+exports.getDefaultCategories = getDefaultCategories;
 exports.filterLayers = filterLayers;
 
 var _lodash = require('lodash');
 
 var _lodash2 = _interopRequireDefault(_lodash);
 
+var _sift = require('sift');
+
+var _sift2 = _interopRequireDefault(_sift);
+
 var _feathersHooksCommon = require('feathers-hooks-common');
 
 var _debug = require('debug');
@@ -67,6 +72,21 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
 const debug = (0, _debug2.default)('kdk:map:catalog:hooks');
 
+// By default we only return layers and not other objects in catalog
+function getDefaultCategories(hook) {
+  const query = _lodash2.default.get(hook, 'params.query', {});
+  if (query.type === 'Category') {
+    const catalog = hook.app.get('catalog');
+    let defaultCategories = catalog ? catalog.categories || [] : [];
+    // Add implicit type
+    defaultCategories = defaultCategories.map(category => Object.assign(category, { type: 'Category' }));
+    // Then filter according to query
+    defaultCategories = defaultCategories.filter((0, _sift2.default)(_lodash2.default.omit(query, ['$sort', '$limit', '$skip'])));
+    const item = (0, _feathersHooksCommon.getItems)(hook);
+    (0, _feathersHooksCommon.replaceItems)(hook, item.concat(defaultCategories.map(category => Object.assign(category, { type: 'Category' }))));
+  }
+}
+
 // By default we only return layers and not other objects in catalog
 function filterLayers(hook) {
   const query = _lodash2.default.get(hook, 'params.query', {});

package/lib/map/api/hooks/hooks.catalog.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../map/api/hooks/hooks.catalog.js"],"names":["hook","type","_","get","params","endsWith","previousLayer","layer","contexts","service","find","query","$in","layers","name","paginate","length","debug","Promise","all","map","context","method","remove","layerName","patch","_id","updateLayerReferences","filterLayers","$nin","set"],"mappings":";;;;;;;AAaA;;+BACO,WAAsCA,IAAtC,EAA4C;AACjD;AACA,UAAMC,OAAOC,iBAAEC,GAAF,CAAMH,KAAKI,MAAX,EAAmB,mBAAnB,EAAwC,EAAxC,CAAb;AACA,QAAI,CAACH,KAAKI,QAAL,CAAc,OAAd,CAAL,EAA6B,OAAOL,IAAP;AAC7B,UAAMM,gBAAgBJ,iBAAEC,GAAF,CAAMH,KAAKI,MAAX,EAAmB,cAAnB,CAAtB;AACA,UAAMG,QAAQ,mCAASP,IAAT,CAAd;;AAEA;AACA,UAAMQ,WAAW,MAAMR,KAAKS,OAAL,CAAaC,IAAb,CAAkB;AACvCC,aAAO,EAAEV,MAAM,EAAEW,KAAK,CAAC,SAAD,EAAY,UAAZ,CAAP,EAAR,EAA0CC,QAAQP,cAAcQ,IAAhE,EADgC;AAEvCC,gBAAU;AAF6B,KAAlB,CAAvB;AAIA;AACA,QAAIP,SAASQ,MAAT,KAAoB,CAAxB,EAA2B;AACzBC,YAAO,qEAAoEV,MAAMO,IAAK,GAAtF;AACA,aAAOd,IAAP;AACD;AACD;AACA,UAAMkB,QAAQC,GAAR,CAAYX,SAASY,GAAT,CAAa,mBAAW;AACxC;AACA,UAAIP,SAASQ,QAAQR,MAArB;AACA,UAAIb,KAAKsB,MAAL,KAAgB,QAApB,EAA8B;AAC5BpB,yBAAEqB,MAAF,CAASV,MAAT,EAAiB;AAAA,iBAAaW,cAAclB,cAAcQ,IAAzC;AAAA,SAAjB;AACD,OAFD,MAEO;AACLD,iBAASA,OAAOO,GAAP,CAAW;AAAA,iBAAcI,cAAclB,cAAcQ,IAA5B,GAAmCP,MAAMO,IAAzC,GAAgDU,SAA9D;AAAA,SAAX,CAAT;AACD;AACD,aAAOxB,KAAKS,OAAL,CAAagB,KAAb,CAAmBJ,QAAQK,GAA3B,EAAgC,EAAEb,MAAF,EAAhC,CAAP;AACD,KATiB,CAAZ,CAAN;;AAWAI,UAAO,WAAUT,SAASQ,MAAO,6DAA4DT,MAAMO,IAAK,GAAxG;AACA,WAAOd,IAAP;AACD,G;;kBA/BqB2B,qB;;;;;QAPNC,Y,GAAAA,Y;;AAPhB;;;;AACA;;AACA;;;;;;;;AAEA,MAAMX,QAAQ,qBAAU,uBAAV,CAAd;;AAEA;AACO,SAASW,YAAT,CAAuB5B,IAAvB,EAA6B;AAClC,QAAMW,QAAQT,iBAAEC,GAAF,CAAMH,IAAN,EAAY,cAAZ,EAA4B,EAA5B,CAAd;AACA,MAAI,CAACW,MAAMV,IAAX,EAAiBU,MAAMV,IAAN,GAAa,EAAE4B,MAAM,CAAC,SAAD,EAAY,SAAZ,EAAuB,UAAvB,CAAR,EAAb;AACjB3B,mBAAE4B,GAAF,CAAM9B,IAAN,EAAY,cAAZ,EAA4BW,KAA5B;AACD","file":"hooks.catalog.js","sourcesContent":["import _ from 'lodash'\r\nimport { getItems } from 'feathers-hooks-common'\r\nimport makeDebug from 'debug'\r\n\r\nconst debug = makeDebug('kdk:map:catalog:hooks')\r\n\r\n// By default we only return layers and not other objects in catalog\r\nexport function filterLayers (hook) {\r\n  const query = _.get(hook, 'params.query', {})\r\n  if (!query.type) query.type = { $nin: ['Context', 'Service', 'Category'] }\r\n  _.set(hook, 'params.query', query)\r\n}\r\n\r\n// Update layer name in all contexts, categories, etc. when renamed/removed\r\nexport async function updateLayerReferences (hook) {\r\n  // Check if it's a layer renaming first\r\n  const type = _.get(hook.params, 'previousItem.type', '')\r\n  if (!type.endsWith('Layer')) return hook\r\n  const previousLayer = _.get(hook.params, 'previousItem')\r\n  const layer = getItems(hook)\r\n\r\n  // Retrieve the list of all contexts, categories, etc. involving the layer\r\n  const contexts = await hook.service.find({\r\n    query: { type: { $in: ['Context', 'Category'] }, layers: previousLayer.name },\r\n    paginate: false\r\n  })\r\n  // Stop when non found\r\n  if (contexts.length === 0) {\r\n    debug(`No context or category to update after renaming or removing layer ${layer.name} `)\r\n    return hook\r\n  }\r\n  // Update each context otherwise\r\n  await Promise.all(contexts.map(context => {\r\n    // Update/Remove layer name in layer list\r\n    let layers = context.layers\r\n    if (hook.method === 'remove') {\r\n      _.remove(layers, layerName => layerName === previousLayer.name)\r\n    } else {\r\n      layers = layers.map(layerName => (layerName === previousLayer.name ? layer.name : layerName))\r\n    }\r\n    return hook.service.patch(context._id, { layers })\r\n  }))\r\n\r\n  debug(`Updated ${contexts.length} contexts and categories after renaming or removing layer ${layer.name} `)\r\n  return hook\r\n}\r\n"]}
+{"version":3,"sources":["../../../../map/api/hooks/hooks.catalog.js"],"names":["hook","type","_","get","params","endsWith","previousLayer","layer","contexts","service","find","query","$in","layers","name","paginate","length","debug","Promise","all","map","context","method","remove","layerName","patch","_id","updateLayerReferences","getDefaultCategories","filterLayers","catalog","app","defaultCategories","categories","category","Object","assign","filter","omit","item","concat","$nin","set"],"mappings":"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","file":"hooks.catalog.js","sourcesContent":["import _ from 'lodash'\r\nimport sift from 'sift'\r\nimport { getItems, replaceItems } from 'feathers-hooks-common'\r\nimport makeDebug from 'debug'\r\n\r\nconst debug = makeDebug('kdk:map:catalog:hooks')\r\n\r\n// By default we only return layers and not other objects in catalog\r\nexport function getDefaultCategories (hook) {\r\n  const query = _.get(hook, 'params.query', {})\r\n  if (query.type === 'Category') {\r\n    const catalog = hook.app.get('catalog')\r\n    let defaultCategories = catalog ? catalog.categories || [] : []\r\n    // Add implicit type\r\n    defaultCategories = defaultCategories.map(category => Object.assign(category, { type: 'Category' }))\r\n    // Then filter according to query\r\n    defaultCategories = defaultCategories.filter(sift(_.omit(query, ['$sort', '$limit', '$skip'])))\r\n    const item = getItems(hook)\r\n    replaceItems(hook, item.concat(defaultCategories.map(category => Object.assign(category, { type: 'Category' }))))\r\n  }\r\n}\r\n\r\n// By default we only return layers and not other objects in catalog\r\nexport function filterLayers (hook) {\r\n  const query = _.get(hook, 'params.query', {})\r\n  if (!query.type) query.type = { $nin: ['Context', 'Service', 'Category'] }\r\n  _.set(hook, 'params.query', query)\r\n}\r\n\r\n// Update layer name in all contexts, categories, etc. when renamed/removed\r\nexport async function updateLayerReferences (hook) {\r\n  // Check if it's a layer renaming first\r\n  const type = _.get(hook.params, 'previousItem.type', '')\r\n  if (!type.endsWith('Layer')) return hook\r\n  const previousLayer = _.get(hook.params, 'previousItem')\r\n  const layer = getItems(hook)\r\n\r\n  // Retrieve the list of all contexts, categories, etc. involving the layer\r\n  const contexts = await hook.service.find({\r\n    query: { type: { $in: ['Context', 'Category'] }, layers: previousLayer.name },\r\n    paginate: false\r\n  })\r\n  // Stop when non found\r\n  if (contexts.length === 0) {\r\n    debug(`No context or category to update after renaming or removing layer ${layer.name} `)\r\n    return hook\r\n  }\r\n  // Update each context otherwise\r\n  await Promise.all(contexts.map(context => {\r\n    // Update/Remove layer name in layer list\r\n    let layers = context.layers\r\n    if (hook.method === 'remove') {\r\n      _.remove(layers, layerName => layerName === previousLayer.name)\r\n    } else {\r\n      layers = layers.map(layerName => (layerName === previousLayer.name ? layer.name : layerName))\r\n    }\r\n    return hook.service.patch(context._id, { layers })\r\n  }))\r\n\r\n  debug(`Updated ${contexts.length} contexts and categories after renaming or removing layer ${layer.name} `)\r\n  return hook\r\n}\r\n"]}

package/lib/map/api/models/catalog.model.mongodb.js

@@ -7,6 +7,11 @@ module.exports = function (app, options) {
   // different object types stored and we'd like a unique constraint per type
   options.Model.indexExists('name_1').then(() => options.Model.dropIndex('name_1')).catch(() => {});
   options.Model.indexExists('type_1').then(() => options.Model.dropIndex('type_1')).catch(() => {});
-  options.Model.createIndex({ name: 1, type: 1 }, { unique: true });
+  // We also previously not take collation into account
+  options.Model.indexExists('name_1_type_1').then(() => options.Model.dropIndex('name_1_type_1')).catch(() => {});
+  // Collation provided in query ensure sorting to be case insensitive w.r.t. user's language
+  // We built indices with collation to cover the most used languages, it requires different naming...
+  options.Model.createIndex({ name: 1, type: 1 }, { unique: true, name: 'name-type-en', collation: { locale: 'en', strength: 1 } });
+  options.Model.createIndex({ name: 1, type: 1 }, { unique: true, name: 'name-type-fr', collation: { locale: 'fr', strength: 1 } });
 };
 //# sourceMappingURL=catalog.model.mongodb.js.map

package/lib/map/api/models/catalog.model.mongodb.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../map/api/models/catalog.model.mongodb.js"],"names":["module","exports","app","options","db","Model","collection","indexExists","then","dropIndex","catch","createIndex","name","type","unique"],"mappings":";;AAAAA,OAAOC,OAAP,GAAiB,UAAUC,GAAV,EAAeC,OAAf,EAAwB;AACvC,QAAMC,KAAKD,QAAQC,EAAR,IAAcF,IAAIE,EAA7B;AACAD,UAAQE,KAAR,GAAgBD,GAAGE,UAAH,CAAc,SAAd,CAAhB;AACA;AACA;AACAH,UAAQE,KAAR,CAAcE,WAAd,CAA0B,QAA1B,EAAoCC,IAApC,CAAyC,MAAML,QAAQE,KAAR,CAAcI,SAAd,CAAwB,QAAxB,CAA/C,EAAkFC,KAAlF,CAAwF,MAAM,CAAE,CAAhG;AACAP,UAAQE,KAAR,CAAcE,WAAd,CAA0B,QAA1B,EAAoCC,IAApC,CAAyC,MAAML,QAAQE,KAAR,CAAcI,SAAd,CAAwB,QAAxB,CAA/C,EAAkFC,KAAlF,CAAwF,MAAM,CAAE,CAAhG;AACAP,UAAQE,KAAR,CAAcM,WAAd,CAA0B,EAAEC,MAAM,CAAR,EAAWC,MAAM,CAAjB,EAA1B,EAAgD,EAAEC,QAAQ,IAAV,EAAhD;AACD,CARD","file":"catalog.model.mongodb.js","sourcesContent":["module.exports = function (app, options) {\r\n  const db = options.db || app.db\r\n  options.Model = db.collection('catalog')\r\n  // We previously had a unique constraint on name but we now have\r\n  // different object types stored and we'd like a unique constraint per type\r\n  options.Model.indexExists('name_1').then(() => options.Model.dropIndex('name_1')).catch(() => {})\r\n  options.Model.indexExists('type_1').then(() => options.Model.dropIndex('type_1')).catch(() => {})\r\n  options.Model.createIndex({ name: 1, type: 1 }, { unique: true })\r\n}\r\n"]}
+{"version":3,"sources":["../../../../map/api/models/catalog.model.mongodb.js"],"names":["module","exports","app","options","db","Model","collection","indexExists","then","dropIndex","catch","createIndex","name","type","unique","collation","locale","strength"],"mappings":";;AAAAA,OAAOC,OAAP,GAAiB,UAAUC,GAAV,EAAeC,OAAf,EAAwB;AACvC,QAAMC,KAAKD,QAAQC,EAAR,IAAcF,IAAIE,EAA7B;AACAD,UAAQE,KAAR,GAAgBD,GAAGE,UAAH,CAAc,SAAd,CAAhB;AACA;AACA;AACAH,UAAQE,KAAR,CAAcE,WAAd,CAA0B,QAA1B,EAAoCC,IAApC,CAAyC,MAAML,QAAQE,KAAR,CAAcI,SAAd,CAAwB,QAAxB,CAA/C,EAAkFC,KAAlF,CAAwF,MAAM,CAAE,CAAhG;AACAP,UAAQE,KAAR,CAAcE,WAAd,CAA0B,QAA1B,EAAoCC,IAApC,CAAyC,MAAML,QAAQE,KAAR,CAAcI,SAAd,CAAwB,QAAxB,CAA/C,EAAkFC,KAAlF,CAAwF,MAAM,CAAE,CAAhG;AACA;AACAP,UAAQE,KAAR,CAAcE,WAAd,CAA0B,eAA1B,EAA2CC,IAA3C,CAAgD,MAAML,QAAQE,KAAR,CAAcI,SAAd,CAAwB,eAAxB,CAAtD,EAAgGC,KAAhG,CAAsG,MAAM,CAAE,CAA9G;AACA;AACA;AACAP,UAAQE,KAAR,CAAcM,WAAd,CAA0B,EAAEC,MAAM,CAAR,EAAWC,MAAM,CAAjB,EAA1B,EAAgD,EAAEC,QAAQ,IAAV,EAAgBF,MAAM,cAAtB,EAAsCG,WAAW,EAAEC,QAAQ,IAAV,EAAgBC,UAAU,CAA1B,EAAjD,EAAhD;AACAd,UAAQE,KAAR,CAAcM,WAAd,CAA0B,EAAEC,MAAM,CAAR,EAAWC,MAAM,CAAjB,EAA1B,EAAgD,EAAEC,QAAQ,IAAV,EAAgBF,MAAM,cAAtB,EAAsCG,WAAW,EAAEC,QAAQ,IAAV,EAAgBC,UAAU,CAA1B,EAAjD,EAAhD;AACD,CAbD","file":"catalog.model.mongodb.js","sourcesContent":["module.exports = function (app, options) {\r\n  const db = options.db || app.db\r\n  options.Model = db.collection('catalog')\r\n  // We previously had a unique constraint on name but we now have\r\n  // different object types stored and we'd like a unique constraint per type\r\n  options.Model.indexExists('name_1').then(() => options.Model.dropIndex('name_1')).catch(() => {})\r\n  options.Model.indexExists('type_1').then(() => options.Model.dropIndex('type_1')).catch(() => {})\r\n  // We also previously not take collation into account\r\n  options.Model.indexExists('name_1_type_1').then(() => options.Model.dropIndex('name_1_type_1')).catch(() => {})\r\n  // Collation provided in query ensure sorting to be case insensitive w.r.t. user's language\r\n  // We built indices with collation to cover the most used languages, it requires different naming...\r\n  options.Model.createIndex({ name: 1, type: 1 }, { unique: true, name: 'name-type-en', collation: { locale: 'en', strength: 1 } })\r\n  options.Model.createIndex({ name: 1, type: 1 }, { unique: true, name: 'name-type-fr', collation: { locale: 'fr', strength: 1 } })\r\n}\r\n"]}

package/lib/map/api/models/features.model.mongodb.js

@@ -8,6 +8,11 @@ module.exports = function (app, options) {
   if (options.featureId) {
     options.Model.createIndex({ ['properties.' + options.featureId]: 1 });
   }
+  try {
+    options.Model.createIndex({ 'properties.$**': 1 });
+  } catch (_) {
+    // Fail silently as it might not be supported under v4
+  }
   if (options.expireAfter || options.ttl) {
     options.Model.createIndex({ time: 1 }, { expireAfterSeconds: options.expireAfter || options.ttl });
   }

package/lib/map/api/models/features.model.mongodb.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../map/api/models/features.model.mongodb.js"],"names":["module","exports","app","options","db","Model","collection","createIndex","geometry","layer","featureId","expireAfter","ttl","time","expireAfterSeconds"],"mappings":";;AAAAA,OAAOC,OAAP,GAAiB,UAAUC,GAAV,EAAeC,OAAf,EAAwB;AACvC,QAAMC,KAAKD,QAAQC,EAAR,IAAcF,IAAIE,EAA7B;AACAD,UAAQE,KAAR,GAAgBD,GAAGE,UAAH,CAAcH,QAAQG,UAAtB,CAAhB;AACAH,UAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAEC,UAAU,UAAZ,EAA1B;AACAL,UAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAEE,OAAO,CAAT,EAA1B;AACA,MAAIN,QAAQO,SAAZ,EAAuB;AACrBP,YAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAE,CAAC,gBAAgBJ,QAAQO,SAAzB,GAAqC,CAAvC,EAA1B;AACD;AACD,MAAIP,QAAQQ,WAAR,IAAuBR,QAAQS,GAAnC,EAAwC;AACtCT,YAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAEM,MAAM,CAAR,EAA1B,EAAuC,EAAEC,oBAAoBX,QAAQQ,WAAR,IAAuBR,QAAQS,GAArD,EAAvC;AACD;AACF,CAXD","file":"features.model.mongodb.js","sourcesContent":["module.exports = function (app, options) {\r\n  const db = options.db || app.db\r\n  options.Model = db.collection(options.collection)\r\n  options.Model.createIndex({ geometry: '2dsphere' })\r\n  options.Model.createIndex({ layer: 1 })\r\n  if (options.featureId) {\r\n    options.Model.createIndex({ ['properties.' + options.featureId]: 1 })\r\n  }\r\n  if (options.expireAfter || options.ttl) {\r\n    options.Model.createIndex({ time: 1 }, { expireAfterSeconds: options.expireAfter || options.ttl })\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["../../../../map/api/models/features.model.mongodb.js"],"names":["module","exports","app","options","db","Model","collection","createIndex","geometry","layer","featureId","_","expireAfter","ttl","time","expireAfterSeconds"],"mappings":";;AAAAA,OAAOC,OAAP,GAAiB,UAAUC,GAAV,EAAeC,OAAf,EAAwB;AACvC,QAAMC,KAAKD,QAAQC,EAAR,IAAcF,IAAIE,EAA7B;AACAD,UAAQE,KAAR,GAAgBD,GAAGE,UAAH,CAAcH,QAAQG,UAAtB,CAAhB;AACAH,UAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAEC,UAAU,UAAZ,EAA1B;AACAL,UAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAEE,OAAO,CAAT,EAA1B;AACA,MAAIN,QAAQO,SAAZ,EAAuB;AACrBP,YAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAE,CAAC,gBAAgBJ,QAAQO,SAAzB,GAAqC,CAAvC,EAA1B;AACD;AACD,MAAI;AACFP,YAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAE,kBAAkB,CAApB,EAA1B;AACD,GAFD,CAEE,OAAOI,CAAP,EAAU;AACV;AACD;AACD,MAAIR,QAAQS,WAAR,IAAuBT,QAAQU,GAAnC,EAAwC;AACtCV,YAAQE,KAAR,CAAcE,WAAd,CAA0B,EAAEO,MAAM,CAAR,EAA1B,EAAuC,EAAEC,oBAAoBZ,QAAQS,WAAR,IAAuBT,QAAQU,GAArD,EAAvC;AACD;AACF,CAhBD","file":"features.model.mongodb.js","sourcesContent":["module.exports = function (app, options) {\r\n  const db = options.db || app.db\r\n  options.Model = db.collection(options.collection)\r\n  options.Model.createIndex({ geometry: '2dsphere' })\r\n  options.Model.createIndex({ layer: 1 })\r\n  if (options.featureId) {\r\n    options.Model.createIndex({ ['properties.' + options.featureId]: 1 })\r\n  }\r\n  try {\r\n    options.Model.createIndex({ 'properties.$**': 1 })\r\n  } catch (_) {\r\n    // Fail silently as it might not be supported under v4\r\n  }\r\n  if (options.expireAfter || options.ttl) {\r\n    options.Model.createIndex({ time: 1 }, { expireAfterSeconds: options.expireAfter || options.ttl })\r\n  }\r\n}\r\n"]}

package/lib/map/api/services/catalog/catalog.hooks.js

@@ -31,7 +31,9 @@ module.exports = {
 
   after: {
     all: [_api.hooks.convertToJson(['schema.content'])],
-    find: [],
+    find: [
+    // Merge built-in categories with user-defined ones
+    _hooks.getDefaultCategories],
     get: [],
     create: [],
     update: [_hooks.updateLayerReferences],

package/lib/map/api/services/catalog/catalog.hooks.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../map/api/services/catalog/catalog.hooks.js"],"names":["module","exports","before","all","find","filterLayers","get","create","coreHooks","checkUnique","field","query","hook","type","_","convertObjectIDs","convertToString","update","populatePreviousObject","patch","remove","after","convertToJson","updateLayerReferences","error"],"mappings":";;AAAA;;;;AACA;;AACA;;AACA;;;;AAEAA,OAAOC,OAAP,GAAiB;AACfC,UAAQ;AACNC,SAAK,EADC;AAENC,UAAM,CACJC,mBADI,CAFA;AAKNC,SAAK,EALC;AAMNC,YAAQ,CACNC,WAAUC,WAAV,CAAsB,EAAEC,OAAO,MAAT,EAAiBC,OAAO,CAACA,KAAD,EAAQC,IAAR,KAAiB;AAAED,cAAME,IAAN,GAAaC,iBAAER,GAAF,CAAMM,IAAN,EAAY,WAAZ,CAAb;AAAuC,OAAlF,EAAtB,CADM,EAENJ,WAAUO,gBAAV,CAA2B,CAAC,iBAAD,CAA3B,CAFM,EAGNP,WAAUQ,eAAV,CAA0B,CAAC,gBAAD,CAA1B,CAHM,EAIN,iCAAO,WAAP,EAAoB,WAApB,CAJM,CANF;AAYNC,YAAQ,CACNT,WAAUU,sBADJ,EAENV,WAAUC,WAAV,CAAsB,EAAEC,OAAO,MAAT,EAAiBC,OAAO,CAACA,KAAD,EAAQC,IAAR,KAAiB;AAAED,cAAME,IAAN,GAAaC,iBAAER,GAAF,CAAMM,IAAN,EAAY,0BAAZ,CAAb;AAAsD,OAAjG,EAAtB,CAFM,EAGNJ,WAAUO,gBAAV,CAA2B,CAAC,iBAAD,CAA3B,CAHM,EAINP,WAAUQ,eAAV,CAA0B,CAAC,gBAAD,CAA1B,CAJM,EAKN,kCAAQ,WAAR,EAAqB,WAArB,CALM,EAMN,iCAAO,WAAP,CANM,CAZF;AAoBNG,WAAO,CACLX,WAAUU,sBADL,EAELV,WAAUC,WAAV,CAAsB,EAAEC,OAAO,MAAT,EAAiBC,OAAO,CAACA,KAAD,EAAQC,IAAR,KAAiB;AAAED,cAAME,IAAN,GAAaC,iBAAER,GAAF,CAAMM,IAAN,EAAY,0BAAZ,CAAb;AAAsD,OAAjG,EAAtB,CAFK,EAGLJ,WAAUO,gBAAV,CAA2B,CAAC,iBAAD,CAA3B,CAHK,EAILP,WAAUQ,eAAV,CAA0B,CAAC,gBAAD,CAA1B,CAJK,EAKL,kCAAQ,WAAR,EAAqB,WAArB,CALK,EAML,iCAAO,WAAP,CANK,CApBD;AA4BNI,YAAQ,CACNZ,WAAUU,sBADJ;AA5BF,GADO;;AAkCfG,SAAO;AACLlB,SAAK,CACHK,WAAUc,aAAV,CAAwB,CAAC,gBAAD,CAAxB,CADG,CADA;AAILlB,UAAM,EAJD;AAKLE,SAAK,EALA;AAMLC,YAAQ,EANH;AAOLU,YAAQ,CACNM,4BADM,CAPH;AAULJ,WAAO,CACLI,4BADK,CAVF;AAaLH,YAAQ,CACN,iCAAO,WAAP,CADM,EAENG,4BAFM;AAbH,GAlCQ;;AAqDfC,SAAO;AACLrB,SAAK,EADA;AAELC,UAAM,EAFD;AAGLE,SAAK,EAHA;AAILC,YAAQ,EAJH;AAKLU,YAAQ,EALH;AAMLE,WAAO,EANF;AAOLC,YAAQ;AAPH;AArDQ,CAAjB","file":"catalog.hooks.js","sourcesContent":["import _ from 'lodash'\r\nimport { setNow, discard } from 'feathers-hooks-common'\r\nimport { hooks as coreHooks } from '../../../../core/api'\r\nimport { filterLayers, updateLayerReferences } from '../../hooks'\r\n\r\nmodule.exports = {\r\n  before: {\r\n    all: [],\r\n    find: [\r\n      filterLayers\r\n    ],\r\n    get: [],\r\n    create: [\r\n      coreHooks.checkUnique({ field: 'name', query: (query, hook) => { query.type = _.get(hook, 'data.type') } }),\r\n      coreHooks.convertObjectIDs(['baseQuery.layer']),\r\n      coreHooks.convertToString(['schema.content']),\r\n      setNow('createdAt', 'updatedAt')\r\n    ],\r\n    update: [\r\n      coreHooks.populatePreviousObject,\r\n      coreHooks.checkUnique({ field: 'name', query: (query, hook) => { query.type = _.get(hook, 'params.previousItem.type') } }),\r\n      coreHooks.convertObjectIDs(['baseQuery.layer']),\r\n      coreHooks.convertToString(['schema.content']),\r\n      discard('createdAt', 'updatedAt'),\r\n      setNow('updatedAt')\r\n    ],\r\n    patch: [\r\n      coreHooks.populatePreviousObject,\r\n      coreHooks.checkUnique({ field: 'name', query: (query, hook) => { query.type = _.get(hook, 'params.previousItem.type') } }),\r\n      coreHooks.convertObjectIDs(['baseQuery.layer']),\r\n      coreHooks.convertToString(['schema.content']),\r\n      discard('createdAt', 'updatedAt'),\r\n      setNow('updatedAt')\r\n    ],\r\n    remove: [\r\n      coreHooks.populatePreviousObject\r\n    ]\r\n  },\r\n\r\n  after: {\r\n    all: [\r\n      coreHooks.convertToJson(['schema.content'])\r\n    ],\r\n    find: [],\r\n    get: [],\r\n    create: [],\r\n    update: [\r\n      updateLayerReferences\r\n    ],\r\n    patch: [\r\n      updateLayerReferences\r\n    ],\r\n    remove: [\r\n      setNow('updatedAt'),\r\n      updateLayerReferences\r\n    ]\r\n  },\r\n\r\n  error: {\r\n    all: [],\r\n    find: [],\r\n    get: [],\r\n    create: [],\r\n    update: [],\r\n    patch: [],\r\n    remove: []\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["../../../../../map/api/services/catalog/catalog.hooks.js"],"names":["module","exports","before","all","find","filterLayers","get","create","coreHooks","checkUnique","field","query","hook","type","_","convertObjectIDs","convertToString","update","populatePreviousObject","patch","remove","after","convertToJson","getDefaultCategories","updateLayerReferences","error"],"mappings":";;AAAA;;;;AACA;;AACA;;AACA;;;;AAEAA,OAAOC,OAAP,GAAiB;AACfC,UAAQ;AACNC,SAAK,EADC;AAENC,UAAM,CACJC,mBADI,CAFA;AAKNC,SAAK,EALC;AAMNC,YAAQ,CACNC,WAAUC,WAAV,CAAsB,EAAEC,OAAO,MAAT,EAAiBC,OAAO,CAACA,KAAD,EAAQC,IAAR,KAAiB;AAAED,cAAME,IAAN,GAAaC,iBAAER,GAAF,CAAMM,IAAN,EAAY,WAAZ,CAAb;AAAuC,OAAlF,EAAtB,CADM,EAENJ,WAAUO,gBAAV,CAA2B,CAAC,iBAAD,CAA3B,CAFM,EAGNP,WAAUQ,eAAV,CAA0B,CAAC,gBAAD,CAA1B,CAHM,EAIN,iCAAO,WAAP,EAAoB,WAApB,CAJM,CANF;AAYNC,YAAQ,CACNT,WAAUU,sBADJ,EAENV,WAAUC,WAAV,CAAsB,EAAEC,OAAO,MAAT,EAAiBC,OAAO,CAACA,KAAD,EAAQC,IAAR,KAAiB;AAAED,cAAME,IAAN,GAAaC,iBAAER,GAAF,CAAMM,IAAN,EAAY,0BAAZ,CAAb;AAAsD,OAAjG,EAAtB,CAFM,EAGNJ,WAAUO,gBAAV,CAA2B,CAAC,iBAAD,CAA3B,CAHM,EAINP,WAAUQ,eAAV,CAA0B,CAAC,gBAAD,CAA1B,CAJM,EAKN,kCAAQ,WAAR,EAAqB,WAArB,CALM,EAMN,iCAAO,WAAP,CANM,CAZF;AAoBNG,WAAO,CACLX,WAAUU,sBADL,EAELV,WAAUC,WAAV,CAAsB,EAAEC,OAAO,MAAT,EAAiBC,OAAO,CAACA,KAAD,EAAQC,IAAR,KAAiB;AAAED,cAAME,IAAN,GAAaC,iBAAER,GAAF,CAAMM,IAAN,EAAY,0BAAZ,CAAb;AAAsD,OAAjG,EAAtB,CAFK,EAGLJ,WAAUO,gBAAV,CAA2B,CAAC,iBAAD,CAA3B,CAHK,EAILP,WAAUQ,eAAV,CAA0B,CAAC,gBAAD,CAA1B,CAJK,EAKL,kCAAQ,WAAR,EAAqB,WAArB,CALK,EAML,iCAAO,WAAP,CANK,CApBD;AA4BNI,YAAQ,CACNZ,WAAUU,sBADJ;AA5BF,GADO;;AAkCfG,SAAO;AACLlB,SAAK,CACHK,WAAUc,aAAV,CAAwB,CAAC,gBAAD,CAAxB,CADG,CADA;AAILlB,UAAM;AACJ;AACAmB,+BAFI,CAJD;AAQLjB,SAAK,EARA;AASLC,YAAQ,EATH;AAULU,YAAQ,CACNO,4BADM,CAVH;AAaLL,WAAO,CACLK,4BADK,CAbF;AAgBLJ,YAAQ,CACN,iCAAO,WAAP,CADM,EAENI,4BAFM;AAhBH,GAlCQ;;AAwDfC,SAAO;AACLtB,SAAK,EADA;AAELC,UAAM,EAFD;AAGLE,SAAK,EAHA;AAILC,YAAQ,EAJH;AAKLU,YAAQ,EALH;AAMLE,WAAO,EANF;AAOLC,YAAQ;AAPH;AAxDQ,CAAjB","file":"catalog.hooks.js","sourcesContent":["import _ from 'lodash'\r\nimport { setNow, discard } from 'feathers-hooks-common'\r\nimport { hooks as coreHooks } from '../../../../core/api'\r\nimport { filterLayers, updateLayerReferences, getDefaultCategories } from '../../hooks'\r\n\r\nmodule.exports = {\r\n  before: {\r\n    all: [],\r\n    find: [\r\n      filterLayers\r\n    ],\r\n    get: [],\r\n    create: [\r\n      coreHooks.checkUnique({ field: 'name', query: (query, hook) => { query.type = _.get(hook, 'data.type') } }),\r\n      coreHooks.convertObjectIDs(['baseQuery.layer']),\r\n      coreHooks.convertToString(['schema.content']),\r\n      setNow('createdAt', 'updatedAt')\r\n    ],\r\n    update: [\r\n      coreHooks.populatePreviousObject,\r\n      coreHooks.checkUnique({ field: 'name', query: (query, hook) => { query.type = _.get(hook, 'params.previousItem.type') } }),\r\n      coreHooks.convertObjectIDs(['baseQuery.layer']),\r\n      coreHooks.convertToString(['schema.content']),\r\n      discard('createdAt', 'updatedAt'),\r\n      setNow('updatedAt')\r\n    ],\r\n    patch: [\r\n      coreHooks.populatePreviousObject,\r\n      coreHooks.checkUnique({ field: 'name', query: (query, hook) => { query.type = _.get(hook, 'params.previousItem.type') } }),\r\n      coreHooks.convertObjectIDs(['baseQuery.layer']),\r\n      coreHooks.convertToString(['schema.content']),\r\n      discard('createdAt', 'updatedAt'),\r\n      setNow('updatedAt')\r\n    ],\r\n    remove: [\r\n      coreHooks.populatePreviousObject\r\n    ]\r\n  },\r\n\r\n  after: {\r\n    all: [\r\n      coreHooks.convertToJson(['schema.content'])\r\n    ],\r\n    find: [\r\n      // Merge built-in categories with user-defined ones\r\n      getDefaultCategories\r\n    ],\r\n    get: [],\r\n    create: [],\r\n    update: [\r\n      updateLayerReferences\r\n    ],\r\n    patch: [\r\n      updateLayerReferences\r\n    ],\r\n    remove: [\r\n      setNow('updatedAt'),\r\n      updateLayerReferences\r\n    ]\r\n  },\r\n\r\n  error: {\r\n    all: [],\r\n    find: [],\r\n    get: [],\r\n    create: [],\r\n    update: [],\r\n    patch: [],\r\n    remove: []\r\n  }\r\n}\r\n"]}

package/lib/map/client/components/KColorLegend.vue

@@ -323,26 +323,27 @@ export default {
 }
 </script>
 
-<style lang="stylus">
-.k-legend
+<style lang="scss">
+  .k-legend {
   position: relative;
-  cursor: pointer;
-  border: none
-
-.k-unit-box
-  position: absolute;
-  top: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-.k-value-step
-  position: absolute;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-.k-gradient-step
-  position: absolute;
-  display: inline-block;
+    cursor: pointer;
+    border: none;
+  }
+  .k-unit-box {
+    position: absolute;
+    top: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .k-value-step {
+    position: absolute;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .k-gradient-step {
+    position: absolute;
+    display: inline-block;
+  }
 </style>

package/lib/map/client/components/KFeaturesChart.vue

@@ -10,14 +10,21 @@
       @opened="$emit('opened')"
       @closed="$emit('closed')"
     >
-      <div class="row justify-center text-center q-ma-none q-pa-none">
-        <div style="width: 90vw">
-          <canvas v-show="chartData.length > 0" class="chart" ref="chart"></canvas>
-        </div>
-        <q-btn v-show="currentChart > 1" size="1rem" flat round color="primary"
-          icon="las la-chevron-left" class="absolute-left" @click="onPreviousChart"/>
-        <q-btn v-show="currentChart < nbCharts" size="1rem" flat round color="primary"
-          icon="las la-chevron-right" class="absolute-right" @click="onNextChart" />
+      <div class="row justify-around items-center q-ma-none q-pa-none">
+        <!-- Previsious chart -->
+        <q-btn
+          v-show="currentChart > 1"
+          size="1rem" flat round color="primary"
+          icon="las la-chevron-left"
+          @click="onPreviousChart"/>
+        <!-- Current chart --->
+        <k-stats-chart ref="chart" :style="chartStyle" />
+        <!-- Netx chart -->
+        <q-btn
+          v-show="currentChart < nbCharts"
+          size="1rem" flat round color="primary"
+          icon="las la-chevron-right"
+          @click="onNextChart" />
       </div>
     </k-modal>
     <k-modal
@@ -26,14 +33,29 @@
       :title="$t('KFeaturesChart.CHART_SETTINGS_LABEL')"
       :buttons="[{ id: 'close-action', label: 'CLOSE', renderer: 'form-button', handler: () => this.$refs.chartSettings.close() }]">
       <div>
-        <q-select v-model="property" :label="$t('KFeaturesChart.PROPERTY_LABEL')"
-          :options="properties" @input="refreshChart"/>
-        <q-select v-model="chartType" :label="$t('KFeaturesChart.CHART_LABEL')"
-          :options="chartOptions" @input="refreshChart"/>
-        <q-select v-model="nbValuesPerChart" :label="$t('KFeaturesChart.PAGINATION_LABEL')"
-          :options="paginationOptions" @input="refreshChartAndPagination"/>
-        <q-select v-model="render" :label="$t('KFeaturesChart.RENDER_LABEL')"
-          :options="renderOptions" @input="refreshChart"/>
+        <q-select
+          v-model="selectedProperty"
+          :label="$t('KFeaturesChart.PROPERTY_LABEL')"
+          :options="properties"
+          @input="refreshChart"/>
+        <q-select
+          :disable="selectedProperty ? false: true"
+          v-model="selectedChartType"
+          :label="$t('KFeaturesChart.CHART_LABEL')"
+          :options="availableChartTypes"
+          @input="refreshChart"/>
+        <q-select
+          :disable="selectedProperty ? false: true"
+          v-model="nbValuesPerChart"
+          :label="$t('KFeaturesChart.PAGINATION_LABEL')"
+          :options="paginationOptions"
+          @input="refreshChartAndPagination"/>
+        <!-- TODO q-select
+          :disable="selectedProperty ? false: true"
+          v-model="render"
+          :label="$t('KFeaturesChart.RENDER_LABEL')"
+          :options="renderOptions"
+          @input="refreshChart"/-->
       </div>
     </k-modal>
   </div>
@@ -44,9 +66,6 @@ import _ from 'lodash'
 import logger from 'loglevel'
 import Papa from 'papaparse'
 import { Loading } from 'quasar'
-import chroma from 'chroma-js'
-import Chart from 'chart.js'
-import 'chartjs-plugin-labels'
 import { mixins as kCoreMixins, utils as kCoreUtils } from '../../../core/client'
 
 export default {
@@ -79,14 +98,17 @@ export default {
       // if (properties.length) this.property = properties[0]
       return properties
     },
+    chartStyle () {
+      const min = Math.min(this.$q.screen.width, this.$q.screen.height)
+      return `maxWidth: ${min * 0.75}px;`
+    },
     nbCharts () {
       if (!this.chartData.length || (this.nbValuesPerChart.value === 0)) return 1
       else return Math.ceil(this.chartData.length / this.nbValuesPerChart.value)
     }
   },
   data () {
-    const chartTypes = ['pie', 'polarArea', 'radar', 'bar']
-    const chartOptions = chartTypes.map(
+    const availableChartTypes = ['pie', 'polarArea', 'radar', 'bar'].map(
       type => ({ value: type, label: this.$i18n.t(`KFeaturesChart.CHART_LABEL_${type.toUpperCase()}`) }))
     const paginationOptions = [{
       value: 0, label: this.$i18n.t('KFeaturesChart.ALL_VALUES')
@@ -102,7 +124,6 @@ export default {
     }, {
       value: 'percentage', label: this.$i18n.t('KFeaturesChart.PERCENTAGE_LABEL')
     }]
-
     return {
       toolbar: [
         { id: 'settings', icon: 'las la-cog', tooltip: 'KFeaturesChart.CHART_SETTINGS_LABEL', handler: () => this.$refs.chartSettings.open() },
@@ -111,15 +132,15 @@ export default {
       buttons: [
         { id: 'close-acation', label: 'CLOSE', renderer: 'form-button', handler: () => this.closeModal() }
       ],
-      property: null,
-      chartType: _.find(chartOptions, { value: 'pie' }),
-      chartOptions,
+      selectedProperty: null,
+      availableChartTypes,
+      selectedChartType: _.find(availableChartTypes, { value: 'pie' }),
+      chartData: [],
       currentChart: 1,
       nbValuesPerChart: _.find(paginationOptions, { value: 10 }),
       paginationOptions,
       renderOptions,
-      render: _.find(renderOptions, { value: 'value' }),
-      chartData: []
+      render: _.find(renderOptions, { value: 'value' })
     }
   },
   methods: {
@@ -128,13 +149,13 @@ export default {
     },
     async getPropertyValues () {
       // For enumeration we directly get the values
-      let values = _.get(this.layer, `schema.content.properties.${this.property.value}.field.options`)
+      let values = _.get(this.layer, `schema.content.properties.${this.selectedProperty.value}.field.options`)
       if (!values) {
         // Otherwise we need to make a DB query
         values = await this.$api.getService(this.layer.service, this.contextId)
-          .find({ query: Object.assign({ $distinct: `properties.${this.property.value}` }, this.layer.baseQuery) })
+          .find({ query: Object.assign({ $distinct: `properties.${this.selectedProperty.value}` }, this.layer.baseQuery) })
         // We don't have label in that case
-        values = values.map(value => ({ value, label: (value || this.$t('KFeaturesChart.NULL_VALUE_LABEL')) }))
+        values = _.map(values, value => ({ value, label: (value || this.$t('KFeaturesChart.NULL_VALUE_LABEL')) }))
       }
       return values
     },
@@ -142,9 +163,9 @@ export default {
       // Get possible values
       this.values = await this.getPropertyValues()
       // Then count features for each value
-      let data = await Promise.all(this.values.map(async value => {
+      let data = await Promise.all(_.map(this.values, async value => {
         const response = await this.$api.getService(this.layer.service, this.contextId)
-          .find({ query: Object.assign({ $limit: 0, [`properties.${this.property.value}`]: value.value }, this.layer.baseQuery) })
+          .find({ query: Object.assign({ $limit: 0, [`properties.${this.selectedProperty.value}`]: value.value }, this.layer.baseQuery) })
         return { value, count: response.total }
       }))
       // Sort data so that we don't have charts mixin large and small numbers when paginating, go large first
@@ -152,64 +173,6 @@ export default {
       this.values = data.map(item => item.value)
       this.chartData = data.map(item => item.count)
     },
-    getChartOptions (type) {
-      const start = (this.currentChart - 1) * this.nbValuesPerChart.value
-      const end = (this.nbValuesPerChart.value > 0 ? start + this.nbValuesPerChart.value : this.chartData.length)
-      const colors = _.shuffle(chroma.scale('Spectral').colors(end - start))
-      // const title = this.property.label + ' - ' + this.$t(`KFeaturesChart.CHART_LABEL_${type.toUpperCase()}`)
-      let title = this.property.label
-      if (this.nbCharts > 1) title += ` (${this.currentChart}/${this.nbCharts})`
-      const config = {
-        type,
-        data: {
-          labels: this.values.map(value => value.label).slice(start, end),
-          datasets: [{
-            data: this.chartData.slice(start, end)
-          }]
-        },
-        options: {
-          responsive: true,
-          title: {
-            display: true,
-            text: title
-          }
-        }
-      }
-      // ticks.precision = 0 means round displayed values to integers
-      if (type === 'radar') {
-        _.set(config, 'options.legend.display', false)
-        _.set(config, 'data.datasets[0].fill', true)
-        _.set(config, 'data.datasets[0].borderColor', colors[0])
-        _.set(config, 'data.datasets[0].backgroundColor', chroma(colors[0]).alpha(0.5).hex())
-        _.set(config, 'data.datasets[0].pointBorderColor', '#fff')
-        _.set(config, 'data.datasets[0].pointBackgroundColor', colors[0])
-        _.set(config, 'options.scale.ticks.beginAtZero', true)
-        _.set(config, 'options.scale.ticks.precision', 0)
-      } else {
-        _.set(config, 'data.datasets[0].backgroundColor', colors)
-        _.set(config, 'options.plugins.labels.render', this.render.value)
-        _.set(config, 'options.plugins.labels.position', 'border')
-        _.set(config, 'options.plugins.labels.overlap', false)
-        _.set(config, 'options.plugins.labels.showActualPercentages', true)
-        _.set(config, 'options.plugins.labels.precision', 0)
-        _.set(config, 'options.plugins.labels.textShadow', true)
-        _.set(config, 'options.plugins.labels.fontSize', 24)
-        _.set(config, 'options.plugins.labels.fontColor', (type === 'bar' ? '#000' : '#fff'))
-      }
-      if (type === 'bar') {
-        _.set(config, 'options.legend.display', false)
-        _.set(config, 'options.scales.xAxes[0].ticks.maxRotation', 90)
-        _.set(config, 'options.scales.xAxes[0].ticks.minRotation', 70)
-        _.set(config, 'options.scales.yAxes[0].ticks.beginAtZero', true)
-        _.set(config, 'options.scales.yAxes[0].ticks.precision', 0)
-        // _.set(config, 'options.plugins.labels.fontSize', 0)
-      } else if (type === 'polarArea') {
-        // FIXME: does not work in this case
-        // _.set(config, 'options.scale.display', false)
-      }
-
-      return config
-    },
     async refreshChart () {
       // As we have async operations during the whole chart creation process avoid reentrance
       // otherwise we might have interleaved calls leading to multiple charts being created
@@ -218,14 +181,32 @@ export default {
       // Try/Catch required to ensure we reset the build flag
       try {
         this.buildingChart = true
-        // Destroy previous graph if any
-        if (this.chart) this.chart.destroy()
-        // Retrieve data
+        // Retrieve chart data
         await this.getChartData()
-        // We need to force a refresh so that the computed props are correctly updated by Vuejs
-        await this.$nextTick()
-        this.chart = new Chart(this.$refs.chart.getContext('2d'),
-          this.getChartOptions(this.chartType.value))
+        // Update chart options
+        const start = (this.currentChart - 1) * this.nbValuesPerChart.value
+        const end = (this.nbValuesPerChart.value > 0 ? start + this.nbValuesPerChart.value : this.chartData.length)
+        let title = this.selectedProperty.label
+        if (this.nbCharts > 1) title += ` (${this.currentChart}/${this.nbCharts})`
+        // Update the chart
+        this.$refs.chart.update({
+          type: this.selectedChartType.value,
+          data: {
+            labels: _.map(this.values, value => value.label).slice(start, end),
+            datasets: [{
+              data: this.chartData.slice(start, end),
+              colorScale: 'Dark2'
+            }]
+          },
+          options: {
+            plugins: {
+              title: {
+                display: true,
+                text: title
+              }
+            }
+          }
+        })
       } catch (error) {
         // User error message on operation should be raised by error hook, otherwise this is more a coding error
         logger.error(error)
@@ -247,31 +228,21 @@ export default {
     },
     downloadChartData () {
       const json = this.values.map((value, index) => ({
-        [this.property.label]: value.label,
+        [this.selectedProperty.label]: value.label,
         [this.$t('KFeaturesChart.CHART_COUNT_LABEL')]: this.chartData[index]
       }))
       const csv = Papa.unparse(json)
       kCoreUtils.downloadAsBlob(csv, this.$t('KFeaturesChart.CHART_EXPORT_FILE', { layer: this.layer.name }), 'text/csv;charset=utf-8;')
     }
   },
-  created () {
+  beforeCreate () {
     // laod the required components
     this.$options.components['k-modal'] = this.$load('frame/KModal')
+    this.$options.components['k-stats-chart'] = this.$load('chart/KStatsChart')
   },
   async mounted () {
     await this.loadRefs()
     this.$refs.chartSettings.open()
-  },
-  beforeDestroy () {
-    if (this.chart) this.chart.destroy()
   }
 }
 </script>
-
-<style lang="stylus">
-.chart {
-  border: solid 1px lightgrey;
-  border-radius: 8px;
-  background: #ffffff
-}
-</style>