From c8725975b551a68c78957a9a850aeecb8ee8fedf Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 16 Sep 2024 16:48:48 +0200 Subject: [PATCH 1/3] If 0, "Automatic Shutdown of Idle Instances" is disabled --- .../class/osparc/desktop/StudyEditorIdlingTracker.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js b/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js index fcabf9616ad1..52bc5c318a42 100644 --- a/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js +++ b/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js @@ -87,8 +87,13 @@ qx.Class.define("osparc.desktop.StudyEditorIdlingTracker", { }, __startTimer: function() { + const inactivityThresholdT = osparc.Preferences.getInstance().getUserInactivityThreshold(); + if (inactivityThresholdT === 0) { + // If 0 "Automatic Shutdown of Idle Instances" is disabled + return; + } + const checkFn = () => { - const inactivityThresholdT = osparc.Preferences.getInstance().getUserInactivityThreshold(); const flashMessageDurationS = Math.round(inactivityThresholdT * 0.2); this.__idlingTime++; From 7fdf2a8a7b66e0f8d91a6f0b3fbb7ce3f4749b48 Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 16 Sep 2024 16:52:23 +0200 Subject: [PATCH 2/3] minor --- .../source/class/osparc/desktop/StudyEditorIdlingTracker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js b/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js index 52bc5c318a42..88b12f3669e9 100644 --- a/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js +++ b/services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js @@ -89,7 +89,7 @@ qx.Class.define("osparc.desktop.StudyEditorIdlingTracker", { __startTimer: function() { const inactivityThresholdT = osparc.Preferences.getInstance().getUserInactivityThreshold(); if (inactivityThresholdT === 0) { - // If 0 "Automatic Shutdown of Idle Instances" is disabled + // If 0, "Automatic Shutdown of Idle Instances" is disabled return; } From 874f3a14d14003af7c2bc11dd4dd8dd9f4f60bc4 Mon Sep 17 00:00:00 2001 From: Odei Maiz Date: Mon, 16 Sep 2024 17:04:13 +0200 Subject: [PATCH 3/3] minor --- .../source/class/osparc/dashboard/WorkspaceHeader.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceHeader.js b/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceHeader.js index 4ef1576ee944..b4a567f5c484 100644 --- a/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceHeader.js +++ b/services/static-webserver/client/source/class/osparc/dashboard/WorkspaceHeader.js @@ -159,14 +159,15 @@ qx.Class.define("osparc.dashboard.WorkspaceHeader", { __buildLayout: function(workspaceId) { this.getChildControl("icon"); const title = this.getChildControl("title"); + this.getChildControl("edit-button").exclude(); + this.resetAccessRights(); + this.resetMyAccessRights(); const workspace = osparc.store.Workspaces.getInstance().getWorkspace(workspaceId); if (workspaceId === -1) { this.__setIcon(osparc.store.Workspaces.iconPath(32)); title.setValue(this.tr("Shared Workspaces")); - this.resetAccessRights(); - this.resetMyAccessRights(); } else if (workspace) { const thumbnail = workspace.getThumbnail(); this.__setIcon(thumbnail ? thumbnail : osparc.store.Workspaces.iconPath(32)); @@ -176,8 +177,6 @@ qx.Class.define("osparc.dashboard.WorkspaceHeader", { } else { this.__setIcon("@FontAwesome5Solid/home/30"); title.setValue(this.tr("My Workspace")); - this.resetAccessRights(); - this.resetMyAccessRights(); } },