notifications: replace testMessage with "force"

rhodecode/public/js/src/rhodecode/utils/notifications.js

@@ -1,47 +1,47 b''
 "use strict";
 
 
 function notifySystem(data) {
     var notification = new Notification(data.message.level + ': ' + data.message.message);
 };
 
 function notifyToaster(data){
     var notifications = document.getElementById('notifications');
     notifications.push('toasts',
         {   level: data.message.level,
             message: data.message.message
         });
     notifications.open();
 }
 
 function handleNotifications(data) {
-    if (!templateContext.rhodecode_user.notification_status && !data.message.testMessage) {
+    if (!templateContext.rhodecode_user.notification_status && !data.message.force) {
         // do not act if notifications are disabled
         return
     }
     // use only js notifications for now
     var onlyJS = true;
     if (!("Notification" in window) || onlyJS) {
         // use legacy notificartion
         notifyToaster(data);
     }
     else {
         // Let's check whether notification permissions have already been granted
         if (Notification.permission === "granted") {
             notifySystem(data);
         }
         // Otherwise, we need to ask the user for permission
         else if (Notification.permission !== 'denied') {
             Notification.requestPermission(function (permission) {
                 if (permission === "granted") {
                     notifySystem(data);
                 }
             });
         }
         else{
             notifyToaster(data);
         }
     }
 };
 
 $.Topic('/notifications').subscribe(handleNotifications);

rhodecode/templates/admin/my_account/my_account_notifications.html

@@ -1,88 +1,88 b''
 <template is="dom-bind" id="notificationsPage">
 <iron-ajax id="toggleNotifications"
            method="post"
            url="${url('my_account_notifications_toggle_visibility')}"
            content-type="application/json"
            loading="{{changeNotificationsLoading}}"
            on-response="handleNotifications"
            handle-as="json"></iron-ajax>
 
 <div class="panel panel-default">
   <div class="panel-heading">
     <h3 class="panel-title">${_('Your Live Notification Settings')}</h3>
   </div>
     <div class="panel-body">
 
         <p><strong>IMPORTANT:</strong> This feature requires enabled channelstream websocket server to function correctly.</p>
 
         <p class="hidden">Status of browser notifications permission: <strong id="browser-notification-status"></strong></p>
 
         <div class="form">
             <div class="fields">
                 <div class="field">
                     <div class="label">
                         <label for="new_email">${_('Notifications Status')}:</label>
                     </div>
                     <div class="checkboxes">
                         <rhodecode-toggle id="live-notifications" active="[[changeNotificationsLoading]]" on-change="toggleNotifications" ${'checked' if c.rhodecode_user.get_instance().user_data.get('notification_status') else ''}></rhodecode-toggle>
                     </div>
                 </div>
                 <div class="buttons">
                     <a class="btn btn-default" id="test-notification">Test notification</a>
                 </div>
             </div>
         </div>
 
     </div>
 </div>
 
 <script type="application/javascript">
     /** because im not creating a custom element for this page
      * we need to push the function onto the dom-template
      * ideally we turn this into notification-settings elements
      * then it will be cleaner
      */
     var ctrlr = $('#notificationsPage')[0];
     ctrlr.toggleNotifications = function(event){
         var ajax = $('#toggleNotifications')[0];
         ajax.headers = {"X-CSRF-Token": CSRF_TOKEN}
         ajax.body = {notification_status:event.target.active};
         ajax.generateRequest();
     };
     ctrlr.handleNotifications = function(event){
         $('#live-notifications')[0].checked = event.detail.response;
     };
 
     function checkBrowserStatus(){
         var browserStatus = 'Unknown';
 
         if (!("Notification" in window)) {
             browserStatus = 'Not supported'
         }
         else if(Notification.permission === 'denied'){
             browserStatus = 'Denied';
             $('.flash_msg').append('<div class="alert alert-error">Notifications are blocked on browser level - you need to enable them in your browser settings.</div>')
         }
         else if(Notification.permission === 'granted'){
             browserStatus = 'Allowed';
         }
 
         $('#browser-notification-status').text(browserStatus);
     };
 
     checkBrowserStatus();
 
 $('#test-notification').on('click', function(e){
     var levels = ['info', 'error', 'warning', 'success'];
     var level = levels[Math.floor(Math.random()*levels.length)];
     var payload = {
         message: {
             message: 'This is a test notification.',
             level: level,
-            testMessage: true
+            force: true
         }
     };
     $.Topic('/notifications').publish(payload);
 })
 </script>
 </template>