@kalisio/kdk 1.4.2 → 1.5.0

package/lib/test/client/map/catalog.js

@@ -3,61 +3,60 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createLayer = exports.connectLayer = exports.importLayer = exports.addLayer = exports.dropFile = exports.removeLayer = exports.clickLayer = exports.clickBaseLayer = exports.clickLayerCategory = exports.isLayerCategoryOpened = undefined;
-
-let isLayerCategoryOpened = exports.isLayerCategoryOpened = (() => {
-  var _ref = _asyncToGenerator(function* (page, category) {
-    const selector = `#${category} .q-expansion-item__content`;
-    return core.isElementVisible(page, selector);
+exports.createLayer = exports.connectLayer = exports.importLayer = exports.addLayer = exports.dropFile = exports.removeLayer = exports.clickLayer = exports.clickLayerCategory = exports.isLayerCategoryOpened = exports.getLayerCategoryId = undefined;
+
+let getLayerCategoryId = exports.getLayerCategoryId = (() => {
+  var _ref = _asyncToGenerator(function* (page, layerId) {
+    const xpath = `//div[contains(@class, "q-expansion-item q-item-type") and .//div[@id="${layerId}"]]`;
+    const elements = yield page.$x(xpath);
+    if (elements.length > 0) return (yield elements[0].getProperty('id')).jsonValue();
+    return undefined;
   });
 
-  return function isLayerCategoryOpened(_x, _x2) {
+  return function getLayerCategoryId(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 })();
 
-let clickLayerCategory = exports.clickLayerCategory = (() => {
-  var _ref2 = _asyncToGenerator(function* (page, category, wait = 500) {
-    yield core.clickRightPaneAction(page, category, wait);
+let isLayerCategoryOpened = exports.isLayerCategoryOpened = (() => {
+  var _ref2 = _asyncToGenerator(function* (page, categoryId) {
+    const selector = `#${categoryId} .q-expansion-item__content`;
+    return core.isElementVisible(page, selector);
   });
 
-  return function clickLayerCategory(_x3, _x4) {
+  return function isLayerCategoryOpened(_x3, _x4) {
     return _ref2.apply(this, arguments);
   };
 })();
 
-let clickBaseLayer = exports.clickBaseLayer = (() => {
-  var _ref3 = _asyncToGenerator(function* (page, layer, wait = 1000) {
-    const baseLayersCategoryId = getSystemLayerCategoryId('BASE_LAYERS');
+let clickLayerCategory = exports.clickLayerCategory = (() => {
+  var _ref3 = _asyncToGenerator(function* (page, categoryId, wait = 500) {
     const isCatalogOpened = yield core.isRightPaneVisible(page);
     if (!isCatalogOpened) yield core.clickRightOpener(page);
-    const isCategoryOpened = yield isLayerCategoryOpened(page, baseLayersCategoryId);
-    if (!isCategoryOpened) yield clickLayerCategory(page, baseLayersCategoryId);
-    const selector = '#' + getSystemLayerId(layer);
-    yield core.click(page, selector);
-    if (!isCategoryOpened) yield clickLayerCategory(page, baseLayersCategoryId);
-    if (!isCatalogOpened) yield core.clickRightOpener(page);
-    yield core.waitForImagesLoaded(page);
-    yield page.waitForTimeout(wait);
+    yield core.clickRightPaneAction(page, categoryId, wait);
   });
 
-  return function clickBaseLayer(_x5, _x6) {
+  return function clickLayerCategory(_x5, _x6) {
     return _ref3.apply(this, arguments);
   };
 })();
 
 let clickLayer = exports.clickLayer = (() => {
-  var _ref4 = _asyncToGenerator(function* (page, layer, category = null, wait = 1000) {
+  var _ref4 = _asyncToGenerator(function* (page, layer, wait = 1000) {
+    const layerId = getLayerId(layer);
     const isCatalogOpened = yield core.isRightPaneVisible(page);
     if (!isCatalogOpened) yield core.clickRightOpener(page);
+    const categoryId = yield getLayerCategoryId(page, layerId);
     let isCategoryOpened;
-    if (category) {
-      isCategoryOpened = yield isLayerCategoryOpened(page, category);
-      if (!isCategoryOpened) yield clickLayerCategory(page, category);
+    if (categoryId) {
+      isCategoryOpened = yield isLayerCategoryOpened(page, categoryId);
+      if (!isCategoryOpened) yield clickLayerCategory(page, categoryId);
     }
-    yield core.click(page, `#${layer} .q-toggle`);
-    if (category) {
-      if (!isCategoryOpened) yield clickLayerCategory(page, category);
+    let selector = `#${layerId}`;
+    if (categoryId !== 'k-catalog-panel-base-layers') selector += ' .q-toggle';
+    yield core.click(page, selector);
+    if (categoryId) {
+      if (!isCategoryOpened) yield clickLayerCategory(page, categoryId);
     }
     if (!isCatalogOpened) yield core.clickRightOpener(page);
     yield core.waitForImagesLoaded(page);
@@ -70,17 +69,22 @@ let clickLayer = exports.clickLayer = (() => {
 })();
 
 let removeLayer = exports.removeLayer = (() => {
-  var _ref5 = _asyncToGenerator(function* (page, layer, category = null, wait = 1000) {
+  var _ref5 = _asyncToGenerator(function* (page, layer, wait = 1000) {
+    const layerId = getLayerId(layer);
     const isCatalogOpened = yield core.isRightPaneVisible(page);
     if (!isCatalogOpened) yield core.clickRightOpener(page);
+    const categoryId = yield getLayerCategoryId(page, layerId);
     let isCategoryOpened;
-    if (category) {
-      isCategoryOpened = yield isLayerCategoryOpened(page, category);
-      if (!isCategoryOpened) yield clickLayerCategory(page, category);
+    if (categoryId) {
+      isCategoryOpened = yield isLayerCategoryOpened(page, categoryId);
+      if (!isCategoryOpened) yield clickLayerCategory(page, categoryId);
     }
-    yield core.click(page, `#${layer} .q-btn`);
+    yield core.click(page, `#${layerId} .q-btn`);
     yield core.clickAction(page, 'remove');
     yield core.click(page, '.q-dialog button:nth-child(2)', wait);
+    if (categoryId) {
+      if (!isCategoryOpened) yield clickLayerCategory(page, categoryId);
+    }
   });
 
   return function removeLayer(_x9, _x10) {
@@ -90,7 +94,7 @@ let removeLayer = exports.removeLayer = (() => {
 
 let dropFile = exports.dropFile = (() => {
   var _ref6 = _asyncToGenerator(function* (page, filePath, wait = 2000) {
-    const loaderSelector = '.leaflet-control-filelayer input[type="file"]';
+    const loaderSelector = '#dropFileInput';
     const loader = yield page.$(loaderSelector);
     yield loader.uploadFile(filePath);
     yield page.waitForTimeout(wait);
@@ -114,17 +118,19 @@ let addLayer = exports.addLayer = (() => {
 })();
 
 let importLayer = exports.importLayer = (() => {
-  var _ref8 = _asyncToGenerator(function* (page, filePath, featureId, wait = 2000) {
+  var _ref8 = _asyncToGenerator(function* (page, filePath, featureId = undefined, wait = 2000) {
     yield addLayer(page);
     yield core.uploadFile(page, '#file-field', filePath);
-    yield core.click(page, '#featureId-field', 500);
-    yield core.click(page, `#${featureId}`, 500);
+    if (featureId) {
+      yield core.click(page, '#featureId-field', 500);
+      yield core.click(page, `#${featureId}`, 500);
+    }
     yield core.clickAction(page, 'import-layer-action');
     yield core.waitForImagesLoaded(page);
     yield page.waitForTimeout(wait);
   });
 
-  return function importLayer(_x14, _x15, _x16) {
+  return function importLayer(_x14, _x15) {
     return _ref8.apply(this, arguments);
   };
 })();
@@ -141,7 +147,7 @@ let connectLayer = exports.connectLayer = (() => {
     yield page.waitForTimeout(wait);
   });
 
-  return function connectLayer(_x17, _x18, _x19) {
+  return function connectLayer(_x16, _x17, _x18) {
     return _ref9.apply(this, arguments);
   };
 })();
@@ -159,13 +165,12 @@ let createLayer = exports.createLayer = (() => {
     yield page.waitForTimeout(wait);
   });
 
-  return function createLayer(_x20, _x21, _x22, _x23) {
+  return function createLayer(_x19, _x20, _x21, _x22) {
     return _ref10.apply(this, arguments);
   };
 })();
 
-exports.getSystemLayerCategoryId = getSystemLayerCategoryId;
-exports.getSystemLayerId = getSystemLayerId;
+exports.getLayerId = getLayerId;
 
 var _lodash = require('lodash');
 
@@ -181,11 +186,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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"); }); }; }
 
-function getSystemLayerCategoryId(category) {
-  return 'k-catalog-panel-' + _lodash2.default.kebabCase(category);
-}
-
-function getSystemLayerId(layer) {
+function getLayerId(layer) {
   return 'layers-' + _lodash2.default.kebabCase(layer);
 }
 //# sourceMappingURL=catalog.js.map

package/lib/test/client/map/catalog.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../test/client/map/catalog.js"],"names":["page","category","selector","core","isElementVisible","isLayerCategoryOpened","wait","clickRightPaneAction","clickLayerCategory","layer","baseLayersCategoryId","getSystemLayerCategoryId","isCatalogOpened","isRightPaneVisible","clickRightOpener","isCategoryOpened","getSystemLayerId","click","waitForImagesLoaded","waitForTimeout","clickBaseLayer","clickLayer","clickAction","removeLayer","filePath","loaderSelector","loader","$","uploadFile","dropFile","clickFab","addLayer","featureId","importLayer","service","layerId","type","connectLayer","layerName","schemaPath","createLayer","_","kebabCase"],"mappings":"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","file":"catalog.js","sourcesContent":["import _ from 'lodash'\r\nimport * as core from '../core'\r\n\r\nexport function getSystemLayerCategoryId (category) {\r\n  return 'k-catalog-panel-' + _.kebabCase(category)\r\n}\r\n\r\nexport function getSystemLayerId (layer) {\r\n  return 'layers-' + _.kebabCase(layer)\r\n}\r\n\r\nexport async function isLayerCategoryOpened (page, category) {\r\n  const selector = `#${category} .q-expansion-item__content`\r\n  return core.isElementVisible(page, selector)\r\n}\r\n\r\nexport async function clickLayerCategory (page, category, wait = 500) {\r\n  await core.clickRightPaneAction(page, category, wait)\r\n}\r\n\r\nexport async function clickBaseLayer (page, layer, wait = 1000) {\r\n  const baseLayersCategoryId = getSystemLayerCategoryId('BASE_LAYERS')\r\n  const isCatalogOpened = await core.isRightPaneVisible(page)\r\n  if (!isCatalogOpened) await core.clickRightOpener(page)\r\n  const isCategoryOpened = await isLayerCategoryOpened(page, baseLayersCategoryId)\r\n  if (!isCategoryOpened) await clickLayerCategory(page, baseLayersCategoryId)\r\n  const selector = '#' + getSystemLayerId(layer)\r\n  await core.click(page, selector)\r\n  if (!isCategoryOpened) await clickLayerCategory(page, baseLayersCategoryId)\r\n  if (!isCatalogOpened) await core.clickRightOpener(page)\r\n  await core.waitForImagesLoaded(page)\r\n  await page.waitForTimeout(wait)\r\n}\r\n\r\nexport async function clickLayer (page, layer, category = null, wait = 1000) {\r\n  const isCatalogOpened = await core.isRightPaneVisible(page)\r\n  if (!isCatalogOpened) await core.clickRightOpener(page)\r\n  let isCategoryOpened\r\n  if (category) {\r\n    isCategoryOpened = await isLayerCategoryOpened(page, category)\r\n    if (!isCategoryOpened) await clickLayerCategory(page, category)\r\n  }\r\n  await core.click(page, `#${layer} .q-toggle`)\r\n  if (category) {\r\n    if (!isCategoryOpened) await clickLayerCategory(page, category)\r\n  }\r\n  if (!isCatalogOpened) await core.clickRightOpener(page)\r\n  await core.waitForImagesLoaded(page)\r\n  await page.waitForTimeout(wait)\r\n}\r\n\r\nexport async function removeLayer (page, layer, category = null, wait = 1000) {\r\n  const isCatalogOpened = await core.isRightPaneVisible(page)\r\n  if (!isCatalogOpened) await core.clickRightOpener(page)\r\n  let isCategoryOpened\r\n  if (category) {\r\n    isCategoryOpened = await isLayerCategoryOpened(page, category)\r\n    if (!isCategoryOpened) await clickLayerCategory(page, category)\r\n  }\r\n  await core.click(page, `#${layer} .q-btn`)\r\n  await core.clickAction(page, 'remove')\r\n  await core.click(page, '.q-dialog button:nth-child(2)', wait)\r\n}\r\n\r\nexport async function dropFile (page, filePath, wait = 2000) {\r\n  const loaderSelector = '.leaflet-control-filelayer input[type=\"file\"]'\r\n  const loader = await page.$(loaderSelector)\r\n  await loader.uploadFile(filePath)\r\n  await page.waitForTimeout(wait)\r\n}\r\n\r\nexport async function addLayer (page) {\r\n  await core.clickFab(page)\r\n  await core.clickAction(page, 'add-layer')\r\n  await page.waitForTimeout(1000)\r\n}\r\n\r\nexport async function importLayer (page, filePath, featureId, wait = 2000) {\r\n  await addLayer(page)\r\n  await core.uploadFile(page, '#file-field', filePath)\r\n  await core.click(page, '#featureId-field', 500)\r\n  await core.click(page, `#${featureId}`, 500)\r\n  await core.clickAction(page, 'import-layer-action')\r\n  await core.waitForImagesLoaded(page)\r\n  await page.waitForTimeout(wait)\r\n}\r\n\r\nexport async function connectLayer (page, service, layerId, wait = 2000) {\r\n  await addLayer(page)\r\n  await core.clickAction(page, 'connect-layer')\r\n  await core.type(page, '#service-field', service, true, false, 5000)\r\n  await core.click(page, '#layer-field', 500)\r\n  await core.click(page, `#${layerId}`, 500)\r\n  await core.clickAction(page, 'connect-layer-action', 2000)\r\n  await core.waitForImagesLoaded(page)\r\n  await page.waitForTimeout(wait)\r\n}\r\n\r\nexport async function createLayer (page, layerName, schemaPath, featureId, wait = 2000) {\r\n  await addLayer(page)\r\n  await core.clickAction(page, 'create-layer')\r\n  await core.type(page, '#name-field', layerName)\r\n  await core.type(page, '#description-field', `${layerName} description`)\r\n  await core.uploadFile(page, '#schema-field', schemaPath)\r\n  await page.click(page, '#featureId-field', 500)\r\n  await core.click(page, `#${featureId}`)\r\n  await core.clickAction(page, 'create-layer-action', 1000)\r\n  await page.waitForTimeout(wait)\r\n}\r\n"]}
+{"version":3,"sources":["../../../../test/client/map/catalog.js"],"names":["page","layerId","xpath","elements","$x","length","getProperty","jsonValue","undefined","getLayerCategoryId","categoryId","selector","core","isElementVisible","isLayerCategoryOpened","wait","isCatalogOpened","isRightPaneVisible","clickRightOpener","clickRightPaneAction","clickLayerCategory","layer","getLayerId","isCategoryOpened","click","waitForImagesLoaded","waitForTimeout","clickLayer","clickAction","removeLayer","filePath","loaderSelector","loader","$","uploadFile","dropFile","clickFab","addLayer","featureId","importLayer","service","type","connectLayer","layerName","schemaPath","createLayer","_","kebabCase"],"mappings":";;;;;;;;+BAOO,WAAmCA,IAAnC,EAAyCC,OAAzC,EAAkD;AACvD,UAAMC,QAAS,0EAAyED,OAAQ,KAAhG;AACA,UAAME,WAAW,MAAMH,KAAKI,EAAL,CAAQF,KAAR,CAAvB;AACA,QAAIC,SAASE,MAAT,GAAkB,CAAtB,EAAyB,OAAO,CAAC,MAAMF,SAAS,CAAT,EAAYG,WAAZ,CAAwB,IAAxB,CAAP,EAAsCC,SAAtC,EAAP;AACzB,WAAOC,SAAP;AACD,G;;kBALqBC,kB;;;;;;gCAOf,WAAsCT,IAAtC,EAA4CU,UAA5C,EAAwD;AAC7D,UAAMC,WAAY,IAAGD,UAAW,6BAAhC;AACA,WAAOE,KAAKC,gBAAL,CAAsBb,IAAtB,EAA4BW,QAA5B,CAAP;AACD,G;;kBAHqBG,qB;;;;;;gCAKf,WAAmCd,IAAnC,EAAyCU,UAAzC,EAAqDK,OAAO,GAA5D,EAAiE;AACtE,UAAMC,kBAAkB,MAAMJ,KAAKK,kBAAL,CAAwBjB,IAAxB,CAA9B;AACA,QAAI,CAACgB,eAAL,EAAsB,MAAMJ,KAAKM,gBAAL,CAAsBlB,IAAtB,CAAN;AACtB,UAAMY,KAAKO,oBAAL,CAA0BnB,IAA1B,EAAgCU,UAAhC,EAA4CK,IAA5C,CAAN;AACD,G;;kBAJqBK,kB;;;;;;gCAMf,WAA2BpB,IAA3B,EAAiCqB,KAAjC,EAAwCN,OAAO,IAA/C,EAAqD;AAC1D,UAAMd,UAAUqB,WAAWD,KAAX,CAAhB;AACA,UAAML,kBAAkB,MAAMJ,KAAKK,kBAAL,CAAwBjB,IAAxB,CAA9B;AACA,QAAI,CAACgB,eAAL,EAAsB,MAAMJ,KAAKM,gBAAL,CAAsBlB,IAAtB,CAAN;AACtB,UAAMU,aAAa,MAAMD,mBAAmBT,IAAnB,EAAyBC,OAAzB,CAAzB;AACA,QAAIsB,gBAAJ;AACA,QAAIb,UAAJ,EAAgB;AACda,yBAAmB,MAAMT,sBAAsBd,IAAtB,EAA4BU,UAA5B,CAAzB;AACA,UAAI,CAACa,gBAAL,EAAuB,MAAMH,mBAAmBpB,IAAnB,EAAyBU,UAAzB,CAAN;AACxB;AACD,QAAIC,WAAY,IAAGV,OAAQ,EAA3B;AACA,QAAIS,eAAe,6BAAnB,EAAkDC,YAAY,YAAZ;AAClD,UAAMC,KAAKY,KAAL,CAAWxB,IAAX,EAAiBW,QAAjB,CAAN;AACA,QAAID,UAAJ,EAAgB;AACd,UAAI,CAACa,gBAAL,EAAuB,MAAMH,mBAAmBpB,IAAnB,EAAyBU,UAAzB,CAAN;AACxB;AACD,QAAI,CAACM,eAAL,EAAsB,MAAMJ,KAAKM,gBAAL,CAAsBlB,IAAtB,CAAN;AACtB,UAAMY,KAAKa,mBAAL,CAAyBzB,IAAzB,CAAN;AACA,UAAMA,KAAK0B,cAAL,CAAoBX,IAApB,CAAN;AACD,G;;kBAnBqBY,U;;;;;;gCAqBf,WAA4B3B,IAA5B,EAAkCqB,KAAlC,EAAyCN,OAAO,IAAhD,EAAsD;AAC3D,UAAMd,UAAUqB,WAAWD,KAAX,CAAhB;AACA,UAAML,kBAAkB,MAAMJ,KAAKK,kBAAL,CAAwBjB,IAAxB,CAA9B;AACA,QAAI,CAACgB,eAAL,EAAsB,MAAMJ,KAAKM,gBAAL,CAAsBlB,IAAtB,CAAN;AACtB,UAAMU,aAAa,MAAMD,mBAAmBT,IAAnB,EAAyBC,OAAzB,CAAzB;AACA,QAAIsB,gBAAJ;AACA,QAAIb,UAAJ,EAAgB;AACda,yBAAmB,MAAMT,sBAAsBd,IAAtB,EAA4BU,UAA5B,CAAzB;AACA,UAAI,CAACa,gBAAL,EAAuB,MAAMH,mBAAmBpB,IAAnB,EAAyBU,UAAzB,CAAN;AACxB;AACD,UAAME,KAAKY,KAAL,CAAWxB,IAAX,EAAkB,IAAGC,OAAQ,SAA7B,CAAN;AACA,UAAMW,KAAKgB,WAAL,CAAiB5B,IAAjB,EAAuB,QAAvB,CAAN;AACA,UAAMY,KAAKY,KAAL,CAAWxB,IAAX,EAAiB,+BAAjB,EAAkDe,IAAlD,CAAN;AACA,QAAIL,UAAJ,EAAgB;AACd,UAAI,CAACa,gBAAL,EAAuB,MAAMH,mBAAmBpB,IAAnB,EAAyBU,UAAzB,CAAN;AACxB;AACF,G;;kBAhBqBmB,W;;;;;;gCAkBf,WAAyB7B,IAAzB,EAA+B8B,QAA/B,EAAyCf,OAAO,IAAhD,EAAsD;AAC3D,UAAMgB,iBAAiB,gBAAvB;AACA,UAAMC,SAAS,MAAMhC,KAAKiC,CAAL,CAAOF,cAAP,CAArB;AACA,UAAMC,OAAOE,UAAP,CAAkBJ,QAAlB,CAAN;AACA,UAAM9B,KAAK0B,cAAL,CAAoBX,IAApB,CAAN;AACD,G;;kBALqBoB,Q;;;;;;gCAOf,WAAyBnC,IAAzB,EAA+B;AACpC,UAAMY,KAAKwB,QAAL,CAAcpC,IAAd,CAAN;AACA,UAAMY,KAAKgB,WAAL,CAAiB5B,IAAjB,EAAuB,WAAvB,CAAN;AACA,UAAMA,KAAK0B,cAAL,CAAoB,IAApB,CAAN;AACD,G;;kBAJqBW,Q;;;;;;gCAMf,WAA4BrC,IAA5B,EAAkC8B,QAAlC,EAA4CQ,YAAY9B,SAAxD,EAAmEO,OAAO,IAA1E,EAAgF;AACrF,UAAMsB,SAASrC,IAAT,CAAN;AACA,UAAMY,KAAKsB,UAAL,CAAgBlC,IAAhB,EAAsB,aAAtB,EAAqC8B,QAArC,CAAN;AACA,QAAIQ,SAAJ,EAAe;AACb,YAAM1B,KAAKY,KAAL,CAAWxB,IAAX,EAAiB,kBAAjB,EAAqC,GAArC,CAAN;AACA,YAAMY,KAAKY,KAAL,CAAWxB,IAAX,EAAkB,IAAGsC,SAAU,EAA/B,EAAkC,GAAlC,CAAN;AACD;AACD,UAAM1B,KAAKgB,WAAL,CAAiB5B,IAAjB,EAAuB,qBAAvB,CAAN;AACA,UAAMY,KAAKa,mBAAL,CAAyBzB,IAAzB,CAAN;AACA,UAAMA,KAAK0B,cAAL,CAAoBX,IAApB,CAAN;AACD,G;;kBAVqBwB,W;;;;;;gCAYf,WAA6BvC,IAA7B,EAAmCwC,OAAnC,EAA4CvC,OAA5C,EAAqDc,OAAO,IAA5D,EAAkE;AACvE,UAAMsB,SAASrC,IAAT,CAAN;AACA,UAAMY,KAAKgB,WAAL,CAAiB5B,IAAjB,EAAuB,eAAvB,CAAN;AACA,UAAMY,KAAK6B,IAAL,CAAUzC,IAAV,EAAgB,gBAAhB,EAAkCwC,OAAlC,EAA2C,IAA3C,EAAiD,KAAjD,EAAwD,IAAxD,CAAN;AACA,UAAM5B,KAAKY,KAAL,CAAWxB,IAAX,EAAiB,cAAjB,EAAiC,GAAjC,CAAN;AACA,UAAMY,KAAKY,KAAL,CAAWxB,IAAX,EAAkB,IAAGC,OAAQ,EAA7B,EAAgC,GAAhC,CAAN;AACA,UAAMW,KAAKgB,WAAL,CAAiB5B,IAAjB,EAAuB,sBAAvB,EAA+C,IAA/C,CAAN;AACA,UAAMY,KAAKa,mBAAL,CAAyBzB,IAAzB,CAAN;AACA,UAAMA,KAAK0B,cAAL,CAAoBX,IAApB,CAAN;AACD,G;;kBATqB2B,Y;;;;;;iCAWf,WAA4B1C,IAA5B,EAAkC2C,SAAlC,EAA6CC,UAA7C,EAAyDN,SAAzD,EAAoEvB,OAAO,IAA3E,EAAiF;AACtF,UAAMsB,SAASrC,IAAT,CAAN;AACA,UAAMY,KAAKgB,WAAL,CAAiB5B,IAAjB,EAAuB,cAAvB,CAAN;AACA,UAAMY,KAAK6B,IAAL,CAAUzC,IAAV,EAAgB,aAAhB,EAA+B2C,SAA/B,CAAN;AACA,UAAM/B,KAAK6B,IAAL,CAAUzC,IAAV,EAAgB,oBAAhB,EAAuC,GAAE2C,SAAU,cAAnD,CAAN;AACA,UAAM/B,KAAKsB,UAAL,CAAgBlC,IAAhB,EAAsB,eAAtB,EAAuC4C,UAAvC,CAAN;AACA,UAAM5C,KAAKwB,KAAL,CAAWxB,IAAX,EAAiB,kBAAjB,EAAqC,GAArC,CAAN;AACA,UAAMY,KAAKY,KAAL,CAAWxB,IAAX,EAAkB,IAAGsC,SAAU,EAA/B,CAAN;AACA,UAAM1B,KAAKgB,WAAL,CAAiB5B,IAAjB,EAAuB,qBAAvB,EAA8C,IAA9C,CAAN;AACA,UAAMA,KAAK0B,cAAL,CAAoBX,IAApB,CAAN;AACD,G;;kBAVqB8B,W;;;;;QAjGNvB,U,GAAAA,U;;AAHhB;;;;AACA;;IAAYV,I;;;;;;;;AAEL,SAASU,UAAT,CAAqBD,KAArB,EAA4B;AACjC,SAAO,YAAYyB,iBAAEC,SAAF,CAAY1B,KAAZ,CAAnB;AACD","file":"catalog.js","sourcesContent":["import _ from 'lodash'\r\nimport * as core from '../core'\r\n\r\nexport function getLayerId (layer) {\r\n  return 'layers-' + _.kebabCase(layer)\r\n}\r\n\r\nexport async function getLayerCategoryId (page, layerId) {\r\n  const xpath = `//div[contains(@class, \"q-expansion-item q-item-type\") and .//div[@id=\"${layerId}\"]]`\r\n  const elements = await page.$x(xpath)\r\n  if (elements.length > 0) return (await elements[0].getProperty('id')).jsonValue()\r\n  return undefined\r\n}\r\n\r\nexport async function isLayerCategoryOpened (page, categoryId) {\r\n  const selector = `#${categoryId} .q-expansion-item__content`\r\n  return core.isElementVisible(page, selector)\r\n}\r\n\r\nexport async function clickLayerCategory (page, categoryId, wait = 500) {\r\n  const isCatalogOpened = await core.isRightPaneVisible(page)\r\n  if (!isCatalogOpened) await core.clickRightOpener(page)\r\n  await core.clickRightPaneAction(page, categoryId, wait)\r\n}\r\n\r\nexport async function clickLayer (page, layer, wait = 1000) {\r\n  const layerId = getLayerId(layer)\r\n  const isCatalogOpened = await core.isRightPaneVisible(page)\r\n  if (!isCatalogOpened) await core.clickRightOpener(page)\r\n  const categoryId = await getLayerCategoryId(page, layerId)\r\n  let isCategoryOpened\r\n  if (categoryId) {\r\n    isCategoryOpened = await isLayerCategoryOpened(page, categoryId)\r\n    if (!isCategoryOpened) await clickLayerCategory(page, categoryId)\r\n  }\r\n  let selector = `#${layerId}`\r\n  if (categoryId !== 'k-catalog-panel-base-layers') selector += ' .q-toggle'\r\n  await core.click(page, selector)\r\n  if (categoryId) {\r\n    if (!isCategoryOpened) await clickLayerCategory(page, categoryId)\r\n  }\r\n  if (!isCatalogOpened) await core.clickRightOpener(page)\r\n  await core.waitForImagesLoaded(page)\r\n  await page.waitForTimeout(wait)\r\n}\r\n\r\nexport async function removeLayer (page, layer, wait = 1000) {\r\n  const layerId = getLayerId(layer)\r\n  const isCatalogOpened = await core.isRightPaneVisible(page)\r\n  if (!isCatalogOpened) await core.clickRightOpener(page)\r\n  const categoryId = await getLayerCategoryId(page, layerId)\r\n  let isCategoryOpened\r\n  if (categoryId) {\r\n    isCategoryOpened = await isLayerCategoryOpened(page, categoryId)\r\n    if (!isCategoryOpened) await clickLayerCategory(page, categoryId)\r\n  }\r\n  await core.click(page, `#${layerId} .q-btn`)\r\n  await core.clickAction(page, 'remove')\r\n  await core.click(page, '.q-dialog button:nth-child(2)', wait)\r\n  if (categoryId) {\r\n    if (!isCategoryOpened) await clickLayerCategory(page, categoryId)\r\n  }\r\n}\r\n\r\nexport async function dropFile (page, filePath, wait = 2000) {\r\n  const loaderSelector = '#dropFileInput'\r\n  const loader = await page.$(loaderSelector)\r\n  await loader.uploadFile(filePath)\r\n  await page.waitForTimeout(wait)\r\n}\r\n\r\nexport async function addLayer (page) {\r\n  await core.clickFab(page)\r\n  await core.clickAction(page, 'add-layer')\r\n  await page.waitForTimeout(1000)\r\n}\r\n\r\nexport async function importLayer (page, filePath, featureId = undefined, wait = 2000) {\r\n  await addLayer(page)\r\n  await core.uploadFile(page, '#file-field', filePath)\r\n  if (featureId) {\r\n    await core.click(page, '#featureId-field', 500)\r\n    await core.click(page, `#${featureId}`, 500)\r\n  }\r\n  await core.clickAction(page, 'import-layer-action')\r\n  await core.waitForImagesLoaded(page)\r\n  await page.waitForTimeout(wait)\r\n}\r\n\r\nexport async function connectLayer (page, service, layerId, wait = 2000) {\r\n  await addLayer(page)\r\n  await core.clickAction(page, 'connect-layer')\r\n  await core.type(page, '#service-field', service, true, false, 5000)\r\n  await core.click(page, '#layer-field', 500)\r\n  await core.click(page, `#${layerId}`, 500)\r\n  await core.clickAction(page, 'connect-layer-action', 2000)\r\n  await core.waitForImagesLoaded(page)\r\n  await page.waitForTimeout(wait)\r\n}\r\n\r\nexport async function createLayer (page, layerName, schemaPath, featureId, wait = 2000) {\r\n  await addLayer(page)\r\n  await core.clickAction(page, 'create-layer')\r\n  await core.type(page, '#name-field', layerName)\r\n  await core.type(page, '#description-field', `${layerName} description`)\r\n  await core.uploadFile(page, '#schema-field', schemaPath)\r\n  await page.click(page, '#featureId-field', 500)\r\n  await core.click(page, `#${featureId}`)\r\n  await core.clickAction(page, 'create-layer-action', 1000)\r\n  await page.waitForTimeout(wait)\r\n}\r\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kalisio/kdk",
   "description": "Kalisio Development Kit",
-  "version": "1.4.2",
+  "version": "1.5.0",
   "homepage": "https://github.com/kalisio/kdk",
   "main": "lib/",
   "keywords": [
@@ -79,7 +79,8 @@
       "Event",
       "MouseEvent",
       "AbortController",
-      "localStorage"
+      "localStorage",
+      "DOMParser"
     ]
   },
   "directories": {