diff --git a/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/FrontendDataSet.js b/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/FrontendDataSet.js index 122d406b0214c6..e6e18b343ea164 100644 --- a/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/FrontendDataSet.js +++ b/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/FrontendDataSet.js @@ -614,6 +614,7 @@ const FrontendDataSet = ({ deselectItems={(items) => deselectItems(items)} fluid={style === 'fluid'} items={items} + onBulkActionsClear={deselectItems(selectedItemsValue)} selectItems={(items) => selectItems(items)} selectedItems={selectedItems} selectedItemsKey={selectedItemsKey} diff --git a/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/management_bar/ManagementBar.js b/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/management_bar/ManagementBar.js index 095f501c0e8703..a055edc71359d7 100644 --- a/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/management_bar/ManagementBar.js +++ b/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/management_bar/ManagementBar.js @@ -16,6 +16,7 @@ function ManagementBar({ deselectItems, fluid, items, + onBulkActionsClear, selectItems, selectedItems, selectedItemsKey, @@ -46,6 +47,7 @@ function ManagementBar({ fluid={fluid} handleCheckboxClick={handleCheckboxClick} items={items} + onClear={onBulkActionsClear} pageSelectedItemsValue={pageSelectedItemsValue} selectItems={selectItems} selectedItems={selectedItems} diff --git a/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/management_bar/controls/BulkActions.js b/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/management_bar/controls/BulkActions.js index e9b8167872cb38..c21d039c9775ba 100644 --- a/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/management_bar/controls/BulkActions.js +++ b/modules/apps/frontend-data-set/frontend-data-set-web/src/main/resources/META-INF/resources/management_bar/controls/BulkActions.js @@ -35,6 +35,7 @@ function BulkActions({ fluid, handleCheckboxClick, items, + onClear, pageSelectedItemsValue, selectItems, selectedItems, @@ -270,6 +271,19 @@ function BulkActions({ )} + {Liferay.FeatureFlags['LPD-42570'] && ( + { + event.preventDefault(); + onClear(); + }} + > + {Liferay.Language.get('clear')} + + )} + { await expect(page.getByText('15 of 75 Items Selected')).toBeVisible(); }); + + await test.step('Unselect all items using clear button', async () => { + await page.getByText('Clear').click(); + + await expect(itemsSelectorCheckbox).not.toBeChecked(); + + await expect( + page.getByText('15 of 75 Items Selected') + ).not.toBeVisible(); + }); }); accountSettingsTest(