Skip to content

Commit

Permalink
Issue 27538 issue with widgets (#30532)
Browse files Browse the repository at this point in the history 
Added a check to avoid override the URL field when the contentlet has
one.

Added test

---------

Co-authored-by: erickgonzalez <[email protected]>
  • Loading branch information
@gortiz-dotcms @erickgonzalez
gortiz-dotcms and erickgonzalez authored Nov 12, 2024
1 parent 84f04b4 commit b852b6c
Show file tree
Hide file tree
Showing 2 changed files with 145 additions and 62 deletions.
4 changes: 4 additions & 0 deletions ...c/main/java/com/dotmarketing/portlets/contentlet/transform/strategy/WebAssetStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,15 @@ public final void apply(final Contentlet source, final Map<String, Object> targe
* @param map
*/
private void urlOverride(final Contentlet contentlet, final Map<String, Object> map){
if (!Boolean.TRUE.equals(contentlet.isHTMLPage()) && contentlet.getMap().get(URL_FIELD) != null) {
return;
}
final String url = toolBox.contentHelper.getUrl(contentlet);
if (null != url) {
map.put(URL_FIELD, url);
}
map.put(URL_FIELD, url);

}

/**
Expand Down
203 changes: 141 additions & 62 deletions dotcms-integration/src/test/java/com/dotcms/contenttype/test/ContentResourceTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,16 @@
package com.dotcms.contenttype.test;

import static com.dotcms.rest.api.v1.workflow.WorkflowTestUtil.DM_WORKFLOW;
import static com.dotmarketing.business.Role.ADMINISTRATOR;
import static com.dotmarketing.portlets.workflows.business.BaseWorkflowIntegrationTest.createContentTypeAndAssignPermissions;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import com.dotcms.DataProviderWeldRunner;
import com.dotcms.IntegrationTestBase;
import com.dotcms.business.WrapInTransaction;
import com.dotcms.contenttype.business.ContentTypeAPI;
import com.dotcms.contenttype.business.FieldAPI;
import com.dotcms.contenttype.model.field.CategoryField;
import com.dotcms.contenttype.model.field.DataTypes;
import com.dotcms.contenttype.model.field.Field;
import com.dotcms.contenttype.model.field.FieldBuilder;
import com.dotcms.contenttype.model.field.ImageField;
import com.dotcms.contenttype.model.field.RelationshipField;
import com.dotcms.contenttype.model.field.TextField;
import com.dotcms.contenttype.exception.NotFoundInDbException;
import com.dotcms.contenttype.model.field.*;
import com.dotcms.contenttype.model.type.BaseContentType;
import com.dotcms.contenttype.model.type.ContentType;
import com.dotcms.datagen.CategoryDataGen;
import com.dotcms.datagen.CompanyDataGen;
import com.dotcms.datagen.ContentTypeDataGen;
import com.dotcms.datagen.ContentletDataGen;
import com.dotcms.datagen.FieldDataGen;
import com.dotcms.datagen.RoleDataGen;
import com.dotcms.datagen.SiteDataGen;
import com.dotcms.datagen.TestDataUtils;
import com.dotcms.datagen.TestUserUtils;
import com.dotcms.datagen.TestWorkflowUtils;
import com.dotcms.datagen.UserDataGen;
import com.dotcms.datagen.WorkflowDataGen;
import com.dotcms.datagen.*;
import com.dotcms.mock.request.MockAttributeRequest;
import com.dotcms.mock.request.MockHeaderRequest;
import com.dotcms.mock.request.MockHttpRequestIntegrationTest;
Expand All @@ -47,13 +22,9 @@
import com.dotcms.util.IntegrationTestInitService;
import com.dotmarketing.beans.Host;
import com.dotmarketing.beans.Permission;
import com.dotmarketing.business.APILocator;
import com.dotmarketing.business.PermissionAPI;
import com.dotmarketing.business.RelationshipAPI;
import com.dotmarketing.business.Role;
import com.dotmarketing.business.RoleAPI;
import com.dotmarketing.business.UserAPI;
import com.dotmarketing.business.*;
import com.dotmarketing.exception.DotDataException;
import com.dotmarketing.exception.DotRuntimeException;
import com.dotmarketing.exception.DotSecurityException;
import com.dotmarketing.portlets.categories.model.Category;
import com.dotmarketing.portlets.contentlet.business.ContentletAPI;
Expand All @@ -76,22 +47,18 @@
import com.tngtech.java.junit.dataprovider.DataProvider;
import com.tngtech.java.junit.dataprovider.UseDataProvider;
import io.vavr.Tuple2;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import org.glassfish.jersey.internal.util.Base64;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;

import javax.enterprise.context.ApplicationScoped;
import javax.servlet.ReadListener;
import javax.servlet.ServletInputStream;
Expand All @@ -107,17 +74,24 @@
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
import javax.xml.xpath.XPathFactory;
import org.glassfish.jersey.internal.util.Base64;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mockito;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import static com.dotcms.rest.api.v1.workflow.WorkflowTestUtil.DM_WORKFLOW;
import static com.dotmarketing.business.Role.ADMINISTRATOR;
import static com.dotmarketing.portlets.workflows.business.BaseWorkflowIntegrationTest.createContentTypeAndAssignPermissions;
import static org.junit.Assert.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;


@ApplicationScoped
@RunWith(DataProviderWeldRunner.class)
Expand Down Expand Up @@ -1611,4 +1585,109 @@ public void test_getContent_SelfRelatedWith3LevelsOfDepth_shouldReturnRelationsh
assertEquals(grandChild.getIdentifier(), grandChildJSONContentlet.get(IDENTIFIER));
assertEquals("grandChild", grandChildJSONContentlet.get("title"));
}


/**
* Method to test: {@link ContentResource#getContent(HttpServletRequest, HttpServletResponse, String)}
* Given scenario: The method is invoked for a widget
* Expected result: The response should override the URL with the one provided in the contentlet
*/
@Test
public void testGetContentShouldReturnUrlOverridden() throws Exception {

final ContentType type = getWidgetLikeContentTypeUrlField("WidgetType", null, null);


ContentletDataGen contentletDataGen = new ContentletDataGen(type.id())
.languageId(1L)
.host(APILocator.getHostAPI().findDefaultHost(APILocator.systemUser(), false))
.setProperty("widgetTitle", "titleContent")
.setProperty("code", "Widget code")
.setProperty("url", "somevalue");


final Contentlet contentlet = contentletDataGen.nextPersisted();

// Build request and response
final HttpServletRequest request = createHttpRequest(null, null);
final HttpServletResponse response = Mockito.mock(HttpServletResponse.class);

// Send request
final ContentResource contentResource = new ContentResource();


Response endpointResponse = contentResource.getContent(request, response,
"/query/+identifier:" + contentlet.getIdentifier() + "/type/xml");

// Verify XML result
final DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
final DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();

final InputSource inputSource = new InputSource();
inputSource.setCharacterStream(
new StringReader(endpointResponse.getEntity().toString().replaceAll("\\n", "")));
final Document doc = dBuilder.parse(inputSource);
doc.getDocumentElement().normalize();

final Element contentletFromXML = (Element) doc.getFirstChild().getFirstChild();

assertEquals("somevalue", contentletFromXML.getElementsByTagName("url").item(0).getTextContent());

}

@WrapInTransaction
public static ContentType getWidgetLikeContentTypeUrlField(final String contentTypeName,
final Set<String> workflowIds, final Supplier<String> widgetCode) {

ContentType simpleWidgetContentType = null;
try {
try {
simpleWidgetContentType = APILocator.getContentTypeAPI(APILocator.systemUser())
.find(contentTypeName);
} catch (NotFoundInDbException e) {
//Do nothing...
}
if (simpleWidgetContentType == null) {

List<com.dotcms.contenttype.model.field.Field> fields = new ArrayList<>();
fields.add(
new FieldDataGen()
.name("Code")
.velocityVarName("code")
.required(true)
.next()
);
fields.add(
new FieldDataGen()
.name("url")
.velocityVarName("url")
.required(true)
.next()
);
if(null != widgetCode){ //If the widgetCode is not null, then add the field
fields.add(
new FieldDataGen()
.name("WidgetCode")
.velocityVarName("widgetCode")
.type(ConstantField.class)
.required(false)
.values(widgetCode.get())
.next()
);
}

simpleWidgetContentType = new ContentTypeDataGen()
.baseContentType(BaseContentType.WIDGET)
.name(contentTypeName)
.velocityVarName(contentTypeName)
.fields(fields)
.workflowId(workflowIds)
.nextPersisted();
}
} catch (Exception e) {
throw new DotRuntimeException(e);
}

return simpleWidgetContentType;
}
}

0 comments on commit b852b6c

Please sign in to comment.