Skip to content

🐛 [Frontend] TIP: New plan after creating its template #6710

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
Nov 13, 2024
Merged

🐛 [Frontend] TIP: New plan after creating its template #6710

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
045dcf1
rename
odeimaiz Nov 12, 2024
dd6dfe9
do not use cached templates
odeimaiz Nov 12, 2024
a808e45
minor
odeimaiz Nov 12, 2024
2184ffe
reload templates
odeimaiz Nov 12, 2024
c7c239c
Merge branch 'master' into fix/plan-after-template
odeimaiz Nov 12, 2024
33635f0
Merge branch 'master' into fix/plan-after-template
odeimaiz Nov 13, 2024
50fcadf
Merge branch 'master' into fix/plan-after-template
odeimaiz Nov 13, 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
45 changes: 24 additions & 21 deletions services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
break;
case "tis":
case "tiplite":
this.__addTIPPlusButtons();
this.__addTIPPlusButton();
break;
case "s4l":
case "s4lacad":
Expand All @@ -745,24 +745,27 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
this._resourcesContainer.addNonResourceCard(newStudyBtn);
},

__addTIPPlusButtons: function() {
osparc.data.Resources.get("templates")
.then(templates => {
if (templates) {
osparc.utils.Utils.fetchJSON("/resource/osparc/new_studies.json")
.then(newStudiesData => {
const product = osparc.product.Utils.getProductName()
if (product in newStudiesData) {
const mode = this._resourcesContainer.getMode();
const title = this.tr("New Plan");
const newStudyBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title) : new osparc.dashboard.ListButtonNew(title);
newStudyBtn.setCardKey("new-study");
newStudyBtn.subscribeToFilterGroup("searchBarFilter");
osparc.utils.Utils.setIdToWidget(newStudyBtn, "newStudyBtn");
this._resourcesContainer.addNonResourceCard(newStudyBtn);
newStudyBtn.addListener("execute", () => {
newStudyBtn.setValue(false);
__addTIPPlusButton: function() {
const mode = this._resourcesContainer.getMode();
const title = this.tr("New Plan");
const newStudyBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title) : new osparc.dashboard.ListButtonNew(title);
newStudyBtn.setCardKey("new-study");
newStudyBtn.subscribeToFilterGroup("searchBarFilter");
osparc.utils.Utils.setIdToWidget(newStudyBtn, "newStudyBtn");
this._resourcesContainer.addNonResourceCard(newStudyBtn);
newStudyBtn.setEnabled(false);

osparc.utils.Utils.fetchJSON("/resource/osparc/new_studies.json")
.then(newStudiesData => {
const product = osparc.product.Utils.getProductName()
if (product in newStudiesData) {
newStudyBtn.setEnabled(true);

newStudyBtn.addListener("execute", () => {
newStudyBtn.setValue(false);
osparc.data.Resources.get("templates")
.then(templates => {
if (templates) {
const newStudies = new osparc.dashboard.NewStudies(newStudiesData[product]);
newStudies.addListener("templatesLoaded", () => {
newStudies.setGroupBy("category");
Expand All @@ -781,9 +784,9 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
});
osparc.utils.Utils.setIdToWidget(win, "newStudiesWindow");
});
});
}
});
}
});
});
}
});
},
Expand Down
4 changes: 4 additions & 0 deletions services/static-webserver/client/source/class/osparc/info/StudyLarge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,10 @@ qx.Class.define("osparc.info.StudyLarge", {
studyData["resourceType"] = this.__isTemplate ? "template" : "study";
this.fireDataEvent("updateStudy", studyData);
qx.event.message.Bus.getInstance().dispatchByName("updateStudy", studyData);
if (this.__isTemplate) {
// reload templates
osparc.data.Resources.get("templates", {}, false)
}
})
.catch(err => {
console.error(err);
Expand Down
Loading