refactor

Author: odeimaiz

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

@@ -672,20 +672,20 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           limit: osparc.dashboard.ResourceBrowserBase.PAGINATED_STUDIES,
         }
       };
-
       const nextPageParams = this.__getNextPageParams();
       if (nextPageParams) {
         params.url.offset = nextPageParams.offset;
         params.url.limit = nextPageParams.limit;
       }
-      const options = {
-        resolveWResponse: true
-      };
-
       const requestParams = this.__getRequestParams();
       Object.entries(requestParams).forEach(([key, value]) => {
         params.url[key] = value;
       });
+
+      const options = {
+        resolveWResponse: true
+      };
+
       if ("text" in requestParams) {
         return osparc.data.Resources.fetch("studies", "getPageSearch", params, options);
       }
@@ -1546,7 +1546,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         }
       };
       const options = {
-        "pollTask": true
+        pollTask: true
       };
       const fetchPromise = osparc.data.Resources.fetch("studies", "duplicate", params, options);
       const interval = 1000;

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

@@ -1365,7 +1365,7 @@ qx.Class.define("osparc.data.Resources", {
         const options = {
           resolveWResponse: true
         };
-        this.fetch(resource, endpoint, params, null, options)
+        this.fetch(resource, endpoint, params, options)
           .then(resp => {
             // sometimes there is a kind of a double "data"
             const meta = ("_meta" in resp["data"]) ? resp["data"]["_meta"] : resp["_meta"];

services/static-webserver/client/source/class/osparc/desktop/MainPage.js

@@ -233,7 +233,7 @@ qx.Class.define("osparc.desktop.MainPage", {
         data: data["studyData"]
       };
       const options = {
-        "pollTask": true
+        pollTask: true
       };
       const fetchPromise = osparc.data.Resources.fetch("studies", "postToTemplate", params, options);
       const pollTasks = osparc.data.PollTasks.getInstance();

services/static-webserver/client/source/class/osparc/desktop/credits/TransactionsTableModel.js

@@ -53,14 +53,16 @@ qx.Class.define("osparc.desktop.credits.TransactionsTableModel", {
   members: {
     // overridden
     _loadRowCount() {
-      osparc.data.Resources.fetch("payments", "get", {
+      const params = {
         url: {
           limit: 1,
           offset: 0
         }
-      }, {
+      };
+      const options = {
         resolveWResponse: true
-      })
+      };
+      osparc.data.Resources.fetch("payments", "get", params, options)
         .then(({ data: resp }) => {
           this._onRowCountLoaded(resp["_meta"].total)
         })

services/static-webserver/client/source/class/osparc/desktop/credits/UsageTableModel.js

@@ -77,7 +77,7 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
     // overridden
     _loadRowCount() {
       const endpoint = this.getWalletId() == null ? "get" : "getWithWallet"
-      osparc.data.Resources.fetch("resourceUsage", endpoint, {
+      const params = {
         url: {
           walletId: this.getWalletId(),
           limit: 1,
@@ -89,9 +89,11 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
             null,
           orderBy: JSON.stringify(this.getOrderBy())
         }
-      }, {
+      };
+      const options = {
         resolveWResponse: true
-      })
+      };
+      osparc.data.Resources.fetch("resourceUsage", endpoint, params, options)
         .then(resp => {
           this._onRowCountLoaded(resp["_meta"].total)
         })

services/static-webserver/client/source/class/osparc/study/Utils.js

@@ -166,7 +166,7 @@ qx.Class.define("osparc.study.Utils", {
     createStudyAndPoll: function(params) {
       return new Promise((resolve, reject) => {
         const options = {
-          "pollTask": true
+          pollTask: true
         };
         const fetchPromise = osparc.data.Resources.fetch("studies", "postNewStudy", params, options);
         const pollTasks = osparc.data.PollTasks.getInstance();
@@ -208,7 +208,7 @@ qx.Class.define("osparc.study.Utils", {
           data: minStudyData
         };
         const options = {
-          "pollTask": true
+          pollTask: true
         };
         const fetchPromise = osparc.data.Resources.fetch("studies", "postNewStudyFromTemplate", params, options);
         const pollTasks = osparc.data.PollTasks.getInstance();