Skip to content

LPD-68333 Compute default theme URLs inside ThemeDisplay #5123

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

Closed
wants to merge 3 commits into from
Closed

LPD-68333 Compute default theme URLs inside ThemeDisplay #5123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ebfbfe
LPD-68333 Compute default theme URLs inside ThemeDisplay
izaera Oct 13, 2025
b3f9e94
LPD-68333 Fix ClientExtensionServicePreActionTest
izaera Oct 17, 2025
a4041cc
LPD-68333 Fix GetPagePreviewStrutsActionTest test
izaera Oct 17, 2025
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
6 changes: 2 additions & 4 deletions ...com/liferay/client/extension/internal/event/test/ClientExtensionServicePreActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,10 @@ private void _assertThemeCSSURLs(
else {
MatcherAssert.assertThat(
themeDisplay.getClayCSSURL(),
CoreMatchers.containsString(
"themeId=classic_WAR_classictheme"));
CoreMatchers.startsWith("/o/classic-theme/css/clay."));
MatcherAssert.assertThat(
themeDisplay.getMainCSSURL(),
CoreMatchers.containsString(
"themeId=classic_WAR_classictheme"));
CoreMatchers.startsWith("/o/classic-theme/css/main."));
}
}

Expand Down
91 changes: 0 additions & 91 deletions ...b/src/main/java/com/liferay/frontend/js/web/internal/events/FrontendServicePreAction.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion modules/apps/layout/layout-impl/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ dependencies {
compileOnly project(":apps:portal-lock:portal-lock-api")
compileOnly project(":apps:portal-search:portal-search-api")
compileOnly project(":apps:portal-search:portal-search-spi")
compileOnly project(":apps:portal-url-builder:portal-url-builder-api")
compileOnly project(":apps:portal-vulcan:portal-vulcan-api")
compileOnly project(":apps:portal-workflow:portal-workflow-api")
compileOnly project(":apps:portal:portal-json-validator")
Expand Down
45 changes: 0 additions & 45 deletions ...out-impl/src/main/java/com/liferay/layout/internal/struts/GetPagePreviewStrutsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@
import com.liferay.portal.kernel.util.Portal;
import com.liferay.portal.kernel.util.Validator;
import com.liferay.portal.kernel.util.WebKeys;
import com.liferay.portal.url.builder.AbsolutePortalURLBuilder;
import com.liferay.portal.url.builder.AbsolutePortalURLBuilderFactory;
import com.liferay.portal.url.builder.WebContextScriptAbsolutePortalURLBuilder;
import com.liferay.portal.url.builder.WebContextStylesheetAbsolutePortalURLBuilder;
import com.liferay.segments.constants.SegmentsWebKeys;
import com.liferay.segments.service.SegmentsExperienceLocalService;

Expand Down Expand Up @@ -142,8 +138,6 @@ public String execute(

themeDisplay.setLookAndFeel(theme, layout.getColorScheme());

_addClayURLs(httpServletRequest, themeDisplay);

themeDisplay.setSignedIn(false);

User guestUser = _userLocalService.getGuestUser(
Expand Down Expand Up @@ -227,42 +221,6 @@ public String execute(
return null;
}

private void _addClayURLs(
HttpServletRequest httpServletRequest, ThemeDisplay themeDisplay) {

AbsolutePortalURLBuilder absolutePortalURLBuilder =
_absolutePortalURLBuilderFactory.getAbsolutePortalURLBuilder(
httpServletRequest);

Theme theme = themeDisplay.getTheme();
boolean rtl = _portal.isRightToLeft(httpServletRequest);

WebContextStylesheetAbsolutePortalURLBuilder
webContextStylesheetAbsolutePortalURLBuilder =
absolutePortalURLBuilder.forWebContextStylesheet(
theme.getServletContextName(),
rtl ? "/css/clay_rtl.css" : "/css/clay.css");

themeDisplay.setDefaultClayCSSURL(
webContextStylesheetAbsolutePortalURLBuilder.build());

webContextStylesheetAbsolutePortalURLBuilder =
absolutePortalURLBuilder.forWebContextStylesheet(
theme.getServletContextName(),
rtl ? "/css/main_rtl.css" : "/css/main.css");

themeDisplay.setDefaultMainCSSURL(
webContextStylesheetAbsolutePortalURLBuilder.build());

WebContextScriptAbsolutePortalURLBuilder
webContextScriptAbsolutePortalURLBuilder =
absolutePortalURLBuilder.forWebContextScript(
theme.getServletContextName(), "/js/main.js");

themeDisplay.setDefaultMainJSURL(
webContextScriptAbsolutePortalURLBuilder.build());
}

private void _addLinkedAssetEntryId(
String className, long classPK, HttpServletRequest httpServletRequest) {

Expand Down Expand Up @@ -346,9 +304,6 @@ private void _includeInfoItemObjects(
private static final Log _log = LogFactoryUtil.getLog(
GetPagePreviewStrutsAction.class);

@Reference
private AbsolutePortalURLBuilderFactory _absolutePortalURLBuilderFactory;

@Reference
private InfoItemServiceRegistry _infoItemServiceRegistry;

Expand Down
2 changes: 1 addition & 1 deletion ...egration/java/com/liferay/layout/internal/struts/test/GetPagePreviewStrutsActionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ private void _assertContainsContent(String expectedThemeId)
Assert.assertThat(
content,
CoreMatchers.containsString(
"href=\"/o/" + theme.getServletContextName() + "/css/"));
"/o/" + theme.getServletContextName() + "/css/main."));
}

private void _setUpThemeDisplay() throws Exception {
Expand Down
48 changes: 27 additions & 21 deletions portal-kernel/src/com/liferay/portal/kernel/theme/ThemeDisplay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import com.liferay.petra.string.StringPool;
import com.liferay.portal.kernel.change.tracking.CTCollectionThreadLocal;
import com.liferay.portal.kernel.exception.PortalException;
import com.liferay.portal.kernel.frontend.hashed.files.HashedFilesRegistryUtil;
import com.liferay.portal.kernel.json.JSON;
import com.liferay.portal.kernel.language.LanguageUtil;
import com.liferay.portal.kernel.log.Log;
Expand Down Expand Up @@ -190,8 +191,15 @@ public String getClayCSSURL() {
return _clayCSSURL;
}

if (Validator.isNotNull(_defaultClayCSSURL)) {
_clayCSSURL = _defaultClayCSSURL;
String hashedFileURI = HashedFilesRegistryUtil.getHashedFileURI(
StringBundler.concat(
PortalUtil.getPathModule(), StringPool.SLASH,
_theme.getServletContextName(), _theme.getCssPath(),
PortalUtil.isRightToLeft(_httpServletRequest) ?
"/clay_rtl.css" : "/clay.css"));

if (Validator.isNotNull(hashedFileURI)) {
_clayCSSURL = hashedFileURI;
}
else {
_clayCSSURL = PortalUtil.getStaticResourceURL(
Expand Down Expand Up @@ -564,8 +572,15 @@ public String getMainCSSURL() {
return _mainCSSURL;
}

if (Validator.isNotNull(_defaultMainCSSURL)) {
_mainCSSURL = _defaultMainCSSURL;
String hashedFileURI = HashedFilesRegistryUtil.getHashedFileURI(
StringBundler.concat(
PortalUtil.getPathModule(), StringPool.SLASH,
_theme.getServletContextName(), _theme.getCssPath(),
PortalUtil.isRightToLeft(_httpServletRequest) ?
"/main_rtl.css" : "/main.css"));

if (Validator.isNotNull(hashedFileURI)) {
_mainCSSURL = hashedFileURI;
}
else {
_mainCSSURL = PortalUtil.getStaticResourceURL(
Expand All @@ -580,8 +595,14 @@ public String getMainJSURL() {
return _mainJSURL;
}

if (Validator.isNotNull(_defaultMainJSURL)) {
_mainJSURL = _defaultMainJSURL;
String hashedFileURI = HashedFilesRegistryUtil.getHashedFileURI(
StringBundler.concat(
PortalUtil.getPathModule(), StringPool.SLASH,
_theme.getServletContextName(), _theme.getJavaScriptPath(),
"/main.js"));

if (Validator.isNotNull(hashedFileURI)) {
_mainJSURL = hashedFileURI;
}
else {
_mainJSURL = PortalUtil.getStaticResourceURL(
Expand Down Expand Up @@ -1385,18 +1406,6 @@ public void setContact(Contact contact) {
_contact = contact;
}

public void setDefaultClayCSSURL(String defaultClayCSSURL) {
_defaultClayCSSURL = defaultClayCSSURL;
}

public void setDefaultMainCSSURL(String defaultMainCSSURL) {
_defaultMainCSSURL = defaultMainCSSURL;
}

public void setDefaultMainJSURL(String defaultMainJSURL) {
_defaultMainJSURL = defaultMainJSURL;
}

public void setDevice(Device device) {
_device = device;
}
Expand Down Expand Up @@ -2029,9 +2038,6 @@ private int _getLayoutManagePagesInitialChildren() {
private Contact _contact;
private Group _controlPanelGroup;
private Layout _controlPanelLayout;
private String _defaultClayCSSURL;
private String _defaultMainCSSURL;
private String _defaultMainJSURL;
private Device _device;
private long _doAsGroupId;
private String _doAsUserId = StringPool.BLANK;
Expand Down
2 changes: 1 addition & 1 deletion portal-kernel/src/com/liferay/portal/kernel/theme/packageinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version 13.1.0
version 14.0.0