Skip to content

Commit 54932cf

Browse files
committed
transition
1 parent dea9468 commit 54932cf

File tree

3 files changed

+27
-19
lines changed

3 files changed

+27
-19
lines changed

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

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,9 @@ qx.Class.define("osparc.desktop.StudyEditor", {
169169
}, this);
170170
}
171171

172-
study.getUi().addListener("changeMode", e => this.__uiModeChanged(e.getData()));
172+
study.getUi().addListener("changeMode", e => {
173+
this.__uiModeChanged(e.getData(), e.getOldData());
174+
});
173175
})
174176
.catch(err => {
175177
console.error(err);
@@ -699,7 +701,7 @@ qx.Class.define("osparc.desktop.StudyEditor", {
699701
return this.__workbenchView.getLogger();
700702
},
701703

702-
__uiModeChanged: function(newUIMode) {
704+
__uiModeChanged: function(newUIMode, oldUIMode) {
703705
switch (newUIMode) {
704706
case "guided":
705707
case "app":
@@ -714,16 +716,21 @@ qx.Class.define("osparc.desktop.StudyEditor", {
714716
case "workbench":
715717
default: {
716718
this.__viewsStack.setSelection([this.__workbenchView]);
717-
const currentNodeId = this.getStudy().getUi().getCurrentNodeId();
718-
if (currentNodeId) {
719-
const node = this.getStudy().getWorkbench().getNode(currentNodeId);
720-
if (node && node.isDynamic()) {
721-
this.__workbenchView.fullscreenNode(currentNodeId);
719+
if (oldUIMode === "standalone") {
720+
// in this transition, show workbenchUI
721+
this.__workbenchView.showPipeline();
722+
} else {
723+
const currentNodeId = this.getStudy().getUi().getCurrentNodeId();
724+
if (currentNodeId) {
725+
const node = this.getStudy().getWorkbench().getNode(currentNodeId);
726+
if (node && node.isDynamic()) {
727+
this.__workbenchView.fullscreenNode(currentNodeId);
728+
} else {
729+
this.__workbenchView.nodeSelected(currentNodeId);
730+
}
722731
} else {
723-
this.__workbenchView.nodeSelected(currentNodeId);
732+
this.__workbenchView.openFirstNode();
724733
}
725-
} else {
726-
this.__workbenchView.openFirstNode();
727734
}
728735
break;
729736
}

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

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -499,10 +499,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
499499

500500
studyTreeItem.addListener("changeSelectedNode", () => {
501501
nodesTree.resetSelection();
502-
this.__populateSecondaryColumn(this.getStudy());
503-
this.__evalIframe();
504-
this.__openWorkbenchTab();
505-
this.__loggerView.setCurrentNodeId(null);
502+
this.showPipeline();
506503

507504
this.getStudy().getUi().setCurrentNodeId(this.getStudy().getUuid());
508505
});
@@ -1187,6 +1184,15 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
11871184
this.__nodesTree.nodeSelected(this.__currentNodeId);
11881185
},
11891186

1187+
showPipeline: function() {
1188+
this.__populateSecondaryColumn(this.getStudy());
1189+
this.__evalIframe();
1190+
this.__openWorkbenchTab();
1191+
this.__loggerView.setCurrentNodeId(null);
1192+
1193+
this.getStudy().getUi().setCurrentNodeId(this.getStudy().getUuid());
1194+
},
1195+
11901196
fullscreenNode: function(nodeId) {
11911197
const node = this.getStudy().getWorkbench().getNode(nodeId);
11921198
if (node && node.isDynamic()) {

services/static-webserver/client/source/class/osparc/navigation/StudyTitleWOptions.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,6 @@ qx.Class.define("osparc.navigation.StudyTitleWOptions", {
9696
});
9797
control.addListener("execute", () => {
9898
this.getStudy().getUi().setMode("standalone");
99-
const validNodes = this.getStudy().getNonFrontendNodes();
100-
if (this.getStudy().isOnlyNodeDynamic()) {
101-
const dynamicNode = validNodes[0];
102-
dynamicNode.getIFrame().maximizeIFrame(true);
103-
}
10499
});
105100
break;
106101
case "study-menu-download-logs":

0 commit comments

Comments
 (0)