🐛 Frontend: Service related bug fixes (ITISFoundation#3149)

Author: odeimaiz

services/web/client/source/class/osparc/component/form/json/JsonSchemaForm.js

@@ -187,13 +187,14 @@ qx.Class.define("osparc.component.form.json.JsonSchemaForm", {
         container.setLayout(new qx.ui.layout.VBox());
       }
       Object.entries(schema.properties).forEach(([key, value], index) => {
-        const allProps = Object.values(schema.properties);
-        const nextProp = index < allProps.length - 1 ? allProps[index+1] : null;
+        // const allProps = Object.values(schema.properties);
+        // const nextProp = index < allProps.length - 1 ? allProps[index+1] : null;
         container.add(this.__expand(key, value, data ? data[key] : data, depth+1, {
           required: schema.required && schema.required.includes(key)
         }), {
-          lineBreak: nextProp && nextProp.type === "array" || value.type === "array",
-          stretch: value.type === "array"
+          // "lineBreak" and "stretch" are not VBox's properties
+          // lineBreak: nextProp && nextProp.type === "array" || value.type === "array",
+          // stretch: value.type === "array"
         });
       });
       return container;

services/web/client/source/class/osparc/component/permissions/Permissions.js

@@ -223,7 +223,7 @@ qx.Class.define("osparc.component.permissions.Permissions", {
     getCollaborators: function() {
       osparc.store.Store.getInstance().getPotentialCollaborators()
         .then(potentialCollaborators => {
-          this.__collaborators = potentialCollaborators;
+          this.__collaborators = Object.assign(this.__collaborators, potentialCollaborators);
           this.__reloadOrganizationsAndMembers();
           this.__reloadCollaboratorsList();
         });
@@ -284,11 +284,7 @@ qx.Class.define("osparc.component.permissions.Permissions", {
           collaborator["accessRights"] = aceessRights[gid];
           collaborator["showOptions"] = this._isUserOwner();
           const collaboratorModel = qx.data.marshal.Json.createModel(collaborator);
-          if (parseInt(gid) === osparc.auth.Data.getInstance().getGroupId()) {
-            this.__collaboratorsModel.insertAt(0, collaboratorModel);
-          } else {
-            this.__collaboratorsModel.append(collaboratorModel);
-          }
+          this.__collaboratorsModel.append(collaboratorModel);
         }
       });
     },

services/web/client/source/class/osparc/component/permissions/Study.js

@@ -33,7 +33,11 @@ qx.Class.define("osparc.component.permissions.Study", {
   construct: function(studyData) {
     this.__studyData = osparc.data.model.Study.deepCloneStudyObject(studyData);
 
-    this.base(arguments, this.__studyData);
+    const initCollabs = [];
+    if (osparc.data.Permissions.getInstance().canDo("study.everyone.share")) {
+      initCollabs.push(this.self().getEveryoneObj());
+    }
+    this.base(arguments, this.__studyData, initCollabs);
   },
 
   events: {
@@ -89,6 +93,17 @@ qx.Class.define("osparc.component.permissions.Study", {
 
     removeCollaborator: function(studyData, gid) {
       return delete studyData["accessRights"][gid];
+    },
+
+    getEveryoneObj: function() {
+      return {
+        "gid": 1,
+        "label": "Everyone",
+        "description": "",
+        "thumbnail": null,
+        "accessRights": this.getCollaboratorAccessRight(),
+        "collabType": 0
+      };
     }
   },
 

services/web/client/source/class/osparc/data/Permissions.js

@@ -121,6 +121,7 @@ qx.Class.define("osparc.data.Permissions", {
           "services.all.read",
           "user.role.update",
           "user.clusters.create",
+          "study.everyone.share",
           "study.snapshot.read",
           "study.snapshot.create",
           "study.nodestree.uuid.read",