LPS-118100 Update SelectField if value prop is updated

modules/apps/fragment/fragment-api/src/main/java/com/liferay/fragment/util/configuration/FragmentConfigurationField.java

@@ -43,15 +43,33 @@ public FragmentConfigurationField(JSONObject fieldJSONObject) {
 		_name = fieldJSONObject.getString("name");
 		_dataType = fieldJSONObject.getString("dataType");
 		_defaultValue = fieldJSONObject.getString("defaultValue");
+		_localizable = fieldJSONObject.getBoolean("localizable");
 		_type = fieldJSONObject.getString("type");
 	}
 
+	public FragmentConfigurationField(
+		String name, String dataType, String defaultValue, boolean localizable,
+		String type) {
+
+		_name = name;
+		_dataType = dataType;
+		_defaultValue = defaultValue;
+		_localizable = localizable;
+		_type = type;
+	}
+
+	/**
+	 * @deprecated As of Cavanaugh (7.4.x), replaced by {@link
+	 * #FragmentConfigurationField(String, String, String, boolean, String)}
+	 */
+	@Deprecated
 	public FragmentConfigurationField(
 		String name, String dataType, String defaultValue, String type) {
 
 		_name = name;
 		_dataType = dataType;
 		_defaultValue = defaultValue;
+		_localizable = false;
 		_type = type;
 	}
 
@@ -83,6 +101,10 @@ public String getType() {
 		return _type;
 	}
 
+	public boolean isLocalizable() {
+		return _localizable;
+	}
+
 	private String _getColorPaletteDefaultValue() {
 		JSONObject defaultValueJSONObject = JSONUtil.put(
 			"cssClass", StringPool.BLANK
@@ -167,6 +189,7 @@ private String _getItemSelectorDefaultValue() {
 
 	private final String _dataType;
 	private final String _defaultValue;
+	private final boolean _localizable;
 	private final String _name;
 	private final String _type;
 

modules/apps/fragment/fragment-api/src/main/java/com/liferay/fragment/util/configuration/FragmentEntryConfigurationParser.java

@@ -18,6 +18,7 @@
 import com.liferay.portal.kernel.json.JSONObject;
 
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.ResourceBundle;
 
@@ -32,10 +33,19 @@ public interface FragmentEntryConfigurationParser {
 	public JSONObject getConfigurationDefaultValuesJSONObject(
 		String configuration);
 
+	/**
+	 * @deprecated As of Cavanaugh (7.4.x), replaced by {@link
+	 * #getConfigurationJSONObject(String, String, Locale)}
+	 */
+	@Deprecated
 	public JSONObject getConfigurationJSONObject(
 			String configuration, String editableValues)
 		throws JSONException;
 
+	public JSONObject getConfigurationJSONObject(
+			String configuration, String editableValues, Locale locale)
+		throws JSONException;
+
 	/**
 	 * @deprecated As of Athanasius (7.3.x), replaced by {@link
 	 *             #getConfigurationJSONObject(String, String)}
@@ -58,9 +68,22 @@ public Map<String, Object> getContextObjects(
 		JSONObject configurationValuesJSONObject, String configuration,
 		long[] segmentsExperienceIds);
 
+	public Object getFieldValue(
+		FragmentConfigurationField fragmentConfigurationField, Locale locale,
+		String value);
+
+	/**
+	 * @deprecated As of Cavanaugh (7.4.x), replaced by {@link
+	 * #getFieldValue(FragmentConfigurationField, Locale, String)}
+	 */
+	@Deprecated
 	public Object getFieldValue(
 		FragmentConfigurationField fragmentConfigurationField, String value);
 
+	public Object getFieldValue(
+		String configuration, String editableValues, Locale locale,
+		String name);
+
 	/**
 	 * @deprecated As of Athanasius (7.3.x), with no direct replacement
 	 */
@@ -69,6 +92,11 @@ public Object getFieldValue(
 		String configuration, String editableValues,
 		long[] segmentsExperienceIds, String name);
 
+	/**
+	 * @deprecated As of Cavanaugh (7.4.x), replaced by {@link
+	 * #getFieldValue(String, String, Locale, String)}
+	 */
+	@Deprecated
 	public Object getFieldValue(
 		String configuration, String editableValues, String name);
 

modules/apps/fragment/fragment-api/src/main/resources/com/liferay/fragment/util/configuration/packageinfo

@@ -1 +1 @@
-version 1.3.0
+version 1.4.0

modules/apps/fragment/fragment-entry-processor/fragment-entry-processor-freemarker/src/main/java/com/liferay/fragment/entry/processor/freemarker/FreeMarkerFragmentEntryProcessor.java

@@ -122,7 +122,8 @@ public String processFragmentEntryLinkHTML(
 		JSONObject configurationValuesJSONObject =
 			_fragmentEntryConfigurationParser.getConfigurationJSONObject(
 				fragmentEntryLink.getConfiguration(),
-				fragmentEntryLink.getEditableValues());
+				fragmentEntryLink.getEditableValues(),
+				fragmentEntryProcessorContext.getLocale());
 
 		template.putAll(
 			HashMapBuilder.<String, Object>put(

modules/apps/fragment/fragment-impl/src/main/java/com/liferay/fragment/internal/util/configuration/FragmentEntryConfigurationParserImpl.java

@@ -30,10 +30,12 @@
 import com.liferay.portal.kernel.json.JSONException;
 import com.liferay.portal.kernel.json.JSONFactoryUtil;
 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.LocaleUtil;
 import com.liferay.portal.kernel.util.StringUtil;
 import com.liferay.portal.kernel.util.Validator;
 
@@ -42,6 +44,7 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 import java.util.ResourceBundle;
@@ -76,11 +79,25 @@ public JSONObject getConfigurationDefaultValuesJSONObject(
 		return defaultValuesJSONObject;
 	}
 
+	/**
+	 * @deprecated As of Cavanaugh (7.4.x), replaced by {@link
+	 * #getConfigurationJSONObject(String, String, Locale)}
+	 */
+	@Deprecated
 	@Override
 	public JSONObject getConfigurationJSONObject(
 			String configuration, String editableValues)
 		throws JSONException {
 
+		return getConfigurationJSONObject(
+			configuration, editableValues, LocaleUtil.getMostRelevantLocale());
+	}
+
+	@Override
+	public JSONObject getConfigurationJSONObject(
+			String configuration, String editableValues, Locale locale)
+		throws JSONException {
+
 		JSONObject configurationDefaultValuesJSONObject =
 			getConfigurationDefaultValuesJSONObject(configuration);
 
@@ -116,7 +133,7 @@ public JSONObject getConfigurationJSONObject(
 			configurationDefaultValuesJSONObject.put(
 				name,
 				getFieldValue(
-					configurationField,
+					configurationField, locale,
 					configurationValuesJSONObject.getString(name)));
 		}
 
@@ -197,10 +214,30 @@ public Map<String, Object> getContextObjects(
 
 	@Override
 	public Object getFieldValue(
-		FragmentConfigurationField fragmentConfigurationField, String value) {
+		FragmentConfigurationField fragmentConfigurationField, Locale locale,
+		String value) {
 
-		value = GetterUtil.getString(
-			value, fragmentConfigurationField.getDefaultValue());
+		value = GetterUtil.getString(value);
+
+		if (fragmentConfigurationField.isLocalizable() &&
+			JSONUtil.isValid(value)) {
+
+			try {
+				JSONObject valueJSONObject = JSONFactoryUtil.createJSONObject(
+					value);
+
+				value = valueJSONObject.getString(
+					LocaleUtil.toLanguageId(locale),
+					fragmentConfigurationField.getDefaultValue());
+			}
+			catch (JSONException jsonException) {
+				_log.error(
+					"Unable to parse configuration value JSON", jsonException);
+			}
+		}
+		else if (Validator.isNull(value)) {
+			value = fragmentConfigurationField.getDefaultValue();
+		}
 
 		if (StringUtil.equalsIgnoreCase(
 				fragmentConfigurationField.getType(), "checkbox")) {
@@ -247,20 +284,23 @@ else if (StringUtil.equalsIgnoreCase(
 	}
 
 	/**
-	 * @deprecated As of Athanasius (7.3.x), with no direct replacement
+	 * @deprecated As of Cavanaugh (7.4.x), replaced by {@link
+	 * #getFieldValue(String, String, Locale, String)}
 	 */
 	@Deprecated
 	@Override
 	public Object getFieldValue(
-		String configuration, String editableValues,
-		long[] segmentsExperienceIds, String name) {
+		FragmentConfigurationField fragmentConfigurationField, String value) {
 
-		return getFieldValue(configuration, editableValues, name);
+		return getFieldValue(
+			fragmentConfigurationField, LocaleUtil.getMostRelevantLocale(),
+			value);
 	}
 
 	@Override
 	public Object getFieldValue(
-		String configuration, String editableValues, String name) {
+		String configuration, String editableValues, Locale locale,
+		String name) {
 
 		JSONObject editableValuesJSONObject = null;
 
@@ -290,12 +330,40 @@ public Object getFieldValue(
 				continue;
 			}
 
-			return configurationValuesJSONObject.get(name);
+			return getFieldValue(
+				fragmentConfigurationField, locale,
+				configurationValuesJSONObject.getString(name));
 		}
 
 		return null;
 	}
 
+	/**
+	 * @deprecated As of Athanasius (7.3.x), with no direct replacement
+	 */
+	@Deprecated
+	@Override
+	public Object getFieldValue(
+		String configuration, String editableValues,
+		long[] segmentsExperienceIds, String name) {
+
+		return getFieldValue(configuration, editableValues, name);
+	}
+
+	/**
+	 * @deprecated As of Cavanaugh (7.4.x), replaced by {@link
+	 * #getFieldValue(String, String, Locale, String)}
+	 */
+	@Deprecated
+	@Override
+	public Object getFieldValue(
+		String configuration, String editableValues, String name) {
+
+		return getFieldValue(
+			configuration, editableValues, LocaleUtil.getMostRelevantLocale(),
+			name);
+	}
+
 	@Override
 	public List<FragmentConfigurationField> getFragmentConfigurationFields(
 		String configuration) {
@@ -473,6 +541,10 @@ private JSONObject _getInfoDisplayObjectEntryJSONObject(String value) {
 			JSONObject configurationValueJSONObject =
 				JSONFactoryUtil.createJSONObject(value);
 
+			if (configurationValueJSONObject.length() == 0) {
+				return null;
+			}
+
 			JSONObject jsonObject = JSONFactoryUtil.createJSONObject(
 				JSONFactoryUtil.looseSerialize(
 					_getInfoDisplayObjectEntry(value)));

modules/apps/fragment/fragment-service/src/main/resources/com/liferay/fragment/internal/validator/dependencies/configuration-json-schema.json

@@ -120,6 +120,11 @@
 					"title": "The Label Schema",
 					"type": "string"
 				},
+				"localizable": {
+					"default": false,
+					"title": "The Localizable Schema",
+					"type": "boolean"
+				},
 				"name": {
 					"minLength": 1,
 					"pattern": "^[A-Za-z0-9]+$",

modules/apps/layout/layout-content-page-editor-web/src/main/java/com/liferay/layout/content/page/editor/web/internal/portlet/action/GetFragmentEntryLinkMVCResourceCommand.java

@@ -39,6 +39,7 @@
 import com.liferay.portal.kernel.portlet.bridges.mvc.MVCResourceCommand;
 import com.liferay.portal.kernel.servlet.SessionErrors;
 import com.liferay.portal.kernel.theme.ThemeDisplay;
+import com.liferay.portal.kernel.util.LocaleUtil;
 import com.liferay.portal.kernel.util.ParamUtil;
 import com.liferay.portal.kernel.util.Portal;
 import com.liferay.portal.kernel.util.Validator;
@@ -81,14 +82,18 @@ protected void doServeResource(
 		JSONObject jsonObject = JSONFactoryUtil.createJSONObject();
 
 		if (fragmentEntryLink != null) {
-			DefaultFragmentRendererContext defaultFragmentRendererContext =
-				new DefaultFragmentRendererContext(fragmentEntryLink);
-
 			ThemeDisplay themeDisplay =
 				(ThemeDisplay)resourceRequest.getAttribute(
 					WebKeys.THEME_DISPLAY);
 
-			defaultFragmentRendererContext.setLocale(themeDisplay.getLocale());
+			String languageId = ParamUtil.getString(
+				resourceRequest, "languageId", themeDisplay.getLanguageId());
+
+			DefaultFragmentRendererContext defaultFragmentRendererContext =
+				new DefaultFragmentRendererContext(fragmentEntryLink);
+
+			defaultFragmentRendererContext.setLocale(
+				LocaleUtil.fromLanguageId(languageId));
 
 			defaultFragmentRendererContext.setMode(
 				FragmentEntryLinkConstants.EDIT);

modules/apps/layout/layout-content-page-editor-web/src/main/java/com/liferay/layout/content/page/editor/web/internal/util/FragmentEntryLinkUtil.java

@@ -41,6 +41,8 @@
 import com.liferay.portal.kernel.portlet.PortletIdCodec;
 import com.liferay.portal.kernel.service.PortletLocalServiceUtil;
 import com.liferay.portal.kernel.theme.ThemeDisplay;
+import com.liferay.portal.kernel.util.LocaleUtil;
+import com.liferay.portal.kernel.util.ParamUtil;
 import com.liferay.portal.kernel.util.PortalUtil;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.util.WebKeys;
@@ -159,7 +161,12 @@ public static JSONObject getFragmentEntryLinkJSONObject(
 			DefaultFragmentRendererContext defaultFragmentRendererContext =
 				new DefaultFragmentRendererContext(fragmentEntryLink);
 
-			defaultFragmentRendererContext.setLocale(themeDisplay.getLocale());
+			String languageId = ParamUtil.getString(
+				portletRequest, "languageId", themeDisplay.getLanguageId());
+
+			defaultFragmentRendererContext.setLocale(
+				LocaleUtil.fromLanguageId(languageId));
+
 			defaultFragmentRendererContext.setMode(
 				FragmentEntryLinkConstants.EDIT);
 			defaultFragmentRendererContext.setSegmentsExperienceIds(

modules/apps/layout/layout-content-page-editor-web/src/main/resources/META-INF/resources/page_editor/app/components/App.js

@@ -19,6 +19,7 @@ import {StyleBookContextProvider} from '../../plugins/page-design-options/hooks/
 import {INIT} from '../actions/types';
 import {config} from '../config/index';
 import {reducer} from '../reducers/index';
+import selectLanguageId from '../selectors/selectLanguageId';
 import {StoreContextProvider, useSelector} from '../store/index';
 import {DragAndDropContextProvider} from '../utils/dragAndDrop/useDragAndDrop';
 import {CollectionActiveItemContextProvider} from './CollectionActiveItemContext';
@@ -75,7 +76,7 @@ App.propTypes = {
 };
 
 const LanguageDirection = () => {
-	const languageId = useSelector((state) => state.languageId);
+	const languageId = useSelector(selectLanguageId);
 
 	useEffect(() => {
 		const currentLanguageDirection = config.languageDirection[languageId];