katello 3.17.0 → 3.18.0

data/app/services/katello/smart_proxy_helper.rb

@@ -21,6 +21,15 @@ module Katello
       end
     end
 
+    def clear_smart_proxy_sync_histories(repo_list = [])
+      if repo_list.empty?
+        @smart_proxy.smart_proxy_sync_histories.delete_all
+        return
+      end
+      repo_ids = repo_list.map(&:id)
+      @smart_proxy.smart_proxy_sync_histories.where("repository_id IN (?)", repo_ids).delete_all
+    end
+
     def combined_repos_available_to_capsule(environment = nil, content_view = nil, repository = nil)
       lifecycle_environment_check(environment, repository)
       if repository

data/app/views/dashboard/_subscription_widget.html.erb

@@ -4,11 +4,6 @@
 
 <% if Organization.current.blank? %>
   <p class="ca"><%= _("Please select an organization to view subscription status.") %></p>
-<% elsif Organization.current.simple_content_access?%>
-  <div class="bastion alert alert-info">
-    <span translate>This organization has Simple Content Access enabled. Hosts can consume from all repositories in their Content View regardless of subscription status.
-    </span>
-  </div>
 <% else %>
   <% total_count = total_host_count() %>
   <% partial_consumer_count = partial_consumer_count() %>

data/app/views/foreman/hosts/_registration.html.erb

@@ -0,0 +1,12 @@
+<div class='form-group'>
+  <label class='col-md-2 control-label'>
+    <%= _('Activation Key(s)') %>
+    <% help = _('Activation key(s) for Subscription Manager. Required for CentOS and Red Hat Enterprise Linux. Multiple keys add separated by comma, example: key1,key2,key3.') %>
+    <a rel="popover" data-content="<%= help %>" data-trigger="focus" data-container="body" data-html="true" tabindex="-1">
+      <span class="pficon pficon-info "></span>
+    </a>
+  </label>
+  <div class='col-md-4'>
+    <%= text_field_tag 'activation_key', params[:activation_key], class: 'form-control' %>
+  </div>
+</div>

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

@@ -1,6 +1,6 @@
 object @resource
 
-attributes :destination_server, :path, :id
+attributes :destination_server, :path, :id, :metadata
 
 node :content_view_version do |h|
   h.content_view_version.name

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

@@ -9,6 +9,7 @@ attributes :version_count
 attributes :latest_version
 attributes :auto_publish
 attributes :solve_dependencies
+attributes :import_only
 
 node :next_version do |content_view|
   content_view.next_version.to_f.to_s

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

@@ -7,7 +7,7 @@ attributes :relative_path, :container_repository_name, :full_path, :library_inst
 attributes :version_href, :remote_href, :publication_href
 
 glue(@object.root) do
-  attributes :content_type, :url, :arch, :content_id
+  attributes :content_type, :url, :arch, :os_versions, :content_id
   attributes :major, :minor
 
   child :product do |_product|

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/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/app/views/overrides/organizations/_index_row_override.html.erb

@@ -1,3 +1,3 @@
 <% if taxonomy.is_a?(Organization) %>
-  <td><%= taxonomy.simple_content_access? ? _("Enabled") : _("Disabled") %></td>
+  <td><%= checked_icon taxonomy.simple_content_access? %></td>
 <% end %>

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,10 +137,15 @@ Katello::Engine.routes.draw do
             get :available_errata, :controller => :errata
           end
           collection do
-            get :export_histories
             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
 
@@ -357,6 +378,7 @@ Katello::Engine.routes.draw do
               get :ping
               match '/simple_content_access/enable', :to => 'upstream_subscriptions#enable_simple_content_access', :via => :put
               match '/simple_content_access/disable', :to => 'upstream_subscriptions#disable_simple_content_access', :via => :put
+              match '/simple_content_access/eligible', :to => 'upstream_subscriptions#simple_content_access_eligible', :via => :get
             end
           end
         end

data/config/routes/overrides.rb

@@ -78,6 +78,7 @@ Foreman::Application.routes.draw do
             match '/bulk/release_version' => 'hosts_bulk_actions#release_version', :via => :put
             match '/bulk/traces' => 'hosts_bulk_actions#traces', :via => :post
             match '/bulk/resolve_traces' => 'hosts_bulk_actions#resolve_traces', :via => :put
+            match '/bulk/system_purpose' => 'hosts_bulk_actions#system_purpose', :via => :put
             match '/bulk/available_incremental_updates' => 'hosts_bulk_actions#available_incremental_updates', :via => :post
             match '/bulk/module_streams' => 'hosts_bulk_actions#module_streams', :via => :post
             match '/subscriptions/' => 'host_subscriptions#create', :via => :post

data/db/migrate/20200929200357_create_katello_smart_proxy_sync_history.rb

@@ -0,0 +1,13 @@
+class CreateKatelloSmartProxySyncHistory < ActiveRecord::Migration[6.0]
+  def change
+    create_table :katello_smart_proxy_sync_history do |t|
+      t.references :smart_proxy, :null => false
+      t.references :repository, :null => false
+      t.datetime :started_at
+      t.datetime :finished_at
+    end
+    add_index "katello_smart_proxy_sync_history", ["smart_proxy_id"], :name => "index_spsh_smart_proxy_id"
+    add_index "katello_smart_proxy_sync_history", ["repository_id"], :name => "index_spsh_repository_id"
+    add_index "katello_smart_proxy_sync_history", [:smart_proxy_id, :repository_id], :unique => true, :name => 'index_spsh_smart_proxy_repository_unique'
+  end
+end

data/db/migrate/20201008204114_add_os_versions_to_katello_root_repositories.rb

@@ -0,0 +1,5 @@
+class AddOsVersionsToKatelloRootRepositories < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_root_repositories, :os_versions, :text
+  end
+end

data/db/migrate/20201012172713_remove_gpg_key_perms.rb

@@ -0,0 +1,23 @@
+class RemoveGpgKeyPerms < ActiveRecord::Migration[6.0]
+  def permission_map
+    {
+      Permission.find_by(name: :view_gpg_keys) => Permission.find_by(name: :view_content_credentials),
+      Permission.find_by(name: :edit_gpg_keys) => Permission.find_by(name: :edit_content_credentials),
+      Permission.find_by(name: :destroy_gpg_keys) => Permission.find_by(name: :destroy_content_credentials),
+      Permission.find_by(name: :create_gpg_keys) => Permission.find_by(name: :create_content_credentials)
+    }
+  end
+
+  def up
+    perms = permission_map
+    perms.each do |old_perm, new_perm|
+      Filtering.where(permission_id: old_perm.id).update_all(:permission_id => new_perm.id) if old_perm
+    end
+    names = perms.keys.compact.map(&:name)
+    Permission.where(:name => names).destroy_all if names.any?
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20201012192035_add_metadata_to_katello_content_view_version_export_history.rb

@@ -0,0 +1,5 @@
+class AddMetadataToKatelloContentViewVersionExportHistory < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_content_view_version_export_histories, :metadata, :text
+  end
+end

data/db/migrate/20201021150008_add_import_only_to_katello_content_view.rb

@@ -0,0 +1,5 @@
+class AddImportOnlyToKatelloContentView < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_content_views, :import_only, :boolean, :default => false, :null => false
+  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/seeds.d/111-upgrade_tasks.rb

@@ -13,6 +13,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:3.13:republish_deb_metadata'},
     {:name => 'katello:upgrades:3.15:set_sub_facet_dmi_uuid'},
     {:name => 'katello:upgrades:3.15:reindex_rpm_modular'},
-    {:name => 'katello:upgrades:3.16:update_applicable_el8_hosts'}
+    {:name => 'katello:upgrades:3.16:update_applicable_el8_hosts'},
+    {:name => 'katello:upgrades:3.18:add_cvv_export_history_metadata'}
   ]
 end

data/engines/bastion/app/assets/javascripts/bastion/components/notification.service.js

@@ -32,6 +32,6 @@ angular.module('Bastion.components').service("Notification", ['$interpolate', 'f
     };
 
     this.setErrorMessage = function (message, context) {
-        foreman.toastNotifications.notify({message: interpolateIfNeeded(message, context), type: 'danger'});
+        foreman.toastNotifications.notify({message: interpolateIfNeeded(message, context), type: 'error'});
     };
 }]);

data/engines/bastion/app/assets/javascripts/bastion/components/nutupane.factory.js

@@ -97,7 +97,6 @@ angular.module('Bastion.components').factory('Nutupane',
             self.load = function () {
                 var deferred = $q.defer(),
                     responsePage,
-                    resourceCall,
                     table = self.table,
                     existingTable = TableCache.getTable(getTableName());
 
@@ -115,11 +114,7 @@ angular.module('Bastion.components').factory('Nutupane',
                 params.search = table.searchTerm || "";
                 params.search = self.searchTransform(params.search);
 
-                resourceCall = resource[table.action](params, function (response) {
-                    if (response.error) {
-                        Notification.setErrorMessage(response.error);
-                    }
-
+                resource[table.action](params).$promise.then(function (response) {
                     angular.forEach(response.results, function (row) {
                         row.selected = table.allResultsSelected;
                     });
@@ -155,14 +150,14 @@ angular.module('Bastion.components').factory('Nutupane',
                     table.working = false;
                     table.refreshing = false;
                     table.initialLoad = false;
-                });
+                }).catch(function(response) {
+                    table.working = false;
+                    table.refreshing = false;
 
-                if (resourceCall && resourceCall.$promise && resourceCall.$promise.catch) {
-                    resourceCall.$promise.catch(function () {
-                        table.working = false;
-                        table.refreshing = false;
-                    });
-                }
+                    if (response && response.data && response.data.error && response.data.error.message) {
+                        Notification.setErrorMessage(response.data.error.message);
+                    }
+                });
 
                 return deferred.promise;
             };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-system-purpose-modal.controller.js

@@ -0,0 +1,112 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-hosts.controller:ContentHostsBulkSystemPurposeModalController
+ *
+ * @requires $scope
+ * @requires $uibModalInstance
+ * @requires HostBulkAction
+ * @requires Organization
+ * @requires CurrentOrganization
+ * @requires Notification
+ * @requires hostIds
+ *
+ * @description
+ *   A controller for providing bulk action functionality for setting system purpose values
+ */
+angular.module('Bastion.content-hosts').controller('ContentHostsBulkSystemPurposeModalController',
+    ['$scope', '$uibModalInstance', 'HostBulkAction', 'Organization', 'CurrentOrganization', 'Notification', 'hostIds',
+    function ($scope, $uibModalInstance, HostBulkAction, Organization, CurrentOrganization, Notification, hostIds) {
+
+        $scope.organization = Organization.get({id: CurrentOrganization});
+
+        $scope.purposeAddonsList = function () {
+            var defaultOptions = ['No Change', 'None (Clear)'];
+            if ($scope.organization.system_purposes && $scope.organization.system_purposes.addons) {
+                return defaultOptions.concat($scope.organization.system_purposes.addons);
+            }
+            return [];
+        };
+
+        $scope.defaultUsages = ['No change', 'None (Clear)', 'Production', 'Development/Test', 'Disaster Recovery'];
+        $scope.defaultRoles = ['No change', 'None (Clear)', 'Red Hat Enterprise Linux Server', 'Red Hat Enterprise Linux Workstation', 'Red Hat Enterprise Linux Compute Node'];
+        $scope.defaultServiceLevels = ['No change', 'None (Clear)', 'Self-Support', 'Standard', 'Premium'];
+
+        $scope.hostCount = hostIds.included.ids.length;
+
+        $scope.selectedUsages = $scope.defaultUsages[0];
+        $scope.selectedRoles = $scope.defaultRoles[0];
+        $scope.selectedServiceLevels = $scope.defaultServiceLevels[0];
+
+        $scope.selected = {
+           addons: undefined
+        };
+
+        $scope.selectedItemToParam = function (item) {
+            var mapping = {
+                "None (Clear)": "",
+                "No change": null,
+                "": []
+            };
+            if (Array.isArray(item)) {
+                return $scope.selectedAddonsToParam(item);
+            }
+            if (mapping.hasOwnProperty(item)) {
+                return mapping[item];
+            }
+            return item;
+        };
+
+        $scope.selectedAddonsToParam = function (addons) {
+            var intentOptions = ['No Change', 'None (Clear)'];
+
+            var userIntent = intentOptions.filter(function(val) {
+                return addons.indexOf(val) !== -1;
+            });
+
+            if (userIntent.length === 0) {
+                return addons;
+            }
+
+            if (userIntent.includes('No Change')) {
+                return null;
+            }
+
+            if (userIntent.includes('None (Clear)') && addons.length === 1) {
+                return [];
+            } if (userIntent.includes('None (Clear)') && addons.length > 1) {
+                addons.shift();
+                return addons;
+            }
+        };
+
+        function actionParams() {
+            var params = hostIds;
+
+            params['purpose_usage'] = $scope.selectedItemToParam($scope.selectedUsages);
+            params['purpose_role'] = $scope.selectedItemToParam($scope.selectedRoles);
+            params['purpose_addons'] = $scope.selectedItemToParam($scope.selectedAddons);
+            params['service_level'] = $scope.selectedItemToParam($scope.selectedServiceLevels);
+
+            return params;
+        }
+
+        $scope.performAction = function () {
+            HostBulkAction.systemPurpose(actionParams(), function (task) {
+            $scope.ok();
+            $scope.transitionTo('content-hosts.bulk-task', {taskId: task.id});
+        }, function (response) {
+            angular.forEach(response.data.errors, function (error) {
+                Notification.setErrorMessage(error);
+            });
+        });
+        };
+
+        $scope.ok = function () {
+            $uibModalInstance.close();
+        };
+
+        $scope.cancel = function () {
+            $uibModalInstance.dismiss('cancel');
+        };
+    }]
+);

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

@@ -0,0 +1,78 @@
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header" translate>Content Host System Purpose</h4>
+
+  <div data-block="modal-body">
+    <h4 translate>Assign System Purpose:</h4>
+
+    <div class="row">
+      <div class="col-sm-12">
+        <div bst-global-notification></div>
+      </div>
+    </div>
+
+    <form name="contentHostContentForm" class="form" ng-hide="content.workingMode">
+      <div>
+        <label translate>Service Level:</label>
+
+        <select type="select"
+                ng-options="item for item in defaultServiceLevels"
+                ng-model="selectedServiceLevels">
+        </select>
+      <br /><br />
+
+        <label translate>Usage Type:</label>
+
+        <select type="select"
+                ng-options="item for item in defaultUsages"
+                ng-model="selectedRoles">
+        </select>
+        <br /><br />
+
+        <label translate>Role:</label>
+
+        <select type="select"
+                ng-options="item for item in defaultRoles"
+                ng-model="selectedUsages">
+        </select>
+        <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>
+
+        <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>
+        </div>
+      </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 type="button" class="btn btn-default" ng-click="cancel()" translate>
+      Cancel
+    </button>
+  </div>
+</div>