d5-testing-library 1.8.0-alpha.0 → 1.8.0-alpha.10

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

@@ -387,6 +387,7 @@ var init_types = __esm({
       ControlClass2["SingleDateRange"] = "single-date-range-control";
       ControlClass2["BooleanSelector"] = "buttons-group";
       ControlClass2["ButtonGroup"] = "button-group-field";
+      ControlClass2["HeaderFilterDictionary"] = "header-filter-dictionary";
       return ControlClass2;
     })(ControlClass || {});
   }
@@ -918,6 +919,108 @@ var init_DateEditor = __esm({
   }
 });
 
+// src/pageObjects/elements/Editors/HeaderFilterDictionary.ts
+var import_selenium_webdriver15, TAGS_SELECTOR2, DX_TAG_CONTAINER2, DX_TEXTEDITOR_EMPTY3, CUSTOM_OPTION_LIST_SELECTOR, SELECT_BOX_OPTION_TEXT_CONTAINER_CLASS2, TAG_BOX_LIST_ITEM_SELECTOR2, combinedOptionHeaderFilterDictValueXpath, dropDownHeaderFilterDictionaryOptionClick, HeaderFilterDictionary;
+var init_HeaderFilterDictionary = __esm({
+  "src/pageObjects/elements/Editors/HeaderFilterDictionary.ts"() {
+    "use strict";
+    init_AbstractEditor();
+    import_selenium_webdriver15 = require("selenium-webdriver");
+    init_actions();
+    init_locators();
+    init_ClearButtonStrategy();
+    init_fixElementStaleError();
+    TAGS_SELECTOR2 = ".dx-tag .tag-text";
+    DX_TAG_CONTAINER2 = "dx-tag-container";
+    DX_TEXTEDITOR_EMPTY3 = "dx-texteditor-empty";
+    CUSTOM_OPTION_LIST_SELECTOR = "custom-list";
+    SELECT_BOX_OPTION_TEXT_CONTAINER_CLASS2 = "d5-multi-select-item";
+    TAG_BOX_LIST_ITEM_SELECTOR2 = '.dx-overlay-wrapper .dx-list-item[aria-selected="true"]';
+    combinedOptionHeaderFilterDictValueXpath = (value) => `//div[contains(@class, '${SELECT_BOX_OPTION_TEXT_CONTAINER_CLASS2}') and contains(text(), '${value}')]`;
+    dropDownHeaderFilterDictionaryOptionClick = async (optionValue, driver, dataTEST = "", delay = true) => {
+      const { implicit } = await driver.manage().getTimeouts();
+      let optElement = null;
+      const timeout = delay ? implicit : 600;
+      let err = null;
+      try {
+        const calendarPopoverSelector = byTestIdCssSelector(`${dataTEST}`);
+        await driver.manage().setTimeouts({ implicit: timeout });
+        const calendarPopoverElement = await driver.findElement(import_selenium_webdriver15.By.css(calendarPopoverSelector));
+        const customOptionList = calendarPopoverElement.findElement(import_selenium_webdriver15.By.css(`.${CUSTOM_OPTION_LIST_SELECTOR}`));
+        optElement = await customOptionList.findElement(import_selenium_webdriver15.By.xpath(combinedOptionHeaderFilterDictValueXpath(optionValue)));
+        await click(optElement, driver);
+      } catch (e) {
+        err = new Error(`Item not found: "${optionValue}"`);
+      } finally {
+        await driver.manage().setTimeouts({ implicit });
+      }
+      if (err)
+        throw err;
+    };
+    HeaderFilterDictionary = class extends AbstractDXEditorWithInput {
+      constructor(parentCssSelector, elementCssSelector, driver) {
+        super(parentCssSelector, elementCssSelector, driver);
+        this.setClearStrategy(new ClearButtonStrategy(this.getFullCssSelector(), this.driver));
+      }
+      async setTagBoxInputValue(values) {
+        const lastElement = values[values.length - 1];
+        const inputEl = await this.getInputElement();
+        await inputEl.click();
+        for (const value of values) {
+          await this.selectOption(inputEl, value, lastElement);
+        }
+      }
+      async waitOptionSelection() {
+        await fixElementStaleError(import_selenium_webdriver15.By.css(TAG_BOX_LIST_ITEM_SELECTOR2), this.driver);
+      }
+      async selectOption(inputEl, value, lastElement) {
+        try {
+          await inputEl.sendKeys(value);
+          const dataTEST = await this.getDataTestId();
+          await dropDownHeaderFilterDictionaryOptionClick(value, this.driver, dataTEST);
+          const textLength = await inputEl.getAttribute("value").then((value2) => value2.length);
+          for (let i = 0; i < textLength; i++) {
+            await inputEl.sendKeys(import_selenium_webdriver15.Key.BACK_SPACE);
+          }
+        } catch (error) {
+          throw error;
+        }
+        await this.waitOptionSelection();
+        if (value !== lastElement) {
+          await inputEl.clear();
+        }
+      }
+      async getHeaderFilterDictionaryInputValue() {
+        if (await this.isHeaderFilterDictionaryEmpty()) {
+          return [];
+        }
+        const tags = await this.driver.findElements(
+          import_selenium_webdriver15.By.css(`${this.getFullCssSelector()} .${DX_TAG_CONTAINER2} ${TAGS_SELECTOR2}`)
+        );
+        const values = [];
+        for (const tag of tags) {
+          values.push(await tag.getAttribute("textContent"));
+        }
+        return values;
+      }
+      async isHeaderFilterDictionaryEmpty() {
+        const classAttribute = await this.getClasses();
+        return classAttribute.includes(DX_TEXTEDITOR_EMPTY3);
+      }
+      async getValue() {
+        const value = await this.getHeaderFilterDictionaryInputValue();
+        return value.length ? value : null;
+      }
+      async setValue(values) {
+        if (!Array.isArray(values)) {
+          values = [values];
+        }
+        await this.setTagBoxInputValue(values);
+      }
+    };
+  }
+});
+
 // src/pageObjects/elements/Editors/editorFactory.ts
 var editorFactory;
 var init_editorFactory = __esm({
@@ -934,6 +1037,7 @@ var init_editorFactory = __esm({
     init_BooleanSelector();
     init_ButtonGroup();
     init_DateEditor();
+    init_HeaderFilterDictionary();
     editorFactory = async (parentCssSelector, elementCssSelector, driver) => {
       const elementInstance = new AbstractFormElement(parentCssSelector, elementCssSelector, driver);
       const classSting = await elementInstance.getClasses();
@@ -956,6 +1060,8 @@ var init_editorFactory = __esm({
         return new BooleanSelector(parentCssSelector, elementCssSelector, driver);
       if (classSting.includes("button-group-field" /* ButtonGroup */))
         return new ButtonGroup(parentCssSelector, elementCssSelector, driver);
+      if (classSting.includes("header-filter-dictionary" /* HeaderFilterDictionary */))
+        return new HeaderFilterDictionary(parentCssSelector, elementCssSelector, driver);
       throw new Error("Unknown type of editor. Please write ticket to the support");
     };
   }
@@ -1003,6 +1109,9 @@ function createFormButtonTestId(formName, itemName) {
 function createSubSystemTestId(itemName) {
   return `${"subsystem-item" /* SUBSYSTEM_ITEM */}-${itemName}`;
 }
+function createEditorButtonTestId(itemName) {
+  return `${"editor-button" /* EDITOR_BUTTON */}-${itemName}`;
+}
 var init_createDataTestId = __esm({
   "src/utils/createDataTestId.ts"() {
     "use strict";
@@ -1035,9 +1144,9 @@ var AbstractButton;
 var init_AbstractButton = __esm({
   "src/pageObjects/elements/TableToolbar/AbstractButton.ts"() {
     "use strict";
-    init_AbstractElementWithParent();
     init_actions();
     init_waitElementIsClickable();
+    init_AbstractElementWithParent();
     AbstractButton = class extends AbstractElementWithParent {
       constructor(parentCssSelector, elementCssSelector, driver) {
         super(parentCssSelector, elementCssSelector, driver);
@@ -1055,17 +1164,21 @@ var init_AbstractButton = __esm({
         const button = await this.getElement();
         return await button.getCssValue("pointer-events") === "none";
       }
+      async isDisplayed() {
+        const button = await this.getElement();
+        return await button.isDisplayed();
+      }
     };
   }
 });
 
 // src/pageObjects/elements/DXComponents/DXButton.ts
-var import_selenium_webdriver16, DXButton;
+var import_selenium_webdriver17, DXButton;
 var init_DXButton = __esm({
   "src/pageObjects/elements/DXComponents/DXButton.ts"() {
     "use strict";
     init_AbstractButton();
-    import_selenium_webdriver16 = require("selenium-webdriver");
+    import_selenium_webdriver17 = require("selenium-webdriver");
     DXButton = class extends AbstractButton {
       async getText() {
         const classes = await this.getClasses();
@@ -1073,7 +1186,7 @@ var init_DXButton = __esm({
           return null;
         }
         const el = await this.getElement();
-        const textEl = el.findElement(import_selenium_webdriver16.By.className("dx-button-text"));
+        const textEl = el.findElement(import_selenium_webdriver17.By.className("dx-button-text"));
         return await textEl.getText();
       }
     };
@@ -1128,12 +1241,12 @@ var init_Panel = __esm({
 });
 
 // src/pageObjects/elements/Groups/TabPanel.ts
-var import_selenium_webdriver17, TabPanelItem, TabPanel;
+var import_selenium_webdriver18, TabPanelItem, TabPanel;
 var init_TabPanel = __esm({
   "src/pageObjects/elements/Groups/TabPanel.ts"() {
     "use strict";
     init_AbstractGroup();
-    import_selenium_webdriver17 = require("selenium-webdriver");
+    import_selenium_webdriver18 = require("selenium-webdriver");
     init_actions();
     TabPanelItem = class extends AbstractGroup {
       constructor(parentCssSelector, elementCssSelector, driver) {
@@ -1144,7 +1257,7 @@ var init_TabPanel = __esm({
       }
       async isActive() {
         const tabPanelItemElement = await this.getElement();
-        const grandparentTab = await tabPanelItemElement.findElement(import_selenium_webdriver17.By.xpath('ancestor::div[@role="tab"][1]'));
+        const grandparentTab = await tabPanelItemElement.findElement(import_selenium_webdriver18.By.xpath('ancestor::div[@role="tab"][1]'));
         return await grandparentTab.getAttribute("aria-selected") === "true";
       }
       async getTitle() {
@@ -1163,12 +1276,12 @@ var init_TabPanel = __esm({
 });
 
 // src/pageObjects/elements/Groups/Accordion/AccordionItem.ts
-var import_selenium_webdriver18, ACCORDION_TITLE_CONTAINER, AccordionItem;
+var import_selenium_webdriver19, ACCORDION_TITLE_CONTAINER, AccordionItem;
 var init_AccordionItem = __esm({
   "src/pageObjects/elements/Groups/Accordion/AccordionItem.ts"() {
     "use strict";
     init_AbstractGroup();
-    import_selenium_webdriver18 = require("selenium-webdriver");
+    import_selenium_webdriver19 = require("selenium-webdriver");
     init_actions();
     ACCORDION_TITLE_CONTAINER = "accordion-title-container";
     AccordionItem = class extends AbstractGroup {
@@ -1181,7 +1294,7 @@ var init_AccordionItem = __esm({
       }
       async clickAccordionItemTitle() {
         const accordionElement = await this.getElement();
-        const accordTitleElement = await accordionElement.findElement(import_selenium_webdriver18.By.className(ACCORDION_TITLE_CONTAINER));
+        const accordTitleElement = await accordionElement.findElement(import_selenium_webdriver19.By.className(ACCORDION_TITLE_CONTAINER));
         await accordTitleElement.click();
       }
       async click() {
@@ -1416,11 +1529,11 @@ function getCssRowByIndexSelector(index) {
 function getCssCellByIndexSelector(index) {
   return `td[role="gridcell"][aria-colindex="${transformInputIndex(index)}"]`;
 }
-var import_selenium_webdriver19, getColumnByIndexCssSelector, getColumnByCaptionCssSelector, getColumnByNameCssSelector, transformInputIndex, transformOutputIndex;
+var import_selenium_webdriver20, getColumnByIndexCssSelector, getColumnByCaptionCssSelector, getColumnByNameCssSelector, transformInputIndex, transformOutputIndex;
 var init_utils2 = __esm({
   "src/pageObjects/elements/Table/utils.ts"() {
     "use strict";
-    import_selenium_webdriver19 = require("selenium-webdriver");
+    import_selenium_webdriver20 = require("selenium-webdriver");
     getColumnByIndexCssSelector = (columnIndex) => `td[aria-colindex="${transformInputIndex(columnIndex)}"]`;
     getColumnByCaptionCssSelector = (caption) => `td[role="columnheader"][aria-label="Column ${caption}"]`;
     getColumnByNameCssSelector = (name) => `td[role="columnheader"][data-fieldname="${name}"]`;
@@ -1437,11 +1550,11 @@ var init_types3 = __esm({
 });
 
 // src/pageObjects/elements/Table/elements/Cell.ts
-var import_selenium_webdriver20, Cell;
+var import_selenium_webdriver21, Cell;
 var init_Cell = __esm({
   "src/pageObjects/elements/Table/elements/Cell.ts"() {
     "use strict";
-    import_selenium_webdriver20 = require("selenium-webdriver");
+    import_selenium_webdriver21 = require("selenium-webdriver");
     init_AbstractElementWithParent();
     init_utils2();
     init_types3();
@@ -1458,12 +1571,12 @@ var init_Cell = __esm({
         this.elementCssSelector = getCssCellByIndexSelector(index);
       }
       async getBooleanValue(cellEl) {
-        const booleanEl = await cellEl.findElement(import_selenium_webdriver20.By.className("boolean-widget"));
+        const booleanEl = await cellEl.findElement(import_selenium_webdriver21.By.className("boolean-widget"));
         return await booleanEl.getAttribute("aria-checked") === "true" ? 1 : 0;
       }
       async getTagsValue(cellEl) {
         const tagsCssSelector = ".multiselect-container .multiselect-cell";
-        const tags = await cellEl.findElements(import_selenium_webdriver20.By.css(tagsCssSelector));
+        const tags = await cellEl.findElements(import_selenium_webdriver21.By.css(tagsCssSelector));
         const values = [];
         for (const tag of tags) {
           values.push(await tag.getAttribute("textContent"));
@@ -1493,11 +1606,11 @@ var init_Cell = __esm({
 });
 
 // src/pageObjects/elements/Table/elements/Row.ts
-var import_selenium_webdriver21, DX_SELECTION_CLASS, DX_ROW_EDIT_CLASS, DX_DATA_ROW_CLASS, Row;
+var import_selenium_webdriver22, DX_SELECTION_CLASS, DX_ROW_EDIT_CLASS, DX_DATA_ROW_CLASS, Row;
 var init_Row = __esm({
   "src/pageObjects/elements/Table/elements/Row.ts"() {
     "use strict";
-    import_selenium_webdriver21 = require("selenium-webdriver");
+    import_selenium_webdriver22 = require("selenium-webdriver");
     init_Cell();
     init_utils2();
     init_AbstractElementWithParent();
@@ -1510,10 +1623,12 @@ var init_Row = __esm({
     Row = class extends AbstractElementWithParent {
       index;
       getColumnBy;
-      constructor(parentCssSelector, index, driver, getColumnBy) {
+      fixedTableContentCssSelector;
+      constructor(parentCssSelector, fixedTableContentCssSelector, index, driver, getColumnBy) {
         super(parentCssSelector, getCssRowByIndexSelector(index), driver);
         this.index = index;
         this.getColumnBy = getColumnBy;
+        this.fixedTableContentCssSelector = fixedTableContentCssSelector;
       }
       _getCell({ index, name, title }) {
         return new Cell(
@@ -1554,7 +1669,7 @@ var init_Row = __esm({
         return this.index;
       }
       async getCells() {
-        const cells = await this.driver.findElements(import_selenium_webdriver21.By.css(`${this.getFullCssSelector()} td[role="gridcell"]`));
+        const cells = await this.driver.findElements(import_selenium_webdriver22.By.css(`${this.getFullCssSelector()} td[role="gridcell"]`));
         const result = [];
         cells.forEach((_, index) => {
           const newCell = this.getCellByIndex(index);
@@ -1563,12 +1678,11 @@ var init_Row = __esm({
         return result;
       }
       async clickInlineButton(buttonClass) {
-        const FIXED_TABLE_CSS_SELECTOR = ".dx-fixed-columns .dx-datagrid-content.dx-datagrid-content-fixed";
         const buttonCssSelector = `.${DX_DATA_ROW_CLASS}[aria-rowindex="${transformInputIndex(
           this.index
         )}"] .${buttonClass}`;
         const button = await fixElementStaleError(
-          import_selenium_webdriver21.By.css(`${this.parentCssSelector} ${FIXED_TABLE_CSS_SELECTOR} ${buttonCssSelector}`),
+          import_selenium_webdriver22.By.css(`${this.parentCssSelector} ${this.fixedTableContentCssSelector} ${buttonCssSelector}`),
           this.driver
         );
         return click(button, this.driver);
@@ -1599,11 +1713,11 @@ var init_Row = __esm({
 });
 
 // src/pageObjects/elements/Table/elements/Column.ts
-var import_selenium_webdriver22, Column;
+var import_selenium_webdriver23, Column;
 var init_Column = __esm({
   "src/pageObjects/elements/Table/elements/Column.ts"() {
     "use strict";
-    import_selenium_webdriver22 = require("selenium-webdriver");
+    import_selenium_webdriver23 = require("selenium-webdriver");
     init_utils2();
     init_AbstractElementWithParent();
     init_fixElementStaleError();
@@ -1631,7 +1745,7 @@ var init_Column = __esm({
         return super.getElement();
       }
       async getColumnHeaderIndexBy(cssSelector) {
-        const column = await fixElementStaleError(import_selenium_webdriver22.By.css(`${this.parentCssSelector} ${this.headerCssSelector} ${cssSelector}`), this.driver);
+        const column = await fixElementStaleError(import_selenium_webdriver23.By.css(`${this.parentCssSelector} ${this.headerCssSelector} ${cssSelector}`), this.driver);
         return transformOutputIndex(await column.getAttribute("aria-colindex"));
       }
       async getIndexByCaption() {
@@ -1662,6 +1776,46 @@ var init_Column = __esm({
   }
 });
 
+// src/pageObjects/elements/EditorButton.ts
+var EditorButton;
+var init_EditorButton = __esm({
+  "src/pageObjects/elements/EditorButton.ts"() {
+    "use strict";
+    init_locators();
+    init_createDataTestId();
+    init_AbstractElementWithParent();
+    init_waitElementIsClickable();
+    init_actions();
+    EditorButton = class extends AbstractElementWithParent {
+      name;
+      constructor(parentCssSelector, name, driver) {
+        super(parentCssSelector, byTestIdCssSelector(createEditorButtonTestId(name)), driver);
+        this.name = name;
+      }
+      buttonNotDisplayedError() {
+        return `Editor Button ${this.name} cannot be clicked. It is not displayed or it is disabled`;
+      }
+      async click() {
+        const button = await this.getElement();
+        await waitElementIsClickable({
+          element: button,
+          errorMessage: this.buttonNotDisplayedError(),
+          driver: this.driver
+        });
+        await click(button, this.driver);
+      }
+      async isDisplayed() {
+        try {
+          const button = await this.getElement();
+          return await button.isDisplayed();
+        } catch (error) {
+          return false;
+        }
+      }
+    };
+  }
+});
+
 // src/pageObjects/elements/AbstractEditor.ts
 var AbstractEditor;
 var init_AbstractEditor2 = __esm({
@@ -1669,6 +1823,7 @@ var init_AbstractEditor2 = __esm({
     "use strict";
     init_AbstractElementWithParent();
     init_Editors();
+    init_EditorButton();
     AbstractEditor = class extends AbstractElementWithParent {
       editor;
       constructor(parentCssSelector, elementCssSelector, driver) {
@@ -1733,6 +1888,16 @@ var init_AbstractEditor2 = __esm({
         await this.initEditor();
         return this.editor.isReadonly();
       }
+      /**
+       * Находит кнопку на поле по имени
+       * @example
+       * const form= new MyForm();
+       * //...
+       * await form.field('Name').button('editorButton).click()
+       */
+      button(name) {
+        return new EditorButton(this.getFullCssSelector(), name, this.driver);
+      }
     };
   }
 });
@@ -1754,11 +1919,11 @@ var init_FormField = __esm({
 });
 
 // src/pageObjects/elements/Table/Table.ts
-var import_selenium_webdriver23, Table;
+var import_selenium_webdriver24, Table;
 var init_Table = __esm({
   "src/pageObjects/elements/Table/Table.ts"() {
     "use strict";
-    import_selenium_webdriver23 = require("selenium-webdriver");
+    import_selenium_webdriver24 = require("selenium-webdriver");
     init_createDataTestId();
     init_AbstractElementWithParent();
     init_Row();
@@ -1767,10 +1932,14 @@ var init_Table = __esm({
     Table = class extends AbstractElementWithParent {
       formName;
       headerCssSelector;
-      constructor(parentCssSelector, headerCssSelector, formName, driver) {
+      fixedTableContentCssSelector;
+      tableContentCssSelector;
+      constructor(parentCssSelector, headerCssSelector, tableContentCssSelector, fixedTableContentCssSelector, formName, driver) {
         super(parentCssSelector, `#${createTableId(formName)}`, driver);
         this.formName = formName;
         this.headerCssSelector = headerCssSelector;
+        this.fixedTableContentCssSelector = fixedTableContentCssSelector;
+        this.tableContentCssSelector = tableContentCssSelector;
       }
       getColumnBy = (args) => {
         if (args.title) {
@@ -1779,7 +1948,7 @@ var init_Table = __esm({
         return this.getColumnByName(args.name);
       };
       getRowByIndex(index) {
-        return new Row(this.getFullCssSelector(), index, this.driver, this.getColumnBy);
+        return new Row(this.getFullCssSelector(), this.fixedTableContentCssSelector, index, this.driver, this.getColumnBy);
       }
       getColumnByIndex(index) {
         return new Column({
@@ -1808,17 +1977,24 @@ var init_Table = __esm({
         return this.getRowByIndex(index).select();
       }
       async getRows() {
-        const rows = await this.driver.findElements(import_selenium_webdriver23.By.css(`${this.getFullCssSelector()} .dx-row.dx-data-row`));
+        const rowsFullCssSelector = `${this.getFullCssSelector()} ${this.tableContentCssSelector} .dx-row.dx-data-row`;
+        const rows = await this.driver.findElements(import_selenium_webdriver24.By.css(rowsFullCssSelector));
         const result = [];
         rows.forEach((_, index) => {
-          const newRow = new Row(this.getFullCssSelector(), index, this.driver, this.getColumnBy);
+          const newRow = new Row(
+            this.getFullCssSelector(),
+            this.fixedTableContentCssSelector,
+            index,
+            this.driver,
+            this.getColumnBy
+          );
           result.push(newRow);
         });
         return result;
       }
       async getColumns() {
         const columns = await this.driver.findElements(
-          import_selenium_webdriver23.By.css(`${this.getFullCssSelector()} ${this.headerCssSelector} td[role="columnheader"]`)
+          import_selenium_webdriver24.By.css(`${this.getFullCssSelector()} ${this.headerCssSelector} td[role="columnheader"]`)
         );
         const result = [];
         columns.forEach((_, index) => {
@@ -1913,11 +2089,11 @@ var init_typesUtil = __esm({
 });
 
 // src/pageObjects/elements/TableToolbar/ToolbarMenu.ts
-var import_selenium_webdriver24, SPINDOWN_CLASS, buttonGroupItemSelector, getFullCssSelector, buttonByTextXpath, ToolbarMenu;
+var import_selenium_webdriver25, SPINDOWN_CLASS, CONTEXT_MENU_CLASS, buttonGroupItemSelector, getFullCssSelector, buttonByTextXpath, ToolbarMenu;
 var init_ToolbarMenu = __esm({
   "src/pageObjects/elements/TableToolbar/ToolbarMenu.ts"() {
     "use strict";
-    import_selenium_webdriver24 = require("selenium-webdriver");
+    import_selenium_webdriver25 = require("selenium-webdriver");
     init_typesUtil();
     init_AbstractElementWithParent();
     init_locators();
@@ -1925,9 +2101,10 @@ var init_ToolbarMenu = __esm({
     init_waitElementIsClickable();
     init_fixElementStaleError();
     SPINDOWN_CLASS = ".dx-icon-spindown";
+    CONTEXT_MENU_CLASS = "dx-context-menu";
     buttonGroupItemSelector = (formName, name) => byTestIdCssSelector(`ftb-${formName}-${name}`);
     getFullCssSelector = (formName, name) => `${buttonGroupItemSelector(formName, name)} ${SPINDOWN_CLASS}`;
-    buttonByTextXpath = (text) => `.//span[contains(@class, "dx-menu-item-text") and contains(text(), "${text}")]`;
+    buttonByTextXpath = (text) => `//div[contains(@class, '${CONTEXT_MENU_CLASS}')]//span[contains(@class, 'dx-menu-item-text') and text()='${text}']`;
     ToolbarMenu = class extends AbstractElementWithParent {
       _formName;
       constructor(parentCssSelector, formName, name, driver) {
@@ -1968,7 +2145,7 @@ var init_ToolbarMenu = __esm({
           throw new Error(`"title" must be a string or array of string`);
         let lTitle = isString(title) ? [title] : title;
         for (let t of lTitle) {
-          await this.goToButton(t, import_selenium_webdriver24.By.xpath(buttonByTextXpath(t)));
+          await this.goToButton(t, import_selenium_webdriver25.By.xpath(buttonByTextXpath(t)));
         }
       }
     };
@@ -2014,6 +2191,14 @@ var init_ToolbarItem = __esm({
         await this.init();
         return await this._button.isDisabled();
       }
+      async isDisplayed() {
+        try {
+          await this.init();
+          return this._button.isDisplayed();
+        } catch (error) {
+          return false;
+        }
+      }
       get menu() {
         return new ToolbarMenu(this.parentCssSelector, this._formName, this._itemName, this.driver);
       }
@@ -2042,6 +2227,110 @@ var init_FormToolbar = __esm({
   }
 });
 
+// src/pageObjects/elements/Filters/FilterOperation.ts
+var import_selenium_webdriver26, FILTER_OPERATIONS, BUTTON_OPERATION_WIDGET, OPERATIONS_WIDGET_POPUP, getWidgetInPopupSelector, FilterOperation;
+var init_FilterOperation = __esm({
+  "src/pageObjects/elements/Filters/FilterOperation.ts"() {
+    "use strict";
+    import_selenium_webdriver26 = require("selenium-webdriver");
+    init_fixElementStaleError();
+    init_AbstractElementWithParent();
+    init_locators();
+    init_actions();
+    init_wait();
+    init_waitElementIsClickable();
+    init_waitElementIsVisible();
+    FILTER_OPERATIONS = [
+      "=",
+      "<>",
+      "<",
+      ">",
+      "<=",
+      ">=",
+      "contains",
+      "between",
+      "isanyof",
+      "isnotanyof",
+      "isblank",
+      "isnotblank",
+      "startwith",
+      "bywords"
+    ];
+    BUTTON_OPERATION_WIDGET = "operation-widget";
+    OPERATIONS_WIDGET_POPUP = "operation-type-widget-popup";
+    getWidgetInPopupSelector = (operationName) => `.dx-list-item [data-operation="${operationName}"]`;
+    FilterOperation = class extends AbstractElementWithParent {
+      _testId;
+      constructor({ parentCssSelector, filterTestID, driver }) {
+        super(parentCssSelector, `${byTestIdCssSelector(`${BUTTON_OPERATION_WIDGET}-${filterTestID}`)}`, driver);
+        this._testId = filterTestID;
+      }
+      async initOperationWidget() {
+        const widgetButtonEl = await this.getElement();
+        await waitElementIsClickable({
+          element: widgetButtonEl,
+          errorMessage: "Widget operation is not clickable",
+          driver: this.driver
+        });
+        const clickableElement = await widgetButtonEl.findElement(import_selenium_webdriver26.By.className("dx-icon"));
+        await click(clickableElement, this.driver);
+        try {
+          const widgetPopupEl = await this.driver.findElement(import_selenium_webdriver26.By.css(`${byTestIdCssSelector(`${OPERATIONS_WIDGET_POPUP}-${this._testId}`)}`));
+          await waitElementIsVisible({
+            element: widgetPopupEl,
+            errorMessage: `Operation widget popup is not visible`,
+            driver: this.driver
+          });
+        } catch (_) {
+          throw `Operation widget popup is not visible`;
+        }
+      }
+      async setOperation(operationName) {
+        if (!FILTER_OPERATIONS.includes(operationName)) {
+          throw new Error(`Operation with name "${operationName}" is not correct.`);
+        }
+        await this.initOperationWidget();
+        const operationEl = await fixElementStaleError(import_selenium_webdriver26.By.css(`${byTestIdCssSelector(`${OPERATIONS_WIDGET_POPUP}-${this._testId}`)} ${getWidgetInPopupSelector(operationName)}`), this.driver);
+        await click(operationEl, this.driver);
+        await wait(
+          async () => {
+            const currOperationName = await this.getAttribute("data-operation");
+            if (operationName === "isblank")
+              return true;
+            return currOperationName === operationName;
+          },
+          this.driver,
+          "Operation is not changed"
+        );
+      }
+      async getOperation() {
+        const result = await this.getAttribute("data-operation");
+        if (!result)
+          throw new Error("Operation not found");
+        return result;
+      }
+      async setIsBlank(value) {
+        const currValue = await this.getIsBlank();
+        if (currValue !== value) {
+          await this.setOperation("isblank");
+          await wait(
+            async () => {
+              const currIsBlank = await this.getIsBlank();
+              return currIsBlank === value;
+            },
+            this.driver,
+            "Operation is not changed"
+          );
+        }
+      }
+      async getIsBlank() {
+        const result = await this.getAttribute("data-hasblank");
+        return result === "true";
+      }
+    };
+  }
+});
+
 // src/pageObjects/elements/Filters/FormFilterField.ts
 var FormFilterField;
 var init_FormFilterField = __esm({
@@ -2050,9 +2339,14 @@ var init_FormFilterField = __esm({
     init_locators();
     init_createDataTestId();
     init_AbstractEditor2();
+    init_FilterOperation();
     FormFilterField = class extends AbstractEditor {
+      formName;
+      name;
       constructor(parentCssSelector, formName, name, driver) {
         super(parentCssSelector, byTestIdCssSelector(createLayoutFilterTestId(formName, name)), driver);
+        this.formName = formName;
+        this.name = name;
       }
       /**
        * Возвращает значение в поле
@@ -2068,8 +2362,15 @@ var init_FormFilterField = __esm({
        * @example
        * await form.formFilter('NumberFld').setValue(123);
        * await form.formFilter('TextFld').setValue('TestValue');
+       * await form.formFilter('TextFld').setValue('TestValue', '=', true);
        */
-      async setValue(value) {
+      async setValue(value, operation, isBlank) {
+        if (typeof operation === "string") {
+          await this.setOperation(operation);
+        }
+        if (typeof isBlank === "boolean") {
+          await this.setIsBlank(isBlank);
+        }
         return super.setValue(value);
       }
       /**
@@ -2088,6 +2389,51 @@ var init_FormFilterField = __esm({
       async remove(itemText) {
         return super.remove(itemText);
       }
+      /**
+       * Инициализация операции фильтра
+       */
+      async initOperation() {
+        return new FilterOperation({
+          parentCssSelector: this.parentCssSelector,
+          filterTestID: createLayoutFilterTestId(this.formName, this.name)
+        });
+      }
+      /**
+       * Устанавливает операцию для фильтра
+       * @example
+       * await form.formFilter('TagBox').setOperation("=");
+       */
+      async setOperation(operationName) {
+        const filterOperation = await this.initOperation();
+        await filterOperation.setOperation(operationName);
+      }
+      /**
+       * Возвращает операцию фильтра
+       * @example
+       * expect(await form.formFilter('NumberFld').getOperation()).toBe("=");
+       */
+      async getOperation() {
+        const filterOperation = await this.initOperation();
+        return await filterOperation.getOperation();
+      }
+      /**
+       * Устанавливает операцию 'isblank' для фильтра
+       * @example
+       * await form.formFilter('TagBox').setIsBlank(true);
+       */
+      async setIsBlank(value) {
+        const filterOperation = await this.initOperation();
+        await filterOperation.setIsBlank(value);
+      }
+      /**
+       * Возвращает true|false, если операция 'isblank' установлена для фильтра
+       * @example
+       * expect(await form.formFilter('NumberFld').getIsBlank()).toBe(false);
+       */
+      async getIsBlank() {
+        const filterOperation = await this.initOperation();
+        return await filterOperation.getIsBlank();
+      }
     };
   }
 });
@@ -2100,9 +2446,14 @@ var init_PanelFilterField = __esm({
     init_locators();
     init_createDataTestId();
     init_AbstractEditor2();
+    init_FilterOperation();
     PanelFilterField = class extends AbstractEditor {
+      formName;
+      name;
       constructor(parentCssSelector, formName, name, driver) {
         super(parentCssSelector, byTestIdCssSelector(createDocFilterTestId(formName, name)), driver);
+        this.formName = formName;
+        this.name = name;
       }
       /**
        * Возвращает значение в поле
@@ -2118,8 +2469,15 @@ var init_PanelFilterField = __esm({
        * @example
        * await form.filterPanel.filterField('NumberFld').setValue(123);
        * await form.filterPanel.filterField('TextFld').setValue('TestValue');
+       * await form.filterPanel.filterField('TextFld').setValue('TestValue', '=', true);
        */
-      async setValue(value) {
+      async setValue(value, operation, isBlank) {
+        if (typeof operation === "string") {
+          await this.setOperation(operation);
+        }
+        if (typeof isBlank === "boolean") {
+          await this.setIsBlank(isBlank);
+        }
         return super.setValue(value);
       }
       /**
@@ -2138,16 +2496,61 @@ var init_PanelFilterField = __esm({
       async remove(itemText) {
         return super.remove(itemText);
       }
+      /**
+       * Инициализация операции фильтра
+       */
+      async initOperation() {
+        return new FilterOperation({
+          parentCssSelector: this.parentCssSelector,
+          filterTestID: createDocFilterTestId(this.formName, this.name)
+        });
+      }
+      /**
+       * Устанавливает операцию для фильтра
+       * @example
+       * await form.filterPanel.filterField('TagBox').setOperation("=");
+       */
+      async setOperation(operationName) {
+        const filterOperation = await this.initOperation();
+        await filterOperation.setOperation(operationName);
+      }
+      /**
+       * Возвращает операцию фильтра
+       * @example
+       * expect(await form.filterPanel.filterField('NumberFld').getOperation()).toBe("=");
+       */
+      async getOperation() {
+        const filterOperation = await this.initOperation();
+        return await filterOperation.getOperation();
+      }
+      /**
+       * Устанавливает операцию 'isblank' для фильтра
+       * @example
+       * await form.filterPanel.filterField('TagBox').setIsBlank(true);
+       */
+      async setIsBlank(value) {
+        const filterOperation = await this.initOperation();
+        await filterOperation.setIsBlank(value);
+      }
+      /**
+       * Возвращает true|false, если операция 'isblank' установлена для фильтра
+       * @example
+       * expect(await form.filterPanel.filterField('NumberFld').getIsBlank()).toBe(false);
+       */
+      async getIsBlank() {
+        const filterOperation = await this.initOperation();
+        return await filterOperation.getIsBlank();
+      }
     };
   }
 });
 
 // src/pageObjects/elements/Filters/FilterPanel.ts
-var import_selenium_webdriver25, drawerSelector, FILTER_PANEL_SELECTOR, CLOSE_SELECTOR, FilterPanel;
+var import_selenium_webdriver27, drawerSelector, FILTER_PANEL_SELECTOR, CLOSE_SELECTOR, FilterPanel;
 var init_FilterPanel = __esm({
   "src/pageObjects/elements/Filters/FilterPanel.ts"() {
     "use strict";
-    import_selenium_webdriver25 = require("selenium-webdriver");
+    import_selenium_webdriver27 = require("selenium-webdriver");
     init_AbstractElement();
     init_PanelFilterField();
     init_actions();
@@ -2162,7 +2565,7 @@ var init_FilterPanel = __esm({
       async filterPanelButtons() {
         const selector = `${this.elementCssSelector} ${FILTER_PANEL_SELECTOR} .filter-panel__buttons-panel .dx-button-text`;
         const el = await this.getElement();
-        return el.findElements(import_selenium_webdriver25.By.css(selector));
+        return el.findElements(import_selenium_webdriver27.By.css(selector));
       }
       constructor(formName, driver) {
         super(driver, drawerSelector(formName));
@@ -2195,7 +2598,7 @@ var init_FilterPanel = __esm({
         await this.driver.sleep(300);
       }
       async close() {
-        const btn = await this.driver.findElement(import_selenium_webdriver25.By.css(`${this.elementCssSelector} ${CLOSE_SELECTOR}`));
+        const btn = await this.driver.findElement(import_selenium_webdriver27.By.css(`${this.elementCssSelector} ${CLOSE_SELECTOR}`));
         await click(btn, this.driver);
       }
     };
@@ -2231,15 +2634,18 @@ var init_HeaderFilterField = __esm({
 });
 
 // src/pageObjects/elements/Filters/ColumnFilter.ts
-var import_selenium_webdriver26, APPLY_SELECTOR, CANCEL_SELECTOR, HEADER_FILTER_ICON, HEADER_FILTER_CONTAINER, HEADER_FILTER_BUTTONS, ColumnFilter;
+var import_selenium_webdriver28, APPLY_SELECTOR, CANCEL_SELECTOR, HEADER_FILTER_ICON, HEADER_FILTER_CONTAINER, HEADER_FILTER_BUTTONS, ColumnFilter;
 var init_ColumnFilter = __esm({
   "src/pageObjects/elements/Filters/ColumnFilter.ts"() {
     "use strict";
     init_actions();
-    import_selenium_webdriver26 = require("selenium-webdriver");
+    import_selenium_webdriver28 = require("selenium-webdriver");
     init_HeaderFilterField();
     init_waitElementIsVisible();
     init_AbstractElement();
+    init_FilterOperation();
+    init_createDataTestId();
+    init_wait();
     APPLY_SELECTOR = ".apply-button";
     CANCEL_SELECTOR = ".cancel-button";
     HEADER_FILTER_ICON = ".dx-column-indicators .dx-header-filter";
@@ -2258,11 +2664,11 @@ var init_ColumnFilter = __esm({
       }
       async getApplyButton() {
         const selector = `${HEADER_FILTER_CONTAINER} ${HEADER_FILTER_BUTTONS} ${APPLY_SELECTOR}`;
-        return this.driver.findElement(import_selenium_webdriver26.By.css(selector));
+        return this.driver.findElement(import_selenium_webdriver28.By.css(selector));
       }
       async getCancelButton() {
         const selector = `${HEADER_FILTER_CONTAINER} ${HEADER_FILTER_BUTTONS} ${CANCEL_SELECTOR}`;
-        return this.driver.findElement(import_selenium_webdriver26.By.css(selector));
+        return this.driver.findElement(import_selenium_webdriver28.By.css(selector));
       }
       async apply() {
         const btn = await this.getApplyButton();
@@ -2276,17 +2682,34 @@ var init_ColumnFilter = __esm({
         const columnEl = await this._column.getElement();
         const actions = this.driver.actions({ async: true });
         await actions.move({ origin: columnEl }).perform();
-        const elements = await columnEl.findElements(import_selenium_webdriver26.By.css(HEADER_FILTER_ICON));
-        const headerFilterIcon = elements[1];
-        await waitElementIsVisible({
-          element: headerFilterIcon,
-          driver: this.driver,
-          errorMessage: `HeaderFilter "${this._name}" is not visible`
-        });
+        const elements = await columnEl.findElements(import_selenium_webdriver28.By.css(HEADER_FILTER_ICON));
+        let headerFilterIcon = null;
+        await wait(
+          async () => {
+            let result = false;
+            for (let element of elements) {
+              if (await element.isDisplayed()) {
+                headerFilterIcon = element;
+                result = true;
+                break;
+              }
+            }
+            return result;
+          },
+          this.driver,
+          `HeaderFilter "${this._name}" is not visible`
+        );
         if (!headerFilterIcon)
           throw new Error(`HeaderFilter "${this._name}" is not visible`);
         await headerFilterIcon.click();
-        return new HeaderFilterField("", this._formName, this._name, this.driver);
+        const filter = new HeaderFilterField("", this._formName, this._name, this.driver);
+        const filterEl = await filter.getElement();
+        await waitElementIsVisible({
+          element: filterEl,
+          driver: this.driver,
+          errorMessage: `Header filter is not visible`
+        });
+        return filter;
       }
       /**
        * Возвращает значение в поле
@@ -2305,9 +2728,22 @@ var init_ColumnFilter = __esm({
        * @example
        * await form.columnFilter('NumberFld').setValue(123);
        * await form.columnFilter('TextFld').setValue('TestValue');
+       * await form.columnFilter('TextFld').setValue('TestValue', '=', true);
        */
-      async setValue(value) {
+      async setValue(value, operation, isBlank) {
         const filter = await this.initFilter();
+        const inputEl = await filter.getElement();
+        await inputEl.click();
+        const filterOperation = new FilterOperation({
+          parentCssSelector: HEADER_FILTER_CONTAINER,
+          filterTestID: createHeaderFilterTestId(this._formName, this._name)
+        });
+        if (typeof operation === "string") {
+          await filterOperation.setOperation(operation);
+        }
+        if (typeof isBlank === "boolean") {
+          await filterOperation.setIsBlank(isBlank);
+        }
         await filter.setValue(value);
         return this.apply();
       }
@@ -2331,6 +2767,56 @@ var init_ColumnFilter = __esm({
         await filter.remove(itemText);
         return this.apply();
       }
+      /**
+       * Инициализация операции фильтра
+       */
+      async initOperation() {
+        const filter = await this.initFilter();
+        const inputEl = await filter.getElement();
+        await inputEl.click();
+        return new FilterOperation({
+          parentCssSelector: HEADER_FILTER_CONTAINER,
+          filterTestID: createHeaderFilterTestId(this._formName, this._name)
+        });
+      }
+      /**
+       * Устанавливает операцию для фильтра
+       * @example
+       * await form.columnFilter('TagBox').setOperation("=");
+       */
+      async setOperation(operationName) {
+        const filterOperation = await this.initOperation();
+        await filterOperation.setOperation(operationName);
+        await this.apply();
+      }
+      /**
+       * Возвращает операцию фильтра
+       * @example
+       * expect(await form.columnFilter('NumberFld').getOperation()).toBe("=");
+       */
+      async getOperation() {
+        const filterOperation = await this.initOperation();
+        return await filterOperation.getOperation();
+      }
+      /**
+       * Устанавливает операцию 'isblank' для фильтра
+       * @example
+       * await form.columnFilter('TagBox').setIsBlank(true);
+       */
+      async setIsBlank(value) {
+        const filterOperation = await this.initOperation();
+        await filterOperation.setIsBlank(value);
+        await this.apply();
+      }
+      /**
+       * Возвращает true|false, если операция 'isblank' установлена для фильтра
+       * @example
+       * expect(await form.columnFilter('NumberFld').getIsBlank()).toBe(false);
+       */
+      async getIsBlank() {
+        const filterOperation = await this.initOperation();
+        return await filterOperation.getIsBlank();
+      }
     };
   }
 });
@@ -2340,7 +2826,7 @@ var ListForm_exports = {};
 __export(ListForm_exports, {
   default: () => ListForm
 });
-var DATAGRID_HEADER_CSS_SELECTOR, ListForm;
+var DATAGRID_HEADER_CSS_SELECTOR, DATAGRID_CONTENT_CSS_SELECTOR, FIXED_DATAGRID_CONTENT_CSS_SELECTOR, ListForm;
 var init_ListForm = __esm({
   "src/pageObjects/elements/Forms/ListForm.ts"() {
     "use strict";
@@ -2351,12 +2837,18 @@ var init_ListForm = __esm({
     init_FilterPanel();
     init_ColumnFilter();
     DATAGRID_HEADER_CSS_SELECTOR = ".dx-datagrid-headers .dx-datagrid-content:not(.dx-datagrid-content-fixed)";
+    DATAGRID_CONTENT_CSS_SELECTOR = ".dx-datagrid-content:not(.dx-datagrid-content-fixed)";
+    FIXED_DATAGRID_CONTENT_CSS_SELECTOR = ".dx-fixed-columns .dx-datagrid-content.dx-datagrid-content-fixed";
     ListForm = class extends Form {
       headerCssSelector;
+      fixedTableContentCssSelector;
+      tableContentCssSelector;
       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;
+        this.tableContentCssSelector = DATAGRID_CONTENT_CSS_SELECTOR;
       }
       /**
        * Находит таблицу
@@ -2366,7 +2858,14 @@ var init_ListForm = __esm({
        * expect(listForm.table());
        */
       table() {
-        return new Table(this.containerCssSelector, this.headerCssSelector, this.formName, this.driver);
+        return new Table(
+          this.containerCssSelector,
+          this.headerCssSelector,
+          this.tableContentCssSelector,
+          this.fixedTableContentCssSelector,
+          this.formName,
+          this.driver
+        );
       }
       /**
        * Находит таблицу
@@ -2413,17 +2912,21 @@ var TreeView_exports = {};
 __export(TreeView_exports, {
   default: () => TreeView
 });
-var TREELIST_HEADER_CSS_SELECTOR, TreeView;
+var TREELIST_HEADER_CSS_SELECTOR, TREELIST_CONTENT_CSS_SELECTOR, FIXED_TREELIST_CONTENT_CSS_SELECTOR, TreeView;
 var init_TreeView = __esm({
   "src/pageObjects/elements/Forms/TreeView.ts"() {
     "use strict";
     init_ListForm();
     TREELIST_HEADER_CSS_SELECTOR = ".dx-treelist-headers .dx-treelist-content:not(.dx-datagrid-content-fixed)";
+    TREELIST_CONTENT_CSS_SELECTOR = ".dx-treelist-content:not(.dx-datagrid-content-fixed)";
+    FIXED_TREELIST_CONTENT_CSS_SELECTOR = ".dx-fixed-columns .dx-treelist-content.dx-treelist-content-fixed";
     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;
+        this.tableContentCssSelector = TREELIST_CONTENT_CSS_SELECTOR;
       }
     };
   }
@@ -2463,12 +2966,12 @@ var init_createSubFormInstance = __esm({
 });
 
 // src/pageObjects/elements/Forms/Form.ts
-var import_selenium_webdriver27, formTestId, Form;
+var import_selenium_webdriver29, formTestId, Form;
 var init_Form = __esm({
   "src/pageObjects/elements/Forms/Form.ts"() {
     "use strict";
     init_locators();
-    import_selenium_webdriver27 = require("selenium-webdriver");
+    import_selenium_webdriver29 = require("selenium-webdriver");
     init_AbstractForm();
     init_waitElementIsVisible();
     init_createSubFormInstance();
@@ -2493,10 +2996,10 @@ var init_Form = __esm({
        */
       async getTitleText() {
         if (await this.isModal()) {
-          const titleEl2 = await this.driver.findElement(import_selenium_webdriver27.By.css(`${this.popupContainerCssSelector} .popup-title`));
+          const titleEl2 = await this.driver.findElement(import_selenium_webdriver29.By.css(`${this.popupContainerCssSelector} .popup-title`));
           return titleEl2.getText();
         }
-        let titleEl = await this.driver.findElement(import_selenium_webdriver27.By.className("main-toolbar-form-title"));
+        let titleEl = await this.driver.findElement(import_selenium_webdriver29.By.className("main-toolbar-form-title"));
         return titleEl.getText();
       }
       setSubFormMode() {
@@ -2514,7 +3017,7 @@ var init_Form = __esm({
        */
       async subForm(name) {
         const cssSelector = subformCssSelector(this.containerCssSelector, subFormTestId(name));
-        const byCssSelector = import_selenium_webdriver27.By.css(cssSelector);
+        const byCssSelector = import_selenium_webdriver29.By.css(cssSelector);
         const subFormEl = await this.driver.findElement(byCssSelector);
         await waitElementIsVisible({
           element: subFormEl,
@@ -2544,21 +3047,27 @@ var FormEdit_exports = {};
 __export(FormEdit_exports, {
   default: () => FormEdit
 });
-var import_selenium_webdriver28, FormEdit;
+var import_selenium_webdriver30, FormEdit;
 var init_FormEdit = __esm({
   "src/pageObjects/elements/Forms/FormEdit.ts"() {
     "use strict";
     init_Form();
-    import_selenium_webdriver28 = require("selenium-webdriver");
+    import_selenium_webdriver30 = require("selenium-webdriver");
     init_FormField();
     init_actions();
     init_wait();
     FormEdit = class extends Form {
-      saveButtonBy = import_selenium_webdriver28.By.id("button-save");
-      closeButtonBy = import_selenium_webdriver28.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;
       }
       /**
        * Находит поле формы редактирования по имени
@@ -2578,7 +3087,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";
       }
@@ -2590,7 +3100,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);
       }
@@ -2602,7 +3113,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);
       }
     };
@@ -2738,7 +3250,7 @@ var SubsystemsPanelHeader = class extends AbstractElementWithParent {
 };
 
 // src/pageObjects/elements/SubsystemsPanel/SubsystemsPanel.ts
-var import_selenium_webdriver15 = require("selenium-webdriver");
+var import_selenium_webdriver16 = require("selenium-webdriver");
 init_wait();
 init_locators();
 init_Editors();
@@ -2820,7 +3332,7 @@ var SubsystemsPanel = class extends AbstractElement {
    */
   async searchClear() {
     const clearBtnSelector = `#aside ${byTestIdCssSelector(SEARCH_INPUT_SELECTOR)} .${DX_CLEAR_BUTTON_AREA}`;
-    const clearBtn = await this.driver.findElement(import_selenium_webdriver15.By.css(clearBtnSelector));
+    const clearBtn = await this.driver.findElement(import_selenium_webdriver16.By.css(clearBtnSelector));
     if (await clearBtn.isDisplayed()) {
       await click(clearBtn, this.driver);
     }
@@ -2834,7 +3346,7 @@ var SubsystemsPanel = class extends AbstractElement {
    */
   item(name) {
     const elementCSS = createSubSystemTestId(name);
-    return new SubsystemItem({ driver: this.driver, bySelector: import_selenium_webdriver15.By.css(`${byTestIdCssSelector(elementCSS, "span")}`) });
+    return new SubsystemItem({ driver: this.driver, bySelector: import_selenium_webdriver16.By.css(`${byTestIdCssSelector(elementCSS, "span")}`) });
   }
   /**
    * Возвращает сабсистему по заголовку
@@ -2844,7 +3356,7 @@ var SubsystemsPanel = class extends AbstractElement {
    * const subsystem = subsystemsPanel.itemByTitle('SubSystemTitle');
    */
   itemByTitle(title) {
-    return new SubsystemItem({ driver: this.driver, bySelector: import_selenium_webdriver15.By.css(byTitleCssSelector(title)) });
+    return new SubsystemItem({ driver: this.driver, bySelector: import_selenium_webdriver16.By.css(byTitleCssSelector(title)) });
   }
   /**
    * Возвращается на уровень выше по сабсистемам
@@ -2854,7 +3366,7 @@ var SubsystemsPanel = class extends AbstractElement {
    * wait subsystemsPanel.back();
    */
   async back() {
-    const backButton = this.driver.findElement(import_selenium_webdriver15.By.css(`#aside .${BACK_BUTTON_SELECTOR}`));
+    const backButton = this.driver.findElement(import_selenium_webdriver16.By.css(`#aside .${BACK_BUTTON_SELECTOR}`));
     await waitElementIsVisible(
       {
         element: backButton,
@@ -2871,13 +3383,12 @@ init_ListForm();
 init_TreeView();
 
 // src/pageObjects/elements/Forms/ReportForm.ts
-var import_selenium_webdriver29 = 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_webdriver29.By.id("button-apply");
+    this.popupContainerCssSelector = `.popup.form-report-${this.formName}`;
+    this.saveButtonId = "#button-apply";
   }
   /**
    * Знаходить поле/фільтр у формі репорту за ім'ям
@@ -2900,7 +3411,7 @@ init_FilterPanel();
 
 // src/pageObjects/elements/Dialog.ts
 init_AbstractElement();
-var import_selenium_webdriver30 = require("selenium-webdriver");
+var import_selenium_webdriver31 = require("selenium-webdriver");
 init_AbstractButton();
 var DIALOG_CLASS = ".d5-dialog";
 var DIALOG_TITLE_CLASS = ".dialog__title";
@@ -2915,7 +3426,7 @@ var DialogButton = class extends AbstractButton {
   }
   async getElement() {
     const panel = await super.getElement();
-    return panel.findElement(import_selenium_webdriver30.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`;
@@ -2935,11 +3446,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_webdriver30.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_webdriver30.By.css(this.textSelector));
+    const el = await this.driver.findElement(import_selenium_webdriver31.By.css(this.textSelector));
     return await el.getText();
   }
   button(text) {