Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -526,6 +526,9 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
if (!osparc.desktop.credits.Utils.areWalletsEnabled()) {
return;
}
if (osparc.utils.Resources.isStudyLike(this.__resourceData) && !osparc.data.model.Study.canIWrite(this.__resourceData["accessRights"])) {
return;
}

const resourceData = this.__resourceData;
if (osparc.utils.Resources.isStudy(resourceData)) {
Expand Down Expand Up @@ -634,6 +637,13 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
},

__addPermissionsPage: function() {
if (osparc.utils.Resources.isStudyLike(this.__resourceData) && !osparc.data.model.Study.canIWrite(this.__resourceData["accessRights"])) {
return;
}
if (osparc.utils.Resources.isService(this.__resourceData) && !osparc.data.model.Service.canIWrite(this.__resourceData["accessRights"])) {
return;
}

const id = "Permissions";
const title = this.tr("Sharing");
const iconSrc = "@FontAwesome5Solid/share-alt/22";
Expand Down Expand Up @@ -695,7 +705,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
let classifiers = null;
if (
(osparc.utils.Resources.isStudy(resourceData) || osparc.utils.Resources.isTemplate(resourceData)) && osparc.data.model.Study.canIWrite(resourceData["accessRights"]) ||
osparc.utils.Resources.isService(resourceData) && osparc.service.Utils.canIWrite(resourceData["accessRights"])
osparc.utils.Resources.isService(resourceData) && osparc.data.model.Service.canIWrite(resourceData["accessRights"])
) {
classifiers = new osparc.metadata.ClassifiersEditor(resourceData);
classifiers.addListener("updateClassifiers", e => {
Expand Down Expand Up @@ -779,6 +789,9 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
if (osparc.utils.Resources.isService(resourceData)) {
return;
}
if (osparc.utils.Resources.isStudyLike(this.__resourceData) && !osparc.data.model.Study.canIWrite(this.__resourceData["accessRights"])) {
return;
}

const id = "ServicesUpdate";
const title = this.tr("Services Updates");
Expand Down Expand Up @@ -813,6 +826,9 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
) {
return;
}
if (osparc.utils.Resources.isStudyLike(this.__resourceData) && !osparc.data.model.Study.canIWrite(this.__resourceData["accessRights"])) {
return;
}

const id = "ServicesBootOptions";
const title = this.tr("Boot Options");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,13 @@ qx.Class.define("osparc.data.model.Service", {
nullable: false
},
},

statics: {
canIWrite: function(serviceAccessRights) {
const groupsStore = osparc.store.Groups.getInstance();
const orgIDs = groupsStore.getOrganizationIds();
orgIDs.push(groupsStore.getMyGroupId());
return osparc.share.CollaboratorsService.canGroupsWrite(serviceAccessRights, orgIDs);
},
},
});

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ qx.Class.define("osparc.info.ServiceLarge", {

if (
this.getService()["descriptionUi"] &&
!osparc.service.Utils.canIWrite(this.getService()["accessRights"])
!osparc.data.model.Service.canIWrite(this.getService()["accessRights"])
) {
// In case of service instance, show also the copy Id buttons too
const buttonsLayout = new qx.ui.container.Composite(new qx.ui.layout.HBox(10));
Expand Down Expand Up @@ -177,7 +177,7 @@ qx.Class.define("osparc.info.ServiceLarge", {
alignY: "middle"
}));
layout.add(view);
if (osparc.service.Utils.canIWrite(this.getService()["accessRights"])) {
if (osparc.data.model.Service.canIWrite(this.getService()["accessRights"])) {
const editBtn = osparc.utils.Utils.getEditButton();
editBtn.addListener("execute", () => cb.call(this), this);
layout.add(editBtn);
Expand Down Expand Up @@ -221,7 +221,7 @@ qx.Class.define("osparc.info.ServiceLarge", {
},

__infoElements: function() {
const canIWrite = osparc.service.Utils.canIWrite(this.getService()["accessRights"]);
const canIWrite = osparc.data.model.Service.canIWrite(this.getService()["accessRights"]);

const infoLayout = {
"THUMBNAIL": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ qx.Class.define("osparc.metadata.QualityEditor", {
const myGid = osparc.auth.Data.getInstance().getGroupId();
if (myGid) {
if (osparc.utils.Resources.isService(this.__resourceData)) {
return osparc.service.Utils.canIWrite(this.__resourceData["accessRights"]);
return osparc.data.model.Service.canIWrite(this.__resourceData["accessRights"]);
}
return osparc.data.model.Study.canIWrite(this.__resourceData["accessRights"]);
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ qx.Class.define("osparc.po.POCenter", {
this.__addPreRegistrationPage();
this.__addInvitationsPage();
this.__addProductPage();
this.__addMsgTemplatesPage();
},

members: {
Expand Down Expand Up @@ -69,12 +68,5 @@ qx.Class.define("osparc.po.POCenter", {
const productInfo = new osparc.po.ProductInfo();
this.addTab(title, iconSrc, productInfo);
},

__addMsgTemplatesPage: function() {
const title = this.tr("Message Templates");
const iconSrc = "@FontAwesome5Solid/envelope-open/22";
const productInfo = new osparc.po.MessageTemplates();
this.addTab(title, iconSrc, productInfo);
}
}
});
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,6 @@ qx.Class.define("osparc.service.Utils", {
return "";
},

canIWrite: function(serviceAccessRights) {
const groupsStore = osparc.store.Groups.getInstance();
const orgIDs = groupsStore.getOrganizationIds();
orgIDs.push(groupsStore.getMyGroupId());
return osparc.share.CollaboratorsService.canGroupsWrite(serviceAccessRights, orgIDs);
},

DEPRECATED_SERVICE_TEXT: qx.locale.Manager.tr("Service deprecated"),
DEPRECATED_DYNAMIC_INSTRUCTIONS: qx.locale.Manager.tr("Please go back to the dashboard and Update the Service or download its data and upload it to an updated version"),
DEPRECATED_COMPUTATIONAL_INSTRUCTIONS: qx.locale.Manager.tr("Please instantiate an updated version"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ qx.Class.define("osparc.share.Collaborators", {
canIShare = osparc.data.model.Function.canIWrite(this._serializedDataCopy["accessRights"]);
break;
case "service":
canIShare = osparc.service.Utils.canIWrite(this._serializedDataCopy["accessRights"]);
canIShare = osparc.data.model.Service.canIWrite(this._serializedDataCopy["accessRights"]);
break;
case "workspace":
canIShare = osparc.share.CollaboratorsWorkspace.canIDelete(this._serializedDataCopy["myAccessRights"]);
Expand Down Expand Up @@ -231,7 +231,7 @@ qx.Class.define("osparc.share.Collaborators", {
fullOptions = osparc.data.model.Function.canIWrite(this._serializedDataCopy["accessRights"]);
break;
case "service":
fullOptions = osparc.service.Utils.canIWrite(this._serializedDataCopy["accessRights"]);
fullOptions = osparc.data.model.Service.canIWrite(this._serializedDataCopy["accessRights"]);
break;
case "workspace":
fullOptions = osparc.share.CollaboratorsWorkspace.canIDelete(this._serializedDataCopy["myAccessRights"]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ qx.Class.define("osparc.utils.Resources", {
return ((hypertoolData["resourceType"] === "hypertool") && ("uuid" in hypertoolData));
},

isStudyLike: function(resourceData) {
return this.isStudy(resourceData) || this.isTemplate(resourceData) || this.isTutorial(resourceData) || this.isHypertool(resourceData);
},

isFunction: function(functionData) {
return ((functionData["resourceType"] === "function") && ("uuid" in functionData));
},
Expand Down
Loading