get and select wallet

Author: odeimaiz

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

@@ -121,12 +121,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
 
       const walletsEnabled = osparc.desktop.credits.Utils.areWalletsEnabled();
       if (walletsEnabled) {
-        const params = {
-          url: {
-            studyId
-          }
-        };
-        osparc.data.Resources.fetch("studies", "getWallet", params)
+        osparc.store.Study.getInstance().getWallet(studyId)
           .then(wallet => {
             if (
               isStudyCreation ||
@@ -164,8 +159,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
             } else {
               openStudy();
             }
-          })
-          .catch(err => osparc.FlashMessenger.logError(err));
+          });
       } else {
         openStudy();
       }

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

@@ -172,6 +172,27 @@ qx.Class.define("osparc.store.Study", {
         });
     },
 
+    getWallet: function(studyId) {
+      const params = {
+        url: {
+          studyId
+        }
+      };
+      return osparc.data.Resources.fetch("studies", "getWallet", params)
+        .catch(err => osparc.FlashMessenger.logError(err));
+    },
+
+    selectWallet: function(studyId, walletId) {
+      const params = {
+        url: {
+          studyId,
+          walletId,
+        }
+      };
+      return osparc.data.Resources.fetch("studies", "selectWallet", params)
+        .catch(err => osparc.FlashMessenger.logError(err));
+    },
+
     addTag: function(studyId, tagId) {
       const params = {
         url: {

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

@@ -119,12 +119,7 @@ qx.Class.define("osparc.study.BillingSettings", {
 
       const walletSelector = this.getChildControl("wallet-selector");
 
-      const paramsGet = {
-        url: {
-          studyId: this.__studyData["uuid"]
-        }
-      };
-      osparc.data.Resources.fetch("studies", "getWallet", paramsGet)
+      osparc.store.Study.getInstance().getWallet(this.__studyData["uuid"])
         .then(wallet => {
           if (wallet) {
             this.__studyWalletId = wallet["walletId"];
@@ -275,13 +270,7 @@ qx.Class.define("osparc.study.BillingSettings", {
     __switchWallet: function(walletId) {
       const creditAccountBox = this.getChildControl("credit-account-box");
       creditAccountBox.setEnabled(false);
-      const paramsPut = {
-        url: {
-          studyId: this.__studyData["uuid"],
-          walletId
-        }
-      };
-      osparc.data.Resources.fetch("studies", "selectWallet", paramsPut)
+      osparc.store.Study.getInstance().selectWallet(this.__studyData["uuid"], walletId)
         .then(() => {
           this.__studyWalletId = walletId;
           const msg = this.tr("Credit Account saved");
@@ -291,7 +280,6 @@ qx.Class.define("osparc.study.BillingSettings", {
           if ("status" in err && err["status"] == 402) {
             osparc.study.Utils.extractDebtFromError(this.__studyData["uuid"], err);
           }
-          osparc.FlashMessenger.logError(err);
           this.fireEvent("closeWindow");
         })
         .finally(() => {

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

@@ -96,14 +96,7 @@ qx.Class.define("osparc.study.StudyOptions", {
     },
 
     updateWallet: function(studyId, walletId) {
-      const params = {
-        url: {
-          studyId,
-          walletId,
-        }
-      };
-      return osparc.data.Resources.fetch("studies", "selectWallet", params)
-        .catch(err => osparc.FlashMessenger.logError(err, qx.locale.Manager.tr("An issue occurred while selecting Credit Account")));
+      return osparc.store.Study.getInstance().selectWallet(studyId, walletId);
     },
   },
 
@@ -231,14 +224,9 @@ qx.Class.define("osparc.study.StudyOptions", {
     },
 
     __fetchStudy: function(studyId) {
-      const params = {
-        url: {
-          studyId
-        }
-      };
       Promise.all([
         osparc.store.Study.getInstance().getOne(studyId),
-        osparc.data.Resources.fetch("studies", "getWallet", params)
+        osparc.store.Study.getInstance().getWallet(studyId),
       ])
         .then(values => {
           const studyData = values[0];