Merge branch 'master' into check_function_run_permissions

Author: wvangeit

services/director-v2/src/simcore_service_director_v2/modules/dask_client.py

@@ -90,7 +90,7 @@
 _logger = logging.getLogger(__name__)
 
 
-_DASK_DEFAULT_TIMEOUT_S: Final[int] = 5
+_DASK_DEFAULT_TIMEOUT_S: Final[int] = 35
 
 
 _UserCallbackInSepThread = Callable[[], None]

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

@@ -244,9 +244,9 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
 
       const permissions = osparc.data.Permissions.getInstance();
       if (permissions.canDo("dashboard.templates.read")) {
-        const templatesButton = this.self().createMenuButton("@FontAwesome5Solid/copy/16", this.tr("Tutorials..."));
-        templatesButton.addListener("execute", () => this.fireDataEvent("changeTab", "templatesTab"), this);
-        moreMenu.add(templatesButton);
+        const tutorialsButton = this.self().createMenuButton("@FontAwesome5Solid/copy/16", this.tr("Tutorials..."));
+        tutorialsButton.addListener("execute", () => this.fireDataEvent("changeTab", "tutorialsTab"), this);
+        moreMenu.add(tutorialsButton);
       }
 
       if (permissions.canDo("dashboard.services.read")) {