LPS-119645 Setting dataType of image field as 'image'

mateussgn · Oct 27, 2020 · 57f9646 · 57f9646
1 parent 0b197df
commit 57f9646
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/...a/mapping/form/field/type/internal/image/ImageDDMFormFieldTemplateContextContributor.java b/...a/mapping/form/field/type/internal/image/ImageDDMFormFieldTemplateContextContributor.java
@@ -126,10 +126,13 @@ protected String getValue(String value) {
 						GetterUtil.getLong(jsonObject.getString("groupId")));
 
 				jsonObject.put(
+					"description", jsonObject.getString("alt")
+				).put(
 					"url",
 					_dlURLHelper.getDownloadURL(
 						fileEntry, fileEntry.getFileVersion(), null,
-						StringPool.BLANK));
+						StringPool.BLANK)
+				);
 
 				return jsonObject.toString();
 			}

diff --git a/...ay/dynamic/data/mapping/form/field/type/internal/image/ImageDDMFormFieldTypeSettings.java b/...ay/dynamic/data/mapping/form/field/type/internal/image/ImageDDMFormFieldTypeSettings.java
@@ -20,13 +20,14 @@
 import com.liferay.dynamic.data.mapping.annotations.DDMFormLayoutColumn;
 import com.liferay.dynamic.data.mapping.annotations.DDMFormLayoutPage;
 import com.liferay.dynamic.data.mapping.annotations.DDMFormLayoutRow;
+import com.liferay.dynamic.data.mapping.annotations.DDMFormRule;
 import com.liferay.dynamic.data.mapping.form.field.type.DefaultDDMFormFieldTypeSettings;
 import com.liferay.dynamic.data.mapping.model.LocalizedValue;
 
 /**
  * @author Carlos Lancha
  */
-@DDMForm
+@DDMForm(rules = @DDMFormRule(actions = "setVisible('dataType', FALSE)"))
 @DDMFormLayout(
 	paginationMode = com.liferay.dynamic.data.mapping.model.DDMFormLayout.TABBED_MODE,
 	value = {
@@ -65,6 +66,10 @@
 public interface ImageDDMFormFieldTypeSettings
 	extends DefaultDDMFormFieldTypeSettings {
 
+	@DDMFormField(predefinedValue = "image", required = true)
+	@Override
+	public String dataType();
+
 	@DDMFormField(
 		dataType = "string", label = "%predefined-value", type = "image"
 	)

diff --git a/...pping-form-field-type/src/main/resources/META-INF/resources/ImagePicker/ImagePicker.es.js b/...pping-form-field-type/src/main/resources/META-INF/resources/ImagePicker/ImagePicker.es.js
@@ -44,8 +44,8 @@ const ImagePicker = ({
 	const dispatchValue = ({clear, value}, callback = () => {}) =>
 		setImageValues((oldValues) => {
 			let mergedValues = {...oldValues, ...value};
-
 			mergedValues = clear ? {} : mergedValues;
+			mergedValues.alt = mergedValues.description || '';
 
 			callback(mergedValues);
 

diff --git a/...n/java/com/liferay/dynamic/data/mapping/internal/upgrade/v3_10_0/UpgradeDDMStructure.java b/...n/java/com/liferay/dynamic/data/mapping/internal/upgrade/v3_10_0/UpgradeDDMStructure.java
@@ -410,8 +410,6 @@ private void _upgradeHTMLField(JSONObject jsonObject) {
 
 	private void _upgradeImageField(JSONObject jsonObject) {
 		jsonObject.put(
-			"dataType", "string"
-		).put(
 			"type", "image"
 		).put(
 			"visibilityExpression", StringPool.BLANK