Skip to content

CSSTUDIO-3811 Don't call Action.resolve() on the URL in the "Open Web Page Action" action #3986

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

Open
abrahamwolk wants to merge 4 commits into
base: master
Choose a base branch
from
Open

CSSTUDIO-3811 Don't call Action.resolve() on the URL in the "Open Web Page Action" action #3986

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4e248e
CSSTUDIO-3811 Don't call ActionUtil.resolve() on the URL in Open Web …
abrahamwolk Oct 26, 2026
1352255
CSSTUDIO-3811 Improve error reporting.
abrahamwolk Oct 26, 2026
2cabc76
CSSTUDIO-3811 Remove unused import.
abrahamwolk Oct 26, 2026
ed363d9
CSSTUDIO-3811 Make check for URL scheme case-insensitive.
abrahamwolk Oct 27, 2026
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
37 changes: 28 additions & 9 deletions ...ava/org/csstudio/display/builder/runtime/app/actionhandlers/OpenWebPageActionHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
import org.csstudio.display.builder.model.Widget;
import org.csstudio.display.builder.model.spi.ActionInfo;
import org.csstudio.display.builder.representation.ToolkitRepresentation;
import org.csstudio.display.builder.runtime.ActionUtil;
import org.csstudio.display.builder.runtime.script.ScriptUtil;
import org.csstudio.display.builder.model.spi.ActionHandler;
import org.csstudio.display.actions.OpenWebPageAction;
import org.phoebus.framework.macros.MacroHandler;
import org.phoebus.framework.macros.MacroValueProvider;

import java.util.logging.Level;
import java.util.logging.Logger;
Expand All @@ -24,33 +25,51 @@
@Override
public void handleAction(Widget sourceWidget, ActionInfo pluggableActionInfo) {
OpenWebPageAction action = (OpenWebPageAction)pluggableActionInfo;
if (action.getURL().isEmpty())
final String url = action.getURL();
if (url.trim().isEmpty())
{
logger.log(Level.WARNING, "Action without URL: {0}", action);
logger.log(Level.WARNING, "Open Web Page Action: No URL: {0}", action);
return;
}
else if (!url.trim().equals(url)) {
logger.log(Level.WARNING, "Open Web Page Action: URL has leading and/or trailing whitespace: \"{0}\"", url);
return;
}
else if (!(url.toLowerCase().startsWith("http://") || url.toLowerCase().startsWith("https://") || url.toLowerCase().startsWith("file:"))) {
logger.log(Level.WARNING, "Open Web Page Action: URL does not start with one of the URL schemes \"http://\", \"https://\", or \"file:\": \"{0}\"", url);
return;
}
try
{
final String resolved_name = ActionUtil.resolve(sourceWidget, action.getURL());
final DisplayModel top_model = sourceWidget.getTopDisplayModel();
final ToolkitRepresentation<Object, Object> toolkit = ToolkitRepresentation.getToolkit(top_model);
final String escapedExpandedURL;
{

Check warning on line 45 in app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/actionhandlers/OpenWebPageActionHandler.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract this nested code block into a method. 


See more on https://sonarcloud.io/project/issues?id=ControlSystemStudio_phoebus&issues=AaF4epMniEcLuZDlGRBO&open=AaF4epMniEcLuZDlGRBO&pullRequest=3986
final MacroValueProvider macros = sourceWidget.getMacrosOrProperties();
final String expandedURL = MacroHandler.replace(macros, url);
escapedExpandedURL = expandedURL.replace(" ", "%20");
}

final ToolkitRepresentation<Object, Object> toolkit;
{

Check warning on line 52 in app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/actionhandlers/OpenWebPageActionHandler.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Extract this nested code block into a method. 


See more on https://sonarcloud.io/project/issues?id=ControlSystemStudio_phoebus&issues=AaF4epMniEcLuZDlGRBP&open=AaF4epMniEcLuZDlGRBP&pullRequest=3986
final DisplayModel top_model = sourceWidget.getTopDisplayModel();
toolkit = ToolkitRepresentation.getToolkit(top_model);
}
toolkit.execute(() ->
{
try
{
toolkit.openWebBrowser(resolved_name);
toolkit.openWebBrowser(escapedExpandedURL);
}
catch (Exception ex)
{
logger.log(Level.WARNING, "Cannot open " + action, ex);
toolkit.showErrorDialog(sourceWidget, "Cannot open " + resolved_name);
toolkit.showErrorDialog(sourceWidget, "Cannot open " + escapedExpandedURL);
}
});
}
catch (final Exception ex)
{
logger.log(Level.WARNING, "Error handling " + action, ex);
ScriptUtil.showErrorDialog(sourceWidget, "Cannot open " + action.getURL() + ".\n\nSee log for details.");
ScriptUtil.showErrorDialog(sourceWidget, "Cannot open " + url + ".\n\nSee log for details.");
}
}

Expand Down
Loading