Skip to content

Commit e6e2c70

Browse files
authored
🐛 [Frontend] TIP: New plan after creating its template (#6710)
1 parent d5dca96 commit e6e2c70

File tree

2 files changed

+28
-21
lines changed

2 files changed

+28
-21
lines changed

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

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
746746
break;
747747
case "tis":
748748
case "tiplite":
749-
this.__addTIPPlusButtons();
749+
this.__addTIPPlusButton();
750750
break;
751751
case "s4l":
752752
case "s4lacad":
@@ -770,24 +770,27 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
770770
this._resourcesContainer.addNonResourceCard(newStudyBtn);
771771
},
772772

773-
__addTIPPlusButtons: function() {
774-
osparc.data.Resources.get("templates")
775-
.then(templates => {
776-
if (templates) {
777-
osparc.utils.Utils.fetchJSON("/resource/osparc/new_studies.json")
778-
.then(newStudiesData => {
779-
const product = osparc.product.Utils.getProductName()
780-
if (product in newStudiesData) {
781-
const mode = this._resourcesContainer.getMode();
782-
const title = this.tr("New Plan");
783-
const newStudyBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title) : new osparc.dashboard.ListButtonNew(title);
784-
newStudyBtn.setCardKey("new-study");
785-
newStudyBtn.subscribeToFilterGroup("searchBarFilter");
786-
osparc.utils.Utils.setIdToWidget(newStudyBtn, "newStudyBtn");
787-
this._resourcesContainer.addNonResourceCard(newStudyBtn);
788-
newStudyBtn.addListener("execute", () => {
789-
newStudyBtn.setValue(false);
773+
__addTIPPlusButton: function() {
774+
const mode = this._resourcesContainer.getMode();
775+
const title = this.tr("New Plan");
776+
const newStudyBtn = (mode === "grid") ? new osparc.dashboard.GridButtonNew(title) : new osparc.dashboard.ListButtonNew(title);
777+
newStudyBtn.setCardKey("new-study");
778+
newStudyBtn.subscribeToFilterGroup("searchBarFilter");
779+
osparc.utils.Utils.setIdToWidget(newStudyBtn, "newStudyBtn");
780+
this._resourcesContainer.addNonResourceCard(newStudyBtn);
781+
newStudyBtn.setEnabled(false);
790782

783+
osparc.utils.Utils.fetchJSON("/resource/osparc/new_studies.json")
784+
.then(newStudiesData => {
785+
const product = osparc.product.Utils.getProductName()
786+
if (product in newStudiesData) {
787+
newStudyBtn.setEnabled(true);
788+
789+
newStudyBtn.addListener("execute", () => {
790+
newStudyBtn.setValue(false);
791+
osparc.data.Resources.get("templates")
792+
.then(templates => {
793+
if (templates) {
791794
const newStudies = new osparc.dashboard.NewStudies(newStudiesData[product]);
792795
newStudies.addListener("templatesLoaded", () => {
793796
newStudies.setGroupBy("category");
@@ -806,9 +809,9 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
806809
});
807810
osparc.utils.Utils.setIdToWidget(win, "newStudiesWindow");
808811
});
809-
});
810-
}
811-
});
812+
}
813+
});
814+
});
812815
}
813816
});
814817
},

services/static-webserver/client/source/class/osparc/info/StudyLarge.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,10 @@ qx.Class.define("osparc.info.StudyLarge", {
324324
studyData["resourceType"] = this.__isTemplate ? "template" : "study";
325325
this.fireDataEvent("updateStudy", studyData);
326326
qx.event.message.Bus.getInstance().dispatchByName("updateStudy", studyData);
327+
if (this.__isTemplate) {
328+
// reload templates
329+
osparc.data.Resources.get("templates", {}, false)
330+
}
327331
})
328332
.catch(err => {
329333
console.error(err);

0 commit comments

Comments
 (0)