Skip to content

Commit 96e0a2a

Browse files
authored
🐛 Failing to start study (#5592)
1 parent b9bcbea commit 96e0a2a

File tree

4 files changed

+38
-7
lines changed

4 files changed

+38
-7
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,9 @@ qx.Class.define("osparc.dashboard.CardBase", {
661661
}
662662

663663
this._getChildren().forEach(item => {
664-
item.setOpacity(enabled ? 1.0 : 0.7);
664+
if (item) {
665+
item.setOpacity(enabled ? 1.0 : 0.7);
666+
}
665667
});
666668

667669
if (this.getMenu() && this.getMenu().getChildren()) {

services/static-webserver/client/source/class/osparc/data/model/NodeProgressSequence.js

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,24 +292,53 @@ qx.Class.define("osparc.data.model.NodeProgressSequence", {
292292

293293
__applySidecarPulling: function(value) {
294294
if (this.getClusterUpScaling() < 1) {
295-
this.setClusterUpScaling(1)
295+
this.setClusterUpScaling(1);
296+
const progress = this.getDefaultProgress();
297+
this.setDefaultProgress(progress + 1);
296298
}
297299
this.self().updateProgressLabel(this.__pullingSidecarTitle, value);
298300
},
299301

300302
__applyOutputsPulling: function(value) {
303+
if (this.getSidecarPulling() < 1) {
304+
this.setSidecarPulling(1);
305+
const progress = this.getDefaultProgress();
306+
this.setDefaultProgress(progress + 1);
307+
}
301308
this.self().updateProgressLabel(this.__pullingOutputsTitle, value);
302309
},
303310

304311
__applyStatePulling: function(value) {
312+
if (this.getSidecarPulling() < 1) {
313+
this.setSidecarPulling(1);
314+
const progress = this.getDefaultProgress();
315+
this.setDefaultProgress(progress + 1);
316+
}
305317
this.self().updateProgressLabel(this.__pullingStateTitle, value);
306318
},
307319

308320
__applyImagesPulling: function(value) {
321+
// [SERVICE_OUTPUTS_PULLING, SERVICE_STATE_PULLING] (notice the parallelism here)
322+
// As the two previous are running in parallel we can assume if this runs both should be done when we start pulling the images
323+
if (this.getOutputsPulling() < 1) {
324+
this.setOutputsPulling(1);
325+
const progress = this.getDefaultProgress();
326+
this.setDefaultProgress(progress + 1);
327+
}
328+
if (this.getStatePulling() < 1) {
329+
this.setStatePulling(1);
330+
const progress = this.getDefaultProgress();
331+
this.setDefaultProgress(progress + 1);
332+
}
309333
this.self().updateProgressLabel(this.__pullingImagesTitle, value);
310334
},
311335

312336
__applyInputsPulling: function(value) {
337+
if (this.getImagesPulling() < 1) {
338+
this.setImagesPulling(1);
339+
const progress = this.getDefaultProgress();
340+
this.setDefaultProgress(progress + 1);
341+
}
313342
this.self().updateProgressLabel(this.__pullingInputsTitle, value);
314343
}
315344
}

services/static-webserver/client/source/class/osparc/ui/list/ListItem.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ qx.Class.define("osparc.ui.list.ListItem", {
173173
control = new osparc.ui.markdown.Markdown().set({
174174
font: "text-13",
175175
noMargin: true,
176-
maxHeight: 16
176+
maxHeight: 18
177177
});
178178
this._add(control, {
179179
row: 1,

services/static-webserver/client/source/class/osparc/ui/markdown/Markdown.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,18 +123,18 @@ qx.Class.define("osparc.ui.markdown.Markdown", {
123123
}
124124
if (domElement && domElement.children) {
125125
const elemHeight = this.__getChildrenElementHeight(domElement.children);
126-
if (this.getMaxHeight() && (elemHeight > this.getMaxHeight())) {
127-
this.setHeight(elemHeight + 40);
126+
if (this.getMaxHeight() && elemHeight > this.getMaxHeight()) {
127+
this.setHeight(elemHeight);
128128
} else {
129-
this.setMinHeight(elemHeight + 40);
129+
this.setMinHeight(elemHeight);
130130
}
131131
}
132132
},
133133

134134
__getChildrenElementHeight: function(children) {
135135
let height = 0;
136136
if (children.length) {
137-
for (let i=0; i<children.length; i++) {
137+
for (let i=0; i < children.length; i++) {
138138
height += this.__getElementHeight(children[i]);
139139
}
140140
}

0 commit comments

Comments
 (0)