Merge branch 'master' into release.24.10

# Conflicts:
#	CHANGELOG.md

Author: ar2rsawseen

.github/workflows/main.yml

@@ -6,7 +6,7 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   pull_request:
-    branches: [ master, next, release.* ]
+    branches: [ master, next, release.*, flex ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 24.10.xx
+
+Dependencies:
+- Bump fs-extra from 11.2.0 to 11.3.0
+- Bump nodemailer from 6.9.16 to 6.10.0
+
 ## Version 24.10.5
 
 Fixes:

frontend/express/public/javascripts/countly/vue/components/form.js

@@ -172,10 +172,12 @@
             },
             prevStep: function() {
                 this.setStep(this.currentStepIndex - 1, 'prev');
+                this.scrollToTop();
             },
             nextStep: function() {
                 this.beforeLeavingStep("onlyCurrent");
                 this.setStep(this.currentStepIndex + 1, 'next', !this.isCurrentStepValid);
+                this.scrollToTop();
             },
             reset: function() {
                 var self = this;
@@ -233,6 +235,12 @@
                         }
                     });
                 }
+            },
+            scrollToTop: function() {
+                var container = this.$el.getElementsByClassName("cly-vue-drawer__steps-container")[0];
+                if (container && container.scrollTop) {
+                    container.scrollTop = 0;
+                }
             }
         }
     };

package-lock.json

@@ -52,7 +52,7 @@
     "express-session": "1.18.1",
     "form-data": "^4.0.0",
     "formidable": "2.1.1",
-    "fs-extra": "11.2.0",
+    "fs-extra": "11.3.0",
     "geoip-lite": "1.4.10",
     "get-random-values": "^3.0.0",
     "grunt": "1.6.1",
@@ -76,7 +76,7 @@
     "moment-timezone": "0.5.46",
     "mongodb": "6.11.0",
     "nginx-conf": "2.1.0",
-    "nodemailer": "6.9.16",
+    "nodemailer": "6.10.0",
     "object-hash": "3.0.0",
     "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
     "properties-parser": "0.6.0",