Merge branch 'liferay:master' into master

modules/apps/export-import/export-import-api/bnd.bnd

@@ -1,6 +1,6 @@
 Bundle-Name: Liferay Export Import API
 Bundle-SymbolicName: com.liferay.exportimport.api
-Bundle-Version: 7.4.1
+Bundle-Version: 7.5.0
 Export-Package:\
 	com.liferay.exportimport.configuration,\
 	com.liferay.exportimport.constants,\

modules/apps/export-import/export-import-api/src/main/resources/com/liferay/exportimport/configuration/packageinfo

@@ -1 +1 @@
-version 2.3.0
+version 2.4.0

modules/apps/frontend-taglib/frontend-taglib-clay/src/main/java/com/liferay/frontend/taglib/clay/servlet/taglib/ManagementToolbarTag.java

@@ -1092,13 +1092,7 @@ protected int processStartTag() throws Exception {
 			jspWriter.write(" /><span class=\"input-group-inset-item");
 			jspWriter.write(" input-group-inset-item-after\"><button class=\"");
 			jspWriter.write(" navbar-breakpoint-d-none btn btn-monospaced");
-			jspWriter.write(" btn-unstyled\">");
-
-			if (disabled) {
-				jspWriter.write(" disabled");
-			}
-
-			jspWriter.write(" type=\"button\">");
+			jspWriter.write(" btn-unstyled\" disabled type=\"button\">");
 
 			iconTag = new IconTag();
 
@@ -1109,13 +1103,7 @@ protected int processStartTag() throws Exception {
 			jspWriter.write("</button><button aria-label=\"");
 			jspWriter.write(LanguageUtil.get(resourceBundle, "search"));
 			jspWriter.write("\" class=\"btn btn-monospaced");
-			jspWriter.write(" btn-unstyled\"");
-
-			if (disabled) {
-				jspWriter.write(" disabled");
-			}
-
-			jspWriter.write(" type=\"submit\">");
+			jspWriter.write(" btn-unstyled\" disabled type=\"submit\">");
 
 			iconTag = new IconTag();
 

modules/apps/frontend-taglib/frontend-taglib-clay/src/main/java/com/liferay/frontend/taglib/clay/servlet/taglib/display/context/ManagementToolbarDisplayContext.java

@@ -98,7 +98,7 @@ public default String getSearchFormMethod() {
 	}
 
 	public default String getSearchFormName() {
-		return null;
+		return "fm";
 	}
 
 	public default String getSearchInputName() {

modules/apps/frontend-taglib/frontend-taglib-clay/src/main/resources/META-INF/resources/management_toolbar/SearchControls.js

@@ -7,7 +7,7 @@ import {ClayButtonWithIcon} from '@clayui/button';
 import {FocusTrap} from '@clayui/core';
 import {ClayInput} from '@clayui/form';
 import {ManagementToolbar} from 'frontend-js-components-web';
-import React, {useEffect, useRef} from 'react';
+import React, {useEffect, useRef, useState} from 'react';
 
 const SearchControls = ({
 	disabled,
@@ -22,17 +22,44 @@ const SearchControls = ({
 	searchValue,
 }) => {
 	const searchInputRef = useRef();
+	const [searchDisabled, setSearchDisabled] = useState(true);
+
+	const onClick = () => {
+		setSearchDisabled(true);
+
+		const form = document.getElementById(`${searchFormName}_search`);
+
+		submitForm(form);
+	};
 
 	useEffect(() => {
 		if (searchMobile) {
 			searchInputRef.current.focus();
 		}
 	}, [searchMobile]);
 
+	useEffect(() => {
+		const onPageLoad = () => {
+			setSearchDisabled(false);
+		};
+
+		if (!disabled) {
+			if (document.readyState === 'complete') {
+				onPageLoad();
+			}
+			else {
+				window.addEventListener('load', onPageLoad);
+
+				return () => window.removeEventListener('load', onPageLoad);
+			}
+		}
+	}, [disabled]);
+
 	return (
 		<>
 			<ManagementToolbar.Search
 				action={searchActionURL}
+				id={`${searchFormName}_search`}
 				method={searchFormMethod}
 				name={searchFormName}
 				showMobile={searchMobile}
@@ -63,8 +90,9 @@ const SearchControls = ({
 							<ClayInput.GroupInsetItem after tag="span">
 								<ClayButtonWithIcon
 									aria-label={Liferay.Language.get('search')}
-									disabled={disabled}
+									disabled={searchDisabled}
 									displayType="unstyled"
+									onClick={onClick}
 									symbol="search"
 									title={Liferay.Language.get('search-for')}
 									type="submit"

modules/apps/object/object-test/src/testFunctional/tests/ObjectPersonalData.testcase

@@ -221,6 +221,8 @@ definition {
 			ObjectAdmin.gotoRelationshipsTab();
 
 			CreateObject.addRelationshipAndSelectEntry(titleFieldName = "Entry D");
+
+			Refresh();
 		}
 
 		task ("When the admin user deletes the user's personal data and reactivates the user in Users and Organizations") {

portal-web/test/functional/com/liferay/portalweb/macros/frontendinfrastructure/DataSetAdmin.macro

@@ -93,6 +93,52 @@ definition {
 		}
 	}
 
+	macro createAndConfigureDataSetEntry {
+		DataSetAdmin.goToDataSetAdminPage();
+
+		DataSetAdmin.createDataSetEntryViaAPI(
+			dataSetName = ${dataSetName},
+			restApplication = ${restApplication},
+			restEndpoint = ${restEndpoint},
+			restSchema = ${restSchema});
+
+		Refresh();
+
+		DataSetAdmin.goToViews(dataSetName = ${dataSetName});
+
+		DataSetAdmin.createDataSetView(
+			description = ${dataSetViewDescription},
+			key_name = ${dataSetViewName});
+
+		DataSetAdmin.goToSpecificViewPage(
+			dataSetName = ${dataSetName},
+			key_viewName = ${dataSetViewName});
+
+		if (isSet(key_fieldList)) {
+			DataSetAdmin.goToTab(tabName = "Fields");
+
+			DataSetAdmin.addFields(key_fieldList = ${key_fieldList});
+
+			Button.clickSave();
+		}
+
+		if (isSet(key_ListItemsPerPage)) {
+			DataSetAdmin.goToTab(tabName = "Pagination");
+
+			Type(
+				key_label = "List of Items per Page",
+				locator1 = "Gmail#GMAIL_HTML_MODE_MESSAGE_QUICK_REPLY_FIELD",
+				value1 = ${key_ListItemsPerPage});
+
+			Type(
+				key_type = "Default Items per Page",
+				locator1 = "DataSet#EDIT_DATA_SET_VIEW",
+				value1 = ${key_DefaultItemsperPage});
+
+			Button.clickSave();
+		}
+	}
+
 	macro createASort {
 		LexiconEntry.gotoAdd();
 

portal-web/test/functional/com/liferay/portalweb/macros/frontendinfrastructure/DataSetFragment.macro

@@ -0,0 +1,27 @@
+definition {
+
+	macro addDataSetView {
+		PageEditor.gotoConfiguration(fragmentName = "Data Set");
+
+		Click.javaScriptClick(locator1 = "DataSet#SELECT_DATA_SET_VIEW");
+
+		SelectFrame(
+			key_title = "Select",
+			locator1 = "IFrame#MODAL_ANY");
+
+		Click.clickAtNotVisible(
+			key_radioOption = ${dataSetViewName},
+			locator1 = "CommerceEntry#RADIO_BUTTON");
+
+		Button.clickSave();
+	}
+
+	macro viewColumnTitle {
+		for (var key_colunmTitle : list ${key_colunmTitleList}) {
+			AssertElementPresent(
+				key_field = ${key_colunmTitle},
+				locator1 = "FrontendDataSet#TABLE_ITEM_COLUMN");
+		}
+	}
+
+}

portal-web/test/functional/com/liferay/portalweb/macros/frontendinfrastructure/FrontendDataSetCustomView.macro

@@ -159,12 +159,6 @@ definition {
 			value1 = ${key_filter});
 	}
 
-	macro viewColumn {
-		VerifyElementPresent(
-			key_field = ${key_field},
-			locator1 = "FrontendDataSet#TABLE_ITEM_COLUMN");
-	}
-
 	macro viewNoColumn {
 		AssertElementNotPresent(
 			key_field = ${key_field},

portal-web/test/functional/com/liferay/portalweb/paths/portlet/frontenddataset/DataSet.path

@@ -318,6 +318,15 @@
 	<td>//table[contains(@class,'table-list')]//tr[contains(@class,'orderable-table-row') and contains(.,'${key_nameField}')]//td[@class="drag-handle-cell"]//button[@aria-label="Drag Item"]</td>
 	<td></td>
 </tr>
+
+<!-- DATA SET FRAGMENT -->
+
+<tr>
+	<td>SELECT_DATA_SET_VIEW</td>
+	<td>//input[contains(@class,'content-input')]</td>
+	<td></td>
+</tr>
+
 </tbody>
 </table>
 </body>

portal-web/test/functional/com/liferay/portalweb/paths/portlet/pageeditor/PageEditor.path

@@ -528,7 +528,7 @@
 </tr>
 <tr>
 	<td>FRAGMENT_SIDEBAR_COLLECTION_PANEL_EXPANDED</td>
-	<td>//*[contains(@class,'panel-header-link collapse-icon')][normalize-space()='${key_collectionName}']</td>
+	<td>//*[contains(@class,'mb-3') and contains(@class,'panel-header') and contains(@class,'panel-header-link')][normalize-space()='${key_collectionName}']</td>
 	<td></td>
 </tr>
 <tr>

portal-web/test/functional/com/liferay/portalweb/paths/portlet/webcontent/WCEditWebContent.path

@@ -237,6 +237,14 @@
 	<td>xpath=//div[contains(@class,'ddm-field') and contains(@data-field-name,'${key_fieldReference}')][${key_index}]</td>
 	<td></td>
 </tr>
+
+<!--CHECKBOX_WEB_CONTENT_ENTRY-->
+
+<tr>
+	<td>SELECT_CHECKBOX_WC</td>
+	<td>//dd[contains(@class,'list-group-item list-group-item-flex') and contains(.,'${key_title}')]//div[@class="checkbox"]</td>
+	<td></td>
+</tr>
 </tbody>
 </table>
 </body>