From a02cd42570f096350421394cfdab7879aa68bf0e Mon Sep 17 00:00:00 2001
From: Lucy Fu <lufu@redhat.com>
Date: Thu, 27 Apr 2023 22:46:06 +0000
Subject: [PATCH] Fixes #36328 - display short host name in Content Hosts page

---
 .../bastion_katello/content-hosts/content-hosts.routes.js   | 2 +-
 .../content/views/content-host-debs-actions.html            | 2 +-
 .../content/views/content-host-debs-applicable.html         | 2 +-
 .../content/views/content-host-debs-installed.html          | 2 +-
 .../content-hosts/content/views/content-host-errata.html    | 6 +++---
 .../content/views/content-host-module-streams.html          | 2 +-
 .../content/views/content-host-packages-actions.html        | 2 +-
 .../content/views/content-host-packages-applicable.html     | 2 +-
 .../content/views/content-host-packages-installed.html      | 2 +-
 .../content-hosts/content/views/content-host-traces.html    | 6 +++---
 .../details/content-host-add-host-collections.controller.js | 2 +-
 .../details/content-host-host-collections.controller.js     | 2 +-
 .../details/views/content-host-add-subscriptions.html       | 2 +-
 .../content-hosts/details/views/content-host-details.html   | 6 +++---
 .../details/views/content-host-host-collections.html        | 2 +-
 .../content-hosts/details/views/content-host-info.html      | 6 +++---
 .../details/views/content-host-provisioning-info.html       | 4 ++--
 .../details/views/content-host-subscriptions-list.html      | 2 +-
 .../details/views/content-host-subscriptions.html           | 2 +-
 .../bastion_katello/content-hosts/views/content-hosts.html  | 6 +++---
 20 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.routes.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.routes.js
index 2d600ddda8c..62db42ae466 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.routes.js
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.routes.js
@@ -51,7 +51,7 @@ angular.module('Bastion.content-hosts').config(['$stateProvider', function ($sta
         controller: 'ContentHostDetailsInfoController',
         templateUrl: 'content-hosts/details/views/content-host-info.html',
         ncyBreadcrumb: {
-            label: "{{ host.name }}",
+            label: "{{ host.display_name }}",
             parent: 'content-hosts'
         }
     })
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-actions.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-actions.html
index be13ef660ee..deaa02fe0a7 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-actions.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-actions.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <h4 translate>Package Actions</h4>
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-applicable.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-applicable.html
index c3830070026..b367365246e 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-applicable.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-applicable.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Deb Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Deb Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <h3 translate>Applicable Deb Packages</h3>
 
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-installed.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-installed.html
index 1f4936127ee..27cc2d95383 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-installed.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-installed.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <p bst-alert="info" ng-hide="remoteExecutionPresent">
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html
index eea49695626..378936bb8e6 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Errata for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Errata for: ' | translate }} {{ host.display_name }}</span>
 
 <div bst-feature-flag="remote_actions">
   <h3 translate ng-hide="selectedErrataOption === 'current'">Applicable Errata</h3>
@@ -53,8 +53,8 @@ <h3 translate ng-show="selectedErrataOption === 'current'">Installable Errata</h
 
     <span data-block="list-actions" ng-hide="contentHost.readonly">
       <div bst-modal="applySelected()" model="host">
-        <div data-block="modal-header" translate>Apply Errata to Content Host "{{host.name}}"?</div>
-        <div data-block="modal-body" translate>Are you sure you want to apply Errata to content host "{{ host.name }}"?</div>
+        <div data-block="modal-header" translate>Apply Errata to Content Host "{{host.displayname}}"?</div>
+        <div data-block="modal-body" translate>Are you sure you want to apply Errata to content host "{{ host.displayname }}"?</div>
         <span data-block="modal-confirm-button">
           <button class="btn btn-primary" ng-click="ok()">
             <span translate>Apply</span>
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-module-streams.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-module-streams.html
index 36a66a15973..e2ed160edbd 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-module-streams.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-module-streams.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Module Streams for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Module Streams for: ' | translate }} {{ host.display_name }}</span>
 <div bst-feature-flag="remote_actions">
   <h3 translate ng-hide="selectedModuleStreamOption === 'available'">Available Module Streams</h3>
 </div>
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html
index 99b895e001d..149dffd2ed0 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <h4 translate>Package Actions</h4>
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html
index 797abeefe10..6c43ff68745 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-applicable.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <h3 translate>Applicable Packages</h3>
 
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html
index 0577bf59595..44cf71039cc 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-installed.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.display_name }}</span>
 
 <h3 translate>Installed Packages</h3>
 
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-traces.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-traces.html
index d0ce93d0ccc..da3a2d6dfa8 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-traces.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-traces.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Traces for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Traces for: ' | translate }} {{ host.display_name }}</span>
 
 <div ng-hide="host.hasContent()">
   <div data-extend-template="common/views/registration.html"></div>
@@ -39,9 +39,9 @@ <h4 translate>Tracer helps administrators identify applications that need to be
   <div data-extend-template="layouts/partials/table.html">
     <span data-block="list-actions" ng-hide="contentHost.readonly">
       <div bst-modal="performViaRemoteExecution(false)" model="host">
-        <div data-block="modal-header" translate>Restart Services on Content Host "{{host.name}}"?</div>
+        <div data-block="modal-header" translate>Restart Services on Content Host "{{host.displayname}}"?</div>
         <div data-block="modal-body">
-          <span translate>Are you sure you want to restart services on content host "{{ host.name }}"?</span>
+          <span translate>Are you sure you want to restart services on content host "{{ host.displayname }}"?</span>
           <span ng-show="host.rebootRequired()">
             <strong translate>Resolving the selected Traces will reboot this host.</strong>
           </span>
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-host-collections.controller.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-host-collections.controller.js
index aa17fe51919..d408d0158bd 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-host-collections.controller.js
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-add-host-collections.controller.js
@@ -46,7 +46,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollection
 
             success = function (response) {
                 Notification.setSuccessMessage(translate('Added %x host collections to content host "%y".')
-                    .replace('%x', $scope.table.numSelected).replace('%y', host.name));
+                    .replace('%x', $scope.table.numSelected).replace('%y', host.display_name));
                 $scope.table.working = false;
                 $scope.table.selectAll(false);
                 nutupane.refresh();
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-host-collections.controller.js b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-host-collections.controller.js
index 6172b441abb..9ad228c2567 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-host-collections.controller.js
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-host-collections.controller.js
@@ -45,7 +45,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
 
             success = function (response) {
                 var message = translate('Removed %x host collections from content host "%y".')
-                    .replace('%x', $scope.table.numSelected).replace('%y', host.name);
+                    .replace('%x', $scope.table.numSelected).replace('%y', host.display_name);
 
                 Notification.setSuccessMessage(message);
                 $scope.table.working = false;
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-add-subscriptions.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-add-subscriptions.html
index d7db0919d9c..a37edeb9987 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-add-subscriptions.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-add-subscriptions.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Add Subscriptions for Content Host:' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Add Subscriptions for Content Host:' | translate }} {{ host.display_name }}</span>
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
index f8fc5ac35a7..a471177f548 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
@@ -1,8 +1,8 @@
-<span page-title ng-model="host">{{ 'Content Host:' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Content Host:' | translate }} {{ host.display_name }}</span>
 
 <div data-extend-template="layouts/details-page-with-breadcrumbs.html">
   <header data-block="header" translate>
-    {{ host.name }}
+    {{ host.display_name }}
   </header>
 
   <nav data-block="item-actions">
@@ -15,7 +15,7 @@
 
     <div bst-modal="unregisterContentHost(host)" model="host">
       <div data-block="modal-header" translate>
-        Unregister Host "{{host.name}}"?
+        Unregister Host "{{host.display_name}}"?
       </div>
       <div data-block="modal-body">
         <p translate>
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-host-collections.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-host-collections.html
index 13c91aff8d0..0fb2e10f6be 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-host-collections.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-host-collections.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Host Collections for:' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Host Collections for:' | translate }} {{ host.display_name }}</span>
 
 <h4 translate>Host Collection Management</h4>
 <nav>
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
index ec82763bfda..2039b488f9a 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Content Host' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Content Host' | translate }} {{ host.display_name }}</span>
 
 <div ng-hide="host.hasSubscription()">
   <div data-extend-template="common/views/registration.html"></div>
@@ -65,7 +65,7 @@ <h4 translate>Basic Information</h4>
 
         <dt ng-show="host.subscription_facet_attributes.virtual_host" translate>Virtual Host</dt>
         <dd ng-show="host.subscription_facet_attributes.virtual_host">
-          <a ui-sref="content-host.info({hostId: host.subscription_facet_attributes.virtual_host.id })">{{ host.subscription_facet_attributes.virtual_host.name }}</a>
+          <a ui-sref="content-host.info({hostId: host.subscription_facet_attributes.virtual_host.id })">{{ host.subscription_facet_attributes.virtual_host.display_name }}</a>
         </dd>
       </dl>
 
@@ -345,7 +345,7 @@ <h4 translate>Networking</h4>
 
       <dl class="dl-horizontal dl-horizontal-left">
         <dt translate>Hostname</dt>
-        <dd>{{ host.name }}</dd>
+        <dd>{{ host.displayname }}</dd>
 
         <dt translate>IPv4 Address</dt>
         <dd>{{ host.facts["network::ipv4_address"] }}</dd>
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html
index 36461cc39e6..c44ac689ebe 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Content Host' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Content Host' | translate }} {{ host.display_name }}</span>
 
 <div data-extend-template="layouts/two-column-details.html">
   <div data-block="left-column">
@@ -8,7 +8,7 @@ <h4 translate>Provisioning Host Details</h4>
       <dt translate>Name</dt>
       <dd>
         <a href="/hosts/{{ host.name }}">
-          {{ host.name }}
+          {{ host.display_name }}
         </a>
       </dd>
 
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions-list.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions-list.html
index 80dd7e360ac..34c17d8b29c 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions-list.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions-list.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Subscriptions for Content Host:' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Subscriptions for Content Host:' | translate }} {{ host.display_name }}</span>
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions.html
index 43f71ea785d..aba1f2022fd 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions.html
@@ -1,4 +1,4 @@
-<span page-title ng-model="host">{{ 'Subscriptions for: ' | translate }} {{ host.name }}</span>
+<span page-title ng-model="host">{{ 'Subscriptions for: ' | translate }} {{ host.display_name }}</span>
 
 <div ng-hide="host.hasSubscription()">
   <div data-extend-template="common/views/registration.html"></div>
diff --git a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html
index 26d9f20f978..fc4622b05eb 100644
--- a/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html
+++ b/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html
@@ -100,9 +100,9 @@ <h2 translate>Content Hosts</h2>
             ng-controller="ContentHostStatusController">
           <td bst-table-cell>
             <span ng-switch="newHostDetailsUI">
-              <a ng-switch-when="true" ng-if="host.subscription_facet_attributes.uuid" ng-href="/new/hosts/{{host.name}}/content">{{ host.name }}</a>
-              <a ng-switch-when="true" ng-if="!host.subscription_facet_attributes.uuid" ng-href="/new/hosts/{{host.name}}">{{ host.name}}</a>
-              <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.name }}</a>
+              <a ng-switch-when="true" ng-if="host.subscription_facet_attributes.uuid" ng-href="/new/hosts/{{host.name}}/content">{{ host.display_name }}</a>
+              <a ng-switch-when="true" ng-if="!host.subscription_facet_attributes.uuid" ng-href="/new/hosts/{{host.name}}">{{ host.display_name }}</a>
+              <a ng-switch-when="false" ui-sref="content-host.info({hostId: host.id})">{{ host.display_name }}</a>
             </span>
           </td>
           <td bst-table-cell ng-hide="simpleContentAccessEnabled">