Merge branch 'master' into is64/users-refactoring

Author: pcrespov

api/specs/web-server/_auth.py

@@ -15,7 +15,7 @@
 from models_library.rest_error import EnvelopedError, Log
 from pydantic import BaseModel, Field, confloat
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.login._controller.rest.auth import (
+from simcore_service_webserver.login._controller.rest.auth_schemas import (
     LoginBody,
     LoginNextPage,
     LoginTwoFactorAuthBody,
@@ -30,7 +30,7 @@
     PhoneConfirmationBody,
     ResetPasswordConfirmation,
 )
-from simcore_service_webserver.login._controller.rest.registration import (
+from simcore_service_webserver.login._controller.rest.registration_schemas import (
     InvitationCheck,
     InvitationInfo,
     RegisterBody,

services/static-webserver/client/source/class/osparc/MaintenanceTracker.js

@@ -41,7 +41,7 @@ qx.Class.define("osparc.MaintenanceTracker", {
 
   statics: {
     CHECK_INTERVAL: 15*60*1000, // Check every 15'
-    CLOSABLE_WARN_IN_ADVANCE: 48*60*60*1000, // Show Closable Ribbon Message 48h in advance
+    CLOSABLE_WARN_IN_ADVANCE: 4*24*60*60*1000, // Show Closable Ribbon Message 4 days in advance
     PERMANENT_WARN_IN_ADVANCE: 60*60*1000 // Show Permanent Ribbon Message 60' in advance
   },
 

services/static-webserver/client/source/class/osparc/NewUITracker.js

@@ -34,18 +34,18 @@ qx.Class.define("osparc.NewUITracker", {
               let msg = "";
               msg += qx.locale.Manager.tr("A new version of the application is now available.");
               msg += "<br>";
-              msg += qx.locale.Manager.tr("Click the Reload button to get the latest features.");
+              msg += qx.locale.Manager.tr("Reload the page to get the latest features.");
               // permanent message
-              const flashMessage = osparc.FlashMessenger.logAs(msg, "INFO", 0).set({
+              osparc.FlashMessenger.logAs(msg, "INFO", 0).set({
                 maxWidth: 500
               });
-              const reloadButton = osparc.utils.Utils.reloadNoCacheButton();
-              flashMessage.addWidget(reloadButton);
+              // stop tracker in case it was running
               this.stopTracker();
             }
           })
           .catch(() => setTimeout(() => checkNewUI(), 5*1000));
       };
+
       checkNewUI();
       this.__checkInterval = setInterval(checkNewUI, this.self().CHECK_INTERVAL);
     },

services/static-webserver/client/source/class/osparc/desktop/MainPage.js

@@ -56,7 +56,7 @@ qx.Class.define("osparc.desktop.MainPage", {
     // Some resources request before building the main stack
     osparc.MaintenanceTracker.getInstance().startTracker();
     osparc.CookieExpirationTracker.getInstance().startTracker();
-    // osparc.NewUITracker.getInstance().startTracker();
+    osparc.NewUITracker.getInstance().startTracker();
 
     const store = osparc.store.Store.getInstance();
     const preloadPromises = [];

services/web/server/src/simcore_service_webserver/login/plugin.py

@@ -11,7 +11,7 @@
 )
 from settings_library.email import SMTPSettings
 from settings_library.postgres import PostgresSettings
-from simcore_service_webserver.login_accounts.plugin import setup_login_accounts
+from simcore_service_webserver.login_accounts.plugin import setup_login_account
 
 from ..constants import (
     APP_PUBLIC_CONFIG_PER_PRODUCT,
@@ -147,7 +147,7 @@ def setup_login(app: web.Application):
 
     app.router.add_routes(auth.routes)
     setup_login_auth(app)
-    setup_login_accounts(app)
+    setup_login_account(app)
 
     app.router.add_routes(confirmation.routes)
     app.router.add_routes(registration.routes)

services/web/server/src/simcore_service_webserver/login_accounts/plugin.py

@@ -9,5 +9,5 @@
 
 
 @ensure_single_setup(__name__, logger=_logger)
-def setup_login_accounts(app: web.Application):
+def setup_login_account(app: web.Application):
     app.add_routes(_controller_rest.routes)