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

Jump to bottom

Unify system error messages #4542

Merged
merged 3 commits into from
Aug 21, 2018
Merged

Unify system error messages #4542

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
4a3eabf
Unify system error messages
Aug 18, 2018
55a35f1
Remove duplicate logging call
pekam Aug 21, 2018
a5dd4de
Fix a test by finding only direct children of body with class 'message'
pekam Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
71 changes: 36 additions & 35 deletions flow-client/src/main/java/com/vaadin/client/SystemErrorHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,43 +93,16 @@ public void handleUnrecoverableError(String caption, String message,
return;
}

Document document = Browser.getDocument();
Element systemErrorContainer = document.createDivElement();
systemErrorContainer.setClassName("v-system-error");

if (caption != null) {
Element captionDiv = document.createDivElement();
captionDiv.setClassName("caption");
captionDiv.setInnerHTML(caption);
systemErrorContainer.appendChild(captionDiv);
Console.error(caption);
}
if (message != null) {
Element messageDiv = document.createDivElement();
messageDiv.setClassName("message");
messageDiv.setInnerHTML(message);
systemErrorContainer.appendChild(messageDiv);
Console.error(message);
}
if (details != null) {
Element detailsDiv = document.createDivElement();
detailsDiv.setClassName("details");
detailsDiv.setInnerHTML(details);
systemErrorContainer.appendChild(detailsDiv);
Console.error(details);
}

Element systemErrorContainer = handleError(caption, message, details);
systemErrorContainer.addEventListener("click",
e -> WidgetUtil.redirect(url), false);

document.addEventListener(Event.KEYDOWN, e -> {
Browser.getDocument().addEventListener(Event.KEYDOWN, e -> {
int keyCode = ((KeyboardEvent) e).getKeyCode();
if (keyCode == KeyCode.ESC) {
WidgetUtil.redirect(url);
}
}, false);

document.getBody().appendChild(systemErrorContainer);
}

/**
Expand All @@ -140,20 +113,16 @@ public void handleUnrecoverableError(String caption, String message,
* the error message to show
*/
public void handleError(String errorMessage) {
Console.error(errorMessage);
if (registry.getApplicationConfiguration().isProductionMode()) {
Console.error(errorMessage);
return;
}

Document document = Browser.getDocument();
Element errorContainer = document.createDivElement();
errorContainer.setClassName("v-system-error");
errorContainer.setTextContent(errorMessage);
Element errorContainer = handleError(null, errorMessage, null);
errorContainer.addEventListener("click", e -> {
// Allow user to dismiss the error by clicking it.
errorContainer.getParentElement().removeChild(errorContainer);
});
document.getBody().appendChild(errorContainer);
}

/**
Expand All @@ -172,6 +141,38 @@ public void handleError(Throwable throwable) {
}
}

private Element handleError(String caption, String message,
String details) {
Document document = Browser.getDocument();
Element systemErrorContainer = document.createDivElement();
systemErrorContainer.setClassName("v-system-error");

if (caption != null) {
Element captionDiv = document.createDivElement();
captionDiv.setClassName("caption");
captionDiv.setInnerHTML(caption);
systemErrorContainer.appendChild(captionDiv);
Console.error(caption);
}
if (message != null) {
Element messageDiv = document.createDivElement();
messageDiv.setClassName("message");
messageDiv.setInnerHTML(message);
systemErrorContainer.appendChild(messageDiv);
Console.error(message);
}
if (details != null) {
Element detailsDiv = document.createDivElement();
detailsDiv.setClassName("details");
detailsDiv.setInnerHTML(details);
systemErrorContainer.appendChild(detailsDiv);
Console.error(details);
}

document.getBody().appendChild(systemErrorContainer);
return systemErrorContainer;
}

private static Throwable unwrapUmbrellaException(Throwable e) {
if (e instanceof UmbrellaException) {
Set<Throwable> causes = ((UmbrellaException) e).getCauses();
Expand Down
3 changes: 2 additions & 1 deletion flow-tests/test-dev-mode/src/test/java/com/vaadin/flow/uitest/ui/DependencyIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ public void loadingUnavailableResourcesProduction() {
}

private List<String> getMessages() {
List<WebElement> elements = findElements(By.className("message"));
List<WebElement> elements = findElements(
By.xpath("html/body/*[@class='message']"));
List<String> messages = new ArrayList<>();
for (WebElement element : elements) {
messages.add(element.getText());
Expand Down