Skip to content

Commit 83a430d

Browse files
authored
✨ Ask for a project name when it's created (#5447)
1 parent 9c0324f commit 83a430d

File tree

6 files changed

+155
-148
lines changed

6 files changed

+155
-148
lines changed

services/static-webserver/client/source/class/osparc/About.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ qx.Class.define("osparc.About", {
2525
this.set({
2626
layout: new qx.ui.layout.VBox(10),
2727
maxWidth: this.self().MAX_WIDTH,
28+
maxHeight: this.self().MAX_HEIGHT,
2829
contentPadding: this.self().PADDING,
30+
resizable: true,
2931
showMaximize: false,
3032
showMinimize: false,
3133
centerOnAppear: true,
@@ -39,7 +41,8 @@ qx.Class.define("osparc.About", {
3941
},
4042

4143
statics: {
42-
MAX_WIDTH: 500,
44+
MAX_WIDTH: 550,
45+
MAX_HEIGHT: 680,
4346
PADDING: 15,
4447
OSPARC_OFFICIAL: "o<sup>2</sup>S<sup>2</sup>PARC"
4548
},
@@ -95,7 +98,9 @@ qx.Class.define("osparc.About", {
9598
barPosition: "top"
9699
});
97100
tabView.getChildControl("pane").setBackgroundColor("transparent");
98-
this.add(tabView, {
101+
const scrollView = new qx.ui.container.Scroll();
102+
scrollView.add(tabView);
103+
this.add(scrollView, {
99104
flex: 1
100105
});
101106

services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
7979
// pop up study options if the study was just created or if it has no wallet assigned or user has no access to it
8080
const resourceSelector = new osparc.study.StudyOptions(studyId);
8181
const win = osparc.study.StudyOptions.popUpInWindow(resourceSelector);
82+
win.moveItUp();
8283
resourceSelector.addListener("startStudy", () => {
8384
win.close();
8485
openStudy();

services/static-webserver/client/source/class/osparc/desktop/credits/Utils.js

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,9 @@ qx.Class.define("osparc.desktop.credits.Utils", {
7272
createWalletSelector: function(accessRight = "read") {
7373
const store = osparc.store.Store.getInstance();
7474

75-
const walletSelector = new qx.ui.form.SelectBox();
75+
const walletSelector = new qx.ui.form.SelectBox().set({
76+
minWidth: 220
77+
});
7678

7779
const populateSelectBox = selectBox => {
7880
selectBox.removeAll();
@@ -81,7 +83,7 @@ qx.Class.define("osparc.desktop.credits.Utils", {
8183
wallets.forEach(wallet => {
8284
const found = wallet.getMyAccessRights();
8385
if (found && found[accessRight]) {
84-
const sbItem = new qx.ui.form.ListItem(wallet.getName());
86+
const sbItem = new qx.ui.form.ListItem(`${wallet.getName()} (${wallet.getCreditsAvailable()} credits)`);
8587
sbItem.walletId = wallet.getWalletId();
8688
selectBox.add(sbItem);
8789
}
@@ -94,24 +96,6 @@ qx.Class.define("osparc.desktop.credits.Utils", {
9496
return walletSelector;
9597
},
9698

97-
createWalletSelectorLayout: function(accessRight = "read") {
98-
const layout = new qx.ui.container.Composite(new qx.ui.layout.HBox(10));
99-
100-
const label = new qx.ui.basic.Label(qx.locale.Manager.tr("Select Credit Account"));
101-
layout.add(label);
102-
103-
const walletSelector = osparc.desktop.credits.Utils.createWalletSelector(accessRight);
104-
layout.add(walletSelector);
105-
106-
if (osparc.desktop.credits.Utils.areWalletsEnabled() && walletSelector.getSelectables().length > 1) {
107-
layout.show();
108-
} else {
109-
layout.exclude();
110-
}
111-
112-
return layout;
113-
},
114-
11599
autoSelectActiveWallet: function(walletSelector) {
116100
// If there is only one active wallet, select it
117101
const store = osparc.store.Store.getInstance();

services/static-webserver/client/source/class/osparc/study/BillingSettings.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ qx.Class.define("osparc.study.BillingSettings", {
4949
alignY: "middle"
5050
});
5151

52-
const walletSelector = osparc.desktop.credits.Utils.createWalletSelector("read").set({
53-
minWidth: 180
54-
});
52+
const walletSelector = osparc.desktop.credits.Utils.createWalletSelector("read");
5553
hBox.add(walletSelector);
5654

5755
pricingUnitsLayout.add(hBox);

0 commit comments

Comments
 (0)