Skip to content

[HAL-2007] Fix utilization bar #1359

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

Merged
hpehl merged 1 commit into from
May 15, 2025
Merged

[HAL-2007] Fix utilization bar #1359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
88 changes: 49 additions & 39 deletions ballroom/src/main/java/org/jboss/hal/ballroom/chart/Utilization.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,19 @@

import static org.jboss.gwt.elemento.core.Elements.div;
import static org.jboss.gwt.elemento.core.Elements.span;
import static org.jboss.hal.resources.CSS.*;
import static org.jboss.hal.resources.CSS.progress;
import static org.jboss.hal.resources.CSS.progressBar;
import static org.jboss.hal.resources.CSS.progressBarDanger;
import static org.jboss.hal.resources.CSS.progressBarRemaining;
import static org.jboss.hal.resources.CSS.progressBarSuccess;
import static org.jboss.hal.resources.CSS.progressBarWarning;
import static org.jboss.hal.resources.CSS.progressContainer;
import static org.jboss.hal.resources.CSS.progressDescription;
import static org.jboss.hal.resources.CSS.progressDescriptionLeft;
import static org.jboss.hal.resources.CSS.progressLabelRight;
import static org.jboss.hal.resources.CSS.progressLabelTopRight;
import static org.jboss.hal.resources.CSS.srOnly;
import static org.jboss.hal.resources.CSS.width;
import static org.jboss.hal.resources.UIConstants.PROGRESSBAR;
import static org.jboss.hal.resources.UIConstants.ROLE;
import static org.jboss.hal.resources.UIConstants.TOGGLE;
Expand Down Expand Up @@ -102,46 +114,44 @@ public void update(long current) {
}

public void update(long current, long total) {
if (current <= total) {
this.total = total;
double currentPercent = Math.round(((double) current) / ((double) total) * 100.0);
long remaining = total - current;
double remainingPercent = 100.0 - currentPercent;

valueBar.setAttribute(aria(VALUE_NOW), String.valueOf(current));
valueBar.setAttribute(aria(VALUE_MAX), String.valueOf(total));
valueBar.style.width = width(currentPercent + "%");
Tooltip.element(valueBar).setTitle(MESSAGES.used(currentPercent));
//noinspection HardCodedStringLiteral
valueElement.innerHTML = new SafeHtmlBuilder()
.appendHtmlConstant("<strong>")
.appendEscaped(MESSAGES.currentOfTotal(current, total))
.appendHtmlConstant("</strong>")
.appendEscaped(" " + unit)
.toSafeHtml().asString();

remainingBar.setAttribute(aria(VALUE_NOW), String.valueOf(remaining));
remainingBar.setAttribute(aria(VALUE_MAX), String.valueOf(total));
remainingBar.style.width = width(remainingPercent + "%");
Tooltip.element(remainingBar).setTitle(MESSAGES.available(remainingPercent));
remainingElement.textContent = MESSAGES.available(remainingPercent);

if (thresholds) {
valueBar.classList.remove(progressBarDanger);
valueBar.classList.remove(progressBarWarning);
valueBar.classList.remove(progressBarSuccess);
if (currentPercent > 90) {
valueBar.classList.add(progressBarDanger);
} else if (currentPercent > 75) {
valueBar.classList.add(progressBarWarning);
} else {
valueBar.classList.add(progressBarSuccess);
}
}

} else {
if (current > total) {
logger.error("Invalid values for utilization bar chart: current > total ({} > {})", current, total);
}
this.total = total;
double currentPercent = Math.round(((double) current) / ((double) total) * 100.0);
long remaining = total - current;
double remainingPercent = 100.0 - currentPercent;

valueBar.setAttribute(aria(VALUE_NOW), String.valueOf(current));
valueBar.setAttribute(aria(VALUE_MAX), String.valueOf(total));
valueBar.style.width = width(currentPercent + "%");
Tooltip.element(valueBar).setTitle(MESSAGES.used(currentPercent));
//noinspection HardCodedStringLiteral
valueElement.innerHTML = new SafeHtmlBuilder()
.appendHtmlConstant("<strong>")
.appendEscaped(MESSAGES.currentOfTotal(current, total))
.appendHtmlConstant("</strong>")
.appendEscaped(" " + unit)
.toSafeHtml().asString();

remainingBar.setAttribute(aria(VALUE_NOW), String.valueOf(remaining));
remainingBar.setAttribute(aria(VALUE_MAX), String.valueOf(total));
remainingBar.style.width = width(remainingPercent + "%");
Tooltip.element(remainingBar).setTitle(MESSAGES.available(remainingPercent));
remainingElement.textContent = MESSAGES.available(remainingPercent);

if (thresholds) {
valueBar.classList.remove(progressBarDanger);
valueBar.classList.remove(progressBarWarning);
valueBar.classList.remove(progressBarSuccess);
if (currentPercent > 90) {
valueBar.classList.add(progressBarDanger);
} else if (currentPercent > 75) {
valueBar.classList.add(progressBarWarning);
} else {
valueBar.classList.add(progressBarSuccess);
}
}
}

private String aria(String name) {
Expand Down
Loading