Publish template with or without data (ITISFoundation#2659)

Author: odeimaiz

services/web/client/source/class/osparc/component/study/SaveAsTemplate.js

@@ -25,61 +25,48 @@ qx.Class.define("osparc.component.study.SaveAsTemplate", {
   extend: qx.ui.core.Widget,
 
   /**
-   * @param studyId {String} Study Id
    * @param studyData {Object} Object containing part or the entire serialized Study Data
    */
-  construct: function(studyId, studyData) {
+  construct: function(studyData) {
     this.base(arguments);
 
     this._setLayout(new qx.ui.layout.VBox(5));
 
-    this.__studyId = studyId;
-    this.__formData = osparc.data.model.Study.deepCloneStudyObject(studyData);
+    this.__studyDataClone = osparc.data.model.Study.deepCloneStudyObject(studyData);
 
     this.__buildLayout();
-
-    this.setHeaderText(this.tr("Make Template accessible to"));
-    this.setButtonText(this.tr("Publish"));
-  },
-
-  properties: {
-    headerText: {
-      check: "String",
-      init: "",
-      event: "changeHeaderText"
-    },
-
-    buttonText: {
-      check: "String",
-      init: "",
-      event: "changeButtonText"
-    }
   },
 
   events: {
     "finished": "qx.event.type.Data"
   },
 
   members: {
-    __studyId: null,
+    __studyDataClone: null,
     __shareWith: null,
-    __formData: null,
+    __copyWData: null,
 
     __buildLayout: function() {
       const shareWith = this.__shareWith = new osparc.component.permissions.ShareWith();
-      this.bind("headerText", shareWith, "legend");
+      shareWith.getChildControl("legend").set({
+        label: this.tr("Make Template accessible to"),
+        font: "title-14"
+      });
       this._add(shareWith, {
         flex: 1
       });
 
+      const publishWithdData = this.__copyWData = new qx.ui.form.CheckBox(this.tr("Publish with data")).set({
+        value: true
+      });
+      this._add(publishWithdData);
+
       const shareResourceBtn = new osparc.ui.form.FetchButton().set({
+        label: this.tr("Publish"),
         allowGrowX: false,
         alignX: "right"
       });
-      this.bind("buttonText", shareResourceBtn, "label");
-      shareResourceBtn.addListener("execute", () => {
-        this.__shareResource(shareResourceBtn);
-      }, this);
+      shareResourceBtn.addListener("execute", () => this.__shareResource(shareResourceBtn), this);
       shareWith.bind("ready", shareResourceBtn, "enabled");
       this._add(shareResourceBtn);
     },
@@ -89,7 +76,7 @@ qx.Class.define("osparc.component.study.SaveAsTemplate", {
 
       const selectedGroupIDs = this.__shareWith.getSelectedGroups();
       selectedGroupIDs.forEach(gid => {
-        this.__formData["accessRights"][gid] = {
+        this.__studyDataClone["accessRights"][gid] = {
           "read": true,
           "write": false,
           "delete": false
@@ -98,9 +85,10 @@ qx.Class.define("osparc.component.study.SaveAsTemplate", {
 
       const params = {
         url: {
-          "study_id": this.__studyId
+          "study_id": this.__studyDataClone.uuid,
+          "copy_data": this.__copyWData.getValue()
         },
-        data: this.__formData
+        data: this.__studyDataClone
       };
       osparc.data.Resources.fetch("studies", "postToTemplate", params)
         .then(template => {

services/web/client/source/class/osparc/dashboard/StudyBrowser.js

@@ -669,7 +669,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     __getSaveAsTemplateMenuButton: function(studyData) {
       const saveAsTemplateButton = new qx.ui.menu.Button(this.tr("Publish as Template"));
       saveAsTemplateButton.addListener("execute", () => {
-        const saveAsTemplateView = new osparc.component.study.SaveAsTemplate(studyData.uuid, studyData);
+        const saveAsTemplateView = new osparc.component.study.SaveAsTemplate(studyData);
         const title = this.tr("Publish as Template");
         const window = osparc.ui.window.Window.popUpInWindow(saveAsTemplateView, title, 400, 300);
         saveAsTemplateView.addListener("finished", e => {

services/web/client/source/class/osparc/data/Resources.js

@@ -92,7 +92,7 @@ qx.Class.define("osparc.data.Resources", {
           },
           postToTemplate: {
             method: "POST",
-            url: statics.API + "/projects?as_template={study_id}"
+            url: statics.API + "/projects?as_template={study_id}&copy_data={copy_data}"
           },
           open: {
             method: "POST",