Merge pull request #7152 from Countly/newsletter

[SER-2756] [onboarding] Fix redirection to newsletter page

Author: widatama

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 25.03.X
+Fixes:
+- [onboarding] Fix redirection to newsletter page
+
 ## Version 25.03.31
 Fixes:
 - [core] Add null checking for user permission when opening the dashboard

frontend/express/public/core/onboarding/javascripts/countly.views.js

@@ -267,11 +267,6 @@
                 var countly_newsletter = doc.countly_newsletter;
                 delete doc.countly_newsletter;
 
-                this.$store.dispatch('countlyOnboarding/updateUserNewsletter', {
-                    user_id: countlyGlobal.member._id,
-                    subscribe_newsletter: countly_newsletter,
-                });
-
                 if (countly_newsletter) {
                     this.$store.dispatch('countlyOnboarding/sendNewsletterSubscription', {
                         name: countlyGlobal.member.full_name.split(' ')[0],
@@ -280,9 +275,15 @@
                     });
                 }
 
-                // go home
-                window.location.href = '#/home';
-                window.location.reload();
+                this.$store.dispatch('countlyOnboarding/updateUserNewsletter', {
+                    user_id: countlyGlobal.member._id,
+                    subscribe_newsletter: countly_newsletter,
+                }).finally(function() {
+                    countlyGlobal.member.subscribe_newsletter = countly_newsletter;
+                    // go home
+                    window.location.href = '#/home';
+                    window.location.reload();
+                });
             },
         }
     });
@@ -345,12 +346,19 @@
         }
     });
 
-    if (hasNewsLetter && (typeof countlyGlobal.member.subscribe_newsletter !== 'boolean' && !store.get('disable_newsletter_prompt') && (countlyGlobal.member.login_count === 3 || moment().dayOfYear() % 90 === 0))) {
+    if (
+        hasNewsLetter &&
+        (
+            typeof countlyGlobal.member.subscribe_newsletter !== 'boolean' &&
+            store.get('disable_newsletter_prompt') === false &&
+            (countlyGlobal.member.login_count === 3 || moment().dayOfYear() % 90 === 0)
+        )
+    ) {
         if (Backbone.history.fragment !== '/not-subscribed-newsletter' && !/initial-setup|initial-consent/.test(window.location.hash)) {
             app.navigate("/not-subscribed-newsletter", true);
         }
     }
     else if (!countlyGlobal.member.subscribe_newsletter && (countlyGlobal.member.login_count !== 3 && moment().dayOfYear() % 90 !== 0)) {
         store.set('disable_newsletter_prompt', false);
     }
-})();
+})();