Study State and debt moved to StudyStore

Author: odeimaiz

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

@@ -60,8 +60,8 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
           case "function":
             // when getting the latest study data, the debt information was lost
             if (osparc.study.Utils.isInDebt(this.__resourceData)) {
-              const mainStore = osparc.store.Store.getInstance();
-              this.__resourceData["debt"] = mainStore.getStudyDebt(this.__resourceData["uuid"]);
+              const studyStore = osparc.store.Study.getInstance();
+              this.__resourceData["debt"] = studyStore.getStudyDebt(this.__resourceData["uuid"]);
             }
             osparc.store.Services.getStudyServicesMetadata(latestResourceData)
               .finally(() => {

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

@@ -742,15 +742,15 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
         this.__reloadStudies();
       }, this);
 
-      const store = osparc.store.Store.getInstance();
-      store.addListener("studyStateChanged", e => {
+      const studyStore = osparc.store.Study.getInstance();
+      studyStore.addListener("studyStateChanged", e => {
         const {
           studyId,
           state,
         } = e.getData();
         this.__studyStateChanged(studyId, state);
       });
-      store.addListener("studyDebtChanged", e => {
+      studyStore.addListener("studyDebtChanged", e => {
         const {
           studyId,
           debt,
@@ -1506,7 +1506,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     // LAYOUT //
 
     __studyStateReceived: function(studyId, state, errors) {
-      osparc.store.Store.getInstance().setStudyState(studyId, state);
+      osparc.store.Study.getInstance().setStudyState(studyId, state);
       if (errors && errors.length) {
         console.error(errors);
       }

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

@@ -318,7 +318,7 @@ qx.Class.define("osparc.desktop.MainPage", {
       const currentStudy = store.getCurrentStudy();
       while (currentStudy.isLocked()) {
         await osparc.utils.Utils.sleep(1000);
-        store.getStudyState(studyId);
+        osparc.store.Study().getInstance().getStudyState(studyId);
       }
       this.__loadingPage.setMessages([]);
       this.__openSnapshot(studyId, snapshotId);
@@ -364,7 +364,7 @@ qx.Class.define("osparc.desktop.MainPage", {
       const currentStudy = store.getCurrentStudy();
       while (currentStudy.isLocked()) {
         await osparc.utils.Utils.sleep(1000);
-        store.getStudyState(studyId);
+        osparc.store.Study().getInstance().getStudyState(studyId);
       }
       this.__loadingPage.setMessages([]);
       this.__openIteration(iterationUuid);

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

@@ -628,7 +628,7 @@ qx.Class.define("osparc.desktop.StudyEditor", {
         /* If no projectStateUpdated comes in 60 seconds, client must
         check state of pipeline and update button accordingly. */
         const timer = setTimeout(() => {
-          osparc.store.Store.getInstance().getStudyState(pipelineId);
+          osparc.store.Study().getInstance().getStudyState(pipelineId);
         }, 60000);
         const socket = osparc.wrapper.WebSocket.getInstance();
         socket.getSocket().once("projectStateUpdated", ({ "project_uuid": projectUuid }) => {

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

@@ -249,14 +249,7 @@ qx.Class.define("osparc.store.Store", {
     },
   },
 
-  events: {
-    "studyStateChanged": "qx.event.type.Data",
-    "studyDebtChanged": "qx.event.type.Data",
-  },
-
   members: {
-    __studiesInDebt: null,
-
     // fetch resources that do not require log in
     preloadCalls: async function() {
       await osparc.data.Resources.get("config");
@@ -436,73 +429,6 @@ qx.Class.define("osparc.store.Store", {
       return null;
     },
 
-    getStudyState: function(studyId) {
-      osparc.data.Resources.fetch("studies", "state", {
-        url: {
-          "studyId": studyId
-        }
-      })
-        .then(({state}) => {
-          this.setStudyState(studyId, state);
-        });
-    },
-
-    setStudyState: function(studyId, state) {
-      const studiesWStateCache = this.getStudies();
-      const idx = studiesWStateCache.findIndex(studyWStateCache => studyWStateCache["uuid"] === studyId);
-      if (idx !== -1) {
-        studiesWStateCache[idx]["state"] = state;
-      }
-
-      const currentStudy = this.getCurrentStudy();
-      if (currentStudy && currentStudy.getUuid() === studyId) {
-        currentStudy.setState(state);
-      }
-
-      this.fireDataEvent("studyStateChanged", {
-        studyId,
-        state,
-      });
-    },
-
-    setStudyDebt: function(studyId, debt) {
-      // init object if it does not exist
-      if (this.__studiesInDebt === null) {
-        this.__studiesInDebt = {};
-      }
-      if (debt) {
-        this.__studiesInDebt[studyId] = debt;
-      } else {
-        delete this.__studiesInDebt[studyId];
-      }
-
-      const studiesWStateCache = this.getStudies();
-      const idx = studiesWStateCache.findIndex(studyWStateCache => studyWStateCache["uuid"] === studyId);
-      if (idx !== -1) {
-        if (debt) {
-          studiesWStateCache[idx]["debt"] = debt;
-        } else {
-          delete studiesWStateCache[idx]["debt"];
-        }
-      }
-
-      this.fireDataEvent("studyDebtChanged", {
-        studyId,
-        debt,
-      });
-    },
-
-    getStudyDebt: function(studyId) {
-      if (this.__studiesInDebt && studyId in this.__studiesInDebt) {
-        return this.__studiesInDebt[studyId];
-      }
-      return null;
-    },
-
-    isStudyInDebt: function(studyId) {
-      return Boolean(this.getStudyDebt(studyId));
-    },
-
     reloadCreditPrice: function() {
       const store = osparc.store.Store.getInstance();
       store.setCreditPrice(null);

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

@@ -19,9 +19,15 @@ qx.Class.define("osparc.store.Study", {
   extend: qx.core.Object,
   type: "singleton",
 
+  events: {
+    "studyStateChanged": "qx.event.type.Data",
+    "studyDebtChanged": "qx.event.type.Data",
+  },
+
   members: {
     __nodeResources: null,
     __nodePricingUnit: null,
+    __studiesInDebt: null,
 
     getPage: function(params, options) {
       return osparc.data.Resources.fetch("studies", "getPage", params, options)
@@ -112,6 +118,73 @@ qx.Class.define("osparc.store.Study", {
       return osparc.data.Resources.fetch("studies", "updateMetadata", params);
     },
 
+    getStudyState: function(studyId) {
+      osparc.data.Resources.fetch("studies", "state", {
+        url: {
+          "studyId": studyId
+        }
+      })
+        .then(({state}) => {
+          this.setStudyState(studyId, state);
+        });
+    },
+
+    setStudyState: function(studyId, state) {
+      const studiesWStateCache = this.getStudies();
+      const idx = studiesWStateCache.findIndex(studyWStateCache => studyWStateCache["uuid"] === studyId);
+      if (idx !== -1) {
+        studiesWStateCache[idx]["state"] = state;
+      }
+
+      const currentStudy = this.getCurrentStudy();
+      if (currentStudy && currentStudy.getUuid() === studyId) {
+        currentStudy.setState(state);
+      }
+
+      this.fireDataEvent("studyStateChanged", {
+        studyId,
+        state,
+      });
+    },
+
+    setStudyDebt: function(studyId, debt) {
+      // init object if it does not exist
+      if (this.__studiesInDebt === null) {
+        this.__studiesInDebt = {};
+      }
+      if (debt) {
+        this.__studiesInDebt[studyId] = debt;
+      } else {
+        delete this.__studiesInDebt[studyId];
+      }
+
+      const studiesWStateCache = this.getStudies();
+      const idx = studiesWStateCache.findIndex(studyWStateCache => studyWStateCache["uuid"] === studyId);
+      if (idx !== -1) {
+        if (debt) {
+          studiesWStateCache[idx]["debt"] = debt;
+        } else {
+          delete studiesWStateCache[idx]["debt"];
+        }
+      }
+
+      this.fireDataEvent("studyDebtChanged", {
+        studyId,
+        debt,
+      });
+    },
+
+    getStudyDebt: function(studyId) {
+      if (this.__studiesInDebt && studyId in this.__studiesInDebt) {
+        return this.__studiesInDebt[studyId];
+      }
+      return null;
+    },
+
+    isStudyInDebt: function(studyId) {
+      return Boolean(this.getStudyDebt(studyId));
+    },
+
     trashStudy: function(studyId) {
       const params = {
         url: {

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

@@ -259,7 +259,7 @@ qx.Class.define("osparc.study.BillingSettings", {
 
     __debtPayed: function() {
       delete this.__studyData["debt"];
-      osparc.store.Store.getInstance().setStudyDebt(this.__studyData["uuid"], 0);
+      osparc.store.Study.getInstance().setStudyDebt(this.__studyData["uuid"], 0);
       this.fireEvent("debtPayed");
       if (this.__debtMessage) {
         this._remove(this.__debtMessage);

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

@@ -368,7 +368,7 @@ qx.Class.define("osparc.study.Utils", {
     },
 
     isInDebt: function(studyData) {
-      return osparc.store.Store.getInstance().isStudyInDebt(studyData["uuid"]);
+      return osparc.store.Study.getInstance().isStudyInDebt(studyData["uuid"]);
     },
 
     extractDebtFromError: function(studyId, err) {
@@ -385,7 +385,7 @@ qx.Class.define("osparc.study.Utils", {
       }
       if (debt) {
         // if get here, it means that the 402 was thrown due to the debt
-        osparc.store.Store.getInstance().setStudyDebt(studyId, debt);
+        osparc.store.Study.getInstance().setStudyDebt(studyId, debt);
       }
       return debt;
     },