katello 3.5.2 → 3.6.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.module.js

@@ -18,7 +18,9 @@ angular.module('Bastion.repositories', [
     'Bastion.packages',
     'Bastion.products',
     'Bastion.docker-manifests',
-    'Bastion.files'
+    'Bastion.docker-manifest-lists',
+    'Bastion.files',
+    'Bastion.debs'
 ]);
 
 angular.module('Bastion.repositories').run(['$rootScope', '$state', '$stateParams',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.routes.js

@@ -108,6 +108,15 @@
                 parent: 'product.repository.info'
             }
         })
+        .state('product.repository.manage-content.docker-manifest-lists', {
+            url: '/content/docker_manifest_lists',
+            permission: 'view_products',
+            templateUrl: 'products/details/repositories/details/views/repository-manage-docker-manifest-lists.html',
+            ncyBreadcrumb: {
+                label: "{{'Docker Manifest Lists' | translate }}",
+                parent: 'product.repository.info'
+            }
+        })
         .state('product.repository.manage-content.files', {
             url: '/content/files',
             permission: 'view_products',
@@ -125,6 +134,15 @@
                 label: "{{'OSTree Branches' | translate }}",
                 parent: 'product.repository.info'
             }
+        })
+        .state('product.repository.manage-content.debs', {
+            url: '/content/debs',
+            permission: 'view_products',
+            templateUrl: 'products/details/repositories/details/views/repository-manage-debs.html',
+            ncyBreadcrumb: {
+                label: "{{'Debs' | translate }}",
+                parent: 'product.repository.info'
+            }
         });
 
         $stateProvider.state('product.repository.tasks', {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html

@@ -38,8 +38,8 @@
       <div data-block="modal-body"
            translate
            translate-n="table.numSelected"
-           translate-plural="Remove {{ table.numSelected }} repositories?">
-        Are you sure you want to remove {{ table.getSelected()[0].name }}?
+           translate-plural="Are you sure you want to remove {{ table.getSelected().length }} repositories?">
+        Are you sure you want to remove the {{ table.getSelected()[0].name }} repository?
       </div>
     </div>
 
@@ -115,6 +115,12 @@
                 </a>
               </div>
 
+              <div>
+                <span translate ng-show="repository.content_counts.srpm > 0">
+                  {{ repository.content_counts.srpm }} Source RPMs
+                </span>
+              </div>
+
               <div>
                 <a ui-sref="errata({repositoryId: repository.id})" translate>
                   {{ repository.content_counts.erratum || 0 }} Errata
@@ -134,6 +140,11 @@
                   {{ repository.content_counts.docker_manifest || 0 }} Docker Manifests
                 </a>
               </div>
+              <div>
+                <a ui-sref="product.repository.manage-content.docker-manifest-lists({productId: product.id, repositoryId: repository.id})" translate>
+                  {{ repository.content_counts.docker_manifest_list || 0 }} Docker Manifest Lists
+                </a>
+              </div>
               <div>
                 <a ui-sref="product.repository.manage-content.docker-manifests({productId: product.id, repositoryId: repository.id})" translate>
                   {{ repository.content_counts.docker_tag || 0 }} Docker Tags
@@ -157,6 +168,14 @@
               </div>
             </span>
 
+            <span ng-show="repository.content_type == 'deb'">
+              <div>
+                <a translate ui-sref="product.repository.manage-content.debs({productId: product.id, repositoryId: repository.id})">
+                  {{ repository.content_counts.deb || 0 }} deb Packages
+                </a>
+              </div>
+            </span>
+
           </td>
         </tr>
       </tbody>

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

@@ -137,6 +137,8 @@ angular.module('Bastion.products').controller('DiscoveryController',
             };
 
             Organization.repoDiscover(params, function (task) {
+                // Hide pagination
+                $scope.table.resource['per_page'] = false;
                 $scope.taskSearchId = Task.registerSearch({ 'type': 'task', 'task_id': task.id }, $scope.updateTask);
             });
         };

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

@@ -95,6 +95,14 @@ angular.module('Bastion.products').controller('ProductsController',
             ProductBulkAction.syncProducts(getBulkParams(), success, bulkError);
         };
 
+        $scope.goToDiscoveries = function () {
+            nutupane.table.rows = [];
+            nutupane.table.resource.results = [];
+            nutupane.table.resource.total = 0;
+            nutupane.table.resource.subtotal = 0;
+            $state.go("product-discovery.scan");
+        };
+
         $scope.openSyncPlanModal = function () {
             nutupane.invalidate();
             $uibModal.open({

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

@@ -15,7 +15,7 @@
     </button>
 
     <button type="button" class="btn btn-default"
-            ui-sref="product-discovery.scan"
+            ng-click="goToDiscoveries()"
             bst-feature-flag="custom_products"
             ng-show="permitted('edit_products')">
       <span translate>Repo Discovery</span>
@@ -56,8 +56,8 @@
             <div data-block="modal-body"
                  translate
                  translate-n="table.getSelected().length"
-                 translate-plural="Are you sure you want to remove {{ table.getSelected().length }} products selected?">
-              Are you sure you want to remove {{ table.getSelected()[0].name }}?
+                 translate-plural="Are you sure you want to remove {{ table.getSelected().length }} products?">
+              Are you sure you want to remove the {{ table.getSelected()[0].name }} product?
             </div>
           </div>
         </li>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/subscription-details.controller.js

@@ -53,6 +53,6 @@ angular.module('Bastion.subscriptions').controller('SubscriptionDetailsControlle
             return "";
         };
 
-        $scope.virtWhoToolTip = translate("If the virt-who field is Yes then the subscription requires the use of virt-who. Learn how to configure and use this tool at the <a href=\"https://access.redhat.com/articles/subscription-management-satellite-6\">Subscription Management Home Page</a>.");
+        $scope.virtWhoToolTip = translate("If the virt-who field is Yes then the subscription requires the use of virt-who. Learn how to configure and use this tool in the <a href=\"https://access.redhat.com/documentation/en/red-hat-satellite/6.2/single/virtual-instances-guide/\">Virtual Instances Guide</a>.");
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import.html

@@ -78,7 +78,7 @@
 
   <div bst-alert="info" ng-if="details.virt_who">
     <span translate>
-      The uploaded manifest contains subscriptions that require the use of virt-who. Learn how to configure and use this tool at the <a href="https://access.redhat.com/articles/subscription-management-satellite-6">Subscription Management Home Page</a>.
+      The uploaded manifest contains subscriptions that require the use of virt-who. Learn how to configure and use this tool in the <a href="https://access.redhat.com/documentation/en/red-hat-satellite/6.2/single/virtual-instances-guide/">Virtual Instances Guide</a>.
     </span>
   </div>
 </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/new/new-sync-plan.controller.js

@@ -18,6 +18,7 @@ angular.module('Bastion.sync-plans').controller('NewSyncPlanController',
 
             $scope.syncPlan = new SyncPlan();
             $scope.syncPlan.interval = $scope.intervals[0].id;
+            $scope.syncPlan.startDate = new Date();
 
             function success(syncPlan) {
                 $scope.working = false;

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

@@ -6,6 +6,7 @@
   @import "errata";
   @import "subscriptions";
   @import "host_subscriptions";
+  @import "docker";
 
   a {
     &.confined-text {

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

@@ -0,0 +1,16 @@
+@import "bastion/variables";
+
+.registry-image-tag {
+    border: 1px solid #ccc;
+    border-radius: 3px;
+    white-space: nowrap;
+    overflow: hidden;
+    background-color: #fff;
+    margin-left: 2px;
+    text-align: center;
+    font-weight: normal;
+    display: inline;
+    padding: 0 5px;
+    -webkit-border-radius: 3;
+    -moz-border-radius: 3;
+}

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -20,6 +20,7 @@ module BastionKatello
           activation_keys
           content_hosts
           content_views
+          debs
           docker_tags
           files
           ostree_branches

data/lib/katello/engine.rb

@@ -3,10 +3,10 @@ module Katello
     isolate_namespace Katello
 
     initializer 'katello.selective_params_parser', :before => :build_middleware_stack do |app|
-      require 'katello/params_parser_wrapper'
-      app.middleware.swap(
-        ActionDispatch::ParamsParser,
-        Katello::ParamsParserWrapper,
+      require 'katello/prevent_json_parsing'
+      app.middleware.insert_after(
+        Rack::MethodOverride,
+        Katello::PreventJsonParsing,
         ->(env) { env['PATH_INFO'] =~ /consumers/ && env['PATH_INFO'] =~ /profile|packages/ }
       )
     end
@@ -28,8 +28,6 @@ module Katello
         :pulp => {
           :default_login => 'admin',
           :url => 'https://localhost/pulp/api/v2/',
-          :oauth_key => 'katello',
-          :oauth_secret => 'katello',
           :bulk_load_size => 100,
           :skip_checksum_validation => false,
           :upload_chunk_size => 1_048_575, # upload size in bytes to pulp. see SSLRenegBufferSize in apache

data/lib/katello/permission_creator.rb

@@ -72,9 +72,9 @@ module Katello
                    'katello/api/v2/content_view_puppet_modules' => [:index, :show, :auto_complete_search],
                    'katello/api/v2/content_view_versions' => [:index, :show, :auto_complete_search],
                    'katello/api/v2/content_view_components' => [:index, :show],
-                   'katello/api/v2/package_groups' => [:index, :show],
-                   'katello/api/v2/errata' => [:index, :show],
-                   'katello/api/v2/puppet_modules' => [:index, :show],
+                   'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
+                   'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare, :available_errata],
+                   'katello/api/v2/puppet_modules' => [:index, :show, :auto_complete_search, :compare],
                    'katello/content_views' => [:auto_complete, :auto_complete_search],
                    'katello/errata' => [:short_details, :auto_complete],
                    'katello/packages' => [:details, :auto_complete],
@@ -145,7 +145,7 @@ module Katello
     def gpg_key_permissions
       @plugin.permission :view_gpg_keys,
                          {
-                           'katello/api/v2/gpg_keys' => [:index, :show, :auto_complete_search]
+                           'katello/api/v2/gpg_keys' => [:index, :show, :content, :auto_complete_search]
                          },
                          :resource_type => 'Katello::GpgKey'
       @plugin.permission :create_gpg_keys,
@@ -155,7 +155,7 @@ module Katello
                          :resource_type => 'Katello::GpgKey'
       @plugin.permission :edit_gpg_keys,
                          {
-                           'katello/api/v2/gpg_keys' => [:update, :content]
+                           'katello/api/v2/gpg_keys' => [:update, :set_content]
                          },
                          :resource_type => 'Katello::GpgKey'
       @plugin.permission :destroy_gpg_keys,
@@ -222,14 +222,16 @@ module Katello
                            'katello/products' => [:auto_complete, :auto_complete_search],
                            'katello/api/v2/products' => [:index, :show, :auto_complete_search],
                            'katello/api/v2/repositories' => [:index, :show, :repository_types, :auto_complete_search, :cancel],
-                           'katello/api/v2/packages' => [:index, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch],
-                           'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search],
-                           'katello/api/v2/docker_manifests' => [:index, :show, :auto_complete_search],
-                           'katello/api/v2/docker_tags' => [:index, :show, :auto_complete_search, :auto_complete_name],
-                           'katello/api/v2/file_units' => [:index, :show, :auto_complete_search],
-                           'katello/api/v2/ostree_branches' => [:index, :show, :auto_complete_search],
+                           'katello/api/v2/packages' => [:index, :show, :auto_complete_search, :auto_complete_name, :auto_complete_arch, :compare],
+                           'katello/api/v2/debs' => [:index, :show, :auto_complete_search],
+                           'katello/api/v2/package_groups' => [:index, :show, :auto_complete_search, :compare],
+                           'katello/api/v2/docker_manifests' => [:index, :show, :auto_complete_search, :compare],
+                           'katello/api/v2/docker_manifest_lists' => [:index, :show, :auto_complete_search, :compare],
+                           'katello/api/v2/docker_tags' => [:index, :show, :auto_complete_search, :auto_complete_name, :compare],
+                           'katello/api/v2/file_units' => [:index, :show, :auto_complete_search, :compare],
+                           'katello/api/v2/ostree_branches' => [:index, :show, :auto_complete_search, :compare],
                            'katello/api/v2/errata' => [:index, :show, :auto_complete_search, :compare],
-                           'katello/api/v2/puppet_modules' => [:index, :show, :auto_complete_search],
+                           'katello/api/v2/puppet_modules' => [:index, :show, :auto_complete_search, :compare],
                            'katello/errata' => [:short_details, :auto_complete],
                            'katello/packages' => [:details, :auto_complete],
                            'katello/puppet_modules' => [:show],

data/lib/katello/permissions/host_permissions.rb

@@ -42,6 +42,7 @@ Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'katello/api/v2/host_subscriptions/index',
   'katello/api/v2/host_subscriptions/events',
   'katello/api/v2/host_subscriptions/product_content',
+  'katello/api/v2/hosts_bulk_actions/applicable_errata',
   'katello/api/v2/hosts_bulk_actions/installable_errata',
   'katello/api/v2/hosts_bulk_actions/available_incremental_updates',
   'katello/api/v2/host_packages/index',

data/lib/katello/plugin.rb

@@ -3,15 +3,8 @@ require 'katello/permission_creator'
 Foreman::Plugin.register :katello do
   requires_foreman '>= 1.16'
 
-  sub_menu :top_menu, :content_menu, :caption => N_('Content'), :after => :monitor_menu do
-    menu :top_menu,
-         :environments,
-         :caption => N_('Lifecycle Environments'),
-         :url => '/lifecycle_environments',
-         :url_hash => {:controller => 'katello/api/v2/environments',
-                       :action => 'index'},
-         :engine => Katello::Engine,
-         :turbolinks => false
+  sub_menu :top_menu, :content_menu, :caption => N_('Content'),
+           :icon => 'fa fa-book', :after => :monitor_menu do
     menu :top_menu,
          :red_hat_subscriptions,
          :caption => N_('Red Hat Subscriptions'),
@@ -20,16 +13,7 @@ Foreman::Plugin.register :katello do
                        :action => 'index'},
          :engine => Katello::Engine,
          :turbolinks => false
-    menu :top_menu,
-         :activation_keys,
-         :caption => N_('Activation Keys'),
-         :url => '/activation_keys',
-         :url_hash => {:controller => 'katello/api/v2/activation_keys',
-                       :action => 'index'},
-         :engine => Katello::Engine,
-         :turbolinks => false
 
-    divider :top_menu, :parent => :content_menu
     menu :top_menu,
          :redhat_provider,
          :caption => N_('Red Hat Repositories'),
@@ -56,7 +40,15 @@ Foreman::Plugin.register :katello do
          :engine => Katello::Engine,
          :turbolinks => false
 
-    divider :top_menu, :parent => :content_menu
+    menu :top_menu,
+         :sync_plans,
+         :caption => N_('Sync Plans'),
+         :url => '/sync_plans',
+         :url_hash => {:controller => 'katello/api/v2/sync_plans',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false
+
     menu :top_menu,
          :sync_status,
          :caption => N_('Sync Status'),
@@ -65,16 +57,17 @@ Foreman::Plugin.register :katello do
          :engine => Katello::Engine,
          :turbolinks => false
 
+    divider :top_menu, :caption => N_('Lifecycle'), :parent => :content_menu
+
     menu :top_menu,
-         :sync_plans,
-         :caption => N_('Sync Plans'),
-         :url => '/sync_plans',
-         :url_hash => {:controller => 'katello/api/v2/sync_plans',
+         :environments,
+         :caption => N_('Lifecycle Environments'),
+         :url => '/lifecycle_environments',
+         :url_hash => {:controller => 'katello/api/v2/environments',
                        :action => 'index'},
          :engine => Katello::Engine,
          :turbolinks => false
 
-    divider :top_menu, :parent => :content_menu
     menu :top_menu,
          :content_views,
          :caption => N_('Content Views'),
@@ -84,30 +77,22 @@ Foreman::Plugin.register :katello do
          :engine => Katello::Engine,
          :turbolinks => false
 
-    divider :top_menu, :parent => :content_menu
     menu :top_menu,
-         :errata,
-         :caption => N_('Errata'),
-         :url => '/errata',
-         :url_hash => {:controller => 'katello/api/v2/errata',
+         :activation_keys,
+         :caption => N_('Activation Keys'),
+         :url => '/activation_keys',
+         :url_hash => {:controller => 'katello/api/v2/activation_keys',
                        :action => 'index'},
          :engine => Katello::Engine,
          :turbolinks => false
 
-    menu :top_menu,
-         :packages,
-         :caption => N_('Packages'),
-         :url => '/packages',
-         :url_hash => {:controller => 'katello/api/v2/packages',
-                       :action => 'index'},
-         :engine => Katello::Engine,
-         :turbolinks => false
+    divider :top_menu, :caption => N_('Content Types'), :parent => :content_menu
 
     menu :top_menu,
-         :puppet_modules,
-         :caption => N_('Puppet Modules'),
-         :url => '/puppet_modules',
-         :url_hash => {:controller => 'katello/api/v2/puppet_modules',
+         :debs,
+         :caption => N_('Deb Packages'),
+         :url => '/debs',
+         :url_hash => {:controller => 'katello/api/v2/debs',
                        :action => 'index'},
          :engine => Katello::Engine,
          :turbolinks => false
@@ -121,6 +106,15 @@ Foreman::Plugin.register :katello do
          :engine => Katello::Engine,
          :turbolinks => false
 
+    menu :top_menu,
+         :errata,
+         :caption => N_('Errata'),
+         :url => '/errata',
+         :url_hash => {:controller => 'katello/api/v2/errata',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false
+
     menu :top_menu,
          :files,
          :caption => N_('Files'),
@@ -138,6 +132,24 @@ Foreman::Plugin.register :katello do
                        :action => 'index'},
          :engine => Katello::Engine,
          :turbolinks => false
+
+    menu :top_menu,
+         :packages,
+         :caption => N_('Packages'),
+         :url => '/packages',
+         :url_hash => {:controller => 'katello/api/v2/packages',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false
+
+    menu :top_menu,
+         :puppet_modules,
+         :caption => N_('Puppet Modules'),
+         :url => '/puppet_modules',
+         :url_hash => {:controller => 'katello/api/v2/puppet_modules',
+                       :action => 'index'},
+         :engine => Katello::Engine,
+         :turbolinks => false
   end
 
   menu :top_menu,
@@ -148,7 +160,7 @@ Foreman::Plugin.register :katello do
                      :action => 'index'},
        :engine => Katello::Engine,
        :parent => :hosts_menu,
-       :after => :hosts,
+       :after => :newhost,
        :turbolinks => false
 
   menu :top_menu,
@@ -162,6 +174,15 @@ Foreman::Plugin.register :katello do
        :after => :content_hosts,
        :turbolinks => false
 
+  menu :labs_menu,
+       :experimental_ui,
+       :url => '/xui',
+       :url_hash => {:controller => 'katello/react',
+                     :action => 'index'},
+       :caption => N_('Content Experimental UI'),
+       :parent => :lab_features_menu,
+       :turbolinks => false
+
   allowed_template_helpers :subscription_manager_configuration_url
   search_path_override("Katello") do |resource|
     "/#{Katello::Util::Model.model_to_controller_path(resource)}/auto_complete_search"
@@ -244,22 +265,30 @@ Foreman::Plugin.register :katello do
                   'bastion/bastion/index_ie should have a permission that grants access'
                 ])
 
-  in_to_prepare do
-    add_controller_action_scope(HostsController, :index) do |base_scope|
-      base_scope
-        .preload(:content_view, :lifecycle_environment, :subscription_facet)
-        .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
-    end
-
-    add_controller_action_scope(Api::V2::HostsController, :index) do |base_scope|
-      base_scope
-        .preload(:content_view, :lifecycle_environment, :subscription_facet)
-        .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
-    end
+  add_controller_action_scope(HostsController, :index) do |base_scope|
+    base_scope
+      .preload(:content_view, :lifecycle_environment, :subscription_facet)
+      .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
+  end
+
+  add_controller_action_scope(Api::V2::HostsController, :index) do |base_scope|
+    base_scope
+      .preload(:content_view, :lifecycle_environment, :subscription_facet)
+      .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
   end
 
   register_info_provider Katello::Host::InfoProvider
 
   Katello::PermissionCreator.new(self).define
   add_all_permissions_to_default_roles
+
+  role 'Register hosts', [
+    :view_hostgroups, :view_activation_keys, :view_hosts,
+    :create_hosts, :edit_hosts, :destroy_hosts,
+    :view_content_views, :view_gpg_keys, :view_subscriptions,
+    :attach_subscriptions, :view_host_collections,
+    :view_organizations, :view_lifecycle_environments, :view_products,
+    :view_locations, :view_domains, :view_architectures,
+    :view_operatingsystems
+  ]
 end