Skip to content

Commit 73f95fd

Browse files
authored
🐛 [Frontend] Fix: Don't let editors delete my project (#8703)
1 parent dc54f08 commit 73f95fd

File tree

8 files changed

+202
-196
lines changed

8 files changed

+202
-196
lines changed

services/static-webserver/client/source/class/osparc/auth/ui/RequestAccount.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ qx.Class.define("osparc.auth.ui.RequestAccount", {
131131
country.setSelection([countryFound])
132132
}
133133
})
134-
.catch(err => {
135-
console.error(err);
134+
.catch(() => {
136135
const emptyItem = new qx.ui.form.ListItem("", null, "");
137136
country.add(emptyItem);
138137
country.setSelection([emptyItem]);

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
4646
"updateHypertool": "qx.event.type.Data",
4747
"publishTemplate": "qx.event.type.Data",
4848
"tagClicked": "qx.event.type.Data",
49-
"emptyStudyClicked": "qx.event.type.Data"
49+
"emptyProjectIconClicked": "qx.event.type.Data",
5050
},
5151

5252
statics: {
@@ -1052,9 +1052,9 @@ qx.Class.define("osparc.dashboard.CardBase", {
10521052
if (moveToButton) {
10531053
moveToButton.setEnabled(osparc.study.Utils.canMoveTo(resourceData));
10541054
}
1055-
const trashButton = menuButtons.find(menuBtn => "trashButton" in menuBtn);
1056-
if (trashButton) {
1057-
trashButton.setEnabled(osparc.study.Utils.canBeDeleted(resourceData));
1055+
const deleteButton = menuButtons.find(menuBtn => "deleteButton" in menuBtn);
1056+
if (deleteButton) {
1057+
deleteButton.setEnabled(osparc.study.Utils.canBeDeleted(resourceData));
10581058
}
10591059
}
10601060
},
@@ -1167,7 +1167,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
11671167
});
11681168
control.addListener("tap", e => {
11691169
e.stopPropagation();
1170-
this.fireDataEvent("emptyStudyClicked", this.getUuid());
1170+
this.fireDataEvent("emptyProjectIconClicked", this.getUuid());
11711171
}, this);
11721172
return control;
11731173
},

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
5252
this.__centerLayout = new qx.ui.container.Composite(new qx.ui.layout.VBox(15));
5353
mainLayoutWithSideSpacers.add(this.__centerLayout);
5454

55-
const rightColum = new qx.ui.container.Composite(new qx.ui.layout.VBox());
56-
mainLayoutWithSideSpacers.add(rightColum, {
55+
const rightColumn = new qx.ui.container.Composite(new qx.ui.layout.VBox());
56+
mainLayoutWithSideSpacers.add(rightColumn, {
5757
flex: 1
5858
});
5959

@@ -70,7 +70,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
7070
}
7171

7272
const compactVersion = w < this.__centerLayout.getMinWidth() + leftColumnWidth + emptyColumnMinWidth;
73-
rightColum.setVisibility(compactVersion ? "excluded" : "visible");
73+
rightColumn.setVisibility(compactVersion ? "excluded" : "visible");
7474
};
7575
fitResourceCards();
7676
window.addEventListener("resize", () => fitResourceCards());
@@ -329,7 +329,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
329329
resourcesContainer.addListener("updateHypertool", e => this._updateHypertoolData(e.getData()));
330330
resourcesContainer.addListener("publishTemplate", e => this.fireDataEvent("publishTemplate", e.getData()));
331331
resourcesContainer.addListener("tagClicked", e => this._searchBarFilter.addTagActiveFilter(e.getData()));
332-
resourcesContainer.addListener("emptyStudyClicked", e => this._deleteResourceRequested(e.getData()));
332+
resourcesContainer.addListener("emptyProjectIconClicked", e => this._emptyProjectIconClicked(e.getData()));
333333
resourcesContainer.addListener("folderUpdated", e => this._folderUpdated(e.getData()));
334334
resourcesContainer.addListener("moveFolderToRequested", e => this._moveFolderToRequested(e.getData()));
335335
resourcesContainer.addListener("trashFolderRequested", e => this._trashFolderRequested(e.getData()));
@@ -889,7 +889,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
889889
return;
890890
},
891891

892-
_deleteResourceRequested: function(resourceId) {
892+
_emptyProjectIconClicked: function(resourceId) {
893893
throw new Error("Abstract method called!");
894894
},
895895

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
8484
"updateHypertool": "qx.event.type.Data",
8585
"publishTemplate": "qx.event.type.Data",
8686
"tagClicked": "qx.event.type.Data",
87-
"emptyStudyClicked": "qx.event.type.Data",
87+
"emptyProjectIconClicked": "qx.event.type.Data",
8888
"changeSelection": "qx.event.type.Data",
8989
"changeVisibility": "qx.event.type.Data",
9090
"folderSelected": "qx.event.type.Data",
@@ -351,7 +351,7 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
351351
"updateHypertool",
352352
"publishTemplate",
353353
"tagClicked",
354-
"emptyStudyClicked"
354+
"emptyProjectIconClicked"
355355
].forEach(eName => card.addListener(eName, e => this.fireDataEvent(eName, e.getData())));
356356
return card;
357357
},

0 commit comments

Comments
 (0)