katello 4.2.2 → 4.3.0.rc1

data/engines/bastion/vendor/assets/javascripts/bastion/angular/angular.js

@@ -19960,8 +19960,8 @@ function $RootScopeProvider() {
  */
 function $$SanitizeUriProvider() {
 
-  var aHrefSanitizationTrustedUrlList = /^\s*(https?|s?ftp|mailto|tel|file):/,
-    imgSrcSanitizationTrustedUrlList = /^\s*((https?|ftp|file|blob):|data:image\/)/;
+  var aHrefSanitizationTrustedUrlList = /^\s*(https?|s?ftp|uln|mailto|tel|file):/,
+    imgSrcSanitizationTrustedUrlList = /^\s*((https?|ftp|uln|file|blob):|data:image\/)/;
 
   /**
    * @description
@@ -36597,4 +36597,4 @@ $provide.value("$locale", {
 
 })(window);
 
-!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend(window.angular.element('<style>').text('@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}'));
+!window.angular.$$csp().noInlineStyle && window.angular.element(document.head).prepend(window.angular.element('<style>').text('@charset "UTF-8";[ng\\:cloak],[ng-cloak],[data-ng-cloak],[x-ng-cloak],.ng-cloak,.x-ng-cloak,.ng-hide:not(.ng-hide-animate){display:none !important;}ng\\:form{display:block;}.ng-animate-shim{visibility:hidden;}.ng-anchor{position:absolute;}'));

data/engines/bastion/vendor/assets/javascripts/bastion/angular-sanitize/angular-sanitize.js

@@ -820,7 +820,7 @@ angular.module('ngSanitize', [])
  */
 angular.module('ngSanitize').filter('linky', ['$sanitize', function($sanitize) {
   var LINKY_URL_REGEXP =
-        /((s?ftp|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,
+        /((s?ftp|uln|https?):\/\/|(www\.)|(mailto:)?[A-Za-z0-9._%+-]+@)\S*[^\s.;,(){}<>"\u201d\u2019]/i,
       MAILTO_REGEXP = /^mailto:/i;
 
   var linkyMinErr = angular.$$minErr('linky');

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion_katello.js

@@ -34,6 +34,9 @@
 //= require "bastion_katello/files/files.module"
 //= require_tree "./files"
 
+//= require "bastion_katello/generic-content/generic-content.module"
+//= require_tree "./generic-content"
+
 //= require "bastion_katello/ansible-collections/ansible-collections.module.js"
 //= require_tree "./ansible-collections"
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/registration.html

@@ -1,4 +1,4 @@
 <span translate>
   <i class="fa fa-warning inline-icon"></i>
-  This Host is not currently registered with subscription-manager.  Click <a ui-sref="content-hosts.register">here</a> for registration information.
+  This Host is not currently registered with subscription-manager. Use the <a href="/hosts/register">Register Host</a> workflow to complete registration.
 </span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-debs-applicable.controller.js

@@ -0,0 +1,44 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-hosts.controller:ContentHostDebsApplicableController
+ *
+ * @requires $scope
+ * @resource $timeout
+ * @resource $window
+ * @requires Deb
+ * @requires HostDeb
+ * @requires translate
+ * @requires Nutupane
+ *
+ * @description
+ *   Provides the functionality for the content host debs list and actions.
+ */
+angular.module('Bastion.content-hosts').controller('ContentHostDebsApplicableController',
+    ['$scope', '$timeout', '$window', 'Deb', 'HostDeb', 'translate', 'Nutupane',
+    function ($scope, $timeout, $window, Deb, HostDeb, translate, Nutupane) {
+        var debsNutupane, openEventInfo;
+
+        $scope.getSelectedDebs = function () {
+            var selected = $scope.table.getSelected();
+            selected = _.map(selected, function(pkg) {
+                return pkg.name + ':' + pkg.architecture + '=' + pkg.version;
+            });
+            return selected;
+        };
+
+        $scope.getRemoteExecutionCommand = function() {
+            return $scope.getSelectedDebs().join(' ');
+        };
+
+        $scope.performDefaultUpdateAction = function () {
+            $scope.performViaRemoteExecution('packageUpdate', $scope.getRemoteExecutionCommand(), false);
+        };
+
+        debsNutupane = new Nutupane(Deb, {'host_id': $scope.$stateParams.hostId, 'packages_restrict_upgradable': true});
+        $scope.controllerName = 'katello_erratum_debs';
+        debsNutupane.masterOnly = true;
+        $scope.table = debsNutupane.table;
+        $scope.table.openEventInfo = openEventInfo;
+        $scope.table.contentHost = $scope.contentHost;
+    }
+]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-debs.controller.js

@@ -52,7 +52,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostDebsController',
         $scope.performViaRemoteExecution = function (actionType, term, customize) {
             $scope.packageActionFormValues.package = term;
             $scope.packageActionFormValues.remoteAction = actionType;
-            $scope.packageActionFormValues.hostIds = $scope.host.id;
+            $scope.packageActionFormValues.bulkHostIds = angular.toJson({ included: { ids: [$scope.host.id] }});
             $scope.packageActionFormValues.customize = customize;
 
             $timeout(function () {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs-applicable.html

@@ -0,0 +1,70 @@
+<span page-title ng-model="host">{{ 'Deb Packages for: ' | translate }} {{ host.name }}</span>
+
+<h3 translate>Applicable Deb Packages</h3>
+
+<div data-extend-template="layouts/partials/table.html">
+
+  <span data-block="no-rows-message" translate>
+    The host has not reported any applicable packages for upgrade.
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero Deb Packages.
+  </span>
+
+  <div data-block="list-actions" bst-feature-flag="remote_actions">
+    <div ng-hide="denied('edit_hosts', host)" class="nutupane-actions fr">
+      <form ng-submit="performDefaultUpdateAction()" role="form">
+
+        <span uib-dropdown class="btn-group">
+          <button class="btn btn-primary" type="button"
+                  ng-click="performDefaultUpdateAction()"
+                  ng-hide="denied('edit_hosts', host)"
+                  ng-disabled="working || table.numSelected === 0"
+                  translate>
+            Upgrade Selected
+          </button>
+          <button uib-dropdown-toggle class="btn btn-default"
+                  ng-hide="!remoteExecutionPresent || denied('edit_hosts', contentHost)"
+                  ng-disabled="working ||  table.numSelected === 0"
+                  type="button" id="use-remote-execution">
+            <span class="caret"></span>
+          </button>
+          <ul uib-dropdown-menu role="menu" aria-labelledby="use-remote-execution">
+            <li role="presentation"><a ng-click="performViaRemoteExecution('packageUpdate', getRemoteExecutionCommand(), false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
+            <li role="presentation"><a ng-click="performViaRemoteExecution('packageUpdate', getRemoteExecutionCommand(), true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
+          </ul>
+        </span>
+
+        <button class="btn btn-default"
+                type="button"
+                translate
+                ng-disabled="working"
+                ng-click="updateAll()">
+          Update All Deb Packages
+        </button>
+      </form>
+    </div>
+  </div>
+
+  <div data-block="table">
+    <table bst-table="table" ng-class="{'table-mask': table.working}" class="table table-full table-striped">
+      <thead>
+      <tr bst-table-head row-select>
+        <th bst-table-column="name" translate>Upgradable Package</th>
+        <th bst-table-column="name" translate>Version</th>
+        <th bst-table-column="name" translate>Architecture</th>
+      </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="deb in table.rows" row-select="deb">
+          <td bst-table-cell>{{ deb.name }}</td>
+          <td bst-table-cell>{{ deb.version }}</td>
+          <td bst-table-cell>{{ deb.architecture }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-debs.html

@@ -1,7 +1,7 @@
 <form role="form" id="packageActionForm" method="post" action="/katello/remote_execution">
   <input type="hidden" name="name" ng-value="packageActionFormValues.package"/>
   <input type="hidden" name="remote_action" ng-value="packageActionFormValues.remoteAction"/>
-  <input type="hidden" name="host_ids" ng-value="packageActionFormValues.hostIds"/>
+  <input type="hidden" name="bulk_host_ids" ng-value="packageActionFormValues.bulkHostIds"/>
   <input type="hidden" name="customize" ng-value="packageActionFormValues.customize"/>
   <input type="hidden" name="authenticity_token" ng-value="packageActionFormValues.authenticityToken"/>
 </form>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts.routes.js

@@ -174,6 +174,16 @@ angular.module('Bastion.content-hosts').config(['$stateProvider', function ($sta
             label: "{{ 'Installed Deb Packages' | translate }}",
             parent: 'content-host.info'
         }
+    })
+    .state('content-host.debs.applicable', {
+        url: '/debs/applicable',
+        permission: 'view_hosts',
+        controller: 'ContentHostDebsApplicableController',
+        templateUrl: 'content-hosts/content/views/content-host-debs-applicable.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Applicable Deb Packages' | translate }}",
+            parent: 'content-host.info'
+        }
     });
 
     $stateProvider.state('content-host.packages', {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html

@@ -130,6 +130,11 @@
               Installed
             </a>
           </li>
+          <li>
+            <a ui-sref="content-host.debs.applicable" translate>
+              Applicable
+            </a>
+          </li>
         </ul>
       </li>
       <li ng-class="{active: isState('content-host.errata.index')}">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html

@@ -112,18 +112,34 @@
               <span class="aligned-errata-count" errata-counts="host.content_facet_attributes.errata_counts"></span>
             </a>
 
-            <a ui-sref="content-host.packages.applicable({hostId: host.id})">
-            <span class="aligned-errata-count">
-              <span class="errata-count"
-                 ng-class="{black: !host.content_facet_attributes.upgradable_package_count,
-                            green: host.content_facet_attributes.upgradable_package_count > 0}">
-                <span>
-                  {{ host.content_facet_attributes.upgradable_package_count || 0 }}
+            <span ng-if="host.content_facet_attributes.upgradable_package_count > 0">
+              <a ui-sref="content-host.packages.applicable({hostId: host.id})">
+              <span class="aligned-errata-count">
+                <span class="errata-count"
+                   ng-class="{black: !host.content_facet_attributes.upgradable_package_count,
+                              green: host.content_facet_attributes.upgradable_package_count > 0}">
+                  <span>
+                    {{ host.content_facet_attributes.upgradable_package_count || 0 }}
+                  </span>
+                  <i class="fa fa-cube inline-icon" title="{{ 'rpm Package Updates' | translate }}"></i>
                 </span>
-                <i class="fa fa-cube inline-icon" title="{{ 'Package Updates' | translate }}"></i>
               </span>
+              </a>
+            </span>
+            <span ng-if="host.content_facet_attributes.upgradable_deb_count > 0">
+              <a ui-sref="content-host.debs.applicable({hostId: host.id})">
+              <span class="aligned-errata-count">
+                <span class="errata-count"
+                   ng-class="{black: !host.content_facet_attributes.upgradable_deb_count,
+                              green: host.content_facet_attributes.upgradable_deb_count > 0}">
+                  <span>
+                    {{ host.content_facet_attributes.upgradable_deb_count || 0 }}
+                  </span>
+                  <i class="fa fa-cube inline-icon" title="{{ 'deb Package Updates' | translate }}"></i>
+                </span>
+              </span>
+              </a>
             </span>
-            </a>
           </td>
           <td bst-table-cell>{{ host.operatingsystem_name }}</td>
           <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment.name }}</td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.routes.js

@@ -9,7 +9,7 @@
  */
 angular.module('Bastion.content-views').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('content-views', {
-        url: '/content_views',
+        url: '/legacy/content_views',
         permission: 'view_content_views',
         views: {
             '@': {
@@ -38,7 +38,7 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
 
     $stateProvider.state('content-view', {
         abstract: true,
-        url: '/content_views/:contentViewId',
+        url: '/legacy/content_views/:contentViewId',
         permission: 'view_content_views',
         controller: 'ContentViewDetailsController',
         templateUrl: 'content-views/details/views/content-view-details.html'

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-versions.html

@@ -108,15 +108,6 @@
                      Promote
                   </a>
                 </li>
-                <li>
-                  <a href="#"
-                     ng-click="regenerateRepositories(version)"
-                     ng-hide="denied('promote_or_remove_content_views', contentView)"
-                     ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask"
-                     translate>
-                     Regenerate Repository Metadata
-                  </a>
-                </li>
                 <li>
                   <a href="#"
                      ng-click="$state.go('content-view.version-deletion.environments', {contentViewId: contentView.id, versionId: version.id})"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/debs.controller.js

@@ -9,11 +9,13 @@
      *   Handles fetching deb packages and populating Nutupane based on the current
      *   ui-router state.
      */
-    function DebsController($scope, Nutupane, Deb, CurrentOrganization) {
+    function DebsController($scope, $location, translate, Nutupane, Deb, CurrentOrganization) {
         var nutupane;
 
         var params = {
             'organization_id': CurrentOrganization,
+            'search': $location.search().search || "",
+            'paged': true,
             'sort_by': 'name',
             'sort_order': 'ASC'
         };
@@ -23,12 +25,30 @@
 
         $scope.table = nutupane.table;
         $scope.controllerName = 'katello_debs';
+
+        Deb.queryPaged({'organization_id': CurrentOrganization}, function (result) {
+            $scope.packageCount = result.total;
+        });
+
+        $scope.showApplicable = false;
+        $scope.showUpgradable = false;
+
+        $scope.toggleFilters = function () {
+            if ($scope.showUpgradable === true) {
+                $scope.showApplicable = true;
+            }
+
+            nutupane.table.params['packages_restrict_applicable'] = $scope.showApplicable;
+            nutupane.table.params['packages_restrict_upgradable'] = $scope.showUpgradable;
+            nutupane.refresh();
+        };
+
     }
 
     angular
         .module('Bastion.debs')
         .controller('DebsController', DebsController);
 
-    DebsController.$inject = ['$scope', 'Nutupane', 'Deb', 'CurrentOrganization'];
+    DebsController.$inject = ['$scope', '$location', 'translate', 'Nutupane', 'Deb', 'CurrentOrganization'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/debs.routes.js

@@ -36,7 +36,7 @@
             permission: ['view_products', 'view_content_views'],
             templateUrl: 'debs/details/views/deb-info.html',
             ncyBreadcrumb: {
-                label: "{{ deb.name }}",
+                label: "{{ deb.nva }}",
                 parent: 'debs'
             }
         })

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/deb.controller.js

@@ -4,10 +4,13 @@
      * @ngdoc object
      * @name  Bastion.debs.controller:DebController
      *
+     * @requires Host
+     * @requires CurrentOrganization
+     *
      * @description
      *   Provides the functionality for the debs details action pane.
      */
-    function DebController($scope, Deb, ApiErrorHandler) {
+    function DebController($scope, Deb, Host, CurrentOrganization, ApiErrorHandler) {
         $scope.panel = {
             error: false,
             loading: true
@@ -17,8 +20,25 @@
             $scope.panel.loading = false;
         }
 
+        $scope.installedPackageCount = undefined;
+
+        $scope.fetchHostCount = function() {
+            Host.get({'per_page': 0, 'search': $scope.createRawSearchString('installed_deb'), 'organization_id': CurrentOrganization}, function (data) {
+                $scope.installedDebCount = data.subtotal;
+            });
+        };
+
+        $scope.createSearchString = function(field) {
+            return encodeURIComponent($scope.createRawSearchString(field));
+        };
+
+        $scope.createRawSearchString = function(field) {
+            return field + '="' + $scope.deb.name + ':' + $scope.deb.architecture + '=' + $scope.deb.version + '"';
+        };
+
         $scope.deb = Deb.get({id: $scope.$stateParams.debId}, function () {
             $scope.panel.loading = false;
+            $scope.fetchHostCount();
         }, function (response) {
             $scope.panel.loading = false;
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
@@ -29,6 +49,6 @@
         .module('Bastion.debs')
         .controller('DebController', DebController);
 
-    DebController.$inject = ['$scope', 'Deb', 'ApiErrorHandler'];
+    DebController.$inject = ['$scope', 'Deb', 'Host', 'CurrentOrganization', 'ApiErrorHandler'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/views/deb-content-views.html

@@ -1,4 +1,4 @@
-<span page-title ng-model="deb">{{ 'Content Views for Deb: ' | translate }} {{ deb.name }}_{{ deb.version }}_{{ deb.architecture }}</span>
+<span page-title ng-model="deb">{{ 'Content Views for Deb: ' | translate }} {{ deb.nva }}</span>
 
 <h3 translate>Content Views that contain this Deb</h3>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/views/deb-info.html

@@ -1,21 +1,53 @@
-<span page-title ng-model="deb">{{ 'Deb: ' | translate }} {{ deb.name }}_{{ deb.version }}_{{ deb.architecture }}</span>
+<span page-title ng-model="deb">{{ 'Deb: ' | translate }} {{ deb.nva }}</span>
 
 <div data-extend-template="layouts/full-page-details.html">
   <div data-block="content">
     <h4 translate>Basic Information</h4>
 
     <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Installed On</dt>
+      <dd>
+        <i class="fa fa-spinner fa-spin" ng-show="installedDebCount === undefined"></i>
+        <span ng-show="installedDebCount !== undefined">
+          <a href="{{ '/content_hosts?search=' + createSearchString('installed_deb') }}" translate>
+            {{ installedDebCount }} Host(s)
+          </a>
+        </span>
+      </dd>
+
+      <dt translate>Applicable To</dt>
+      <dd>
+        <a href="{{ '/content_hosts?search=' + createSearchString('applicable_debs') }}" translate>
+          {{ deb.hosts_applicable_count }} Host(s)
+        </a>
+      </dd>
+
+      <dt translate>Upgradable For</dt>
+      <dd>
+        <a href="{{ '/content_hosts?search=' + createSearchString('upgradable_debs') }}" translate>
+          {{ deb.hosts_available_count }} Host(s)
+        </a>
+      </dd>
+
       <dt translate>Version</dt>
       <dd>{{ deb.version }}</dd>
 
       <dt translate>Architecture</dt>
       <dd>{{ deb.architecture }}</dd>
 
-      <dt translate>Checksum</dt>
-      <dd>{{ deb.checksum }}</dd>
-
       <dt translate>Description</dt>
       <dd>{{ deb.description }}</dd>
     </dl>
+    <div class="divider"></div>
+
+    <h4 translate>File Information</h4>
+
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Filename</dt>
+      <dd>{{ deb.filename}}</dd>
+
+      <dt translate>Checksum</dt>
+      <dd>{{ deb.checksum }}</dd>
+    </dl>
   </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/views/deb-repositories.html

@@ -1,4 +1,4 @@
-<span page-title ng-model="deb">{{ 'Repositories for Deb: ' | translate }} {{ deb.name }}_{{ deb.version }}_{{ deb.architecture }}</span>
+<span page-title ng-model="deb">{{ 'Repositories for Deb: ' | translate }} {{ deb.nva }}</span>
 
 <h3 translate>Library Repositories that contain this Deb.</h3>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/details/views/deb.html

@@ -1,9 +1,9 @@
-<span page-title ng-model="deb">{{ 'Deb: ' | translate }} {{ deb.name }}</span>
+<span page-title ng-model="deb">{{ 'Deb: ' | translate }} {{ deb.nva }}</span>
 
 <div data-extend-template="layouts/details-page-with-breadcrumbs.html">
-  <div data-block="header" translate>
-    {{ deb.name }}
-  </div>
+  <header data-block="header">
+    <h2>{{ deb.nva }}</h2>
+  </header>
 
   <nav data-block="navigation">
     <ul class="nav nav-tabs">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/debs/views/debs.html

@@ -1,12 +1,34 @@
 <span page-title>{{ 'Deb Packages' | translate }}</span>
 
 <div data-extend-template="layouts/table-with-header.html">
-  <div data-block="header" translate>
-    Debs
+
+  <header data-block="header">
+    <h2 translate>Deb Packages</h2>
+  </header>
+
+  <div data-block="filters">
+    <label class="checkbox-inline" title="{{ 'Only show Packages that are Applicable to one or more Content Hosts' | translate }}">
+      <input type="checkbox" ng-model="showApplicable" ng-disabled="showUpgradable" ng-change="toggleFilters()"/>
+      <span translate>Applicable</span>
+    </label>
+
+    <label class="checkbox-inline" title="{{ 'Only show Packages that are Upgradable on one or more Content Hosts' | translate }}">
+      <input type="checkbox" ng-model="showUpgradable" ng-change="toggleFilters()"/>
+      <span translate>Upgradable</span>
+    </label>
+
+    <p ng-show="showUpgradable" translate>
+      Packages are automatically Applicable if they are Upgradable
+    </p>
   </div>
 
-  <span data-block="no-rows-message" translate>
-    You currently don't have any Debs.
+  <span data-block="no-rows-message">
+    <span ng-hide="packageCount > 0" translate>
+      There are no Packages in this organization.  Create one or more Products with Packages to view Packages on this page.
+    </span>
+    <span ng-show="packageCount > 0" translate>
+      There are {{ packageCount }} total Packages in this organization but none match the above filters.
+    </span>
   </span>
 
   <span data-block="no-search-results-message" translate>
@@ -20,6 +42,7 @@
           <th bst-table-column="name"><span translate>Name</span></th>
           <th bst-table-column="version"><span translate>Version</span></th>
           <th bst-table-column="architecture"><span translate>Architecture</span></th>
+          <th bst-table-column="numberOfContentHosts">{{ "Content Host Counts" | translate }}</th>
         </tr>
       </thead>
 
@@ -36,6 +59,10 @@
           <td bst-table-cell>
             {{ deb.architecture }}
           </td>
+          <td bst-table-cell>
+            <span translate>{{ deb.hosts_applicable_count || 0 }} Applicable, </span>
+            <span translate>{{ deb.hosts_available_count || 0 }} Upgradable</span>
+          </td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/generic-content/generic-content.factory.js

@@ -0,0 +1,21 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.generic-content.factory:GenericContent
+ *
+ * @requires BastionResource
+ *
+ * @description
+ *   Provides a BastionResource for GenericContent
+ */
+angular.module('Bastion.generic-content').factory('GenericContent',
+    ['BastionResource', function (BastionResource) {
+
+        return BastionResource('katello/api/v2/:content_type_name/:id/',
+            {'content_type_name': '@content_type_name', 'sort_by': 'name', 'sort_order': 'DESC'},
+            {
+                autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
+            }
+        );
+
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/generic-content/generic-content.module.js

@@ -0,0 +1,17 @@
+/**
+ * @ngdoc module
+ * @name  Bastion.generic-content
+ *
+ * @description
+ *   Module for Generic content units related functionality.
+ */
+angular.module('Bastion.generic-content', [
+    'ngResource',
+    'ui.router',
+    'Bastion',
+    'Bastion.common',
+    'Bastion.i18n',
+    'Bastion.components.formatters',
+    'Bastion.tasks',
+    'Bastion.dates'
+]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/package.controller.js

@@ -36,6 +36,10 @@ angular.module('Bastion.packages').controller('PackageController',
                             $scope.package.arch;
         };
 
+        $scope.encodedUrl = function(field) {
+            return '/content_hosts?search=' + encodeURIComponent($scope.createSearchString(field));
+        };
+
         $scope.package = Package.get({id: $scope.$stateParams.packageId}, function () {
             $scope.panel.loading = false;
             $scope.fetchHostCount();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/views/package-info.html

@@ -9,7 +9,7 @@
       <dd>
         <i class="fa fa-spinner fa-spin" ng-show="installedPackageCount === undefined"></i>
         <span ng-show="installedPackageCount !== undefined">
-          <a href="{{ '/content_hosts?search=' + createSearchString('installed_package') }}" translate>
+          <a href="{{ encodedUrl('installed_package') }}" translate>
             {{ installedPackageCount }} Host(s)
           </a>
         </span>
@@ -17,14 +17,14 @@
 
       <dt translate>Applicable To</dt>
       <dd>
-        <a href="{{ '/content_hosts?search=' + createSearchString('applicable_rpms') }}" translate>
+        <a href="{{ encodedUrl('applicable_rpms') }}" translate>
           {{ package.hosts_applicable_count }} Host(s)
         </a>
       </dd>
 
       <dt translate>Upgradable For</dt>
       <dd>
-        <a href="{{ '/content_hosts?search=' + createSearchString('upgradable_rpms') }}" translate>
+        <a href="{{ encodedUrl('upgradable_rpms') }}" translate>
           {{ package.hosts_available_count }} Host(s)
         </a>
       </dd>