katello 4.2.2 → 4.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cdba19f418c59dd75998081c306267defc02548958e1c48b38db4db29f2c633
-  data.tar.gz: 96f3ff300309604144e935295d3d8f859f757a694cde91768f773a63dfde1106
+  metadata.gz: bf975eaf437422cc7622770087b3b996c0834bb4d0077de55ed4748670c888d2
+  data.tar.gz: a6fbabac90eeed02b2b4a404e1c2d8af1cb245c083daf5981e2471ca035157b5
 SHA512:
-  metadata.gz: e793a484c717492274ee01345a14ccefb4ddad648a0db9b3615232a9b329f8681c1208ccabc21e382d7343bd5a812703db1a9840f59fe895bce42637a125c67f
-  data.tar.gz: f9a960acb16529071412b353e79c392cb0c79d8cb4f5f001d67b8ddc64056c80d8e9fd51ead49fce0d8f04918063ee95f31856608ddcef013eb22a70cb827f20
+  metadata.gz: d349265901e8142d15ad6ee35fcf6045bec5cbc8197799b9f8b8fac3edbdb29433a40f774345118a86a598587b5656e04aa9f20263cdb81ed388c9f373414a55
+  data.tar.gz: ee28f705628e3ff302918e2bf30ba5a78addc92454937fe43fc34ed2f48b4388f1f1294c630899884afb0d6071bc9ec733843b52175c1af5ef90160759d0f814

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

@@ -21,73 +21,6 @@ KT.common = (function() {
         escapeId: function(myid) {
             return myid.replace(/([ #;&,.%+*~\':"!\^$\[\]()=>|\/])/g,'\\$1');
         },
-        customConfirm : function (params) {
-          var settings = {
-              message: undefined,
-              warning_message: undefined,
-              yes_text: katelloI18n.yes,
-              no_text: katelloI18n.no,
-              yes_callback: function(){},
-              no_callback: function(){},
-              include_cancel: false
-          },
-          confirmTrue = true,
-          confirmFalse = false;
-
-          $.extend(settings, params);
-
-          var message = "<div style='margin:20px;'><span class='status_confirm_icon'/><div style='margin-left: 24px; display:table;height:1%;'>" + settings.message + "</div></div>",
-              warning_message = (settings.warning_message === undefined) ? undefined : "<div style='margin:20px;'><span class='icon-warning-sign'/><div style='margin-left: 24px; display:table;height:1%;color:red;'>" + settings.warning_message + "</div></div>",
-              html = (warning_message === undefined) ? message : "<div>"+message+warning_message+"</div>",
-              buttons = {
-                "Yes": {
-                  click : function () {
-                    $(this).dialog("close");
-                    $(this).dialog("destroy");
-                    settings.yes_callback();
-                    return confirmTrue;
-                  },
-                  'class' : 'button',
-                  'text' : settings.yes_text
-                },
-                "No": {
-                  click:function () {
-                    $(this).dialog("close");
-                    $(this).dialog("destroy");
-                    settings.no_callback();
-                    return confirmFalse;
-                  },
-                  'class' : 'button',
-                  'text' : settings.no_text
-                }
-              };
-
-          if(settings.include_cancel === true) {
-              buttons["Cancel"] = {
-                click:function () {
-                  $(this).dialog("close");
-                  $(this).dialog("destroy");
-                  return confirmFalse;
-                },
-                'class' : 'button',
-                'text' : katelloI18n.cancel
-              };
-          }
-
-          $(html).dialog({
-            closeOnEscape: true,
-            open: function (event, ui) {
-                $('.ui-dialog-titlebar-close').hide();
-                $('.confirmation').find('.ui-button')[1].focus();
-            },
-            modal: true,
-            resizable: false,
-            width: 450,
-            title: katelloI18n.confirmation,
-            dialogClass: "confirmation",
-            buttons: buttons
-          });
-        },
         customAlert : function(message) {
           var html = "<div style='margin:20px;'><span class='status_exclamation_icon'/><div style='margin-left: 24px; display:table;height:1%;'>" + message + "</div></div>";
           $(html).dialog({

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

@@ -100,30 +100,6 @@ if(!Object.keys) {
   };
 }
 
-
-//override the jQuery UJS $.rails.allowAction
-$.rails.allowAction = function(element) {
-    var message = element.data('confirm'),
-    answer = false, callback;
-    if (!message) { return true; }
-
-    if ($.rails.fire(element, 'confirm')) {
-        KT.common.customConfirm({
-            message: message,
-            yes_callback: function() {
-                callback = $.rails.fire(element, 'confirm:complete', [answer]);
-                if(callback) {
-                    var oldAllowAction = $.rails.allowAction;
-                    $.rails.allowAction = function() { return true; };
-                    element.trigger('click');
-                    $.rails.allowAction = oldAllowAction;
-                }
-            }
-        });
-    }
-    return false;
-};
-
 //make jQuery Contains case insensitive
 $.expr[':'].Contains = function(a, i, m) {
   return $(a).text().toUpperCase().indexOf(m[3].toUpperCase()) >= 0;
@@ -267,7 +243,4 @@ $(window).ready(function(){
     });
 
     window.alert = function(message){KT.common.customAlert(message);return false;};
-    $.rails.confirm = function(message) {
-        KT.common.customConfirm({message: message}); return false;
-    };
 });

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

@@ -1,6 +1,5 @@
 //= require "jquery-ui/widgets/dialog"
 //= require "jquery-ui/widgets/sortable"
-//= require "jquery-ui/widgets/tabs"
 //= require "jquery-ui/widgets/progressbar"
 //= require "jquery-ui/effect"
 //= require "jquery-ui/effect.all"

data/app/assets/stylesheets/katello/katello.scss

@@ -4,7 +4,6 @@
 
 @import "katello/fancyqueries";
 @import "katello/widgets/chosen";
-@import "katello/widgets/tabs";
 @import "katello/katello_sprites";
 
 @import "katello/contents";

data/app/controllers/katello/api/rhsm/candlepin_proxies_controller.rb

@@ -3,6 +3,8 @@ module Katello
   class Api::Rhsm::CandlepinProxiesController < Api::V2::ApiController
     include Katello::Authentication::ClientAuthentication
 
+    IF_MODIFIED_SINCE_HEADER = 'If-Modified-Since'.freeze
+
     before_action :disable_strong_params
 
     wrap_parameters false
@@ -71,9 +73,15 @@ module Katello
     end
 
     def get
-      r = Resources::Candlepin::Proxy.get(@request_path)
+      extra_headers = {}
+      modified_since = request.headers[IF_MODIFIED_SINCE_HEADER]
+      if modified_since.present?
+        extra_headers[IF_MODIFIED_SINCE_HEADER] = modified_since
+      end
+
+      r = Resources::Candlepin::Proxy.get(@request_path, extra_headers)
       logger.debug filter_sensitive_data(r)
-      render :json => r
+      render :json => r, :status => r.code
     end
 
     def delete

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

@@ -94,7 +94,8 @@ module Katello
       query = self.final_custom_index_relation(query) if self.respond_to?(:final_custom_index_relation)
 
       query = query.select(group).group(group) if group
-      sub_total = total.zero? ? 0 : scoped_search_total(query, group)
+      subtotal = total.zero? ? 0 : scoped_search_total(query, group)
+      selectable = total.zero? ? 0 : scoped_search_total_selectable(query, group)
 
       if options[:custom_sort]
         query = options[:custom_sort].call(query)
@@ -109,9 +110,20 @@ module Katello
       end
       page = params[:page] || 1
       per_page = params[:per_page] || Setting[:entries_per_page]
-      query = (total.zero? || sub_total.zero?) ? blank_query : query
+      query = (total.zero? || subtotal.zero?) ? blank_query : query
 
-      options[:csv] ? query : scoped_search_results(query, sub_total, total, page, per_page)
+      if options[:csv]
+        query
+      else
+        scoped_search_results(
+          query: query,
+          subtotal: subtotal,
+          total: total,
+          page: page,
+          per_page: per_page,
+          selectable: selectable
+        )
+      end
     rescue ScopedSearch::QueryNotSupported, ActiveRecord::StatementInvalid => error
       message = error.message
       if error.class == ActiveRecord::StatementInvalid
@@ -119,24 +131,38 @@ module Katello
         message = _('Your search query was invalid. Please revise it and try again. The full error has been sent to the application logs.')
       end
 
-      scoped_search_results(blank_query, 0, 0, page, per_page, message)
+      scoped_search_results(query: blank_query, page: page, per_page: per_page, error: message)
     end
 
     protected
 
-    def scoped_search_total(query, group)
+    def scoped_search_query(query, group)
       if group
-        query.select(group).group(group).length
+        query.select(group).group(group)
+      else
+        query
+      end
+    end
+
+    def scoped_search_total(query, group)
+      scoped_search_query(query, group).length
+    end
+
+    def scoped_search_total_selectable(query, group)
+      q = scoped_search_query(query, group)
+      if self.respond_to?(:total_selectable, true)
+        total_selectable(q)
       else
-        query.count
+        q.length
       end
     end
 
-    def scoped_search_results(query, sub_total, total, page, per_page, error = nil)
+    def scoped_search_results(query:, subtotal: 0, total: 0, page: 0, per_page: 0, error: nil, selectable: nil)
       {
         :results => query,
-        :subtotal => sub_total,
+        :subtotal => subtotal,
         :total => total,
+        :selectable => selectable.blank? ? total : selectable,
         :page => page,
         :per_page => per_page,
         :error => error

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

@@ -51,13 +51,19 @@ module Katello
     api :POST, '/capsules/:id/content/sync', N_('Synchronize the content to the smart proxy')
     param :id, Integer, :desc => N_('Id of the smart proxy'), :required => true
     param :environment_id, Integer, :desc => N_('Id of the environment to limit the synchronization on')
+    param :content_view_id, Integer, :desc => N_('Id of the content view to limit the synchronization on')
+    param :repository_id, Integer, :desc => N_('Id of the repository to limit the synchronization on')
     param :skip_metadata_check, :bool, :desc => N_('Skip metadata check on each repository on the smart proxy')
     def sync
       find_environment if params[:environment_id]
+      find_content_view if params[:content_view_id]
+      find_repository if params[:repository_id]
       skip_metadata_check = ::Foreman::Cast.to_bool(params[:skip_metadata_check])
       task = async_task(::Actions::Katello::CapsuleContent::Sync,
                         @capsule,
                         :environment_id => @environment.try(:id),
+                        :content_view_id => @content_view.try(:id),
+                        :repository_id => @repository.try(:id),
                         :skip_metadata_check => skip_metadata_check)
       respond_for_async :resource => task
     end
@@ -94,14 +100,14 @@ module Katello
     def find_editable_capsule
       @capsule = SmartProxy.unscoped.authorized(:manage_capsule_content).find(params[:id])
       unless @capsule&.pulp_mirror?
-        fail _("This request may only be performed on a Smart proxy that has the Pulp Node feature.")
+        fail _("This request may only be performed on a Smart proxy that has the Pulpcore feature with mirror=true.")
       end
     end
 
     def find_capsule
       @capsule = SmartProxy.unscoped.authorized(:view_capsule_content).find(params[:id])
       unless @capsule&.pulp_mirror?
-        fail _("This request may only be performed on a Smart proxy that has the Pulp Node feature.")
+        fail _("This request may only be performed on a Smart proxy that has the Pulpcore feature with mirror=true.")
       end
     end
 
@@ -109,6 +115,14 @@ module Katello
       @environment = Katello::KTEnvironment.readable.find(params[:environment_id])
     end
 
+    def find_content_view
+      @content_view = Katello::ContentView.readable.find(params[:content_view_id])
+    end
+
+    def find_repository
+      @repository = Katello::Repository.readable.find(params[:repository_id])
+    end
+
     def smart_proxy_service
       Pulp::SmartProxyRepository.new(@capsule)
     end

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

@@ -46,9 +46,17 @@ module Katello
       order_query = <<-SQL
          CAST (#{kcc}.composite_content_view_id as BOOLEAN) ASC, #{kc}.name
       SQL
-
       query = Katello::ContentView.readable.in_organization(@organization)
       query = query&.non_composite&.non_default
+      component_cv_ids = Katello::ContentViewComponent.where(composite_content_view_id: @view.id).select(:content_view_id)
+      query = case params[:status]
+              when "Not added"
+                query.where.not(id: component_cv_ids)
+              when "Added"
+                query.where(id: component_cv_ids)
+              else
+                query
+              end
       custom_sort = ->(sort_query) { sort_query.joins(join_query).order(order_query) }
       options = { resource_class: Katello::ContentView, custom_sort: custom_sort }
       collection = scoped_search(query, nil, nil, options)
@@ -134,6 +142,19 @@ module Katello
 
     private
 
+    def get_total(status)
+      case status
+      when 'All'
+        return Katello::ContentView.non_default.non_composite.in_organization(@organization).count
+      when 'Added'
+        return Katello::ContentViewComponent.where(composite_content_view_id: @view.id).count
+      when 'Not added'
+        return Katello::ContentView.non_default.non_composite.in_organization(@organization).count - Katello::ContentViewComponent.where(composite_content_view_id: @view.id).count
+      else
+        return Katello::ContentView.non_default.non_composite.in_organization(@organization).count
+      end
+    end
+
     def find_composite_content_view
       @view = ContentView.composite.non_default.readable.find_by(id: params[:composite_content_view_id])
       throw_resource_not_found(name: 'composite content view', id: params[:composite_content_view_id]) if @view.nil?

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

@@ -34,7 +34,7 @@ module Katello
     api :post, "/content_view_filters", N_("create a filter for a content view")
     param :content_view_id, :number, :desc => N_("content view identifier"), :required => true
     param :name, String, :desc => N_("name of the filter"), :required => true
-    param :type, String, :desc => N_("type of filter (e.g. rpm, package_group, erratum, docker, modulemd)"), :required => true
+    param :type, String, :desc => N_("type of filter (e.g. rpm, package_group, erratum, erratum_id, erratum_date, docker, modulemd)"), :required => true
     param :original_packages, :bool, :desc => N_("add all packages without errata to the included/excluded list. " \
                                                        "(package filter only)")
     param :original_module_streams, :bool, :desc => N_("add all module streams without errata to the included/excluded list. " \
@@ -43,6 +43,7 @@ module Katello
     param :repository_ids, Array, :desc => N_("list of repository ids")
     param :description, String, :desc => N_("description of the filter")
     def create
+      params[:type] = "erratum" if (params[:type] == "erratum_date" || params[:type] == "erratum_id")
       filter = ContentViewFilter.create_for(params[:type], filter_params.merge(:content_view => @view))
       respond :resource => filter
     end
@@ -82,6 +83,63 @@ module Katello
       respond_for_show :resource => @filter
     end
 
+    api :put, "/content_views/:content_view_id/filters/:id/remove_filter_rules", N_("bulk delete filter rules")
+    api :put, "/content_view_filters/:id/remove_filter_rules", N_("bulk delete filter rules")
+    param :content_view_id, :number, :desc => N_("content view identifier")
+    param :id, :number, :desc => N_("filter identifier"), :required => true
+    param :rule_ids, Array, of: :number, :desc => N_("filter identifiers"), :required => true
+    def remove_filter_rules
+      rule_clazz = ContentViewFilter.rule_class_for(@filter)
+      rule_clazz.where(id: params[:rule_ids]).try(:destroy_all)
+      respond_for_show(resource: @filter)
+    end
+
+    api :put, "/content_views/:content_view_id/filters/:id/add_filter_rules", N_("bulk add filter rules")
+    api :put, "/content_view_filters/:id/add_filter_rules", N_("bulk add filter rules")
+    param :content_view_id, :number, :desc => N_("content view identifier")
+    param :id, :number, :desc => N_("filter identifier"), :required => true
+    param :rules_params, Array, :desc => N_("Rules to be added"), :required => false do
+      param :name, Array, of: [String], :desc => N_("package, package group, or docker tag names")
+      param :uuid, String, :desc => N_("package group: uuid")
+      param :version, String, :desc => N_("package: version")
+      param :architecture, String, :desc => N_("package: architecture")
+      param :min_version, String, :desc => N_("package: minimum version")
+      param :max_version, String, :desc => N_("package: maximum version")
+      param :errata_id, String, :desc => N_("erratum: id")
+      param :errata_ids, Array, :desc => N_("erratum: IDs or a select all object")
+      param :start_date, String, :desc => N_("erratum: start date (YYYY-MM-DD)")
+      param :end_date, String, :desc => N_("erratum: end date (YYYY-MM-DD)")
+      param :types, Array, :desc => N_("erratum: types (enhancement, bugfix, security)")
+      param :date_type, String, :desc => N_("erratum: search using the 'Issued On' or 'Updated On' column of the errata. Values are 'issued'/'updated'")
+      param :module_stream_ids, Array, :desc => N_("module stream ids")
+    end
+    def add_filter_rules
+      rule_clazz = ContentViewFilter.rule_class_for(@filter)
+      rules = []
+      rules_params[:rules_params].each do |rule_params|
+        rules = (rule_params[:name] || []).map do |name|
+          rule_clazz.create!(rule_params.except(:name).merge(:filter => @filter, name: name))
+        end
+
+        rules += (rule_params[:errata_ids] || []).map do |errata_id|
+          rule_clazz.create!(rule_params.except(:errata_ids)
+                                 .merge(filter: @filter, errata_id: errata_id))
+        end
+        if rule_params[:module_stream_ids]
+          rules += (rule_params[:module_stream_ids] || []).map do |module_stream_id|
+            rule_clazz.create!(rule_params.except(:module_stream_ids)
+                                   .merge(filter: @filter, module_stream_id: module_stream_id))
+          end
+        end
+
+        if rules.empty?
+          rules = [rule_clazz.create!(rule_params.merge(:filter => @filter))]
+        end
+      end
+
+      respond_for_show(resource: @filter)
+    end
+
     private
 
     def find_readable_content_view
@@ -110,5 +168,11 @@ module Katello
     def filter_params
       params.require(:content_view_filter).permit(:name, :inclusion, :original_packages, :original_module_streams, :description, :repository_ids => [])
     end
+
+    def rules_params
+      params.permit(:id, :content_view_id, :rules_params => [:uuid, :version, :min_version, :max_version, :architecture,
+                                                             :errata_id, :start_date, :end_date, :date_type,
+                                                             :types => [], :module_stream_ids => [], :errata_ids => [], name: []])
+    end
   end
 end

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

@@ -64,7 +64,7 @@ module Katello
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
     param :description, String, :desc => N_("The description for the content view version"), :required => true
     def update
-      history = @content_view_version.history.publish.successful.first
+      history = @content_view_version.history.publish.first
       if history.blank?
         fail HttpErrors::BadRequest, _("This content view version doesn't have a history.")
       else
@@ -76,7 +76,11 @@ module Katello
 
     api :PUT, "/content_view_versions/:id/republish_repositories", N_("Forces a republish of the version's repositories' metadata")
     param :id, :number, :desc => N_("Content view version identifier"), :required => true
+    param :force, :bool, :desc => N_("Force metadata regeneration to proceed.  Dangerous when repositories use mirror on sync."), :required => true
     def republish_repositories
+      unless ::Foreman::Cast.to_bool(params[:force])
+        fail HttpErrors::BadRequest, _("Metadata republishing must be forced because it is a dangerous operation.")
+      end
       task = async_task(::Actions::Katello::ContentViewVersion::RepublishRepositories, @content_view_version)
       respond_for_async :resource => task
     end

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

@@ -145,13 +145,19 @@ module Katello
     param :system_environment_id, :number, :desc => N_("environment to reassign orphaned systems to")
     param :key_content_view_id, :number, :desc => N_("content view to reassign orphaned activation keys to")
     param :key_environment_id, :number, :desc => N_("environment to reassign orphaned activation keys to")
+    param :destroy_content_view, :boolean, :desc => N_("delete the content view with all the versions and environments")
     def remove
-      cv_envs = ContentViewEnvironment.where(:environment_id => params[:environment_ids],
-                                             :content_view_id => params[:id]
-                                            )
-      versions = @content_view.versions.where(:id => params[:content_view_version_ids])
+      if params[:destroy_content_view]
+        cv_envs = @content_view.content_view_environments
+        versions = @content_view.versions
+      else
+        cv_envs = ContentViewEnvironment.where(:environment_id => params[:environment_ids],
+                                               :content_view_id => params[:id]
+        )
+        versions = @content_view.versions.where(:id => params[:content_view_version_ids])
+      end
 
-      if cv_envs.empty? && versions.empty?
+      if !params[:destroy_content_view] && cv_envs.empty? && versions.empty?
         fail _("There either were no environments nor versions specified or there were invalid environments/versions specified. "\
                "Please check environment_ids and content_view_version_ids parameters.")
       end
@@ -159,7 +165,8 @@ module Katello
       options = params.slice(:system_content_view_id,
                              :system_environment_id,
                              :key_content_view_id,
-                             :key_environment_id
+                             :key_environment_id,
+                             :destroy_content_view
                             ).reject { |_k, v| v.nil? }.to_unsafe_h
       options[:content_view_versions] = versions
       options[:content_view_environments] = cv_envs

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

@@ -2,16 +2,89 @@ module Katello
   class Api::V2::DebsController < Api::V2::ApiController
     resource_description do
       name 'Deb Packages'
+      resource_id 'debs'
     end
-    apipie_concern_subst(:a_resource => N_("a deb"), :resource => "debs")
+    apipie_concern_subst(:a_resource => N_("a deb package"), :resource => "deb packages")
     include Katello::Concerns::Api::V2::RepositoryContentController
 
+    before_action :find_repositories, :only => [:auto_complete_name, :auto_complete_arch]
+    before_action :find_hosts, :only => :index
+
+    def auto_complete_name
+      page_size = Katello::Concerns::FilteredAutoCompleteSearch::PAGE_SIZE
+      debs = Deb.in_repositories(@repositories)
+      col = "#{Deb.table_name}.name"
+      debs = debs.where("#{Deb.table_name}.name ILIKE ?", "#{params[:term]}%").select(col).group(col).order(col).limit(page_size)
+      render :json => debs.pluck(col)
+    end
+
+    def auto_complete_arch
+      page_size = Katello::Concerns::FilteredAutoCompleteSearch::PAGE_SIZE
+      debs = Deb.in_repositories(@repositories)
+      col = "#{Deb.table_name}.architecture"
+      debs = debs.where("#{col} ILIKE ?", "%#{params[:term]}%").select(col).group(col).order(col).limit(page_size)
+      render :json => debs.pluck(col)
+    end
+
+    api :GET, "/debs", N_("List deb packages")
+    api :GET, "/content_views/:content_view_id/filters/:filter_id/debs", N_("List deb packages")
+    api :GET, "/content_view_filters/:content_view_filter_id/debs", N_("List deb packages")
+    api :GET, "/repositories/:repository_id/debs", N_("List deb packages")
+    param :organization_id, :number, :desc => N_("Organization identifier")
+    param :content_view_version_id, :number, :desc => N_("Content View Version identifier")
+    param :content_view_filter_id, :number, :desc => N_("Content View Filter identifier")
+    param :repository_id, :number, :desc => N_("Repository identifier")
+    param :environment_id, :number, :desc => N_("Environment identifier")
+    param :ids, Array, :desc => N_("Deb package identifiers to filter content by")
+    param :host_id, :number, :desc => N_("Host id to list applicable deb packages for")
+    param :packages_restrict_applicable, :boolean, :desc => N_("Return deb packages that are applicable to one or more hosts (defaults to true if host_id is specified)")
+    param :packages_restrict_upgradable, :boolean, :desc => N_("Return deb packages that are upgradable on one or more hosts")
+    param :available_for, String, :desc => N_("Return deb packages that can be added to the specified object.  Only the value 'content_view_version' is supported.")
+    param_group :search, ::Katello::Api::V2::ApiController
+    def index
+      super
+    end
+
     def default_sort
       %w(name asc)
     end
 
+    def available_for_content_view_version(version)
+      version.available_debs
+    end
+
+    def custom_index_relation(collection)
+      applicable = ::Foreman::Cast.to_bool(params[:packages_restrict_applicable]) || params[:host_id]
+      upgradable = ::Foreman::Cast.to_bool(params[:packages_restrict_upgradable])
+
+      if upgradable
+        collection = collection.installable_for_hosts(@hosts)
+      elsif applicable
+        collection = collection.applicable_to_hosts(@hosts)
+      end
+
+      collection
+    end
+
     private
 
+    def find_hosts
+      @hosts = ::Host::Managed.authorized("view_hosts")
+      if params[:host_id]
+        @hosts = @hosts.where(:id => params[:host_id])
+        fail HttpErrors::NotFound, _('Could not find a host with id %s') % params[:host_id] if @hosts.empty?
+      end
+      @hosts = @hosts.where(:organization_id => params[:organization_id]) if params[:organization_id]
+    end
+
+    def find_repositories
+      @repositories = Repository.readable.where(:id => params[:repoids])
+    end
+
+    def resource_class
+      Katello::Deb
+    end
+
     def repo_association
       :repository_id
     end

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

@@ -31,19 +31,13 @@ module Katello
       collection = filter_by_content_view(filter, collection)
       ids = Katello::ContentViewErratumFilterRule.where(:content_view_filter_id => filter.id).pluck("errata_id")
       collection = collection.where("errata_id not in (?)", ids) unless ids.empty?
-
-      date_type = params[:date_type].present? ? params[:date_type] : ContentViewErratumFilterRule::UPDATED
-      unless ContentViewErratumFilterRule::DATE_TYPES.include?(date_type)
-        msg = _("Invalid params provided - date_type must be one of %s" % ContentViewErratumFilterRule::DATE_TYPES.join(","))
-        fail HttpErrors::UnprocessableEntity, msg
-      end
-
-      collection = collection.where("#{date_type} >= ?", params[:start_date]) if params[:start_date]
-      collection = collection.where("#{date_type} <= ?", params[:end_date]) if params[:end_date]
-      collection = collection.of_type(params[:types]) if params[:types]
       collection
     end
 
+    def all_for_content_view_filter(filter, _collection)
+      Erratum.joins(:repositories).merge(filter.applicable_repos)
+    end
+
     def custom_index_relation(collection)
       collection = filter_by_cve(params[:cve], collection) if params[:cve]
       applicable = ::Foreman::Cast.to_bool(params[:errata_restrict_applicable]) || @host
@@ -57,6 +51,15 @@ module Katello
           collection = collection.applicable_to_hosts(hosts)
         end
       end
+      date_type = params[:date_type].present? ? params[:date_type] : ContentViewErratumFilterRule::UPDATED
+      unless ContentViewErratumFilterRule::DATE_TYPES.include?(date_type)
+        msg = _("Invalid params provided - date_type must be one of %s" % ContentViewErratumFilterRule::DATE_TYPES.join(","))
+        fail HttpErrors::UnprocessableEntity, msg
+      end
+
+      collection = collection.where("#{date_type} >= ?", params[:start_date]) if params[:start_date]
+      collection = collection.where("#{date_type} <= ?", params[:end_date]) if params[:end_date]
+      collection = collection.of_type(params[:types]) if params[:types]
       collection
     end
 

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

@@ -1,5 +1,6 @@
 module Katello
   class Api::V2::FileUnitsController < Api::V2::ApiController
+    include Katello::Concerns::FilteredAutoCompleteSearch
     resource_description do
       name 'Files'
     end

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

@@ -1,6 +1,6 @@
 module Katello
   class Api::V2::GenericContentUnitsController < Api::V2::ApiController
-    Katello::RepositoryTypeManager.generic_content_types(enabled_only: false).each do |type|
+    Katello::RepositoryTypeManager.generic_content_types(false).each do |type|
       apipie_concern_subst(:a_resource => N_(type), :resource_id => type.pluralize)
       resource_description do
         name type.pluralize.titleize