Skip to content

Commit 6f8749d

Browse files
authored
πŸ›πŸŽ¨ [Frontend] add border to Disk Indicator (#6022)
1 parent c361c2f commit 6f8749d

File tree

7 files changed

+21
-10
lines changed

7 files changed

+21
-10
lines changed

β€Žservices/static-webserver/client/source/class/osparc/desktop/credits/CreditsIndicatorButton.jsβ€Ž

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ qx.Class.define("osparc.desktop.credits.CreditsIndicatorButton", {
2121
construct: function() {
2222
this.base(arguments);
2323

24+
osparc.utils.Utils.setIdToWidget(this, "creditsIndicatorButton");
25+
2426
this.set({
2527
cursor: "pointer",
2628
padding: [3, 8]

β€Žservices/static-webserver/client/source/class/osparc/desktop/credits/CreditsNavBarContainer.jsβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ qx.Class.define("osparc.desktop.credits.CreditsNavBarContainer", {
5757
osparc.desktop.credits.BillingCenterWindow.openWindow();
5858
this.exclude();
5959
});
60+
osparc.utils.Utils.setIdToWidget(billingCenterButton, "billingCenterButton");
6061
layout.add(billingCenterButton);
6162

6263
this._add(layout);

β€Žservices/static-webserver/client/source/class/osparc/navigation/NavigationBar.jsβ€Ž

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,6 @@ qx.Class.define("osparc.navigation.NavigationBar", {
240240
}
241241
case "credits-button":
242242
control = new osparc.desktop.credits.CreditsIndicatorButton();
243-
osparc.utils.Utils.setIdToWidget(control, "creditsNavigationBtn");
244243
this.getChildControl("right-items").add(control);
245244
break;
246245
case "tasks-button":

β€Žservices/static-webserver/client/source/class/osparc/theme/Decoration.jsβ€Ž

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ qx.Theme.define("osparc.theme.Decoration", {
3535
"indicator-border": {
3636
include: "material-button",
3737
style: {
38-
radius: 2
38+
radius: 2,
39+
width: 1,
40+
color: "text"
3941
}
4042
},
4143

β€Žservices/static-webserver/client/source/class/osparc/viewer/NodeViewer.jsβ€Ž

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ qx.Class.define("osparc.viewer.NodeViewer", {
3939
// create node
4040
const node = new osparc.data.model.Node(study, key, version, nodeId);
4141
this.setNode(node);
42+
43+
node.addListener("retrieveInputs", e => {
44+
const data = e.getData();
45+
const portKey = data["portKey"];
46+
node.retrieveInputs(portKey);
47+
}, this);
48+
4249
node.initIframeHandler();
4350

4451
const iframeHandler = node.getIframeHandler();

β€Žservices/static-webserver/client/source/class/osparc/workbench/DiskUsageIndicator.jsβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,15 +157,15 @@ qx.Class.define("osparc.workbench.DiskUsageIndicator", {
157157
}
158158

159159
const usage = diskUsage["usage"]["/"]
160-
const warningColor = this.__getIndicatorColor(usage.free);
160+
const color1 = this.__getIndicatorColor(usage.free);
161161
const progress = `${usage["used_percent"]}%`;
162162
const labelDiskSize = osparc.utils.Utils.bytesToSize(usage.free);
163-
const color1 = warningColor;
164163
const bgColor = qx.theme.manager.Color.getInstance().resolve("tab_navigation_bar_background_color");
165164
const color2 = qx.theme.manager.Color.getInstance().resolve("progressive-progressbar-background");
166165
indicator.getContentElement().setStyles({
167166
"background-color": bgColor,
168167
"background": `linear-gradient(90deg, ${color1} ${progress}, ${color2} ${progress})`,
168+
"border-color": color1
169169
});
170170

171171
const indicatorLabel = this.getChildControl("disk-indicator-label");

β€Žservices/static-webserver/client/source/resource/osparc/tours/tis_tours.jsonβ€Ž

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,21 @@
9595
"id": "credits",
9696
"name": "Buy Credits",
9797
"description": "Buy Credits for Personalization",
98-
"context": "osparc-test-id=userMenuBtn",
98+
"context": "osparc-test-id=creditsIndicatorButton",
9999
"steps": [{
100100
"title": "Credits",
101101
"text": "In order to run Personalized TI Plans, credits are required.<br>In the next Guided Tour you will learn how to purchase them."
102102
}, {
103103
"beforeClick": {
104-
"selector": "osparc-test-id=userMenuBtn",
105-
"action": "open"
104+
"selector": "osparc-test-id=creditsIndicatorButton",
105+
"event": "tap"
106106
},
107-
"anchorEl": "osparc-test-id=userMenuBillingCenterBtn",
108-
"text": "From the User Menu you can access the Billing Center.",
107+
"anchorEl": "osparc-test-id=creditsNavBarContainer",
108+
"text": "By clicking on the Credits Indicator, you will you see the available Credits. Tap the three dots to access the Billing Center.",
109109
"placement": "left"
110110
}, {
111111
"beforeClick": {
112-
"selector": "osparc-test-id=userMenuBillingCenterBtn",
112+
"selector": "osparc-test-id=billingCenterButton",
113113
"action": "execute"
114114
},
115115
"anchorEl": "osparc-test-id=walletsList",

0 commit comments

Comments
Β (0)