Merge branch 'master' into pr-osparc-fix-orphan-task-removal

Author: GitHK

services/autoscaling/src/simcore_service_autoscaling/modules/cluster_scaling/_warm_buffer_machines_pool_core.py

@@ -314,7 +314,7 @@ async def _add_remove_buffer_instances(
                 subnet_id=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_SUBNET_ID,
                 iam_instance_profile=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_ATTACHED_IAM_PROFILE,
             ),
-            min_number_of_instances=num_to_start,
+            min_number_of_instances=1,  # NOTE: we want at least 1
             number_of_instances=num_to_start,
             max_total_number_of_instances=app_settings.AUTOSCALING_EC2_INSTANCES.EC2_INSTANCES_MAX_INSTANCES,
         )

services/autoscaling/tests/unit/test_modules_cluster_scaling_warm_buffer_machine_core.py

@@ -268,6 +268,7 @@ async def _assert_wait_for_ssm_command_to_finish() -> None:
 
 
 async def test_monitor_buffer_machines(
+    patch_ec2_client_launch_instances_min_number_of_instances: None,
     minimal_configuration: None,
     ec2_client: EC2Client,
     buffer_count: int,
@@ -374,6 +375,7 @@ async def test_monitor_buffer_machines_terminates_supernumerary_instances(
 
 
 async def test_monitor_buffer_machines_terminates_instances_with_incorrect_pre_pulled_images(
+    patch_ec2_client_launch_instances_min_number_of_instances: None,
     minimal_configuration: None,
     ec2_client: EC2Client,
     buffer_count: int,
@@ -457,6 +459,7 @@ def unneeded_instance_type(
     ],
 )
 async def test_monitor_buffer_machines_terminates_unneeded_pool(
+    patch_ec2_client_launch_instances_min_number_of_instances: None,
     minimal_configuration: None,
     ec2_client: EC2Client,
     buffer_count: int,

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

@@ -63,7 +63,7 @@ qx.Class.define("osparc.About", {
         wrap: true
       });
       this.add(poweredByLabel);
-      const displayName = osparc.store.StaticInfo.getInstance().getDisplayName();
+      const displayName = osparc.store.StaticInfo.getDisplayName();
       const poweredText = ` is powered by the <a href='https://github.com/ITISFoundation/osparc-simcore' style='color: ${color}' target='_blank'>${osparc.About.OSPARC_OFFICIAL}</a> platform.`;
       poweredByLabel.setValue(displayName + poweredText);
 

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

@@ -377,7 +377,7 @@ qx.Class.define("osparc.Application", {
       // first, pop up new release window
       this.__checkNewRelease();
 
-      const platformName = osparc.store.StaticInfo.getInstance().getPlatformName();
+      const platformName = osparc.store.StaticInfo.getPlatformName();
       if (platformName !== "master") {
         // then, pop up cookies accepted window. It will go on top.
         this.__checkCookiesAccepted();

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

@@ -39,7 +39,7 @@ qx.Class.define("osparc.CookieExpirationTracker", {
     __messageInterval: null,
 
     startTracker: function() {
-      const cookieMaxAge = osparc.store.StaticInfo.getInstance().getCookieMaxAge(); // seconds
+      const cookieMaxAge = osparc.store.StaticInfo.getCookieMaxAge(); // seconds
       if (cookieMaxAge) {
         const nowDate = new Date();
         const expirationDateMilliseconds = nowDate.getTime() + cookieMaxAge*1000;

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

@@ -211,7 +211,7 @@ qx.Class.define("osparc.ErrorPage", {
     },
 
     __supportEmail: function() {
-      const supportEmail = osparc.store.VendorInfo.getInstance().getSupportEmail();
+      const supportEmail = osparc.store.VendorInfo.getSupportEmail();
       const giveEmailFeedbackWindow = new osparc.ui.window.Dialog("Support", null, qx.locale.Manager.tr("Please send us an email to:"));
       const mailto = osparc.store.Support.getMailToLabel(supportEmail, "Access error");
       mailto.setTextAlign("center");

services/static-webserver/client/source/class/osparc/auth/LoginWithDecorators.js

@@ -332,7 +332,7 @@ qx.Class.define("osparc.auth.LoginWithDecorators", {
       const organizationLink = new osparc.ui.basic.LinkLabel().set({
         textColor: "text-darker"
       });
-      const vendor = osparc.store.VendorInfo.getInstance().getVendor();
+      const vendor = osparc.store.VendorInfo.getVendor();
       if (vendor && "url" in vendor && "copyright" in vendor) {
         organizationLink.set({
           value: vendor.copyright,

services/static-webserver/client/source/class/osparc/auth/Manager.js

@@ -116,6 +116,28 @@ qx.Class.define("osparc.auth.Manager", {
       return osparc.data.Resources.fetch("auth", "resendCode", params);
     },
 
+    updatePhoneNumber: function(newPhoneNumber) {
+      const params = {
+        data: {
+          phone: newPhoneNumber
+        }
+      };
+      return osparc.data.Resources.fetch("profile", "phoneRegister", params);
+    },
+
+    validateCodeUpdatePhoneNumber: function(code, loginCbk, failCbk, context) {
+      const params = {
+        data: {
+          code
+        }
+      };
+      osparc.data.Resources.fetch("profile", "phoneConfirm", params)
+        .then(data => {
+          loginCbk.call(context, data);
+        })
+        .catch(err => failCbk.call(context, err.message));
+    },
+
     isLoggedIn: function() {
       return osparc.auth.Data.getInstance().isLoggedIn();
     },

services/static-webserver/client/source/class/osparc/auth/ui/RequestAccount.js

@@ -127,7 +127,7 @@ qx.Class.define("osparc.auth.ui.RequestAccount", {
         required: true
       });
       doubleSpaced.push(country);
-      const countries = osparc.store.StaticInfo.getInstance().getCountries();
+      const countries = osparc.store.StaticInfo.getCountries();
       countries.forEach(c => {
         const cItem = new qx.ui.form.ListItem(c.name, null, c.alpha2).set({
           rich: true