Merging v16/dev to v17/dev branch (#315)

* Add helper: for property action, dashboard (#294)

* Add helper for property action

* add dashboard helper

* Update lib/helpers/UiBaseLocators.ts

Co-authored-by: Nhu Dinh <[email protected]>

* Bumped version

---------

Co-authored-by: Lan Nguyen Thuy <[email protected]>
Co-authored-by: Nhu Dinh <[email protected]>
Co-authored-by: Nhu Dinh <[email protected]>

* Add helper: for block custom view (#299)

* add helper for block custom view

* Update lib/helpers/ContentUiHelper.ts

Co-authored-by: Nhu Dinh <[email protected]>

* Update lib/helpers/ContentUiHelper.ts

Co-authored-by: Nhu Dinh <[email protected]>

* Update lib/helpers/ContentUiHelper.ts

Co-authored-by: Nhu Dinh <[email protected]>

* Update lib/helpers/ContentUiHelper.ts

Co-authored-by: Nhu Dinh <[email protected]>

* Update lib/helpers/ContentUiHelper.ts

Co-authored-by: Nhu Dinh <[email protected]>

* Update lib/helpers/DataTypeApiHelper.ts

Co-authored-by: Nhu Dinh <[email protected]>

* change locator

* Fix parameter name

* add verson and format code

* fix conflict

---------

Co-authored-by: Lan Nguyen Thuy <[email protected]>
Co-authored-by: Nhu Dinh <[email protected]>

* Add helper: for workspace view (#298)

* Add helper: for workspace view

* Update lib/helpers/ContentUiHelper.ts

Co-authored-by: Nhu Dinh <[email protected]>

* move method into UiBaseLocators

* update version

---------

Co-authored-by: Lan Nguyen Thuy <[email protected]>
Co-authored-by: Nhu Dinh <[email protected]>

* V16: Updates Language menu label locator (#300)

* Language menu locate exact label text

This is to support PR umbraco/Umbraco-CMS#20458

* Bump version number

* add new version (#302)

Co-authored-by: Lan Nguyen Thuy <[email protected]>

* V16 Cherrypick changes from 17 (#311)

* Updated helpers

* Bumped version

* Add helper: for custom collection view (#313)

* add helper for custom collection view

* Update lib/helpers/ContentUiHelper.ts

Co-authored-by: Nhu Dinh <[email protected]>

* Update lib/helpers/ContentUiHelper.ts

Co-authored-by: Nhu Dinh <[email protected]>

* update some names

---------

Co-authored-by: Lan Nguyen Thuy <[email protected]>
Co-authored-by: Nhu Dinh <[email protected]>

* V16 reverted updates from 17 (#314)

* Updated helpers

* Bumped version

---------

Co-authored-by: NguyenThuyLan <[email protected]>
Co-authored-by: Lan Nguyen Thuy <[email protected]>
Co-authored-by: Lee Kelleher <[email protected]>
Co-authored-by: Andreas Zerbst <[email protected]>

Author: 5 people

lib/helpers/ContentUiHelper.ts

@@ -170,6 +170,10 @@ export class ContentUiHelper extends UiBaseLocators {
   private readonly mediaPickerSearchTxt: Locator;
   private readonly memberPickerSearchTxt: Locator;
   private readonly documentCreateOptionsModal: Locator;
+  private readonly refListBlock: Locator;
+  private readonly propertyActionMenu: Locator;
+  private readonly documentCreateOptionsModal: Locator;
+  private readonly listViewCustomRows: Locator;
 
   constructor(page: Page) {
     super(page);
@@ -306,6 +310,7 @@ export class ContentUiHelper extends UiBaseLocators {
     this.blockGridAreasContainer = page.locator('umb-block-grid-areas-container');
     this.blockGridEntries = page.locator('umb-block-grid-entries');
     this.inlineCreateBtn = page.locator('uui-button-inline-create');
+    this.refListBlock = page.locator('umb-ref-list-block');
     // TipTap
     this.tipTapPropertyEditor = page.locator('umb-property-editor-ui-tiptap');
     this.tipTapEditor = this.tipTapPropertyEditor.locator('#editor .tiptap');
@@ -348,6 +353,10 @@ export class ContentUiHelper extends UiBaseLocators {
     this.treePickerSearchTxt = this.page.locator('umb-tree-picker-modal #input');
     this.mediaPickerSearchTxt = this.page.locator('umb-media-picker-modal #search #input');
     this.memberPickerSearchTxt = this.page.locator('umb-member-picker-modal #input');
+    // Property Actions
+    this.propertyActionMenu = page.locator('#property-action-popover umb-popover-layout');
+    // List view custom
+    this.listViewCustomRows = page.locator('table tbody tr');
   }
 
   async enterContentName(name: string) {
@@ -1708,6 +1717,33 @@ export class ContentUiHelper extends UiBaseLocators {
   async isContentNameReadOnly() {
     await expect(this.contentNameTxt).toHaveAttribute('readonly');
   }
+
+  // Block Custom View
+  async isBlockCustomViewVisible(blockCustomViewLocator: string, isVisible: boolean = true) {
+    await expect(this.page.locator(blockCustomViewLocator)).toBeVisible({visible: isVisible});
+  }
+
+  async isSingleBlockElementVisible(isVisible: boolean = true) {
+    const count = await this.refListBlock.count();
+    if (isVisible) {
+      expect(count, `Expected only one element, but found ${count}`).toBe(1);
+    } else {
+      expect(count, `Expected only one element, but found ${count}`).toBe(0);
+    }
+    await expect(this.refListBlock).toBeVisible({visible: isVisible});
+  }
+
+  async doesBlockCustomViewHaveValue(customBlockViewLocator: string, valueText: string) {
+    const locator = this.page.locator(`${customBlockViewLocator} p`);
+    await expect(locator).toBeVisible();
+    await expect(locator).toHaveText(valueText);
+  }
+  
+  async clickPropertyActionWithName(name: string) {
+    const actionLocator = this.propertyActionMenu.locator('umb-property-action uui-menu-item[label="' + name + '"]');
+    await expect(actionLocator).toBeVisible();
+    await actionLocator.click();
+  }
 
   async isContentWithNameVisibleInList(contentName: string, isVisible: boolean = true) {
     await expect(this.documentTableColumnName.filter({hasText: contentName})).toBeVisible({visible: isVisible});
@@ -1721,4 +1757,17 @@ export class ContentUiHelper extends UiBaseLocators {
   async doesDocumentModalHaveText(text: string) {
     await expect(this.documentCreateOptionsModal).toContainText(text);
   }
+
+  async doesListViewItemsHaveCount(pageSize: number){
+    await expect(this.listViewCustomRows).toHaveCount(pageSize);
+  }
+
+  async isListViewItemWithNameVisible(itemName: string, index: number = 0){
+    await expect(this.listViewCustomRows.nth(index)).toContainText(itemName);
+  }
+
+  async clickPaginationNextButton(){
+    await expect(this.nextBtn).toBeVisible();
+    await this.nextBtn.click();
+  }
 }

lib/helpers/DataTypeApiHelper.ts

@@ -314,6 +314,22 @@ export class DataTypeApiHelper {
 
     return await this.save(blockList);
   }
+
+  async createBlockListDataTypeWithTwoBlocks(name: string, firstContentElementTypeId: string, secondContentElementTypeId: string) {
+    await this.ensureNameNotExists(name);
+  
+    const blockList = new BlockListDataTypeBuilder()
+      .withName(name)
+      .addBlock()
+        .withContentElementTypeKey(firstContentElementTypeId)
+        .done()
+      .addBlock()
+        .withContentElementTypeKey(secondContentElementTypeId)
+        .done()
+      .build();
+
+    return await this.save(blockList);
+  }
 
   async createBlockListDataTypeWithABlock(name: string, contentElementTypeId: string) {
     await this.ensureNameNotExists(name);
@@ -1204,6 +1220,32 @@ export class DataTypeApiHelper {
     return await this.save(dataType);
   }
 
+  async createListViewContentDataTypeWithLayoutAndPageSize(name: string = 'List View - Content Test', layoutAlias: string = 'Umb.CollectionView.Document.Table', layoutName: string = 'List', pageSize: number = 100 ) {
+    await this.ensureNameNotExists(name);
+
+    const dataType = new ListViewDataTypeBuilder()
+      .withName(name)
+      .withPageSize(pageSize)
+      .withOrderDirection('asc')
+      .addLayout()
+        .withName(layoutName)
+        .withIcon('icon-list')
+        .withCollectionView(layoutAlias)
+        .done()
+      .addColumnDisplayedProperty()
+        .withAlias('updateDate')
+        .withHeader('Last edited')
+        .withIsSystem(true)
+        .done()
+      .addColumnDisplayedProperty()
+        .withAlias('creator')
+        .withHeader('Updated by')
+        .withIsSystem(true)
+        .done()
+      .build();
+    return await this.save(dataType);
+  }
+
   async createListViewContentDataTypeWithAllPermissions(name: string = 'List View - Content Test') {
     await this.ensureNameNotExists(name);
 

lib/helpers/UiBaseLocators.ts

@@ -1408,6 +1408,10 @@ export class UiBaseLocators {
     await this.clickEntityActionWithName('Lock');
   }
 
+  async isDashboardTabWithNameVisible(name: string, isVisible: boolean = true) {
+    await expect(this.page.locator('uui-tab[label="' + name + '"]')).toBeVisible({visible: isVisible});
+  }
+  
   async enterMonacoEditorValue(value: string) {
     await expect(this.monacoEditor).toBeVisible();
     await this.monacoEditor.click();
@@ -1423,8 +1427,4 @@ export class UiBaseLocators {
   async isWorkspaceViewTabWithAliasVisible(alias: string, isVisible: boolean = true) {
     await expect(this.page.getByTestId('workspace:view-link:' + alias)).toBeVisible({ visible: isVisible });
   }
-
-  async isDashboardTabWithNameVisible(name: string, isVisible: boolean = true) {
-    await expect(this.page.locator('uui-tab[label="' + name + '"]')).toBeVisible({visible: isVisible});
-  }
 }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbraco/playwright-testhelpers",
-  "version": "17.0.0-beta.9",
+  "version": "17.0.1",
   "description": "Test helpers for making playwright tests for Umbraco solutions",
   "main": "dist/lib/index.js",
   "files": [