@kalisio/kdk 1.5.0 → 1.7.0

package/lib/core/client/reader.js

@@ -15,6 +15,12 @@ var _i18next2 = _interopRequireDefault(_i18next);
 
 var _events = require('./events');
 
+var _quasar = require('quasar');
+
+var _lodash = require('lodash');
+
+var _lodash2 = _interopRequireDefault(_lodash);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
@@ -24,27 +30,52 @@ const Reader = exports.Reader = {
   readers: {},
   register(mimeType, reader) {
     this.readers[mimeType] = reader;
+    reader.mimeType = mimeType;
+  },
+  filter(filelist) {
+    const acceptedFiles = [];
+    const additionnalFiles = [];
+    // iterate though the files and sort the files
+    for (let i = 0; i < filelist.length; ++i) {
+      const file = filelist[i];
+      const fileExt = _path2.default.extname(file.name);
+      let reader = this.readers[fileExt];
+      if (reader) {
+        acceptedFiles.push({ reader: fileExt, name: file.name, files: [file] });
+      } else {
+        reader = _lodash2.default.find(this.readers, reader => reader.getAdditionalFiles().includes(fileExt));
+        if (reader) {
+          additionnalFiles.push({ reader: reader.mimeType, file });
+        } else {
+          const error = { message: _i18next2.default.t('errors.UNSUPPORTED_FILE_FORMAT', { file: file.name }) };
+          _events.Events.$emit('error', error);
+        }
+      }
+    }
+    // process the additional files
+    _lodash2.default.forEach(additionnalFiles, additionnalFile => {
+      const group = _lodash2.default.find(acceptedFiles, acceptedFile => acceptedFile.reader === additionnalFile.reader);
+      if (group) group.files.push(additionnalFile.file);else {
+        const error = { message: _i18next2.default.t('errors.UNSUPPORTED_FILE_FORMAT', { file: additionnalFile.name }) };
+        _events.Events.$emit('error', error);
+      }
+    });
+    return acceptedFiles;
   },
   read(file, options) {
     var _this = this;
 
     return _asyncToGenerator(function* () {
-      const fileExtension = _path2.default.extname(file.name);
-      const reader = _this.readers[fileExtension];
-      if (reader) {
-        try {
-          const content = yield reader(file, options);
-          return content;
-        } catch (error) {
-          _events.Events.$emit('error', error);
-          throw error;
-        }
+      const reader = _this.readers[file.reader];
+      _quasar.Loading.show({ message: _i18next2.default.t('reader.READING_FILE', { file: file.name }) });
+      try {
+        const content = yield reader.read(file.files, options);
+        _quasar.Loading.hide();
+        return content;
+      } catch (error) {
+        _quasar.Loading.hide();
+        _events.Events.$emit('error', error);
       }
-      const error = {
-        message: _i18next2.default.t('errors.UNSUPPORTED_FILE_FORMAT', { file: file.name })
-      };
-      _events.Events.$emit('error', error);
-      throw new Error(error);
     })();
   },
   getSupportedFormats() {

package/lib/core/client/reader.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../core/client/reader.js"],"names":["Reader","readers","register","mimeType","reader","read","file","options","fileExtension","path","extname","name","content","error","Events","$emit","message","i18next","t","Error","getSupportedFormats","Object","keys"],"mappings":";;;;;;;AAAA;;;;AACA;;;;AACA;;;;;;AAEA;AACO,MAAMA,0BAAS;AACpBC,WAAS,EADW;AAEpBC,WAAUC,QAAV,EAAoBC,MAApB,EAA4B;AAC1B,SAAKH,OAAL,CAAaE,QAAb,IAAyBC,MAAzB;AACD,GAJmB;AAKdC,MAAN,CAAYC,IAAZ,EAAkBC,OAAlB,EAA2B;AAAA;;AAAA;AACzB,YAAMC,gBAAgBC,eAAKC,OAAL,CAAaJ,KAAKK,IAAlB,CAAtB;AACA,YAAMP,SAAS,MAAKH,OAAL,CAAaO,aAAb,CAAf;AACA,UAAIJ,MAAJ,EAAY;AACV,YAAI;AACF,gBAAMQ,UAAU,MAAMR,OAAOE,IAAP,EAAaC,OAAb,CAAtB;AACA,iBAAOK,OAAP;AACD,SAHD,CAGE,OAAOC,KAAP,EAAc;AACdC,yBAAOC,KAAP,CAAa,OAAb,EAAsBF,KAAtB;AACA,gBAAMA,KAAN;AACD;AACF;AACD,YAAMA,QAAQ;AACZG,iBAASC,kBAAQC,CAAR,CAAU,gCAAV,EAA4C,EAAEZ,MAAMA,KAAKK,IAAb,EAA5C;AADG,OAAd;AAGAG,qBAAOC,KAAP,CAAa,OAAb,EAAsBF,KAAtB;AACA,YAAM,IAAIM,KAAJ,CAAUN,KAAV,CAAN;AAhByB;AAiB1B,GAtBmB;AAuBpBO,wBAAuB;AACrB,WAAOC,OAAOC,IAAP,CAAY,KAAKrB,OAAjB,CAAP;AACD;AAzBmB,CAAf","file":"reader.js","sourcesContent":["import path from 'path'\r\nimport i18next from 'i18next'\r\nimport { Events } from './events'\r\n\r\n// Export singleton\r\nexport const Reader = {\r\n  readers: {},\r\n  register (mimeType, reader) {\r\n    this.readers[mimeType] = reader\r\n  },\r\n  async read (file, options) {\r\n    const fileExtension = path.extname(file.name)\r\n    const reader = this.readers[fileExtension]\r\n    if (reader) {\r\n      try {\r\n        const content = await reader(file, options)\r\n        return content\r\n      } catch (error) {\r\n        Events.$emit('error', error)\r\n        throw error\r\n      }\r\n    }\r\n    const error = {\r\n      message: i18next.t('errors.UNSUPPORTED_FILE_FORMAT', { file: file.name })\r\n    }\r\n    Events.$emit('error', error)\r\n    throw new Error(error)\r\n  },\r\n  getSupportedFormats () {\r\n    return Object.keys(this.readers)\r\n  }\r\n}\n"]}
+{"version":3,"sources":["../../../core/client/reader.js"],"names":["Reader","readers","register","mimeType","reader","filter","filelist","acceptedFiles","additionnalFiles","i","length","file","fileExt","path","extname","name","push","files","_","find","getAdditionalFiles","includes","error","message","i18next","t","Events","$emit","forEach","additionnalFile","group","acceptedFile","read","options","Loading","show","content","hide","getSupportedFormats","Object","keys"],"mappings":";;;;;;;AAAA;;;;AACA;;;;AACA;;AACA;;AACA;;;;;;;;AAEA;AACO,MAAMA,0BAAS;AACpBC,WAAS,EADW;AAEpBC,WAAUC,QAAV,EAAoBC,MAApB,EAA4B;AAC1B,SAAKH,OAAL,CAAaE,QAAb,IAAyBC,MAAzB;AACAA,WAAOD,QAAP,GAAkBA,QAAlB;AACD,GALmB;AAMpBE,SAAQC,QAAR,EAAkB;AAChB,UAAMC,gBAAgB,EAAtB;AACA,UAAMC,mBAAmB,EAAzB;AACA;AACA,SAAK,IAAIC,IAAI,CAAb,EAAgBA,IAAIH,SAASI,MAA7B,EAAqC,EAAED,CAAvC,EAA0C;AACxC,YAAME,OAAOL,SAASG,CAAT,CAAb;AACA,YAAMG,UAAUC,eAAKC,OAAL,CAAaH,KAAKI,IAAlB,CAAhB;AACA,UAAIX,SAAS,KAAKH,OAAL,CAAaW,OAAb,CAAb;AACA,UAAIR,MAAJ,EAAY;AACVG,sBAAcS,IAAd,CAAmB,EAAEZ,QAAQQ,OAAV,EAAmBG,MAAMJ,KAAKI,IAA9B,EAAoCE,OAAO,CAACN,IAAD,CAA3C,EAAnB;AACD,OAFD,MAEO;AACLP,iBAASc,iBAAEC,IAAF,CAAO,KAAKlB,OAAZ,EAAqBG,UAAUA,OAAOgB,kBAAP,GAA4BC,QAA5B,CAAqCT,OAArC,CAA/B,CAAT;AACA,YAAIR,MAAJ,EAAY;AACVI,2BAAiBQ,IAAjB,CAAsB,EAAEZ,QAAQA,OAAOD,QAAjB,EAA2BQ,IAA3B,EAAtB;AACD,SAFD,MAEO;AACL,gBAAMW,QAAQ,EAAEC,SAASC,kBAAQC,CAAR,CAAU,gCAAV,EAA4C,EAAEd,MAAMA,KAAKI,IAAb,EAA5C,CAAX,EAAd;AACAW,yBAAOC,KAAP,CAAa,OAAb,EAAsBL,KAAtB;AACD;AACF;AACF;AACD;AACAJ,qBAAEU,OAAF,CAAUpB,gBAAV,EAA4BqB,mBAAmB;AAC7C,YAAMC,QAAQZ,iBAAEC,IAAF,CAAOZ,aAAP,EAAsBwB,gBAAgBA,aAAa3B,MAAb,KAAwByB,gBAAgBzB,MAA9E,CAAd;AACA,UAAI0B,KAAJ,EAAWA,MAAMb,KAAN,CAAYD,IAAZ,CAAiBa,gBAAgBlB,IAAjC,EAAX,KACK;AACH,cAAMW,QAAQ,EAAEC,SAASC,kBAAQC,CAAR,CAAU,gCAAV,EAA4C,EAAEd,MAAMkB,gBAAgBd,IAAxB,EAA5C,CAAX,EAAd;AACAW,uBAAOC,KAAP,CAAa,OAAb,EAAsBL,KAAtB;AACD;AACF,KAPD;AAQA,WAAOf,aAAP;AACD,GApCmB;AAqCdyB,MAAN,CAAYrB,IAAZ,EAAkBsB,OAAlB,EAA2B;AAAA;;AAAA;AACzB,YAAM7B,SAAS,MAAKH,OAAL,CAAaU,KAAKP,MAAlB,CAAf;AACA8B,sBAAQC,IAAR,CAAa,EAAEZ,SAASC,kBAAQC,CAAR,CAAU,qBAAV,EAAiC,EAAEd,MAAMA,KAAKI,IAAb,EAAjC,CAAX,EAAb;AACA,UAAI;AACF,cAAMqB,UAAU,MAAMhC,OAAO4B,IAAP,CAAYrB,KAAKM,KAAjB,EAAwBgB,OAAxB,CAAtB;AACAC,wBAAQG,IAAR;AACA,eAAOD,OAAP;AACD,OAJD,CAIE,OAAOd,KAAP,EAAc;AACdY,wBAAQG,IAAR;AACAX,uBAAOC,KAAP,CAAa,OAAb,EAAsBL,KAAtB;AACD;AAVwB;AAW1B,GAhDmB;AAiDpBgB,wBAAuB;AACrB,WAAOC,OAAOC,IAAP,CAAY,KAAKvC,OAAjB,CAAP;AACD;AAnDmB,CAAf","file":"reader.js","sourcesContent":["import path from 'path'\r\nimport i18next from 'i18next'\r\nimport { Events } from './events'\r\nimport { Loading } from 'quasar'\r\nimport _ from 'lodash'\r\n\r\n// Export singleton\r\nexport const Reader = {\r\n  readers: {},\r\n  register (mimeType, reader) {\r\n    this.readers[mimeType] = reader\r\n    reader.mimeType = mimeType\r\n  },\r\n  filter (filelist) {\r\n    const acceptedFiles = []\r\n    const additionnalFiles = []\r\n    // iterate though the files and sort the files\r\n    for (let i = 0; i < filelist.length; ++i) {\r\n      const file = filelist[i]\r\n      const fileExt = path.extname(file.name)\r\n      let reader = this.readers[fileExt]\r\n      if (reader) {\r\n        acceptedFiles.push({ reader: fileExt, name: file.name, files: [file] })\r\n      } else {\r\n        reader = _.find(this.readers, reader => reader.getAdditionalFiles().includes(fileExt))\r\n        if (reader) {\r\n          additionnalFiles.push({ reader: reader.mimeType, file })\r\n        } else {\r\n          const error = { message: i18next.t('errors.UNSUPPORTED_FILE_FORMAT', { file: file.name }) }\r\n          Events.$emit('error', error)\r\n        }\r\n      }\r\n    }\r\n    // process the additional files\r\n    _.forEach(additionnalFiles, additionnalFile => {\r\n      const group = _.find(acceptedFiles, acceptedFile => acceptedFile.reader === additionnalFile.reader)\r\n      if (group) group.files.push(additionnalFile.file)\r\n      else {\r\n        const error = { message: i18next.t('errors.UNSUPPORTED_FILE_FORMAT', { file: additionnalFile.name }) }\r\n        Events.$emit('error', error)\r\n      }\r\n    })\r\n    return acceptedFiles\r\n  },\r\n  async read (file, options) {\r\n    const reader = this.readers[file.reader]\r\n    Loading.show({ message: i18next.t('reader.READING_FILE', { file: file.name }) })\r\n    try {\r\n      const content = await reader.read(file.files, options)\r\n      Loading.hide()\r\n      return content\r\n    } catch (error) {\r\n      Loading.hide()\r\n      Events.$emit('error', error)\r\n    }\r\n  },\r\n  getSupportedFormats () {\r\n    return Object.keys(this.readers)\r\n  }\r\n}\r\n"]}

package/lib/core/client/readers/reader.csv.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.readCSV = readCSV;
+exports.CSVReader = undefined;
 
 var _loglevel = require('loglevel');
 
@@ -19,25 +19,36 @@ var _papaparse2 = _interopRequireDefault(_papaparse);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function readCSV(file, options) {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onloadend = () => {
-      let content = reader.result;
-      const papaParseOptions = Object.assign({ skipEmptyLines: true }, options);
-      content = _papaparse2.default.parse(content, papaParseOptions);
-      if (content.errors.length > 0) {
-        _loglevel2.default.debug(content.errors);
-        reject(new Error(_i18next2.default.t('errors.INVALID_CSV_FILE', { file: file.name }), { errors: content.errors }));
-        return;
-      }
-      resolve(content);
-    };
-    reader.onerror = error => {
-      _loglevel2.default.debug(error);
-      reject(new Error(_i18next2.default.t('errors.CANNOT_READ_FILE', { file: file.name }), { errors: error }));
-    };
-    reader.readAsText(file);
-  });
-}
+const CSVReader = exports.CSVReader = {
+  read(files, options) {
+    if (files.length !== 1) {
+      _loglevel2.default.debug('invlaid \'fields\' arguments');
+      return;
+    }
+    const file = files[0];
+    _loglevel2.default.debug(`reading CSV file ${file.name}`);
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.onloadend = () => {
+        let content = reader.result;
+        const papaParseOptions = Object.assign({ skipEmptyLines: true }, options);
+        content = _papaparse2.default.parse(content, papaParseOptions);
+        if (content.errors.length > 0) {
+          _loglevel2.default.debug(content.errors);
+          reject(new Error(_i18next2.default.t('errors.INVALID_CSV_FILE', { file: file.name }), { errors: content.errors }));
+          return;
+        }
+        resolve(content);
+      };
+      reader.onerror = error => {
+        _loglevel2.default.debug(error);
+        reject(new Error(_i18next2.default.t('errors.CANNOT_READ_FILE', { file: file.name }), { errors: error }));
+      };
+      reader.readAsText(file);
+    });
+  },
+  getAdditionalFiles() {
+    return [];
+  }
+};
 //# sourceMappingURL=reader.csv.js.map

package/lib/core/client/readers/reader.csv.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../core/client/readers/reader.csv.js"],"names":["readCSV","file","options","Promise","resolve","reject","reader","FileReader","onloadend","content","result","papaParseOptions","Object","assign","skipEmptyLines","Papa","parse","errors","length","logger","debug","Error","i18next","t","name","onerror","error","readAsText"],"mappings":";;;;;QAIgBA,O,GAAAA,O;;AAJhB;;;;AACA;;;;AACA;;;;;;AAEO,SAASA,OAAT,CAAkBC,IAAlB,EAAwBC,OAAxB,EAAiC;AACtC,SAAO,IAAIC,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;AACtC,UAAMC,SAAS,IAAIC,UAAJ,EAAf;AACAD,WAAOE,SAAP,GAAmB,MAAM;AACvB,UAAIC,UAAUH,OAAOI,MAArB;AACA,YAAMC,mBAAmBC,OAAOC,MAAP,CAAc,EAAEC,gBAAgB,IAAlB,EAAd,EAAwCZ,OAAxC,CAAzB;AACAO,gBAAUM,oBAAKC,KAAL,CAAWP,OAAX,EAAoBE,gBAApB,CAAV;AACA,UAAIF,QAAQQ,MAAR,CAAeC,MAAf,GAAwB,CAA5B,EAA+B;AAC7BC,2BAAOC,KAAP,CAAaX,QAAQQ,MAArB;AACAZ,eAAO,IAAIgB,KAAJ,CAAUC,kBAAQC,CAAR,CAAU,yBAAV,EAAqC,EAAEtB,MAAMA,KAAKuB,IAAb,EAArC,CAAV,EAAqE,EAAEP,QAAQR,QAAQQ,MAAlB,EAArE,CAAP;AACA;AACD;AACDb,cAAQK,OAAR;AACD,KAVD;AAWAH,WAAOmB,OAAP,GAAkBC,KAAD,IAAW;AAC1BP,yBAAOC,KAAP,CAAaM,KAAb;AACArB,aAAO,IAAIgB,KAAJ,CAAUC,kBAAQC,CAAR,CAAU,yBAAV,EAAqC,EAAEtB,MAAMA,KAAKuB,IAAb,EAArC,CAAV,EAAqE,EAAEP,QAAQS,KAAV,EAArE,CAAP;AACD,KAHD;AAIApB,WAAOqB,UAAP,CAAkB1B,IAAlB;AACD,GAlBM,CAAP;AAmBD","file":"reader.csv.js","sourcesContent":["import logger from 'loglevel'\r\nimport i18next from 'i18next'\r\nimport Papa from 'papaparse'\r\n\r\nexport function readCSV (file, options) {\r\n  return new Promise((resolve, reject) => {\r\n    const reader = new FileReader()\r\n    reader.onloadend = () => {\r\n      let content = reader.result\r\n      const papaParseOptions = Object.assign({ skipEmptyLines: true }, options)\r\n      content = Papa.parse(content, papaParseOptions)\r\n      if (content.errors.length > 0) {\r\n        logger.debug(content.errors)\r\n        reject(new Error(i18next.t('errors.INVALID_CSV_FILE', { file: file.name }), { errors: content.errors }))\r\n        return\r\n      }\r\n      resolve(content)\r\n    }\r\n    reader.onerror = (error) => {\r\n      logger.debug(error)\r\n      reject(new Error(i18next.t('errors.CANNOT_READ_FILE', { file: file.name }), { errors: error }))\n    }\r\n    reader.readAsText(file)\r\n  })\r\n}\r\n"]}
+{"version":3,"sources":["../../../../core/client/readers/reader.csv.js"],"names":["CSVReader","read","files","options","length","logger","debug","file","name","Promise","resolve","reject","reader","FileReader","onloadend","content","result","papaParseOptions","Object","assign","skipEmptyLines","Papa","parse","errors","Error","i18next","t","onerror","error","readAsText","getAdditionalFiles"],"mappings":";;;;;;;AAAA;;;;AACA;;;;AACA;;;;;;AAEO,MAAMA,gCAAY;AACvBC,OAAMC,KAAN,EAAaC,OAAb,EAAsB;AACpB,QAAID,MAAME,MAAN,KAAiB,CAArB,EAAwB;AACtBC,yBAAOC,KAAP,CAAa,8BAAb;AACA;AACD;AACD,UAAMC,OAAOL,MAAM,CAAN,CAAb;AACAG,uBAAOC,KAAP,CAAc,oBAAmBC,KAAKC,IAAK,EAA3C;AACA,WAAO,IAAIC,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;AACtC,YAAMC,SAAS,IAAIC,UAAJ,EAAf;AACAD,aAAOE,SAAP,GAAmB,MAAM;AACvB,YAAIC,UAAUH,OAAOI,MAArB;AACA,cAAMC,mBAAmBC,OAAOC,MAAP,CAAc,EAAEC,gBAAgB,IAAlB,EAAd,EAAwCjB,OAAxC,CAAzB;AACAY,kBAAUM,oBAAKC,KAAL,CAAWP,OAAX,EAAoBE,gBAApB,CAAV;AACA,YAAIF,QAAQQ,MAAR,CAAenB,MAAf,GAAwB,CAA5B,EAA+B;AAC7BC,6BAAOC,KAAP,CAAaS,QAAQQ,MAArB;AACAZ,iBAAO,IAAIa,KAAJ,CAAUC,kBAAQC,CAAR,CAAU,yBAAV,EAAqC,EAAEnB,MAAMA,KAAKC,IAAb,EAArC,CAAV,EAAqE,EAAEe,QAAQR,QAAQQ,MAAlB,EAArE,CAAP;AACA;AACD;AACDb,gBAAQK,OAAR;AACD,OAVD;AAWAH,aAAOe,OAAP,GAAkBC,KAAD,IAAW;AAC1BvB,2BAAOC,KAAP,CAAasB,KAAb;AACAjB,eAAO,IAAIa,KAAJ,CAAUC,kBAAQC,CAAR,CAAU,yBAAV,EAAqC,EAAEnB,MAAMA,KAAKC,IAAb,EAArC,CAAV,EAAqE,EAAEe,QAAQK,KAAV,EAArE,CAAP;AACD,OAHD;AAIAhB,aAAOiB,UAAP,CAAkBtB,IAAlB;AACD,KAlBM,CAAP;AAmBD,GA3BsB;AA4BvBuB,uBAAsB;AACpB,WAAO,EAAP;AACD;AA9BsB,CAAlB","file":"reader.csv.js","sourcesContent":["import logger from 'loglevel'\r\nimport i18next from 'i18next'\r\nimport Papa from 'papaparse'\r\n\r\nexport const CSVReader = {\r\n  read (files, options) {\r\n    if (files.length !== 1) {\r\n      logger.debug('invlaid \\'fields\\' arguments')\r\n      return\r\n    }\r\n    const file = files[0]\r\n    logger.debug(`reading CSV file ${file.name}`)\r\n    return new Promise((resolve, reject) => {\r\n      const reader = new FileReader()\r\n      reader.onloadend = () => {\r\n        let content = reader.result\r\n        const papaParseOptions = Object.assign({ skipEmptyLines: true }, options)\r\n        content = Papa.parse(content, papaParseOptions)\r\n        if (content.errors.length > 0) {\r\n          logger.debug(content.errors)\r\n          reject(new Error(i18next.t('errors.INVALID_CSV_FILE', { file: file.name }), { errors: content.errors }))\r\n          return\r\n        }\r\n        resolve(content)\r\n      }\r\n      reader.onerror = (error) => {\r\n        logger.debug(error)\r\n        reject(new Error(i18next.t('errors.CANNOT_READ_FILE', { file: file.name }), { errors: error }))\r\n      }\r\n      reader.readAsText(file)\r\n    })\r\n  },\r\n  getAdditionalFiles () {\r\n    return []\r\n  }\r\n}\r\n"]}

package/lib/core/client/readers/reader.json.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.readJSON = readJSON;
+exports.JSONReader = undefined;
 
 var _loglevel = require('loglevel');
 
@@ -15,24 +15,35 @@ var _i18next2 = _interopRequireDefault(_i18next);
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function readJSON(file, options) {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onloadend = () => {
-      let content = reader.result;
-      try {
-        content = JSON.parse(content);
-      } catch (error) {
+const JSONReader = exports.JSONReader = {
+  read(files, options) {
+    if (files.length !== 1) {
+      _loglevel2.default.debug('invlaid \'fields\' arguments');
+      return;
+    }
+    const file = files[0];
+    _loglevel2.default.debug(`reading JSON file ${file.name}`);
+    return new Promise((resolve, reject) => {
+      const reader = new FileReader();
+      reader.onloadend = () => {
+        let content = reader.result;
+        try {
+          content = JSON.parse(content);
+        } catch (error) {
+          _loglevel2.default.debug(error);
+          reject(new Error(_i18next2.default.t('errors.INVALID_JSON_FILE', { file }), { errors: error }));
+        }
+        resolve(content);
+      };
+      reader.onerror = error => {
         _loglevel2.default.debug(error);
-        reject(new Error(_i18next2.default.t('errors.INVALID_JSON_FILE', { file }), { errors: error }));
-      }
-      resolve(content);
-    };
-    reader.onerror = error => {
-      _loglevel2.default.debug(error);
-      reject(new Error(_i18next2.default.t('errors.CANNOT_READ_FILE', { file }), { errors: error }));
-    };
-    reader.readAsText(file);
-  });
-}
+        reject(new Error(_i18next2.default.t('errors.CANNOT_READ_FILE', { file }), { errors: error }));
+      };
+      reader.readAsText(file);
+    });
+  },
+  getAdditionalFiles() {
+    return [];
+  }
+};
 //# sourceMappingURL=reader.json.js.map

package/lib/core/client/readers/reader.json.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../core/client/readers/reader.json.js"],"names":["readJSON","file","options","Promise","resolve","reject","reader","FileReader","onloadend","content","result","JSON","parse","error","logger","debug","Error","i18next","t","errors","onerror","readAsText"],"mappings":";;;;;QAGgBA,Q,GAAAA,Q;;AAHhB;;;;AACA;;;;;;AAEO,SAASA,QAAT,CAAmBC,IAAnB,EAAyBC,OAAzB,EAAkC;AACvC,SAAO,IAAIC,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;AACtC,UAAMC,SAAS,IAAIC,UAAJ,EAAf;AACAD,WAAOE,SAAP,GAAmB,MAAM;AACvB,UAAIC,UAAUH,OAAOI,MAArB;AACA,UAAI;AACFD,kBAAUE,KAAKC,KAAL,CAAWH,OAAX,CAAV;AACD,OAFD,CAEE,OAAOI,KAAP,EAAc;AACdC,2BAAOC,KAAP,CAAaF,KAAb;AACAR,eAAO,IAAIW,KAAJ,CAAUC,kBAAQC,CAAR,CAAU,0BAAV,EAAsC,EAAEjB,IAAF,EAAtC,CAAV,EAA2D,EAAEkB,QAAQN,KAAV,EAA3D,CAAP;AACD;AACDT,cAAQK,OAAR;AACD,KATD;AAUAH,WAAOc,OAAP,GAAkBP,KAAD,IAAW;AAC1BC,yBAAOC,KAAP,CAAaF,KAAb;AACAR,aAAO,IAAIW,KAAJ,CAAUC,kBAAQC,CAAR,CAAU,yBAAV,EAAqC,EAAEjB,IAAF,EAArC,CAAV,EAA0D,EAAEkB,QAAQN,KAAV,EAA1D,CAAP;AACD,KAHD;AAIAP,WAAOe,UAAP,CAAkBpB,IAAlB;AACD,GAjBM,CAAP;AAkBD","file":"reader.json.js","sourcesContent":["import logger from 'loglevel'\r\nimport i18next from 'i18next'\r\n\r\nexport function readJSON (file, options) {\r\n  return new Promise((resolve, reject) => {\r\n    const reader = new FileReader()\r\n    reader.onloadend = () => {\r\n      let content = reader.result\r\n      try {\r\n        content = JSON.parse(content)\r\n      } catch (error) {\r\n        logger.debug(error)\r\n        reject(new Error(i18next.t('errors.INVALID_JSON_FILE', { file }), { errors: error }))\r\n      }\r\n      resolve(content)\r\n    }\r\n    reader.onerror = (error) => {\r\n      logger.debug(error)\r\n      reject(new Error(i18next.t('errors.CANNOT_READ_FILE', { file }), { errors: error }))\r\n    }\r\n    reader.readAsText(file)\r\n  })\r\n}\r\n"]}
+{"version":3,"sources":["../../../../core/client/readers/reader.json.js"],"names":["JSONReader","read","files","options","length","logger","debug","file","name","Promise","resolve","reject","reader","FileReader","onloadend","content","result","JSON","parse","error","Error","i18next","t","errors","onerror","readAsText","getAdditionalFiles"],"mappings":";;;;;;;AAAA;;;;AACA;;;;;;AAEO,MAAMA,kCAAa;AACxBC,OAAMC,KAAN,EAAaC,OAAb,EAAsB;AACpB,QAAID,MAAME,MAAN,KAAiB,CAArB,EAAwB;AACtBC,yBAAOC,KAAP,CAAa,8BAAb;AACA;AACD;AACD,UAAMC,OAAOL,MAAM,CAAN,CAAb;AACAG,uBAAOC,KAAP,CAAc,qBAAoBC,KAAKC,IAAK,EAA5C;AACA,WAAO,IAAIC,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;AACtC,YAAMC,SAAS,IAAIC,UAAJ,EAAf;AACAD,aAAOE,SAAP,GAAmB,MAAM;AACvB,YAAIC,UAAUH,OAAOI,MAArB;AACA,YAAI;AACFD,oBAAUE,KAAKC,KAAL,CAAWH,OAAX,CAAV;AACD,SAFD,CAEE,OAAOI,KAAP,EAAc;AACdd,6BAAOC,KAAP,CAAaa,KAAb;AACAR,iBAAO,IAAIS,KAAJ,CAAUC,kBAAQC,CAAR,CAAU,0BAAV,EAAsC,EAAEf,IAAF,EAAtC,CAAV,EAA2D,EAAEgB,QAAQJ,KAAV,EAA3D,CAAP;AACD;AACDT,gBAAQK,OAAR;AACD,OATD;AAUAH,aAAOY,OAAP,GAAkBL,KAAD,IAAW;AAC1Bd,2BAAOC,KAAP,CAAaa,KAAb;AACAR,eAAO,IAAIS,KAAJ,CAAUC,kBAAQC,CAAR,CAAU,yBAAV,EAAqC,EAAEf,IAAF,EAArC,CAAV,EAA0D,EAAEgB,QAAQJ,KAAV,EAA1D,CAAP;AACD,OAHD;AAIAP,aAAOa,UAAP,CAAkBlB,IAAlB;AACD,KAjBM,CAAP;AAkBD,GA1BuB;AA2BxBmB,uBAAsB;AACpB,WAAO,EAAP;AACD;AA7BuB,CAAnB","file":"reader.json.js","sourcesContent":["import logger from 'loglevel'\r\nimport i18next from 'i18next'\r\n\r\nexport const JSONReader = {\r\n  read (files, options) {\r\n    if (files.length !== 1) {\r\n      logger.debug('invlaid \\'fields\\' arguments')\r\n      return\r\n    }\r\n    const file = files[0]\r\n    logger.debug(`reading JSON file ${file.name}`)\r\n    return new Promise((resolve, reject) => {\r\n      const reader = new FileReader()\r\n      reader.onloadend = () => {\r\n        let content = reader.result\r\n        try {\r\n          content = JSON.parse(content)\r\n        } catch (error) {\r\n          logger.debug(error)\r\n          reject(new Error(i18next.t('errors.INVALID_JSON_FILE', { file }), { errors: error }))\r\n        }\r\n        resolve(content)\r\n      }\r\n      reader.onerror = (error) => {\r\n        logger.debug(error)\r\n        reject(new Error(i18next.t('errors.CANNOT_READ_FILE', { file }), { errors: error }))\r\n      }\r\n      reader.readAsText(file)\r\n    })\r\n  },\r\n  getAdditionalFiles () {\r\n    return []\r\n  }\r\n}\r\n"]}

package/lib/core/client/services/index.js

@@ -6,6 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.LocalSettingsService = undefined;
 exports.default = init;
 
+var _lodash = require('lodash');
+
+var _lodash2 = _interopRequireDefault(_lodash);
+
 var _localSettings = require('./local-settings.service');
 
 var _localSettings2 = _interopRequireDefault(_localSettings);
@@ -32,7 +36,7 @@ function init() {
   api.declareService('devices');
 
   // Setup service for settings edition
-  api.createService('settings', Object.assign({
+  api.createService('settings', _lodash2.default.merge(_config2.default.settings || {}, {
     service: _localSettings2.default,
     propertyMapping: {
       shortTime: 'time.format.time.short',
@@ -41,13 +45,21 @@ function init() {
       longDate: 'time.format.date.long',
       shortYear: 'time.format.year.short',
       longYear: 'time.format.year.long',
-      utc: 'time.format.utc',
+      timezone: 'time.format.timezone',
       timelineStep: 'time.step',
+      timelineInterval: 'time.interval',
       timeseriesSpan: 'timeseries.span',
       location: 'locationFormat',
       restoreView: 'restore.view',
-      restoreLayers: 'restore.layers'
+      restoreLayers: 'restore.layers',
+      defaultLength: 'units.default.length',
+      defaultAltitude: 'units.default.altitude',
+      defaultArea: 'units.default.area',
+      defaultVelocity: 'units.default.velocity',
+      defaultTemperature: 'units.default.temperature',
+      defaultAngle: 'units.default.angle',
+      defaultPrecision: 'units.default.precision'
     }
-  }, _config2.default.settings || {})); // Default options can be overriden from app config
+  })); // Default options can be overriden from app config
 }
 //# sourceMappingURL=index.js.map

package/lib/core/client/services/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../core/client/services/index.js"],"names":["init","LocalSettingsService","api","declareService","context","createService","Object","assign","service","propertyMapping","shortTime","longTime","shortDate","longDate","shortYear","longYear","utc","timelineStep","timeseriesSpan","location","restoreView","restoreLayers","config","settings"],"mappings":";;;;;;kBAKwBA,I;;AALxB;;;;AACA;;;;;;QAESC,oB,GAAAA,uB;AAEM,SAASD,IAAT,GAAiB;AAC9B,QAAME,MAAM,IAAZ;;AAEA;AACAA,MAAIC,cAAJ,CAAmB,OAAnB;AACAD,MAAIC,cAAJ,CAAmB,gBAAnB;AACAD,MAAIC,cAAJ,CAAmB,MAAnB,EAA2B,EAAEC,SAAS,IAAX,EAA3B;AACAF,MAAIC,cAAJ,CAAmB,eAAnB;AACAD,MAAIC,cAAJ,CAAmB,SAAnB,EAA8B,EAAEC,SAAS,IAAX,EAA9B;AACAF,MAAIC,cAAJ,CAAmB,QAAnB,EAA6B,EAAEC,SAAS,IAAX,EAA7B;AACAF,MAAIC,cAAJ,CAAmB,SAAnB,EAA8B,EAAEC,SAAS,IAAX,EAA9B;AACAF,MAAIC,cAAJ,CAAmB,SAAnB;AACAD,MAAIC,cAAJ,CAAmB,SAAnB;;AAEA;AACAD,MAAIG,aAAJ,CAAkB,UAAlB,EAA8BC,OAAOC,MAAP,CAAc;AAC1CC,aAASP,uBADiC;AAE1CQ,qBAAiB;AACfC,iBAAW,wBADI;AAEfC,gBAAU,uBAFK;AAGfC,iBAAW,wBAHI;AAIfC,gBAAU,uBAJK;AAKfC,iBAAW,wBALI;AAMfC,gBAAU,uBANK;AAOfC,WAAK,iBAPU;AAQfC,oBAAc,WARC;AASfC,sBAAgB,iBATD;AAUfC,gBAAU,gBAVK;AAWfC,mBAAa,cAXE;AAYfC,qBAAe;AAZA;AAFyB,GAAd,EAgB3BC,iBAAOC,QAAP,IAAmB,EAhBQ,CAA9B,EAf8B,CA+BH;AAC5B","file":"index.js","sourcesContent":["import LocalSettingsService from './local-settings.service'\r\nimport config from 'config'\r\n\r\nexport { LocalSettingsService }\r\n\r\nexport default function init () {\r\n  const api = this\r\n\r\n  // Declare the built-in services, others are optional\r\n  api.declareService('users')\r\n  api.declareService('authorisations')\r\n  api.declareService('tags', { context: true })\r\n  api.declareService('organisations')\r\n  api.declareService('members', { context: true })\r\n  api.declareService('groups', { context: true })\r\n  api.declareService('storage', { context: true })\r\n  api.declareService('account')\r\n  api.declareService('devices')\r\n\r\n  // Setup service for settings edition\r\n  api.createService('settings', Object.assign({\r\n    service: LocalSettingsService,\r\n    propertyMapping: {\r\n      shortTime: 'time.format.time.short',\r\n      longTime: 'time.format.time.long',\r\n      shortDate: 'time.format.date.short',\r\n      longDate: 'time.format.date.long',\r\n      shortYear: 'time.format.year.short',\r\n      longYear: 'time.format.year.long',\r\n      utc: 'time.format.utc',\r\n      timelineStep: 'time.step',\r\n      timeseriesSpan: 'timeseries.span',\r\n      location: 'locationFormat',\r\n      restoreView: 'restore.view',\r\n      restoreLayers: 'restore.layers'\r\n    }\r\n  }, config.settings || {})) // Default options can be overriden from app config\r\n}\r\n"]}
+{"version":3,"sources":["../../../../core/client/services/index.js"],"names":["init","LocalSettingsService","api","declareService","context","createService","_","merge","config","settings","service","propertyMapping","shortTime","longTime","shortDate","longDate","shortYear","longYear","timezone","timelineStep","timelineInterval","timeseriesSpan","location","restoreView","restoreLayers","defaultLength","defaultAltitude","defaultArea","defaultVelocity","defaultTemperature","defaultAngle","defaultPrecision"],"mappings":";;;;;;kBAMwBA,I;;AANxB;;;;AACA;;;;AACA;;;;;;QAESC,oB,GAAAA,uB;AAEM,SAASD,IAAT,GAAiB;AAC9B,QAAME,MAAM,IAAZ;;AAEA;AACAA,MAAIC,cAAJ,CAAmB,OAAnB;AACAD,MAAIC,cAAJ,CAAmB,gBAAnB;AACAD,MAAIC,cAAJ,CAAmB,MAAnB,EAA2B,EAAEC,SAAS,IAAX,EAA3B;AACAF,MAAIC,cAAJ,CAAmB,eAAnB;AACAD,MAAIC,cAAJ,CAAmB,SAAnB,EAA8B,EAAEC,SAAS,IAAX,EAA9B;AACAF,MAAIC,cAAJ,CAAmB,QAAnB,EAA6B,EAAEC,SAAS,IAAX,EAA7B;AACAF,MAAIC,cAAJ,CAAmB,SAAnB,EAA8B,EAAEC,SAAS,IAAX,EAA9B;AACAF,MAAIC,cAAJ,CAAmB,SAAnB;AACAD,MAAIC,cAAJ,CAAmB,SAAnB;;AAEA;AACAD,MAAIG,aAAJ,CAAkB,UAAlB,EAA8BC,iBAAEC,KAAF,CAAQC,iBAAOC,QAAP,IAAmB,EAA3B,EAA+B;AAC3DC,aAAST,uBADkD;AAE3DU,qBAAiB;AACfC,iBAAW,wBADI;AAEfC,gBAAU,uBAFK;AAGfC,iBAAW,wBAHI;AAIfC,gBAAU,uBAJK;AAKfC,iBAAW,wBALI;AAMfC,gBAAU,uBANK;AAOfC,gBAAU,sBAPK;AAQfC,oBAAc,WARC;AASfC,wBAAkB,eATH;AAUfC,sBAAgB,iBAVD;AAWfC,gBAAU,gBAXK;AAYfC,mBAAa,cAZE;AAafC,qBAAe,gBAbA;AAcfC,qBAAe,sBAdA;AAefC,uBAAiB,wBAfF;AAgBfC,mBAAa,oBAhBE;AAiBfC,uBAAiB,wBAjBF;AAkBfC,0BAAoB,2BAlBL;AAmBfC,oBAAc,qBAnBC;AAoBfC,wBAAkB;AApBH;AAF0C,GAA/B,CAA9B,EAf8B,CAuC1B;AACL","file":"index.js","sourcesContent":["import _ from 'lodash'\r\nimport LocalSettingsService from './local-settings.service'\r\nimport config from 'config'\r\n\r\nexport { LocalSettingsService }\r\n\r\nexport default function init () {\r\n  const api = this\r\n\r\n  // Declare the built-in services, others are optional\r\n  api.declareService('users')\r\n  api.declareService('authorisations')\r\n  api.declareService('tags', { context: true })\r\n  api.declareService('organisations')\r\n  api.declareService('members', { context: true })\r\n  api.declareService('groups', { context: true })\r\n  api.declareService('storage', { context: true })\r\n  api.declareService('account')\r\n  api.declareService('devices')\r\n\r\n  // Setup service for settings edition\r\n  api.createService('settings', _.merge(config.settings || {}, {\r\n    service: LocalSettingsService,\r\n    propertyMapping: {\r\n      shortTime: 'time.format.time.short',\r\n      longTime: 'time.format.time.long',\r\n      shortDate: 'time.format.date.short',\r\n      longDate: 'time.format.date.long',\r\n      shortYear: 'time.format.year.short',\r\n      longYear: 'time.format.year.long',\r\n      timezone: 'time.format.timezone',\r\n      timelineStep: 'time.step',\r\n      timelineInterval: 'time.interval',\r\n      timeseriesSpan: 'timeseries.span',\r\n      location: 'locationFormat',\r\n      restoreView: 'restore.view',\r\n      restoreLayers: 'restore.layers',\r\n      defaultLength: 'units.default.length',\r\n      defaultAltitude: 'units.default.altitude',\r\n      defaultArea: 'units.default.area',\r\n      defaultVelocity: 'units.default.velocity',\r\n      defaultTemperature: 'units.default.temperature',\r\n      defaultAngle: 'units.default.angle',\r\n      defaultPrecision: 'units.default.precision'\r\n    }\r\n  })) // Default options can be overriden from app config\r\n}\r\n"]}

package/lib/core/client/services/local-settings.service.js

@@ -16,7 +16,9 @@ exports.default = function (name, api, options) {
       return _asyncToGenerator(function* () {
         const data = {};
         _lodash2.default.forOwn(mapping, function (value, key) {
-          _lodash2.default.set(data, key, _store.Store.get(value));
+          if (value) {
+            _lodash2.default.set(data, key, _store.Store.get(value));
+          }
         });
         return data;
       })();
@@ -30,7 +32,7 @@ exports.default = function (name, api, options) {
           return _store.Store.get(rootPath);
         });
         _lodash2.default.forOwn(data, function (value, key) {
-          if (_lodash2.default.has(mapping, key)) {
+          if (_lodash2.default.get(mapping, key)) {
             _store.Store.set(mapping[key], value);
           }
         });
@@ -45,7 +47,7 @@ exports.default = function (name, api, options) {
     saveSettings() {
       const data = {};
       _lodash2.default.forOwn(mapping, (value, key) => {
-        if (_store.Store.has(value)) {
+        if (value && _store.Store.has(value)) {
           _lodash2.default.set(data, key, _store.Store.get(value));
         }
       });
@@ -56,8 +58,12 @@ exports.default = function (name, api, options) {
       let settings = window.localStorage.getItem(settingsKey);
       if (!settings) return;
       settings = JSON.parse(settings);
+      // Backward compatibility when changed utc mode to timezone setting
+      if (_lodash2.default.get(settings, 'utc') && _lodash2.default.has(mapping, 'timezone') && !_lodash2.default.get(settings, 'timezone')) {
+        _lodash2.default.set(settings, 'timezone', 'UTC');
+      }
       _lodash2.default.forOwn(mapping, (value, key) => {
-        if (_lodash2.default.has(settings, key)) {
+        if (value && _lodash2.default.has(settings, key)) {
           _store.Store.set(value, _lodash2.default.get(settings, key));
         }
       });

package/lib/core/client/services/local-settings.service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../core/client/services/local-settings.service.js"],"names":["name","api","options","mapping","propertyMapping","rootPaths","_","uniq","values","map","path","split","settingsKey","config","appName","toLowerCase","get","id","data","forOwn","value","key","set","Store","patch","previousRootValues","rootPath","has","forEach","index","eventName","kebabCase","Events","$emit","saveSettings","window","localStorage","setItem","JSON","stringify","restoreSettings","settings","getItem","parse","getSettingsMapping"],"mappings":";;;;;;kBAKe,UAAUA,IAAV,EAAgBC,GAAhB,EAAqBC,OAArB,EAA8B;AAC3C,QAAMC,UAAUD,QAAQE,eAAxB;AACA;AACA;AACA,QAAMC,YAAYC,iBAAEC,IAAF,CAAOD,iBAAEE,MAAF,CAASL,OAAT,EAAkBM,GAAlB,CAAsBC,QAAQA,KAAKC,KAAL,CAAW,GAAX,EAAgB,CAAhB,CAA9B,CAAP,CAAlB;AACA,QAAMC,cAAcC,iBAAOC,OAAP,CAAeC,WAAf,KAA+B,GAA/B,IAAsCb,QAAQU,WAAR,IAAuB,UAA7D,CAApB;AACA,SAAO;;AAECI,OAAN,CAAWC,EAAX,EAAe;AAAA;AACb,cAAMC,OAAO,EAAb;AACAZ,yBAAEa,MAAF,CAAShB,OAAT,EAAkB,UAACiB,KAAD,EAAQC,GAAR,EAAgB;AAChCf,2BAAEgB,GAAF,CAAMJ,IAAN,EAAYG,GAAZ,EAAiBE,aAAMP,GAAN,CAAUI,KAAV,CAAjB;AACD,SAFD;AAGA,eAAOF,IAAP;AALa;AAMd,KARI;;AAUCM,SAAN,CAAaP,EAAb,EAAiBC,IAAjB,EAAuB;AAAA;;AAAA;AACrB,cAAMO,qBAAqBpB,UAAUI,GAAV,CAAc;AAAA,iBAAYc,aAAMP,GAAN,CAAUU,QAAV,CAAZ;AAAA,SAAd,CAA3B;AACApB,yBAAEa,MAAF,CAASD,IAAT,EAAe,UAACE,KAAD,EAAQC,GAAR,EAAgB;AAC7B,cAAIf,iBAAEqB,GAAF,CAAMxB,OAAN,EAAekB,GAAf,CAAJ,EAAyB;AACvBE,yBAAMD,GAAN,CAAUnB,QAAQkB,GAAR,CAAV,EAAwBD,KAAxB;AACD;AACF,SAJD;AAKAf,kBAAUuB,OAAV,CAAkB,UAACF,QAAD,EAAWG,KAAX,EAAqB;AACrC,gBAAMC,YAAYxB,iBAAEyB,SAAF,CAAa,GAAEL,QAAS,UAAxB,CAAlB;AACAM,yBAAOC,KAAP,CAAaH,SAAb,EAAwBP,aAAMP,GAAN,CAAUU,QAAV,CAAxB,EAA6CD,mBAAmBI,KAAnB,CAA7C;AACD,SAHD;AAIA,cAAKK,YAAL;AAXqB;AAYtB,KAtBI;;AAwBLA,mBAAgB;AACd,YAAMhB,OAAO,EAAb;AACAZ,uBAAEa,MAAF,CAAShB,OAAT,EAAkB,CAACiB,KAAD,EAAQC,GAAR,KAAgB;AAChC,YAAIE,aAAMI,GAAN,CAAUP,KAAV,CAAJ,EAAsB;AACpBd,2BAAEgB,GAAF,CAAMJ,IAAN,EAAYG,GAAZ,EAAiBE,aAAMP,GAAN,CAAUI,KAAV,CAAjB;AACD;AACF,OAJD;AAKAe,aAAOC,YAAP,CAAoBC,OAApB,CAA4BzB,WAA5B,EAAyC0B,KAAKC,SAAL,CAAerB,IAAf,CAAzC;AACD,KAhCI;;AAkCLsB,sBAAmB;AACjB,UAAIC,WAAWN,OAAOC,YAAP,CAAoBM,OAApB,CAA4B9B,WAA5B,CAAf;AACA,UAAI,CAAC6B,QAAL,EAAe;AACfA,iBAAWH,KAAKK,KAAL,CAAWF,QAAX,CAAX;AACAnC,uBAAEa,MAAF,CAAShB,OAAT,EAAkB,CAACiB,KAAD,EAAQC,GAAR,KAAgB;AAChC,YAAIf,iBAAEqB,GAAF,CAAMc,QAAN,EAAgBpB,GAAhB,CAAJ,EAA0B;AACxBE,uBAAMD,GAAN,CAAUF,KAAV,EAAiBd,iBAAEU,GAAF,CAAMyB,QAAN,EAAgBpB,GAAhB,CAAjB;AACD;AACF,OAJD;AAKD,KA3CI;;AA6CLuB,yBAAsB;AACpB,aAAOzC,OAAP;AACD;AA/CI,GAAP;AAiDD,C;;AA5DD;;;;AACA;;;;AACA;;AACA","file":"local-settings.service.js","sourcesContent":["import _ from 'lodash'\r\nimport config from 'config'\r\nimport { Store } from '../store'\r\nimport { Events } from '../events'\r\n\r\nexport default function (name, api, options) {\r\n  const mapping = options.propertyMapping\r\n  // We will emit also an event for all top level properties in case of nested ones\r\n  // This simplifies event management for some listeners instead of listening to all nested properties\r\n  const rootPaths = _.uniq(_.values(mapping).map(path => path.split('.')[0]))\r\n  const settingsKey = config.appName.toLowerCase() + '-' + (options.settingsKey || 'settings')\r\n  return {\r\n\r\n    async get (id) {\r\n      const data = {}\r\n      _.forOwn(mapping, (value, key) => {\r\n        _.set(data, key, Store.get(value))\r\n      })\r\n      return data\r\n    },\r\n\r\n    async patch (id, data) {\r\n      const previousRootValues = rootPaths.map(rootPath => Store.get(rootPath))\r\n      _.forOwn(data, (value, key) => {\r\n        if (_.has(mapping, key)) {\r\n          Store.set(mapping[key], value)\r\n        }\r\n      })\r\n      rootPaths.forEach((rootPath, index) => {\r\n        const eventName = _.kebabCase(`${rootPath}-changed`)\r\n        Events.$emit(eventName, Store.get(rootPath), previousRootValues[index])\r\n      })\r\n      this.saveSettings()\r\n    },\r\n\r\n    saveSettings () {\r\n      const data = {}\r\n      _.forOwn(mapping, (value, key) => {\r\n        if (Store.has(value)) {\r\n          _.set(data, key, Store.get(value))\r\n        }\r\n      })\r\n      window.localStorage.setItem(settingsKey, JSON.stringify(data))\r\n    },\r\n\r\n    restoreSettings () {\r\n      let settings = window.localStorage.getItem(settingsKey)\r\n      if (!settings) return\r\n      settings = JSON.parse(settings)\r\n      _.forOwn(mapping, (value, key) => {\r\n        if (_.has(settings, key)) {\r\n          Store.set(value, _.get(settings, key))\r\n        }\r\n      })\r\n    },\r\n\r\n    getSettingsMapping () {\r\n      return mapping\r\n    }\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["../../../../core/client/services/local-settings.service.js"],"names":["name","api","options","mapping","propertyMapping","rootPaths","_","uniq","values","map","path","split","settingsKey","config","appName","toLowerCase","get","id","data","forOwn","value","key","set","Store","patch","previousRootValues","rootPath","forEach","index","eventName","kebabCase","Events","$emit","saveSettings","has","window","localStorage","setItem","JSON","stringify","restoreSettings","settings","getItem","parse","getSettingsMapping"],"mappings":"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","file":"local-settings.service.js","sourcesContent":["import _ from 'lodash'\r\nimport config from 'config'\r\nimport { Store } from '../store'\r\nimport { Events } from '../events'\r\n\r\nexport default function (name, api, options) {\r\n  const mapping = options.propertyMapping\r\n  // We will emit also an event for all top level properties in case of nested ones\r\n  // This simplifies event management for some listeners instead of listening to all nested properties\r\n  const rootPaths = _.uniq(_.values(mapping).map(path => path.split('.')[0]))\r\n  const settingsKey = config.appName.toLowerCase() + '-' + (options.settingsKey || 'settings')\r\n  return {\r\n\r\n    async get (id) {\r\n      const data = {}\r\n      _.forOwn(mapping, (value, key) => {\r\n        if (value) {\r\n          _.set(data, key, Store.get(value))\r\n        }\r\n      })\r\n      return data\r\n    },\r\n\r\n    async patch (id, data) {\r\n      const previousRootValues = rootPaths.map(rootPath => Store.get(rootPath))\r\n      _.forOwn(data, (value, key) => {\r\n        if (_.get(mapping, key)) {\r\n          Store.set(mapping[key], value)\r\n        }\r\n      })\r\n      rootPaths.forEach((rootPath, index) => {\r\n        const eventName = _.kebabCase(`${rootPath}-changed`)\r\n        Events.$emit(eventName, Store.get(rootPath), previousRootValues[index])\r\n      })\r\n      this.saveSettings()\r\n    },\r\n\r\n    saveSettings () {\r\n      const data = {}\r\n      _.forOwn(mapping, (value, key) => {\r\n        if (value && Store.has(value)) {\r\n          _.set(data, key, Store.get(value))\r\n        }\r\n      })\r\n      window.localStorage.setItem(settingsKey, JSON.stringify(data))\r\n    },\r\n\r\n    restoreSettings () {\r\n      let settings = window.localStorage.getItem(settingsKey)\r\n      if (!settings) return\r\n      settings = JSON.parse(settings)\r\n      // Backward compatibility when changed utc mode to timezone setting\r\n      if (_.get(settings, 'utc') && _.has(mapping, 'timezone') && !_.get(settings, 'timezone')) {\r\n        _.set(settings, 'timezone', 'UTC')\r\n      }\r\n      _.forOwn(mapping, (value, key) => {\r\n        if (value && _.has(settings, key)) {\r\n          Store.set(value, _.get(settings, key))\r\n        }\r\n      })\r\n    },\r\n\r\n    getSettingsMapping () {\r\n      return mapping\r\n    }\r\n  }\r\n}\r\n"]}

package/lib/core/client/time.js

@@ -9,9 +9,13 @@ var _lodash = require('lodash');
 
 var _lodash2 = _interopRequireDefault(_lodash);
 
-var _moment = require('moment');
+var _momentTimezoneWithData10YearRange = require('moment-timezone/builds/moment-timezone-with-data-10-year-range');
 
-var _moment2 = _interopRequireDefault(_moment);
+var _momentTimezoneWithData10YearRange2 = _interopRequireDefault(_momentTimezoneWithData10YearRange);
+
+var _config = require('config');
+
+var _config2 = _interopRequireDefault(_config);
 
 var _events = require('./events');
 
@@ -25,10 +29,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 const Time = exports.Time = {
   initialize() {
     // Set locale globally
-    _moment2.default.locale((0, _utils.getLocale)());
+    _momentTimezoneWithData10YearRange2.default.locale((0, _utils.getLocale)());
     // Set the time object within the store
-    const now = _moment2.default.utc();
-    _store.Store.set('time', {
+    const now = _momentTimezoneWithData10YearRange2.default.utc();
+    // Try to guess user timezone
+    const timezone = _momentTimezoneWithData10YearRange2.default.tz.guess() || '';
+    _store.Store.set('time', _lodash2.default.merge(_config2.default.time || {}, {
       range: {
         start: now.clone().subtract(1, 'months').startOf('day'),
         end: now.clone().endOf('day'),
@@ -48,22 +54,24 @@ const Time = exports.Time = {
           short: 'YY',
           long: 'YYYY'
         },
-        utc: false
+        timezone
       },
       currentTime: now,
-      step: 60 // 1H
-    });
+      step: 60, // 1H
+      interval: 60 // 1m
+    }));
     this.updateTimeRangeQuery();
     // Make filter react to external changes to update the query
     _events.Events.$on('time-range-changed', () => this.updateTimeRangeQuery());
   },
   convertToMoment(datetime) {
-    if (_moment2.default.isMoment(datetime)) {
+    if (_momentTimezoneWithData10YearRange2.default.isMoment(datetime)) {
       // Clone to avoid mutating and force UTC mode
-      return _moment2.default.utc(datetime.valueOf());
+      return _momentTimezoneWithData10YearRange2.default.utc(datetime.valueOf());
     } else {
       // Convert from Date, string or milliseconds (ie EPOCH)
-      return _moment2.default.utc(datetime);
+      // Check for ambiguous input as ISO 8601 consider it as locale and not UTC
+      if (typeof datetime === 'string' && !datetime.endsWith('Z')) return (0, _momentTimezoneWithData10YearRange2.default)(datetime).utc();else return _momentTimezoneWithData10YearRange2.default.utc(datetime);
     }
   },
   get() {
@@ -88,15 +96,18 @@ const Time = exports.Time = {
   getFormat() {
     return this.get().format;
   },
-  format(datetime, format) {
-    let currentTime = this.convertToMoment(datetime);
-    if (!this.getFormat().utc) {
-      // Convert to local time
-      currentTime = (0, _moment2.default)(currentTime.valueOf());
+  getFormatTimezone() {
+    return this.getFormat().timezone;
+  },
+  format(datetime, format, options = { year: 'numeric', month: 'numeric', day: 'numeric', hour: '2-digit', minute: '2-digit' }) {
+    const currentTime = this.convertToMoment(datetime);
+    // Convert to local time
+    if (this.getFormatTimezone()) {
+      currentTime.tz(this.getFormatTimezone());
     }
-    if (format === 'iso') return currentTime.format();
+    if (format === 'iso') return currentTime.format();else if (format === 'locale') return currentTime.toDate().toLocaleString((0, _utils.getLocale)(), options);
     // Defaults to long mode if not given
-    else return currentTime.format(_lodash2.default.get(this.getFormat(), format, _lodash2.default.get(this.getFormat(), format + '.long')));
+    else return currentTime.format(_lodash2.default.get(this.getFormat(), format));
   },
   getCurrentTime() {
     return this.get().currentTime;

package/lib/core/client/time.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../core/client/time.js"],"names":["Time","initialize","moment","locale","now","utc","Store","set","range","start","clone","subtract","startOf","end","endOf","field","query","format","time","short","long","date","year","currentTime","step","updateTimeRangeQuery","Events","$on","convertToMoment","datetime","isMoment","valueOf","get","getRange","patchRange","patch","getRangeQuery","$gte","$lte","_","isEqual","getFormat","getCurrentTime","setCurrentTime","isSame","getCurrentFormattedTime","iso","getStep"],"mappings":"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","file":"time.js","sourcesContent":["import _ from 'lodash'\r\nimport moment from 'moment'\r\nimport { Events } from './events'\r\nimport { Store } from './store'\r\nimport { getLocale } from './utils'\r\n\r\n// Export singleton\r\nexport const Time = {\r\n  initialize () {\r\n    // Set locale globally\r\n    moment.locale(getLocale())\r\n    // Set the time object within the store\r\n    const now = moment.utc()\r\n    Store.set('time', {\r\n      range: {\r\n        start: now.clone().subtract(1, 'months').startOf('day'),\r\n        end: now.clone().endOf('day'),\r\n        field: 'createdAt',\r\n        query: {}\r\n      },\r\n      format: {\r\n        time: {\r\n          short: 'H[h]',\r\n          long: 'HH:mm'\r\n        },\r\n        date: {\r\n          short: 'DD/MM',\r\n          long: 'dddd D'\r\n        },\r\n        year: {\r\n          short: 'YY',\r\n          long: 'YYYY'\r\n        },\r\n        utc: false\r\n      },\r\n      currentTime: now,\r\n      step: 60 // 1H\r\n    })\r\n    this.updateTimeRangeQuery()\r\n    // Make filter react to external changes to update the query\r\n    Events.$on('time-range-changed', () => this.updateTimeRangeQuery())\r\n  },\r\n  convertToMoment (datetime) {\r\n    if (moment.isMoment(datetime)) {\r\n      // Clone to avoid mutating and force UTC mode\r\n      return moment.utc(datetime.valueOf())\r\n    } else { // Convert from Date, string or milliseconds (ie EPOCH)\r\n      return moment.utc(datetime)\r\n    }\r\n  },\r\n  get () {\r\n    return Store.get('time')\r\n  },\r\n  getRange () {\r\n    return this.get().range\r\n  },\r\n  patchRange (range) {\r\n    Store.patch('time.range', range)\r\n  },\r\n  getRangeQuery () {\r\n    return Store.get('time.range.query')\r\n  },\r\n  // Build sort query\r\n  updateTimeRangeQuery () {\r\n    const query = {}\r\n    query[this.getRange().field] = { $gte: this.getRange().start.format(), $lte: this.getRange().end.format() }\r\n    // Avoid reentrance as we listen to other filter property changes\r\n    if (!_.isEqual(query, this.getRangeQuery())) Store.patch('time.range', { query })\r\n  },\r\n  getFormat () {\r\n    return this.get().format\r\n  },\r\n  format (datetime, format) {\r\n    let currentTime = this.convertToMoment(datetime)\r\n    if (!this.getFormat().utc) {\r\n      // Convert to local time\r\n      currentTime = moment(currentTime.valueOf())\r\n    }\r\n    if (format === 'iso') return currentTime.format()\r\n    // Defaults to long mode if not given\r\n    else return currentTime.format(_.get(this.getFormat(), format, _.get(this.getFormat(), format + '.long')))\r\n  },\r\n  getCurrentTime () {\r\n    return this.get().currentTime\r\n  },\r\n  setCurrentTime (datetime) {\r\n    const now = this.convertToMoment(datetime)\r\n    if (this.getCurrentTime().isSame(now)) return\r\n    Store.patch('time.currentTime', now)\r\n  },\r\n  getCurrentFormattedTime () {\r\n    const currentTime = this.getCurrentTime()\r\n    return {\r\n      time: {\r\n        short: this.format(currentTime, 'time.short'),\r\n        long: this.format(currentTime, 'time.long')\r\n      },\r\n      date: {\r\n        short: this.format(currentTime, 'date.short'),\r\n        long: this.format(currentTime, 'date.long')\r\n      },\r\n      year: {\r\n        short: this.format(currentTime, 'year.short'),\r\n        long: this.format(currentTime, 'year.long')\r\n      },\r\n      iso: this.format(currentTime, 'iso')\r\n    }\r\n  },\r\n  getStep () {\r\n    return this.get().step\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["../../../core/client/time.js"],"names":["Time","initialize","moment","locale","now","utc","timezone","tz","guess","Store","set","_","merge","config","time","range","start","clone","subtract","startOf","end","endOf","field","query","format","short","long","date","year","currentTime","step","interval","updateTimeRangeQuery","Events","$on","convertToMoment","datetime","isMoment","valueOf","endsWith","get","getRange","patchRange","patch","getRangeQuery","$gte","$lte","isEqual","getFormat","getFormatTimezone","options","month","day","hour","minute","toDate","toLocaleString","getCurrentTime","setCurrentTime","isSame","getCurrentFormattedTime","iso","getStep"],"mappings":"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","file":"time.js","sourcesContent":["import _ from 'lodash'\r\nimport moment from 'moment-timezone/builds/moment-timezone-with-data-10-year-range'\r\nimport config from 'config'\r\nimport { Events } from './events'\r\nimport { Store } from './store'\r\nimport { getLocale } from './utils'\r\n\r\n// Export singleton\r\nexport const Time = {\r\n  initialize () {\r\n    // Set locale globally\r\n    moment.locale(getLocale())\r\n    // Set the time object within the store\r\n    const now = moment.utc()\r\n    // Try to guess user timezone\r\n    const timezone = moment.tz.guess() || ''\r\n    Store.set('time', _.merge(config.time || {}, {\r\n      range: {\r\n        start: now.clone().subtract(1, 'months').startOf('day'),\r\n        end: now.clone().endOf('day'),\r\n        field: 'createdAt',\r\n        query: {}\r\n      },\r\n      format: {\r\n        time: {\r\n          short: 'H[h]',\r\n          long: 'HH:mm'\r\n        },\r\n        date: {\r\n          short: 'DD/MM',\r\n          long: 'dddd D'\r\n        },\r\n        year: {\r\n          short: 'YY',\r\n          long: 'YYYY'\r\n        },\r\n        timezone\r\n      },\r\n      currentTime: now,\r\n      step: 60, // 1H\r\n      interval: 60 // 1m\r\n    }))\r\n    this.updateTimeRangeQuery()\r\n    // Make filter react to external changes to update the query\r\n    Events.$on('time-range-changed', () => this.updateTimeRangeQuery())\r\n  },\r\n  convertToMoment (datetime) {\r\n    if (moment.isMoment(datetime)) {\r\n      // Clone to avoid mutating and force UTC mode\r\n      return moment.utc(datetime.valueOf())\r\n    } else { // Convert from Date, string or milliseconds (ie EPOCH)\r\n      // Check for ambiguous input as ISO 8601 consider it as locale and not UTC\r\n      if ((typeof datetime === 'string') && !datetime.endsWith('Z')) return moment(datetime).utc()\r\n      else return moment.utc(datetime)\r\n    }\r\n  },\r\n  get () {\r\n    return Store.get('time')\r\n  },\r\n  getRange () {\r\n    return this.get().range\r\n  },\r\n  patchRange (range) {\r\n    Store.patch('time.range', range)\r\n  },\r\n  getRangeQuery () {\r\n    return Store.get('time.range.query')\r\n  },\r\n  // Build sort query\r\n  updateTimeRangeQuery () {\r\n    const query = {}\r\n    query[this.getRange().field] = { $gte: this.getRange().start.format(), $lte: this.getRange().end.format() }\r\n    // Avoid reentrance as we listen to other filter property changes\r\n    if (!_.isEqual(query, this.getRangeQuery())) Store.patch('time.range', { query })\r\n  },\r\n  getFormat () {\r\n    return this.get().format\r\n  },\r\n  getFormatTimezone () {\r\n    return this.getFormat().timezone\r\n  },\r\n  format (datetime, format, options = { year: 'numeric', month: 'numeric', day: 'numeric', hour: '2-digit', minute: '2-digit' }) {\r\n    const currentTime = this.convertToMoment(datetime)\r\n    // Convert to local time\r\n    if (this.getFormatTimezone()) {\r\n      currentTime.tz(this.getFormatTimezone())\r\n    }\r\n    if (format === 'iso') return currentTime.format()\r\n    else if (format === 'locale') return currentTime.toDate().toLocaleString(getLocale(), options)\r\n    // Defaults to long mode if not given\r\n    else return currentTime.format(_.get(this.getFormat(), format))\r\n  },\r\n  getCurrentTime () {\r\n    return this.get().currentTime\r\n  },\r\n  setCurrentTime (datetime) {\r\n    const now = this.convertToMoment(datetime)\r\n    if (this.getCurrentTime().isSame(now)) return\r\n    Store.patch('time.currentTime', now)\r\n  },\r\n  getCurrentFormattedTime () {\r\n    const currentTime = this.getCurrentTime()\r\n    return {\r\n      time: {\r\n        short: this.format(currentTime, 'time.short'),\r\n        long: this.format(currentTime, 'time.long')\r\n      },\r\n      date: {\r\n        short: this.format(currentTime, 'date.short'),\r\n        long: this.format(currentTime, 'date.long')\r\n      },\r\n      year: {\r\n        short: this.format(currentTime, 'year.short'),\r\n        long: this.format(currentTime, 'year.long')\r\n      },\r\n      iso: this.format(currentTime, 'iso')\r\n    }\r\n  },\r\n  getStep () {\r\n    return this.get().step\r\n  }\r\n}\r\n"]}