Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LPS-145225 #1413

Closed
wants to merge 6 commits into from
Closed

LPS-145225 #1413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7823be6
LPS-145225 Create new export form modal in React
carolmariaabb Feb 3, 2022
83071e6
LPS-145225 Use new export modal in form dropdown actions
carolmariaabb Feb 3, 2022
7f3e678
LPS-145225 Fix test
carolmariaabb Feb 3, 2022
c3ba414
LPS-145225 Use new export modal in ExportDDMFormInstancePortletConfig…
carolmariaabb Feb 3, 2022
420c8d3
LPS-145225 Remove unused code
carolmariaabb Feb 3, 2022
bb503d0
LPS-145225 Add unit test
carolmariaabb Feb 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions ...ay/dynamic/data/mapping/form/web/internal/display/context/DDMFormAdminDisplayContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,8 @@ public List<DropdownItem> getActionDropdownItems(
DDMFormAdminActionDropdownItemsProvider
ddmFormAdminActionDropdownItemsProvider =
new DDMFormAdminActionDropdownItemsProvider(
getAutocompleteUserURL(), ddmFormInstance,
getAutocompleteUserURL(), getCSVExport(), ddmFormInstance,
getExportFileExtensionsJSONObject(),
_formInstancePermissionCheckerHelper,
isFormPublished(ddmFormInstance),
ddmFormAdminRequestHelper.getRequest(),
Expand Down Expand Up @@ -277,11 +278,6 @@ public int getAutosaveInterval() {
return _ddmFormWebConfiguration.autosaveInterval();
}

public Map<String, String> getAvailableExportExtensions() {
return _ddmFormInstanceRecordWriterTracker.
getDDMFormInstanceRecordWriterExtensions();
}

public JSONArray getAvailableLanguageIdsJSONArray() {
JSONArray availableLanguageIdsJSONArray = jsonFactory.createJSONArray();

Expand Down Expand Up @@ -655,6 +651,15 @@ public String getEmptyResultsMessage() {
search.getEmptyResultsMessage());
}

public JSONObject getExportFileExtensionsJSONObject()
throws PortalException {

return jsonFactory.createJSONObject(
jsonFactory.looseSerialize(
_ddmFormInstanceRecordWriterTracker.
getDDMFormInstanceRecordWriterExtensions()));
}

public String getFieldSetDefinitionURL() throws PortalException {
DDMFormBuilderSettingsResponse ddmFormBuilderSettingsResponse =
_getDDMFormBuilderSettingsResponse();
Expand Down
51 changes: 33 additions & 18 deletions ...pping/form/web/internal/display/context/util/DDMFormAdminActionDropdownItemsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.liferay.frontend.taglib.clay.servlet.taglib.util.DropdownItemListBuilder;
import com.liferay.petra.function.UnsafeConsumer;
import com.liferay.petra.portlet.url.builder.PortletURLBuilder;
import com.liferay.petra.string.StringBundler;
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.json.JSONObject;
import com.liferay.portal.kernel.language.LanguageUtil;
Expand All @@ -43,15 +42,19 @@
public class DDMFormAdminActionDropdownItemsProvider {

public DDMFormAdminActionDropdownItemsProvider(
String autocompleteUserURL, DDMFormInstance ddmFormInstance,
String autocompleteUserURL, String csvExport,
DDMFormInstance ddmFormInstance,
JSONObject exportFileExtensionsJSONObject,
FormInstancePermissionCheckerHelper formInstancePermissionCheckerHelper,
boolean formPublished, HttpServletRequest httpServletRequest,
boolean invalidDDMFormInstance, JSONObject localizedNameJSONObject,
String publishedFormURL, RenderResponse renderResponse,
long scopeGroupId, String shareFormInstanceURL) {

_autocompleteUserURL = autocompleteUserURL;
_csvExport = csvExport;
_ddmFormInstance = ddmFormInstance;
_exportFileExtensionsJSONObject = exportFileExtensionsJSONObject;
_formInstancePermissionCheckerHelper =
formInstancePermissionCheckerHelper;
_formPublished = formPublished;
Expand Down Expand Up @@ -204,24 +207,34 @@ public List<DropdownItem> getActionDropdownItems() {
_getExportActionUnsafeConsumer() {

return dropdownItem -> {
dropdownItem.setDisabled(_invalidDDMFormInstance);

LiferayPortletURL liferayPortletURL =
(LiferayPortletURL)_renderResponse.createResourceURL();
dropdownItem.setData(
HashMapBuilder.<String, Object>put(
"action", "exportForm"
).put(
"csvExport", _csvExport
).put(
"exportFormInstanceURL",
() -> {
LiferayPortletURL liferayPortletURL =
(LiferayPortletURL)
_renderResponse.createResourceURL();

liferayPortletURL.setCopyCurrentRenderParameters(false);
liferayPortletURL.setParameter(
"formInstanceId",
String.valueOf(_ddmFormInstance.getFormInstanceId()));
liferayPortletURL.setResourceID(
"/dynamic_data_mapping_form/export_form_instance");

dropdownItem.setHref(
StringBundler.concat(
"javascript:", _renderResponse.getNamespace(),
"exportFormInstance('", liferayPortletURL.toString(),
"');"));
liferayPortletURL.setCopyCurrentRenderParameters(false);
liferayPortletURL.setParameter(
"formInstanceId",
String.valueOf(
_ddmFormInstance.getFormInstanceId()));
liferayPortletURL.setResourceID(
"/dynamic_data_mapping_form/export_form_instance");

return liferayPortletURL.toString();
}
).put(
"fileExtensions", _exportFileExtensionsJSONObject
).put(
"portletNamespace", _renderResponse.getNamespace()
).build());
dropdownItem.setDisabled(_invalidDDMFormInstance);
dropdownItem.setLabel(
LanguageUtil.get(_httpServletRequest, "export"));
};
Expand Down Expand Up @@ -298,7 +311,9 @@ public List<DropdownItem> getActionDropdownItems() {
}

private final String _autocompleteUserURL;
private final String _csvExport;
private final DDMFormInstance _ddmFormInstance;
private final JSONObject _exportFileExtensionsJSONObject;
private final FormInstancePermissionCheckerHelper
_formInstancePermissionCheckerHelper;
private final boolean _formPublished;
Expand Down
39 changes: 19 additions & 20 deletions ...b/src/main/resources/META-INF/resources/admin/configuration/icon/export_form_instance.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,24 @@

<%@ include file="/admin/init.jsp" %>

<%
long formInstanceId = ParamUtil.getLong(request, liferayPortletResponse.getNamespace() + "formInstanceId");
%>

<liferay-portlet:resourceURL copyCurrentRenderParameters="<%= false %>" id="/dynamic_data_mapping_form/export_form_instance" var="exportFormInstanceURL">
<portlet:param name="formInstanceId" value="<%= String.valueOf(formInstanceId) %>" />
</liferay-portlet:resourceURL>

<%
StringBundler sb = new StringBundler(5);

sb.append("javascript:");
sb.append(liferayPortletResponse.getNamespace());
sb.append("exportFormInstance('");
sb.append(exportFormInstanceURL);
sb.append("');");
%>

<liferay-ui:icon
message="export"
url="<%= sb.toString() %>"
/>
onClick='<%= "Liferay.fire('" + liferayPortletResponse.getNamespace() + "openExportFormModal');" %>'
url="javascript:;"
/>

<aui:script require='<%= mainRequire + "/admin/js/components/export-form/openExportFormModal.es as Modal" %>'>
Liferay.after('<portlet:namespace />openExportFormModal', () => {
<liferay-portlet:resourceURL copyCurrentRenderParameters="<%= false %>" id="/dynamic_data_mapping_form/export_form_instance" var="exportFormInstanceURL">
<portlet:param name="formInstanceId" value='<%= String.valueOf(ParamUtil.getLong(request, liferayPortletResponse.getNamespace() + "formInstanceId")) %>' />
</liferay-portlet:resourceURL>

Modal.openExportFormModal({
csvExport: '<%= ddmFormAdminDisplayContext.getCSVExport() %>',
exportFormInstanceURL: '<%= exportFormInstanceURL %>',
fileExtensions: <%= ddmFormAdminDisplayContext.getExportFileExtensionsJSONObject() %>,
portletNamespace: '<portlet:namespace />',
spritemap: themeDisplay.getPathThemeImages() + '/clay/icons.svg',
});
});
</aui:script>
181 changes: 0 additions & 181 deletions ...ta-mapping-form-web/src/main/resources/META-INF/resources/admin/export_form_instance.jspf
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions ...eb/src/main/resources/META-INF/resources/admin/form_instance_records_search_container.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

<%
DDMFormViewFormInstanceRecordsDisplayContext ddmFormViewFormInstanceRecordsDisplayContext = ddmFormAdminDisplayContext.getDDMFormViewFormInstanceRecordsDisplayContext();

PortletURL portletURL = ddmFormViewFormInstanceRecordsDisplayContext.getPortletURL();
%>

<portlet:actionURL name="/dynamic_data_mapping_form/delete_form_instance_record" var="deleteFormInstanceRecordURL">
Expand Down Expand Up @@ -62,7 +60,7 @@ PortletURL portletURL = ddmFormViewFormInstanceRecordsDisplayContext.getPortletU
<clay:container-fluid
id='<%= liferayPortletResponse.getNamespace() + "viewEntriesContainer" %>'
>
<aui:form action="<%= portletURL %>" method="post" name="searchContainerForm">
<aui:form action="<%= ddmFormViewFormInstanceRecordsDisplayContext.getPortletURL() %>" method="post" name="searchContainerForm">
<aui:input name="deleteFormInstanceRecordIds" type="hidden" />

<liferay-ui:search-container
Expand Down Expand Up @@ -191,6 +189,4 @@ PortletURL portletURL = ddmFormViewFormInstanceRecordsDisplayContext.getPortletU
markupView="lexicon"
searchContainer="<%= ddmFormViewFormInstanceRecordsDisplayContext.getSearch() %>"
/>
</clay:container-fluid>

<%@ include file="/admin/export_form_instance.jspf" %>
</clay:container-fluid>