diff --git a/e2e/playwright/info-drawer/src/tests/comments.e2e.ts b/e2e/playwright/info-drawer/src/tests/comments.e2e.ts index a8869dc2a3..d2ce0e24d0 100755 --- a/e2e/playwright/info-drawer/src/tests/comments.e2e.ts +++ b/e2e/playwright/info-drawer/src/tests/comments.e2e.ts @@ -115,7 +115,7 @@ test.describe('Info Drawer - Comments', () => { await fileActionsApi.waitForNodes(recentFile, { expect: 1 }); await recentFilesPage.navigate(); await expect(recentFilesPage.dataTable.getRowByName(recentFile)).toBeVisible(); - await recentFilesPage.dataTable.getRowByName(recentFile).click(); + await recentFilesPage.dataTable.selectItem(recentFile); await recentFilesPage.acaHeader.viewDetails.click(); await recentFilesPage.infoDrawer.commentsTab.click(); await expect(recentFilesPage.infoDrawer.commentInputField).toBeVisible(); diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html index a5145fe998..c8ae1db407 100644 --- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html +++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html @@ -12,7 +12,8 @@

{{ 'APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITL acaContextActions [node]="$any(list)" [loading]="isLoading" - [selectionMode]="'single'" + [selectionMode]="'multiple'" + [multiselect]="true" [navigate]="false" [sorting]="['title', 'asc']" [sortingMode]="'client'" diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.html b/projects/aca-content/src/lib/components/favorites/favorites.component.html index 12530b4239..c95652f541 100644 --- a/projects/aca-content/src/lib/components/favorites/favorites.component.html +++ b/projects/aca-content/src/lib/components/favorites/favorites.component.html @@ -12,6 +12,7 @@

{{ 'APP.BROWSE.FAVORITES.TITLE' | translate }}

acaContextActions [currentFolderId]="'-favorites-'" [selectionMode]="'multiple'" + [multiselect]="true" [navigate]="false" [sorting]="['modifiedAt', 'desc']" [sortingMode]="'client'" diff --git a/projects/aca-content/src/lib/components/files/files.component.html b/projects/aca-content/src/lib/components/files/files.component.html index bcee7562e2..af6d4ec325 100644 --- a/projects/aca-content/src/lib/components/files/files.component.html +++ b/projects/aca-content/src/lib/components/files/files.component.html @@ -16,7 +16,7 @@ acaDocumentList acaContextActions [selectionMode]="'multiple'" - [multiselect]="false" + [multiselect]="true" [currentFolderId]="node?.id" [loading]="true" [showHeader]="showHeader" diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.html b/projects/aca-content/src/lib/components/libraries/libraries.component.html index 7621c605a1..6f74f05ec5 100644 --- a/projects/aca-content/src/lib/components/libraries/libraries.component.html +++ b/projects/aca-content/src/lib/components/libraries/libraries.component.html @@ -11,7 +11,8 @@

{{ 'APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE' | t acaDocumentList acaContextActions [currentFolderId]="'-mysites-'" - [selectionMode]="'single'" + [selectionMode]="'multiple'" + [multiselect]="true" [navigate]="false" [sorting]="['title', 'asc']" [sortingMode]="'client'" diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html index 85ca8aa7ed..ef06f8ed9b 100644 --- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html +++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html @@ -12,6 +12,7 @@

{{ 'APP.BROWSE.RECENT.TITLE' | translate }}

acaContextActions [currentFolderId]="'-recent-'" [selectionMode]="'multiple'" + [multiselect]="true" [navigate]="false" [sorting]="['modifiedAt', 'desc']" [sortingMode]="'client'" diff --git a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html index 13f7a57085..4ad5dbebb0 100644 --- a/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html +++ b/projects/aca-content/src/lib/components/search/search-libraries-results/search-libraries-results.component.html @@ -26,7 +26,8 @@ acaContextActions acaDocumentList [showHeader]="showHeader" - [selectionMode]="'single'" + [selectionMode]="'multiple'" + [multiselect]="true" [sorting]="['name', 'asc']" [node]="data" [imageResolver]="imageResolver" diff --git a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html index 63a3726d34..d642335ff1 100644 --- a/projects/aca-content/src/lib/components/search/search-results/search-results.component.html +++ b/projects/aca-content/src/lib/components/search/search-results/search-results.component.html @@ -37,6 +37,7 @@ acaDocumentList acaContextActions [selectionMode]="'multiple'" + [multiselect]="true" [sortingMode]="'server'" [sorting]="sorting" [imageResolver]="imageResolver" diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html index 5eb363f3fb..f896aacd78 100644 --- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html +++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html @@ -12,6 +12,7 @@

{{ 'APP.BROWSE.SHARED.TITLE' | translate }}

acaContextActions [currentFolderId]="'-sharedlinks-'" [selectionMode]="'multiple'" + [multiselect]="true" [sorting]="['modifiedAt', 'desc']" [imageResolver]="imageResolver" [sortingMode]="'client'" diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html index db1c41b173..5e9f75849f 100644 --- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html +++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html @@ -12,7 +12,7 @@

{{ 'APP.BROWSE.TRASHCAN.TITLE' | translate }}

acaContextActions [currentFolderId]="'-trashcan-'" [selectionMode]="'multiple'" - [multiselect]="false" + [multiselect]="true" [navigate]="false" [sortingMode]="'client'" [imageResolver]="imageResolver" diff --git a/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts b/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts index c6a160ed1d..7b4cfb731b 100644 --- a/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts +++ b/projects/aca-playwright-shared/src/page-objects/components/dataTable/data-table.component.ts @@ -80,7 +80,7 @@ export class DataTableComponent extends BaseComponent { /** * Method used in cases where we want to retrieve a row from the datatable based on its numerical order within the array. - * + * * @returns reference to cell element which contains text. */ getNthRow = (orderNum: number): Locator => this.getRowLocator.nth(orderNum); @@ -238,11 +238,11 @@ export class DataTableComponent extends BaseComponent { } async selectItem(name: string): Promise { - const isSelected = await this.hasCheckMarkIcon(name); + const isSelected = await this.isRowSelected(name); if (!isSelected) { let row = this.getRowByName(name); await row.locator('[title="Size"]').click({ modifiers: ['Meta'] }); - await row.locator('.adf-datatable-selected').waitFor({ state: 'attached' }); + await row.locator('.adf-datatable-checkbox .mat-checkbox-checked').waitFor({ state: 'attached' }); } } @@ -250,15 +250,15 @@ export class DataTableComponent extends BaseComponent { await this.page.keyboard.down('Meta'); let row = this.getRowByName(name); await row.locator('[title="Size"]').click(); - await row.locator('.adf-datatable-selected').waitFor({ state: 'attached' }); + await row.locator('.adf-datatable-checkbox .mat-checkbox-checked').waitFor({ state: 'attached' }); row = this.getRowByName(name2); await row.locator('[title="Size"]').click(); - await row.locator('.adf-datatable-selected').waitFor({ state: 'attached' }); + await row.locator('.adf-datatable-checkbox .mat-checkbox-checked').waitFor({ state: 'attached' }); } - async hasCheckMarkIcon(itemName: string): Promise { + async isRowSelected(itemName: string): Promise { const row = this.getRowByName(itemName); - return await row.locator('.adf-datatable-selected').isVisible(); + return await row.locator('.adf-datatable-checkbox .mat-checkbox-checked').isVisible(); } async getColumnHeaders(): Promise> { @@ -338,9 +338,9 @@ export class DataTableComponent extends BaseComponent { await this.paginationOptions.getByText("50").click(); } - /** + /** * Method used to create objects from names and visibility of sites from datatable - * + * * @returns an object with sites' names and their corresponding visibility values */ async getSitesNameAndVisibility(): Promise<{ [siteName: string]: string }> { @@ -356,9 +356,9 @@ export class DataTableComponent extends BaseComponent { return sitesInfo; } - /** + /** * Method used to create objects from names and roles of sites from datatable - * + * * @returns an object with sites' names and their corresponding role values */ async getSitesNameAndRole(): Promise<{ [siteName: string]: string }> {