katello 3.18.0.rc2.1 → 3.18.2.1

data/app/views/katello/layouts/react.html.erb

@@ -10,7 +10,8 @@
     <%= notifications %>
     <div id="organization-id" data-id="<%= Organization.current.id if Organization.current %>" ></div>
     <div id="user-id" data-id="<%= User.current.id if User.current %>" ></div>
-    <div id="reactRoot"></div>
-    <%= mount_react_component('katello', '#reactRoot') %>
+    <div id="reactRoot">
+      <%= react_component('katello') %>
+    </div>
 <% end %>
 <%= render file: "layouts/base" %>

data/app/views/katello/sync_management/_products.html.erb

@@ -42,5 +42,5 @@
     </tbody>
   </table>
 
-  <%= submit_tag _('Synchronize Now'), :class => 'button fr', :id => 'sync_button' %>
+  <%= submit_tag _('Synchronize Now'), :class => 'btn btn-default fr', :id => 'sync_button' %>
 <% end %>

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

@@ -9,13 +9,9 @@
 
   <%= field(f, _("Activation Keys"),
             :help_inline => _("The value will be available in templates as @host.params['#{kt_ak_label}']")) do
-    tag.div id: :kt_activation_keys
+    react_component('TypeAheadSelect', { id: 'kt_activation_keys', multiple: true, allowNew: true })
   end %>
 
-  <%= mount_react_component('TypeAheadSelect', '#kt_activation_keys',
-                            {id: 'kt_activation_keys', multiple: true, allowNew: true}.to_json,
-                            { flatten_data: true }) %>
-
   <div class="alert alert-info">
     <p><b><%= _('Subscriptions information based on selected activation keys:') %></b></p>
     <ul id="ak-subscriptions-info"></ul>

data/config/routes/api/v2.rb

@@ -113,6 +113,22 @@ Katello::Engine.routes.draw do
           end
         end
 
+        api_resources :content_exports, :only => [] do
+          collection do
+            post :version
+            post :library
+            get :index
+            get :api_status
+          end
+        end
+
+        api_resources :content_export_incrementals, :only => [] do
+          collection do
+            post :version
+            post :library
+          end
+        end
+
         api_resources :content_view_versions, :except => [:create] do
           member do
             post :promote
@@ -121,11 +137,15 @@ Katello::Engine.routes.draw do
             get :available_errata, :controller => :errata
           end
           collection do
-            get :export_histories
-            get :export_api_status
             get :auto_complete_search
             post :incremental_update
-            post :import
+          end
+        end
+
+        api_resources :content_imports, :only => [] do
+          collection do
+            post :version
+            post :library
           end
         end
 

data/db/migrate/20150930183738_migrate_content_hosts.rb

@@ -329,7 +329,7 @@ class MigrateContentHosts < ActiveRecord::Migration[4.2]
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
   def up
-    if User.where(:login => User::ANONYMOUS_API_ADMIN).first.nil?
+    unless User.unscoped.where(:login => User::ANONYMOUS_API_ADMIN).exists?
       logger.warn("Foreman anonymous admin does not exist, skipping content host migration.")
       return
     end

data/db/migrate/20200514092553_move_katello_fields_from_hostgroups.katello.rb

@@ -1,6 +1,6 @@
 class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
   def up
-    if User.where(login: User::ANONYMOUS_ADMIN).exists?
+    if User.unscoped.where(login: User::ANONYMOUS_ADMIN).exists?
       User.as_anonymous_admin do
         copy_data_from_hostgroup
       end
@@ -46,7 +46,10 @@ class MoveKatelloFieldsFromHostgroups < ActiveRecord::Migration[6.0]
         content_facet.kickstart_repository_id = kickstart_repository_id
         content_facet.content_view_id = content_view_id
         content_facet.lifecycle_environment_id = lifecycle_environment_id
-        content_facet.save!
+        unless content_facet.save
+          Rails.logger.warn("Unable to save content facet hostgroup for #{content_facet.inspect} ")
+          Rails.logger.warn(content_facet.errors.full_messages.join("\n"))
+        end
       end
     end
   end

data/db/migrate/20201119211133_pulp3_migration_progress.rb

@@ -0,0 +1,9 @@
+class Pulp3MigrationProgress < ActiveRecord::Migration[6.0]
+  def change
+    create_table :katello_content_migration_progresses do |t|
+      t.string :progress_message
+      t.boolean :canceled, null: false, default: false
+      t.string :task_id, null: false, index: {name: 'katello_content_migration_progress_task_id', unique: true }
+    end
+  end
+end

data/db/migrate/20210201165835_add_migration_missing_content.rb

@@ -0,0 +1,12 @@
+class AddMigrationMissingContent < ActiveRecord::Migration[6.0]
+  def change
+    content_models = [Katello::Rpm, Katello::ModuleStream, Katello::Erratum, Katello::PackageGroup, Katello::YumMetadataFile,
+                      Katello::Srpm, Katello::FileUnit, Katello::DockerManifestList, Katello::DockerManifest, Katello::DockerTag,
+                      Katello::Deb]
+
+    content_models.each do |model|
+      add_column model.table_name, :missing_from_migration, :bool, :default => false, :null => false
+      add_column model.table_name, :ignore_missing_from_migration, :bool, :default => false, :null => false
+    end
+  end
+end

data/engines/bastion/app/assets/javascripts/bastion/auth/authorization.service.js

@@ -20,7 +20,7 @@ angular.module('Bastion.auth').service('Authorization', ['CurrentUser', 'Permiss
                 allowedTo = model.permissions[permissionName];
             } else {
                 angular.forEach(Permissions, function (permission) {
-                    if (permission.permission.name === permissionName) {
+                    if (permission.name === permissionName) {
                         allowedTo = true;
                     }
                 });

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html

@@ -1,7 +1,7 @@
 <section>
   <p bst-alert="warning" >
     <span translate>
-      Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution.
+      Katello-agent is deprecated and will be removed in a future release.
     </span>
   </p>
 </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html

@@ -1,8 +1,7 @@
 <div data-extend-template="components/views/bst-modal.html">
-  <h4 data-block="modal-header" translate>Content Host System Purpose</h4>
+  <h2 data-block="modal-header" translate>Assign System Purpose</h2>
 
   <div data-block="modal-body">
-    <h4 translate>Assign System Purpose:</h4>
 
     <div class="row">
       <div class="col-sm-12">
@@ -10,67 +9,63 @@
       </div>
     </div>
 
+    <div bst-alert="info">
+      <span translate>
+        This change will be applied to <b>{{ hostCount }} systems.</b>
+      </span>
+    </div>
+    <br />
+
     <form name="contentHostContentForm" class="form" ng-hide="content.workingMode">
-      <div>
-        <label translate>Service Level:</label>
+      <div><b>
+        <dl class="dl-horizontal dl-horizontal-left">
+        <dt><label translate>Service Level (SLA):</label></dt>
 
-        <select type="select"
-                ng-options="item for item in defaultServiceLevels"
-                ng-model="selectedServiceLevels">
-        </select>
-      <br /><br />
+        <dd><select type="select"
+                    ng-options="item for item in defaultServiceLevels"
+                    ng-model="selectedServiceLevels">
+        </select></dd>
+        <br /><br />
 
-        <label translate>Usage Type:</label>
+        <dt style="margin-left: -50px;"><label translate>Usage Type:</label></dt>
 
-        <select type="select"
+        <dd><select type="select"
                 ng-options="item for item in defaultUsages"
                 ng-model="selectedRoles">
-        </select>
+        </select></dd>
         <br /><br />
 
-        <label translate>Role:</label>
+        <dt style="margin-left: -98px;"><label translate>Role:</label></dt>
 
-        <select type="select"
+        <dd><select type="select"
                 ng-options="item for item in defaultRoles"
                 ng-model="selectedUsages">
-        </select>
+        </select></dd>
         <br /><br />
 
-        <label ng-hide="!purposeAddonsList().length" translate>Add ons:</label>
-        <div class="help-block" style="text-align:left;">
-          <p translate>ctrl-click or shift-click to select multiple Add ons</p>
-        </div>
+        <dt style="margin-left: -75px;"><label ng-hide="!purposeAddonsList().length" translate>Add ons:</label></dt>
 
-        <select multiple ng-multiple="true"
+        <dd><select multiple ng-multiple="true"
                 ng-hide="!purposeAddonsList().length"
                 ng-options="item for item in purposeAddonsList()"
                 ng-model="selectedAddons">
-        </select>
-        <br /><br />
-
-      </div>
-
-      <div bst-alert="info" ng-show="showConfirm">
-        <span translate>
-          Set System Purpose values on {{ hostCount }} selected content hosts?
-        </span>
-        <div>
-          <br />
-          <button type="button" class="btn btn-primary" ng-click="showConfirm = false; performAction()" translate>Assign</button>
+        </select></dd>
+        <div class="help-block" style="text-align:center; margin-left: -180px;">
+          <p translate>ctrl-click or shift-click to select multiple Add ons</p>
         </div>
+        <br /><br />
+        </dl></b>
       </div>
-
-      <button class="btn btn-primary"
-              type="button"
-              ng-hide="showConfirm"
-              ng-click="showConfirm = true;">
-        <span translate>Assign</span>
-      </button>
-
     </form>
   </div>
 
   <div data-block="modal-footer">
+    <button class="btn btn-primary"
+            type="button"
+            ng-click="performAction()">
+      <span translate>Assign</span>
+    </button>
+
     <button type="button" class="btn btn-default" ng-click="cancel()" translate>
       Cancel
     </button>

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

@@ -12,7 +12,7 @@
   <section>
     <p bst-alert="warning" >
     <span translate>
-      Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution.
+      Katello-agent is deprecated and will be removed in a future release.
     </span>
     </p>
   </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/content-view-version-deletion-activation-keys.controller.js

@@ -16,16 +16,20 @@
 angular.module('Bastion.content-views').controller('ContentViewVersionDeletionActivationKeysController',
     ['$scope', '$location', 'Organization', 'CurrentOrganization', 'Nutupane', 'ActivationKey',
     function ($scope, $location, Organization, CurrentOrganization, Nutupane, ActivationKey) {
-        var params, nutupane;
+        var params, nutupane, nutupaneParams;
 
         $scope.validateEnvironmentSelection();
         params = {
             'organization_id': CurrentOrganization,
-            'content_view_id': $scope.contentView.id,
             'sort_by': 'name',
             'sort_order': 'ASC'
         };
-        nutupane = new Nutupane(ActivationKey, params);
+
+        nutupaneParams = {
+            'disableAutoLoad': true
+        };
+
+        nutupane = new Nutupane(ActivationKey, params, undefined, nutupaneParams);
         $scope.controllerName = 'katello_activation_keys';
 
         nutupane.searchTransform = function (term) {
@@ -43,6 +47,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionAc
 
             return term + " AND " + addition;
         };
+        nutupane.load();
 
         $scope.table = nutupane.table;
         $scope.table.closeItem = function () {};

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

@@ -17,16 +17,20 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
     ['$scope', '$location', 'Organization', 'CurrentOrganization', 'Nutupane', 'Host',
     function ($scope, $location, Organization, CurrentOrganization, Nutupane, Host) {
 
-        var params, nutupane;
+        var params, nutupane, nutupaneParams;
 
         $scope.validateEnvironmentSelection();
         params = {
             'organization_id': CurrentOrganization,
-            'content_view_id': $scope.contentView.id,
             'sort_by': 'name',
             'sort_order': 'ASC'
         };
-        nutupane = new Nutupane(Host, params);
+
+        nutupaneParams = {
+            'disableAutoLoad': true
+        };
+
+        nutupane = new Nutupane(Host, params, undefined, nutupaneParams);
         $scope.controllerName = 'hosts';
 
         nutupane.searchTransform = function (term) {
@@ -44,6 +48,8 @@ angular.module('Bastion.content-views').controller('ContentViewVersionDeletionCo
 
             return term + " AND " + addition;
         };
+
+        nutupane.load();
         $scope.table = nutupane.table;
         $scope.table.closeItem = function () {};
 

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

@@ -13,7 +13,7 @@
   </div>
 
   <nav data-block="item-actions">
-    <button type="button" class="btn btn-primary" ng-hide="denied('publish_content_views', contentView) || contentView.import_only"
+    <button type="button" class="btn btn-primary" ng-hide="denied('publish_content_views', contentView) || contentView.import_only" 
             ui-sref="content-view.publish">
       <span translate>Publish New Version</span>
     </button>

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

@@ -7,6 +7,10 @@
   It can be promoted to other environments from the Versions tab of this Content View.
 </p>
 
+<div bst-alert="warning" ng-show="contentView.errors['messages'].length > 0">
+  <span translate>{{contentView.errors['messages'][0]}}</span>
+  </div>
+
 <header class="details-header">
   <h3 translate>Version Details</h3>
 </header>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -521,6 +521,10 @@ msgstr ""
 msgid "Add ons"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html
+msgid "Add ons:"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-group-filter-details.html
 msgid "Add Package Group"
 msgstr ""
@@ -1028,6 +1032,7 @@ msgstr[1] ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-environment-modal.html
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-release-version-modal.html
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html
 msgid "Assign"
 msgstr ""
 
@@ -1039,6 +1044,10 @@ msgstr ""
 msgid "Assign Release Version"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html
+msgid "Assign System Purpose:"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html
 msgid "Associations"
 msgstr ""
@@ -1192,6 +1201,7 @@ msgid "Build Time"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-host-bulk-module-streams-modal.html
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-traces-modal.html
 #: app/assets/javascripts/bastion_katello/content-views/deletion/views/content-view-deletion.html
 #: app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-activation-keys.html
@@ -1284,10 +1294,6 @@ msgstr ""
 msgid "Checksum Type"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
-msgid "Choose <b>Default</b> to enable the repository for all architectures"
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/content-views/details/views/content-view-promotion.html
 msgid "Choose a lifecycle environment from the available promotion paths."
 msgstr ""
@@ -1524,6 +1530,10 @@ msgstr ""
 msgid "Content Host Status"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html
+msgid "Content Host System Purpose"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
 msgid "Content Host:"
 msgstr ""
@@ -1771,6 +1781,10 @@ msgstr ""
 msgid "Cron Logic"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html
+msgid "ctrl-click or shift-click to select multiple Add ons"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-hosts/content/content-host-errata.controller.js
 msgid "Current Lifecycle Environment (%e/%cv)"
 msgstr ""
@@ -1860,8 +1874,6 @@ msgid "Debs"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/repositories/checksum.service.js
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js
-#: app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js
 msgid "Default"
 msgstr ""
 
@@ -1944,6 +1956,10 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-views/new/views/content-view-new.html
+msgid "Designate whether this Content View is for importing from an upstream server. Import-only Content Views can not be published directly."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html
 #: app/assets/javascripts/bastion_katello/content-credentials/details/views/content-credential-details.html
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-details.html
@@ -2605,6 +2621,15 @@ msgstr ""
 msgid "Immediate"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-views/details/views/content-view-info.html
+#: app/assets/javascripts/bastion_katello/content-views/new/views/content-view-new.html
+msgid "Import-only"
+msgstr ""
+
+#: app/assets/javascripts/bastion_katello/content-views/views/content-views.html
+msgid "Import-only?"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/errata/errata-severity.filter.js
 msgid "Important"
 msgstr ""
@@ -2753,7 +2778,7 @@ msgstr ""
 
 #: app/assets/javascripts/bastion_katello/common/views/katello-agent-notice.html
 #: app/assets/javascripts/bastion_katello/content-hosts/views/register-client.html
-msgid "Katello-agent is deprecated and will be removed in Katello 4.0.  Consider migrating to Remote Execution."
+msgid "Katello-agent is deprecated and will be removed in a future release."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-views/details/views/content-view-info.html
@@ -3024,6 +3049,10 @@ msgstr ""
 msgid "Manage Sync Plan"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html
+msgid "Manage System Purpose"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifests.html
 msgid "Manifest Lists"
 msgstr ""
@@ -3478,6 +3507,11 @@ msgstr ""
 msgid "No repository sets provided through subscriptions."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.controller.js
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js
+msgid "No restriction"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-rule-matching-package-modal.html
 msgid "No RPMs were matched"
 msgstr ""
@@ -4626,6 +4660,10 @@ msgstr ""
 msgid "Restart Services on Content Host \"{{host.name}}\"?"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+msgid "Restrict to <br>OS version"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 msgid "Restrict to architecture"
 msgstr ""
@@ -4634,6 +4672,10 @@ msgstr ""
 msgid "Restrict to Architecture"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+msgid "Restrict to OS version"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/tasks/views/task-details.html
 msgid "Result"
 msgstr ""
@@ -4643,6 +4685,10 @@ msgstr ""
 msgid "Role"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html
+msgid "Role:"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-rule-matching-package-modal.html
 #: app/assets/javascripts/bastion_katello/packages/views/packages.html
 #: app/assets/javascripts/bastion_katello/content-views/details/filters/filter-helper.service.js
@@ -4798,10 +4844,18 @@ msgstr ""
 msgid "Service Level (SLA)"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html
+msgid "Service Level:"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html
 msgid "Set Release Version"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html
+msgid "Set System Purpose values on {{ hostCount }} selected content hosts?"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/errata/details/views/erratum-info.html
 msgid "Severity"
 msgstr ""
@@ -5204,6 +5258,10 @@ msgstr ""
 msgid "System Purpose allows you to set the system's intended use on your network and improves the accuracy of auto attaching subscriptions."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-info.html
+msgid "System Purpose Management"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
 msgid "System Purpose Status"
 msgstr ""
@@ -5304,6 +5362,15 @@ msgstr ""
 msgid "The Remote Execution plugin needs to be installed in order to resolve Traces."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+msgid "The repository will be enabled by default on content hosts with the selected architecture."
+msgstr ""
+
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+msgid "The repository will be enabled by default on content hosts with the selected OS version."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/activation-keys/new/views/activation-key-new.html
 msgid "The selected environment contains no Content Views, please select a different environment."
 msgstr ""
@@ -5746,6 +5813,10 @@ msgstr ""
 msgid "Usage Type"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html
+msgid "Usage Type:"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 #: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
 msgid "Use Ctrl-click to multi-select/deselect items."