Render the notification drawer footer synchronously, remove its haml

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1640161
ManageIQ · Oct 18, 2018 · 9d502ea · 9d502ea
1 parent e4fc7df
commit 9d502ea
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/app/assets/javascripts/controllers/notifications/notification-drawer.directive.js b/app/assets/javascripts/controllers/notifications/notification-drawer.directive.js
@@ -14,7 +14,6 @@ angular.module('miq.notifications').directive('miqNotificationDrawer', ['$window
       headingInclude: '@',
       subheadingInclude: '@',
       notificationBodyInclude: '@',
-      notificationFooterInclude: '@',
       customScope: '=?',
     },
     templateUrl: '/static/notification_drawer/notification-drawer.html',

diff --git a/app/views/layouts/_notifications_drawer.html.haml b/app/views/layouts/_notifications_drawer.html.haml
@@ -8,5 +8,4 @@
        "heading-include" => "/static/notification_drawer/notification-heading.html",
        "subheading-include" => "/static/notification_drawer/notification-subheading.html",
        "notification-body-include" => "/static/notification_drawer/notification-body.html",
-       "notification-footer-include" => "/static/notification_drawer/notification-footer.html",
        "custom-scope" => "vm.customScope"}
diff --git a/app/views/static/notification_drawer/notification-drawer.html.haml b/app/views/static/notification_drawer/notification-drawer.html.haml
@@ -46,5 +46,17 @@
             %a.btn.btn-link.btn-block{'ng-click' => "actionButtonCallback(notificationGroup)"}
               {{actionButtonTitle}}
 
-          %div{'ng-if'      => "notificationFooterInclude",
-               'ng-include' => "notificationFooterInclude"}
+          %div
+            .drawer-pf-action.footer-actions
+              .footer-button-left
+                %a.btn.btn-link{"role" => "button",
+                                "ng-class" => "{'disabled': !notificationGroup.notifications || notificationGroup.notifications.length === 0}",
+                                "ng-click" => "customScope.markAllRead(notificationGroup)"}
+                  %span
+                    = _('Mark All Read')
+              .footer-button-right
+                %a.btn.btn-link{"role" => "button",
+                                "ng-class" => "{'disabled': !notificationGroup.notifications || notificationGroup.notifications.length === 0}",
+                                "ng-click" => "customScope.clearAllNotifications(notificationGroup)"}
+                  %span
+                    = _('Clear All')
diff --git a/app/views/static/notification_drawer/notification-footer.html.haml b/app/views/static/notification_drawer/notification-footer.html.haml