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: Improve study homepage #4451

Merged
merged 9 commits into from
Jul 4, 2023
Merged

🎨 Frontend: Improve study homepage #4451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c1fdd4c
Do not create three Studies, reuse the copy
odeimaiz Jul 3, 2023
6bba309
do not show the Nodes Tree
odeimaiz Jul 3, 2023
b9a58c4
Merge branch 'master' into feature/improve-study-homepage
odeimaiz Jul 4, 2023
e1eda46
Do not add the preview if the study is in App Mode
odeimaiz Jul 4, 2023
351356f
Merge branch 'feature/improve-study-homepage' of github.com:odeimaiz/…
odeimaiz Jul 4, 2023
5a567e9
minor
odeimaiz Jul 4, 2023
c14f48f
refactoring
odeimaiz Jul 4, 2023
70d309a
Do not show the thumbnail explorer if there are no thumbnails
odeimaiz Jul 4, 2023
3f46246
Merge branch 'master' into feature/improve-study-homepage
odeimaiz Jul 4, 2023
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
29 changes: 19 additions & 10 deletions ...ices/static-webserver/client/source/class/osparc/component/editor/ThumbnailSuggestions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ qx.Class.define("osparc.component.editor.ThumbnailSuggestions", {
},

events: {
"thumbnailAdded": "qx.event.type.Event",
"thumbnailTapped": "qx.event.type.Data"
},

Expand Down Expand Up @@ -72,10 +73,7 @@ qx.Class.define("osparc.component.editor.ThumbnailSuggestions", {
const srvMetadata = osparc.utils.Services.getMetaData(node.getKey(), node.getVersion());
if (srvMetadata && srvMetadata["thumbnail"] && !osparc.data.model.Node.isFrontend(node)) {
const nodeId = node.getNodeId();
if (!(nodeId in this.__thumbnailsPerNode)) {
this.__thumbnailsPerNode[nodeId] = [];
}
this.__thumbnailsPerNode[nodeId].push({
this.__addThumbnail(nodeId, {
type: "serviceImage",
thumbnailUrl: srvMetadata["thumbnail"],
fileUrl: srvMetadata["thumbnail"]
Expand All @@ -84,13 +82,27 @@ qx.Class.define("osparc.component.editor.ThumbnailSuggestions", {
});
},

__addThumbnail: function(nodeId, thumbnailData) {
if (!(nodeId in this.__thumbnailsPerNode)) {
this.__thumbnailsPerNode[nodeId] = [];
}
this.__thumbnailsPerNode[nodeId].push(thumbnailData);
this.fireEvent("thumbnailAdded");
},

__setThumbnails: function(nodeId, thumbnailsData) {
this.__thumbnailsPerNode[nodeId] = thumbnailsData;
this.fireEvent("thumbnailAdded");
},

addWorkbenchUIPreviewToSuggestions: function() {
// make it first in the list
this.__thumbnailsPerNode["0000-workbenchUIPreview"] = [{
this.__setThumbnails("0000-workbenchUIPreview", [{
type: "workbenchUIPreview",
thumbnailUrl: osparc.product.Utils.getWorkbenhUIPreviewPath(),
fileUrl: osparc.product.Utils.getWorkbenhUIPreviewPath()
}];
}]);

const themeManager = qx.theme.manager.Meta.getInstance();
themeManager.addListener("changeTheme", () => this.addWorkbenchUIPreviewToSuggestions());
},
Expand All @@ -100,11 +112,8 @@ qx.Class.define("osparc.component.editor.ThumbnailSuggestions", {
const nodeId = previewsPerNode["node_id"];
const previews = previewsPerNode["screenshots"];
if (previews && previews.length) {
if (!(nodeId in this.__thumbnailsPerNode)) {
this.__thumbnailsPerNode[nodeId] = [];
}
previews.forEach(preview => {
this.__thumbnailsPerNode[nodeId].push({
this.__addThumbnail(nodeId, {
type: preview["mimetype"],
thumbnailUrl: preview["thumbnail_url"],
fileUrl: preview["file_url"]
Expand Down
79 changes: 47 additions & 32 deletions services/static-webserver/client/source/class/osparc/dashboard/StudyThumbnailExplorer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ qx.Class.define("osparc.dashboard.StudyThumbnailExplorer", {
maxHeight: this.self().LAYOUT_HEIGHT
});

this.__studyData = studyData;
const study = this.__study = new osparc.data.model.Study(studyData);
// make nodes not movable
study.setReadOnly(true);

this.__buildLayout();
this.__attachEventHandlers();
Expand All @@ -42,7 +44,7 @@ qx.Class.define("osparc.dashboard.StudyThumbnailExplorer", {
},

members: {
__studyData: null,
__study: null,

_createChildControlImpl: function(id) {
let control;
Expand All @@ -64,7 +66,7 @@ qx.Class.define("osparc.dashboard.StudyThumbnailExplorer", {
});
break;
}
case "scroll-thumbnails": {
case "thumbnail-suggestions": {
control = this.__getThumbnailSuggestions();
const thumbnailsLayout = this.getChildControl("thumbnails-layout");
thumbnailsLayout.add(control);
Expand All @@ -90,49 +92,37 @@ qx.Class.define("osparc.dashboard.StudyThumbnailExplorer", {
hideRoot: false,
simpleNodes: true
});
const study = new osparc.data.model.Study(this.__studyData);
// Do not show the nodes tree if it's a mononode study
if (study.isPipelineMononode()) {
if (this.__study.isPipelineMononode()) {
nodesTree.exclude();
}
nodesTree.setStudy(study);
return nodesTree;
},

__getThumbnailSuggestions: function() {
const study = new osparc.data.model.Study(this.__studyData);
const thumbnailSuggestions = new osparc.component.editor.ThumbnailSuggestions().set({
minHeight: this.self().THUMBNAIL_SLIDER_HEIGHT,
maxHeight: this.self().THUMBNAIL_SLIDER_HEIGHT
});
thumbnailSuggestions.addWorkbenchUIPreviewToSuggestions();
thumbnailSuggestions.setStudy(study);

const params = {
url: {
studyId: this.__studyData["uuid"]
}
};
osparc.data.Resources.fetch("studyPreviews", "getPreviews", params)
.then(previewsPerNodes => thumbnailSuggestions.addPreviewsToSuggestions(previewsPerNodes))
.catch(err => console.error(err));

return thumbnailSuggestions;
},

__buildLayout: function() {
this.getChildControl("nodes-tree");
this.getChildControl("scroll-thumbnails");
// For now, do not show the Nodes Tree
// this.getChildControl("nodes-tree");
this.getChildControl("thumbnail-suggestions");
this.getChildControl("thumbnail-viewer-layout");
},

__attachEventHandlers: function() {
/*
const nodesTree = this.getChildControl("nodes-tree");
const scrollThumbnails = this.getChildControl("scroll-thumbnails");
nodesTree.addListener("changeSelectedNode", e => {
const selectedNodeId = e.getData();
scrollThumbnails.setSelectedNodeId(selectedNodeId);
});
*/
const scrollThumbnails = this.getChildControl("thumbnail-suggestions");
const thumbnailViewerLayout = this.getChildControl("thumbnail-viewer-layout");
scrollThumbnails.addListener("thumbnailTapped", e => {
const thumbnailData = e.getData();
Expand Down Expand Up @@ -167,12 +157,9 @@ qx.Class.define("osparc.dashboard.StudyThumbnailExplorer", {
},

__getWorkbenchUIPreview: function() {
const study = new osparc.data.model.Study(this.__studyData);
// make nodes not movable
study.setReadOnly(true);
const workbenchUIPreview = new osparc.component.workbench.WorkbenchUIPreview();
workbenchUIPreview.setStudy(study);
workbenchUIPreview.loadModel(study.getWorkbench());
workbenchUIPreview.setStudy(this.__study);
workbenchUIPreview.loadModel(this.__study.getWorkbench());
workbenchUIPreview.addListener("appear", () => {
// give it some time to take the bounds
setTimeout(() => {
Expand All @@ -190,12 +177,40 @@ qx.Class.define("osparc.dashboard.StudyThumbnailExplorer", {
},

__initComponents: function() {
const scrollThumbnails = this.getChildControl("scroll-thumbnails");
scrollThumbnails.setSelectedNodeId(null);
/*
const nodesTree = this.getChildControl("nodes-tree");
nodesTree.setStudy(this.__study);
*/

const thumbnailSuggestions = this.getChildControl("thumbnail-suggestions");
// make it visible only if there are thumbnails
this.exclude();
thumbnailSuggestions.addListener("thumbnailAdded", () => this.show());
if (this.__showWorkbenchUIPreview()) {
thumbnailSuggestions.addWorkbenchUIPreviewToSuggestions();
}
thumbnailSuggestions.setStudy(this.__study);
const params = {
url: {
studyId: this.__study.getUuid()
}
};
osparc.data.Resources.fetch("studyPreviews", "getPreviews", params)
.then(previewsPerNodes => thumbnailSuggestions.addPreviewsToSuggestions(previewsPerNodes))
.catch(err => console.error(err));

const workbenchUIPreview = this.__getWorkbenchUIPreview();
const thumbnailViewerLayout = this.getChildControl("thumbnail-viewer-layout");
thumbnailViewerLayout.add(workbenchUIPreview);
thumbnailSuggestions.setSelectedNodeId(null);

// Do not add the preview if the study is in App Mode
if (this.__showWorkbenchUIPreview()) {
const workbenchUIPreview = this.__getWorkbenchUIPreview();
const thumbnailViewerLayout = this.getChildControl("thumbnail-viewer-layout");
thumbnailViewerLayout.add(workbenchUIPreview);
}
},

__showWorkbenchUIPreview: function() {
return !["guided", "app"].includes(this.__study.getUi().getMode());
}
}
});