Fixes #36756 - Add a banner warning about RHEL lifecycle EOS per cont…

…ent host
Katello · Sep 20, 2023 · b02739c · b02739c
1 parent 506c528
commit b02739c
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/engines/bastion/app/assets/javascripts/bastion/components/bst-alert.directive.js b/engines/bastion/app/assets/javascripts/bastion/components/bst-alert.directive.js
@@ -47,10 +47,14 @@ angular.module('Bastion.components').directive('bstAlert', ['$animate', '$timeou
                 }
             };
 
-            // Automatically fade out success alerts
-            if (scope.type === 'success') {
+            scope.closeit = function () {
                 scope.fadePrevented = false;
                 scope.startFade();
+            };
+
+            // Automatically fade out success alerts
+            if (scope.type === 'success') {
+                scope.closeit();
             }
         }
     };

diff --git a/engines/bastion/app/assets/javascripts/bastion/components/views/bst-alert.html b/engines/bastion/app/assets/javascripts/bastion/components/views/bst-alert.html
@@ -1,5 +1,5 @@
 <div uib-alert ng-class='"alert-" + (type || "warning")' ng-mouseover="cancelFade()">
-  <button ng-show="closeable" type="button" class="close" aria-hidden="true" ng-click="close()">
+  <button ng-show="closeable" type="button" class="close" aria-hidden="true" ng-click="closeit()">
     <span class="pficon pficon-close"></span>
   </button>
 

diff --git a/...on_katello/app/assets/javascripts/bastion_katello/common/views/rhel-lifecycle-notice.html b/...on_katello/app/assets/javascripts/bastion_katello/common/views/rhel-lifecycle-notice.html
@@ -0,0 +1,7 @@
+<section>
+  <p bst-alert="warning" ng-show="host.rhelLifecycleExpireSoon()" close>
+    <span translate>
+      {{ host.rhel_lifecycle_status_label }}
+    </span>
+  </p>
+</section>
diff --git a/.../assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html b/.../assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
@@ -54,6 +54,7 @@
 
   <nav data-block="navigation">
     <div content-access-mode-banner></div>
+    <div data-extend-template="common/views/rhel-lifecycle-notice.html"></div>
     <ul class="nav nav-tabs">
       <li ng-class="{active: isState('content-host.info')}">
         <a translate

diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host.factory.js
@@ -30,6 +30,10 @@ angular.module('Bastion.hosts').factory('Host',
             return _.isString(this.operatingsystem_name) && (this.operatingsystem_name.indexOf("Debian") >= 0 || this.operatingsystem_name.indexOf("Ubuntu") >= 0);
         };
 
+        resource.prototype.rhelLifecycleExpireSoon = function() {
+            return _.isString(this.rhel_lifecycle_status_label) && (this.rhel_lifecycle_status_label.indexOf("Approaching end of") >= 0);
+        };
+
         return resource;
     }]
 );