@umbraco/playwright-testhelpers 17.0.18 → 17.1.0-beta

package/dist/lib/helpers/UiBaseLocators.js

@@ -3,586 +3,563 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UiBaseLocators = void 0;
 const test_1 = require("@playwright/test");
 const ConstantHelper_1 = require("./ConstantHelper");
-class UiBaseLocators {
-    page;
+const BasePage_1 = require("./BasePage");
+class UiBaseLocators extends BasePage_1.BasePage {
+    // Core Action Buttons
     saveBtn;
-    chooseBtn;
     submitBtn;
-    createFolderBtn;
-    breadcrumbBtn;
-    confirmToDeleteBtn;
+    confirmBtn;
+    chooseBtn;
+    chooseModalBtn;
+    createBtn;
+    addBtn;
+    updateBtn;
+    changeBtn;
+    deleteBtn;
     deleteExactBtn;
-    confirmCreateFolderBtn;
+    removeExactBtn;
     insertBtn;
-    modalCaretBtn;
-    queryBuilderBtn;
-    queryBuilderOrderedBy;
-    queryBuilderCreateDate;
+    renameBtn;
+    reloadBtn;
+    reloadChildrenBtn;
+    restoreBtn;
+    disableBtn;
+    enableBtn;
+    actionBtn;
+    nextBtn;
+    // Confirmation Buttons
+    confirmToDeleteBtn;
+    confirmCreateFolderBtn;
+    confirmToRemoveBtn;
+    confirmToSubmitBtn;
+    confirmDisableBtn;
+    confirmEnableBtn;
+    confirmRenameBtn;
+    confirmTrashBtn;
+    // Folder Management
+    createFolderBtn;
     folderNameTxt;
-    textAreaInputArea;
-    wherePropertyAliasBtn;
-    whereOperatorBtn;
-    whereConstrainValueTxt;
-    orderByPropertyAliasBtn;
-    ascendingBtn;
-    queryBuilderShowCode;
-    createThreeDotsBtn;
+    folderBtn;
     newFolderThreeDotsBtn;
-    renameThreeDotsBtn;
-    newNameTxt;
-    renameModalBtn;
-    createBtn;
-    successState;
-    chooseModalBtn;
-    addBtn;
     renameFolderThreeDotsBtn;
     renameFolderBtn;
     updateFolderBtn;
-    filterChooseBtn;
-    updateBtn;
-    changeBtn;
+    deleteFolderThreeDotsBtn;
+    // Navigation & Menu
+    breadcrumbBtn;
+    leftArrowBtn;
+    caretBtn;
+    modalCaretBtn;
+    backOfficeHeader;
+    backOfficeMain;
+    sectionLinks;
+    sectionSidebar;
+    menuItem;
+    actionsMenuContainer;
+    treeItem;
+    // Three Dots Menu Buttons
+    createThreeDotsBtn;
+    renameThreeDotsBtn;
+    deleteThreeDotsBtn;
+    // Modal & Container
+    sidebarModal;
+    openedModal;
+    container;
+    containerChooseBtn;
+    containerSaveAndPublishBtn;
+    createModalBtn;
+    // Document Type & Property Editor
+    documentTypeNode;
     propertyNameTxt;
     selectPropertyEditorBtn;
+    editorSettingsBtn;
+    enterPropertyEditorDescriptionTxt;
+    property;
+    addPropertyBtn;
+    labelAboveBtn;
+    // Group & Tab Management
     addGroupBtn;
-    iAmDoneReorderingBtn;
-    reorderBtn;
-    compositionsBtn;
+    groupLabel;
+    typeGroups;
     addTabBtn;
-    descriptionBtn;
-    enterDescriptionTxt;
+    unnamedTabTxt;
+    structureTabBtn;
+    // Validation & Mandatory
     mandatoryToggle;
     validation;
     regexTxt;
     regexMessageTxt;
-    structureTabBtn;
+    validationMessage;
+    // Composition & Structure
+    compositionsBtn;
     allowAtRootBtn;
-    addPropertyBtn;
-    typeToFilterSearchTxt;
-    editorSettingsBtn;
-    labelAboveBtn;
-    unnamedTabTxt;
-    deleteThreeDotsBtn;
-    removeExactBtn;
-    confirmBtn;
-    disableBtn;
-    confirmDisableBtn;
-    enableBtn;
-    confirmEnableBtn;
-    iconBtn;
-    aliasLockBtn;
-    aliasNameTxt;
-    deleteFolderThreeDotsBtn;
-    createLink;
+    allowedChildNodesModal;
+    addCollectionBtn;
+    // Reorder
+    iAmDoneReorderingBtn;
+    reorderBtn;
+    // Query Builder
+    queryBuilderBtn;
+    queryBuilderOrderedBy;
+    queryBuilderCreateDate;
+    queryBuilderShowCode;
+    wherePropertyAliasBtn;
+    whereOperatorBtn;
+    whereConstrainValueTxt;
+    orderByPropertyAliasBtn;
+    ascendingBtn;
+    chooseRootContentBtn;
+    returnedItemsCount;
+    queryResults;
+    // Insert & Template
     insertValueBtn;
     insertPartialViewBtn;
     insertDictionaryItemBtn;
     chooseFieldDropDown;
     systemFieldsOption;
     chooseFieldValueDropDown;
-    renameBtn;
-    returnedItemsCount;
-    chooseRootContentBtn;
-    queryResults;
-    reloadBtn;
-    confirmToRemoveBtn;
-    confirmToSubmitBtn;
-    typeGroups;
-    allowedChildNodesModal;
-    addCollectionBtn;
-    errorNotification;
-    confirmRenameBtn;
-    successNotification;
-    leftArrowBtn;
-    clickToUploadBtn;
-    backOfficeHeader;
+    breadcrumbsTemplateModal;
+    // Rename
+    newNameTxt;
+    renameModalBtn;
+    // State & Notification
+    successState;
+    successStateIcon;
     failedStateButton;
-    sidebarModal;
+    successNotification;
+    errorNotification;
+    // Search & Filter
+    typeToFilterSearchTxt;
+    filterChooseBtn;
+    // Text Input
+    textAreaInputArea;
     enterAName;
-    mediaCardItems;
-    enterPropertyEditorDescriptionTxt;
-    breadcrumbsTemplateModal;
-    containerChooseBtn;
-    documentTypeNode;
-    groupLabel;
-    containerSaveAndPublishBtn;
-    confirmTrashBtn;
+    descriptionBtn;
+    enterDescriptionTxt;
+    aliasLockBtn;
+    aliasNameTxt;
+    // Icon
+    iconBtn;
+    // Create Link
+    createLink;
+    // Recycle Bin
     recycleBinBtn;
-    recycleBinMenuItemCaretBtn;
     recycleBinMenuItem;
+    recycleBinMenuItemCaretBtn;
+    // View Options
     gridBtn;
     listBtn;
     viewBundleBtn;
-    chooseDocumentInputBtn;
-    chooseMediaInputBtn;
-    container;
-    createDocumentBlueprintBtn;
-    actionBtn;
+    // Media
+    mediaCardItems;
     mediaPickerModalSubmitBtn;
-    deleteBtn;
-    createModalBtn;
     mediaCaptionAltTextModalSubmitBtn;
+    clickToUploadBtn;
+    inputDropzone;
+    imageCropperField;
+    inputUploadField;
+    chooseMediaInputBtn;
+    // Embedded Media
     embeddedMediaModal;
     embeddedURLTxt;
     embeddedRetrieveBtn;
     embeddedMediaModalConfirmBtn;
     embeddedPreview;
-    sectionSidebar;
-    actionsMenuContainer;
-    menuItem;
-    property;
+    // Document & Content
+    chooseDocumentInputBtn;
+    createDocumentBlueprintBtn;
+    createDocumentBlueprintModal;
+    createNewDocumentBlueprintBtn;
+    // User
     currentUserAvatarBtn;
     newPasswordTxt;
     confirmPasswordTxt;
     currentPasswordTxt;
-    createOptionActionListModal;
+    // Collection & Table
+    collectionTreeItemTableRow;
     createActionButtonCollection;
     createActionBtn;
-    collectionTreeItemTableRow;
-    folderBtn;
-    reloadChildrenBtn;
+    createOptionActionListModal;
+    // Reference & Entity
     confirmActionModalEntityReferences;
     referenceHeadline;
     entityItemRef;
-    validationMessage;
-    successStateIcon;
+    entityItem;
+    // Workspace & Action
     workspaceAction;
+    workspaceActionMenuBtn;
     entityAction;
     openEntityAction;
-    caretBtn;
-    workspaceActionMenuBtn;
-    monacoEditor;
-    createNewDocumentBlueprintBtn;
-    openedModal;
-    uiLoader;
-    createDocumentBlueprintModal;
-    inputDropzone;
-    imageCropperField;
-    inputUploadField;
-    entityItem;
-    sectionLinks;
-    restoreBtn;
-    backOfficeMain;
+    // Pagination
     firstPaginationBtn;
     nextPaginationBtn;
-    nextBtn;
+    // Editor
+    monacoEditor;
+    // Loader
+    uiLoader;
     constructor(page) {
-        this.page = page;
+        super(page);
+        // Core Action Buttons
         this.saveBtn = page.getByLabel('Save', { exact: true });
         this.submitBtn = page.getByLabel('Submit');
+        this.confirmBtn = page.getByLabel('Confirm');
+        this.chooseBtn = page.getByLabel('Choose', { exact: true });
+        this.chooseModalBtn = page.locator('uui-modal-sidebar').locator('[look="primary"]').getByLabel('Choose');
+        this.createBtn = page.getByRole('button', { name: /^Create(…)?$/ });
+        this.addBtn = page.getByRole('button', { name: 'Add', exact: true });
+        this.updateBtn = page.getByLabel('Update');
+        this.changeBtn = page.getByLabel('Change');
+        this.deleteBtn = page.getByRole('button', { name: /^Delete(…)?$/ });
         this.deleteExactBtn = page.getByRole('button', { name: 'Delete', exact: true });
+        this.removeExactBtn = page.getByLabel('Remove', { exact: true });
+        this.insertBtn = page.locator('uui-box uui-button').filter({ hasText: 'Insert' });
+        this.renameBtn = page.getByRole('button', { name: /^Rename(…)?$/ });
+        this.reloadBtn = page.getByRole('button', { name: 'Reload', exact: true });
+        this.reloadChildrenBtn = page.getByRole('button', { name: 'Reload children' });
+        this.restoreBtn = page.getByLabel('Restore', { exact: true });
+        this.disableBtn = page.getByLabel('Disable', { exact: true });
+        this.enableBtn = page.getByLabel('Enable');
+        this.actionBtn = page.getByTestId('workspace:action-menu-button');
+        this.nextBtn = page.getByLabel('Next');
+        // Confirmation Buttons
         this.confirmToDeleteBtn = page.locator('#confirm').getByLabel('Delete');
         this.confirmCreateFolderBtn = page.locator('#confirm').getByLabel('Create Folder');
-        this.breadcrumbBtn = page.getByLabel('Breadcrumb');
+        this.confirmToRemoveBtn = page.locator('#confirm').getByLabel('Remove');
+        this.confirmToSubmitBtn = page.locator('#confirm').getByLabel('Submit');
+        this.confirmDisableBtn = page.locator('#confirm').getByLabel('Disable');
+        this.confirmEnableBtn = page.locator('#confirm').getByLabel('Enable');
+        this.confirmRenameBtn = page.locator('#confirm').getByLabel('Rename');
+        this.confirmTrashBtn = page.locator('#confirm').getByLabel('Trash');
+        // Folder Management
         this.createFolderBtn = page.getByLabel('Create folder');
-        this.insertBtn = page.locator('uui-box uui-button').filter({ hasText: 'Insert' });
-        this.sidebarModal = page.locator('uui-modal-sidebar');
-        this.modalCaretBtn = this.sidebarModal.locator('#caret-button');
-        this.enterAName = page.getByLabel('Enter a name...', { exact: true });
-        this.queryBuilderBtn = page.locator('#query-builder-button');
-        this.queryBuilderOrderedBy = page.locator('#property-alias-dropdown').getByLabel('Property alias');
-        this.queryBuilderCreateDate = page.locator('#property-alias-dropdown').getByText('CreateDate').locator("..");
         this.folderNameTxt = page.getByLabel('Enter a folder name');
-        this.textAreaInputArea = page.locator('textarea.ime-text-area');
-        this.wherePropertyAliasBtn = page.locator('#property-alias-dropdown');
-        this.whereOperatorBtn = page.locator('#operator-dropdown');
-        this.whereConstrainValueTxt = page.getByLabel('constrain value');
-        this.orderByPropertyAliasBtn = page.locator('#sort-dropdown');
-        this.ascendingBtn = page.locator('[key="template_ascending"]');
-        this.queryBuilderShowCode = page.locator('umb-code-block');
-        this.createThreeDotsBtn = page.getByText('Create…', { exact: true });
-        this.chooseBtn = page.getByLabel('Choose', { exact: true });
-        this.containerChooseBtn = page.locator('#container').getByLabel('Choose');
-        this.containerSaveAndPublishBtn = page.locator('#container').getByLabel('Save and Publish');
+        this.folderBtn = page.locator('umb-entity-create-option-action-list-modal').locator('umb-ref-item', { hasText: 'Folder' });
         this.newFolderThreeDotsBtn = page.getByLabel('New Folder…');
-        this.renameThreeDotsBtn = page.getByLabel('Rename…', { exact: true });
-        this.newNameTxt = page.getByRole('textbox', { name: 'Enter new name...' });
-        this.renameModalBtn = page.locator('umb-rename-modal').getByLabel('Rename');
-        this.createBtn = page.getByRole('button', { name: /^Create(…)?$/ });
-        this.actionsMenuContainer = page.locator('uui-scroll-container');
-        this.successState = page.locator('[state="success"]');
-        this.chooseModalBtn = this.sidebarModal.locator('[look="primary"]').getByLabel('Choose');
-        this.addBtn = page.getByRole('button', { name: 'Add', exact: true });
         this.renameFolderThreeDotsBtn = page.getByRole('button', { name: 'Rename folder…' });
         this.renameFolderBtn = page.getByLabel('Rename folder');
-        this.confirmRenameBtn = page.locator('#confirm').getByLabel('Rename');
         this.updateFolderBtn = page.getByLabel('Update folder');
-        this.filterChooseBtn = page.locator('button').filter({ hasText: 'Choose' });
-        this.updateBtn = page.getByLabel('Update');
-        this.changeBtn = page.getByLabel('Change');
+        this.deleteFolderThreeDotsBtn = page.locator('#action-modal').getByLabel('Delete Folder...');
+        // Navigation & Menu
+        this.breadcrumbBtn = page.getByLabel('Breadcrumb');
+        this.leftArrowBtn = page.locator('[name="icon-arrow-left"] svg');
+        this.caretBtn = page.locator('#caret-button');
+        this.modalCaretBtn = page.locator('uui-modal-sidebar').locator('#caret-button');
+        this.backOfficeHeader = page.locator('umb-backoffice-header');
+        this.backOfficeMain = page.locator('umb-backoffice-main');
+        this.sectionLinks = page.getByTestId('section-links');
+        this.sectionSidebar = page.locator('umb-section-sidebar');
+        this.menuItem = page.locator('uui-menu-item');
+        this.actionsMenuContainer = page.locator('uui-scroll-container');
+        this.treeItem = page.locator('umb-tree-item');
+        // Three Dots Menu Buttons
+        this.createThreeDotsBtn = page.getByText('Create…', { exact: true });
+        this.renameThreeDotsBtn = page.getByLabel('Rename…', { exact: true });
+        this.deleteThreeDotsBtn = page.getByLabel('Delete…');
+        // Modal & Container
+        this.sidebarModal = page.locator('uui-modal-sidebar');
+        this.openedModal = page.locator('uui-modal-container[backdrop]');
+        this.container = page.locator('#container');
+        this.containerChooseBtn = page.locator('#container').getByLabel('Choose');
+        this.containerSaveAndPublishBtn = page.locator('#container').getByLabel('Save and Publish');
+        this.createModalBtn = page.locator('uui-modal-sidebar').getByLabel('Create', { exact: true });
+        // Document Type & Property Editor
+        this.documentTypeNode = page.locator('uui-ref-node-document-type');
         this.propertyNameTxt = page.getByTestId('input:entity-name').locator('#input').first();
         this.selectPropertyEditorBtn = page.getByLabel('Select Property Editor');
+        this.editorSettingsBtn = page.getByLabel('Editor settings');
+        this.enterPropertyEditorDescriptionTxt = page.locator('uui-modal-sidebar').getByTestId('input:entity-description').locator('#textarea');
+        this.property = page.locator('umb-property');
+        this.addPropertyBtn = page.getByLabel('Add property', { exact: true });
+        this.labelAboveBtn = page.locator('.appearance-option').filter({ hasText: 'Label above' });
+        // Group & Tab Management
         this.addGroupBtn = page.getByLabel('Add group', { exact: true });
-        this.iAmDoneReorderingBtn = page.getByLabel('I am done reordering');
-        this.reorderBtn = page.getByLabel('Reorder');
-        this.compositionsBtn = page.getByLabel('Compositions');
+        this.groupLabel = page.getByLabel('Group', { exact: true });
+        this.typeGroups = page.locator('umb-content-type-design-editor-group');
         this.addTabBtn = page.getByLabel('Add tab');
-        this.descriptionBtn = page.getByLabel('Description');
-        this.enterDescriptionTxt = page.getByLabel('Enter a description...');
+        this.unnamedTabTxt = page.getByTestId('tab:').getByTestId('tab:name-input').locator('#input');
+        this.structureTabBtn = page.locator('uui-tab').filter({ hasText: 'Structure' }).locator('svg');
+        // Validation & Mandatory
         this.mandatoryToggle = page.locator('#mandatory #toggle');
         this.validation = page.locator('#native');
         this.regexTxt = page.locator('input[name="pattern"]');
         this.regexMessageTxt = page.locator('textarea[name="pattern-message"]');
-        this.structureTabBtn = page.locator('uui-tab').filter({ hasText: 'Structure' }).locator('svg');
+        this.validationMessage = page.locator('umb-form-validation-message').locator('#messages');
+        // Composition & Structure
+        this.compositionsBtn = page.getByLabel('Compositions');
         this.allowAtRootBtn = page.locator('label').filter({ hasText: 'Allow at root' });
-        this.addPropertyBtn = page.getByLabel('Add property', { exact: true });
-        this.typeToFilterSearchTxt = page.locator('[type="search"] #input');
-        this.editorSettingsBtn = page.getByLabel('Editor settings');
-        this.labelAboveBtn = page.locator('.appearance-option').filter({ hasText: 'Label above' });
-        this.firstPaginationBtn = this.page.locator('umb-collection-pagination').getByLabel('First');
-        this.nextPaginationBtn = this.page.locator('umb-collection-pagination').getByLabel('Next');
-        this.nextBtn = this.page.getByLabel('Next');
-        // tab: means that the tab is unnamed
-        this.unnamedTabTxt = page.getByTestId('tab:').getByTestId('tab:name-input').locator('#input');
-        this.deleteThreeDotsBtn = page.getByLabel('Delete…');
-        this.removeExactBtn = page.getByLabel('Remove', { exact: true });
-        this.confirmBtn = page.getByLabel('Confirm');
-        this.disableBtn = page.getByLabel('Disable', { exact: true });
-        this.confirmDisableBtn = page.locator('#confirm').getByLabel('Disable');
-        this.confirmToSubmitBtn = page.locator('#confirm').getByLabel('Submit');
-        this.enableBtn = page.getByLabel('Enable');
-        this.confirmEnableBtn = page.locator('#confirm').getByLabel('Enable');
-        this.iconBtn = page.getByLabel('icon');
-        this.aliasLockBtn = page.locator('#name').getByLabel('Unlock input');
-        this.aliasNameTxt = page.locator('#name').getByLabel('alias');
-        this.deleteFolderThreeDotsBtn = page.locator('#action-modal').getByLabel('Delete Folder...');
-        this.createLink = page.getByRole('link', { name: 'Create', exact: true });
+        this.allowedChildNodesModal = page.locator('umb-tree-picker-modal');
+        this.addCollectionBtn = page.locator('umb-input-content-type-collection-configuration #create-button');
+        // Reorder
+        this.iAmDoneReorderingBtn = page.getByLabel('I am done reordering');
+        this.reorderBtn = page.getByLabel('Reorder');
+        // Query Builder
+        this.queryBuilderBtn = page.locator('#query-builder-button');
+        this.queryBuilderOrderedBy = page.locator('#property-alias-dropdown').getByLabel('Property alias');
+        this.queryBuilderCreateDate = page.locator('#property-alias-dropdown').getByText('CreateDate').locator("..");
+        this.queryBuilderShowCode = page.locator('umb-code-block');
+        this.wherePropertyAliasBtn = page.locator('#property-alias-dropdown');
+        this.whereOperatorBtn = page.locator('#operator-dropdown');
+        this.whereConstrainValueTxt = page.getByLabel('constrain value');
+        this.orderByPropertyAliasBtn = page.locator('#sort-dropdown');
+        this.ascendingBtn = page.locator('[key="template_ascending"]');
+        this.chooseRootContentBtn = page.getByLabel('Choose root document');
+        this.returnedItemsCount = page.locator('#results-count');
+        this.queryResults = page.locator('.query-results');
+        // Insert & Template
         this.insertValueBtn = page.locator('uui-button').filter({ has: page.locator('[key="template_insertPageField"]') });
         this.insertPartialViewBtn = page.locator('uui-button').filter({ has: page.locator('[key="template_insertPartialView"]') });
         this.insertDictionaryItemBtn = page.locator('uui-button').filter({ has: page.locator('[key="template_insertDictionaryItem"]') });
         this.chooseFieldDropDown = page.locator('#preview #expand-symbol-wrapper');
         this.systemFieldsOption = page.getByText('System fields');
         this.chooseFieldValueDropDown = page.locator('#value #expand-symbol-wrapper');
-        this.renameBtn = page.getByRole('button', { name: /^Rename(…)?$/ });
-        this.returnedItemsCount = page.locator('#results-count');
-        this.chooseRootContentBtn = page.getByLabel('Choose root document');
-        this.queryResults = page.locator('.query-results');
-        this.reloadBtn = page.getByRole('button', { name: 'Reload', exact: true });
-        this.confirmToRemoveBtn = page.locator('#confirm').getByLabel('Remove');
-        this.typeGroups = page.locator('umb-content-type-design-editor-group');
-        this.allowedChildNodesModal = page.locator('umb-tree-picker-modal');
-        this.addCollectionBtn = page.locator('umb-input-content-type-collection-configuration #create-button');
-        this.errorNotification = page.locator('uui-toast-notification[open][color="danger"]');
-        this.successNotification = page.locator('uui-toast-notification[open][color="positive"]');
-        this.leftArrowBtn = page.locator('[name="icon-arrow-left"] svg');
-        this.clickToUploadBtn = page.locator('#splitViews').getByRole('button', { name: 'Click to upload' });
-        this.backOfficeHeader = page.locator('umb-backoffice-header');
+        this.breadcrumbsTemplateModal = page.locator('uui-modal-sidebar').locator('umb-template-workspace-editor uui-breadcrumbs');
+        // Rename
+        this.newNameTxt = page.getByRole('textbox', { name: 'Enter new name...' });
+        this.renameModalBtn = page.locator('umb-rename-modal').getByLabel('Rename');
+        // State & Notification
+        this.successState = page.locator('[state="success"]');
+        this.successStateIcon = page.locator('[state="success"]').locator('#state');
         this.failedStateButton = page.locator('uui-button[state="failed"]');
-        this.mediaCardItems = page.locator('uui-card-media');
-        this.enterPropertyEditorDescriptionTxt = this.sidebarModal.getByTestId('input:entity-description').locator('#textarea');
-        this.breadcrumbsTemplateModal = this.sidebarModal.locator('umb-template-workspace-editor uui-breadcrumbs');
-        this.documentTypeNode = page.locator('uui-ref-node-document-type');
-        this.groupLabel = page.getByLabel('Group', { exact: true });
-        this.confirmTrashBtn = page.locator('#confirm').getByLabel('Trash');
+        this.successNotification = page.locator('uui-toast-notification[open][color="positive"]');
+        this.errorNotification = page.locator('uui-toast-notification[open][color="danger"]');
+        // Search & Filter
+        this.typeToFilterSearchTxt = page.locator('[type="search"] #input');
+        this.filterChooseBtn = page.locator('button').filter({ hasText: 'Choose' });
+        // Text Input
+        this.textAreaInputArea = page.locator('textarea.ime-text-area');
+        this.enterAName = page.getByLabel('Enter a name...', { exact: true });
+        this.descriptionBtn = page.getByLabel('Description');
+        this.enterDescriptionTxt = page.getByLabel('Enter a description...');
+        this.aliasLockBtn = page.locator('#name').getByLabel('Unlock input');
+        this.aliasNameTxt = page.locator('#name').getByLabel('alias');
+        // Icon
+        this.iconBtn = page.getByLabel('icon');
+        // Create Link
+        this.createLink = page.getByRole('link', { name: 'Create', exact: true });
+        // Recycle Bin
         this.recycleBinBtn = page.getByLabel('Recycle Bin', { exact: true });
         this.recycleBinMenuItem = page.locator('uui-menu-item[label="Recycle Bin"]');
-        this.recycleBinMenuItemCaretBtn = this.recycleBinMenuItem.locator('#caret-button');
+        this.recycleBinMenuItemCaretBtn = page.locator('uui-menu-item[label="Recycle Bin"]').locator('#caret-button');
+        // View Options
         this.gridBtn = page.getByLabel('Grid');
         this.listBtn = page.getByLabel('List');
         this.viewBundleBtn = page.locator('umb-collection-view-bundle uui-button svg');
-        this.createDocumentBlueprintModal = page.locator('umb-document-blueprint-options-create-modal');
-        this.createDocumentBlueprintBtn = page.getByLabel(/^Create Document Blueprint(…)?$/);
-        this.createNewDocumentBlueprintBtn = this.createDocumentBlueprintModal.locator('umb-ref-item', { hasText: 'Document Blueprint for' });
-        this.chooseDocumentInputBtn = page.locator('umb-input-document').getByLabel('Choose');
-        this.chooseMediaInputBtn = page.locator('umb-input-media').getByLabel('Choose');
-        this.container = page.locator('#container');
-        this.actionBtn = page.getByTestId('workspace:action-menu-button');
+        // Media
+        this.mediaCardItems = page.locator('uui-card-media');
         this.mediaPickerModalSubmitBtn = page.locator('umb-media-picker-modal').getByLabel('Submit');
-        this.deleteBtn = page.getByRole('button', { name: /^Delete(…)?$/ });
-        this.createModalBtn = this.sidebarModal.getByLabel('Create', { exact: true });
         this.mediaCaptionAltTextModalSubmitBtn = page.locator('umb-media-caption-alt-text-modal').getByLabel('Submit');
+        this.clickToUploadBtn = page.locator('#splitViews').getByRole('button', { name: 'Click to upload' });
+        this.inputDropzone = page.locator('umb-input-dropzone');
+        this.imageCropperField = page.locator('umb-image-cropper-field');
+        this.inputUploadField = page.locator('umb-input-upload-field').locator('#wrapperInner');
+        this.chooseMediaInputBtn = page.locator('umb-input-media').getByLabel('Choose');
+        // Embedded Media
         this.embeddedMediaModal = page.locator('umb-embedded-media-modal');
-        this.embeddedURLTxt = this.embeddedMediaModal.locator('[label="URL"] #input');
-        this.embeddedRetrieveBtn = this.embeddedMediaModal.locator('[label="Retrieve"]');
-        this.embeddedMediaModalConfirmBtn = this.embeddedMediaModal.getByLabel('Confirm');
-        this.embeddedPreview = this.embeddedMediaModal.locator('[label="Preview"]');
-        this.sectionSidebar = page.locator('umb-section-sidebar');
-        this.menuItem = page.locator('uui-menu-item');
-        this.property = page.locator('umb-property');
+        this.embeddedURLTxt = page.locator('umb-embedded-media-modal').locator('[label="URL"] #input');
+        this.embeddedRetrieveBtn = page.locator('umb-embedded-media-modal').locator('[label="Retrieve"]');
+        this.embeddedMediaModalConfirmBtn = page.locator('umb-embedded-media-modal').getByLabel('Confirm');
+        this.embeddedPreview = page.locator('umb-embedded-media-modal').locator('[label="Preview"]');
+        // Document & Content
+        this.chooseDocumentInputBtn = page.locator('umb-input-document').getByLabel('Choose');
+        this.createDocumentBlueprintBtn = page.getByLabel(/^Create Document Blueprint(…)?$/);
+        this.createDocumentBlueprintModal = page.locator('umb-document-blueprint-options-create-modal');
+        this.createNewDocumentBlueprintBtn = page.locator('umb-document-blueprint-options-create-modal').locator('umb-ref-item', { hasText: 'Document Blueprint for' });
+        // User
         this.currentUserAvatarBtn = page.getByTestId('header-app:Umb.HeaderApp.CurrentUser').locator('uui-avatar');
         this.currentPasswordTxt = page.locator('input[name="oldPassword"]');
         this.newPasswordTxt = page.locator('input[name="newPassword"]');
         this.confirmPasswordTxt = page.locator('input[name="confirmPassword"]');
-        this.createOptionActionListModal = page.locator('umb-entity-create-option-action-list-modal');
-        this.createActionButtonCollection = page.locator('umb-collection-create-action-button');
-        this.createActionBtn = this.createActionButtonCollection.locator('[label="Create"]');
+        // Collection & Table
         this.collectionTreeItemTableRow = page.locator('umb-collection-workspace-view umb-table uui-table-row');
-        this.folderBtn = this.createOptionActionListModal.locator('umb-ref-item', { hasText: 'Folder' });
-        this.reloadChildrenBtn = page.getByRole('button', { name: 'Reload children' });
+        this.createActionButtonCollection = page.locator('umb-collection-create-action-button');
+        this.createActionBtn = page.locator('umb-collection-create-action-button').locator('[label="Create"]');
+        this.createOptionActionListModal = page.locator('umb-entity-create-option-action-list-modal');
+        // Reference & Entity
         this.confirmActionModalEntityReferences = page.locator('umb-confirm-action-modal-entity-references,umb-confirm-bulk-action-modal-entity-references');
-        this.referenceHeadline = this.confirmActionModalEntityReferences.locator('#reference-headline').first();
-        this.entityItemRef = this.confirmActionModalEntityReferences.locator('uui-ref-list').first().getByTestId('entity-item-ref');
-        this.validationMessage = page.locator('umb-form-validation-message').locator('#messages');
-        this.successStateIcon = this.successState.locator('#state');
+        this.referenceHeadline = page.locator('umb-confirm-action-modal-entity-references,umb-confirm-bulk-action-modal-entity-references').locator('#reference-headline').first();
+        this.entityItemRef = page.locator('umb-confirm-action-modal-entity-references,umb-confirm-bulk-action-modal-entity-references').locator('uui-ref-list').first().getByTestId('entity-item-ref');
+        this.entityItem = page.locator('umb-entity-item-ref');
+        // Workspace & Action
         this.workspaceAction = page.locator('umb-workspace-action');
-        this.caretBtn = page.locator('#caret-button');
-        this.sectionLinks = page.getByTestId('section-links');
-        // Entity Action
-        this.entityAction = page.locator('umb-entity-action-list umb-entity-action');
-        this.openEntityAction = page.locator('#action-modal[open]').locator(this.entityAction);
-        // Workspace Entity Action
         this.workspaceActionMenuBtn = page.getByTestId('workspace:action-menu-button');
+        this.entityAction = page.locator('umb-entity-action-list umb-entity-action');
+        this.openEntityAction = page.locator('#action-modal[open]').locator(page.locator('umb-entity-action-list umb-entity-action'));
+        // Pagination
+        this.firstPaginationBtn = page.locator('umb-collection-pagination').getByLabel('First');
+        this.nextPaginationBtn = page.locator('umb-collection-pagination').getByLabel('Next');
+        // Editor
         this.monacoEditor = page.locator('.monaco-editor');
-        this.openedModal = page.locator('uui-modal-container[backdrop]');
+        // Loader
         this.uiLoader = page.locator('uui-loader');
-        this.inputDropzone = page.locator('umb-input-dropzone');
-        this.imageCropperField = page.locator('umb-image-cropper-field');
-        this.inputUploadField = page.locator('umb-input-upload-field').locator('#wrapperInner');
-        this.entityItem = page.locator('umb-entity-item-ref');
-        this.restoreBtn = page.getByLabel('Restore', { exact: true });
-        this.backOfficeMain = page.locator('umb-backoffice-main');
     }
+    // Helper Methods
+    getMenuItemByLabel(name) {
+        return this.page.locator(`uui-menu-item[label="${name}"]`);
+    }
+    // Actions Menu Methods
     async clickActionsMenuForNameInSectionSidebar(name) {
         await this.sectionSidebar.locator('[label="' + name + '"]').hover();
-        await this.sectionSidebar.locator('[label="' + name + '"] >> [label="Open actions menu"]').first().click();
+        await this.click(this.sectionSidebar.locator('[label="' + name + '"] >> [label="Open actions menu"]').first());
     }
     async clickActionsMenuForName(name) {
-        await (0, test_1.expect)(this.page.locator('uui-menu-item[label="' + name + '"]').locator('#menu-item').first()).toBeVisible();
-        // We need to wait for the load to be finished, otherwise we would run into flaky tests
-        await this.page.waitForTimeout(1000);
-        await this.page.locator('uui-menu-item[label="' + name + '"]').locator('#menu-item').first().hover({ force: true });
-        await this.page.locator('uui-menu-item[label="' + name + '"] #action-modal').first().click({ force: true });
+        const menuItem = this.getMenuItemByLabel(name);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.medium);
+        await menuItem.locator('#menu-item').first().hover({ force: true });
+        await this.click(menuItem.locator('#action-modal').first(), { force: true });
     }
     async isActionsMenuForNameVisible(name, isVisible = true) {
-        await this.page.locator('uui-menu-item[label="' + name + '"]').click();
-        await (0, test_1.expect)(this.page.locator('uui-menu-item[label="' + name + '"] #action-modal').first()).toBeVisible({ visible: isVisible });
+        const menuItem = this.getMenuItemByLabel(name);
+        await this.click(menuItem);
+        await (0, test_1.expect)(menuItem.locator('#action-modal').first()).toBeVisible({ visible: isVisible });
     }
+    // Caret Button Methods
     async clickCaretButtonForName(name) {
         await this.isCaretButtonWithNameVisible(name);
-        await this.page.locator('uui-menu-item[label="' + name + '"]').locator('#caret-button').first().click();
+        await this.click(this.getMenuItemByLabel(name).locator('#caret-button').first());
     }
     async isCaretButtonWithNameVisible(name, isVisible = true) {
-        await (0, test_1.expect)(this.page.locator('uui-menu-item[label="' + name + '"]').locator('#caret-button').first()).toBeVisible({ visible: isVisible });
+        await (0, test_1.expect)(this.getMenuItemByLabel(name).locator('#caret-button').first()).toBeVisible({ visible: isVisible });
     }
     async clickCaretButton() {
-        await this.page.locator('#caret-button').click();
+        await this.click(this.caretBtn);
     }
     async openCaretButtonForName(name, isInModal = false) {
         let menuItem;
         if (isInModal) {
-            menuItem = this.sidebarModal.locator('uui-menu-item[label="' + name + '"]');
+            menuItem = this.sidebarModal.locator(`uui-menu-item[label="${name}"]`);
         }
         else {
-            menuItem = this.page.locator('uui-menu-item[label="' + name + '"]');
+            menuItem = this.getMenuItemByLabel(name);
         }
         const isCaretButtonOpen = await menuItem.getAttribute('show-children');
         if (isCaretButtonOpen === null) {
             await this.clickCaretButtonForName(name);
         }
     }
+    // Tree Methods
     async reloadTree(treeName) {
-        // Waits until the tree item is visible
-        await (0, test_1.expect)(this.page.getByLabel(treeName, { exact: true })).toBeVisible();
-        await this.page.waitForTimeout(500);
+        await this.isVisible(this.page.getByLabel(treeName, { exact: true }));
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.short);
         await this.clickActionsMenuForName(treeName);
         await this.clickReloadChildrenActionMenuOption();
         await this.openCaretButtonForName(treeName);
     }
+    async isTreeItemVisible(name, isVisible = true) {
+        await this.isVisible(this.treeItem.locator('[label="' + name + '"]'), isVisible);
+    }
+    async doesTreeItemHaveTheCorrectIcon(name, icon) {
+        return await this.isVisible(this.treeItem.filter({ hasText: name }).locator('umb-icon').locator('[name="' + icon + '"]'));
+    }
+    // Core Button Click Methods
     async clickReloadButton() {
-        await (0, test_1.expect)(this.reloadBtn).toBeVisible();
-        await this.reloadBtn.click();
+        await this.click(this.reloadBtn);
     }
     async clickReloadChildrenButton() {
-        await (0, test_1.expect)(this.reloadChildrenBtn).toBeVisible();
-        await this.reloadChildrenBtn.click({ force: true });
-    }
-    async isSuccessStateVisibleForSaveButton(isVisible = true) {
-        const regex = new RegExp(`^workspace-action:.*Save$`);
-        const saveButtonLocator = this.page.getByTestId(regex);
-        const saveBtn = this.workspaceAction.filter({ has: saveButtonLocator });
-        await (0, test_1.expect)(saveBtn.locator(this.successState)).toBeVisible({ visible: isVisible, timeout: 10000 });
+        await this.click(this.reloadChildrenBtn, { force: true });
     }
     async clickSaveButton() {
-        await (0, test_1.expect)(this.saveBtn).toBeVisible();
-        await this.saveBtn.click();
-        await this.page.waitForTimeout(500);
+        await this.click(this.saveBtn);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.short);
     }
     async clickChooseButton() {
-        await (0, test_1.expect)(this.chooseBtn).toBeVisible();
-        await this.chooseBtn.click();
+        await this.click(this.chooseBtn);
     }
     async clickChooseContainerButton() {
-        await this.containerChooseBtn.click();
-    }
-    async clickFilterChooseButton() {
-        await this.filterChooseBtn.click();
+        await this.click(this.containerChooseBtn);
     }
-    async clickRenameFolderThreeDotsButton() {
-        await this.renameFolderThreeDotsBtn.click();
+    async clickSubmitButton() {
+        await this.click(this.submitBtn);
     }
-    async clickRenameFolderButton() {
-        await this.clickRenameButton();
+    async clickConfirmButton() {
+        await this.click(this.confirmBtn);
     }
-    async clickConfirmRenameButton() {
-        await this.confirmRenameBtn.click();
+    async clickCreateButton() {
+        await this.click(this.createBtn);
     }
-    async clickUpdateFolderButton() {
-        await this.updateFolderBtn.click();
+    async clickAddButton() {
+        await this.click(this.addBtn);
     }
     async clickUpdateButton() {
-        await this.updateBtn.click();
-    }
-    async clickSubmitButton() {
-        await (0, test_1.expect)(this.submitBtn).toBeVisible();
-        await this.submitBtn.click();
-    }
-    async clickConfirmToSubmitButton() {
-        await this.confirmToSubmitBtn.click();
+        await this.click(this.updateBtn);
     }
     async clickChangeButton() {
-        await this.changeBtn.click();
+        await this.click(this.changeBtn);
     }
-    async clickExactLinkWithName(name, toForce = false) {
-        const exactLinkWithNameLocator = this.page.getByRole('link', { name: name, exact: true });
-        await (0, test_1.expect)(exactLinkWithNameLocator).toBeVisible();
-        await exactLinkWithNameLocator.click({ force: toForce });
+    async clickDeleteButton() {
+        await this.click(this.deleteBtn);
     }
-    async enterAliasName(aliasName) {
-        // Unlocks alias
-        await this.page.waitForTimeout(500);
-        await (0, test_1.expect)(this.aliasLockBtn).toBeVisible();
-        await this.aliasLockBtn.click({ force: true });
-        await this.aliasNameTxt.clear();
-        await this.aliasNameTxt.fill(aliasName);
+    async clickDeleteExactButton() {
+        await this.click(this.deleteExactBtn);
     }
-    async updateIcon(iconName) {
-        await (0, test_1.expect)(this.iconBtn).toBeVisible();
-        // Force click is needed
-        await this.iconBtn.click({ force: true });
-        await this.searchForTypeToFilterValue(iconName);
-        await this.clickLabelWithName(iconName, true, true);
-        await this.clickSubmitButton();
+    async clickRemoveExactButton() {
+        await this.click(this.removeExactBtn);
     }
-    async clickTextButtonWithName(name) {
-        await (0, test_1.expect)(this.page.getByText(name, { exact: true })).toBeVisible();
-        await this.page.getByText(name, { exact: true }).click();
+    async clickInsertButton() {
+        await this.click(this.insertBtn);
     }
-    async clickSelectPropertyEditorButton() {
-        await (0, test_1.expect)(this.selectPropertyEditorBtn).toBeVisible();
-        await this.selectPropertyEditorBtn.click();
+    async clickRenameButton() {
+        await this.click(this.renameBtn);
     }
-    async clickCreateFolderButton() {
-        await (0, test_1.expect)(this.createFolderBtn).toBeVisible();
-        await this.createFolderBtn.click();
-        await this.page.waitForTimeout(500); // Wait for the action to complete
+    async clickRestoreButton() {
+        await this.click(this.restoreBtn);
     }
-    async enterAPropertyName(name) {
-        await (0, test_1.expect)(this.propertyNameTxt).toBeVisible();
-        await this.propertyNameTxt.fill(name);
+    async clickDisableButton() {
+        await this.click(this.disableBtn);
     }
-    async clickNextPaginationButton() {
-        await (0, test_1.expect)(this.nextPaginationBtn).toBeVisible();
-        await this.nextPaginationBtn.click();
+    async clickEnableButton() {
+        await this.click(this.enableBtn);
     }
-    async clickNextButton() {
-        await (0, test_1.expect)(this.nextBtn).toBeVisible();
-        await this.nextBtn.click();
+    async clickActionButton() {
+        await this.click(this.actionBtn);
     }
-    async clickConfirmButton() {
-        await (0, test_1.expect)(this.confirmBtn).toBeVisible();
-        await this.confirmBtn.click();
+    async clickNextButton() {
+        await this.click(this.nextBtn);
     }
     async clickBreadcrumbButton() {
-        await (0, test_1.expect)(this.breadcrumbBtn).toBeVisible();
-        await this.breadcrumbBtn.click();
+        await this.click(this.breadcrumbBtn);
     }
-    async clickInsertButton() {
-        await (0, test_1.expect)(this.insertBtn).toBeVisible();
-        await this.insertBtn.click();
+    async clickLeftArrowButton() {
+        await this.click(this.leftArrowBtn);
     }
+    // Confirmation Button Methods
     async clickConfirmToDeleteButton() {
-        await (0, test_1.expect)(this.confirmToDeleteBtn).toBeVisible();
-        await this.confirmToDeleteBtn.click();
-        await this.page.waitForTimeout(500); // Wait for the action to complete
+        await this.click(this.confirmToDeleteBtn);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.short);
     }
     async clickConfirmCreateFolderButton() {
-        await (0, test_1.expect)(this.confirmCreateFolderBtn).toBeVisible();
-        await this.confirmCreateFolderBtn.click();
-        await this.page.waitForTimeout(500); // Wait for the action to complete
-    }
-    async clickRemoveExactButton() {
-        await (0, test_1.expect)(this.removeExactBtn).toBeVisible();
-        await this.removeExactBtn.click();
-    }
-    async clickRemoveButtonForName(name) {
-        const removeButtonWithNameLocator = this.page.locator('[name="' + name + '"] [label="Remove"]');
-        await (0, test_1.expect)(removeButtonWithNameLocator).toBeVisible();
-        await removeButtonWithNameLocator.click();
-    }
-    async clickTrashIconButtonForName(name) {
-        const trashIconButtonWithNameLocator = this.page.locator('[name="' + name + '"] [name="icon-trash"]');
-        await (0, test_1.expect)(trashIconButtonWithNameLocator).toBeVisible();
-        await trashIconButtonWithNameLocator.click();
+        await this.click(this.confirmCreateFolderBtn);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.short);
     }
-    async clickRemoveWithName(name) {
-        const removeLabelWithNameLocator = this.page.locator('[label="Remove ' + name + '"]');
-        await (0, test_1.expect)(removeLabelWithNameLocator).toBeVisible();
-        await removeLabelWithNameLocator.click();
+    async clickConfirmRemoveButton() {
+        await this.click(this.confirmToRemoveBtn);
     }
-    async clickDisableButton() {
-        await (0, test_1.expect)(this.disableBtn).toBeVisible();
-        await this.disableBtn.click();
+    async clickConfirmToSubmitButton() {
+        await this.click(this.confirmToSubmitBtn);
     }
     async clickConfirmDisableButton() {
-        await (0, test_1.expect)(this.confirmDisableBtn).toBeVisible();
-        await this.confirmDisableBtn.click();
-    }
-    async clickConfirmRemoveButton() {
-        await (0, test_1.expect)(this.confirmToRemoveBtn).toBeVisible();
-        await this.confirmToRemoveBtn.click();
-    }
-    async clickEnableButton() {
-        await (0, test_1.expect)(this.enableBtn).toBeVisible();
-        await this.enableBtn.click();
+        await this.click(this.confirmDisableBtn);
     }
     async clickConfirmEnableButton() {
-        await (0, test_1.expect)(this.confirmEnableBtn).toBeVisible();
-        await this.confirmEnableBtn.click();
+        await this.click(this.confirmEnableBtn);
     }
-    async insertDictionaryItem(dictionaryName) {
-        await this.clickInsertButton();
-        await (0, test_1.expect)(this.insertDictionaryItemBtn).toBeVisible();
-        await this.insertDictionaryItemBtn.click();
-        await (0, test_1.expect)(this.page.getByLabel(dictionaryName)).toBeVisible();
-        await this.page.getByLabel(dictionaryName).click();
-        await (0, test_1.expect)(this.chooseBtn).toBeVisible();
-        await this.chooseBtn.click();
+    async clickConfirmRenameButton() {
+        await this.click(this.confirmRenameBtn);
     }
-    async addQueryBuilderWithOrderByStatement(propertyAlias, isAscending) {
-        await (0, test_1.expect)(this.queryBuilderBtn).toBeVisible({ timeout: 10000 });
-        await this.queryBuilderBtn.click();
-        await (0, test_1.expect)(this.orderByPropertyAliasBtn).toBeVisible();
-        await this.orderByPropertyAliasBtn.click();
-        // Wait and choose property alias option 
-        await this.waitAndSelectQueryBuilderDropDownList(propertyAlias);
-        await (0, test_1.expect)(this.orderByPropertyAliasBtn).toBeVisible();
-        await this.orderByPropertyAliasBtn.click();
-        // Click to ascending button if isAscending is false
-        if (!isAscending) {
-            await (0, test_1.expect)(this.ascendingBtn).toBeVisible();
-            await this.ascendingBtn.click();
-        }
+    async clickConfirmTrashButton() {
+        await this.click(this.confirmTrashBtn);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.short);
     }
-    async addQueryBuilderWithWhereStatement(propertyAlias, operator, constrainValue) {
-        await (0, test_1.expect)(this.queryBuilderBtn).toBeVisible({ timeout: 10000 });
-        await this.queryBuilderBtn.click();
-        // Wait and choose property alias
-        await (0, test_1.expect)(this.wherePropertyAliasBtn).toBeVisible();
-        await this.wherePropertyAliasBtn.click();
-        await this.waitAndSelectQueryBuilderDropDownList(propertyAlias);
-        // Wait and choose operator
-        await (0, test_1.expect)(this.whereOperatorBtn).toBeVisible();
-        await this.whereOperatorBtn.click();
-        await this.waitAndSelectQueryBuilderDropDownList(operator);
-        // Wait and choose constrain value and press Enter
-        await (0, test_1.expect)(this.whereConstrainValueTxt).toBeVisible();
-        await this.whereConstrainValueTxt.clear();
-        await this.whereConstrainValueTxt.fill(constrainValue);
-        await this.whereConstrainValueTxt.press('Enter');
+    async clickDeleteAndConfirmButton() {
+        await this.clickDeleteActionMenuOption();
+        await this.clickConfirmToDeleteButton();
     }
-    async waitAndSelectQueryBuilderDropDownList(option) {
-        const ddlOption = this.page.locator('[open]').locator('uui-combobox-list-option').filter({ hasText: option }).first();
-        await (0, test_1.expect)(ddlOption).toBeVisible({ timeout: 10000 });
-        await ddlOption.click();
+    // Folder Methods
+    async clickCreateFolderButton() {
+        await this.click(this.createFolderBtn);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.short);
+    }
+    async enterFolderName(folderName) {
+        await this.enterText(this.folderNameTxt, folderName, { verify: true });
     }
     async createFolder(folderName) {
         await this.clickCreateActionMenuOption();
@@ -590,585 +567,577 @@ class UiBaseLocators {
         await this.enterFolderName(folderName);
         await this.clickConfirmCreateFolderButton();
     }
-    async deletePropertyEditor(propertyEditorName) {
-        // We need to hover over the property to be able to see the delete button
-        await this.page.locator('uui-button').filter({ hasText: propertyEditorName }).getByLabel('Editor settings').hover();
-        await this.deleteBtn.click();
+    async deleteFolder() {
+        await this.clickDeleteActionMenuOption();
+        await this.clickConfirmToDeleteButton();
     }
-    async enterFolderName(folderName) {
-        await (0, test_1.expect)(this.folderNameTxt).toBeVisible();
-        await this.folderNameTxt.clear();
-        await this.folderNameTxt.fill(folderName);
-        await (0, test_1.expect)(this.folderNameTxt).toHaveValue(folderName);
+    async clickFolderButton() {
+        await this.click(this.folderBtn);
     }
-    async isTextWithExactNameVisible(name, isVisible = true) {
-        return (0, test_1.expect)(this.page.getByText(name, { exact: true })).toBeVisible({ visible: isVisible });
+    async clickNewFolderThreeDotsButton() {
+        await this.click(this.newFolderThreeDotsBtn);
     }
-    async isQueryBuilderCodeShown(code) {
-        await (0, test_1.expect)(this.queryBuilderShowCode).toBeVisible();
-        await this.queryBuilderShowCode.click();
-        await (0, test_1.expect)(this.queryBuilderShowCode).toContainText(code, { timeout: 10000 });
+    async clickRenameFolderThreeDotsButton() {
+        await this.click(this.renameFolderThreeDotsBtn);
     }
-    async deleteFolder() {
-        await this.clickDeleteActionMenuOption();
-        await this.clickConfirmToDeleteButton();
+    async clickRenameFolderButton() {
+        await this.clickRenameButton();
     }
-    async clickDeleteExactButton() {
-        await (0, test_1.expect)(this.deleteExactBtn).toBeVisible();
-        await this.deleteExactBtn.click();
+    async clickUpdateFolderButton() {
+        await this.click(this.updateFolderBtn);
     }
-    async isTreeItemVisible(name, isVisible = true) {
-        await (0, test_1.expect)(this.page.locator('umb-tree-item').locator('[label="' + name + '"]')).toBeVisible({ visible: isVisible });
+    // Three Dots Menu Methods
+    async clickCreateThreeDotsButton() {
+        await this.click(this.createThreeDotsBtn);
     }
-    async doesTreeItemHaveTheCorrectIcon(name, icon) {
-        return await (0, test_1.expect)(this.page.locator('umb-tree-item').filter({ hasText: name }).locator('umb-icon').locator('[name="' + icon + '"]')).toBeVisible();
+    async clickFilterChooseButton() {
+        await this.click(this.filterChooseBtn);
+    }
+    // Success State Methods
+    async isSuccessStateVisibleForSaveButton(isVisible = true) {
+        const regex = new RegExp(`^workspace-action:.*Save$`);
+        const saveButtonLocator = this.page.getByTestId(regex);
+        const saveBtn = this.workspaceAction.filter({ has: saveButtonLocator });
+        await (0, test_1.expect)(saveBtn.locator(this.successState)).toBeVisible({ visible: isVisible, timeout: ConstantHelper_1.ConstantHelper.timeout.long });
+    }
+    async isSuccessButtonWithTextVisible(text) {
+        return await this.isVisible(this.successState.filter({ hasText: text }));
+    }
+    async isSuccessStateIconVisible() {
+        await this.isVisible(this.successStateIcon);
+    }
+    async isFailedStateButtonVisible() {
+        await this.isVisible(this.failedStateButton);
+    }
+    // Notification Methods
+    async isSuccessNotificationVisible(isVisible = true) {
+        return await (0, test_1.expect)(this.successNotification.first()).toBeVisible({ visible: isVisible, timeout: ConstantHelper_1.ConstantHelper.timeout.long });
+    }
+    async doesSuccessNotificationsHaveCount(count) {
+        await this.hasCount(this.successNotification, count);
+    }
+    async doesSuccessNotificationHaveText(text, isVisible = true, deleteNotification = false, timeout = 5000) {
+        const response = await (0, test_1.expect)(this.successNotification.filter({ hasText: text })).toBeVisible({
+            visible: isVisible,
+            timeout: timeout
+        });
+        if (deleteNotification) {
+            await this.click(this.successNotification.filter({ hasText: text }).getByLabel('close'), { force: true });
+        }
+        return response;
+    }
+    async isErrorNotificationVisible(isVisible = true) {
+        return await (0, test_1.expect)(this.errorNotification.first()).toBeVisible({ visible: isVisible });
+    }
+    async doesErrorNotificationHaveText(text, isVisible = true, deleteNotification = false) {
+        const response = await (0, test_1.expect)(this.errorNotification.filter({ hasText: text })).toBeVisible({ visible: isVisible });
+        if (deleteNotification) {
+            await this.click(this.errorNotification.filter({ hasText: text }).locator('svg'));
+        }
+        return response;
+    }
+    // Modal Methods
+    async clickChooseModalButton() {
+        await this.click(this.chooseModalBtn);
     }
+    async clickCreateModalButton() {
+        await this.click(this.createModalBtn);
+    }
+    async clickModalMenuItemWithName(name) {
+        await this.click(this.openedModal.locator(`uui-menu-item[label="${name}"]`));
+    }
+    async isModalMenuItemWithNameDisabled(name) {
+        await this.hasAttribute(this.sidebarModal.locator(`uui-menu-item[label="${name}"]`), 'disabled', '');
+    }
+    async isModalMenuItemWithNameVisible(name, isVisible = true) {
+        await this.isVisible(this.sidebarModal.locator(`uui-menu-item[label="${name}"]`), isVisible);
+    }
+    // Container Methods
+    async clickContainerSaveAndPublishButton() {
+        await this.click(this.containerSaveAndPublishBtn);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.short);
+    }
+    // Navigation Methods
     async goToSection(sectionName, checkSections = true, skipReload = false) {
         if (checkSections) {
             for (let section in ConstantHelper_1.ConstantHelper.sections) {
-                await (0, test_1.expect)(this.sectionLinks.getByRole('tab', { name: ConstantHelper_1.ConstantHelper.sections[section] })).toBeVisible({ timeout: 30000 });
+                await (0, test_1.expect)(this.sectionLinks.getByRole('tab', { name: ConstantHelper_1.ConstantHelper.sections[section] })).toBeVisible({ timeout: ConstantHelper_1.ConstantHelper.timeout.navigation });
             }
         }
-        // We need to check if we are on the section tab already, if we are, then we need to reload the page instead of clicking again
         const alreadySelected = await this.sectionLinks.locator('[active]').getByText(sectionName).isVisible();
         if (alreadySelected && !skipReload) {
             await this.page.reload();
         }
         else {
-            await this.backOfficeHeader.getByRole('tab', { name: sectionName }).click();
+            await this.click(this.backOfficeHeader.getByRole('tab', { name: sectionName }));
         }
     }
     async goToSettingsTreeItem(settingsTreeItemName) {
         await this.goToSection(ConstantHelper_1.ConstantHelper.sections.settings);
-        await (0, test_1.expect)(this.page.getByLabel(settingsTreeItemName, { exact: true })).toBeVisible();
-        await this.page.getByLabel(settingsTreeItemName, { exact: true }).click();
+        await this.click(this.page.getByLabel(settingsTreeItemName, { exact: true }));
     }
-    async clickDataElement(elementName, options = null) {
-        await this.page.click(`[data-element="${elementName}"]`, options);
+    async isSectionWithNameVisible(sectionName, isVisible = true) {
+        await this.isVisible(this.page.getByRole('tab', { name: sectionName }), isVisible);
     }
-    async getDataElement(elementName) {
-        return this.page.locator(`[data-element="${elementName}"]`);
+    async isBackOfficeMainVisible(isVisible = true) {
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.medium);
+        await this.isVisible(this.backOfficeMain, isVisible);
     }
-    async isButtonWithNameVisible(name) {
-        await (0, test_1.expect)(this.page.getByRole('button', { name: name })).toBeVisible();
+    // Link & Button Click by Name Methods
+    async clickExactLinkWithName(name, toForce = false) {
+        const exactLinkWithNameLocator = this.page.getByRole('link', { name: name, exact: true });
+        await this.click(exactLinkWithNameLocator, { force: toForce });
+    }
+    async clickLinkWithName(name, isExact = false) {
+        await this.click(this.page.getByRole('link', { name: name, exact: isExact }));
     }
     async clickLabelWithName(name, isExact = true, toForce = false) {
-        await (0, test_1.expect)(this.page.getByLabel(name, { exact: isExact })).toBeVisible();
-        await this.page.getByLabel(name, { exact: isExact }).click({ force: toForce });
+        await this.click(this.page.getByLabel(name, { exact: isExact }), { force: toForce });
     }
     async clickButtonWithName(name, isExact = false) {
         const exactButtonWithNameLocator = this.page.getByRole('button', { name: name, exact: isExact });
-        await (0, test_1.expect)(exactButtonWithNameLocator).toBeVisible();
-        // Force click is needed
-        await exactButtonWithNameLocator.click({ force: true });
+        await this.click(exactButtonWithNameLocator, { force: true });
     }
-    async isSuccessNotificationVisible(isVisible = true) {
-        return await (0, test_1.expect)(this.successNotification.first()).toBeVisible({ visible: isVisible, timeout: 10000 });
-    }
-    async doesSuccessNotificationsHaveCount(count) {
-        return await (0, test_1.expect)(this.successNotification).toHaveCount(count);
+    async clickTextButtonWithName(name) {
+        await this.click(this.page.getByText(name, { exact: true }));
     }
-    async isErrorNotificationVisible(isVisible = true) {
-        return await (0, test_1.expect)(this.errorNotification.first()).toBeVisible({ visible: isVisible });
+    async isButtonWithNameVisible(name) {
+        await this.isVisible(this.page.getByRole('button', { name: name }));
     }
-    async isTextWithMessageVisible(message, isVisible = true) {
-        return await (0, test_1.expect)(this.page.getByText(message)).toBeVisible({ visible: isVisible });
+    async getButtonWithName(name) {
+        await this.waitForVisible(this.page.getByRole('button', { name: name }));
+        return this.page.getByRole('button', { name: name });
     }
-    async clickCreateThreeDotsButton() {
-        await (0, test_1.expect)(this.createThreeDotsBtn).toBeVisible();
-        await this.createThreeDotsBtn.click();
+    // Remove Button Methods
+    async clickRemoveButtonForName(name) {
+        const removeButtonWithNameLocator = this.page.locator('[name="' + name + '"] [label="Remove"]');
+        await this.click(removeButtonWithNameLocator);
     }
-    async clickCreateButton() {
-        await (0, test_1.expect)(this.createBtn).toBeVisible();
-        await this.createBtn.click();
+    async clickTrashIconButtonForName(name) {
+        const trashIconButtonWithNameLocator = this.page.locator('[name="' + name + '"] [name="icon-trash"]');
+        await this.click(trashIconButtonWithNameLocator);
     }
-    async clickAddButton() {
-        await (0, test_1.expect)(this.addBtn).toBeVisible();
-        await this.addBtn.click();
+    async clickRemoveWithName(name) {
+        const removeLabelWithNameLocator = this.page.locator('[label="Remove ' + name + '"]');
+        await this.click(removeLabelWithNameLocator);
     }
-    ;
-    async clickNewFolderThreeDotsButton() {
-        await (0, test_1.expect)(this.newFolderThreeDotsBtn).toBeVisible();
-        await this.newFolderThreeDotsBtn.click();
+    // Alias & Icon Methods
+    async enterAliasName(aliasName) {
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.short);
+        await this.click(this.aliasLockBtn, { force: true });
+        await this.enterText(this.aliasNameTxt, aliasName);
     }
-    async clickEditorSettingsButton(index = 0) {
-        await (0, test_1.expect)(this.editorSettingsBtn.nth(index)).toBeVisible();
-        return this.editorSettingsBtn.nth(index).click();
+    async updateIcon(iconName) {
+        await this.click(this.iconBtn, { force: true });
+        await this.searchForTypeToFilterValue(iconName);
+        await this.clickLabelWithName(iconName, true, true);
+        await this.clickSubmitButton();
     }
-    async enterDescription(description) {
-        await (0, test_1.expect)(this.enterDescriptionTxt).toBeVisible();
-        await this.enterDescriptionTxt.clear();
-        await this.enterDescriptionTxt.fill(description);
+    // Property Editor Methods
+    async clickSelectPropertyEditorButton() {
+        await this.click(this.selectPropertyEditorBtn);
     }
-    async doesDescriptionHaveValue(value, index = 0) {
-        return await (0, test_1.expect)(this.descriptionBtn.nth(index)).toHaveValue(value);
+    async enterAPropertyName(name) {
+        await this.enterText(this.propertyNameTxt, name, { clearFirst: false });
     }
-    async clickStructureTab() {
-        await this.page.waitForTimeout(1000);
-        await (0, test_1.expect)(this.structureTabBtn).toBeVisible();
-        await this.structureTabBtn.click();
+    async clickEditorSettingsButton(index = 0) {
+        await this.click(this.editorSettingsBtn.nth(index));
     }
-    async clickAllowAtRootButton() {
-        await (0, test_1.expect)(this.allowAtRootBtn).toBeVisible();
-        await this.allowAtRootBtn.click();
+    async addPropertyEditor(propertyEditorName, index = 0) {
+        await this.click(this.addPropertyBtn.nth(index));
+        await this.enterAPropertyName(propertyEditorName);
+        await this.hasValue(this.propertyNameTxt, propertyEditorName);
+        await this.clickSelectPropertyEditorButton();
+        await this.searchForTypeToFilterValue(propertyEditorName);
+        await this.click(this.page.getByText(propertyEditorName, { exact: true }));
+        await this.clickSubmitButton();
     }
-    async clickIAmDoneReorderingButton() {
-        await (0, test_1.expect)(this.iAmDoneReorderingBtn).toBeVisible();
-        await this.iAmDoneReorderingBtn.click();
+    async updatePropertyEditor(propertyEditorName) {
+        await this.clickEditorSettingsButton();
+        await this.clickChangeButton();
+        await this.searchForTypeToFilterValue(propertyEditorName);
+        await this.click(this.page.getByText(propertyEditorName, { exact: true }));
+        await this.enterAPropertyName(propertyEditorName);
+        await this.clickSubmitButton();
     }
-    async clickReorderButton() {
-        await (0, test_1.expect)(this.reorderBtn).toBeVisible();
-        await this.reorderBtn.click();
+    async deletePropertyEditor(propertyEditorName) {
+        await this.page.locator('uui-button').filter({ hasText: propertyEditorName }).getByLabel('Editor settings').hover();
+        await this.click(this.deleteBtn);
     }
-    async clickLabelAboveButton() {
-        await (0, test_1.expect)(this.labelAboveBtn).toBeVisible();
-        await this.labelAboveBtn.click();
+    async deletePropertyEditorWithName(name) {
+        const propertyEditor = this.page.locator('umb-content-type-design-editor-property', { hasText: name });
+        await this.hoverAndClick(propertyEditor, propertyEditor.getByLabel('Delete'), { force: true });
+        await this.clickConfirmToDeleteButton();
     }
-    async clickMandatoryToggle() {
-        await (0, test_1.expect)(this.mandatoryToggle).toBeVisible();
-        await this.mandatoryToggle.click();
+    async enterPropertyEditorDescription(description) {
+        await this.enterText(this.enterPropertyEditorDescriptionTxt, description);
     }
-    async selectValidationOption(option) {
-        await (0, test_1.expect)(this.validation).toBeVisible();
-        await this.validation.selectOption(option);
+    async isPropertyEditorUiWithNameReadOnly(name) {
+        const propertyEditorUiLocator = this.page.locator('umb-property-editor-ui-' + name);
+        await this.hasAttribute(propertyEditorUiLocator, 'readonly', '');
     }
-    async enterRegEx(regEx) {
-        await (0, test_1.expect)(this.regexTxt).toBeVisible();
-        await this.regexTxt.fill(regEx);
+    async isPropertyEditorUiWithNameVisible(name, isVisible = true) {
+        const propertyEditorUiLocator = this.page.locator('umb-property-editor-ui-' + name);
+        await this.isVisible(propertyEditorUiLocator, isVisible);
     }
-    async enterRegExMessage(regExMessage) {
-        await (0, test_1.expect)(this.regexMessageTxt).toBeVisible();
-        await this.regexMessageTxt.fill(regExMessage);
+    async doesPropertyHaveInvalidBadge(propertyName) {
+        await this.isVisible(this.page.locator('umb-property-layout').filter({ hasText: propertyName }).locator('#invalid-badge uui-badge'));
     }
-    async clickCompositionsButton() {
-        await (0, test_1.expect)(this.compositionsBtn).toBeVisible();
-        await this.compositionsBtn.click();
+    // Group Methods
+    async clickAddGroupButton() {
+        await this.click(this.addGroupBtn);
     }
-    async clickAddTabButton() {
-        await (0, test_1.expect)(this.addTabBtn).toBeVisible();
-        await this.addTabBtn.click();
+    async enterGroupName(groupName, index = 0) {
+        const groupNameTxt = this.groupLabel.nth(index);
+        await this.enterText(groupNameTxt, groupName);
     }
-    async enterTabName(tabName) {
-        await (0, test_1.expect)(this.unnamedTabTxt).toBeVisible();
-        await this.page.waitForTimeout(400);
-        await this.unnamedTabTxt.clear();
-        await this.unnamedTabTxt.fill(tabName);
-        // We use this to make sure the test id is updated
-        await this.page.getByRole('tab', { name: 'Design' }).click();
-        // We click again to make sure the tab is focused
-        await this.page.getByTestId('tab:' + tabName).click();
+    async isGroupVisible(groupName, isVisible = true) {
+        await this.isVisible(this.groupLabel.filter({ hasText: groupName }), isVisible);
     }
-    async searchForTypeToFilterValue(searchValue) {
-        await (0, test_1.expect)(this.typeToFilterSearchTxt).toBeVisible();
-        await this.typeToFilterSearchTxt.fill(searchValue);
+    async doesGroupHaveValue(value) {
+        await this.waitForVisible(this.groupLabel);
+        return await this.hasValue(this.groupLabel, value);
     }
-    async addPropertyEditor(propertyEditorName, index = 0) {
-        await (0, test_1.expect)(this.addPropertyBtn.nth(index)).toBeVisible();
-        await this.addPropertyBtn.nth(index).click();
-        await this.enterAPropertyName(propertyEditorName);
-        await (0, test_1.expect)(this.propertyNameTxt).toHaveValue(propertyEditorName);
-        await this.clickSelectPropertyEditorButton();
-        await this.searchForTypeToFilterValue(propertyEditorName);
-        await this.page.getByText(propertyEditorName, { exact: true }).click();
-        await this.clickSubmitButton();
+    async deleteGroup(groupName) {
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.medium);
+        const groups = this.page.locator('umb-content-type-design-editor-group').all();
+        for (const group of await groups) {
+            if (await group.getByLabel('Group', { exact: true }).inputValue() === groupName) {
+                const headerActionsDeleteLocator = group.locator('[slot="header-actions"]').getByLabel('Delete');
+                await this.click(headerActionsDeleteLocator, { force: true });
+                return;
+            }
+        }
     }
-    async updatePropertyEditor(propertyEditorName) {
-        await this.clickEditorSettingsButton();
-        await this.clickChangeButton();
-        await this.searchForTypeToFilterValue(propertyEditorName);
-        await this.page.getByText(propertyEditorName, { exact: true }).click();
-        await this.enterAPropertyName(propertyEditorName);
-        await this.clickSubmitButton();
+    async reorderTwoGroups(firstGroupName, secondGroupName) {
+        const firstGroup = this.page.getByTestId('group:' + firstGroupName);
+        const secondGroup = this.page.getByTestId('group:' + secondGroupName);
+        const firstGroupValue = await firstGroup.getByLabel('Group').inputValue();
+        const secondGroupValue = await secondGroup.getByLabel('Group').inputValue();
+        const dragToLocator = firstGroup.locator('[slot="header"]').first();
+        const dragFromLocator = secondGroup.locator('[slot="header"]').first();
+        await this.dragAndDrop(dragFromLocator, dragToLocator, 0, 0, 20);
+        return { firstGroupValue, secondGroupValue };
     }
-    async enterPropertyEditorDescription(description) {
-        await (0, test_1.expect)(this.enterPropertyEditorDescriptionTxt).toBeVisible();
-        await this.enterPropertyEditorDescriptionTxt.clear();
-        await this.enterPropertyEditorDescriptionTxt.fill(description);
+    // Tab Methods
+    async clickAddTabButton() {
+        await this.click(this.addTabBtn);
     }
-    async clickAddGroupButton() {
-        await (0, test_1.expect)(this.addGroupBtn).toBeVisible();
-        await this.addGroupBtn.click();
+    async enterTabName(tabName) {
+        await this.waitForVisible(this.unnamedTabTxt);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.debounce);
+        await this.enterText(this.unnamedTabTxt, tabName);
+        await this.click(this.page.getByRole('tab', { name: 'Design' }));
+        await this.click(this.page.getByTestId('tab:' + tabName));
     }
-    async clickChooseModalButton() {
-        await (0, test_1.expect)(this.chooseModalBtn).toBeVisible();
-        await this.chooseModalBtn.click();
+    async clickRemoveTabWithName(name) {
+        const tab = this.page.locator('uui-tab').filter({ hasText: name });
+        await this.hoverAndClick(tab, tab.locator('[label="Remove"]'));
     }
-    async enterGroupName(groupName, index = 0) {
-        const groupNameTxt = this.groupLabel.nth(index);
-        await (0, test_1.expect)(groupNameTxt).toBeVisible();
-        await groupNameTxt.clear();
-        await groupNameTxt.fill(groupName);
+    async clickStructureTab() {
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.medium);
+        await this.click(this.structureTabBtn);
     }
-    async isGroupVisible(groupName, isVisible = true) {
-        await (0, test_1.expect)(this.groupLabel.filter({ hasText: groupName })).toBeVisible({ visible: isVisible });
+    getTabLocatorWithName(name) {
+        return this.page.getByRole('tab', { name: name });
     }
-    async doesGroupHaveValue(value) {
-        await (0, test_1.expect)(this.groupLabel).toBeVisible();
-        return await (0, test_1.expect)(this.groupLabel).toHaveValue(value);
+    // Validation Methods
+    async clickMandatoryToggle() {
+        await this.click(this.mandatoryToggle);
     }
-    async rename(newName) {
-        await this.clickRenameActionMenuOption();
-        await (0, test_1.expect)(this.newNameTxt).toBeVisible();
-        await this.newNameTxt.click();
-        await this.newNameTxt.clear();
-        await this.newNameTxt.fill(newName);
-        await this.renameModalBtn.click();
-        await this.page.waitForTimeout(500);
+    async selectValidationOption(option) {
+        await this.selectByValue(this.validation, option);
     }
-    async isSuccessButtonWithTextVisible(text) {
-        return await (0, test_1.expect)(this.successState.filter({ hasText: text })).toBeVisible();
+    async enterRegEx(regEx) {
+        await this.enterText(this.regexTxt, regEx, { clearFirst: false });
     }
-    async dragAndDrop(dragFromSelector, dragToSelector, verticalOffset = 0, horizontalOffset = 0, steps = 5) {
-        await (0, test_1.expect)(dragFromSelector).toBeVisible();
-        await (0, test_1.expect)(dragToSelector).toBeVisible();
-        const targetLocation = await dragToSelector.boundingBox();
-        const elementCenterX = targetLocation.x + targetLocation.width / 2;
-        const elementCenterY = targetLocation.y + targetLocation.height / 2;
-        await dragFromSelector.hover();
-        await this.page.mouse.move(10, 10);
-        await dragFromSelector.hover();
-        await this.page.mouse.down();
-        await this.page.waitForTimeout(400);
-        await this.page.mouse.move(elementCenterX + horizontalOffset, elementCenterY + verticalOffset, { steps: steps });
-        await this.page.waitForTimeout(400);
-        await this.page.mouse.up();
+    async enterRegExMessage(regExMessage) {
+        await this.enterText(this.regexMessageTxt, regExMessage, { clearFirst: false });
     }
-    async getButtonWithName(name) {
-        await (0, test_1.expect)(this.page.getByRole('button', { name: name })).toBeVisible();
-        return this.page.getByRole('button', { name: name });
+    async isValidationMessageVisible(message, isVisible = true) {
+        await this.isVisible(this.validationMessage.filter({ hasText: message }), isVisible);
     }
-    async clickCreateLink() {
-        await (0, test_1.expect)(this.createLink).toBeVisible();
-        await this.createLink.click();
+    // Composition & Structure Methods
+    async clickCompositionsButton() {
+        await this.click(this.compositionsBtn);
     }
-    async insertSystemFieldValue(fieldValue) {
-        await this.clickInsertButton();
-        await (0, test_1.expect)(this.insertValueBtn).toBeVisible();
-        await this.insertValueBtn.click();
-        await (0, test_1.expect)(this.chooseFieldDropDown).toBeVisible();
-        await this.chooseFieldDropDown.click();
-        await (0, test_1.expect)(this.systemFieldsOption).toBeVisible();
-        await this.systemFieldsOption.click();
-        await (0, test_1.expect)(this.chooseFieldValueDropDown).toBeVisible();
-        await this.chooseFieldValueDropDown.click();
-        await (0, test_1.expect)(this.page.getByText(fieldValue)).toBeVisible();
-        await this.page.getByText(fieldValue).click();
-        await this.clickSubmitButton();
+    async clickAllowAtRootButton() {
+        await this.click(this.allowAtRootBtn);
     }
-    async insertPartialView(partialViewName) {
-        await this.clickInsertButton();
-        await (0, test_1.expect)(this.insertPartialViewBtn).toBeVisible();
-        await this.insertPartialViewBtn.click();
-        await (0, test_1.expect)(this.page.getByLabel(partialViewName)).toBeVisible();
-        await this.page.getByLabel(partialViewName).click();
-        await this.clickChooseButton();
+    async clickAllowedChildNodesButton() {
+        await this.click(this.allowedChildNodesModal.locator(this.chooseBtn));
     }
-    async deletePropertyEditorWithName(name) {
-        // We need to hover over the Property Editor to make the delete button visible
-        const propertyEditor = this.page.locator('umb-content-type-design-editor-property', { hasText: name });
-        await (0, test_1.expect)(propertyEditor).toBeVisible();
-        await propertyEditor.hover();
-        await (0, test_1.expect)(propertyEditor.getByLabel('Delete')).toBeVisible();
-        // Force click is needed
-        await propertyEditor.getByLabel('Delete').click({ force: true });
-        await this.clickConfirmToDeleteButton();
+    async clickAddCollectionButton() {
+        await this.click(this.addCollectionBtn);
     }
-    async clickRenameButton() {
-        await (0, test_1.expect)(this.renameBtn).toBeVisible();
-        await this.renameBtn.click();
+    // Reorder Methods
+    async clickIAmDoneReorderingButton() {
+        await this.click(this.iAmDoneReorderingBtn);
     }
-    async clickDeleteAndConfirmButton() {
-        await this.clickDeleteActionMenuOption();
-        await this.clickConfirmToDeleteButton();
+    async clickReorderButton() {
+        await this.click(this.reorderBtn);
     }
-    async clickDeleteButton() {
-        await (0, test_1.expect)(this.deleteBtn).toBeVisible();
-        await this.deleteBtn.click();
+    async clickLabelAboveButton() {
+        await this.click(this.labelAboveBtn);
     }
+    // Query Builder Methods
     async clickQueryBuilderButton() {
-        await (0, test_1.expect)(this.queryBuilderBtn).toBeVisible();
-        await this.queryBuilderBtn.click();
-        await this.page.waitForTimeout(500);
+        await this.click(this.queryBuilderBtn);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.short);
+    }
+    async addQueryBuilderWithOrderByStatement(propertyAlias, isAscending) {
+        await this.click(this.queryBuilderBtn, { timeout: ConstantHelper_1.ConstantHelper.timeout.long });
+        await this.click(this.orderByPropertyAliasBtn);
+        await this.waitAndSelectQueryBuilderDropDownList(propertyAlias);
+        await this.click(this.orderByPropertyAliasBtn);
+        if (!isAscending) {
+            await this.click(this.ascendingBtn);
+        }
+    }
+    async addQueryBuilderWithWhereStatement(propertyAlias, operator, constrainValue) {
+        await this.click(this.queryBuilderBtn, { timeout: ConstantHelper_1.ConstantHelper.timeout.long });
+        await this.click(this.wherePropertyAliasBtn);
+        await this.waitAndSelectQueryBuilderDropDownList(propertyAlias);
+        await this.click(this.whereOperatorBtn);
+        await this.waitAndSelectQueryBuilderDropDownList(operator);
+        await this.enterText(this.whereConstrainValueTxt, constrainValue);
+        await this.pressKey(this.whereConstrainValueTxt, 'Enter');
+    }
+    async waitAndSelectQueryBuilderDropDownList(option) {
+        const ddlOption = this.page.locator('[open]').locator('uui-combobox-list-option').filter({ hasText: option }).first();
+        await this.click(ddlOption, { timeout: ConstantHelper_1.ConstantHelper.timeout.long });
     }
     async chooseRootContentInQueryBuilder(contentName) {
-        await (0, test_1.expect)(this.chooseRootContentBtn).toBeVisible();
-        await this.chooseRootContentBtn.click();
+        await this.click(this.chooseRootContentBtn);
         await this.clickModalMenuItemWithName(contentName);
         await this.clickChooseButton();
     }
-    async reorderTwoGroups(firstGroupName, secondGroupName) {
-        const firstGroup = this.page.getByTestId('group:' + firstGroupName);
-        const secondGroup = this.page.getByTestId('group:' + secondGroupName);
-        const firstGroupValue = await firstGroup.getByLabel('Group').inputValue();
-        const secondGroupValue = await secondGroup.getByLabel('Group').inputValue();
-        const dragToLocator = firstGroup.locator('[slot="header"]').first();
-        const dragFromLocator = secondGroup.locator('[slot="header"]').first();
-        await this.dragAndDrop(dragFromLocator, dragToLocator, 0, 0, 20);
-        return { firstGroupValue, secondGroupValue };
-    }
-    async clickAllowedChildNodesButton() {
-        await (0, test_1.expect)(this.allowedChildNodesModal.locator(this.chooseBtn)).toBeVisible();
-        await this.allowedChildNodesModal.locator(this.chooseBtn).click();
-    }
-    async clickAddCollectionButton() {
-        await (0, test_1.expect)(this.addCollectionBtn).toBeVisible();
-        await this.addCollectionBtn.click();
+    async isQueryBuilderCodeShown(code) {
+        await this.click(this.queryBuilderShowCode);
+        await this.containsText(this.queryBuilderShowCode, code, ConstantHelper_1.ConstantHelper.timeout.long);
     }
     async doesReturnedItemsHaveCount(itemCount) {
-        await (0, test_1.expect)(this.returnedItemsCount).toContainText(itemCount.toString() + ' published items returned');
+        await this.containsText(this.returnedItemsCount, itemCount.toString() + ' published items returned');
     }
     async doesQueryResultHaveContentName(contentName) {
-        await (0, test_1.expect)(this.queryResults).toContainText(contentName);
-    }
-    async deleteGroup(groupName) {
-        await this.page.waitForTimeout(1000);
-        const groups = this.page.locator('umb-content-type-design-editor-group').all();
-        for (const group of await groups) {
-            if (await group.getByLabel('Group', { exact: true }).inputValue() === groupName) {
-                const headerActionsDeleteLocator = group.locator('[slot="header-actions"]').getByLabel('Delete');
-                await (0, test_1.expect)(headerActionsDeleteLocator).toBeVisible();
-                // Force click is needed
-                await headerActionsDeleteLocator.click({ force: true });
-                return;
-            }
-        }
+        await this.containsText(this.queryResults, contentName);
     }
-    async clickRemoveTabWithName(name) {
-        await (0, test_1.expect)(this.page.locator('uui-tab').filter({ hasText: name })).toBeVisible();
-        await this.page.locator('uui-tab').filter({ hasText: name }).hover();
-        const removeTabWithNameLocator = this.page.locator('uui-tab').filter({ hasText: name }).locator('[label="Remove"]');
-        await (0, test_1.expect)(removeTabWithNameLocator).toBeVisible();
-        await removeTabWithNameLocator.click();
+    // Insert Methods
+    async insertDictionaryItem(dictionaryName) {
+        await this.clickInsertButton();
+        await this.click(this.insertDictionaryItemBtn);
+        await this.click(this.page.getByLabel(dictionaryName));
+        await this.click(this.chooseBtn);
     }
-    async clickLeftArrowButton() {
-        await (0, test_1.expect)(this.leftArrowBtn).toBeVisible();
-        await this.leftArrowBtn.click();
+    async insertSystemFieldValue(fieldValue) {
+        await this.clickInsertButton();
+        await this.click(this.insertValueBtn);
+        await this.click(this.chooseFieldDropDown);
+        await this.click(this.systemFieldsOption);
+        await this.click(this.chooseFieldValueDropDown);
+        await this.click(this.page.getByText(fieldValue));
+        await this.clickSubmitButton();
     }
-    async clickToUploadButton() {
-        await (0, test_1.expect)(this.clickToUploadBtn).toBeVisible();
-        await this.clickToUploadBtn.click();
+    async insertPartialView(partialViewName) {
+        await this.clickInsertButton();
+        await this.click(this.insertPartialViewBtn);
+        await this.click(this.page.getByLabel(partialViewName));
+        await this.clickChooseButton();
     }
-    async uploadFile(filePath) {
-        const [fileChooser] = await Promise.all([
-            this.page.waitForEvent('filechooser'),
-            await this.clickToUploadButton(),
-        ]);
-        await fileChooser.setFiles(filePath);
+    // Rename Methods
+    async rename(newName) {
+        await this.clickRenameActionMenuOption();
+        await this.click(this.newNameTxt);
+        await this.enterText(this.newNameTxt, newName);
+        await this.click(this.renameModalBtn);
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.short);
     }
-    getTabLocatorWithName(name) {
-        return this.page.getByRole('tab', { name: name });
+    // Search & Filter Methods
+    async searchForTypeToFilterValue(searchValue) {
+        await this.enterText(this.typeToFilterSearchTxt, searchValue, { clearFirst: false });
     }
-    getTextLocatorWithName(name) {
-        return this.page.getByText(name, { exact: true });
+    // Description Methods
+    async enterDescription(description) {
+        await this.enterText(this.enterDescriptionTxt, description);
     }
-    getLocatorWithDataMark(dataMark) {
-        return this.page.getByTestId(dataMark);
+    async doesDescriptionHaveValue(value, index = 0) {
+        return await this.hasValue(this.descriptionBtn.nth(index), value);
     }
-    ;
-    async isFailedStateButtonVisible() {
-        await (0, test_1.expect)(this.failedStateButton).toBeVisible();
+    // Drag and Drop Methods
+    async dragAndDrop(dragFromSelector, dragToSelector, verticalOffset = 0, horizontalOffset = 0, steps = 5) {
+        await this.waitForVisible(dragFromSelector);
+        await this.waitForVisible(dragToSelector);
+        const targetLocation = await dragToSelector.boundingBox();
+        const elementCenterX = targetLocation.x + targetLocation.width / 2;
+        const elementCenterY = targetLocation.y + targetLocation.height / 2;
+        await this.hover(dragFromSelector);
+        await this.page.mouse.move(10, 10);
+        await this.hover(dragFromSelector);
+        await this.page.mouse.down();
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.debounce);
+        await this.page.mouse.move(elementCenterX + horizontalOffset, elementCenterY + verticalOffset, { steps: steps });
+        await this.page.waitForTimeout(ConstantHelper_1.ConstantHelper.wait.debounce);
+        await this.page.mouse.up();
     }
-    async clickContainerSaveAndPublishButton() {
-        await (0, test_1.expect)(this.containerSaveAndPublishBtn).toBeVisible();
-        await this.containerSaveAndPublishBtn.click();
-        await this.page.waitForTimeout(500);
+    // Create Link Methods
+    async clickCreateLink() {
+        await this.click(this.createLink);
     }
-    async clickConfirmTrashButton() {
-        await (0, test_1.expect)(this.confirmTrashBtn).toBeVisible();
-        await this.confirmTrashBtn.click();
-        await this.page.waitForTimeout(500);
+    // Recycle Bin Methods
+    async clickRecycleBinButton() {
+        await this.click(this.recycleBinBtn);
     }
     async reloadRecycleBin(containsItems = true) {
-        await (0, test_1.expect)(this.recycleBinMenuItem).toBeVisible();
-        // If the Recycle Bin does not contain any items,0 the caret button should not be visible. and we should not try to click it
+        await this.waitForVisible(this.recycleBinMenuItem);
         if (!containsItems) {
             await this.clickReloadChildrenActionMenuOption();
-            await (0, test_1.expect)(this.recycleBinMenuItemCaretBtn).not.toBeVisible();
+            await this.isVisible(this.recycleBinMenuItemCaretBtn, false);
             return;
         }
         await this.clickActionsMenuForName('Recycle Bin');
         await this.clickReloadChildrenActionMenuOption();
         await this.openCaretButtonForName('Recycle Bin');
     }
-    async clickRecycleBinButton() {
-        await (0, test_1.expect)(this.recycleBinBtn).toBeVisible();
-        await this.recycleBinBtn.click();
-    }
     async isItemVisibleInRecycleBin(item, isVisible = true, isReload = true) {
         if (isReload) {
             await this.reloadRecycleBin(isVisible);
         }
-        return await (0, test_1.expect)(this.page.locator('[label="Recycle Bin"] [label="' + item + '"]')).toBeVisible({ visible: isVisible });
+        return await this.isVisible(this.page.locator('[label="Recycle Bin"] [label="' + item + '"]'), isVisible);
     }
+    // View Methods
     async changeToGridView() {
-        await (0, test_1.expect)(this.viewBundleBtn).toBeVisible();
-        await this.viewBundleBtn.click();
-        await this.gridBtn.click();
+        await this.click(this.viewBundleBtn);
+        await this.click(this.gridBtn);
     }
     async changeToListView() {
-        await (0, test_1.expect)(this.viewBundleBtn).toBeVisible();
-        await this.viewBundleBtn.click();
-        await this.listBtn.click();
+        await this.click(this.viewBundleBtn);
+        await this.click(this.listBtn);
     }
     async isViewBundleButtonVisible(isVisible = true) {
-        return (0, test_1.expect)(this.viewBundleBtn).toBeVisible({ visible: isVisible });
-    }
-    async doesSuccessNotificationHaveText(text, isVisible = true, deleteNotification = false, timeout = 5000) {
-        const response = await (0, test_1.expect)(this.successNotification.filter({ hasText: text })).toBeVisible({
-            visible: isVisible,
-            timeout: timeout
-        });
-        if (deleteNotification) {
-            await this.successNotification.filter({ hasText: text }).getByLabel('close').click({ force: true });
-        }
-        return response;
-    }
-    async doesErrorNotificationHaveText(text, isVisible = true, deleteNotification = false) {
-        const response = await (0, test_1.expect)(this.errorNotification.filter({ hasText: text })).toBeVisible({ visible: isVisible });
-        if (deleteNotification) {
-            await this.errorNotification.filter({ hasText: text }).locator('svg').click();
-        }
-        return response;
-    }
-    async isSectionWithNameVisible(sectionName, isVisible = true) {
-        await (0, test_1.expect)(this.page.getByRole('tab', { name: sectionName })).toBeVisible({ visible: isVisible });
+        return this.isVisible(this.viewBundleBtn, isVisible);
     }
+    // Media Methods
     async clickMediaWithName(name) {
-        await (0, test_1.expect)(this.mediaCardItems.filter({ hasText: name })).toBeVisible();
-        await this.mediaCardItems.filter({ hasText: name }).click();
-    }
-    async clickChooseContentStartNodeButton() {
-        await (0, test_1.expect)(this.chooseDocumentInputBtn).toBeVisible();
-        await this.chooseDocumentInputBtn.click();
-    }
-    async clickChooseMediaStartNodeButton() {
-        await (0, test_1.expect)(this.chooseMediaInputBtn).toBeVisible();
-        await this.chooseMediaInputBtn.click();
-    }
-    async clickActionButton() {
-        await (0, test_1.expect)(this.actionBtn).toBeVisible();
-        await this.actionBtn.click();
-    }
-    async clickReferenceNodeLinkWithName(name) {
-        await (0, test_1.expect)(this.page.locator('[name="' + name + '"] a#open-part')).toBeVisible();
-        await this.page.locator('[name="' + name + '"] a#open-part').click();
-    }
-    async clickLinkWithName(name, isExact = false) {
-        await (0, test_1.expect)(this.page.getByRole('link', { name: name, exact: isExact })).toBeVisible();
-        await this.page.getByRole('link', { name: name, exact: isExact }).click();
-    }
-    async clickMediaPickerModalSubmitButton() {
-        await (0, test_1.expect)(this.mediaPickerModalSubmitBtn).toBeVisible();
-        await this.mediaPickerModalSubmitBtn.click();
+        await this.click(this.mediaCardItems.filter({ hasText: name }));
     }
     async selectMediaWithName(mediaName, isForce = false) {
         const mediaLocator = this.mediaCardItems.filter({ hasText: mediaName });
-        await (0, test_1.expect)(mediaLocator).toBeVisible();
+        await this.waitForVisible(mediaLocator);
+        // Using direct click with position option (not supported by BasePage.click)
         await mediaLocator.click({ position: { x: 0.5, y: 0.5 }, force: isForce });
     }
     async selectMediaWithTestId(mediaKey) {
         const locator = this.page.getByTestId('media:' + mediaKey);
-        await (0, test_1.expect)(locator).toBeVisible();
+        await this.waitForVisible(locator);
+        // Using direct click with position option (not supported by BasePage.click)
         await locator.click({ position: { x: 0.5, y: 0.5 } });
     }
-    async clickCreateModalButton() {
-        await (0, test_1.expect)(this.createModalBtn).toBeVisible();
-        await this.createModalBtn.click();
+    async clickMediaPickerModalSubmitButton() {
+        await this.click(this.mediaPickerModalSubmitBtn);
     }
     async clickMediaCaptionAltTextModalSubmitButton() {
-        await (0, test_1.expect)(this.mediaCaptionAltTextModalSubmitBtn).toBeVisible();
-        await this.mediaCaptionAltTextModalSubmitBtn.click();
-    }
-    // Embed Modal
-    async enterEmbeddedURL(value) {
-        await (0, test_1.expect)(this.embeddedURLTxt).toBeVisible();
-        await this.embeddedURLTxt.clear();
-        await this.embeddedURLTxt.fill(value);
+        await this.click(this.mediaCaptionAltTextModalSubmitBtn);
     }
-    async clickEmbeddedRetrieveButton() {
-        await (0, test_1.expect)(this.embeddedRetrieveBtn).toBeVisible();
-        await this.embeddedRetrieveBtn.click();
-    }
-    async clickEmbeddedMediaModalConfirmButton() {
-        await (0, test_1.expect)(this.embeddedMediaModalConfirmBtn).toBeVisible();
-        await this.embeddedMediaModalConfirmBtn.click();
+    async clickChooseMediaStartNodeButton() {
+        await this.click(this.chooseMediaInputBtn);
     }
-    async waitForEmbeddedPreviewVisible() {
-        await (0, test_1.expect)(this.embeddedPreview).toBeVisible();
+    async isMediaCardItemWithNameDisabled(itemName) {
+        await this.hasAttribute(this.mediaCardItems.filter({ hasText: itemName }), 'class', 'not-allowed');
     }
-    async isSubmitButtonDisabled() {
-        await (0, test_1.expect)(this.submitBtn).toBeVisible();
-        await (0, test_1.expect)(this.submitBtn).toHaveAttribute('disabled');
+    async isMediaCardItemWithNameVisible(itemName, isVisible = true) {
+        await this.isVisible(this.mediaCardItems.filter({ hasText: itemName }), isVisible);
     }
     async doesMediaHaveThumbnail(mediaId, thumbnailIconName, thumbnailImage) {
         const mediaThumbnailLocator = this.page.getByTestId('media:' + mediaId);
         if (thumbnailIconName === 'image') {
             const regexImageSrc = new RegExp(`^${thumbnailImage}.*`);
-            await (0, test_1.expect)(mediaThumbnailLocator.locator('umb-imaging-thumbnail img')).toHaveAttribute('src', regexImageSrc);
+            await this.hasAttribute(mediaThumbnailLocator.locator('umb-imaging-thumbnail img'), 'src', regexImageSrc.toString());
         }
         else {
-            await (0, test_1.expect)(mediaThumbnailLocator.locator('umb-imaging-thumbnail umb-icon')).toHaveAttribute('name', thumbnailIconName);
+            await this.hasAttribute(mediaThumbnailLocator.locator('umb-imaging-thumbnail umb-icon'), 'name', thumbnailIconName);
         }
     }
+    async isInputDropzoneVisible(isVisible = true) {
+        await this.isVisible(this.inputDropzone, isVisible);
+    }
+    async isImageCropperFieldVisible(isVisible = true) {
+        await this.isVisible(this.imageCropperField, isVisible);
+    }
+    async isInputUploadFieldVisible(isVisible = true) {
+        await this.isVisible(this.inputUploadField, isVisible);
+    }
+    // Upload Methods
+    async clickToUploadButton() {
+        await this.click(this.clickToUploadBtn);
+    }
+    async uploadFile(filePath) {
+        const [fileChooser] = await Promise.all([
+            this.page.waitForEvent('filechooser'),
+            await this.clickToUploadButton(),
+        ]);
+        await fileChooser.setFiles(filePath);
+    }
+    // Embedded Media Methods
+    async enterEmbeddedURL(value) {
+        await this.enterText(this.embeddedURLTxt, value);
+    }
+    async clickEmbeddedRetrieveButton() {
+        await this.click(this.embeddedRetrieveBtn);
+    }
+    async clickEmbeddedMediaModalConfirmButton() {
+        await this.click(this.embeddedMediaModalConfirmBtn);
+    }
+    async waitForEmbeddedPreviewVisible() {
+        await this.waitForVisible(this.embeddedPreview);
+    }
+    // Document Methods
+    async clickChooseContentStartNodeButton() {
+        await this.click(this.chooseDocumentInputBtn);
+    }
+    // User Methods
     async clickCurrentUserAvatarButton() {
-        await (0, test_1.expect)(this.currentUserAvatarBtn).toBeVisible();
-        await this.currentUserAvatarBtn.click({ force: true });
+        await this.click(this.currentUserAvatarBtn, { force: true });
     }
+    // Collection Methods
     async clickCreateActionButton() {
-        await (0, test_1.expect)(this.createActionBtn).toBeVisible();
-        await this.createActionBtn.click();
+        await this.click(this.createActionBtn);
     }
     async clickCreateActionWithOptionName(optionName) {
         await this.clickCreateActionButton();
         const createOptionLocator = this.createActionButtonCollection.locator('[label="' + optionName + '"]');
-        await (0, test_1.expect)(createOptionLocator).toBeVisible();
-        await createOptionLocator.click();
+        await this.click(createOptionLocator);
     }
     async doesCollectionTreeItemTableRowHaveName(name) {
-        await (0, test_1.expect)(this.collectionTreeItemTableRow.first()).toBeVisible();
-        await (0, test_1.expect)(this.collectionTreeItemTableRow.locator('[label="' + name + '"]')).toBeVisible();
+        await this.waitForVisible(this.collectionTreeItemTableRow.first());
+        await this.isVisible(this.collectionTreeItemTableRow.locator('[label="' + name + '"]'));
     }
     async doesCollectionTreeItemTableRowHaveIcon(name, icon) {
-        await (0, test_1.expect)(this.collectionTreeItemTableRow.first()).toBeVisible();
-        await (0, test_1.expect)(this.collectionTreeItemTableRow.filter({ hasText: name }).locator('umb-icon').locator('[name="' + icon + '"]')).toBeVisible();
+        await this.waitForVisible(this.collectionTreeItemTableRow.first());
+        await this.isVisible(this.collectionTreeItemTableRow.filter({ hasText: name }).locator('umb-icon').locator('[name="' + icon + '"]'));
     }
-    async clickFolderButton() {
-        await (0, test_1.expect)(this.folderBtn).toBeVisible();
-        await this.folderBtn.click();
+    // Reference Methods
+    async clickReferenceNodeLinkWithName(name) {
+        await this.click(this.page.locator('[name="' + name + '"] a#open-part'));
     }
     async doesReferenceHeadlineHaveText(text) {
-        await (0, test_1.expect)(this.referenceHeadline).toContainText(text);
+        await this.containsText(this.referenceHeadline, text);
     }
     async isReferenceHeadlineVisible(isVisible) {
-        await (0, test_1.expect)(this.referenceHeadline).toBeVisible({ visible: isVisible });
+        await this.isVisible(this.referenceHeadline, isVisible);
     }
     async doesReferenceItemsHaveCount(count) {
-        await (0, test_1.expect)(this.entityItemRef).toHaveCount(count);
+        await this.hasCount(this.entityItemRef, count);
     }
     async isReferenceItemNameVisible(itemName) {
-        await (0, test_1.expect)(this.entityItemRef.locator('uui-ref-node[name="' + itemName + '"]')).toBeVisible();
+        await this.isVisible(this.entityItemRef.locator('uui-ref-node[name="' + itemName + '"]'));
     }
     async doesReferencesContainText(text) {
-        await (0, test_1.expect)(this.confirmActionModalEntityReferences).toContainText(text);
-    }
-    async isValidationMessageVisible(message, isVisible = true) {
-        await (0, test_1.expect)(this.validationMessage.filter({ hasText: message })).toBeVisible({ visible: isVisible });
-    }
-    async isSuccessStateIconVisible() {
-        await (0, test_1.expect)(this.successStateIcon).toBeVisible();
-    }
-    async isPropertyEditorUiWithNameReadOnly(name) {
-        const propertyEditorUiLocator = this.page.locator('umb-property-editor-ui-' + name);
-        await (0, test_1.expect)(propertyEditorUiLocator).toHaveAttribute('readonly');
-    }
-    async isPropertyEditorUiWithNameVisible(name, isVisible = true) {
-        const propertyEditorUiLocator = this.page.locator('umb-property-editor-ui-' + name);
-        await (0, test_1.expect)(propertyEditorUiLocator).toBeVisible({ visible: isVisible });
+        await this.containsText(this.confirmActionModalEntityReferences, text);
     }
-    // Entity Action
+    // Entity Action Methods
     async clickEntityActionWithName(name) {
         const regex = new RegExp(`^entity-action:.*${name}$`);
-        await this.openEntityAction.getByTestId(regex).filter({ has: this.page.locator(':visible') }).click();
+        await this.click(this.openEntityAction.getByTestId(regex).filter({ has: this.page.locator(':visible') }));
     }
     async clickCreateActionMenuOption() {
         await this.clickEntityActionWithName('Create');
@@ -1230,69 +1199,63 @@ class UiBaseLocators {
     async clickUpdateActionMenuOption() {
         await this.clickEntityActionWithName('Update');
     }
-    async clickModalMenuItemWithName(name) {
-        await (0, test_1.expect)(this.openedModal.locator('uui-menu-item[label="' + name + '"]')).toBeVisible();
-        await this.openedModal.locator('uui-menu-item[label="' + name + '"]').click();
-    }
-    async isModalMenuItemWithNameDisabled(name) {
-        await (0, test_1.expect)(this.sidebarModal.locator('uui-menu-item[label="' + name + '"]')).toHaveAttribute('disabled');
-    }
-    async doesPropertyHaveInvalidBadge(propertyName) {
-        await (0, test_1.expect)(this.page.locator('umb-property-layout').filter({ hasText: propertyName }).locator('#invalid-badge uui-badge')).toBeVisible();
-    }
-    async isModalMenuItemWithNameVisible(name, isVisible = true) {
-        await (0, test_1.expect)(this.sidebarModal.locator('uui-menu-item[label="' + name + '"]')).toBeVisible({ visible: isVisible });
+    async clickLockActionMenuOption() {
+        await this.clickEntityActionWithName('Lock');
     }
+    // Entity Item Methods
     async clickEntityItemByName(itemName) {
-        await (0, test_1.expect)(this.page.locator('uui-ref-node,umb-ref-item[name="' + itemName + '"]')).toBeVisible();
-        await this.page.locator('uui-ref-node,umb-ref-item[name="' + itemName + '"]').click();
-    }
-    async isMediaCardItemWithNameDisabled(itemName) {
-        await (0, test_1.expect)(this.mediaCardItems.filter({ hasText: itemName })).toHaveAttribute('class', 'not-allowed');
-    }
-    async isMediaCardItemWithNameVisible(itemName, isVisible = true) {
-        await (0, test_1.expect)(this.mediaCardItems.filter({ hasText: itemName })).toBeVisible({ visible: isVisible });
+        await this.click(this.page.locator('uui-ref-node,umb-ref-item[name="' + itemName + '"]'));
     }
+    // Workspace Action Methods
     async clickWorkspaceActionMenuButton() {
-        await (0, test_1.expect)(this.workspaceActionMenuBtn).toBeVisible();
-        await this.workspaceActionMenuBtn.click();
-    }
-    async clickLockActionMenuOption() {
-        await this.clickEntityActionWithName('Lock');
+        await this.click(this.workspaceActionMenuBtn);
     }
-    async isDashboardTabWithNameVisible(name, isVisible = true) {
-        await (0, test_1.expect)(this.page.locator('uui-tab[label="' + name + '"]')).toBeVisible({ visible: isVisible });
+    // Pagination Methods
+    async clickNextPaginationButton() {
+        await this.click(this.nextPaginationBtn);
     }
+    // Editor Methods
     async enterMonacoEditorValue(value) {
-        await (0, test_1.expect)(this.monacoEditor).toBeVisible();
-        await this.monacoEditor.click();
-        await this.page.keyboard.press('Control+A');
-        await this.page.keyboard.press('Backspace');
+        await this.click(this.monacoEditor);
+        await this.pressKey(this.monacoEditor, 'Control+A');
+        await this.pressKey(this.monacoEditor, 'Backspace');
         await this.page.keyboard.insertText(value);
     }
+    // Loader Methods
     async waitUntilUiLoaderIsNoLongerVisible() {
-        await (0, test_1.expect)(this.uiLoader).toBeVisible({ visible: false, timeout: 10000 });
+        await this.waitForHidden(this.uiLoader, 10000);
+    }
+    // Dashboard Methods
+    async isDashboardTabWithNameVisible(name, isVisible = true) {
+        await this.isVisible(this.page.locator('uui-tab[label="' + name + '"]'), isVisible);
     }
     async isWorkspaceViewTabWithAliasVisible(alias, isVisible = true) {
-        await (0, test_1.expect)(this.page.getByTestId('workspace:view-link:' + alias)).toBeVisible({ visible: isVisible });
+        await this.isVisible(this.page.getByTestId('workspace:view-link:' + alias), isVisible);
     }
-    async clickRestoreButton() {
-        await (0, test_1.expect)(this.restoreBtn).toBeVisible();
-        await this.restoreBtn.click();
+    // Submit Button Methods
+    async isSubmitButtonDisabled() {
+        await this.isVisible(this.submitBtn);
+        await this.isDisabled(this.submitBtn);
     }
-    async isInputDropzoneVisible(isVisible = true) {
-        await (0, test_1.expect)(this.inputDropzone).toBeVisible({ visible: isVisible });
+    // Data Element Methods
+    async clickDataElement(elementName, options = null) {
+        await this.click(this.page.locator(`[data-element="${elementName}"]`), options);
     }
-    async isImageCropperFieldVisible(isVisible = true) {
-        await (0, test_1.expect)(this.imageCropperField).toBeVisible({ visible: isVisible });
+    async getDataElement(elementName) {
+        return this.page.locator(`[data-element="${elementName}"]`);
     }
-    async isInputUploadFieldVisible(isVisible = true) {
-        await (0, test_1.expect)(this.inputUploadField).toBeVisible({ visible: isVisible });
+    getLocatorWithDataMark(dataMark) {
+        return this.page.getByTestId(dataMark);
     }
-    async isBackOfficeMainVisible(isVisible = true) {
-        // We need to wait to make sure the page has loaded
-        await this.page.waitForTimeout(1000);
-        await (0, test_1.expect)(this.backOfficeMain).toBeVisible({ visible: isVisible });
+    // Text Visibility Methods
+    async isTextWithExactNameVisible(name, isVisible = true) {
+        return (0, test_1.expect)(this.page.getByText(name, { exact: true })).toBeVisible({ visible: isVisible });
+    }
+    async isTextWithMessageVisible(message, isVisible = true) {
+        return await (0, test_1.expect)(this.page.getByText(message)).toBeVisible({ visible: isVisible });
+    }
+    getTextLocatorWithName(name) {
+        return this.page.getByText(name, { exact: true });
     }
 }
 exports.UiBaseLocators = UiBaseLocators;