Skip to content

Commit e4fd000

Browse files
committed
User Info
1 parent 6f8afa6 commit e4fd000

File tree

2 files changed

+42
-4
lines changed

2 files changed

+42
-4
lines changed

services/static-webserver/client/source/class/osparc/metadata/ServicesInStudy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ qx.Class.define("osparc.metadata.ServicesInStudy", {
132132
i++;
133133
const node = workbench[nodeId];
134134

135-
const infoButton = new qx.ui.form.Button(null, "@MaterialIcons/info_outline/14");
135+
const infoButton = new qx.ui.form.Button(null, "@MaterialIcons/info_outline/16");
136136
infoButton.addListener("execute", () => {
137137
const metadata = osparc.store.Services.getMetadata(node["key"], node["version"]);
138138
if (metadata === null) {

services/static-webserver/client/source/class/osparc/po/UsersPending.js

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,37 @@ qx.Class.define("osparc.po.UsersPending", {
2828
2929
date: "2025-01-01 00:00:00.702394",
3030
status: "APPROVAL_PENDING",
31+
info: {
32+
"institution": "ETH Zurich",
33+
"department": "Department of Physics",
34+
"position": "PhD Student",
35+
"country": "Switzerland",
36+
"city": "Zurich",
37+
},
3138
}, {
3239
name: "Jane Doe",
3340
3441
date: "2025-01-01 00:01:00.702394",
3542
status: "APPROVAL_DENIED",
43+
info: {
44+
"institution": "ETH Zurich",
45+
"department": "Department of Physics",
46+
"position": "PhD Student",
47+
"country": "Switzerland",
48+
"city": "Zurich",
49+
},
3650
}, {
3751
name: "Alice Smith",
3852
3953
date: "2025-01-01 00:02:00.702394",
4054
status: "CONFIRMATION_PENDING",
55+
info: {
56+
"institution": "ETH Zurich",
57+
"department": "Department of Physics",
58+
"position": "PhD Student",
59+
"country": "Switzerland",
60+
"city": "Zurich",
61+
},
4162
}]
4263
});
4364
});
@@ -158,12 +179,19 @@ qx.Class.define("osparc.po.UsersPending", {
158179
column: 3,
159180
});
160181

161-
pendingUsersLayout.add(new qx.ui.basic.Label(this.tr("Action")).set({
182+
pendingUsersLayout.add(new qx.ui.basic.Label(this.tr("Info")).set({
162183
font: "text-14"
163184
}), {
164185
row: 0,
165186
column: 4,
166187
});
188+
189+
pendingUsersLayout.add(new qx.ui.basic.Label(this.tr("Action")).set({
190+
font: "text-14"
191+
}), {
192+
row: 0,
193+
column: 5,
194+
});
167195
},
168196

169197
__addRows: function(pendingUsers) {
@@ -187,12 +215,22 @@ qx.Class.define("osparc.po.UsersPending", {
187215
row,
188216
column: 3,
189217
});
190-
218+
const infoButton = new qx.ui.form.Button(null, "@MaterialIcons/info_outline/16");
219+
infoButton.addListener("execute", () => {
220+
const container = new qx.ui.container.Scroll();
221+
container.add(new osparc.ui.basic.JsonTreeWidget(pendingUser.info, "pendingUserInfo"));
222+
osparc.ui.window.Window.popUpInWindow(container, this.tr("User Info"));
223+
});
224+
pendingUsersLayout.add(infoButton, {
225+
row,
226+
column: 4,
227+
});
191228
const buttonsLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(5));
192229
pendingUsersLayout.add(buttonsLayout, {
193230
row,
194-
column: 4,
231+
column: 5,
195232
});
233+
196234
switch (pendingUser.status) {
197235
case "APPROVAL_PENDING": {
198236
const approveButton = this.self().createApproveButton(pendingUser.email);

0 commit comments

Comments
 (0)