support group

Author: odeimaiz

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

@@ -82,7 +82,7 @@ qx.Class.define("osparc.data.model.Group", {
     },
 
     groupType: {
-      check: ["me", "organization", "productEveryone", "everyone"],
+      check: ["me", "organization", "support", "productEveryone", "everyone"],
       nullable: false,
       init: null,
     },

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

@@ -417,9 +417,5 @@ qx.Class.define("osparc.product.Utils", {
     groupServices: function() {
       return Boolean(osparc.store.Products.getInstance().getGroupedServicesUiConfig());
     },
-
-    isSupportEnabled: function() {
-      return Boolean(osparc.store.Products.getInstance().getSupportGroupId());
-    },
   }
 });

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

@@ -38,7 +38,8 @@ qx.Class.define("osparc.store.Groups", {
 
     supportGroup: {
       check: "osparc.data.model.Group",
-      init: null // this will stay null for guest users
+      init: null, // this will stay null for guest users
+      event: "changeSupportGroup",
     },
 
     organizations: {
@@ -67,6 +68,15 @@ qx.Class.define("osparc.store.Groups", {
         .then(resp => {
           const everyoneGroup = this.__addToGroupsCache(resp["all"], "everyone");
           const productEveryoneGroup = this.__addToGroupsCache(resp["product"], "productEveryone");
+          let supportGroup = null;
+          if ("support" && resp["support"]) {
+            resp["support"]["accessRights"] = {
+              "read": false,
+              "write": false,
+              "delete": false,
+            };
+            supportGroup = this.__addToGroupsCache(resp["support"], "support");
+          }
           const groupMe = this.__addToGroupsCache(resp["me"], "me");
           const orgs = {};
           resp["organizations"].forEach(organization => {
@@ -75,6 +85,7 @@ qx.Class.define("osparc.store.Groups", {
           });
           this.setEveryoneGroup(everyoneGroup);
           this.setEveryoneProductGroup(productEveryoneGroup);
+          this.setSupportGroup(supportGroup);
           this.setOrganizations(orgs);
           this.setGroupMe(groupMe);
           const myAuthData = osparc.auth.Data.getInstance();
@@ -182,6 +193,19 @@ qx.Class.define("osparc.store.Groups", {
       return everyoneGroups;
     },
 
+    isSupportEnabled: function() {
+      return Boolean(this.getSupportGroup());
+    },
+
+    amIASupportUser: function() {
+      const supportGroup = this.getSupportGroup();
+      if (supportGroup) {
+        const myOrgIds = this.getOrganizationIds().map(gId => parseInt(gId));
+        return myOrgIds.includes(supportGroup.getGroupId());
+      }
+      return false;
+    },
+
     getGroup: function(groupId) {
       const groups = [];
 

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

@@ -27,6 +27,15 @@ qx.Class.define("osparc.store.Products", {
   extend: qx.core.Object,
   type: "singleton",
 
+  properties: {
+    supportEnabled: {
+      check: "Boolean",
+      nullable: false,
+      init: false,
+      event: "changeSupportEnabled",
+    },
+  },
+
   members: {
     __uiConfig: null,
 
@@ -125,16 +134,5 @@ qx.Class.define("osparc.store.Products", {
     getGroupedServicesUiConfig: function() {
       return this.__uiConfig["groupedServices"];
     },
-
-    getSupportGroupId: function() {
-      return osparc.store.StaticInfo.getValue("supportStandardGroupId");
-    },
-
-    amIASupportUser: function() {
-      const supportGroupId = this.getSupportGroupId();
-      const groupsStore = osparc.store.Groups.getInstance();
-      const myGroupIds = groupsStore.getOrganizationIds().map(gId => parseInt(gId));
-      return (supportGroupId && myGroupIds.includes(supportGroupId));
-    },
   }
 });

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

@@ -20,23 +20,25 @@ qx.Class.define("osparc.store.Support", {
     },
 
     addSupportConversationsToMenu: function(menu) {
-      if (osparc.product.Utils.isSupportEnabled()) {
-        const supportCenterButton = new qx.ui.menu.Button().set({
-          icon: "@FontAwesome5Regular/question-circle/16",
-        });
-        const amISupporter = () => {
-          const isSupportUser = osparc.store.Products.getInstance().amIASupportUser();
-          supportCenterButton.set({
-            label: isSupportUser ? qx.locale.Manager.tr("Support Center") : qx.locale.Manager.tr("Support"),
-          });
-        };
-        amISupporter();
-        osparc.store.Groups.getInstance().addListener("organizationsChanged", () => amISupporter());
-        supportCenterButton.addListener("execute", () => {
-          osparc.support.SupportCenter.openWindow();
+      const supportCenterButton = new qx.ui.menu.Button().set({
+        icon: "@FontAwesome5Regular/question-circle/16",
+        visibility: "excluded",
+      });
+      supportCenterButton.addListener("execute", () => osparc.support.SupportCenter.openWindow());
+      menu.add(supportCenterButton);
+
+      const updateSupportButton = () => {
+        const isSupportEnabled = osparc.store.Groups.getInstance().isSupportEnabled();
+        const isSupportUser = osparc.store.Groups.getInstance().amIASupportUser();
+        supportCenterButton.set({
+          visibility: isSupportEnabled ? "visible" : "excluded",
+          label: isSupportUser ? qx.locale.Manager.tr("Support Center") : qx.locale.Manager.tr("Support"),
         });
-        menu.add(supportCenterButton);
       }
+
+      updateSupportButton();
+      osparc.store.Groups.getInstance().addListener("changeSupportGroup", () => updateSupportButton());
+      osparc.store.Groups.getInstance().addListener("organizationsChanged", () => updateSupportButton());
     },
 
     addQuickStartToMenu: function(menu) {

services/static-webserver/client/source/class/osparc/support/Conversation.js

@@ -190,7 +190,7 @@ qx.Class.define("osparc.support.Conversation", {
           .then(studyData => {
             let isAlreadyShared = false;
             const accessRights = studyData["accessRights"];
-            const supportGroupId = osparc.store.Products.getInstance().getSupportGroupId();
+            const supportGroupId = osparc.store.Groups.getInstance().getSupportGroup().getGroupId();
             if (supportGroupId && supportGroupId in accessRights) {
               isAlreadyShared = true;
             } else {
@@ -207,7 +207,7 @@ qx.Class.define("osparc.support.Conversation", {
 
     __shareProjectWithSupport: function(e) {
       const share = e.getData();
-      const supportGroupId = osparc.store.Products.getInstance().getSupportGroupId();
+      const supportGroupId = osparc.store.Groups.getInstance().getSupportGroup().getGroupId();
       const projectId = this.getConversation().getContextProjectId();
       osparc.store.Study.getInstance().getOne(projectId)
         .then(studyData => {

services/static-webserver/client/source/class/osparc/support/ConversationPage.js

@@ -147,7 +147,7 @@ qx.Class.define("osparc.support.ConversationPage", {
       }
 
       const extraContextLabel = this.getChildControl("conversation-extra-content");
-      const amISupporter = osparc.store.Products.getInstance().amIASupportUser();
+      const amISupporter = osparc.store.Groups.getInstance().amIASupportUser();
       if (conversation && amISupporter) {
         const extraContext = conversation.getExtraContext();
         if (extraContext && Object.keys(extraContext).length) {

services/static-webserver/client/source/class/osparc/support/SupportCenter.js

@@ -90,7 +90,7 @@ qx.Class.define("osparc.support.SupportCenter", {
             rich: true,
             font: "text-14",
           });
-          const isSupportUser = osparc.store.Products.getInstance().amIASupportUser();
+          const isSupportUser = osparc.store.Groups.getInstance().amIASupportUser();
           control.set({
             value: isSupportUser ?
               this.tr("Thanks for being here! Let's help every user feel supported.") :

services/static-webserver/client/source/class/osparc/ui/message/FlashMessageOEC.js

@@ -28,7 +28,7 @@ qx.Class.define("osparc.ui.message.FlashMessageOEC", {
   construct: function(message, duration, supportId) {
     this.base(arguments, message, "ERROR", duration ? duration*2 : null);
 
-    if (osparc.product.Utils.isSupportEnabled()) {
+    if (osparc.store.Groups.getInstance().isSupportEnabled()) {
       this.getChildControl("contact-support");
     } else {
       const oecAtom = this.getChildControl("oec-atom");