katello 3.8.0.rc1 → 3.8.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b618c5ea8ea521a3bc6e5c240bb41675162b2a7
-  data.tar.gz: 7ee6a2bc9a14c84fb699d749cc05b5956a72ef0b
+  metadata.gz: a29f4138e7efc30092c57d2d41cba2daa63d8f96
+  data.tar.gz: 2d6286442b855654c1baaa52db2c96946b153c39
 SHA512:
-  metadata.gz: 03e1ed24d9276d21a18323c34be085e1970eff16c2b999e252733b1da420170d54c2689bbb993cc7b68fb75322fb3994089615ecaac7c29efb10a4085637b8f3
-  data.tar.gz: 6f5ebc555ebcaadc3b6653979195e0959cc63259327c8dff05c33df1d635081ec97a80a33d0dcc359fdf9156680d0fc14e981c610979fe2590b6a1426aea816f
+  metadata.gz: 98f1753327006589d1804417424b7b5252bbe60ba35cef2cac87a8b2f5088548dbfeedc5212f88d70240b97f7b80c12fad55e87c9d1985fae771120baff2bb39
+  data.tar.gz: d7fed987e7d06d564e141b5675c08be8dc960f8b0f2e87531f3ef2268bf72250b228c518d4f6cc04ca261d4be69e166b88556ce760e5d0d6c3bf9b57fc0aef46

data/app/assets/javascripts/katello/common/index.js

@@ -1,3 +1,4 @@
+//= require bastion/lodash/lodash
 //= require "katello/common/katello.global"
 //= require "katello/common/katello.common.js"
 //= require "katello/common/katello"

data/app/assets/javascripts/katello/sync_management/index.js

@@ -1,2 +1,3 @@
 //= require "katello/jquery.treeTable"
+//= require "katello/common/katello.common.js"
 //= require "katello/sync_management/sync_management"

data/app/controllers/katello/api/registry/registry_proxies_controller.rb

@@ -449,7 +449,7 @@ module Katello
     end
 
     def confirm_settings
-      return true if SETTINGS[:katello][:registry]
+      return true if SETTINGS[:katello][:container_image_registry]
       render_error('custom_error', :status => :not_found,
                    :locals => { :message => "Registry not configured" })
       false

data/app/controllers/katello/api/v2/environments_controller.rb

@@ -104,7 +104,6 @@ module Katello
       fail HttpErrors::BadRequest, _("Can't update the '%s' environment") % "Library" if @environment.library? && update_params.empty?
       update_params[:name] = params[:environment][:new_name] if params[:environment][:new_name]
       @environment.update_attributes!(update_params)
-      @environment.update_container_repositories(update_params[:registry_unauthenticated_pull]) if update_params.key? :registry_unauthenticated_pull
       if update_params[:registry_name_pattern]
         task = send(async ? :async_task : :sync_task, ::Actions::Katello::Environment::PublishRepositories,
                     @environment, content_type: Katello::Repository::DOCKER_TYPE)

data/app/controllers/katello/api/v2/ostree_branches_controller.rb

@@ -4,7 +4,7 @@ module Katello
     include Katello::Concerns::Api::V2::RepositoryContentController
 
     def default_sort
-      %w(version_date desc)
+      %w(version desc)
     end
 
     private

data/app/controllers/katello/api/v2/repository_sets_controller.rb

@@ -17,6 +17,7 @@ module Katello
     param :product_id, :number, :required => true, :desc => N_("ID of a product to list repository sets from")
     param :name, String, :required => false, :desc => N_("Repository set name to search on")
     param :enabled, :bool, :required => false, :desc => N_("If true, only return repository sets that have been enabled. Defaults to false")
+    param :with_active_subscription, :bool, :required => false, :desc => N_("If true, only return repository sets that are associated with an active subscriptions")
     param_group :search, Api::V2::ApiController
     def index
       respond(:collection => scoped_search(index_relation, nil, nil, :custom_sort => default_sort,
@@ -92,7 +93,15 @@ module Katello
         relation = @product.displayable_product_contents
       end
 
-      relation = relation.enabled(@organization) if ::Foreman::Cast.to_bool(params[:enabled])
+      if ::Foreman::Cast.to_bool(params[:enabled])
+        relation = relation.enabled(@organization)
+      elsif ::Foreman::Cast.to_bool(params[:with_active_subscription])
+        relation = relation.with_valid_subscription(@organization)
+      else
+        relation = relation.where(:id => Katello::ProductContent.with_valid_subscription(@organization)).or(
+            relation.where(:id => Katello::ProductContent.enabled(@organization)))
+      end
+
       relation = relation.where(Katello::Content.table_name => {:name => params[:name]}) if params[:name].present?
       relation.redhat
     end

data/app/controllers/katello/remote_execution_controller.rb

@@ -15,6 +15,12 @@ module Katello
         end
       end
 
+      # to overcome the isolated namespace engine difficulties with paths
+      helper Rails.application.routes.url_helpers
+      def _routes
+        Rails.application.routes
+      end
+
       private
 
       def prepare_composer
@@ -43,12 +49,6 @@ module Katello
         # getting packageInstall from UI, translating to 'katello_package_install' feature
         "katello_#{params[:remote_action].underscore}"
       end
-
-      # to overcome the isolated namespace engine difficulties with paths
-      helper Rails.application.routes.url_helpers
-      def _routes
-        Rails.application.routes
-      end
     end
   else
     class RemoteExecutionController < ApplicationController

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -72,6 +72,12 @@ module Katello
       return selected_host_group.content_view if selected_host_group.present?
     end
 
+    def fetch_content_source(host, options = {})
+      return host.content_source if host.content_source.present?
+      selected_host_group = options.fetch(:selected_host_group, nil)
+      return selected_host_group.content_source if selected_host_group.present?
+    end
+
     def accessible_lifecycle_environments(org, host)
       selected = host.lifecycle_environment
       envs = org.kt_environments.readable
@@ -97,24 +103,28 @@ module Katello
       end
     end
 
-    def lifecycle_environment_options(host, options = {})
+    # Generic method to provide a list of options in the UI
+    def content_options(host, selected_id, object_type, options = {})
       include_blank = options.fetch(:include_blank, nil)
       include_blank = '<option></option>' if include_blank == true #check for true specifically
-
-      selected_id = fetch_lifecycle_environment(host, options).try(:id)
       orgs = relevant_organizations(host)
       all_options = []
       orgs.each do |org|
-        env_options = ""
-        accessible_lifecycle_environments(org, host).each do |env|
-          selected = selected_id == env.id ? 'selected' : ''
-          env_options << %(<option value="#{env.id}" class="kt-env" #{selected}>#{h(env.name)}</option>)
+        content_object_options = ""
+        accessible_content_objects = if object_type == :lifecycle_environment
+                                       accessible_lifecycle_environments(org, host)
+                                     elsif object_type == :content_source
+                                       accessible_content_proxies(host)
+                                     end
+        accessible_content_objects.each do |content_object|
+          selected = selected_id == content_object.id ? 'selected' : ''
+          content_object_options << %(<option value="#{content_object.id}" class="kt-env" #{selected}>#{h(content_object.name)}</option>)
         end
 
         if orgs.count > 1
-          all_options << %(<optgroup label="#{org.name}">#{env_options}</optgroup>)
+          all_options << %(<optgroup label="#{org.name}">#{content_object_options}</optgroup>)
         else
-          all_options << env_options
+          all_options << content_object_options
         end
       end
 
@@ -123,6 +133,24 @@ module Katello
       all_options.html_safe
     end
 
+    def lifecycle_environment_options(host, options = {})
+      content_options(
+        host,
+        fetch_lifecycle_environment(host, options).try(:id),
+        :lifecycle_environment,
+        options
+      )
+    end
+
+    def content_source_options(host, options = {})
+      content_options(
+        host,
+        fetch_content_source(host, options).try(:id),
+        :content_source,
+        options
+      )
+    end
+
     def content_views_for_host(host, options)
       include_blank = options.fetch(:include_blank, nil)
       if include_blank == true #check for true specifically

data/app/lib/katello/resources/registry.rb

@@ -18,13 +18,13 @@ module Katello
       end
 
       class RegistryResource < HttpResource
-        if SETTINGS[:katello][:registry]
-          cfg = SETTINGS[:katello][:registry]
-          url = cfg[:url]
+        if SETTINGS[:katello][:container_image_registry]
+          cfg = SETTINGS[:katello][:container_image_registry]
+          url = cfg[:crane_url]
           uri = URI.parse(url)
           self.prefix = uri.path
           self.site = "#{uri.scheme}://#{uri.host}:#{uri.port}"
-          self.ca_cert_file = cfg[:ca_cert_file]
+          self.ca_cert_file = cfg[:crane_ca_cert_file]
         end
 
         class << self

data/app/models/katello/authorization/repository.rb

@@ -21,9 +21,10 @@ module Katello
     module ClassMethods
       def readable
         in_products = Repository.where(:product_id => Katello::Product.authorized(:view_products)).select(:id)
+        in_environments = Repository.where(:environment_id => Katello::KTEnvironment.authorized(:view_lifecycle_environments)).select(:id)
         in_content_views = Repository.joins(:content_view_repositories).where("#{ContentViewRepository.table_name}.content_view_id" => Katello::ContentView.readable).select(:id)
         in_versions = Repository.joins(:content_view_version).where("#{Katello::ContentViewVersion.table_name}.content_view_id" => Katello::ContentView.readable).select(:id)
-        where("#{self.table_name}.id in (?) or #{self.table_name}.id in (?) or #{self.table_name}.id in (?)", in_products, in_content_views, in_versions)
+        where("#{self.table_name}.id in (?) or #{self.table_name}.id in (?) or #{self.table_name}.id in (?) or #{self.table_name}.id in (?)", in_products, in_content_views, in_versions, in_environments)
       end
 
       def deletable

data/app/models/katello/content_view.rb

@@ -579,14 +579,22 @@ module Katello
 
     def check_composite_action_allowed!(env)
       if composite? && Setting['restrict_composite_view']
-        # verify that the composite's component view versions exist in the target environment.
+        if components.size != content_view_components.size
+          fail _("Make sure all the component content views are published before publishing/promoting the composite content view. "\
+               "This restriction is optional and can be modified in the Administrator -> Settings -> Content "\
+                "page using the restrict_composite_view flag.")
+        end
+
+        env_ids = env.try(:pluck, 'id') || []
+        env_ids << env.id unless env_ids.size > 0
         components.each do |component|
-          unless component.environments.include?(env)
+          component_environment_ids = component.environments.pluck('id')
+          unless (env_ids - component_environment_ids).empty?
             fail _("The action requested on this composite view cannot be performed until all of the "\
                    "component content view versions have been promoted to the target environment: %{env}.  "\
-                   "This restriction is optional and can be modified in the Administrator -> Settings "\
+                   "This restriction is optional and can be modified in the Administrator -> Settings -> Content "\
                    "page using the restrict_composite_view flag.") %
-                   { :env => env.name }
+                   { :env => env.try(:pluck, 'name') || env.name }
           end
         end
       end

data/app/models/katello/glue/candlepin/owner.rb

@@ -39,14 +39,6 @@ module Katello
         self.owner_details['contentAccessMode']
       end
 
-      def pools(consumer_uuid = nil)
-        if consumer_uuid
-          Resources::Candlepin::Owner.pools self.label, :consumer => consumer_uuid
-        else
-          Resources::Candlepin::Owner.pools self.label
-        end
-      end
-
       def generate_debug_cert
         Resources::Candlepin::Owner.generate_ueber_cert(label)
       end

data/app/models/katello/glue/candlepin/pool.rb

@@ -40,6 +40,16 @@ module Katello
         end
         pool.import_data(index_hosts)
       end
+
+      def stacking_subscription(org_label, stacking_id)
+        org = Organization.find_by(:label => org_label)
+        subscription = ::Katello::Subscription.find_by(:organization_id => org.id, :cp_id => stacking_id)
+        if subscription.nil?
+          found_product = ::Katello::Resources::Candlepin::Product.find_for_stacking_id(org_label, stacking_id)
+          subscription = ::Katello::Subscription.find_by(:organization_id => org.id, :cp_id => found_product['id']) if found_product
+        end
+        subscription
+      end
     end
 
     module InstanceMethods
@@ -80,16 +90,6 @@ module Katello
         providers.any?
       end
 
-      def stacking_subscription(org_label, stacking_id)
-        org = Organization.find_by(:label => org_label)
-        subscription = ::Katello::Subscription.find_by(:organization_id => org.id, :product_id => stacking_id)
-        if subscription.nil?
-          found_product = ::Katello::Resources::Candlepin::Product.find_for_stacking_id(org_label, stacking_id)
-          subscription = ::Katello::Subscription.find_by(:organization_id => org.id, :cp_id => found_product['id']) if found_product
-        end
-        subscription
-      end
-
       # rubocop:disable MethodLength,Metrics/AbcSize
       def import_data(index_hosts_and_activation_keys = false)
         pool_attributes = {}.with_indifferent_access
@@ -101,7 +101,7 @@ module Katello
         product_attributes.map { |attr| pool_attributes[attr["name"].underscore.to_sym] = attr["value"] }
 
         if pool_json["sourceStackId"]
-          subscription = stacking_subscription(pool_json['owner']['key'], pool_json["sourceStackId"])
+          subscription = Pool.stacking_subscription(pool_json['owner']['key'], pool_json["sourceStackId"])
         else
           subscription = ::Katello::Subscription.find_by(:cp_id => pool_json["productId"])
         end

data/app/models/katello/kt_environment.rb

@@ -221,12 +221,6 @@ module Katello
       self.repositories.readable.where(:content_type => Katello::Repository::PUPPET_TYPE)
     end
 
-    def update_container_repositories(registry_unauthenticated_pull)
-      self.repositories.readable.where(:content_type => Katello::Repository::DOCKER_TYPE).each do |repository|
-        repository.update_attributes!(registry_unauthenticated_pull: registry_unauthenticated_pull)
-      end
-    end
-
     def as_json(_options = {})
       to_ret = self.attributes
       to_ret['prior'] = self.prior && self.prior.name

data/app/models/katello/product_content.rb

@@ -12,7 +12,6 @@ module Katello
 
     scope :displayable, -> {
       joins(:content).where.not("#{content_table_name}.content_type IN (?)", Katello::Repository.undisplayable_types)
-      .order("LOWER(#{content_table_name}.name) ASC")
     }
 
     scope :redhat, -> {
@@ -32,6 +31,10 @@ module Katello
       joins(:content).where("#{self.content_table_name}.cp_content_id" => Katello::Repository.in_organization(organization).select(:content_id))
     end
 
+    def self.with_valid_subscription(organization)
+      where(:product_id => Katello::PoolProduct.where(:pool_id => organization.pools).select(:product_id))
+    end
+
     # used by Katello::Api::V2::RepositorySetsController#index
     def repositories
       product.repositories.in_default_view.has_url.where(:content_id => content.cp_content_id)

data/app/models/katello/rpm.rb

@@ -222,15 +222,23 @@ module Katello
     end
 
     def self.installable_for_hosts(hosts = nil)
-      query = Katello::Rpm.joins(:content_facet_applicable_rpms).joins(:repository_rpms).
+      hosts = ::Host.where(:id => hosts) if hosts && hosts.is_a?(Array)
+
+      query = Katello::Rpm.joins(:content_facet_applicable_rpms).
         joins("INNER JOIN #{Katello::ContentFacetRepository.table_name} on \
         #{Katello::ContentFacetRepository.table_name}.content_facet_id = #{Katello::ContentFacetApplicableRpm.table_name}.content_facet_id").
         joins("INNER JOIN #{Katello::RepositoryRpm.table_name} AS host_repo_rpm ON \
-          host_repo_rpm.rpm_id = #{Katello::Rpm.table_name}.id").
-        where("#{Katello::ContentFacetRepository.table_name}.repository_id = host_repo_rpm.repository_id")
+          host_repo_rpm.rpm_id = #{Katello::Rpm.table_name}.id AND \
+          #{Katello::ContentFacetRepository.table_name}.repository_id = host_repo_rpm.repository_id")
 
-      query = query.joins(:content_facets).where("#{Katello::Host::ContentFacet.table_name}.host_id" => hosts.map(&:id)) if hosts
-      query.distinct
+      if hosts
+        query = query.where("#{Katello::ContentFacetRepository.table_name}.content_facet_id" => hosts.joins(:content_facet)
+                                .select("#{Katello::Host::ContentFacet.table_name}.id"))
+      else
+        query = query.joins(:content_facet_applicable_rpms)
+      end
+
+      query
     end
 
     def self.applicable_to_hosts(hosts)

data/app/services/katello/ui_notifications/pulp/proxy_disk_space.rb

@@ -5,7 +5,9 @@ module Katello
         class << self
           def deliver!
             SmartProxy.unscoped.with_content.each do |proxy|
-              percentage = proxy.statuses[:pulp].storage['pulp_dir']['percent']
+              status = proxy.statuses[:pulp] || proxy.statuses[:pulpnode]
+              next unless (percentage = status&.storage&.dig('pulp_dir', 'percent'))
+
               if percentage[0..2].to_i < 90 && notification_already_exists?(proxy)
                 blueprint.notifications.where(subject: proxy).destroy_all
               elsif update_notifications(proxy).empty? && percentage[0..2].to_i > 90

data/app/views/overrides/activation_keys/_host_environment_select.html.erb

@@ -35,12 +35,11 @@ end %>
 <% cs_select_name =  using_hostgroups_page? ? 'hostgroup[content_source_id]' : 'host[content_facet_attributes][content_source_id]' %>
 <% cs_select_attr = using_hostgroups_page? ? 'content_source' : 'content_facet.content_source' %>
 
-<% proxies = accessible_content_proxies(@host || @hostgroup) %>
 <%= field(f, cs_select_attr, {:label => _("Content Source")}) do
   if using_hostgroups_page?
-    select_tag cs_select_id, options_from_collection_for_select(proxies, :id, :name, @hostgroup.content_source_id), :data => {"spinner_path" => spinner_path},
+    select_tag cs_select_id, content_source_options(@hostgroup, :selected_host_group => @hostgroup.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_source)), :data => {"spinner_path" => spinner_path},
                :class => 'form-control',  :name => cs_select_name, include_blank: true
   else
-    select_tag cs_select_id, options_from_collection_for_select(proxies, :id, :name, (@hostgroup || @host).content_source_id), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cs_select_name, include_blank: true
+    select_tag cs_select_id, content_source_options(@host, :selected_host_group => @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_source)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cs_select_name, include_blank: true
   end
 end %>

data/config/katello.yaml.example

@@ -71,6 +71,11 @@
   #    :user: login
   #    :password: password
 
+  # Internal configuration for communication from server to pulp crane service.
+  :container_image_registry:
+    :crane_url: https://localhost:5000
+    :crane_ca_cert_file: /etc/pki/katello/certs/katello-server-ca.crt
+
 # Logging configuration can be changed by uncommenting the loggers
 # section and the logger configuration desired.
 #

data/config/routes.rb

@@ -23,4 +23,5 @@ Katello::Engine.routes.draw do
 
   match '/xui' => 'react#index', :via => [:get]
   match '/xui/*page' => 'react#index', :via => [:get]
+  match '/organization_select' => 'react#index', :via => [:get]
 end

data/db/seeds.d/75-job_templates.rb

@@ -7,10 +7,13 @@ if Katello.with_remote_execution?
         sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
         # import! was renamed to import_raw! around 1.3.1
         if JobTemplate.respond_to?('import_raw!')
-          JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
         else
-          JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
         end
+
+        template.organizations << Organization.unscoped.all if template && template.organizations.empty?
+        template.locations << Location.unscoped.all if template && template.locations.empty?
       end
     end
   end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-details.html

@@ -24,16 +24,51 @@
 
   <dl class="dl-horizontal dl-horizontal-left">
     <dt translate>Unauthenticated Pull</dt>
-    <dd bst-edit-checkbox="environment.registry_unauthenticated_pull"
-        formatter="booleanToYesNo"
-        on-save="save(environment)"
-        readonly="denied('edit_lifecycle_environments', environment)">
+    <dd>
+      <div bst-edit-checkbox="environment.registry_unauthenticated_pull"
+           formatter="booleanToYesNo"
+           on-save="save(environment)"
+           readonly="denied('edit_lifecycle_environments', environment)">
+      </div>
+      <div bst-alert='info'>
+        <span translate>
+          Determines whether to require login to pull container images in this lifecycle environment.
+        </span>
+      </div>
     </dd>
     <dt translate>Registry Name Pattern</dt>
-    <dd bst-edit-textarea="environment.registry_name_pattern"
-        on-save="save(environment)"
-        readonly="denied('edit_lifecycle_environments', environment)">
+    <dd>
+      <div bst-edit-textarea="environment.registry_name_pattern"
+           on-save="save(environment)"
+           readonly="denied('edit_lifecycle_environments', environment)">
+      </div>
+      <div bst-alert='info'>
+        <span translate>
+          The <i>Registry Name Pattern</i> overrides the default name by which container images may be pulled from the server. (By default this name is a combination of Organization, Lifecycle Environment, Content View, Product, and Repository labels.)
+
+          <br/><br/>The name may be constructed using ERB syntax. Variables available for use are:
+
+          <pre>
+organization.name
+organization.label
+repository.name
+repository.label
+repository.docker_upstream_name
+repository.url
+content_view.label
+content_view.name
+content_view.version
+product.name
+product.label
+lifecycle_environment.name
+lifecycle_environment.label</pre>
+
+          Examples:
+            <pre>
+&lt;%= organization.label %&gt;-&lt;%= lifecycle_environment.label %&gt;-&lt;%= content_view.label %&gt;-&lt;%= product.label %&gt;-&lt;%= repository.label %&gt;
+&lt;%= organization.label %&gt;/&lt;%= repository.docker_upstream_name %&gt;</pre>
+        </span>
+      </div>
     </dd>
   </dl>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery.controller.js

@@ -17,8 +17,8 @@
  *   Provides the functionality for the repo discovery action pane.
  */
 angular.module('Bastion.products').controller('DiscoveryController',
-    ['$scope', '$q', '$timeout', '$http', 'Notification', 'Task', 'Organization', 'CurrentOrganization', 'DiscoveryRepositories', 'translate',
-    function ($scope, $q, $timeout, $http, Notification, Task, Organization, CurrentOrganization, DiscoveryRepositories, translate) {
+    ['$scope', '$q', '$timeout', '$http', '$filter', 'Notification', 'Task', 'Organization', 'CurrentOrganization', 'DiscoveryRepositories', 'translate',
+    function ($scope, $q, $timeout, $http, $filter, Notification, Task, Organization, CurrentOrganization, DiscoveryRepositories, translate) {
         var transformRows, setDiscoveryDetails;
 
         $scope.discovery = {
@@ -50,6 +50,21 @@ angular.module('Bastion.products').controller('DiscoveryController',
             $scope.table.resource.subtotal = $scope.table.resource.total;
         };
 
+        $scope.filteredRows = function (filter) {
+            var rows, idx;
+            angular.forEach($scope.table.rows, function (row) {
+                row.unselectable = true;
+            });
+            rows = $filter('filter')($scope.table.rows.slice(), filter);
+            angular.forEach(rows, function (row) {
+                idx = $scope.table.rows.indexOf(row);
+                $scope.table.rows[idx].unselectable = false;
+            });
+            $scope.table.getSelected();
+
+            return (rows);
+        };
+
         $scope.setupSelected = function () {
             var url;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html

@@ -44,7 +44,7 @@
 
     <div bst-form-group ng-show="createRepoChoices.newProduct === 'true' && contentCredentials.length !== 0"
          label="{{ 'GPG Key' | translate }}">
-      <select class="form-control" ng-model="createRepoChoices.product.content_credential_id"
+      <select class="form-control" ng-model="createRepoChoices.product.gpg_key_id"
               ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials"/>
     </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery.html

@@ -101,7 +101,7 @@
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="urlRow in table.rows | filter:tableFilter" row-select="urlRow">
+        <tr bst-table-row ng-repeat="urlRow in filteredRows(tableFilter)" row-select="urlRow">
           <td bst-table-cell style="white-space:nowrap">{{ urlRow.path }}</td>
         </tr>
       </tbody>

data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/bastion_katello.scss

@@ -38,3 +38,8 @@
 .bottom-padded-content {
   padding-bottom: 10%;
 }
+
+.modal-body .uib-time input {
+  width: 100%;
+  padding-right: 6px;
+}

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.8.0.rc1".freeze
+  VERSION = "3.8.0.rc2".freeze
 end

data/package.json

@@ -9,7 +9,9 @@
     "test:current": "jest webpack --watch",
     "format": "prettier --single-quote --trailing-comma es5 --write 'webpack/**/*.js'",
     "build": "npm run format && npm run lint",
-    "lint": "eslint --fix webpack/ || exit 0"
+    "lint": "eslint webpack/ || exit 0",
+    "lint:fix": "eslint --fix webpack/ || exit 0",
+    "lint:test": "npm run lint && npm test"
   },
   "repository": {
     "type": "git",
@@ -22,11 +24,11 @@
     "@storybook/react": "^3.2.17",
     "@storybook/storybook-deployer": "^2.0.0",
     "babel-core": "^6.26.3",
-    "babel-jest": "^21.2.0",
+    "babel-jest": "^23.4.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-preset-env": "^1.6.0",
     "babel-polyfill": "^6.26.0",
+    "babel-preset-env": "^1.6.0",
     "babel-preset-react": "^6.24.1",
     "enzyme": "^3.2.0",
     "enzyme-adapter-react-16": "^1.1.0",
@@ -34,11 +36,11 @@
     "eslint": "^4.8.0",
     "eslint-config-airbnb": "^16.0.0",
     "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-jest": "^21.2.0",
+    "eslint-plugin-jest": "^21.18.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-react": "^7.4.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^21.2.1",
+    "jest": "^23.4.1",
     "prettier": "^1.7.4",
     "react-test-renderer": "^16.0.0",
     "redux-mock-store": "^1.3.0",
@@ -53,10 +55,10 @@
     "jed": "^1.1.1",
     "lodash": "^4.17.5",
     "patternfly": "^3.41.1",
-    "patternfly-react": "2.5.1",
+    "patternfly-react": "^2.5.1",
     "prop-types": "^15.6.0",
     "react": "^16.3.1",
-    "react-bootstrap": "^0.31.5",
+    "react-bootstrap": "^0.32.1",
     "react-bootstrap-tooltip-button": "^1.0.6",
     "react-dom": "^16.3.1",
     "react-ellipsis-with-tooltip": "^1.0.7",
@@ -68,10 +70,12 @@
     "seamless-immutable": "^7.1.2"
   },
   "jest": {
+    "testURL": "http://localhost/",
     "setupFiles": [
       "raf/polyfill",
       "./webpack/test_setup.js"
     ],
+    "setupTestFrameworkScriptFile": "./webpack/global_test_setup.js",
     "testPathIgnorePatterns": [
       "/node_modules/",
       "<rootDir>/foreman/",

data/webpack/__mocks__/foremanReact/components/BreadcrumbBar.js

@@ -0,0 +1,3 @@
+
+const BreadcrumbsBar = () => jest.fn();
+export default BreadcrumbsBar;

data/webpack/__mocks__/foremanReact/redux/actions/toasts.js

@@ -0,0 +1,8 @@
+export const addToast = toast => ({
+  type: 'TOASTS_ADD',
+  payload: {
+    message: toast,
+  },
+});
+
+export default addToast;