Merge branch 'master' into pr-osparc-download-link-in-folder

Author: GitHK

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

@@ -340,9 +340,25 @@ qx.Class.define("osparc.component.study.ResourceSelector", {
 
       const openButton = this.getChildControl("open-button");
       openButton.addListener("execute", () => {
-        this.fireEvent("startStudy");
-
-        store.setActiveWallet(this.getWallet());
+        const selection = this.getChildControl("wallet-selector").getSelection();
+        if (selection.length) {
+          const params = {
+            url: {
+              "studyId": this.__studyData["uuid"],
+              "walletId": selection[0]["walletId"]
+            }
+          };
+          osparc.data.Resources.fetch("studies", "selectWallet", params)
+            .then(() => {
+              store.setActiveWallet(this.getWallet());
+              this.fireEvent("startStudy");
+            })
+            .catch(err => {
+              console.error(err);
+              const msg = err.message || this.tr("Error selecting Wallet");
+              osparc.component.message.FlashMessenger.getInstance().logAs(msg, "ERROR");
+            });
+        }
       });
 
       const cancelButton = this.getChildControl("cancel-button");

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

@@ -103,6 +103,10 @@ qx.Class.define("osparc.data.Resources", {
             method: "POST",
             url: statics.API + "/projects/{studyId}:open"
           },
+          selectWallet: {
+            method: "PUT",
+            url: statics.API + "/projects/{studyId}/wallet/{walletId}"
+          },
           openDisableAutoStart: {
             method: "POST",
             url: statics.API + "/projects/{studyId}:open?disable_service_auto_start={disableServiceAutoStart}"
@@ -597,17 +601,29 @@ qx.Class.define("osparc.data.Resources", {
             method: "GET",
             url: statics.API + "/wallets"
           },
-          getOne: {
-            method: "GET",
-            url: statics.API + "/wallets/{walletId}"
-          },
           post: {
             method: "POST",
             url: statics.API + "/wallets"
           },
-          patch: {
-            method: "PATCH",
+          put: {
+            method: "PUT",
             url: statics.API + "/wallets/{walletId}"
+          },
+          getAccessRights: {
+            method: "GET",
+            url: statics.API + "/wallets/{walletId}/groups"
+          },
+          putAccessRights: {
+            method: "PUT",
+            url: statics.API + "/wallets/{walletId}/groups/{groupId}"
+          },
+          postAccessRights: {
+            method: "POST",
+            url: statics.API + "/wallets/{walletId}/groups/{groupId}"
+          },
+          deleteAccessRights: {
+            method: "DELETE",
+            url: statics.API + "/wallets/{walletId}/groups/{groupId}"
           }
         }
       },
@@ -909,15 +925,17 @@ qx.Class.define("osparc.data.Resources", {
               osparc.component.metadata.Quality.attachQualityToObject(data);
             }
           }
-          if (endpoint.includes("delete")) {
-            this.__removeCached(resource, deleteId);
-          } else if (useCache && endpointDef.method === "POST" && options.pollTask !== true) {
-            this.__addCached(resource, data);
-          } else if (useCache && endpointDef.method === "GET") {
-            if (endpoint.includes("getPage")) {
+          if (useCache) {
+            if (endpoint.includes("delete")) {
+              this.__removeCached(resource, deleteId);
+            } else if (endpointDef.method === "POST" && options.pollTask !== true) {
               this.__addCached(resource, data);
-            } else {
-              this.__setCached(resource, data);
+            } else if (endpointDef.method === "GET") {
+              if (endpoint.includes("getPage")) {
+                this.__addCached(resource, data);
+              } else {
+                this.__setCached(resource, data);
+              }
             }
           }
           res.dispose();
@@ -1098,114 +1116,17 @@ qx.Class.define("osparc.data.Resources", {
     dummy: {
       newWalletData: function() {
         return {
-          id: Math.floor(Math.random() * 1000),
+          "wallet_id": Math.floor(Math.random() * 1000),
           name: "New Wallet",
           description: "",
           thumbnail: null,
-          type: "shared",
           owner: null,
-          accessRights: {},
-          credits: {
-            left: 0
-          },
-          active: true
+          "available_credits": 0,
+          status: "ACTIVE",
+          accessRights: []
         };
       },
 
-      addWalletsToStore: function() {
-        const store = osparc.store.Store.getInstance();
-        osparc.data.Resources.dummy.getWallets()
-          .then(walletsData => {
-            if (walletsData && "wallets" in walletsData && walletsData["wallets"].length) {
-              const wallets = [];
-              walletsData["wallets"].forEach(walletData => {
-                const wallet = new osparc.data.model.Wallet(walletData);
-                wallets.push(wallet);
-              });
-              store.setWallets(wallets);
-              setInterval(() => {
-                store.getWallets().forEach(wallet => {
-                  wallet.setCredits(wallet.getCredits()-1);
-                });
-              }, 30000);
-            }
-          })
-          .catch(err => console.error(err));
-      },
-
-      getWallets: function() {
-        const myGid = osparc.auth.Data.getInstance().getGroupId();
-        return new Promise(resolve => {
-          resolve({
-            wallets: [{
-              id: 1,
-              name: "My Wallet",
-              description: "Personal Wallet",
-              thumbnail: null,
-              type: "personal",
-              owner: myGid,
-              accessRights: {
-                [myGid]: {
-                  delete: true,
-                  write: true,
-                  read: true
-                }
-              },
-              credits: {
-                left: 10
-              },
-              active: true
-            }, {
-              id: 2,
-              name: "Our Wallet",
-              description: "Organization wide Wallet",
-              thumbnail: null,
-              type: "shared",
-              owner: myGid,
-              accessRights: {
-                [myGid]: {
-                  delete: false,
-                  write: true,
-                  read: true
-                },
-                417: {
-                  delete: false,
-                  write: false,
-                  read: true
-                }
-              },
-              credits: {
-                left: 100
-              },
-              active: true
-            }, {
-              id: 3,
-              name: "Another Wallet",
-              description: "Organization wide Wallet 2",
-              thumbnail: null,
-              type: "shared",
-              owner: 417,
-              accessRights: {
-                417: {
-                  delete: true,
-                  write: true,
-                  read: true
-                },
-                [myGid]: {
-                  delete: false,
-                  write: false,
-                  read: true
-                }
-              },
-              credits: {
-                left: 1000
-              },
-              active: true
-            }]
-          });
-        });
-      },
-
       getUsageDetailed: function() {
         return new Promise(resolve => {
           resolve([{

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

@@ -22,14 +22,14 @@ qx.Class.define("osparc.data.model.Wallet", {
     this.base(arguments);
 
     this.set({
-      walletId: walletData["id"],
+      walletId: walletData["wallet_id"],
       name: walletData["name"],
       description: walletData["description"] ? walletData["description"] : null,
       thumbnail: walletData["thumbnail"] ? walletData["thumbnail"] : null,
-      walletType: walletData["type"] ? walletData["type"] : "personal",
-      accessRights: walletData["accessRights"],
-      credits: walletData["credits"] && walletData["credits"]["left"] ? walletData["credits"]["left"] : 0,
-      active: walletData["active"] ? walletData["active"] : false
+      owner: walletData["owner"] ? walletData["owner"] : null,
+      status: walletData["status"] ? walletData["status"] : false,
+      creditsAvailable: walletData["available_credits"] ? walletData["available_credits"] : 20,
+      accessRights: walletData["accessRights"] ? walletData["accessRights"] : []
     });
   },
 
@@ -51,7 +51,7 @@ qx.Class.define("osparc.data.model.Wallet", {
     description: {
       check: "String",
       init: "",
-      nullable: false,
+      nullable: true,
       event: "changeDescription"
     },
 
@@ -62,32 +62,42 @@ qx.Class.define("osparc.data.model.Wallet", {
       event: "changeThumbnail"
     },
 
-    walletType: {
-      check: ["personal", "shared"],
-      init: "personal",
+    owner: {
+      check: "Number",
+      init: null,
       nullable: false,
-      event: "changeWalletType"
+      event: "changeOwner"
     },
 
-    accessRights: {
-      check: "Object",
-      init: null,
+    status: {
+      check: ["ACTIVE", "INACTIVE"],
+      init: false,
       nullable: false,
-      event: "changeAccessRights"
+      event: "changeStatus"
     },
 
-    credits: {
+    creditsAvailable: {
       check: "Number",
       init: 0,
       nullable: false,
-      event: "changeCredits"
+      event: "changeCreditsAvailable"
     },
 
-    active: {
-      check: "Boolean",
-      init: false,
+    accessRights: {
+      check: "Array",
+      init: null,
       nullable: false,
-      event: "changeActive"
+      event: "changeAccessRights"
+    }
+  },
+
+  members: {
+    getMyAccessRights: function() {
+      const myGid = osparc.auth.Data.getInstance().getGroupId();
+      if (myGid && this.getAccessRights()) {
+        return this.getAccessRights().find(accessRight => accessRight["gid"] === myGid);
+      }
+      return null;
     }
   }
 });

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

@@ -54,9 +54,8 @@ qx.Class.define("osparc.desktop.MainPage", {
     osparc.WindowSizeTracker.getInstance().startTracker();
     osparc.MaintenanceTracker.getInstance().startTracker();
 
-    osparc.data.Resources.dummy.addWalletsToStore();
-
     const store = osparc.store.Store.getInstance();
+    store.reloadWallets();
 
     Promise.all([
       store.getAllClassifiers(true),

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

@@ -436,7 +436,7 @@ qx.Class.define("osparc.desktop.credits.BuyCredits", {
             msg += "<br>";
             msg += "You now have " + nCredits + " more credits";
             osparc.component.message.FlashMessenger.getInstance().logAs(msg, "INFO", null, 10000);
-            wallet.setCredits(wallet.getCredits() + nCredits);
+            wallet.setCreditsAvailable(wallet.getCreditsAvailable() + nCredits);
             this.fireDataEvent("transactionSuccessful", {
               nCredits,
               totalPrice,

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

@@ -65,12 +65,12 @@ qx.Class.define("osparc.desktop.credits.CreditsIndicator", {
       apply: "__applyWallet"
     },
 
-    credits: {
+    creditsAvailable: {
       check: "Number",
       init: 0,
       nullable: false,
       event: "changeCredits",
-      apply: "__applyCredits"
+      apply: "__applyCreditsAvailable"
     }
   },
 
@@ -87,24 +87,24 @@ qx.Class.define("osparc.desktop.credits.CreditsIndicator", {
   members: {
     __applyWallet: function(wallet) {
       if (wallet) {
-        wallet.bind("credits", this, "credits");
-        wallet.bind("credits", this, "toolTipText", {
+        wallet.bind("creditsAvailable", this, "creditsAvailable");
+        wallet.bind("creditsAvailable", this, "toolTipText", {
           converter: val => wallet.getName() + ": " + val + " credits left"
         });
       }
     },
 
-    __applyCredits: function(credits) {
-      if (credits !== null) {
-        this.setValue(this.self().convertCreditsToIndicatorValue(credits));
+    __applyCreditsAvailable: function(creditsAvailable) {
+      if (creditsAvailable !== null) {
+        this.setValue(this.self().convertCreditsToIndicatorValue(creditsAvailable));
 
-        if (credits <= 0) {
+        if (creditsAvailable <= 0) {
           this.setBackgroundColor("danger-red");
         } else {
           this.resetBackgroundColor();
         }
 
-        let tttext = credits + " " + this.tr("credits left");
+        let tttext = creditsAvailable + " " + this.tr("credits left");
         if (this.getWallet()) {
           tttext = this.getWallet().getName() + ": " + tttext;
         }