Skip to content
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

🎨 [Frontend] Enh: Show pending service_message in loading page #6570

Merged
merged 11 commits into from
Oct 21, 2024
Merged

🎨 [Frontend] Enh: Show pending service_message in loading page #6570

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e8aed49
minor
odeimaiz Oct 21, 2024
2021dbc
show service message
odeimaiz Oct 21, 2024
e4cbd0e
minor
odeimaiz Oct 21, 2024
d425b08
Merge branch 'master' into enh/show-pending-message
odeimaiz Oct 21, 2024
873273f
pending is a valid Progress Sequence State
odeimaiz Oct 21, 2024
3d92efa
Merge branch 'enh/show-pending-message' of github.com:odeimaiz/osparc…
odeimaiz Oct 21, 2024
4d49ab8
add comment
odeimaiz Oct 21, 2024
a0d625d
rename variable
odeimaiz Oct 21, 2024
b90bf36
expose MessageLabels
odeimaiz Oct 21, 2024
2d3abbc
show pending messages only after 10"
odeimaiz Oct 21, 2024
a6eb1c6
Merge branch 'master' into enh/show-pending-message
odeimaiz Oct 21, 2024
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
5 changes: 4 additions & 1 deletion services/static-webserver/client/source/class/osparc/data/model/IframeHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ qx.Class.define("osparc.data.model.IframeHandler", {
const nodeStatus = node.getStatus();
const sequenceWidget = nodeStatus.getProgressSequence().getWidgetForLoadingPage();
nodeStatus.bind("interactive", sequenceWidget, "visibility", {
converter: state => ["starting", "pulling", "pending", "connecting"].includes(state) ? "visible" : "excluded"
converter: state => ["pulling", "starting", "connecting"].includes(state) ? "visible" : "excluded"
});
loadingPage.addExtraWidget(sequenceWidget);

Expand Down Expand Up @@ -189,6 +189,8 @@ qx.Class.define("osparc.data.model.IframeHandler", {
const nodeId = data["service_uuid"];
const node = this.getNode();
const status = node.getStatus();
const loadingPage = this.getLoadingPage();
loadingPage.clearMessages();
switch (serviceState) {
case "idle": {
status.setInteractive(serviceState);
Expand All @@ -202,6 +204,7 @@ qx.Class.define("osparc.data.model.IframeHandler", {
if (data["service_message"]) {
const serviceName = node.getLabel();
const serviceMessage = data["service_message"];
loadingPage.setMessages([serviceMessage]);
const msg = `The service "${serviceName}" is waiting for available ` +
`resources. Please inform support and provide the following message ` +
`in case this does not resolve in a few minutes: "${nodeId}" ` +
Expand Down
1 change: 1 addition & 0 deletions 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 @@ -22,6 +22,7 @@
* [CLUSTER_UP_SCALING]
* [SIDECARS_PULLING]
* [SERVICE_OUTPUTS_PULLING, SERVICE_STATE_PULLING, SERVICE_IMAGES_PULLING] (notice the parallelism here)
* [SERVICE_CONTAINERS_STARTING]
* [SERVICE_INPUTS_PULLING] (when this happens, the frontend has already loaded the service and is displaying it to the user) I would still keep it as is, when we decide to make inputs pulling part of the boot sequence this will be helpful.
*
* This class provides different widgets that render the progress status
Expand Down
Loading