katello 4.6.2.1 → 4.7.0.rc1

data/config/routes.rb

@@ -32,6 +32,9 @@ Katello::Engine.routes.draw do
 
   match '/content' => 'react#index', :via => [:get]
 
+  match '/alternate_content_sources' => 'react#index', :via => [:get]
+  match '/alternate_content_sources/*page' => 'react#index', :via => [:get]
+
   Katello::RepositoryTypeManager.generic_ui_content_types(false).each do |type|
     get "/#{type.pluralize}", to: redirect("/content/#{type.pluralize}")
     get "/#{type.pluralize}/:page", to: redirect("/content/#{type.pluralize}/%{page}")

data/db/migrate/20220730033504_update_custom_cdn.rb

@@ -0,0 +1,13 @@
+class UpdateCustomCdn < ActiveRecord::Migration[6.1]
+  class FakeCdnConfiguration < Katello::Model
+    self.table_name = 'katello_cdn_configurations'
+    self.inheritance_column = nil
+  end
+
+  def change
+    FakeCdnConfiguration.reset_column_information
+    FakeCdnConfiguration.where(type: 'redhat_cdn').each do |config|
+      config.update!(type: 'custom_cdn') unless Katello::Resources::CDN::CdnResource.redhat_cdn?(config.url)
+    end
+  end
+end

data/db/migrate/20220920173656_add_http_proxy_to_smart_proxy.rb

@@ -0,0 +1,7 @@
+class AddHttpProxyToSmartProxy < ActiveRecord::Migration[6.1]
+  def change
+    add_column      :katello_alternate_content_sources, :use_http_proxies, :boolean
+    add_column      :smart_proxies, :http_proxy_id, :integer
+    add_foreign_key :smart_proxies, :http_proxies
+  end
+end

data/db/migrate/20220920180858_remove_http_proxy_from_katello_alternate_content_sources.rb

@@ -0,0 +1,6 @@
+class RemoveHttpProxyFromKatelloAlternateContentSources < ActiveRecord::Migration[6.1]
+  def change
+    remove_foreign_key :katello_alternate_content_sources, :http_proxies
+    remove_column :katello_alternate_content_sources, :http_proxy_id, :integer
+  end
+end

data/engines/bastion/app/assets/javascripts/bastion/components/notification.service.js

@@ -32,6 +32,6 @@ angular.module('Bastion.components').service("Notification", ['$interpolate', 'f
     };
 
     this.setErrorMessage = function (message, context) {
-        foreman.toastNotifications.notify({message: interpolateIfNeeded(message, context), type: 'error'});
+        foreman.toastNotifications.notify({message: interpolateIfNeeded(message, context), type: 'danger'});
     };
 }]);

data/engines/bastion/app/views/bastion/layouts/assets.html.erb

@@ -21,17 +21,17 @@
     angular.module('Bastion').value('simpleContentAccessEnabled', <%= Organization.current.simple_content_access? if Organization.current %>);
     angular.module('Bastion').value('isManifestImported', <%= !!Organization.current&.manifest_imported?(cached: true) %>)
     angular.module('Bastion').value('foreman', tfm);
-    angular.module('Bastion').value('repositoryTypes', angular.fromJson(`<%= Katello::RepositoryTypeManager.enabled_repository_types.values.to_json.html_safe %>`));
-    angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson(`<%= Setting[:unregister_delete_host] %>`));
-    angular.module('Bastion').value('globalContentProxy', angular.fromJson(`<%= Setting[:content_default_http_proxy].empty? ? nil.to_json : Setting[:content_default_http_proxy].to_json.html_safe %>`));
+    angular.module('Bastion').value('repositoryTypes', angular.fromJson('<%= Katello::RepositoryTypeManager.enabled_repository_types.values.to_json.html_safe %>'));
+    angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson('<%= Setting[:unregister_delete_host] %>'));
+    angular.module('Bastion').value('globalContentProxy', angular.fromJson('<%= Setting[:content_default_http_proxy].empty? ? nil.to_json : Setting[:content_default_http_proxy].to_json.html_safe %>'));
     angular.module('Bastion').value('entriesPerPage', "<%= Setting[:entries_per_page] %>");
     angular.module('Bastion').value('contentViewSolveDependencies', "<%= Setting[:content_view_solve_dependencies] %>");
-    angular.module('Bastion').constant('BastionConfig', angular.fromJson(`<%= Bastion.config.to_json.html_safe %>`));
+    angular.module('Bastion').constant('BastionConfig', angular.fromJson('<%= Bastion.config.to_json.html_safe %>'));
     angular.module('Bastion.auth').value('CurrentUser', {
         id: <%= User.current.id %>,
         admin: <%= User.current.admin || User.current.usergroups.any? { |group| group.admin } %>
     });
-    angular.module('Bastion.auth').value('Permissions', angular.fromJson(`<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>`));
+    angular.module('Bastion.auth').value('Permissions', angular.fromJson('<%= User.current.cached_roles.collect { |role| role.permissions }.flatten.to_json.html_safe %>'));
     angular.module('Bastion').value('newHostDetailsUI', "<%= Setting[:host_details_ui] %>");
   </script>
   <% Bastion.plugins.each do |name, plugin| %>

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

@@ -17941,7 +17941,7 @@ function $ParseProvider() {
  * @description
  */
 function $QProvider() {
-  var errorOnUnhandledRejections = true;
+  var errorOnUnhandledRejections = false;
   this.$get = ['$rootScope', '$exceptionHandler', function($rootScope, $exceptionHandler) {
     return qFactory(function(callback) {
       $rootScope.$evalAsync(callback);

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

@@ -25,6 +25,12 @@ angular.module("Bastion.content-credentials").factory("ContentCredential", [
             "ssl_key_products": "SSL Client Key"
         };
 
+        var acsTypeMap = {
+            "ssl_ca_alternate_content_sources": "SSL CA Cert",
+            "ssl_client_alternate_content_sources": "SSL Client Cert",
+            "ssl_key_alternate_content_sources": "SSL Client Key"
+        };
+
         function appendData(allData, fullCredential, usedAs) {
             angular.forEach(fullCredential, function(data) {
                 data.usedAs = usedAs;
@@ -53,6 +59,17 @@ angular.module("Bastion.content-credentials").factory("ContentCredential", [
                     params: { id: "auto_complete_search" }
                 },
                 update: { method: "PUT" },
+                acs: {
+                    method: "GET",
+                    transformResponse: function(data) {
+                        var allAcs = parseContentCredentialData(data, acsTypeMap);
+                        return {
+                            total: allAcs.length,
+                            subtotal: allAcs.length,
+                            results: allAcs
+                        };
+                    }
+                },
                 products: {
                     method: "GET",
                     transformResponse: function(data) {

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

@@ -52,6 +52,16 @@ angular.module('Bastion.content-credentials').config(['$stateProvider', function
             parent: 'content-credentials'
         }
     })
+    .state('content-credential.acs', {
+        url: '/alternate_content_sources',
+        permission: 'view_content_credentials',
+        controller: 'ContentCredentialACSController',
+        templateUrl: 'content-credentials/details/views/content-credential-acs.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Alternate Content Sources' | translate }}",
+            parent: 'content-credential.info'
+        }
+    })
     .state('content-credential.products', {
         url: '/products',
         permission: 'view_content_credentials',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-acs.controller.js

@@ -0,0 +1,36 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-credentials.controller:ContentCredentialACSController
+ *
+ * @requires $scope
+ * @requires Nutupane
+ * @requires ContentCredential
+ * @requires ApiErrorHandler
+ *
+ * @description
+ *   Page for Content Credential acs
+ */
+(function () {
+    function ContentCredentialACSController($scope, Nutupane, ContentCredential, ApiErrorHandler) {
+      var nutupane = new Nutupane(ContentCredential, {
+          id: $scope.$stateParams.contentCredentialId
+      }, 'acs');
+      $scope.controllerName = 'katello_content_credentials';
+      nutupane.primaryOnly = true;
+
+      $scope.panel = $scope.panel || {error: false, loading: false};
+
+      $scope.contentCredential = ContentCredential.get({id: $scope.$stateParams.contentCredentialId}, function () {
+          $scope.panel.error = false;
+          $scope.panel.loading = false;
+      }, function (response) {
+          $scope.panel.loading = false;
+          ApiErrorHandler.handleGETRequestErrors(response, $scope);
+      });
+
+      $scope.table = nutupane.table;
+  }
+
+    angular.module('Bastion.content-credentials').controller('ContentCredentialACSController', ContentCredentialACSController);
+    ContentCredentialACSController.$inject = ['$scope', 'Nutupane', 'ContentCredential', 'ApiErrorHandler'];
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-details.controller.js

@@ -40,9 +40,15 @@ angular.module('Bastion.content-credentials').controller('ContentCredentialDetai
         };
 
         $scope.removeContentCredential = function (contentCredential) {
-            contentCredential.$delete(function () {
+            var deferred = $q.defer();
+            contentCredential.$delete(function (response) {
+                deferred.resolve(response);
                 $scope.transitionTo('content-credentials');
+            }, function (response) {
+                deferred.reject(response);
+                Notification.setErrorMessage(response.data.displayMessage);
             });
+            return deferred.promise;
         };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-acs.html

@@ -0,0 +1,38 @@
+<span page-title ng-model="contentCredential">{{ 'Alternate Content Sources for ' | translate }} {{ contentCredential.name }}</span>
+
+<div data-extend-template="layouts/partials/table.html">
+  <span data-block="no-rows-message" translate>
+    You currently don't have any Alternate Content Sources associated with this Content Credential.
+  </span>
+
+  <div data-block="search">
+    <input type="text" class="form-control" stop-event="click"
+            placeholder="{{ 'Filter...' | translate }}"
+            ng-model="contentCredentialACSFilter"/>
+  </div>
+
+
+  <div data-block="table">
+    <table bst-table="table" class="table table-striped table-bordered">
+      <thead>
+        <tr bst-table-head>
+          <th bst-table-column="name" sortable><span translate>Name</span></th>
+          <th bst-table-column="usedAs" sortable><span translate>Used as</span></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="alternate_content_source in table.rows | filter:contentCredentialACSFilter">
+          <td bst-table-cell>
+            <a href="/alternate_content_sources/{{ alternate_content_source.id }}/details" target="_self">
+              {{ alternate_content_source.name }}
+            </a>
+          </td>
+          <td bst-table-cell>
+              {{ alternate_content_source.usedAs }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-details.html

@@ -27,6 +27,9 @@
       <li ng-class="{active: stateIncludes('content-credential.repositories')}">
         <a ui-sref="content-credential.repositories" translate>Repositories</a>
       </li>
+      <li ng-class="{active: stateIncludes('content-credential.acs')}">
+        <a ui-sref="content-credential.acs" translate>Alternate Content Sources</a>
+      </li>
     </ul>
   </nav>
 

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

@@ -26,8 +26,9 @@
         <th bst-table-column="name" sortable><span translate>Name</span></th>
         <th bst-table-column="organization"><span translate>Organization</span></th>
         <th bst-table-column="content_type"><span translate>Type</span></th>
-        <th bst-table-column="products" class="number-cell"><span translate>Product Count</span></th>
-        <th bst-table-column class="number-cell"><span translate>Repository Count</span></th>
+        <th bst-table-column="products" class="number-cell"><span translate>Products</span></th>
+        <th bst-table-column class="number-cell"><span translate>Repositories</span></th>
+        <th bst-table-column class="acs"><span translate>Alternate Content Sources</span></th>
       </tr>
       </thead>
 
@@ -47,6 +48,10 @@
             contentCredential.ssl_client_root_repos.length +
             contentCredential.ssl_key_root_repos.length || 0 }}
         </td>
+        <td bst-table-cell class="number-cell">{{ contentCredential.ssl_ca_alternate_content_sources.length +
+          contentCredential.ssl_client_alternate_content_sources.length +
+          contentCredential.ssl_client_key_alternate_content_sources.length || 0 }}
+      </td>
       </tr>
       </tbody>
     </table>

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

@@ -14,6 +14,7 @@
  * @requires CurrentOrganization
  * @requires ContentHostsHelper
  * @requires simpleContentAccessEnabled
+ * @requires newHostDetailsUI
  *
  * @description
  *   Provides the functionality specific to Content Hosts for use with the Nutupane UI pattern.
@@ -21,8 +22,8 @@
  *   within the table.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsController',
-    ['$scope', '$q', '$state', '$location', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'Notification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper', '$httpParamSerializer', 'simpleContentAccessEnabled',
-    function ($scope, $q, $state, $location, $uibModal, translate, Nutupane, Host, HostBulkAction, Notification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper, $httpParamSerializer, simpleContentAccessEnabled) {
+    ['$scope', '$q', '$state', '$location', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'Notification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper', '$httpParamSerializer', 'simpleContentAccessEnabled', 'newHostDetailsUI',
+    function ($scope, $q, $state, $location, $uibModal, translate, Nutupane, Host, HostBulkAction, Notification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper, $httpParamSerializer, simpleContentAccessEnabled, newHostDetailsUI) {
         var nutupane, params, query;
 
         if ($location.search().search) {
@@ -49,6 +50,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
         $scope.table = nutupane.table;
         $scope.nutupane = nutupane;
         $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
+        $scope.newHostDetailsUI = newHostDetailsUI;
 
         // @TODO begin hack necessary because of foreman API bug http://projects.theforeman.org/issues/13877
         $scope.table.sortBy = function (column) {

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

@@ -115,7 +115,7 @@
       <div class="divider"></div>
 
       <div style="display: inline-block"><h4 translate>System Purpose</h4></div>
-      <div style="display: inline-block"><i class="pficon-info" title="{{ 'System Purpose allows you to set the system\'s intended use on your network and improves the accuracy of auto attaching subscriptions.' | translate }}"></i></div>
+      <div style="display: inline-block"><i class="pficon-info" title="{{ 'System purpose enables you to set the system\'s intended use on your network and improves reporting accuracy in the Subscriptions service of the Red Hat Hybrid Cloud Console.' | translate }}"></i></div>
 
       <dl class="dl-horizontal dl-horizontal-left">
         <dt translate ng-hide="simpleContentAccessEnabled">System Purpose Status</dt>

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

@@ -99,9 +99,10 @@
         <tr bst-table-row ng-repeat="host in table.rows" row-select="host"
             ng-controller="ContentHostStatusController">
           <td bst-table-cell>
-            <a ui-sref="content-host.info({hostId: host.id})">
-              {{ host.name }}
-            </a>
+            <span ng-switch="newHostDetailsUI">
+              <a ng-switch-when="true" 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>
+            </span>
           </td>
           <td bst-table-cell ng-hide="simpleContentAccessEnabled">
             <span ng-class="table.getHostStatusIcon(host.subscription_global_status)">