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

Issue 27538 issue with widgets #30532

Merged
merged 18 commits into from
Nov 12, 2024
+145 −62
Merged

Issue 27538 issue with widgets #30532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
e6584ce
fix: add a check to avoid url override (#27538)
gortiz-dotcms Oct 31, 2024
0b7ea26
test: add test (#27538)
gortiz-dotcms Oct 31, 2024
2b5e8c8
test: fix test (#27538)
gortiz-dotcms Oct 31, 2024
0203b9a
Merge branch 'main' into issue-27538-issue-with-widgets
gortiz-dotcms Oct 31, 2024
0be2683
test: fix test (#27538)
gortiz-dotcms Oct 31, 2024
411e27f
Merge branch 'refs/heads/main' into issue-27538-issue-with-widgets
gortiz-dotcms Nov 1, 2024
cffd0c4
test: fix test (#27538)
gortiz-dotcms Nov 1, 2024
c0727a2
fix: add a check to avoid override page content(#27538)
gortiz-dotcms Nov 4, 2024
ea34d45
test: fix test (#27538)
gortiz-dotcms Nov 4, 2024
2d6b857
test: fix test (#27538)
gortiz-dotcms Nov 4, 2024
ec36f42
test: fix test (#27538)
gortiz-dotcms Nov 4, 2024
b8a663d
test: fix test
gortiz-dotcms Nov 4, 2024
eb0d2dc
test: fix test
gortiz-dotcms Nov 4, 2024
384cf3f
Merge branch 'main' into issue-27538-issue-with-widgets
gortiz-dotcms Nov 5, 2024
f4ace6a
merge main into issue-27538
gortiz-dotcms Nov 5, 2024
442d35a
pull
gortiz-dotcms Nov 5, 2024
b97fd34
Merge branch 'main' into issue-27538-issue-with-widgets
erickgonzalez Nov 11, 2024
afb3120
Merge branch 'main' into issue-27538-issue-with-widgets
erickgonzalez Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ...c/main/java/com/dotmarketing/portlets/contentlet/transform/strategy/WebAssetStrategy.java
View file
Open in desktop
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
Open in desktop
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;
}
}