fix: DEV-2617: Newsletter notification disappears then reappears again (#2520)

* fix: DEV-2617: Newsletter notification disappears then reappears again

* Fix dot on account page

* Add comments

Author: makseq

label_studio/core/utils/contextlog.py

@@ -118,9 +118,15 @@ def browser_exists(request):
                hasattr(request.user_agent, 'browser') and request.user_agent.browser
 
     def create_payload(self, request, response, body):
+        advanced_json = None
+        if hasattr(request, 'advanced_json'):
+            advanced_json = request.advanced_json
+        elif hasattr(request, 'user') and hasattr(request.user, 'advanced_json'):
+            advanced_json = request.user.advanced_json
+
         payload = {
             'url': request.build_absolute_uri(),
-            'server_id': self._get_server_id(),
+            'server_id': self.server_id,
             'server_time': self._get_timestamp_now(),
             'session_id': request.session.get('uid', None),
             'client_ip': get_client_ip(request),
@@ -134,7 +140,7 @@ def create_payload(self, request, response, body):
             'method': request.method,
             'values': request.GET.dict(),
             'json': body,
-            'advanced_json': request.advanced_json if hasattr(request, 'advanced_json') else None,
+            'advanced_json': advanced_json,
             'language': request.LANGUAGE_CODE,
             'content_type': request.content_type,
             'content_length': int(request.environ.get('CONTENT_LENGTH')) if request.environ.get('CONTENT_LENGTH') else None,

label_studio/frontend/dist/react-app/index.js

@@ -64,9 +64,7 @@ export const Menubar = ({
   const sidebarClass = cn('sidebar');
   const contentClass = cn('content-wrapper');
   const contextItem = menubarClass.elem('context-item');
-
-  const isAccountPage = /\/user\/account\/?$/.test(location.pathname);
-  const showNewsletterDot = !isDefined(config.user.allow_newsletters) && !isAccountPage;
+  const showNewsletterDot = !isDefined(config.user.allow_newsletters);
 
   const sidebarPin = useCallback((e) => {
     e.preventDefault();

label_studio/frontend/dist/react-app/index.js.map

@@ -137,7 +137,7 @@ def partial_update(self, request, *args, **kwargs):
         # newsletters
         if 'allow_newsletters' in request.data:
             user = User.objects.get(id=request.user.id)  # we need an updated user
-            request.advanced_json = {
+            request.user.advanced_json = {  # request.user instance will be unchanged in request all the time
                 'email': user.email, 'allow_newsletters': user.allow_newsletters,
                 'update-notifications': 1, 'new-user': 0
             }

label_studio/frontend/src/components/Menubar/Menubar.js

@@ -160,7 +160,7 @@
                  onclick="smart_submit()">
 
           <label for="allow_newsletters_visual" style="display: inline-block; cursor: pointer; margin-top: -10px">
-            Get the latest news from Heidi
+            Get the latest news & tips from Heidi
             <img src="{{ settings.HOSTNAME }}{% static 'images/heidi.png' %}" alt="Heidi"
                  width="25" style="display: inline; margin: 0; position: relative; top: 5px; left: 0">
           </label>