Skip to content

🐛 [Frontend] Fix Automatic Shutdown = 0 #6372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 17, 2024
Merged

🐛 [Frontend] Fix Automatic Shutdown = 0 #6372

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c872597
If 0, "Automatic Shutdown of Idle Instances" is disabled
odeimaiz Sep 16, 2024
7fdf2a8
minor
odeimaiz Sep 16, 2024
874f3a1
minor
odeimaiz Sep 16, 2024
13b6bda
Merge branch 'master' into fix/inactivity-threshold-0
odeimaiz Sep 16, 2024
4818e42
Merge branch 'master' into fix/inactivity-threshold-0
odeimaiz Sep 17, 2024
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
7 changes: 3 additions & 4 deletions services/static-webserver/client/source/class/osparc/dashboard/WorkspaceHeader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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();
}
},

Expand Down
7 changes: 6 additions & 1 deletion services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++;

Expand Down