fetchTemplatesNonPublicPaginated

Author: odeimaiz

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

@@ -838,7 +838,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           request = osparc.data.Resources.fetch("studies", "getPageSearch", params, options);
           break;
         case "templates":
-          request = osparc.store.Templates.fetchTemplatesPaginated(params, options);
+          request = osparc.store.Templates.fetchTemplatesNonPublicPaginated(params, options);
           break;
         case "public":
           request = osparc.store.Templates.fetchTemplatesPublicPaginated(params, options);

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

@@ -59,13 +59,12 @@ qx.Class.define("osparc.dashboard.TutorialBrowser", {
           const templateId = data["project_uuid"];
           const state = ("data" in data) ? data.data : {};
           const errors = ("errors" in data) ? data.errors : [];
-          this.__templateStateReceived(templateId, state, errors);
+          this.__tutorialStateReceived(templateId, state, errors);
         }
       }, this);
     },
 
-    __templateStateReceived: function(templateId, state, errors) {
-      osparc.store.Store.getInstance().setTemplateState(templateId, state);
+    __tutorialStateReceived: function(templateId, state, errors) {
       const idx = this._resourcesList.findIndex(study => study["uuid"] === templateId);
       if (idx > -1) {
         this._resourcesList[idx]["state"] = state;

services/static-webserver/client/source/class/osparc/data/Resources.js

@@ -596,10 +596,6 @@ qx.Class.define("osparc.data.Resources", {
             method: "GET",
             url: statics.API + "/projects?type=template&offset={offset}&limit={limit}"
           },
-          getPageSorted: {
-            method: "GET",
-            url: statics.API + "/projects?type=template&offset={offset}&limit={limit}&order_by={orderBy}"
-          },
           getPageFilteredSorted: {
             method: "GET",
             url: statics.API + "/projects?type=template&template_type={templateType}&offset={offset}&limit={limit}&order_by={orderBy}"

services/static-webserver/client/source/class/osparc/store/Templates.js

@@ -21,9 +21,13 @@ qx.Class.define("osparc.store.Templates", {
   statics: {
     __templates: null,
     __templatesPromisesCached: null,
+    __tutorials: null,
+    __tutorialsPromisesCached: null,
+    __hypertools: null,
+    __hypertoolsPromisesCached: null,
 
-    fetchTemplatesPaginated: function(params, options) {
-      return osparc.data.Resources.fetch("templates", "getPageSorted", params, options)
+    __fetchTemplatesPaginated: function(params, options) {
+      return osparc.data.Resources.fetch("templates", "getPageFilteredSorted", params, options)
         .then(resp => {
           const templates = resp.data;
           // add them to the list
@@ -42,8 +46,14 @@ qx.Class.define("osparc.store.Templates", {
         .catch(err => osparc.FlashMessenger.logError(err));
     },
 
+    fetchTemplatesNonPublicPaginated: function(params, options) {
+      params["url"]["templateType"] = osparc.data.model.StudyUI.TEMPLATE_TYPE;
+      return this.__fetchTemplatesPaginated(params, options);
+    },
+
     fetchTemplatesPublicPaginated: function(params, options) {
-      return this.fetchTemplatesPaginated(params, options);
+      params["url"]["templateType"] = osparc.data.model.StudyUI.TEMPLATE_TYPE;
+      return this.__fetchTemplatesPaginated(params, options);
     },
 
     __fetchAllTemplates: function() {