katello 4.3.0.rc1 → 4.3.0.rc2

data/app/views/foreman/job_templates/install_errata.erb

@@ -2,14 +2,14 @@
 kind: job_template
 name: Install Errata - Katello SSH Default
 job_category: Katello
-description_format: 'Install errata %{errata}'
+description_format: 'Install errata %{Errata search query}'
 feature: katello_errata_install
 provider_type: SSH
 template_inputs:
-- name: errata
-  description: A comma separated list of errata to install
+- name: Errata search query
+  description: Filter criteria for errata to be installed.
   input_type: user
-  required: true
+  required: false
 foreign_input_sets:
 - template: Package Action - SSH Default
   exclude: action,package
@@ -19,6 +19,8 @@ foreign_input_sets:
     <% advisories = input(:errata).split(',').join(' ') %>
     <%= render_template('Package Action - SSH Default', :action => 'install -n -t patch', :package => advisories) %>
 <% else %>
-    <% advisories = input(:errata).split(',').map { |e| "--advisory=#{e}" }.join(' ') %>
+    <% advisory_ids = @host.advisory_ids(search: input("Errata search query")) %>
+
+    <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') %>
     <%= render_template('Package Action - SSH Default', :action => 'update-minimal', :package => advisories) %>
-<% end %>
+<% end %>

data/app/views/foreman/job_templates/resolve_traces.erb

@@ -6,15 +6,14 @@ description_format: 'Resolve Traces'
 feature: katello_host_tracer_resolve
 provider_type: SSH
 template_inputs:
-- name: ids
-  description: A comma-separated list of trace IDs to resolve
+- name: Traces search query
+  description: Search query to provide traces to resolve
   input_type: user
-  required: true
+  required: false
 %>
 
 <%
-ids = input(:ids).split(',').map { |split| split.strip.to_i }
-commands = @host.traces_helpers(ids)
+commands = @host.traces_helpers(search: input('Traces search query'))
 reboot = commands.delete('reboot')
 -%>
 <% if reboot -%>

data/app/views/foreman/job_templates/resolve_traces_-_katello_ansible_default.erb

@@ -5,18 +5,16 @@ model: JobTemplate
 job_category: Katello via Ansible
 description_format: Resolve Traces
 template_inputs:
-- name: ids
-  description: A comma-separated list of trace IDs to resolve
+- name: Traces search query
+  description: Search query to provide traces to resolve
   input_type: user
   required: true
-  advanced: false
 provider_type: Ansible
 kind: job_template
 %>
 
 <%
-ids = input(:ids).split(',').map { |split| split.strip.to_i }
-commands = @host.traces_helpers(ids)
+commands = @host.traces_helpers(search: input('Traces search query'))
 reboot = commands.delete('reboot')
 -%>
 <%= render_template(

data/app/views/foreman/smart_proxies/_content_sync.html.erb

@@ -19,6 +19,13 @@
   </div>
 
   <br>
+  <div ng-hide="syncStatus.unsyncable_content_types.length == 0">
+    <span translate>
+      Pulp plugin missing for synchronizable content types: <b>{{ syncStatus.unsyncable_content_types.join(", ") }}.</b><br />
+      Repositories containing these content types will not be synced.
+    </span>
+  </div>
+
   <div ng-show="syncState.is(syncState.SYNCING, syncState.SYNC_TRIGGERED, syncState.CANCEL_TRIGGERED)">
     <a ng-click="cancelSync()" class="btn btn-default" ng-disabled="!syncState.is(syncState.SYNCING)">
       <span translate>Cancel Sync</span>

data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl

@@ -2,6 +2,10 @@ object @capsule
 
 attribute :last_sync_time
 
+node :unsyncable_content_types do
+  ::Katello::SmartProxyHelper.new(@capsule).unsyncable_content_types
+end
+
 child :active_sync_tasks => :active_sync_tasks do
   extends 'foreman_tasks/api/tasks/show'
 end

data/app/views/katello/api/v2/{organizations/cdn_configuration.rabl → cdn_configurations/show.json.rabl}

@@ -1 +1,5 @@
 attributes :url, :username, :upstream_organization_label, :ssl_ca_credential_id
+
+node :password_exists do |config|
+  config.password.present?
+end

data/app/views/katello/api/v2/content_facet/show.json.rabl

@@ -25,6 +25,14 @@ child :content_facet => :content_facet_attributes do
   node :katello_tracer_installed do |content_facet|
     content_facet.tracer_installed?
   end
+
+  node :katello_agent_enabled do
+    Katello.with_katello_agent?
+  end
+
+  node :remote_execution_by_default do
+    Katello.remote_execution_by_default?
+  end
 end
 
 attributes :description, :facts

data/app/views/katello/api/v2/content_view_filters/show.json.rabl

@@ -14,7 +14,6 @@ child :content_view => :content_view do
 
     node :content_counts do |repo|
       {
-        :ostree_branch => repo.ostree_branches.count,
         :docker_manifest => repo.docker_manifests.count,
         :docker_tag => repo.docker_tags.count,
         :rpm => repo.rpms.count,

data/app/views/katello/api/v2/content_views/base.json.rabl

@@ -17,7 +17,7 @@ node :next_version do |content_view|
 end
 
 child :last_task => :last_task do |_task|
-  attributes :id
+  attributes :id, :started_at
   attributes :result => :result
   node :last_sync_words do |object|
     if object.try(:started_at)

data/app/views/katello/api/v2/host_packages/base.json.rabl

@@ -2,3 +2,5 @@ object @resource
 
 attributes :id, :name
 attributes :nvrea, :nvra
+attributes :upgradable_version
+attributes :rpm_id

data/app/views/katello/api/v2/organizations/show.json.rabl

@@ -16,7 +16,7 @@ node :owner_details do |org|
 end
 
 node :cdn_configuration do |org|
-  partial('katello/api/v2/organizations/cdn_configuration', object: org.cdn_configuration)
+  partial('katello/api/v2/cdn_configurations/show', object: org.cdn_configuration)
 end
 
 node :default_content_view_id do |org|

data/app/views/katello/api/v2/repositories/show.json.rabl

@@ -21,8 +21,6 @@ glue(@resource.root) do
 
   attributes :product_type
   attributes :upstream_username
-  attributes :ostree_upstream_sync_policy, :ostree_upstream_sync_depth
-  attributes :compute_ostree_upstream_sync_depth => :computed_ostree_upstream_sync_depth
   attributes :deb_releases, :deb_components, :deb_architectures
   attributes :http_proxy_policy
   attributes :http_proxy_id
@@ -53,7 +51,6 @@ glue(@resource.root) do
   end
 end
 
-attributes :ostree_branch_names => :ostree_branches
 attributes :relative_path
 attributes :promoted? => :promoted
 attributes :content_view_version_id, :library_instance_id

data/config/routes/api/v2.rb

@@ -14,8 +14,6 @@ Katello::Engine.routes.draw do
         # re-routes alphabetical
         ##############################
 
-        root :to => 'root#resource_list'
-
         api_resources :capsules, :only => [:index, :show] do
           member do
             resource :content, :only => [], :controller => 'capsule_content' do
@@ -162,13 +160,6 @@ Katello::Engine.routes.draw do
           end
         end
 
-        api_resources :ostree_branches, :only => [:index, :show] do
-          collection do
-            get :auto_complete_search
-            get :compare
-          end
-        end
-
         api_resources :debs, :only => [:index, :show] do
           collection do
             get :auto_complete_search
@@ -417,7 +408,6 @@ Katello::Engine.routes.draw do
           Katello::RepositoryTypeManager.generic_content_types(false).each do |type|
             api_resources type.pluralize.to_sym, :only => [:index, :show], :controller => 'generic_content_units', :content_type => type
           end
-          api_resources :ostree_branches, :only => [:index, :show]
 
           api_resources :content_uploads, :controller => :content_uploads, :only => [:create, :destroy, :update]
 

data/db/migrate/20211115215210_drop_ostree_branches.rb

@@ -0,0 +1,13 @@
+class DropOstreeBranches < ActiveRecord::Migration[6.0]
+  def up
+    drop_table :katello_repository_ostree_branches
+    drop_table :katello_ostree_branches
+
+    remove_column :katello_root_repositories, :ostree_upstream_sync_policy
+    remove_column :katello_root_repositories, :ostree_upstream_sync_depth
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js

@@ -9,9 +9,7 @@ BASTION_MODULES.push(
     'Bastion.docker-tags',
     'Bastion.files',
     'Bastion.ansible-collections',
-    'Bastion.ostree-branches',
     'Bastion.hosts',
-    'Bastion.ostree-branches',
     'Bastion.module-streams',
     'Bastion.environments',
     'Bastion.content-credentials',

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

@@ -40,9 +40,6 @@
 //= require "bastion_katello/ansible-collections/ansible-collections.module.js"
 //= require_tree "./ansible-collections"
 
-//= require "bastion_katello/ostree-branches/ostree-branches.module.js"
-//= require_tree "./ostree-branches"
-
 //= require "bastion_katello/debs/debs.module.js"
 //= require_tree "./debs"
 

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

@@ -130,16 +130,6 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
             parent: 'content-view.version.details'
         }
     })
-    .state('content-view.version.ostree-branches', {
-        url: '/ostree_branches',
-        permission: 'view_content_views',
-        controller: 'ContentViewVersionContentController',
-        templateUrl: 'content-views/versions/views/content-view-version-ostree-branches.html',
-        ncyBreadcrumb: {
-            label: '{{ "OSTree Branches" | translate }}',
-            parent: 'content-view.version.details'
-        }
-    })
     .state('content-view.version.module-streams', {
         url: '/module_streams',
         permission: 'view_content_views',

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

@@ -74,9 +74,6 @@
             <div translate ng-if="version.docker_tag_count && version.docker_tag_count > 0">
               {{ version.docker_tag_count }} Container Image Tags
             </div>
-            <div translate ng-if="version.ostree_branch_count && version.ostree_branch_count > 0">
-              {{ version.ostree_branch_count }} OSTree Branches
-            </div>
             <div translate ng-if="version.file_count && version.file_count > 0">
               {{ version.file_count }} Files
             </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version-content.controller.js

@@ -52,16 +52,6 @@
                 type: Erratum,
                 repositoryType: 'yum'
             },
-            'ostree-branches': {
-                type: OstreeBranch,
-                repositoryType: 'ostree',
-                params: {
-                    'content_type': "ostree",
-                    'content_view_version_id': $scope.$stateParams.versionId,
-                    'sort_by': 'version',
-                    'sort_order': 'DESC'
-                }
-            },
             'module-streams': {
                 type: ModuleStream,
                 repositoryType: 'yum',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-versions.module.js

@@ -15,7 +15,6 @@ angular.module('Bastion.content-views.versions', [
     'Bastion.packages',
     'Bastion.errata',
     'Bastion.package-groups',
-    'Bastion.ostree-branches',
     'Bastion.module-streams',
     'Bastion.files',
     'Bastion.debs'

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

@@ -71,13 +71,6 @@
       </a>
     </li>
 
-    <li ng-class="{active: isState('content-view.version.ostree-branches')}"
-        ng-show="version.ostree_branch_count !== 0">
-      <a ui-sref="content-view.version.ostree-branches({versionId: version.id})">
-        <span translate>OSTree Branches</span>
-      </a>
-    </li>
-
     <li ng-class="{active: isState('content-view.version.details')}">
       <a ui-sref="content-view.version.details({versionId: version.id})">
         <span translate>Details</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js

@@ -50,11 +50,6 @@
                 resource: 'DockerTag',
                 display: translate('Container Image Tags'),
                 repositoryType: 'docker'
-            }, {
-                state: 'ostree',
-                resource: 'OstreeBranch',
-                display: translate('OSTree Branches'),
-                repositoryType: 'ostree'
             }, {
                 state: 'module-streams',
                 resource: 'ModuleStream',

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

@@ -14,7 +14,6 @@ angular.module('Bastion.environments', [
     'Bastion.components',
     'Bastion.errata',
     'Bastion.packages',
-    'Bastion.ostree-branches',
     'Bastion.repositories',
     'Bastion.content-views',
     'Bastion.dates'

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

@@ -108,17 +108,6 @@ angular.module('Bastion.environments').config(['$stateProvider', function ($stat
             parent: 'environment.details'
         }
     })
-    .state('environment.ostree', {
-        url: '/ostree?repositoryId&contentViewId',
-        reloadOnSearch: false,
-        permission: 'view_lifecycle_environments',
-        controller: 'EnvironmentContentController',
-        templateUrl: 'environments/details/views/environment-ostree.html',
-        ncyBreadcrumb: {
-            label: '{{ "OSTree Branches" | translate }}',
-            parent: 'environment.details'
-        }
-    })
     .state('environment.content-views', {
         url: '/content-views',
         reloadOnSearch: false,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/fenced-pages.service.js

@@ -22,8 +22,7 @@ angular.module('Bastion.organizations').service('FencedPages', ['$state',
             'subscriptions',
             'sync-plans',
             'files',
-            'debs',
-            'ostree-branches'
+            'debs'
         ];
 
         function getRootPath(path) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js

@@ -10,7 +10,6 @@
  * @requires CurrentOrganization
  * @requires Checksum
  * @requires DownloadPolicy
- * @requires OstreeUpstreamSyncPolicy
  * @requires Architecture
  * @requires HttpProxyPolicy
  * @requires OSVersions
@@ -20,8 +19,8 @@
  *   Provides the functionality for the repository details info page.
  */
 angular.module('Bastion.repositories').controller('RepositoryDetailsInfoController',
-    ['$scope', '$q', 'translate', 'Notification', 'ContentCredential', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions', 'RepositoryTypesService',
-        function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, HttpProxy, HttpProxyPolicy, OSVersions, RepositoryTypesService) {
+    ['$scope', '$q', 'translate', 'Notification', 'ContentCredential', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'Architecture', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions', 'RepositoryTypesService',
+        function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, Architecture, HttpProxy, HttpProxyPolicy, OSVersions, RepositoryTypesService) {
             $scope.organization = CurrentOrganization;
 
             $scope.progress = {uploading: false};
@@ -199,7 +198,6 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
             $scope.checksums = Checksum.checksums;
             $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
-            $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
 
             $scope.checksumTypeDisplay = function (checksum) {
                 return Checksum.checksumType(checksum);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.filter.js

@@ -1,13 +1,3 @@
-/**
- * @ngdoc object
- * @name  Bastion.repositories.controller:OstreeUpstreamSyncPolicyFilter
- *
- * @requires translate
- * @requires OstreeUpstreamSyncPolicy
- * @requires YumContentUnits
- * @requires HttpProxyPolicy
-**/
-
 angular.module('Bastion.components.formatters').filter('upstreamPasswordFilter', [function () {
     return function (displayValue, repository) {
         if (repository["upstream_auth_exists"]) {

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

@@ -262,7 +262,7 @@
       <dd translate>Yes</dd>
 
       <span ng-hide="repository.content_type === 'docker' || repository.content_type === 'ansible_collection'">
-        <dt translate>Publish via HTTP</dt>
+        <dt translate>Unprotected</dt>
         <dd bst-edit-checkbox="repository.unprotected"
             formatter="booleanToYesNo"
             on-save="save(repository)"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -14,7 +14,6 @@
  * @requires BastionConfig
  * @requires Checksum
  * @requires DownloadPolicy
- * @requires OstreeUpstreamSyncPolicy
  * @requires Architecture
  * @requires RepositoryTypesService
  * @requires OSVersions
@@ -24,8 +23,8 @@
  *   Controls the creation of an empty Repository object for use by sub-controllers.
  */
 angular.module('Bastion.repositories').controller('NewRepositoryController',
-    ['$scope', '$sce', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
-        function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy, OSVersions) {
+    ['$scope', '$sce', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'Architecture', 'RepositoryTypesService', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
+        function ($scope, $sce, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, Architecture, RepositoryTypesService, HttpProxy, HttpProxyPolicy, OSVersions) {
 
             function success() {
                 Notification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
@@ -63,8 +62,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
 
             $scope.repository = new Repository({'product_id': $scope.$stateParams.productId, unprotected: true,
                 'checksum_type': null, 'mirror_on_sync': true, 'verify_ssl_on_sync': true,
-                'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null,
-                'ostree_upstream_sync_policy': 'latest'});
+                'download_policy': BastionConfig.defaultDownloadPolicy, 'arch': null});
 
             $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
                 $scope.page.loading = false;
@@ -78,7 +76,6 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
 
             $scope.checksums = Checksum.checksums;
             $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
-            $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
 
             $scope.$watch('repository.name', function () {
                 if ($scope.repositoryForm && $scope.repositoryForm.name) {

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

@@ -332,8 +332,11 @@
       <div class="checkbox" ng-hide="repository.content_type === 'docker' || repository.content_type === 'ansible_collection'">
         <label>
           <input id="unprotected" name="unprotected" ng-model="repository.unprotected" type="checkbox"/>
-          <span translate>Publish via HTTP</span>
+          <span translate>Unprotected</span>
         </label>
+        <p class="help-block" translate>
+          Do not require a subscription entitlement certificate for accessing this repository.
+        </p>
       </div>
 
       <div bst-form-group label="{{ 'GPG Key' | translate }}" ng-show="repository.content_type === 'yum' || repository.content_type === 'deb'">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/os-versions.service.js

@@ -14,6 +14,7 @@ angular
         this.getOSVersionsOptions = function () {
             return [
                 { name: 'No restriction', id: '' },
+                { name: 'Red Hat Enterprise Linux 9 ', id: 'rhel-9' },
                 { name: 'Red Hat Enterprise Linux 8 ', id: 'rhel-8' },
                 { name: 'Red Hat Enterprise Linux 7 ', id: 'rhel-7' },
                 { name: 'Red Hat Enterprise Linux 6 ', id: 'rhel-6' }

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

@@ -126,15 +126,6 @@
                 parent: 'product.repository.info'
             }
         })
-        .state('product.repository.manage-content.ostree-branches', {
-            url: '/ostree_branches',
-            permission: 'view_products',
-            templateUrl: 'products/details/repositories/details/views/repository-manage-ostree-branches.html',
-            ncyBreadcrumb: {
-                label: "{{'OSTree Branches' | translate }}",
-                parent: 'product.repository.info'
-            }
-        })
         .state('product.repository.manage-content.module-streams', {
             url: '/module_streams',
             permission: 'view_products',

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

@@ -156,14 +156,6 @@
               </div>
             </span>
 
-            <span ng-show="repository.content_type == 'ostree'">
-              <div>
-                <span translate>
-                  {{ repository.content_counts.ostree_branch || 0 }} OSTree Branches
-                </span>
-              </div>
-            </span>
-
             <span ng-show="repository.content_type == 'file'">
               <div>
                 <span translate>

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

@@ -29,7 +29,6 @@ module BastionKatello
           debs
           docker_tags
           files
-          ostree_branches
           errata
           packages
           lifecycle_environments

data/lib/katello/permission_creator.rb

@@ -254,7 +254,6 @@ module Katello
                                                             :compare,
                                                             :repositories],
                            '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/module_streams' => [:index, :show, :auto_complete_search, :compare, :auto_complete_name],
                            'katello/api/v2/ansible_collections' => [:index, :show, :auto_complete_search, :compare],

data/lib/katello/plugin.rb

@@ -121,16 +121,6 @@ Foreman::Plugin.register :katello do
          :turbolinks => false,
          :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::FILE_TYPE) }
 
-    menu :top_menu,
-         :ostree_branches,
-         :caption => N_('OSTree Branches'),
-         :url => '/ostree_branches',
-         :url_hash => {:controller => 'katello/api/v2/ostree_branches',
-                       :action => 'index'},
-         :engine => Katello::Engine,
-         :turbolinks => false,
-         :if => lambda { ::Katello::RepositoryTypeManager.enabled?(::Katello::Repository::OSTREE_TYPE) }
-
     menu :top_menu,
          :packages,
          :caption => N_('Packages'),

data/lib/katello/tasks/reset.rake

@@ -15,9 +15,9 @@ namespace :katello do
       system("sudo runuser - postgres -c 'createdb pulpcore'")
 
       Dir.chdir("/tmp") do
-        fail "\e[31mCannot migrate Pulp3 database\e[0m\n\n" unless system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' python3-django-admin migrate --no-input")
+        fail "\e[31mCannot migrate Pulp3 database\e[0m\n\n" unless system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' pulpcore-manager migrate --no-input")
         puts "\e[33mRecreating Admin User\e[0m\n\n"
-        system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' python3-django-admin reset-admin-password --password password")
+        system("sudo -u pulp PULP_SETTINGS='/etc/pulp/settings.py' DJANGO_SETTINGS_MODULE='pulpcore.app.settings' pulpcore-manager reset-admin-password --password password")
       end
 
       SERVICES.each { |s| system(service_start.gsub("%s", s)) }

data/lib/katello/version.rb

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

data/webpack/components/Packages/index.js

@@ -0,0 +1,63 @@
+import React from 'react';
+import { TableText } from '@patternfly/react-table';
+import { translate as __ } from 'foremanReact/common/I18n';
+import {
+  CheckIcon,
+  LongArrowAltUpIcon,
+  MinusIcon,
+} from '@patternfly/react-icons';
+import PropTypes from 'prop-types';
+
+export const PackagesStatus = ({ upgradable_version: upgradableVersion }) => {
+  let PackagesIcon;
+  let label;
+  let color;
+
+  if (upgradableVersion == null) {
+    color = 'green';
+    label = __('Up-to date');
+    PackagesIcon = CheckIcon;
+  } else {
+    color = 'blue';
+    label = __('Upgradable');
+    PackagesIcon = LongArrowAltUpIcon;
+  }
+  if (!PackagesIcon) return null;
+
+  return (
+    <TableText wrapModifier="nowrap">
+      {color && <PackagesIcon color={color} title={label} />} {label}
+    </TableText>
+  );
+};
+
+PackagesStatus.propTypes = {
+  upgradable_version: PropTypes.string,
+};
+
+PackagesStatus.defaultProps = {
+  upgradable_version: null,
+};
+
+export const PackagesLatestVersion = ({ name, upgradable_version: upgradableVersion }) => {
+  let label;
+  let color;
+
+  if (upgradableVersion == null) {
+    label = '';
+    color = 'green';
+  } else {
+    label = upgradableVersion.replace(`${name}-`, '');
+  }
+
+  return <TableText wrapModifier="nowrap">{color && <MinusIcon color={color} title={label} />} {label} </TableText>;
+};
+
+PackagesLatestVersion.propTypes = {
+  name: PropTypes.string.isRequired,
+  upgradable_version: PropTypes.string,
+};
+
+PackagesLatestVersion.defaultProps = {
+  upgradable_version: null,
+};