d5-testing-library 1.8.0-alpha.7 → 1.8.0-alpha.8

package/dist/FormEdit-5JMOGDF5.mjs

@@ -0,0 +1,7 @@
+import {
+  FormEdit
+} from "./chunk-43FE34WA.mjs";
+import "./chunk-K6JEWF3Y.mjs";
+export {
+  FormEdit as default
+};

package/dist/ListForm-RYJQQ7PK.mjs

@@ -0,0 +1,7 @@
+import {
+  ListForm
+} from "./chunk-7TTKFTZM.mjs";
+import "./chunk-K6JEWF3Y.mjs";
+export {
+  ListForm as default
+};

package/dist/TreeView-YRHW5YVA.mjs

@@ -0,0 +1,8 @@
+import {
+  TreeView
+} from "./chunk-S6ZF7DZF.mjs";
+import "./chunk-7TTKFTZM.mjs";
+import "./chunk-K6JEWF3Y.mjs";
+export {
+  TreeView as default
+};

package/dist/{chunk-OFRHOWHJ.mjs → chunk-43FE34WA.mjs}

@@ -3,16 +3,22 @@ import {
   FormField,
   click,
   wait
-} from "./chunk-XIXI3XKT.mjs";
+} from "./chunk-K6JEWF3Y.mjs";
 
 // src/pageObjects/elements/Forms/FormEdit.ts
 import { By } from "selenium-webdriver";
 var FormEdit = class extends Form {
-  saveButtonBy = By.id("button-save");
-  closeButtonBy = By.id("button-cancel");
+  saveButtonId = "#button-save";
+  closeButtonId = "#button-cancel";
   constructor(driver) {
     super(driver);
-    this.popupContainerCssSelector = `.popup .form-edit-${this.formName}`;
+    this.popupContainerCssSelector = `.popup.form-edit-${this.formName}`;
+  }
+  async getButtonCssSelector(buttonId) {
+    if (await this.isModal()) {
+      return `${this.popupContainerCssSelector} ${buttonId}`;
+    }
+    return buttonId;
   }
   /**
    * Находит поле формы редактирования по имени
@@ -32,7 +38,8 @@ var FormEdit = class extends Form {
    * await formEdit.isSaveButtonDisabled();
    */
   async isSaveButtonDisabled() {
-    const saveButton = await this.driver.findElement(this.saveButtonBy);
+    const saveButtonCssSelector = await this.getButtonCssSelector(this.saveButtonId);
+    const saveButton = await this.driver.findElement(By.css(saveButtonCssSelector));
     const result = await saveButton.getAttribute("aria-disabled");
     return result === "true";
   }
@@ -44,7 +51,8 @@ var FormEdit = class extends Form {
    * await formEdit.saveButtonClick();
    */
   async saveButtonClick() {
-    const saveButton = await this.driver.findElement(this.saveButtonBy);
+    const saveButtonCssSelector = await this.getButtonCssSelector(this.saveButtonId);
+    const saveButton = await this.driver.findElement(By.css(saveButtonCssSelector));
     await wait(async () => !await this.isSaveButtonDisabled(), this.driver, "Button is disabled");
     await click(saveButton, this.driver);
   }
@@ -56,7 +64,8 @@ var FormEdit = class extends Form {
    * await formEdit.closeButtonClick();
    */
   async closeButtonClick() {
-    const closeButton = await this.driver.findElement(this.closeButtonBy);
+    const closeButtonCssSelector = await this.getButtonCssSelector(this.closeButtonId);
+    const closeButton = await this.driver.findElement(By.css(closeButtonCssSelector));
     await click(closeButton, this.driver);
   }
 };

package/dist/{chunk-JPBRK2XM.mjs → chunk-7TTKFTZM.mjs}

@@ -16,7 +16,7 @@ import {
   wait,
   waitElementIsClickable,
   waitElementIsVisible
-} from "./chunk-XIXI3XKT.mjs";
+} from "./chunk-K6JEWF3Y.mjs";
 
 // src/pageObjects/elements/Table/Table.ts
 import { By as By5 } from "selenium-webdriver";
@@ -1022,7 +1022,7 @@ var ListForm = class extends Form {
   fixedTableContentCssSelector;
   constructor(driver) {
     super(driver);
-    this.popupContainerCssSelector = `.popup .form-inline-${this.formName}`;
+    this.popupContainerCssSelector = `.popup.form-inline-${this.formName}`;
     this.headerCssSelector = DATAGRID_HEADER_CSS_SELECTOR;
     this.fixedTableContentCssSelector = FIXED_DATAGRID_CONTENT_CSS_SELECTOR;
   }

package/dist/{chunk-XIXI3XKT.mjs → chunk-K6JEWF3Y.mjs}

@@ -1254,15 +1254,15 @@ async function classDependencyInjector(formType) {
   let SubFormFactoryClass;
   switch (formType) {
     case "1" /* LIST */:
-      SubFormFactoryClass = (await import("./ListForm-5DCDM5MB.mjs")).default;
+      SubFormFactoryClass = (await import("./ListForm-RYJQQ7PK.mjs")).default;
       break;
     case "3" /* TREE */:
-      SubFormFactoryClass = (await import("./TreeView-X5OAX5BH.mjs")).default;
+      SubFormFactoryClass = (await import("./TreeView-YRHW5YVA.mjs")).default;
       break;
     case "2" /* EDIT */:
     case "99" /* FREE_FORM */:
     case "4" /* REPORT */:
-      SubFormFactoryClass = (await import("./FormEdit-CWMK45SG.mjs")).default;
+      SubFormFactoryClass = (await import("./FormEdit-5JMOGDF5.mjs")).default;
       break;
     default:
       throw new Error(`Unsupported form type ${formType}`);

package/dist/{chunk-SLLHWNFA.mjs → chunk-S6ZF7DZF.mjs}

@@ -1,6 +1,6 @@
 import {
   ListForm
-} from "./chunk-JPBRK2XM.mjs";
+} from "./chunk-7TTKFTZM.mjs";
 
 // src/pageObjects/elements/Forms/TreeView.ts
 var TREELIST_HEADER_CSS_SELECTOR = ".dx-treelist-headers .dx-treelist-content:not(.dx-datagrid-content-fixed)";
@@ -8,7 +8,7 @@ var FIXED_TREELIST_CONTENT_CSS_SELECTOR = ".dx-fixed-columns .dx-treelist-conten
 var TreeView = class extends ListForm {
   constructor(driver) {
     super(driver);
-    this.popupContainerCssSelector = `.popup .wrapper-tree-view-${this.formName}`;
+    this.popupContainerCssSelector = `.popup.wrapper-tree-view-${this.formName}`;
     this.headerCssSelector = TREELIST_HEADER_CSS_SELECTOR;
     this.fixedTableContentCssSelector = FIXED_TREELIST_CONTENT_CSS_SELECTOR;
   }

package/dist/cjs/d5-testing-library.cjs

@@ -2839,7 +2839,7 @@ var init_ListForm = __esm({
       fixedTableContentCssSelector;
       constructor(driver) {
         super(driver);
-        this.popupContainerCssSelector = `.popup .form-inline-${this.formName}`;
+        this.popupContainerCssSelector = `.popup.form-inline-${this.formName}`;
         this.headerCssSelector = DATAGRID_HEADER_CSS_SELECTOR;
         this.fixedTableContentCssSelector = FIXED_DATAGRID_CONTENT_CSS_SELECTOR;
       }
@@ -2914,7 +2914,7 @@ var init_TreeView = __esm({
     TreeView = class extends ListForm {
       constructor(driver) {
         super(driver);
-        this.popupContainerCssSelector = `.popup .wrapper-tree-view-${this.formName}`;
+        this.popupContainerCssSelector = `.popup.wrapper-tree-view-${this.formName}`;
         this.headerCssSelector = TREELIST_HEADER_CSS_SELECTOR;
         this.fixedTableContentCssSelector = FIXED_TREELIST_CONTENT_CSS_SELECTOR;
       }
@@ -3047,11 +3047,17 @@ var init_FormEdit = __esm({
     init_actions();
     init_wait();
     FormEdit = class extends Form {
-      saveButtonBy = import_selenium_webdriver30.By.id("button-save");
-      closeButtonBy = import_selenium_webdriver30.By.id("button-cancel");
+      saveButtonId = "#button-save";
+      closeButtonId = "#button-cancel";
       constructor(driver) {
         super(driver);
-        this.popupContainerCssSelector = `.popup .form-edit-${this.formName}`;
+        this.popupContainerCssSelector = `.popup.form-edit-${this.formName}`;
+      }
+      async getButtonCssSelector(buttonId) {
+        if (await this.isModal()) {
+          return `${this.popupContainerCssSelector} ${buttonId}`;
+        }
+        return buttonId;
       }
       /**
        * Находит поле формы редактирования по имени
@@ -3071,7 +3077,8 @@ var init_FormEdit = __esm({
        * await formEdit.isSaveButtonDisabled();
        */
       async isSaveButtonDisabled() {
-        const saveButton = await this.driver.findElement(this.saveButtonBy);
+        const saveButtonCssSelector = await this.getButtonCssSelector(this.saveButtonId);
+        const saveButton = await this.driver.findElement(import_selenium_webdriver30.By.css(saveButtonCssSelector));
         const result = await saveButton.getAttribute("aria-disabled");
         return result === "true";
       }
@@ -3083,7 +3090,8 @@ var init_FormEdit = __esm({
        * await formEdit.saveButtonClick();
        */
       async saveButtonClick() {
-        const saveButton = await this.driver.findElement(this.saveButtonBy);
+        const saveButtonCssSelector = await this.getButtonCssSelector(this.saveButtonId);
+        const saveButton = await this.driver.findElement(import_selenium_webdriver30.By.css(saveButtonCssSelector));
         await wait(async () => !await this.isSaveButtonDisabled(), this.driver, "Button is disabled");
         await click(saveButton, this.driver);
       }
@@ -3095,7 +3103,8 @@ var init_FormEdit = __esm({
        * await formEdit.closeButtonClick();
        */
       async closeButtonClick() {
-        const closeButton = await this.driver.findElement(this.closeButtonBy);
+        const closeButtonCssSelector = await this.getButtonCssSelector(this.closeButtonId);
+        const closeButton = await this.driver.findElement(import_selenium_webdriver30.By.css(closeButtonCssSelector));
         await click(closeButton, this.driver);
       }
     };
@@ -3364,13 +3373,12 @@ init_ListForm();
 init_TreeView();
 
 // src/pageObjects/elements/Forms/ReportForm.ts
-var import_selenium_webdriver31 = require("selenium-webdriver");
 init_FormEdit();
 var ReportForm = class extends FormEdit {
   constructor(driver) {
     super(driver);
-    this.popupContainerCssSelector = `.popup .form-report-${this.formName}`;
-    this.saveButtonBy = import_selenium_webdriver31.By.id("button-apply");
+    this.popupContainerCssSelector = `.popup.form-report-${this.formName}`;
+    this.saveButtonId = "#button-apply";
   }
   /**
    * Знаходить поле/фільтр у формі репорту за ім'ям
@@ -3393,7 +3401,7 @@ init_FilterPanel();
 
 // src/pageObjects/elements/Dialog.ts
 init_AbstractElement();
-var import_selenium_webdriver32 = require("selenium-webdriver");
+var import_selenium_webdriver31 = require("selenium-webdriver");
 init_AbstractButton();
 var DIALOG_CLASS = ".d5-dialog";
 var DIALOG_TITLE_CLASS = ".dialog__title";
@@ -3408,7 +3416,7 @@ var DialogButton = class extends AbstractButton {
   }
   async getElement() {
     const panel = await super.getElement();
-    return panel.findElement(import_selenium_webdriver32.By.xpath(buttonByTextXpath2(this.text)));
+    return panel.findElement(import_selenium_webdriver31.By.xpath(buttonByTextXpath2(this.text)));
   }
   buttonNotDisplayedError() {
     return `Dialog button ${this.text} cannot be clicked. It is not displayed or it is disabled`;
@@ -3428,11 +3436,11 @@ var Dialog = class extends AbstractElement {
     return this.joinRelativeCssSelectors([DIALOG_CLASS, DIALOG_BUTTONS_PANEL_CLASS]);
   }
   async title() {
-    const el = await this.driver.findElement(import_selenium_webdriver32.By.css(this.titleSelector));
+    const el = await this.driver.findElement(import_selenium_webdriver31.By.css(this.titleSelector));
     return await el.getText();
   }
   async text() {
-    const el = await this.driver.findElement(import_selenium_webdriver32.By.css(this.textSelector));
+    const el = await this.driver.findElement(import_selenium_webdriver31.By.css(this.textSelector));
     return await el.getText();
   }
   button(text) {

package/dist/d5-testing-library.d.ts

@@ -413,9 +413,10 @@ declare class FormField extends AbstractEditor {
 }
 
 declare class FormEdit extends Form {
-    saveButtonBy: By;
-    closeButtonBy: By;
+    saveButtonId: string;
+    closeButtonId: string;
     constructor(driver: WebDriver);
+    private getButtonCssSelector;
     /**
      * Находит поле формы редактирования по имени
      * @example

package/dist/d5-testing-library.legacy-esm.js

@@ -1,15 +1,15 @@
 import {
   TreeView
-} from "./chunk-SLLHWNFA.mjs";
+} from "./chunk-S6ZF7DZF.mjs";
 import {
   FilterPanel,
   FormFilterField,
   ListForm,
   PanelFilterField
-} from "./chunk-JPBRK2XM.mjs";
+} from "./chunk-7TTKFTZM.mjs";
 import {
   FormEdit
-} from "./chunk-OFRHOWHJ.mjs";
+} from "./chunk-43FE34WA.mjs";
 import {
   AbstractButton,
   AbstractElement,
@@ -30,7 +30,7 @@ import {
   readonlyLocator,
   wait,
   waitElementIsVisible
-} from "./chunk-XIXI3XKT.mjs";
+} from "./chunk-K6JEWF3Y.mjs";
 
 // src/pageObjects/pages/LoginPage.ts
 var LOGIN_PATH = "/login";
@@ -225,12 +225,11 @@ var SubsystemsPanel = class extends AbstractElement {
 };
 
 // src/pageObjects/elements/Forms/ReportForm.ts
-import { By as By4 } from "selenium-webdriver";
 var ReportForm = class extends FormEdit {
   constructor(driver) {
     super(driver);
-    this.popupContainerCssSelector = `.popup .form-report-${this.formName}`;
-    this.saveButtonBy = By4.id("button-apply");
+    this.popupContainerCssSelector = `.popup.form-report-${this.formName}`;
+    this.saveButtonId = "#button-apply";
   }
   /**
    * Знаходить поле/фільтр у формі репорту за ім'ям
@@ -245,7 +244,7 @@ var ReportForm = class extends FormEdit {
 };
 
 // src/pageObjects/elements/Dialog.ts
-import { By as By5 } from "selenium-webdriver";
+import { By as By4 } from "selenium-webdriver";
 var DIALOG_CLASS = ".d5-dialog";
 var DIALOG_TITLE_CLASS = ".dialog__title";
 var DIALOG_TEXT_CLASS = ".dialog__text";
@@ -259,7 +258,7 @@ var DialogButton = class extends AbstractButton {
   }
   async getElement() {
     const panel = await super.getElement();
-    return panel.findElement(By5.xpath(buttonByTextXpath(this.text)));
+    return panel.findElement(By4.xpath(buttonByTextXpath(this.text)));
   }
   buttonNotDisplayedError() {
     return `Dialog button ${this.text} cannot be clicked. It is not displayed or it is disabled`;
@@ -279,11 +278,11 @@ var Dialog = class extends AbstractElement {
     return this.joinRelativeCssSelectors([DIALOG_CLASS, DIALOG_BUTTONS_PANEL_CLASS]);
   }
   async title() {
-    const el = await this.driver.findElement(By5.css(this.titleSelector));
+    const el = await this.driver.findElement(By4.css(this.titleSelector));
     return await el.getText();
   }
   async text() {
-    const el = await this.driver.findElement(By5.css(this.textSelector));
+    const el = await this.driver.findElement(By4.css(this.textSelector));
     return await el.getText();
   }
   button(text) {

package/dist/d5-testing-library.mjs

@@ -1,15 +1,15 @@
 import {
   TreeView
-} from "./chunk-SLLHWNFA.mjs";
+} from "./chunk-S6ZF7DZF.mjs";
 import {
   FilterPanel,
   FormFilterField,
   ListForm,
   PanelFilterField
-} from "./chunk-JPBRK2XM.mjs";
+} from "./chunk-7TTKFTZM.mjs";
 import {
   FormEdit
-} from "./chunk-OFRHOWHJ.mjs";
+} from "./chunk-43FE34WA.mjs";
 import {
   AbstractButton,
   AbstractElement,
@@ -30,7 +30,7 @@ import {
   readonlyLocator,
   wait,
   waitElementIsVisible
-} from "./chunk-XIXI3XKT.mjs";
+} from "./chunk-K6JEWF3Y.mjs";
 
 // src/pageObjects/pages/LoginPage.ts
 var LOGIN_PATH = "/login";
@@ -225,12 +225,11 @@ var SubsystemsPanel = class extends AbstractElement {
 };
 
 // src/pageObjects/elements/Forms/ReportForm.ts
-import { By as By4 } from "selenium-webdriver";
 var ReportForm = class extends FormEdit {
   constructor(driver) {
     super(driver);
-    this.popupContainerCssSelector = `.popup .form-report-${this.formName}`;
-    this.saveButtonBy = By4.id("button-apply");
+    this.popupContainerCssSelector = `.popup.form-report-${this.formName}`;
+    this.saveButtonId = "#button-apply";
   }
   /**
    * Знаходить поле/фільтр у формі репорту за ім'ям
@@ -245,7 +244,7 @@ var ReportForm = class extends FormEdit {
 };
 
 // src/pageObjects/elements/Dialog.ts
-import { By as By5 } from "selenium-webdriver";
+import { By as By4 } from "selenium-webdriver";
 var DIALOG_CLASS = ".d5-dialog";
 var DIALOG_TITLE_CLASS = ".dialog__title";
 var DIALOG_TEXT_CLASS = ".dialog__text";
@@ -259,7 +258,7 @@ var DialogButton = class extends AbstractButton {
   }
   async getElement() {
     const panel = await super.getElement();
-    return panel.findElement(By5.xpath(buttonByTextXpath(this.text)));
+    return panel.findElement(By4.xpath(buttonByTextXpath(this.text)));
   }
   buttonNotDisplayedError() {
     return `Dialog button ${this.text} cannot be clicked. It is not displayed or it is disabled`;
@@ -279,11 +278,11 @@ var Dialog = class extends AbstractElement {
     return this.joinRelativeCssSelectors([DIALOG_CLASS, DIALOG_BUTTONS_PANEL_CLASS]);
   }
   async title() {
-    const el = await this.driver.findElement(By5.css(this.titleSelector));
+    const el = await this.driver.findElement(By4.css(this.titleSelector));
     return await el.getText();
   }
   async text() {
-    const el = await this.driver.findElement(By5.css(this.textSelector));
+    const el = await this.driver.findElement(By4.css(this.textSelector));
     return await el.getText();
   }
   button(text) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "d5-testing-library",
-  "version": "1.8.0-alpha.7",
+  "version": "1.8.0-alpha.8",
   "description": "e2e testing D5 projects",
   "main": "dist/cjs/d5-testing-library.cjs",
   "module": "dist/d5-testing-library.legacy-esm.js",

package/dist/FormEdit-CWMK45SG.mjs

@@ -1,7 +0,0 @@
-import {
-  FormEdit
-} from "./chunk-OFRHOWHJ.mjs";
-import "./chunk-XIXI3XKT.mjs";
-export {
-  FormEdit as default
-};

package/dist/ListForm-5DCDM5MB.mjs

@@ -1,7 +0,0 @@
-import {
-  ListForm
-} from "./chunk-JPBRK2XM.mjs";
-import "./chunk-XIXI3XKT.mjs";
-export {
-  ListForm as default
-};

package/dist/TreeView-X5OAX5BH.mjs

@@ -1,8 +0,0 @@
-import {
-  TreeView
-} from "./chunk-SLLHWNFA.mjs";
-import "./chunk-JPBRK2XM.mjs";
-import "./chunk-XIXI3XKT.mjs";
-export {
-  TreeView as default
-};