-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
There are some failing tests, but this is in a feature branch for now so it should be fine.
- Loading branch information
Showing
7 changed files
with
126 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
64 changes: 64 additions & 0 deletions
64
vaadin-portlet/src/main/java/com/vaadin/flow/portal/VaadinLiferayPortlet.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| package com.vaadin.flow.portal; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import javax.portlet.HeaderRequest; | ||
| import javax.portlet.HeaderResponse; | ||
| import javax.portlet.PortletException; | ||
| import javax.portlet.RenderRequest; | ||
| import javax.portlet.RenderResponse; | ||
|
|
||
| import com.vaadin.flow.component.Component; | ||
|
|
||
| /** | ||
| * VaadinPortlet workarounds for Liferay versions 7.2.x and 7.3.x | ||
| * | ||
| * Requires the implementing portlet to signal PortletHub dependency due to a Liferay bug. | ||
| * Addresses inconsistent behaviour in injecting required Vaadin specific javascript. | ||
| */ | ||
| public abstract class VaadinLiferayPortlet<C extends Component> | ||
| extends VaadinPortlet<C> { | ||
|
|
||
| @Override | ||
| public void renderHeaders(HeaderRequest request, HeaderResponse response) { | ||
| // Skip most of renderHeaders for liferay portlets as it is called inconsistently between different versions (7.2, 7.3). | ||
| // - response.addDependency() won't work (ref: https://issues.liferay.com/browse/LPS-107438). | ||
| // - injected scripts may or may not actually appear on the page, and they are processed as XML (?) | ||
| // -> do the injection in doHeaders instead | ||
|
|
||
| // Calling this probably won't help (see above) | ||
| response.addDependency("PortletHub", "javax.portlet", "3.0.0"); | ||
| } | ||
|
|
||
| @Override | ||
| protected void doHeaders(RenderRequest request, RenderResponse response) | ||
| throws PortletException, IOException { | ||
| if (!checkStaticResourcesConfiguration()) { | ||
| throw new PortletException( | ||
| "Unexpected static resources path for Vaadin Liferay Portlet"); | ||
| } | ||
|
|
||
| super.doHeaders(request, response); | ||
|
|
||
| /** | ||
| * FIXME: This is pretty quaranteed to end up on the page, however... | ||
| * 1. The script tag will appear once per portlet | ||
| * 2. Liferay partial page update breaks the page and causes Vaadin components to render blank | ||
| * *if* the browser has stale Vaadin related things from the previous page. | ||
| * | ||
| * In other words we probably need a surgical way to scrub stale Vaadin things from users browser | ||
| * that only runs once, even if the script can be on the page multiple times. Alternatively we can | ||
| * just detect the problem and force a hard reload. | ||
| */ | ||
| response.getWriter().println( | ||
| getPortletScriptTag(request, "scripts/PortletMethods.js")); | ||
|
|
||
| // we don't actually know if the portlet is a 3.0 one here, but we need to stop the IPC errors from being thrown | ||
| // with liferay 7.3 the portlet generally fails to render if the exception is thrown | ||
| isPortlet3.set(true); | ||
| } | ||
|
|
||
| private boolean checkStaticResourcesConfiguration() { | ||
| return getStaticResourcesPath().startsWith("/o/"); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters