LPS-122347 Showing the currently selected video details

liferay-content-management · Nov 5, 2020 · 8695d2d · 8695d2d
1 parent c0a885b
commit 8695d2d
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 6 deletions.
diff --git a/...-library-api/src/main/java/com/liferay/document/library/display/context/DLFilePicker.java b/...-library-api/src/main/java/com/liferay/document/library/display/context/DLFilePicker.java
@@ -21,6 +21,14 @@
  */
 public interface DLFilePicker {
 
+	public default String getCurrentIconURL() {
+		return null;
+	}
+
+	public default String getCurrentTitle() {
+		return null;
+	}
+
 	public String getDescriptionFieldName();
 
 	public String getIconFieldName();

diff --git a/...library/external/video/internal/display/context/ExternalVideoDLDisplayContextFactory.java b/...library/external/video/internal/display/context/ExternalVideoDLDisplayContextFactory.java
@@ -18,6 +18,9 @@
 import com.liferay.document.library.display.context.DLDisplayContextFactory;
 import com.liferay.document.library.display.context.DLEditFileEntryDisplayContext;
 import com.liferay.document.library.display.context.DLViewFileVersionDisplayContext;
+import com.liferay.document.library.external.video.internal.ExternalVideo;
+import com.liferay.document.library.external.video.internal.constants.ExternalVideoConstants;
+import com.liferay.document.library.external.video.internal.resolver.ExternalVideoResolver;
 import com.liferay.document.library.external.video.internal.util.ExternalVideoMetadataHelper;
 import com.liferay.document.library.kernel.model.DLFileEntry;
 import com.liferay.document.library.kernel.model.DLFileEntryType;
@@ -94,7 +97,8 @@ public DLEditFileEntryDisplayContext getDLEditFileEntryDisplayContext(
 		if (externalVideoMetadataHelper.isExternalVideo()) {
 			return new ExternalVideoDLEditFileEntryDisplayContext(
 				parentDLEditFileEntryDisplayContext, httpServletRequest,
-				httpServletResponse, fileEntry);
+				httpServletResponse, fileEntry,
+				_getExternalVideo(externalVideoMetadataHelper));
 		}
 
 		return parentDLEditFileEntryDisplayContext;
@@ -151,6 +155,20 @@ public DLViewFileVersionDisplayContext getDLViewFileVersionDisplayContext(
 		return parentDLViewFileVersionDisplayContext;
 	}
 
+	private ExternalVideo _getExternalVideo(
+		ExternalVideoMetadataHelper externalVideoMetadataHelper) {
+
+		if (externalVideoMetadataHelper.containsField(
+				ExternalVideoConstants.DDM_FIELD_NAME_URL)) {
+
+			return _externalVideoResolver.resolve(
+				externalVideoMetadataHelper.getFieldValue(
+					ExternalVideoConstants.DDM_FIELD_NAME_URL));
+		}
+
+		return null;
+	}
+
 	@Reference
 	private DDMFormValuesToFieldsConverter _ddmFormValuesToFieldsConverter;
 
@@ -163,6 +181,9 @@ public DLViewFileVersionDisplayContext getDLViewFileVersionDisplayContext(
 	@Reference
 	private DLFileEntryMetadataLocalService _dlFileEntryMetadataLocalService;
 
+	@Reference
+	private ExternalVideoResolver _externalVideoResolver;
+
 	@Reference
 	private FieldsToDDMFormValuesConverter _fieldsToDDMFormValuesConverter;
 

diff --git a/...y/external/video/internal/display/context/ExternalVideoDLEditFileEntryDisplayContext.java b/...y/external/video/internal/display/context/ExternalVideoDLEditFileEntryDisplayContext.java
@@ -17,6 +17,7 @@
 import com.liferay.document.library.display.context.BaseDLEditFileEntryDisplayContext;
 import com.liferay.document.library.display.context.DLEditFileEntryDisplayContext;
 import com.liferay.document.library.display.context.DLFilePicker;
+import com.liferay.document.library.external.video.internal.ExternalVideo;
 import com.liferay.document.library.external.video.internal.constants.ExternalVideoConstants;
 import com.liferay.document.library.kernel.model.DLFileEntryType;
 import com.liferay.dynamic.data.mapping.kernel.DDMStructure;
@@ -49,16 +50,20 @@ public ExternalVideoDLEditFileEntryDisplayContext(
 	public ExternalVideoDLEditFileEntryDisplayContext(
 		DLEditFileEntryDisplayContext parentDLEditFileEntryDisplayContext,
 		HttpServletRequest httpServletRequest,
-		HttpServletResponse httpServletResponse, FileEntry fileEntry) {
+		HttpServletResponse httpServletResponse, FileEntry fileEntry,
+		ExternalVideo externalVideo) {
 
 		super(
 			_UUID, parentDLEditFileEntryDisplayContext, httpServletRequest,
 			httpServletResponse, fileEntry);
+
+		_externalVideo = externalVideo;
 	}
 
 	@Override
 	public DLFilePicker getDLFilePicker(String onFilePickCallback) {
-		return new ExternalVideoDLFilePicker(request, onFilePickCallback);
+		return new ExternalVideoDLFilePicker(
+			request, _externalVideo, onFilePickCallback);
 	}
 
 	@Override
@@ -104,4 +109,6 @@ public boolean isVersionInfoVisible() {
 	private static final UUID _UUID = UUID.fromString(
 		"f3dad960-a5ea-4499-badd-0d1a06ee1c93");
 
+	private ExternalVideo _externalVideo;
+
 }
diff --git a/...y/document/library/external/video/internal/display/context/ExternalVideoDLFilePicker.java b/...y/document/library/external/video/internal/display/context/ExternalVideoDLFilePicker.java
@@ -15,9 +15,11 @@
 package com.liferay.document.library.external.video.internal.display.context;
 
 import com.liferay.document.library.display.context.DLFilePicker;
+import com.liferay.document.library.external.video.internal.ExternalVideo;
 import com.liferay.document.library.external.video.internal.constants.ExternalVideoConstants;
 import com.liferay.document.library.external.video.internal.constants.ExternalVideoPortletKeys;
 import com.liferay.petra.io.unsync.UnsyncStringWriter;
+import com.liferay.petra.string.StringPool;
 import com.liferay.portal.kernel.exception.PortalException;
 import com.liferay.portal.kernel.portlet.RequestBackedPortletURLFactory;
 import com.liferay.portal.kernel.portlet.RequestBackedPortletURLFactoryUtil;
@@ -39,12 +41,32 @@
 public class ExternalVideoDLFilePicker implements DLFilePicker {
 
 	public ExternalVideoDLFilePicker(
-		HttpServletRequest httpServletRequest, String onFilePickCallback) {
+		HttpServletRequest httpServletRequest, ExternalVideo externalVideo,
+		String onFilePickCallback) {
 
 		_httpServletRequest = httpServletRequest;
+		_externalVideo = externalVideo;
 		_onFilePickCallback = onFilePickCallback;
 	}
 
+	@Override
+	public String getCurrentIconURL() {
+		if (_externalVideo != null) {
+			return _externalVideo.getIconURL();
+		}
+
+		return StringPool.BLANK;
+	}
+
+	@Override
+	public String getCurrentTitle() {
+		if (_externalVideo != null) {
+			return _externalVideo.getTitle();
+		}
+
+		return StringPool.BLANK;
+	}
+
 	@Override
 	public String getDescriptionFieldName() {
 		return ExternalVideoConstants.DDM_FIELD_NAME_DESCRIPTION;
@@ -112,6 +134,7 @@ private String _getExternalVideoFieldsURL() {
 		return getExternalVideoFieldsURL.toString();
 	}
 
+	private final ExternalVideo _externalVideo;
 	private final HttpServletRequest _httpServletRequest;
 	private final String _onFilePickCallback;
 

diff --git a/...ry-web/src/main/resources/META-INF/resources/document_library/edit_file_entry_picker.jspf b/...ry-web/src/main/resources/META-INF/resources/document_library/edit_file_entry_picker.jspf
@@ -32,9 +32,9 @@ DLFilePicker dlFilePicker = dlEditFileEntryDisplayContext.getDLFilePicker("onFil
 		<aui:field-wrapper label="file">
 			<aui:button cssClass="customized-file-button disabled" disabled="<%= true %>" name="file" value="select-file" />
 
-			<img class="pick-button-icon" id="<portlet:namespace />pickButtonIcon" />
+			<img class="pick-button-icon" id="<portlet:namespace />pickButtonIcon" src="<%= dlFilePicker.getCurrentIconURL() %>" />
 
-			<span id="<portlet:namespace />pickButtonTitle"></span>
+			<span id="<portlet:namespace />pickButtonTitle"><%= dlFilePicker.getCurrentTitle() %></span>
 		</aui:field-wrapper>
 
 		<aui:script sandbox="<%= true %>">