Skip to content

🎨 [Frontend] Enh: Better fit loading page #7866

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
merged 7 commits into from
Jun 10, 2025
Merged

🎨 [Frontend] Enh: Better fit loading page #7866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0eff0e5
minor
odeimaiz Jun 10, 2025
0a5c88d
minor
odeimaiz Jun 10, 2025
607f21b
re-layout
odeimaiz Jun 10, 2025
dbde00d
exclude it
odeimaiz Jun 10, 2025
b4f37a9
minor
odeimaiz Jun 10, 2025
d9e28f4
simplify
odeimaiz Jun 10, 2025
4108fc1
Merge branch 'master' into enh/fit-loading-page
mergify[bot] Jun 10, 2025
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
4 changes: 3 additions & 1 deletion services/static-webserver/client/source/class/osparc/data/model/NodeProgressSequence.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,9 @@ qx.Class.define("osparc.data.model.NodeProgressSequence", {
},

__initLayout: function() {
this.__mainLoadingPage = new qx.ui.container.Composite(new qx.ui.layout.VBox(8));
this.__mainLoadingPage = new qx.ui.container.Composite(new qx.ui.layout.VBox(8)).set({
maxWidth: 400,
});

const sequenceLoadingPage = new osparc.widget.ProgressSequence(qx.locale.Manager.tr("LOADING ..."));
const nTasks = 7;
Expand Down
66 changes: 14 additions & 52 deletions services/static-webserver/client/source/class/osparc/ui/message/Loading.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,7 @@ qx.Class.define("osparc.ui.message.Loading", {
construct: function() {
this.base(arguments);

const layout = new qx.ui.layout.Grid(20, 20);
layout.setRowFlex(this.self().GRID_POS.SPACER_TOP, 1);
layout.setRowFlex(this.self().GRID_POS.SPACER_BOTTOM, 1);
layout.setColumnFlex(0, 1);
layout.setColumnMaxWidth(1, 400);
layout.setColumnAlign(1, "center", "middle");
layout.setColumnFlex(2, 1);
layout.setColumnAlign(2, "right", "middle");
this._setLayout(layout);
this._setLayout(new qx.ui.layout.VBox(10));

this.__buildLayout();
},
Expand Down Expand Up @@ -88,16 +80,6 @@ qx.Class.define("osparc.ui.message.Loading", {
LOGO_HEIGHT: 100,
ICON_HEIGHT: 220,
STATUS_ICON_SIZE: 20,

GRID_POS: {
TOOLBAR: 0,
SPACER_TOP: 1,
LOGO: 2,
WAITING: 3,
MESSAGES: 4,
EXTRA_WIDGETS: 5,
SPACER_BOTTOM: 6,
}
},

members: {
Expand All @@ -108,20 +90,12 @@ qx.Class.define("osparc.ui.message.Loading", {
__maxButton: null,

__buildLayout: function() {
this._add(new qx.ui.core.Widget(), {
column: 0,
row: 0
});

const maxLayout = this.__createMaximizeToolbar();
this._add(maxLayout, {
column: 2,
row: this.self().GRID_POS.TOOLBAR
});
this._add(maxLayout);

this._add(new qx.ui.core.Spacer(), {
column: 1,
row: this.self().GRID_POS.SPACER_TOP
const topSpacer = new qx.ui.core.Spacer();
this._add(topSpacer, {
flex: 1,
});

const productLogoPath = osparc.product.Utils.getLogoPath();
Expand All @@ -141,18 +115,15 @@ qx.Class.define("osparc.ui.message.Loading", {
height: logoHeight
});
}
this._add(thumbnail, {
column: 1,
row: this.self().GRID_POS.LOGO
});
this._add(thumbnail);

const waitingHeader = this.__header = new qx.ui.basic.Atom().set({
icon: "@FontAwesome5Solid/circle-notch/"+this.self().STATUS_ICON_SIZE,
font: "title-18",
alignX: "center",
rich: true,
gap: 15,
allowGrowX: false
allowGrowX: false,
});
const icon = waitingHeader.getChildControl("icon");
osparc.service.StatusUI.updateCircleAnimation(icon);
Expand All @@ -162,30 +133,21 @@ qx.Class.define("osparc.ui.message.Loading", {
wrap: true,
alignX: "center",
});
this._add(waitingHeader, {
column: 1,
row: this.self().GRID_POS.WAITING
});
this._add(waitingHeader);

const messages = this.__messagesContainer = new qx.ui.container.Composite(new qx.ui.layout.VBox(10).set({
alignX: "center"
}));
this._add(messages, {
column: 1,
row: this.self().GRID_POS.MESSAGES
});
this._add(messages);

const extraWidgets = this.__extraWidgets = new qx.ui.container.Composite(new qx.ui.layout.VBox(10).set({
alignX: "center"
}));
this._add(extraWidgets, {
column: 1,
row: this.self().GRID_POS.EXTRA_WIDGETS
});
this._add(extraWidgets);

this._add(new qx.ui.core.Spacer(), {
column: 1,
row: this.self().GRID_POS.SPACER_BOTTOM
const bottomSpacer = new qx.ui.core.Spacer();
this._add(bottomSpacer, {
flex: 1,
});
},

Expand Down Expand Up @@ -220,7 +182,7 @@ qx.Class.define("osparc.ui.message.Loading", {
alignX: "right",
}));
this.bind("showToolbar", toolbarLayout, "visibility", {
converter: showToolbar => showToolbar ? "visible" : "hidden"
converter: showToolbar => showToolbar ? "visible" : "excluded"
});
toolbarLayout.add(maxButton);
return toolbarLayout;
Expand Down
Loading