@kalisio/kdk 1.5.0 → 1.7.0

package/lib/map/common/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../map/common/index.js"],"names":["errors","permissions","gridSourceFactories","OpenDapGridSource","getKey","options","WcsGridSource","GeoTiffGridSource","WeacastGridSource","MeteoModelGridSource","TimeBasedGridSource","unitConverters","kelvin2celsius","kelvin"],"mappings":";;;;;;;AAGA;;IAAYA,M;;AACZ;;IAAYC,W;;AACZ;;AACA;;AACA;;AACA;;AACA;;AACA;;AACA;;;;QAESD,M,GAAAA,M,EAbT;AACA;AACA;;QAYSC,W,GAAAA,W;;AAET;;AACAC,0BAAoBC,qCAAkBC,MAAlB,EAApB,IAAkD,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAIF,oCAAJ,CAAsBE,OAAtB,CAAP;AAAuC,CAA9G;AACAH,0BAAoBI,6BAAcF,MAAd,EAApB,IAA8C,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAIC,4BAAJ,CAAkBD,OAAlB,CAAP;AAAmC,CAAtG;AACAH,0BAAoBK,qCAAkBH,MAAlB,EAApB,IAAkD,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAIE,oCAAJ,CAAsBF,OAAtB,CAAP;AAAuC,CAA9G;AACAH,0BAAoBM,qCAAkBJ,MAAlB,EAApB,IAAkD,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAIG,oCAAJ,CAAsBH,OAAtB,CAAP;AAAuC,CAA9G;AACAH,0BAAoBO,2CAAqBL,MAArB,EAApB,IAAqD,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAII,0CAAJ,CAAyBJ,OAAzB,CAAP;AAA0C,CAApH;AACAH,0BAAoBQ,yCAAoBN,MAApB,EAApB,IAAoD,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAIK,wCAAJ,CAAwBL,OAAxB,CAAP;AAAyC,CAAlH;;AAEAM,qBAAeC,cAAf,GAAgC,UAAUC,MAAV,EAAkB;AAAE,SAAOA,SAAS,MAAhB;AAAwB,CAA5E","file":"index.js","sourcesContent":["// We faced a bug in babel so that transform-runtime with export * from 'x' generates import statements in transpiled code\r\n// Tracked here : https://github.com/babel/babel/issues/2877\r\n// We tested the workaround given here https://github.com/babel/babel/issues/2877#issuecomment-270700000 with success so far\r\nimport * as errors from './errors'\r\nimport * as permissions from './permissions'\r\nimport { gridSourceFactories, unitConverters } from './grid'\r\nimport { OpenDapGridSource } from './opendap-grid-source'\r\nimport { WcsGridSource } from './wcs-grid-source'\r\nimport { GeoTiffGridSource } from './geotiff-grid-source'\r\nimport { WeacastGridSource } from './weacast-grid-source'\r\nimport { MeteoModelGridSource } from './meteo-model-grid-source'\r\nimport { TimeBasedGridSource } from './time-based-grid-source'\r\n\r\nexport { errors }\r\nexport { permissions }\r\n\r\n// register factories for known grid sources\r\ngridSourceFactories[OpenDapGridSource.getKey()] = function (options) { return new OpenDapGridSource(options) }\r\ngridSourceFactories[WcsGridSource.getKey()] = function (options) { return new WcsGridSource(options) }\r\ngridSourceFactories[GeoTiffGridSource.getKey()] = function (options) { return new GeoTiffGridSource(options) }\r\ngridSourceFactories[WeacastGridSource.getKey()] = function (options) { return new WeacastGridSource(options) }\r\ngridSourceFactories[MeteoModelGridSource.getKey()] = function (options) { return new MeteoModelGridSource(options) }\r\ngridSourceFactories[TimeBasedGridSource.getKey()] = function (options) { return new TimeBasedGridSource(options) }\r\n\r\nunitConverters.kelvin2celsius = function (kelvin) { return kelvin - 273.15 }\r\n"]}
+{"version":3,"sources":["../../../map/common/index.js"],"names":["errors","permissions","dap","grid","gridSourceFactories","unitConverters","OpenDapGridSource","getKey","options","WcsGridSource","GeoTiffGridSource","WeacastGridSource","MeteoModelGridSource","TimeBasedGridSource","kelvin2celsius","kelvin"],"mappings":";;;;;;;AAGA;;IAAYA,M;;AACZ;;IAAYC,W;;AACZ;;IAAYC,G;;AACZ;;IAAYC,I;;AACZ;;AACA;;AACA;;AACA;;AACA;;AACA;;;;AAZA;AACA;AACA;QAYSH,M,GAAAA,M;QACAC,W,GAAAA,W;QACAC,G,GAAAA,G;QACAC,I,GAAAA,I;;;AAET,MAAMC,sBAAsBD,KAAKC,mBAAjC;AACA,MAAMC,iBAAiBF,KAAKE,cAA5B;;AAEA;AACAD,oBAAoBE,qCAAkBC,MAAlB,EAApB,IAAkD,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAIF,oCAAJ,CAAsBE,OAAtB,CAAP;AAAuC,CAA9G;AACAJ,oBAAoBK,6BAAcF,MAAd,EAApB,IAA8C,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAIC,4BAAJ,CAAkBD,OAAlB,CAAP;AAAmC,CAAtG;AACAJ,oBAAoBM,qCAAkBH,MAAlB,EAApB,IAAkD,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAIE,oCAAJ,CAAsBF,OAAtB,CAAP;AAAuC,CAA9G;AACAJ,oBAAoBO,qCAAkBJ,MAAlB,EAApB,IAAkD,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAIG,oCAAJ,CAAsBH,OAAtB,CAAP;AAAuC,CAA9G;AACAJ,oBAAoBQ,2CAAqBL,MAArB,EAApB,IAAqD,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAII,0CAAJ,CAAyBJ,OAAzB,CAAP;AAA0C,CAApH;AACAJ,oBAAoBS,yCAAoBN,MAApB,EAApB,IAAoD,UAAUC,OAAV,EAAmB;AAAE,SAAO,IAAIK,wCAAJ,CAAwBL,OAAxB,CAAP;AAAyC,CAAlH;;AAEAH,eAAeS,cAAf,GAAgC,UAAUC,MAAV,EAAkB;AAAE,SAAOA,SAAS,MAAhB;AAAwB,CAA5E","file":"index.js","sourcesContent":["// We faced a bug in babel so that transform-runtime with export * from 'x' generates import statements in transpiled code\r\n// Tracked here : https://github.com/babel/babel/issues/2877\r\n// We tested the workaround given here https://github.com/babel/babel/issues/2877#issuecomment-270700000 with success so far\r\nimport * as errors from './errors'\r\nimport * as permissions from './permissions'\r\nimport * as dap from './opendap-utils'\r\nimport * as grid from './grid'\r\nimport { OpenDapGridSource } from './opendap-grid-source'\r\nimport { WcsGridSource } from './wcs-grid-source'\r\nimport { GeoTiffGridSource } from './geotiff-grid-source'\r\nimport { WeacastGridSource } from './weacast-grid-source'\r\nimport { MeteoModelGridSource } from './meteo-model-grid-source'\r\nimport { TimeBasedGridSource } from './time-based-grid-source'\r\n\r\nexport { errors }\r\nexport { permissions }\r\nexport { dap }\r\nexport { grid }\r\n\r\nconst gridSourceFactories = grid.gridSourceFactories\r\nconst unitConverters = grid.unitConverters\r\n\r\n// register factories for known grid sources\r\ngridSourceFactories[OpenDapGridSource.getKey()] = function (options) { return new OpenDapGridSource(options) }\r\ngridSourceFactories[WcsGridSource.getKey()] = function (options) { return new WcsGridSource(options) }\r\ngridSourceFactories[GeoTiffGridSource.getKey()] = function (options) { return new GeoTiffGridSource(options) }\r\ngridSourceFactories[WeacastGridSource.getKey()] = function (options) { return new WeacastGridSource(options) }\r\ngridSourceFactories[MeteoModelGridSource.getKey()] = function (options) { return new MeteoModelGridSource(options) }\r\ngridSourceFactories[TimeBasedGridSource.getKey()] = function (options) { return new TimeBasedGridSource(options) }\r\n\r\nunitConverters.kelvin2celsius = function (kelvin) { return kelvin - 273.15 }\r\n"]}

package/lib/map/common/meteo-model-grid-source.js

@@ -78,8 +78,11 @@ class MeteoModelGridSource extends _dynamicGridSource.DynamicGridSource {
           model: item.model
 
           // handle dynamic properties
-        };for (const prop of _lodash2.default.keys(item.dynprops)) {
-          const value = item.dynprops[prop];
+          // dynprops may be 'scoped' per grid source, that's what we check here
+          // if not scoped, use the dynprops object
+        };const dynprops = _lodash2.default.has(item.dynprops, candidate.key) ? item.dynprops[candidate.key] : item.dynprops;
+        for (const prop of _lodash2.default.keys(dynprops)) {
+          const value = dynprops[prop];
           const generator = _this.dynpropGenerator(value);
           if (generator) candidate.dynamicProps[prop] = generator;
         }

package/lib/map/common/meteo-model-grid-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../map/common/meteo-model-grid-source.js"],"names":["MeteoModelGridSource","DynamicGridSource","getKey","constructor","options","updateCtx","level","undefined","setModel","model","queueUpdate","setTime","time","clone","utc","runOffset","setLevel","setup","config","candidates","source","sources","item","Object","assign","default","key","conf","candidate","staticProps","dynamicProps","from","to","prop","_","keys","dynprops","value","generator","dynpropGenerator","push","makeBuildContext","ctx","selectCandidate","name","runTime","runInterval","subtract","forecastTime","interval","forecastOffset","moment","duration","diff","shouldSkipUpdate","newContext","oldContext","isSame","buildSourceAndConfig","deriveConfig","now","isBetween","isSameOrAfter","isSameOrBefore","dataChanged","usable"],"mappings":"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","file":"meteo-model-grid-source.js","sourcesContent":["import _ from 'lodash'\r\nimport moment from 'moment'\r\nimport { getNearestRunTime, getNearestForecastTime } from 'weacast-core/common'\r\nimport { makeGridSource, extractGridSourceConfig } from './grid'\r\nimport { DynamicGridSource } from './dynamic-grid-source'\r\nimport { readAsTimeOrDuration, makeTime } from './moment-utils'\r\n\r\nexport class MeteoModelGridSource extends DynamicGridSource {\r\n  static getKey () {\r\n    return 'meteo_model'\r\n  }\r\n\r\n  constructor (options) {\r\n    super(options)\r\n\r\n    this.options = options\r\n    // these members are not mandatory, but still defined in the context\r\n    this.updateCtx.level = undefined\r\n  }\r\n\r\n  setModel (model) {\r\n    this.updateCtx.model = model\r\n    this.queueUpdate()\r\n  }\r\n\r\n  setTime (time) {\r\n    this.updateCtx.time = time.clone()\r\n    this.updateCtx.time.utc()\r\n    // reset runOffset to fetch nearest run time\r\n    // when there's no data in the nearest run, we may try to fetch\r\n    // data in the run before the nearest (cf. dataChanged())\r\n    this.updateCtx.runOffset = 0\r\n    this.queueUpdate()\r\n  }\r\n\r\n  setLevel (level) {\r\n    if (level !== null) this.updateCtx.level = level\r\n    else if (this.updateCtx.level) delete this.updateCtx.level\r\n    this.queueUpdate()\r\n  }\r\n\r\n  async setup (config) {\r\n    this.candidates = []\r\n\r\n    for (const source of config.sources) {\r\n      // use default props and override with current source\r\n      const item = Object.assign(Object.assign({}, config.default), source)\r\n\r\n      const [key, conf] = extractGridSourceConfig(item)\r\n      const candidate = {\r\n        key: key,\r\n        staticProps: conf,\r\n        dynamicProps: {},\r\n        from: item.from ? readAsTimeOrDuration(item.from) : null,\r\n        to: item.to ? readAsTimeOrDuration(item.to) : null,\r\n        model: item.model\r\n      }\r\n\r\n      // handle dynamic properties\r\n      for (const prop of _.keys(item.dynprops)) {\r\n        const value = item.dynprops[prop]\r\n        const generator = this.dynpropGenerator(value)\r\n        if (generator) candidate.dynamicProps[prop] = generator\r\n      }\r\n\r\n      this.candidates.push(candidate)\r\n    }\r\n  }\r\n\r\n  makeBuildContext (updateCtx) {\r\n    const ctx = Object.assign({}, updateCtx)\r\n\r\n    ctx.candidate = this.selectCandidate(updateCtx.time, updateCtx.model.name)\r\n    if (ctx.candidate) {\r\n      // update context\r\n      ctx.runTime = getNearestRunTime(updateCtx.time, updateCtx.model.runInterval)\r\n      // take runOffset into account\r\n      ctx.runTime.subtract(ctx.runOffset * updateCtx.model.runInterval, 'seconds')\r\n      ctx.forecastTime = getNearestForecastTime(updateCtx.time, updateCtx.model.interval)\r\n      ctx.forecastOffset = moment.duration(ctx.forecastTime.diff(ctx.runTime))\r\n\r\n      // switch to utc mode, all display methods will display in UTC\r\n      ctx.time.utc()\r\n      ctx.runTime.utc()\r\n      ctx.forecastTime.utc()\r\n    }\r\n\r\n    return ctx\r\n  }\r\n\r\n  shouldSkipUpdate (newContext, oldContext) {\r\n    if (oldContext.candidate !== newContext.candidate) return false\r\n    if (oldContext.runTime && newContext.runTime && !oldContext.runTime.isSame(newContext.runTime)) return false\r\n    if (oldContext.forecastTime && newContext.forecastTime && !oldContext.forecastTime.isSame(newContext.forecastTime)) return false\r\n    if (oldContext.level !== newContext.level) return false\r\n    return true\r\n  }\r\n\r\n  buildSourceAndConfig (ctx) {\r\n    let source = null\r\n    let config = null\r\n\r\n    if (ctx.candidate) {\r\n      config = this.deriveConfig(ctx, ctx.candidate.staticProps, ctx.candidate.dynamicProps)\r\n      if (config) {\r\n        source = makeGridSource(ctx.candidate.key, this.options)\r\n      }\r\n    }\r\n\r\n    return [source, config]\r\n  }\r\n\r\n  selectCandidate (time, model) {\r\n    const now = moment()\r\n\r\n    let candidate = null\r\n    // select a source for the requested time\r\n    for (const source of this.candidates) {\r\n      if (source.model !== model) continue\r\n\r\n      const from = source.from ? makeTime(source.from, now) : null\r\n      const to = source.to ? makeTime(source.to, now) : null\r\n      if (from && to) {\r\n        candidate = time.isBetween(from, to) ? source : null\r\n      } else if (from) {\r\n        candidate = time.isSameOrAfter(from) ? source : null\r\n      } else if (to) {\r\n        candidate = time.isSameOrBefore(to) ? source : null\r\n      }\r\n\r\n      if (candidate) break\r\n    }\r\n\r\n    return candidate\r\n  }\r\n\r\n  dataChanged () {\r\n    // check if we need to try to fetch data from a previous run\r\n    // in case the nearest run doesn't exists or fails to provide\r\n    // required data\r\n\r\n    if (this.source && !this.source.usable) {\r\n      // if we have a selected source but it's not usable\r\n      if (this.updateCtx.runOffset === 0) {\r\n        // queue updaty with an offseted run\r\n        this.updateCtx.runOffset = 1\r\n        this.queueUpdate()\r\n        return\r\n      }\r\n    }\r\n\r\n    super.dataChanged()\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["../../../map/common/meteo-model-grid-source.js"],"names":["MeteoModelGridSource","DynamicGridSource","getKey","constructor","options","updateCtx","level","undefined","setModel","model","queueUpdate","setTime","time","clone","utc","runOffset","setLevel","setup","config","candidates","source","sources","item","Object","assign","default","key","conf","candidate","staticProps","dynamicProps","from","to","dynprops","_","has","prop","keys","value","generator","dynpropGenerator","push","makeBuildContext","ctx","selectCandidate","name","runTime","runInterval","subtract","forecastTime","interval","forecastOffset","moment","duration","diff","shouldSkipUpdate","newContext","oldContext","isSame","buildSourceAndConfig","deriveConfig","now","isBetween","isSameOrAfter","isSameOrBefore","dataChanged","usable"],"mappings":"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","file":"meteo-model-grid-source.js","sourcesContent":["import _ from 'lodash'\r\nimport moment from 'moment'\r\nimport { getNearestRunTime, getNearestForecastTime } from 'weacast-core/common'\r\nimport { makeGridSource, extractGridSourceConfig } from './grid'\r\nimport { DynamicGridSource } from './dynamic-grid-source'\r\nimport { readAsTimeOrDuration, makeTime } from './moment-utils'\r\n\r\nexport class MeteoModelGridSource extends DynamicGridSource {\r\n  static getKey () {\r\n    return 'meteo_model'\r\n  }\r\n\r\n  constructor (options) {\r\n    super(options)\r\n\r\n    this.options = options\r\n    // these members are not mandatory, but still defined in the context\r\n    this.updateCtx.level = undefined\r\n  }\r\n\r\n  setModel (model) {\r\n    this.updateCtx.model = model\r\n    this.queueUpdate()\r\n  }\r\n\r\n  setTime (time) {\r\n    this.updateCtx.time = time.clone()\r\n    this.updateCtx.time.utc()\r\n    // reset runOffset to fetch nearest run time\r\n    // when there's no data in the nearest run, we may try to fetch\r\n    // data in the run before the nearest (cf. dataChanged())\r\n    this.updateCtx.runOffset = 0\r\n    this.queueUpdate()\r\n  }\r\n\r\n  setLevel (level) {\r\n    if (level !== null) this.updateCtx.level = level\r\n    else if (this.updateCtx.level) delete this.updateCtx.level\r\n    this.queueUpdate()\r\n  }\r\n\r\n  async setup (config) {\r\n    this.candidates = []\r\n\r\n    for (const source of config.sources) {\r\n      // use default props and override with current source\r\n      const item = Object.assign(Object.assign({}, config.default), source)\r\n\r\n      const [key, conf] = extractGridSourceConfig(item)\r\n      const candidate = {\r\n        key: key,\r\n        staticProps: conf,\r\n        dynamicProps: {},\r\n        from: item.from ? readAsTimeOrDuration(item.from) : null,\r\n        to: item.to ? readAsTimeOrDuration(item.to) : null,\r\n        model: item.model\r\n      }\r\n\r\n      // handle dynamic properties\r\n      // dynprops may be 'scoped' per grid source, that's what we check here\r\n      // if not scoped, use the dynprops object\r\n      const dynprops = _.has(item.dynprops, candidate.key) ? item.dynprops[candidate.key] : item.dynprops\r\n      for (const prop of _.keys(dynprops)) {\r\n        const value = dynprops[prop]\r\n        const generator = this.dynpropGenerator(value)\r\n        if (generator) candidate.dynamicProps[prop] = generator\r\n      }\r\n\r\n      this.candidates.push(candidate)\r\n    }\r\n  }\r\n\r\n  makeBuildContext (updateCtx) {\r\n    const ctx = Object.assign({}, updateCtx)\r\n\r\n    ctx.candidate = this.selectCandidate(updateCtx.time, updateCtx.model.name)\r\n    if (ctx.candidate) {\r\n      // update context\r\n      ctx.runTime = getNearestRunTime(updateCtx.time, updateCtx.model.runInterval)\r\n      // take runOffset into account\r\n      ctx.runTime.subtract(ctx.runOffset * updateCtx.model.runInterval, 'seconds')\r\n      ctx.forecastTime = getNearestForecastTime(updateCtx.time, updateCtx.model.interval)\r\n      ctx.forecastOffset = moment.duration(ctx.forecastTime.diff(ctx.runTime))\r\n\r\n      // switch to utc mode, all display methods will display in UTC\r\n      ctx.time.utc()\r\n      ctx.runTime.utc()\r\n      ctx.forecastTime.utc()\r\n    }\r\n\r\n    return ctx\r\n  }\r\n\r\n  shouldSkipUpdate (newContext, oldContext) {\r\n    if (oldContext.candidate !== newContext.candidate) return false\r\n    if (oldContext.runTime && newContext.runTime && !oldContext.runTime.isSame(newContext.runTime)) return false\r\n    if (oldContext.forecastTime && newContext.forecastTime && !oldContext.forecastTime.isSame(newContext.forecastTime)) return false\r\n    if (oldContext.level !== newContext.level) return false\r\n    return true\r\n  }\r\n\r\n  buildSourceAndConfig (ctx) {\r\n    let source = null\r\n    let config = null\r\n\r\n    if (ctx.candidate) {\r\n      config = this.deriveConfig(ctx, ctx.candidate.staticProps, ctx.candidate.dynamicProps)\r\n      if (config) {\r\n        source = makeGridSource(ctx.candidate.key, this.options)\r\n      }\r\n    }\r\n\r\n    return [source, config]\r\n  }\r\n\r\n  selectCandidate (time, model) {\r\n    const now = moment()\r\n\r\n    let candidate = null\r\n    // select a source for the requested time\r\n    for (const source of this.candidates) {\r\n      if (source.model !== model) continue\r\n\r\n      const from = source.from ? makeTime(source.from, now) : null\r\n      const to = source.to ? makeTime(source.to, now) : null\r\n      if (from && to) {\r\n        candidate = time.isBetween(from, to) ? source : null\r\n      } else if (from) {\r\n        candidate = time.isSameOrAfter(from) ? source : null\r\n      } else if (to) {\r\n        candidate = time.isSameOrBefore(to) ? source : null\r\n      }\r\n\r\n      if (candidate) break\r\n    }\r\n\r\n    return candidate\r\n  }\r\n\r\n  dataChanged () {\r\n    // check if we need to try to fetch data from a previous run\r\n    // in case the nearest run doesn't exists or fails to provide\r\n    // required data\r\n\r\n    if (this.source && !this.source.usable) {\r\n      // if we have a selected source but it's not usable\r\n      if (this.updateCtx.runOffset === 0) {\r\n        // queue updaty with an offseted run\r\n        this.updateCtx.runOffset = 1\r\n        this.queueUpdate()\r\n        return\r\n      }\r\n    }\r\n\r\n    super.dataChanged()\r\n  }\r\n}\r\n"]}

package/lib/map/common/time-based-grid-source.js

@@ -60,8 +60,11 @@ class TimeBasedGridSource extends _dynamicGridSource.DynamicGridSource {
           every: _moment2.default.duration(item.every)
 
           // handle dynamic properties
-        };for (const prop of _lodash2.default.keys(item.dynprops)) {
-          const value = item.dynprops[prop];
+          // dynprops may be 'scoped' per grid source, that's what we check here
+          // if not scoped, use the dynprops object
+        };const dynprops = _lodash2.default.has(item.dynprops, candidate.key) ? item.dynprops[candidate.key] : item.dynprops;
+        for (const prop of _lodash2.default.keys(dynprops)) {
+          const value = dynprops[prop];
           const generator = _this.dynpropGenerator(value);
           if (generator) candidate.dynamicProps[prop] = generator;
         }

package/lib/map/common/time-based-grid-source.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../map/common/time-based-grid-source.js"],"names":["TimeBasedGridSource","DynamicGridSource","getKey","constructor","options","setTime","time","updateCtx","clone","utc","queueUpdate","setup","config","candidates","source","sources","item","Object","assign","default","key","conf","candidate","staticProps","dynamicProps","from","to","every","moment","duration","prop","_","keys","dynprops","value","generator","dynpropGenerator","push","makeBuildContext","ctx","selectCandidate","stepTime","Math","trunc","shouldSkipUpdate","newContext","oldContext","isSame","buildSourceAndConfig","deriveConfig","now","isBetween","isSameOrAfter","isSameOrBefore"],"mappings":"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","file":"time-based-grid-source.js","sourcesContent":["import _ from 'lodash'\r\nimport moment from 'moment'\r\nimport { makeGridSource, extractGridSourceConfig } from './grid'\r\nimport { DynamicGridSource } from './dynamic-grid-source'\r\nimport { readAsTimeOrDuration, makeTime } from './moment-utils'\r\n\r\nexport class TimeBasedGridSource extends DynamicGridSource {\r\n  static getKey () {\r\n    return 'time_based'\r\n  }\r\n\r\n  constructor (options) {\r\n    super(options)\r\n\r\n    this.options = options\r\n  }\r\n\r\n  setTime (time) {\r\n    this.updateCtx.time = time.clone()\r\n    this.updateCtx.time.utc()\r\n    this.queueUpdate()\r\n  }\r\n\r\n  async setup (config) {\r\n    this.candidates = []\r\n\r\n    for (const source of config.sources) {\r\n      // use default props and override with current source\r\n      const item = Object.assign(Object.assign({}, config.default), source)\r\n\r\n      const [key, conf] = extractGridSourceConfig(item)\r\n      const candidate = {\r\n        key: key,\r\n        staticProps: conf,\r\n        dynamicProps: {},\r\n        from: item.from ? readAsTimeOrDuration(item.from) : null,\r\n        to: item.to ? readAsTimeOrDuration(item.to) : null,\r\n        every: moment.duration(item.every)\r\n      }\r\n\r\n      // handle dynamic properties\r\n      for (const prop of _.keys(item.dynprops)) {\r\n        const value = item.dynprops[prop]\r\n        const generator = this.dynpropGenerator(value)\r\n        if (generator) candidate.dynamicProps[prop] = generator\r\n      }\r\n\r\n      this.candidates.push(candidate)\r\n    }\r\n  }\r\n\r\n  makeBuildContext (updateCtx) {\r\n    const ctx = Object.assign({}, updateCtx)\r\n\r\n    ctx.candidate = this.selectCandidate(ctx.time)\r\n    if (ctx.candidate) {\r\n      ctx.stepTime = moment(Math.trunc(ctx.time / ctx.candidate.every) * ctx.candidate.every)\r\n\r\n      // switch to utc mode, all display methods will display in UTC\r\n      ctx.time.utc()\r\n      ctx.stepTime.utc()\r\n    }\r\n\r\n    return ctx\r\n  }\r\n\r\n  shouldSkipUpdate (newContext, oldContext) {\r\n    if (oldContext.candidate !== newContext.candidate) return false\r\n    if (oldContext.stepTime && newContext.stepTime && !oldContext.stepTime.isSame(newContext.stepTime)) return false\r\n    return true\r\n  }\r\n\r\n  buildSourceAndConfig (ctx) {\r\n    let source = null\r\n    let config = null\r\n\r\n    if (ctx.candidate) {\r\n      config = this.deriveConfig(ctx, ctx.candidate.staticProps, ctx.candidate.dynamicProps)\r\n      if (config) {\r\n        source = makeGridSource(ctx.candidate.key, this.options)\r\n      }\r\n    }\r\n\r\n    return [source, config]\r\n  }\r\n\r\n  selectCandidate (time) {\r\n    const now = moment()\r\n\r\n    let candidate = null\r\n    // select a source for the requested time\r\n    for (const source of this.candidates) {\r\n      const from = source.from ? makeTime(source.from, now) : null\r\n      const to = source.to ? makeTime(source.to, now) : null\r\n      if (from && to) {\r\n        candidate = time.isBetween(from, to) ? source : null\r\n      } else if (from) {\r\n        candidate = time.isSameOrAfter(from) ? source : null\r\n      } else if (to) {\r\n        candidate = time.isSameOrBefore(to) ? source : null\r\n      }\r\n\r\n      if (candidate) break\r\n    }\r\n\r\n    return candidate\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["../../../map/common/time-based-grid-source.js"],"names":["TimeBasedGridSource","DynamicGridSource","getKey","constructor","options","setTime","time","updateCtx","clone","utc","queueUpdate","setup","config","candidates","source","sources","item","Object","assign","default","key","conf","candidate","staticProps","dynamicProps","from","to","every","moment","duration","dynprops","_","has","prop","keys","value","generator","dynpropGenerator","push","makeBuildContext","ctx","selectCandidate","stepTime","Math","trunc","shouldSkipUpdate","newContext","oldContext","isSame","buildSourceAndConfig","deriveConfig","now","isBetween","isSameOrAfter","isSameOrBefore"],"mappings":"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","file":"time-based-grid-source.js","sourcesContent":["import _ from 'lodash'\r\nimport moment from 'moment'\r\nimport { makeGridSource, extractGridSourceConfig } from './grid'\r\nimport { DynamicGridSource } from './dynamic-grid-source'\r\nimport { readAsTimeOrDuration, makeTime } from './moment-utils'\r\n\r\nexport class TimeBasedGridSource extends DynamicGridSource {\r\n  static getKey () {\r\n    return 'time_based'\r\n  }\r\n\r\n  constructor (options) {\r\n    super(options)\r\n\r\n    this.options = options\r\n  }\r\n\r\n  setTime (time) {\r\n    this.updateCtx.time = time.clone()\r\n    this.updateCtx.time.utc()\r\n    this.queueUpdate()\r\n  }\r\n\r\n  async setup (config) {\r\n    this.candidates = []\r\n\r\n    for (const source of config.sources) {\r\n      // use default props and override with current source\r\n      const item = Object.assign(Object.assign({}, config.default), source)\r\n\r\n      const [key, conf] = extractGridSourceConfig(item)\r\n      const candidate = {\r\n        key: key,\r\n        staticProps: conf,\r\n        dynamicProps: {},\r\n        from: item.from ? readAsTimeOrDuration(item.from) : null,\r\n        to: item.to ? readAsTimeOrDuration(item.to) : null,\r\n        every: moment.duration(item.every)\r\n      }\r\n\r\n      // handle dynamic properties\r\n      // dynprops may be 'scoped' per grid source, that's what we check here\r\n      // if not scoped, use the dynprops object\r\n      const dynprops = _.has(item.dynprops, candidate.key) ? item.dynprops[candidate.key] : item.dynprops\r\n      for (const prop of _.keys(dynprops)) {\r\n        const value = dynprops[prop]\r\n        const generator = this.dynpropGenerator(value)\r\n        if (generator) candidate.dynamicProps[prop] = generator\r\n      }\r\n\r\n      this.candidates.push(candidate)\r\n    }\r\n  }\r\n\r\n  makeBuildContext (updateCtx) {\r\n    const ctx = Object.assign({}, updateCtx)\r\n\r\n    ctx.candidate = this.selectCandidate(ctx.time)\r\n    if (ctx.candidate) {\r\n      ctx.stepTime = moment(Math.trunc(ctx.time / ctx.candidate.every) * ctx.candidate.every)\r\n\r\n      // switch to utc mode, all display methods will display in UTC\r\n      ctx.time.utc()\r\n      ctx.stepTime.utc()\r\n    }\r\n\r\n    return ctx\r\n  }\r\n\r\n  shouldSkipUpdate (newContext, oldContext) {\r\n    if (oldContext.candidate !== newContext.candidate) return false\r\n    if (oldContext.stepTime && newContext.stepTime && !oldContext.stepTime.isSame(newContext.stepTime)) return false\r\n    return true\r\n  }\r\n\r\n  buildSourceAndConfig (ctx) {\r\n    let source = null\r\n    let config = null\r\n\r\n    if (ctx.candidate) {\r\n      config = this.deriveConfig(ctx, ctx.candidate.staticProps, ctx.candidate.dynamicProps)\r\n      if (config) {\r\n        source = makeGridSource(ctx.candidate.key, this.options)\r\n      }\r\n    }\r\n\r\n    return [source, config]\r\n  }\r\n\r\n  selectCandidate (time) {\r\n    const now = moment()\r\n\r\n    let candidate = null\r\n    // select a source for the requested time\r\n    for (const source of this.candidates) {\r\n      const from = source.from ? makeTime(source.from, now) : null\r\n      const to = source.to ? makeTime(source.to, now) : null\r\n      if (from && to) {\r\n        candidate = time.isBetween(from, to) ? source : null\r\n      } else if (from) {\r\n        candidate = time.isSameOrAfter(from) ? source : null\r\n      } else if (to) {\r\n        candidate = time.isSameOrBefore(to) ? source : null\r\n      }\r\n\r\n      if (candidate) break\r\n    }\r\n\r\n    return candidate\r\n  }\r\n}\r\n"]}

package/lib/test/client/core/account.js

@@ -67,7 +67,7 @@ let updateAccountEmail = exports.updateAccountEmail = (() => {
 })();
 
 let deleteAccount = exports.deleteAccount = (() => {
-  var _ref5 = _asyncToGenerator(function* (page, name, wait = 5000) {
+  var _ref5 = _asyncToGenerator(function* (page, name, wait = 10000) {
     yield manageAccount(page, 'danger-zone');
     yield (0, _utils.click)(page, '#block-action');
     yield (0, _utils.type)(page, '.q-dialog input', name);

package/lib/test/client/core/account.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../test/client/core/account.js"],"names":["page","tab","url","includes","manageAccount","name","avatarPath","wait","updateAccountProfile","oldPassword","newPassword","updateAccountPassword","password","email","updateAccountEmail","waitForTimeout","deleteAccount","closeSignupAlert"],"mappings":"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","file":"account.js","sourcesContent":["import { click, type, uploadFile } from './utils'\r\nimport { clickAction, clickLeftPaneAction, clickTopPaneAction } from './layout'\r\n\r\nexport async function manageAccount (page, tab = 'profile') {\r\n  const url = page.url()\r\n  if (!url.includes('account')) await clickLeftPaneAction(page, 'manage-account')\r\n  if (tab === 'profile') {\r\n    if (!url.includes('profile')) await clickTopPaneAction(page, 'profile')\r\n  } else if (tab === 'security') {\r\n    if (!url.includes('security')) await clickTopPaneAction(page, 'security')\r\n  } else {\r\n    if (!url.includes('danger-zone')) await clickTopPaneAction(page, 'danger-zone')\r\n  }\r\n}\r\n\r\nexport async function updateAccountProfile (page, name, avatarPath, wait = 3000) {\r\n  await manageAccount(page, 'profile')\r\n  await type(page, '#name-field', name, false, true)\r\n  if (avatarPath) await uploadFile(page, '.dz-hidden-input', avatarPath)\r\n  await clickAction(page, 'apply-button', wait)\r\n}\r\n\r\nexport async function updateAccountPassword (page, oldPassword, newPassword, wait = 1000) {\r\n  await manageAccount(page, 'security')\r\n  await click(page, '#password-block button', 1000)\r\n  await type(page, '#oldPassword-field', oldPassword)\r\n  await type(page, '#password-field', newPassword)\r\n  await type(page, '#confirmPassword-field', newPassword)\r\n  await click(page, 'button', 20000)\r\n  await click(page, '.la-arrow-left', wait)\r\n}\r\n\r\nexport async function updateAccountEmail (page, password, email, wait = 5000) {\r\n  await manageAccount(page, 'security')\r\n  await click(page, '#email-block button', 1000)\r\n  await type(page, '#password-field', password)\r\n  await type(page, '#email-field', email)\r\n  await click(page, 'button', wait)\r\n}\r\n\r\nexport async function deleteAccount (page, name, wait = 5000) {\r\n  await manageAccount(page, 'danger-zone')\r\n  await click(page, '#block-action')\r\n  await type(page, '.q-dialog input', name)\r\n  await click(page, '.q-dialog button:nth-child(2)')\r\n  await page.waitForTimeout(wait)\r\n}\r\n\r\nexport async function closeSignupAlert (page) {\r\n  await page.waitForTimeout(1000)\r\n  await click(page, '#close-signup-alert')\r\n  await page.waitForTimeout(500)\r\n}\r\n"]}
+{"version":3,"sources":["../../../../test/client/core/account.js"],"names":["page","tab","url","includes","manageAccount","name","avatarPath","wait","updateAccountProfile","oldPassword","newPassword","updateAccountPassword","password","email","updateAccountEmail","waitForTimeout","deleteAccount","closeSignupAlert"],"mappings":"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","file":"account.js","sourcesContent":["import { click, type, uploadFile } from './utils'\r\nimport { clickAction, clickLeftPaneAction, clickTopPaneAction } from './layout'\r\n\r\nexport async function manageAccount (page, tab = 'profile') {\r\n  const url = page.url()\r\n  if (!url.includes('account')) await clickLeftPaneAction(page, 'manage-account')\r\n  if (tab === 'profile') {\r\n    if (!url.includes('profile')) await clickTopPaneAction(page, 'profile')\r\n  } else if (tab === 'security') {\r\n    if (!url.includes('security')) await clickTopPaneAction(page, 'security')\r\n  } else {\r\n    if (!url.includes('danger-zone')) await clickTopPaneAction(page, 'danger-zone')\r\n  }\r\n}\r\n\r\nexport async function updateAccountProfile (page, name, avatarPath, wait = 3000) {\r\n  await manageAccount(page, 'profile')\r\n  await type(page, '#name-field', name, false, true)\r\n  if (avatarPath) await uploadFile(page, '.dz-hidden-input', avatarPath)\r\n  await clickAction(page, 'apply-button', wait)\r\n}\r\n\r\nexport async function updateAccountPassword (page, oldPassword, newPassword, wait = 1000) {\r\n  await manageAccount(page, 'security')\r\n  await click(page, '#password-block button', 1000)\r\n  await type(page, '#oldPassword-field', oldPassword)\r\n  await type(page, '#password-field', newPassword)\r\n  await type(page, '#confirmPassword-field', newPassword)\r\n  await click(page, 'button', 20000)\r\n  await click(page, '.la-arrow-left', wait)\r\n}\r\n\r\nexport async function updateAccountEmail (page, password, email, wait = 5000) {\r\n  await manageAccount(page, 'security')\r\n  await click(page, '#email-block button', 1000)\r\n  await type(page, '#password-field', password)\r\n  await type(page, '#email-field', email)\r\n  await click(page, 'button', wait)\r\n}\r\n\r\nexport async function deleteAccount (page, name, wait = 10000) {\r\n  await manageAccount(page, 'danger-zone')\r\n  await click(page, '#block-action')\r\n  await type(page, '.q-dialog input', name)\r\n  await click(page, '.q-dialog button:nth-child(2)')\r\n  await page.waitForTimeout(wait)\r\n}\r\n\r\nexport async function closeSignupAlert (page) {\r\n  await page.waitForTimeout(1000)\r\n  await click(page, '#close-signup-alert')\r\n  await page.waitForTimeout(500)\r\n}\r\n"]}

package/lib/test/client/core/collection.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shrinkCard = exports.expandCard = exports.isCardExpanded = exports.clickItemAction = exports.itemActionExists = exports.itemExists = exports.countItems = undefined;
+exports.shrinkCard = exports.expandCard = exports.isCardExpanded = exports.clickItemAction = exports.clickItem = exports.itemActionExists = exports.itemExists = exports.countItems = undefined;
 
 let countItems = exports.countItems = (() => {
   var _ref = _asyncToGenerator(function* (page, component) {
@@ -39,8 +39,26 @@ let itemActionExists = exports.itemActionExists = (() => {
   };
 })();
 
+let clickItem = exports.clickItem = (() => {
+  var _ref4 = _asyncToGenerator(function* (page, component, name, wait = 250) {
+    const xpath = `//div[contains(@component, "${component}") and contains(., "${name}")]`;
+    const elements = yield page.$x(xpath);
+    if (elements.length > 0) {
+      elements[0].click();
+      yield page.waitForTimeout(wait);
+      debug(`Clicked item ${name}`);
+    } else {
+      debug(`Item ${name} not found`);
+    }
+  });
+
+  return function clickItem(_x10, _x11, _x12) {
+    return _ref4.apply(this, arguments);
+  };
+})();
+
 let clickItemAction = exports.clickItemAction = (() => {
-  var _ref4 = _asyncToGenerator(function* (page, component, name, action, wait = 250) {
+  var _ref5 = _asyncToGenerator(function* (page, component, name, action, wait = 250) {
     const xpath = `//div[contains(@component, "${component}") and contains(., "${name}")]//button[@id="${action}"]`;
     const elements = yield page.$x(xpath);
     if (elements.length > 0) {
@@ -52,46 +70,46 @@ let clickItemAction = exports.clickItemAction = (() => {
     }
   });
 
-  return function clickItemAction(_x10, _x11, _x12, _x13) {
-    return _ref4.apply(this, arguments);
+  return function clickItemAction(_x13, _x14, _x15, _x16) {
+    return _ref5.apply(this, arguments);
   };
 })();
 
 let isCardExpanded = exports.isCardExpanded = (() => {
-  var _ref5 = _asyncToGenerator(function* (page, component, name) {
+  var _ref6 = _asyncToGenerator(function* (page, component, name) {
     const xpath = `//div[contains(@component, "${component}") and contains(., "${name}")]//i[contains(@class, "la-angle-up")]`;
     const elements = yield page.$x(xpath);
     return elements.length > 0;
   });
 
-  return function isCardExpanded(_x14, _x15, _x16) {
-    return _ref5.apply(this, arguments);
+  return function isCardExpanded(_x17, _x18, _x19) {
+    return _ref6.apply(this, arguments);
   };
 })();
 
 let expandCard = exports.expandCard = (() => {
-  var _ref6 = _asyncToGenerator(function* (page, component, name, wait = 1000) {
+  var _ref7 = _asyncToGenerator(function* (page, component, name, wait = 1000) {
     const isExpanded = yield isCardExpanded(page, component, name);
     if (!isExpanded) {
       yield clickItemAction(page, component, name, 'expand-action', wait);
     }
   });
 
-  return function expandCard(_x17, _x18, _x19) {
-    return _ref6.apply(this, arguments);
+  return function expandCard(_x20, _x21, _x22) {
+    return _ref7.apply(this, arguments);
   };
 })();
 
 let shrinkCard = exports.shrinkCard = (() => {
-  var _ref7 = _asyncToGenerator(function* (page, component, name) {
+  var _ref8 = _asyncToGenerator(function* (page, component, name) {
     const isExpanded = yield isCardExpanded(page, component, name);
     if (isExpanded) {
       yield clickItemAction(page, component, name, 'expand-action', 1000);
     }
   });
 
-  return function shrinkCard(_x20, _x21, _x22) {
-    return _ref7.apply(this, arguments);
+  return function shrinkCard(_x23, _x24, _x25) {
+    return _ref8.apply(this, arguments);
   };
 })();
 

package/lib/test/client/core/collection.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../test/client/core/collection.js"],"names":["page","component","countItems","name","xpath","elements","$x","length","itemExists","action","itemActionExists","wait","click","waitForTimeout","debug","clickItemAction","isCardExpanded","isExpanded","expandCard","shrinkCard"],"mappings":";;;;;;;;+BAKO,WAA2BA,IAA3B,EAAiCC,SAAjC,EAA4C;AACjD,WAAO,0BAAcD,IAAd,EAAqB,+BAA8BC,SAAU,KAA7D,CAAP;AACD,G;;kBAFqBC,U;;;;;;gCAIf,WAA2BF,IAA3B,EAAiCC,SAAjC,EAA4CE,IAA5C,EAAkD;AACvD,UAAMC,QAAS,+BAA8BH,SAAU,uBAAsBE,IAAK,KAAlF;AACA,UAAME,WAAW,MAAML,KAAKM,EAAL,CAAQF,KAAR,CAAvB;AACA,WAAOC,SAASE,MAAT,KAAoB,CAA3B;AACD,G;;kBAJqBC,U;;;;;;gCAMf,WAAiCR,IAAjC,EAAuCC,SAAvC,EAAkDE,IAAlD,EAAwDM,MAAxD,EAAgE;AACrE,UAAML,QAAS,+BAA8BH,SAAU,uBAAsBE,IAAK,oBAAmBM,MAAO,IAA5G;AACA,UAAMJ,WAAW,MAAML,KAAKM,EAAL,CAAQF,KAAR,CAAvB;AACA,WAAOC,SAASE,MAAT,KAAoB,CAA3B;AACD,G;;kBAJqBG,gB;;;;;;gCAMf,WAAgCV,IAAhC,EAAsCC,SAAtC,EAAiDE,IAAjD,EAAuDM,MAAvD,EAA+DE,OAAO,GAAtE,EAA2E;AAChF,UAAMP,QAAS,+BAA8BH,SAAU,uBAAsBE,IAAK,oBAAmBM,MAAO,IAA5G;AACA,UAAMJ,WAAW,MAAML,KAAKM,EAAL,CAAQF,KAAR,CAAvB;AACA,QAAIC,SAASE,MAAT,GAAkB,CAAtB,EAAyB;AACvBF,eAAS,CAAT,EAAYO,KAAZ;AACA,YAAMZ,KAAKa,cAAL,CAAoBF,IAApB,CAAN;AACAG,YAAO,kBAAiBL,MAAO,YAAWN,IAAK,EAA/C;AACD,KAJD,MAIO;AACLW,YAAO,UAASL,MAAO,YAAWN,IAAK,YAAvC;AACD;AACF,G;;kBAVqBY,e;;;;;;gCAYf,WAA+Bf,IAA/B,EAAqCC,SAArC,EAAgDE,IAAhD,EAAsD;AAC3D,UAAMC,QAAS,+BAA8BH,SAAU,uBAAsBE,IAAK,yCAAlF;AACA,UAAME,WAAW,MAAML,KAAKM,EAAL,CAAQF,KAAR,CAAvB;AACA,WAAOC,SAASE,MAAT,GAAkB,CAAzB;AACD,G;;kBAJqBS,c;;;;;;gCAMf,WAA2BhB,IAA3B,EAAiCC,SAAjC,EAA4CE,IAA5C,EAAkDQ,OAAO,IAAzD,EAA+D;AACpE,UAAMM,aAAa,MAAMD,eAAehB,IAAf,EAAqBC,SAArB,EAAgCE,IAAhC,CAAzB;AACA,QAAI,CAACc,UAAL,EAAiB;AACf,YAAMF,gBAAgBf,IAAhB,EAAsBC,SAAtB,EAAiCE,IAAjC,EAAuC,eAAvC,EAAwDQ,IAAxD,CAAN;AACD;AACF,G;;kBALqBO,U;;;;;;gCAOf,WAA2BlB,IAA3B,EAAiCC,SAAjC,EAA4CE,IAA5C,EAAkD;AACvD,UAAMc,aAAa,MAAMD,eAAehB,IAAf,EAAqBC,SAArB,EAAgCE,IAAhC,CAAzB;AACA,QAAIc,UAAJ,EAAgB;AACd,YAAMF,gBAAgBf,IAAhB,EAAsBC,SAAtB,EAAiCE,IAAjC,EAAuC,eAAvC,EAAwD,IAAxD,CAAN;AACD;AACF,G;;kBALqBgB,U;;;;;AA9CtB;;;;AACA;;;;;;AAEA,MAAML,QAAQ,qBAAU,0BAAV,CAAd","file":"collection.js","sourcesContent":["import makeDebug from 'debug'\r\nimport { countElements } from './utils'\r\n\r\nconst debug = makeDebug('kdk:core:test:collection')\r\n\r\nexport async function countItems (page, component) {\r\n  return countElements(page, `//div[contains(@component, \"${component}\")]`)\r\n}\r\n\r\nexport async function itemExists (page, component, name) {\r\n  const xpath = `//div[contains(@component, \"${component}\") and contains(., \"${name}\")]`\r\n  const elements = await page.$x(xpath)\r\n  return elements.length === 1\r\n}\r\n\r\nexport async function itemActionExists (page, component, name, action) {\r\n  const xpath = `//div[contains(@component, \"${component}\") and contains(., \"${name}\")]//button[@id=\"${action}\"]`\r\n  const elements = await page.$x(xpath)\r\n  return elements.length === 1\r\n}\r\n\r\nexport async function clickItemAction (page, component, name, action, wait = 250) {\r\n  const xpath = `//div[contains(@component, \"${component}\") and contains(., \"${name}\")]//button[@id=\"${action}\"]`\r\n  const elements = await page.$x(xpath)\r\n  if (elements.length > 0) {\r\n    elements[0].click()\r\n    await page.waitForTimeout(wait)\r\n    debug(`Clicked action ${action} on item ${name}`)\r\n  } else {\r\n    debug(`Action ${action} on item ${name} not found`)\r\n  }\r\n}\r\n\r\nexport async function isCardExpanded (page, component, name) {\r\n  const xpath = `//div[contains(@component, \"${component}\") and contains(., \"${name}\")]//i[contains(@class, \"la-angle-up\")]`\r\n  const elements = await page.$x(xpath)\r\n  return elements.length > 0\r\n}\r\n\r\nexport async function expandCard (page, component, name, wait = 1000) {\r\n  const isExpanded = await isCardExpanded(page, component, name)\r\n  if (!isExpanded) {\r\n    await clickItemAction(page, component, name, 'expand-action', wait)\r\n  }\r\n}\r\n\r\nexport async function shrinkCard (page, component, name) {\r\n  const isExpanded = await isCardExpanded(page, component, name)\r\n  if (isExpanded) {\r\n    await clickItemAction(page, component, name, 'expand-action', 1000)\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["../../../../test/client/core/collection.js"],"names":["page","component","countItems","name","xpath","elements","$x","length","itemExists","action","itemActionExists","wait","click","waitForTimeout","debug","clickItem","clickItemAction","isCardExpanded","isExpanded","expandCard","shrinkCard"],"mappings":"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","file":"collection.js","sourcesContent":["import makeDebug from 'debug'\r\nimport { countElements } from './utils'\r\n\r\nconst debug = makeDebug('kdk:core:test:collection')\r\n\r\nexport async function countItems (page, component) {\r\n  return countElements(page, `//div[contains(@component, \"${component}\")]`)\r\n}\r\n\r\nexport async function itemExists (page, component, name) {\r\n  const xpath = `//div[contains(@component, \"${component}\") and contains(., \"${name}\")]`\r\n  const elements = await page.$x(xpath)\r\n  return elements.length === 1\r\n}\r\n\r\nexport async function itemActionExists (page, component, name, action) {\r\n  const xpath = `//div[contains(@component, \"${component}\") and contains(., \"${name}\")]//button[@id=\"${action}\"]`\r\n  const elements = await page.$x(xpath)\r\n  return elements.length === 1\r\n}\r\n\r\nexport async function clickItem (page, component, name, wait = 250) {\r\n  const xpath = `//div[contains(@component, \"${component}\") and contains(., \"${name}\")]`\r\n  const elements = await page.$x(xpath)\r\n  if (elements.length > 0) {\r\n    elements[0].click()\r\n    await page.waitForTimeout(wait)\r\n    debug(`Clicked item ${name}`)\r\n  } else {\r\n    debug(`Item ${name} not found`)\r\n  }\r\n}\r\n\r\nexport async function clickItemAction (page, component, name, action, wait = 250) {\r\n  const xpath = `//div[contains(@component, \"${component}\") and contains(., \"${name}\")]//button[@id=\"${action}\"]`\r\n  const elements = await page.$x(xpath)\r\n  if (elements.length > 0) {\r\n    elements[0].click()\r\n    await page.waitForTimeout(wait)\r\n    debug(`Clicked action ${action} on item ${name}`)\r\n  } else {\r\n    debug(`Action ${action} on item ${name} not found`)\r\n  }\r\n}\r\n\r\nexport async function isCardExpanded (page, component, name) {\r\n  const xpath = `//div[contains(@component, \"${component}\") and contains(., \"${name}\")]//i[contains(@class, \"la-angle-up\")]`\r\n  const elements = await page.$x(xpath)\r\n  return elements.length > 0\r\n}\r\n\r\nexport async function expandCard (page, component, name, wait = 1000) {\r\n  const isExpanded = await isCardExpanded(page, component, name)\r\n  if (!isExpanded) {\r\n    await clickItemAction(page, component, name, 'expand-action', wait)\r\n  }\r\n}\r\n\r\nexport async function shrinkCard (page, component, name) {\r\n  const isExpanded = await isCardExpanded(page, component, name)\r\n  if (isExpanded) {\r\n    await clickItemAction(page, component, name, 'expand-action', 1000)\r\n  }\r\n}\r\n"]}

package/lib/test/client/core/layout.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.logout = exports.isToastVisible = exports.closeWelcomeDialog = exports.clickFab = exports.clickLeftPaneAction = exports.clickBottomPaneAction = exports.clickRightPaneAction = exports.clickTopPaneAction = exports.clickAction = exports.isLeftPaneVisible = exports.isBottomPaneVisible = exports.isRightPaneVisible = exports.isTopPaneVisible = exports.clickLeftOpener = exports.clickBottomOpener = exports.clickRightOpener = exports.clickTopOpener = undefined;
+exports.logout = exports.isToastVisible = exports.closeWelcomeDialog = exports.clickFab = exports.clickLeftPaneAction = exports.clickBottomPaneAction = exports.clickRightPaneAction = exports.clickTopPaneAction = exports.clickAction = exports.closeLeftPane = exports.openLeftPane = exports.isLeftPaneVisible = exports.clickLeftOpener = exports.closeBottomPane = exports.openBottomPane = exports.isBottomPaneVisible = exports.clickBottomOpener = exports.closeRightPane = exports.openRightPane = exports.isRightPaneVisible = exports.clickRightOpener = exports.closeTopPane = exports.openTopPane = exports.isTopPaneVisible = exports.clickTopOpener = undefined;
 
 let clickOpener = (() => {
   var _ref = _asyncToGenerator(function* (page, opener) {
@@ -30,42 +30,44 @@ let clickTopOpener = exports.clickTopOpener = (() => {
   };
 })();
 
-let clickRightOpener = exports.clickRightOpener = (() => {
+let isTopPaneVisible = exports.isTopPaneVisible = (() => {
   var _ref3 = _asyncToGenerator(function* (page) {
-    yield clickOpener(page, 'right');
+    return (0, _utils.isElementVisible)(page, '#top-panel');
   });
 
-  return function clickRightOpener(_x4) {
+  return function isTopPaneVisible(_x4) {
     return _ref3.apply(this, arguments);
   };
 })();
 
-let clickBottomOpener = exports.clickBottomOpener = (() => {
+let openTopPane = exports.openTopPane = (() => {
   var _ref4 = _asyncToGenerator(function* (page) {
-    yield clickOpener(page, 'bottom');
+    const isOpen = yield isTopPaneVisible(page);
+    if (!isOpen) yield clickTopOpener(page);
   });
 
-  return function clickBottomOpener(_x5) {
+  return function openTopPane(_x5) {
     return _ref4.apply(this, arguments);
   };
 })();
 
-let clickLeftOpener = exports.clickLeftOpener = (() => {
+let closeTopPane = exports.closeTopPane = (() => {
   var _ref5 = _asyncToGenerator(function* (page) {
-    yield clickOpener(page, 'left');
+    const isOpen = yield isTopPaneVisible(page);
+    if (isOpen) yield clickTopOpener(page);
   });
 
-  return function clickLeftOpener(_x6) {
+  return function closeTopPane(_x6) {
     return _ref5.apply(this, arguments);
   };
 })();
 
-let isTopPaneVisible = exports.isTopPaneVisible = (() => {
+let clickRightOpener = exports.clickRightOpener = (() => {
   var _ref6 = _asyncToGenerator(function* (page) {
-    return (0, _utils.isElementVisible)(page, '#top-panel');
+    yield clickOpener(page, 'right');
   });
 
-  return function isTopPaneVisible(_x7) {
+  return function clickRightOpener(_x7) {
     return _ref6.apply(this, arguments);
   };
 })();
@@ -80,130 +82,216 @@ let isRightPaneVisible = exports.isRightPaneVisible = (() => {
   };
 })();
 
-let isBottomPaneVisible = exports.isBottomPaneVisible = (() => {
+let openRightPane = exports.openRightPane = (() => {
   var _ref8 = _asyncToGenerator(function* (page) {
-    return (0, _utils.isElementVisible)(page, '#bottom-panel');
+    const isOpen = yield isRightPaneVisible(page);
+    if (!isOpen) yield clickRightOpener(page);
   });
 
-  return function isBottomPaneVisible(_x9) {
+  return function openRightPane(_x9) {
     return _ref8.apply(this, arguments);
   };
 })();
 
-let isLeftPaneVisible = exports.isLeftPaneVisible = (() => {
+let closeRightPane = exports.closeRightPane = (() => {
   var _ref9 = _asyncToGenerator(function* (page) {
-    return (0, _utils.isElementVisible)(page, '#left-panel');
+    const isOpen = yield isRightPaneVisible(page);
+    if (isOpen) yield clickRightOpener(page);
   });
 
-  return function isLeftPaneVisible(_x10) {
+  return function closeRightPane(_x10) {
     return _ref9.apply(this, arguments);
   };
 })();
 
+let clickBottomOpener = exports.clickBottomOpener = (() => {
+  var _ref10 = _asyncToGenerator(function* (page) {
+    yield clickOpener(page, 'bottom');
+  });
+
+  return function clickBottomOpener(_x11) {
+    return _ref10.apply(this, arguments);
+  };
+})();
+
+let isBottomPaneVisible = exports.isBottomPaneVisible = (() => {
+  var _ref11 = _asyncToGenerator(function* (page) {
+    return (0, _utils.isElementVisible)(page, '#bottom-panel');
+  });
+
+  return function isBottomPaneVisible(_x12) {
+    return _ref11.apply(this, arguments);
+  };
+})();
+
+let openBottomPane = exports.openBottomPane = (() => {
+  var _ref12 = _asyncToGenerator(function* (page) {
+    const isOpen = yield isBottomPaneVisible(page);
+    if (!isOpen) yield clickBottomOpener(page);
+  });
+
+  return function openBottomPane(_x13) {
+    return _ref12.apply(this, arguments);
+  };
+})();
+
+let closeBottomPane = exports.closeBottomPane = (() => {
+  var _ref13 = _asyncToGenerator(function* (page) {
+    const isOpen = yield isBottomPaneVisible(page);
+    if (isOpen) yield clickBottomOpener(page);
+  });
+
+  return function closeBottomPane(_x14) {
+    return _ref13.apply(this, arguments);
+  };
+})();
+
+let clickLeftOpener = exports.clickLeftOpener = (() => {
+  var _ref14 = _asyncToGenerator(function* (page) {
+    yield clickOpener(page, 'left');
+  });
+
+  return function clickLeftOpener(_x15) {
+    return _ref14.apply(this, arguments);
+  };
+})();
+
+let isLeftPaneVisible = exports.isLeftPaneVisible = (() => {
+  var _ref15 = _asyncToGenerator(function* (page) {
+    return (0, _utils.isElementVisible)(page, '#left-panel');
+  });
+
+  return function isLeftPaneVisible(_x16) {
+    return _ref15.apply(this, arguments);
+  };
+})();
+
+let openLeftPane = exports.openLeftPane = (() => {
+  var _ref16 = _asyncToGenerator(function* (page) {
+    const isOpen = yield isLeftPaneVisible(page);
+    if (!isOpen) yield clickLeftOpener(page);
+  });
+
+  return function openLeftPane(_x17) {
+    return _ref16.apply(this, arguments);
+  };
+})();
+
+let closeLeftPane = exports.closeLeftPane = (() => {
+  var _ref17 = _asyncToGenerator(function* (page) {
+    const isOpen = yield isLeftPaneVisible(page);
+    if (isOpen) yield clickLeftOpener(page);
+  });
+
+  return function closeLeftPane(_x18) {
+    return _ref17.apply(this, arguments);
+  };
+})();
+
 let clickAction = exports.clickAction = (() => {
-  var _ref10 = _asyncToGenerator(function* (page, action, wait = 250) {
+  var _ref18 = _asyncToGenerator(function* (page, action, wait = 250) {
     const selector = `#${action}`;
     yield (0, _utils.click)(page, selector, wait);
     debug(`Clicked action ${selector}`);
   });
 
-  return function clickAction(_x11, _x12) {
-    return _ref10.apply(this, arguments);
+  return function clickAction(_x19, _x20) {
+    return _ref18.apply(this, arguments);
   };
 })();
 
 let clickPaneAction = (() => {
-  var _ref11 = _asyncToGenerator(function* (page, pane, action, wait) {
+  var _ref19 = _asyncToGenerator(function* (page, pane, action, wait) {
     const isPaneVisible = yield (0, _utils.isElementVisible)(page, `#${pane}-panel`);
     if (!isPaneVisible) yield clickOpener(page, pane);
     yield clickAction(page, action, wait);
     if (!isPaneVisible) yield clickOpener(page, pane);
   });
 
-  return function clickPaneAction(_x13, _x14, _x15, _x16) {
-    return _ref11.apply(this, arguments);
+  return function clickPaneAction(_x21, _x22, _x23, _x24) {
+    return _ref19.apply(this, arguments);
   };
 })();
 
 let clickTopPaneAction = exports.clickTopPaneAction = (() => {
-  var _ref12 = _asyncToGenerator(function* (page, action, wait = 250) {
+  var _ref20 = _asyncToGenerator(function* (page, action, wait = 250) {
     yield clickPaneAction(page, 'top', action, wait);
   });
 
-  return function clickTopPaneAction(_x17, _x18) {
-    return _ref12.apply(this, arguments);
+  return function clickTopPaneAction(_x25, _x26) {
+    return _ref20.apply(this, arguments);
   };
 })();
 
 let clickRightPaneAction = exports.clickRightPaneAction = (() => {
-  var _ref13 = _asyncToGenerator(function* (page, action, wait = 250) {
+  var _ref21 = _asyncToGenerator(function* (page, action, wait = 250) {
     yield clickPaneAction(page, 'right', action, wait);
   });
 
-  return function clickRightPaneAction(_x19, _x20) {
-    return _ref13.apply(this, arguments);
+  return function clickRightPaneAction(_x27, _x28) {
+    return _ref21.apply(this, arguments);
   };
 })();
 
 let clickBottomPaneAction = exports.clickBottomPaneAction = (() => {
-  var _ref14 = _asyncToGenerator(function* (page, action, wait = 250) {
+  var _ref22 = _asyncToGenerator(function* (page, action, wait = 250) {
     yield clickPaneAction(page, 'bottom', action, wait);
   });
 
-  return function clickBottomPaneAction(_x21, _x22) {
-    return _ref14.apply(this, arguments);
+  return function clickBottomPaneAction(_x29, _x30) {
+    return _ref22.apply(this, arguments);
   };
 })();
 
 let clickLeftPaneAction = exports.clickLeftPaneAction = (() => {
-  var _ref15 = _asyncToGenerator(function* (page, action, wait = 250) {
+  var _ref23 = _asyncToGenerator(function* (page, action, wait = 250) {
     const isPaneVisible = yield isLeftPaneVisible(page);
     if (!isPaneVisible) yield clickLeftOpener(page);
     yield clickAction(page, action, wait);
   });
 
-  return function clickLeftPaneAction(_x23, _x24) {
-    return _ref15.apply(this, arguments);
+  return function clickLeftPaneAction(_x31, _x32) {
+    return _ref23.apply(this, arguments);
   };
 })();
 
 let clickFab = exports.clickFab = (() => {
-  var _ref16 = _asyncToGenerator(function* (page) {
+  var _ref24 = _asyncToGenerator(function* (page) {
     return clickAction(page, 'fab');
   });
 
-  return function clickFab(_x25) {
-    return _ref16.apply(this, arguments);
+  return function clickFab(_x33) {
+    return _ref24.apply(this, arguments);
   };
 })();
 
 let closeWelcomeDialog = exports.closeWelcomeDialog = (() => {
-  var _ref17 = _asyncToGenerator(function* (page) {
+  var _ref25 = _asyncToGenerator(function* (page) {
     yield (0, _utils.click)(page, '.q-dialog #close-button');
   });
 
-  return function closeWelcomeDialog(_x26) {
-    return _ref17.apply(this, arguments);
+  return function closeWelcomeDialog(_x34) {
+    return _ref25.apply(this, arguments);
   };
 })();
 
 let isToastVisible = exports.isToastVisible = (() => {
-  var _ref18 = _asyncToGenerator(function* (page) {
+  var _ref26 = _asyncToGenerator(function* (page) {
     return (0, _utils.isElementVisible)(page, '[role="alert"]');
   });
 
-  return function isToastVisible(_x27) {
-    return _ref18.apply(this, arguments);
+  return function isToastVisible(_x35) {
+    return _ref26.apply(this, arguments);
   };
 })();
 
 let logout = exports.logout = (() => {
-  var _ref19 = _asyncToGenerator(function* (page) {
+  var _ref27 = _asyncToGenerator(function* (page) {
     yield clickLeftPaneAction(page, 'logout', 1000);
   });
 
-  return function logout(_x28) {
-    return _ref19.apply(this, arguments);
+  return function logout(_x36) {
+    return _ref27.apply(this, arguments);
   };
 })();