LPS-97577 Fix checkbox markup

modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/resources/META-INF/resources/Checkbox/Checkbox.soy

@@ -96,39 +96,41 @@
 			</span>
 		</label>
 	{else}
-		<label>
-			{let $inputAttributes kind="attributes"}
-				{if $checked}
-					checked="checked"
-				{/if}
-
-				class="custom-control-input"
-				data-onchange="{$handleInputChangeEvent}"
-
-				{if $disabled}
-					disabled="disabled"
-				{/if}
-
-				name="{$name}"
-				type="checkbox"
-				value="true"
-			{/let}
-
-			<input {$inputAttributes} />
-
-			{if $showLabel}
-				<span class="custom-control-label">
-					<span class="custom-control-label-text">
-						{$label}{sp}
+		<div class="custom-control custom-checkbox">
+			<label>
+				{let $inputAttributes kind="attributes"}
+					{if $checked}
+						checked="checked"
+					{/if}
+
+					class="custom-control-input"
+					data-onchange="{$handleInputChangeEvent}"
+
+					{if $disabled}
+						disabled="disabled"
+					{/if}
+
+					name="{$name}"
+					type="checkbox"
+					value="true"
+				{/let}
+
+				<input {$inputAttributes} />
+
+				{if $showLabel}
+					<span class="custom-control-label">
+						<span class="custom-control-label-text">
+							{$label}{sp}
+						</span>
 					</span>
-				</span>
 
-				{if $required}
-					<svg aria-hidden="true" class="lexicon-icon lexicon-icon-asterisk reference-mark">
-						<use xlink:href="{$spritemap}#asterisk" />
-					</svg>
+					{if $required}
+						<svg aria-hidden="true" class="lexicon-icon lexicon-icon-asterisk reference-mark">
+							<use xlink:href="{$spritemap}#asterisk" />
+						</svg>
+					{/if}
 				{/if}
-			{/if}
-		</label>
+			</label>
+		</div>
 	{/if}
 {/template}

modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/store/withStore.es.js

@@ -189,16 +189,9 @@ export default Component => {
 
 			handleFormSubmitted(this.getEvaluatorContext()).then(validForm => {
 				if (validForm) {
-					const {target} = event;
-
-					Liferay.Util.submitForm({
-						getDOM: () => target,
-						one: selector => target.querySelector(selector)
-					});
+					Liferay.Util.submitForm(event.target);
 				} else {
-					const {activePage} = this;
-
-					this.dispatch('pageValidationFailed', activePage);
+					this.dispatch('pageValidationFailed', this.activePage);
 				}
 			});
 		}

modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/util/evaluation.es.js

@@ -12,7 +12,7 @@
  * details.
  */
 
-import {convertToSearchParams, makeFetch} from './fetch.es';
+import {convertToFormData, makeFetch} from './fetch.es';
 import {debounce} from 'metal-debounce';
 import {PagesVisitor} from './visitors.es';
 
@@ -27,7 +27,7 @@ const doEvaluate = debounce((fieldName, evaluatorContext, callback) => {
 	} = evaluatorContext;
 
 	makeFetch({
-		body: convertToSearchParams({
+		body: convertToFormData({
 			languageId: editingLanguageId,
 			p_auth: Liferay.authToken,
 			portletNamespace,

modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-renderer/src/main/resources/META-INF/resources/js/util/fetch.es.js

@@ -13,8 +13,7 @@
  */
 
 const defaultHeaders = {
-	Accept: 'application/json',
-	'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'
+	Accept: 'application/json'
 };
 
 export const makeFetch = ({
@@ -44,22 +43,20 @@ export const makeFetch = ({
 		});
 };
 
-export const convertToSearchParams = body => {
-	let searchParams = new URLSearchParams();
-
+export const convertToFormData = body => {
 	if (body instanceof HTMLFormElement) {
-		const formData = new FormData(body);
-
-		formData.forEach((value, key) => searchParams.set(key, value));
+		return new FormData(body);
 	} else if (body instanceof FormData) {
-		body.forEach((value, key) => searchParams.set(key, value));
+		return body;
 	} else if (typeof body === 'object') {
+		const formData = new FormData();
+
 		Object.entries(body).forEach(([key, value]) =>
-			searchParams.append(key, value)
+			formData.append(key, value)
 		);
-	} else {
-		searchParams = body;
+
+		return formData;
 	}
 
-	return searchParams;
+	throw new Error('Unsupported body type.');
 };

modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-web/src/main/resources/META-INF/resources/admin/js/util/AutoSave.es.js

@@ -18,7 +18,7 @@ import Component from 'metal-jsx';
 import objectHash from 'object-hash';
 import {Config} from 'metal-state';
 import {
-	convertToSearchParams,
+	convertToFormData,
 	makeFetch
 } from 'dynamic-data-mapping-form-renderer/js/util/fetch.es';
 
@@ -159,7 +159,7 @@ class AutoSave extends Component {
 		formData.set(`${namespace}published`, JSON.stringify(this.published));
 		formData.set(`${namespace}saveAsDraft`, saveAsDraft);
 
-		return convertToSearchParams(formData);
+		return convertToFormData(formData);
 	}
 
 	_setInterval(minutes) {

modules/apps/frontend-js/frontend-js-spa-web/src/main/resources/META-INF/resources/liferay/app/App.es.js

@@ -215,7 +215,7 @@ class LiferayApp extends App {
 	 * @param  {!Event} event The event object
 	 */
 
-	onDataLayoutConfigReady_(event) {
+	onDataLayoutConfigReady_() {
 		if (Liferay.Layout) {
 			Liferay.Layout.init(Liferay.Data.layoutConfig);
 		}

modules/apps/frontend-js/frontend-js-spa-web/src/main/resources/META-INF/resources/liferay/init.es.js

@@ -83,7 +83,9 @@ const initSPA = function() {
 
 	Liferay.Util.submitForm = function(form) {
 		async.nextTick(() => {
-			const formElement = form.getDOM();
+			const formElement = HTMLFormElement.prototype.isPrototypeOf(form)
+				? form
+				: form.getDOM();
 			const formSelector =
 				'form' + Liferay.SPA.navigationExceptionSelectors;
 			const url = formElement.action;

modules/apps/frontend-js/frontend-js-spa-web/src/main/resources/META-INF/resources/liferay/util/Utils.es.js

@@ -60,9 +60,7 @@ class Utils {
 
 	static resetAllPortlets() {
 		Utils.getPortletBoundaryIds(Liferay.Portlet.list).forEach(function(
-			value,
-			index,
-			collection
+			value
 		) {
 			const portlet = document.querySelector('#' + value);