Lpd 49643 3

modules/apps/data-engine/data-engine-js-components-web/src/main/resources/META-INF/resources/js/core/hooks/useEvaluate.es.js

@@ -14,7 +14,7 @@ import {useFormState} from './useForm.es';
  * the `evaluate` function.
  */
 export function useEvaluate(thunk) {
-	const {groupId, portletNamespace} = useConfig();
+	const {containerId, groupId, portletNamespace} = useConfig();
 	const {
 		defaultLanguageId,
 		editingLanguageId,
@@ -27,6 +27,7 @@ export function useEvaluate(thunk) {
 	return useCallback(
 		(args) =>
 			thunk({
+				containerId,
 				defaultLanguageId,
 				editingLanguageId,
 				groupId,
@@ -38,6 +39,7 @@ export function useEvaluate(thunk) {
 				...args,
 			}),
 		[
+			containerId,
 			defaultLanguageId,
 			editingLanguageId,
 			groupId,

modules/apps/data-engine/data-engine-js-components-web/src/main/resources/META-INF/resources/js/core/thunks/fieldChange.es.js

@@ -7,12 +7,20 @@ import {evaluate, mergePages} from '../../utils/evaluation.es';
 import {PagesVisitor} from '../../utils/visitors.es';
 import {EVENT_TYPES} from '../actions/eventTypes.es';
 import {disableSubmitButton} from '../utils/submitButtonController.es';
-
 let REVALIDATE_UPDATES = [];
 
 const skipPageEvaluationFieldNames = ['name', 'requiredErrorMessage'];
 
-const needsPageEvaluation = (fieldName) => {
+const needsPageEvaluation = (
+	containerId,
+	defaultLanguageId,
+	editingLanguageId,
+	fieldName
+) => {
+	if (containerId === 'editObjectEntry') {
+		return editingLanguageId === defaultLanguageId;
+	}
+
 	return !skipPageEvaluationFieldNames.includes(fieldName);
 };
 
@@ -59,6 +67,7 @@ const getEditedPages = ({
 let lastEditedPages = [];
 
 export default function fieldChange({
+	containerId,
 	defaultLanguageId,
 	editingLanguageId,
 	focusedField,
@@ -107,7 +116,16 @@ export default function fieldChange({
 			}
 		}
 
-		if (evaluable && (viewMode || needsPageEvaluation(fieldName))) {
+		if (
+			evaluable &&
+			(viewMode ||
+				needsPageEvaluation(
+					containerId,
+					defaultLanguageId,
+					editingLanguageId,
+					fieldName
+				))
+		) {
 			try {
 				disableSubmitButton(submitButtonId);
 

modules/apps/data-engine/data-engine-js-components-web/src/main/resources/META-INF/resources/js/core/thunks/formValidate.es.js

@@ -9,6 +9,7 @@ import {EVENT_TYPES} from '../actions/eventTypes.es';
 
 export default function formValidate({
 	activePage,
+	containerId,
 	defaultLanguageId,
 	editingLanguageId,
 	formId,
@@ -26,6 +27,7 @@ export default function formValidate({
 		}
 
 		return evaluate(null, {
+			containerId,
 			defaultLanguageId,
 			editingLanguageId,
 			formId,

modules/apps/data-engine/data-engine-js-components-web/src/main/resources/META-INF/resources/js/custom/form/FormView.es.js

@@ -255,6 +255,7 @@ const usePublicAPI = ({apiRef, containerRef, unstable_onEventRef}) => {
 			dispatch(
 				formValidate({
 					activePage,
+					containerId,
 					defaultLanguageId,
 					editingLanguageId,
 					formId: containerRef.current
@@ -268,6 +269,7 @@ const usePublicAPI = ({apiRef, containerRef, unstable_onEventRef}) => {
 				})
 			),
 		[
+			containerId,
 			dispatch,
 			activePage,
 			containerRef,

modules/apps/data-engine/data-engine-js-components-web/src/main/resources/META-INF/resources/js/utils/dataConverter.ts

@@ -173,6 +173,7 @@ interface DataDefinitionCustomProperties {
 }
 
 export interface Field<T = unknown> {
+	editOnlyInDefaultLanguage?: boolean;
 	fieldName: string;
 	localizable?: boolean;
 	localizedObjectField?: boolean;

modules/apps/data-engine/data-engine-js-components-web/src/main/resources/META-INF/resources/js/utils/evaluation.es.js

@@ -130,6 +130,7 @@ export function mergePages(
 
 const doEvaluate = debounce((fieldName, evaluatorContext, callback) => {
 	const {
+		containerId,
 		defaultLanguageId,
 		editingLanguageId,
 		formId,
@@ -153,7 +154,10 @@ const doEvaluate = debounce((fieldName, evaluatorContext, callback) => {
 
 	makeFetch({
 		body: convertToFormData({
-			languageId: editingLanguageId,
+			languageId:
+				containerId === 'editObjectEntry'
+					? defaultLanguageId
+					: editingLanguageId,
 			p_auth: Liferay.authToken,
 			p_l_id: themeDisplay.getPlid(),
 			p_v_l_s_g_id: themeDisplay.getSiteGroupId(),

modules/apps/dynamic-data-mapping/dynamic-data-mapping-api/src/main/java/com/liferay/dynamic/data/mapping/util/DDMFormFieldTemplateContextContributorUtil.java

@@ -5,19 +5,21 @@
 
 package com.liferay.dynamic.data.mapping.util;
 
-import com.liferay.dynamic.data.mapping.model.DDMFormField;
+import com.liferay.dynamic.data.mapping.model.DDMFormFieldOptions;
+import com.liferay.dynamic.data.mapping.model.LocalizedValue;
 import com.liferay.list.type.model.ListTypeEntry;
 import com.liferay.list.type.service.ListTypeEntryLocalService;
 import com.liferay.portal.kernel.json.JSONObject;
 import com.liferay.portal.kernel.json.JSONUtil;
 import com.liferay.portal.kernel.language.LanguageUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
-import com.liferay.portal.kernel.util.GetterUtil;
 import com.liferay.portal.kernel.util.HashMapBuilder;
 import com.liferay.portal.kernel.util.LocaleUtil;
 import com.liferay.portal.kernel.util.StringUtil;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -26,12 +28,69 @@
  */
 public class DDMFormFieldTemplateContextContributorUtil {
 
-	public static Map<Locale, String> getListTypeEntryNameMap(
-		DDMFormField ddmFormField, String key,
+	public static Map<String, Object> getLocaleMap(Locale defaultLocale) {
+		JSONObject localeJSONObject = _getLocaleJSONObject(defaultLocale);
+
+		return HashMapBuilder.<String, Object>put(
+			"availableLocales",
+			JSONUtil.toJSONArray(
+				LanguageUtil.getAvailableLocales(),
+				locale -> _getLocaleJSONObject(locale), _log)
+		).put(
+			"defaultLocale", localeJSONObject
+		).put(
+			"editingLocale", localeJSONObject
+		).build();
+	}
+
+	public static List<Map<String, Object>> getOptions(
+		DDMFormFieldOptions ddmFormFieldOptions, Long listTypeDefinitionId,
 		ListTypeEntryLocalService listTypeEntryLocalService) {
 
-		long listTypeDefinitionId = GetterUtil.getLong(
-			ddmFormField.getProperty("listTypeDefinitionId"));
+		List<Map<String, Object>> options = new ArrayList<>();
+
+		for (String optionValue : ddmFormFieldOptions.getOptionsValues()) {
+			if (optionValue == null) {
+				continue;
+			}
+
+			LocalizedValue localizedValue = ddmFormFieldOptions.getOptionLabels(
+				optionValue);
+
+			options.add(
+				HashMapBuilder.<String, Object>put(
+					"defaultLocale",
+					String.valueOf(localizedValue.getDefaultLocale())
+				).put(
+					"label",
+					localizedValue.getString(localizedValue.getDefaultLocale())
+				).put(
+					"labelMap",
+					() -> {
+						Map<Locale, String> labeMap = _getListTypeEntryNameMap(
+							optionValue, listTypeDefinitionId,
+							listTypeEntryLocalService);
+
+						if (labeMap != null) {
+							return labeMap;
+						}
+
+						return localizedValue.getValues();
+					}
+				).put(
+					"reference",
+					ddmFormFieldOptions.getOptionReference(optionValue)
+				).put(
+					"value", optionValue
+				).build());
+		}
+
+		return options;
+	}
+
+	private static Map<Locale, String> _getListTypeEntryNameMap(
+		String key, long listTypeDefinitionId,
+		ListTypeEntryLocalService listTypeEntryLocalService) {
 
 		if (listTypeDefinitionId == 0) {
 			return null;
@@ -48,21 +107,6 @@ public static Map<Locale, String> getListTypeEntryNameMap(
 		return listTypeEntry.getNameMap();
 	}
 
-	public static Map<String, Object> getLocaleMap(Locale defaultLocale) {
-		JSONObject localeJSONObject = _getLocaleJSONObject(defaultLocale);
-
-		return HashMapBuilder.<String, Object>put(
-			"availableLocales",
-			JSONUtil.toJSONArray(
-				LanguageUtil.getAvailableLocales(),
-				locale -> _getLocaleJSONObject(locale), _log)
-		).put(
-			"defaultLocale", localeJSONObject
-		).put(
-			"editingLocale", localeJSONObject
-		).build();
-	}
-
 	private static JSONObject _getLocaleJSONObject(Locale locale) {
 		String languageId = LocaleUtil.toLanguageId(locale);
 

modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/java/com/liferay/dynamic/data/mapping/form/field/type/internal/checkbox/CheckboxDDMFormFieldTemplateContextContributor.java

@@ -48,6 +48,14 @@ public Map<String, Object> getParameters(
 			ddmFormField.getProperty("localizedObjectField"));
 
 		return HashMapBuilder.<String, Object>put(
+			"editOnlyInDefaultLanguage",
+			GetterUtil.getBoolean(
+				ddmFormField.getProperty("editOnlyInDefaultLanguage"))
+		).put(
+			"isLocalizationSupported",
+			GetterUtil.getBoolean(
+				ddmFormField.getProperty("isLocalizationSupported"))
+		).put(
 			"localizedObjectField", localizedObjectField
 		).put(
 			"predefinedValue",

modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/java/com/liferay/dynamic/data/mapping/form/field/type/internal/date/DateDDMFormFieldTemplateContextContributor.java

@@ -55,12 +55,20 @@ public Map<String, Object> getParameters(
 			ddmFormField.getProperty("localizedObjectField"));
 
 		return HashMapBuilder.<String, Object>put(
+			"editOnlyInDefaultLanguage",
+			GetterUtil.getBoolean(
+				ddmFormField.getProperty("editOnlyInDefaultLanguage"))
+		).put(
 			"firstDayOfWeek",
 			_getFirstDayOfWeek(ddmFormFieldRenderingContext.getLocale())
 		).put(
 			"htmlAutocompleteAttribute",
 			GetterUtil.getString(
 				ddmFormField.getProperty("htmlAutocompleteAttribute"))
+		).put(
+			"isLocalizationSupported",
+			GetterUtil.getBoolean(
+				ddmFormField.getProperty("isLocalizationSupported"))
 		).put(
 			"localizedObjectField", localizedObjectField
 		).put(

modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/java/com/liferay/dynamic/data/mapping/form/field/type/internal/localizable/text/LocalizableTextDDMFormFieldTemplateContextContributor.java

@@ -53,6 +53,14 @@ public Map<String, Object> getParameters(
 
 		if (ddmFormFieldRenderingContext.isReturnFullContext()) {
 			parameters.put("displayStyle", _getDisplayStyle(ddmFormField));
+			parameters.put(
+				"editOnlyInDefaultLanguage",
+				GetterUtil.getBoolean(
+					ddmFormField.getProperty("editOnlyInDefaultLanguage")));
+			parameters.put(
+				"isLocalizationSupported",
+				GetterUtil.getBoolean(
+					ddmFormField.getProperty("isLocalizationSupported")));
 			parameters.put(
 				"placeholder",
 				_getPlaceholder(ddmFormField, ddmFormFieldRenderingContext));

modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/java/com/liferay/dynamic/data/mapping/form/field/type/internal/numeric/NumericDDMFormFieldTemplateContextContributor.java

@@ -67,13 +67,21 @@ public Map<String, Object> getParameters(
 			"dataType", dataType
 		).put(
 			"direction", ddmFormField.getProperty("direction")
+		).put(
+			"editOnlyInDefaultLanguage",
+			GetterUtil.getBoolean(
+				ddmFormField.getProperty("editOnlyInDefaultLanguage"))
 		).put(
 			"hideField",
 			GetterUtil.getBoolean(ddmFormField.getProperty("hideField"))
 		).put(
 			"htmlAutocompleteAttribute",
 			GetterUtil.getString(
 				ddmFormField.getProperty("htmlAutocompleteAttribute"))
+		).put(
+			"isLocalizationSupported",
+			GetterUtil.getBoolean(
+				ddmFormField.getProperty("isLocalizationSupported"))
 		).put(
 			"localizedObjectField", localizedObjectField
 		).put(

modules/apps/dynamic-data-mapping/dynamic-data-mapping-form-field-type/src/main/java/com/liferay/dynamic/data/mapping/form/field/type/internal/rich/text/RichTextDDMFormFieldTemplateContextContributor.java

@@ -54,6 +54,14 @@ public Map<String, Object> getParameters(
 			ddmFormField.getProperty("localizedObjectField"));
 
 		return HashMapBuilder.<String, Object>put(
+			"editOnlyInDefaultLanguage",
+			GetterUtil.getBoolean(
+				ddmFormField.getProperty("editOnlyInDefaultLanguage"))
+		).put(
+			"isLocalizationSupported",
+			GetterUtil.getBoolean(
+				ddmFormField.getProperty("isLocalizationSupported"))
+		).put(
 			"localizedObjectField", localizedObjectField
 		).put(
 			"predefinedValue",