Skip to content

Commit 0dc3045

Browse files
Merge branch 'master' into bugfix/efs-blocking-operation
2 parents 0c476e1 + aca56c2 commit 0dc3045

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,11 @@ qx.Class.define("osparc.dashboard.ResourceFilter", {
147147
},
148148

149149
evaluateTrashEmpty: function() {
150+
if (osparc.auth.Data.getInstance().isGuest()) {
151+
// Guests do not have access to folders and workspaces
152+
return;
153+
}
154+
150155
const studiesParams = {
151156
url: {
152157
offset: 0,

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ qx.Class.define("osparc.data.Resources", {
143143
getPageTrashed: {
144144
useCache: false,
145145
method: "GET",
146-
url: statics.API + "/projects?filters={%22trashed%22:%22true%22}&offset={offset}&limit={limit}&order_by={orderBy}"
146+
url: statics.API + "/projects:search?filters={%22trashed%22:%22true%22}&offset={offset}&limit={limit}&order_by={orderBy}"
147147
},
148148
postToTemplate: {
149149
method: "POST",
@@ -327,7 +327,7 @@ qx.Class.define("osparc.data.Resources", {
327327
getPageTrashed: {
328328
useCache: false,
329329
method: "GET",
330-
url: statics.API + "/folders?filters={%22trashed%22:%22true%22}&offset={offset}&limit={limit}&order_by={orderBy}"
330+
url: statics.API + "/folders:search?filters={%22trashed%22:%22true%22}&offset={offset}&limit={limit}&order_by={orderBy}"
331331
},
332332
post: {
333333
method: "POST",
@@ -373,6 +373,7 @@ qx.Class.define("osparc.data.Resources", {
373373
getPageTrashed: {
374374
useCache: false,
375375
method: "GET",
376+
// url: statics.API + "/workspaces:search?filters={%22trashed%22:%22true%22}&offset={offset}&limit={limit}&order_by={orderBy}"
376377
url: statics.API + "/workspaces?filters={%22trashed%22:%22true%22}&offset={offset}&limit={limit}&order_by={orderBy}"
377378
},
378379
post: {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ qx.Class.define("osparc.store.Groups", {
156156
},
157157

158158
getMyGroupId: function() {
159-
return this.getGroupMe().getGroupId();
159+
return osparc.auth.Data.getInstance().getGroupId();
160160
},
161161

162162
getOrganizationIds: function() {

0 commit comments

Comments
 (0)