Skip to content

Commit 81e4847

Browse files
authored
Orange progress bar when allocated resources go over 80% (ITISFoundation#3014)
1 parent 85c998f commit 81e4847

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

services/web/client/source/class/osparc/component/cluster/ClusterMiniView.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,10 @@ qx.Class.define("osparc.component.cluster.ClusterMiniView", {
153153
if (resourceInfo.available === 0) {
154154
return;
155155
}
156-
const icon = new qx.ui.basic.Image(resourceInfo.icon);
156+
const relativeUsage = resourceInfo.used / resourceInfo.available;
157+
const icon = new qx.ui.basic.Image(resourceInfo.icon).set({
158+
textColor: relativeUsage > 0.8 ? "busy-orange" : "text"
159+
});
157160
this._add(icon, {
158161
row: idx,
159162
column: 0
@@ -163,8 +166,9 @@ qx.Class.define("osparc.component.cluster.ClusterMiniView", {
163166
width: 60
164167
});
165168
osparc.utils.Utils.hideBorder(progressBar);
169+
// orange > 80%
166170
progressBar.getChildControl("progress").set({
167-
backgroundColor: "visual-blue"
171+
backgroundColor: relativeUsage > 0.8 ? "busy-orange" : "ready-green"
168172
});
169173
this._add(progressBar, {
170174
row: idx,

services/web/client/source/class/osparc/component/cluster/ClusterWorkers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ qx.Class.define("osparc.component.cluster.ClusterWorkers", {
103103
available = osparc.utils.Utils.bytesToGB(available);
104104
}
105105
if (qx.lang.Type.isNumber(available)) {
106-
// red > 80%
106+
// orange > 80%
107107
gaugeData.gauge.steps = [{
108108
range: [0.8*available, available],
109109
color: qx.theme.manager.Color.getInstance().resolve("busy-orange"),

services/web/client/source/class/osparc/component/cluster/ClustersDetails.js

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,8 @@ qx.Class.define("osparc.component.cluster.ClustersDetails", {
9292
clusters.addListener("clusterDetailsReceived", e => {
9393
const data = e.getData();
9494
if (this.__clusterId === data.clusterId) {
95-
if ("error" in data) {
96-
this.__clusterStatus.setTextColor("failed-red");
97-
this.__clusterWorkers.populateWorkersDetails(null);
98-
} else {
99-
this.__clusterStatus.setTextColor("ready-green");
100-
this.__clusterWorkers.populateWorkersDetails(data.clusterDetails);
101-
}
95+
this.__clusterStatus.setTextColor("error" in data ? "failed-red" : "ready-green");
96+
this.__clusterWorkers.populateWorkersDetails("error" in data ? null : data.clusterDetails);
10297
}
10398
});
10499
clusters.startFetchingDetails(this.__clusterId);

0 commit comments

Comments
 (0)