katello 3.4.2 → 3.4.4

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

@@ -82,7 +82,7 @@ angular.module('Bastion.errata').controller('ErrataController',
         });
 
         $scope.goToNextStep = function () {
-            IncrementalUpdate.setBulkErrata(nutupane.getAllSelectedResults());
+            IncrementalUpdate.setBulkErrata(nutupane.getAllSelectedResults('errata_id'));
             $state.transitionTo('apply-errata.select-content-hosts');
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-details.controller.js

@@ -6,16 +6,17 @@
  * @requires $state
  * @requires $q
  * @requires translate
+ * @requires Host
+ * @requires ContentHostsModalHelper
  * @requires HostCollection
  * @requires ApiErrorHandler
- * @requires urlencodeFilter
  *
  * @description
  *   Provides the functionality for the host collection details action pane.
  */
 angular.module('Bastion.host-collections').controller('HostCollectionDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'HostCollection', 'ApiErrorHandler', 'urlencodeFilter',
-    function ($scope, $state, $q, translate, HostCollection, ApiErrorHandler, urlencodeFilter) {
+    ['$scope', '$state', '$q', 'translate', 'Host', 'ContentHostsModalHelper', 'HostCollection', 'ApiErrorHandler',
+    function ($scope, $state, $q, translate, Host, ContentHostsModalHelper, HostCollection, ApiErrorHandler) {
         $scope.successMessages = [];
         $scope.errorMessages = [];
 
@@ -36,15 +37,49 @@ angular.module('Bastion.host-collections').controller('HostCollectionDetailsCont
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
         });
 
+        $scope.getHostIds = function() {
+            return $scope.selected;
+        };
+
+        $scope.host = Host.get({search: "host_collection_id = " + $scope.$stateParams.hostCollectionId}, function (response) {
+            $scope.selected = {
+                included: {
+                    ids: _.map(response.results, 'id')
+                },
+                excluded: {
+                    ids: []
+                }};
+        ContentHostsModalHelper.resolveFunc = $scope.getHostIds;}, function (response) {
+            $scope.panel.loading = false;
+            ApiErrorHandler.handleGETRequestErrors(response, $scope);
+        });
+
         $scope.refreshHostCollection = function () {
             $scope.hostCollection.$get().then(function (hostCollection) {
                 $scope.$emit("updateContentHostCollection", hostCollection);
             });
         };
 
-        $scope.getHostCollectionSearchUrl = function (hostCollectionName) {
-            var search = 'host_collection="%s"'.replace('%s', hostCollectionName);
-            return '?select_all=true&search=' + urlencodeFilter(search);
+        $scope.openPackagesModal = function () {
+            ContentHostsModalHelper.openPackagesModal();
+        };
+
+        $scope.openErrataModal = function () {
+            ContentHostsModalHelper.openErrataModal();
+        };
+
+        $scope.openHostCollectionsModal = function () {
+            ContentHostsModalHelper.openHostCollectionsModal();
+        };
+
+
+        $scope.openEnvironmentModal = function () {
+            ContentHostsModalHelper.openEnvironmentModal();
+        };
+
+
+        $scope.openSubscriptionsModal = function () {
+            ContentHostsModalHelper.openSubscriptionsModal();
         };
 
         $scope.save = function (hostCollection) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-info.html

@@ -69,28 +69,34 @@
 
     <ul class="list-unstyled">
       <li bst-feature-flag="remote_actions">
-        <a translate ng-href="{{ $state.href('content-hosts.bulk-actions.packages') }}{{ getHostCollectionSearchUrl(hostCollection.name) }}">
+        <a translate ng-click ="openPackagesModal()">
           Package Installation, Removal, and Update
         </a>
       </li>
 
       <li bst-feature-flag="remote_actions">
-        <a translate ng-href="{{ $state.href('content-hosts.bulk-actions.errata.list') }}{{ getHostCollectionSearchUrl(hostCollection.name) }}">
+        <a translate ng-click="openErrataModal()">
           Errata Installation
         </a>
       </li>
 
       <li>
-        <a translate ng-href="{{ $state.href('content-hosts.bulk-actions.host-collections') }}{{ getHostCollectionSearchUrl(hostCollection.name) }}">
+        <a translate ng-click = "openHostCollectionsModal()">
           Host Collection Membership
         </a>
       </li>
 
       <li bst-feature-flag="lifecycle_environments">
-        <a translate ng-href="{{ $state.href('content-hosts.bulk-actions.environment') }}{{ getHostCollectionSearchUrl(hostCollection.name) }}">
+        <a translate ng-click="openEnvironmentModal()">
           Change assigned Lifecycle Environment or Content View
         </a>
       </li>
+
+      <li bst-feature-flag="subscription_management">
+        <a translate ng-click="openSubscriptionsModal()">
+          Subscription Management
+        </a>
+      </li>
     </ul>
   </div>
-</section>
+</section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifests.html

@@ -45,6 +45,7 @@
         <tr bst-table-head row-select>
           <th bst-table-column><span translate>Manifest Name</span></th>
           <th bst-table-column><span translate>Tags</span></th>
+          <th bst-table-column><span translate>Schema Version</span></th>
           <th bst-table-column><span translate>Digest</span></th>
         </tr>
       </thead>
@@ -61,6 +62,9 @@
               </a>
             </span>
           </td>
+          <td bst-table-cell>
+            {{ item.schema_version }}
+          </td>
           <td bst-table-cell>
             {{ item.digest }}
           </td>

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

@@ -17,8 +17,8 @@
  *      repository discovery.
  */
 angular.module('Bastion.products').controller('DiscoveryCreateController',
-    ['$scope', '$q', 'CurrentOrganization', 'Product', 'Repository', 'GPGKey', 'FormUtils', 'DiscoveryRepositories', 'translate',
-    function ($scope, $q, CurrentOrganization, Product, Repository, GPGKey, FormUtils, DiscoveryRepositories, translate) {
+    ['$scope', '$q', 'CurrentOrganization', 'Product', 'Repository', 'GPGKey', 'FormUtils', 'DiscoveryRepositories', 'translate', 'ApiErrorHandler',
+    function ($scope, $q, CurrentOrganization, Product, Repository, GPGKey, FormUtils, DiscoveryRepositories, translate, ApiErrorHandler) {
 
         $scope.errorMessages = [];
         $scope.successMessages = [];
@@ -172,15 +172,13 @@ angular.module('Bastion.products').controller('DiscoveryCreateController',
             return fieldsEnabled;
         };
 
-        $scope.gpgKeys = function () {
-            var deferred = $q.defer();
-
-            GPGKey.queryUnpaged(function (response) {
-                deferred.resolve(response.results);
-            });
-
-            return deferred.promise;
-        };
+        $scope.gpgKeys = [];
+        GPGKey.queryUnpaged(function (gpgKeys) {
+            $scope.gpgKeys = gpgKeys.results;
+        }, function (response) {
+            $scope.gpgKeys = [];
+            ApiErrorHandler.handleGETRequestErrors(response, $scope);
+        });
 
         $scope.$watch('table.rows', function (newList, oldList) {
             if (newList) {

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

@@ -31,6 +31,10 @@ angular.module('Bastion.subscriptions').controller('SubscriptionContentHostsCont
 
         $scope.memory = ContentHostsHelper.memory;
 
+        $scope.convertMemToGB = function (memoryValue) {
+            return (memoryValue / 1048576).toFixed(2);
+        };
+
         $scope.virtual = function (facts) {
             if (angular.isUndefined(facts.virt) || angular.isUndefined(facts.virt['is_guest'])) {
                 return false;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-content-hosts.html

@@ -54,7 +54,7 @@
         <td bst-table-cell>{{ contentHost.service_level }}</td>
         <td bst-table-cell>{{ contentHost.facts.cpu['cpu_socket(s)'] }}</td>
         <td bst-table-cell>{{ contentHost.facts.cpu['core(s)_per_socket'] }}</td>
-        <td bst-table-cell>{{ contentHost.facts.dmi.memory['size'] }}</td>
+        <td bst-table-cell>{{ convertMemToGB(contentHost.facts.memory['memtotal']) }}</td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/manifest-import.controller.js

@@ -43,6 +43,11 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
             }
         }
 
+        function getInitialTask() {
+            return {pending: true};
+
+        }
+
         $scope.uploadErrorMessages = [];
         $scope.progress = {uploading: false};
         $scope.uploadURL = '/katello/api/v2/organizations/' + CurrentOrganization + '/subscriptions/upload';
@@ -58,11 +63,7 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
         });
 
         $scope.isTaskPending = function () {
-            var pending = false;
-            if (($scope.task && $scope.task.pending) || ($scope.deleteTask && $scope.deleteTask.pending)) {
-                pending = true;
-            }
-            return pending;
+            return $scope.task && $scope.task.pending;
         };
 
         $scope.unregisterSearch = function () {
@@ -92,7 +93,6 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
                 if ($scope.task.result === 'success') {
                     $scope.refreshOrganizationInfo();
                     GlobalNotification.setSuccessMessage(translate("Manifest successfully imported."));
-                    $scope.refreshTable();
                 } else {
                     $scope.handleTaskErrors(task, translate("Error importing manifest."));
                 }
@@ -100,9 +100,11 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
         };
 
         $scope.deleteManifest = function () {
+            $scope.task = getInitialTask();
+            $scope.taskStatusText = translate('Removing Manifest');
             Subscription.deleteManifest({}, function (returnData) {
-                $scope.deleteTask = returnData;
-                $scope.searchId = Task.registerSearch({'type': 'task', 'task_id': $scope.deleteTask.id}, $scope.deleteManifestTask);
+                $scope.task = returnData;
+                $scope.searchId = Task.registerSearch({'type': 'task', 'task_id': $scope.task.id}, $scope.deleteManifestTask);
             }, function (response) {
                 $scope.saveError = true;
                 $scope.errors = response.data.errors;
@@ -110,13 +112,12 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
         };
 
         $scope.deleteManifestTask = function (task) {
-            $scope.deleteTask = task;
-            if (!$scope.deleteTask.pending) {
+            $scope.task = task;
+            if (!$scope.task.pending) {
                 $scope.unregisterSearch();
-                if ($scope.deleteTask.result === 'success') {
+                if ($scope.task.result === 'success') {
                     $scope.saveSuccess = true;
                     GlobalNotification.setSuccessMessage(translate("Manifest successfully deleted."));
-                    $scope.refreshTable();
                     $scope.refreshOrganizationInfo();
                 } else {
                     $scope.handleTaskErrors(task, translate("Error deleting manifest."));
@@ -133,9 +134,11 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
         };
 
         $scope.refreshManifest = function () {
+            $scope.task = getInitialTask();
+            $scope.taskStatusText = translate('Refreshing Manifest');
             Subscription.refreshManifest({}, function (returnData) {
-                $scope.refreshTask = returnData;
-                $scope.searchId = Task.registerSearch({'type': 'task', 'task_id': $scope.refreshTask.id}, $scope.refreshManifestTask);
+                $scope.task = returnData;
+                $scope.searchId = Task.registerSearch({'type': 'task', 'task_id': $scope.task.id}, $scope.refreshManifestTask);
             }, function (response) {
                 $scope.saveError = true;
                 $scope.errors = response.data.errors;
@@ -143,13 +146,12 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
         };
 
         $scope.refreshManifestTask = function (task) {
-            $scope.refreshTask = task;
-            if (!$scope.refreshTask.pending) {
+            $scope.task = task;
+            if (!$scope.task.pending) {
                 $scope.unregisterSearch();
-                if ($scope.refreshTask.result === 'success') {
+                if ($scope.task.result === 'success') {
                     $scope.saveSuccess = true;
                     GlobalNotification.setSuccessMessage(translate("Manifest successfully refreshed."));
-                    $scope.refreshTable();
                     $scope.refreshOrganizationInfo();
                 } else {
                     $scope.handleTaskErrors(task, translate("Error refreshing manifest."));
@@ -174,10 +176,11 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
 
             deferred = Organization.update(whitelistedOrganizationObject, function () {
                 GlobalNotification.setSuccessMessage(translate('Repository URL updated'));
-                $scope.refreshTable();
                 $scope.refreshOrganizationInfo();
             }, function (response) {
-                GlobalNotification.setErrorMessage(translate("An error occurred saving the URL: ") + response.data.error.message);
+                angular.forEach(response.data.error['full_messages'], function (message) {
+                    GlobalNotification.setErrorMessage(translate("An error occurred saving the URL: ") + message);
+                });
             });
 
             return deferred.$promise;
@@ -186,6 +189,9 @@ angular.module('Bastion.subscriptions').controller('ManifestImportController',
         $scope.uploadManifest = function (content) {
             var returnData;
             if (content) {
+                $scope.task = getInitialTask();
+                $scope.taskStatusText = translate('Uploading Manifest');
+
                 try {
                     returnData = angular.fromJson(angular.element(content).html());
                 } catch (err) {

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

@@ -17,6 +17,17 @@
   <div class="details">
     <h4 translate>Subscription Manifest</h4>
 
+    <div ng-show="isTaskPending()">
+      <a ng-href="/foreman_tasks/tasks/{{ task.id }}">
+
+        <div ng-class="{ active: isTaskPending() }"
+             class="progress progress-striped">
+          <span uib-progressbar animate="false" value="task.progressbar.value" type="{{task.progressbar.type}}"></span>
+        </div>
+      </a>
+      {{ taskStatusText }}
+    </div>
+
     <div class="detail">
       <span class="info-label" translate>Upstream Subscription Management Application</span>
       <span class="info-value" ng-show="upstream.uuid != undefined">
@@ -30,18 +41,13 @@
               ng-hide="denied('delete_manifest')"
               ng-click="openModal()">
          <span bst-modal="deleteManifest()" template-url="subscriptions/manifest/views/manifest-delete-modal.html"></span>
-         <i class="fa fa-spinner fa-spin" ng-show="deleteTask.pending"></i>
-          <span ng-show="deleteTask.pending" translate>Deleting Manifest...</span>
-          <span ng-hide="deleteTask.pending" translate>Delete Manifest</span>
+          <span translate>Delete Manifest</span>
       </button>
-      <button type="button" class="btn btn-default" ng-disabled="upstream.idCert == undefined || upstream.idCert.cert == undefined"
+      <button type="button" class="btn btn-default" ng-disabled="isTaskPending() || upstream.idCert == undefined || upstream.idCert.cert == undefined"
         ng-click="refreshManifest()">
-         <i class="fa fa-spinner fa-spin" ng-show="refreshTask.pending"></i>
-          <span ng-show="refreshTask.pending" translate>Refreshing Manifest...</span>
-          <span ng-hide="refreshTask.pending" translate>Refresh Manifest</span>
+          <span translate>Refresh Manifest</span>
       </button>
-      <span ng-show="upstream.idCert == undefined || upstream.idCert.cert == undefined"
-        translate>
+      <span ng-show="upstream.idCert == undefined || upstream.idCert.cert == undefined" translate>
         Refreshing manifest not supported by this manifest.
       </span>
     </div>
@@ -66,9 +72,7 @@
 
     <div class="form-group">
       <button type="button" class="btn btn-primary" ng-disabled="isTaskPending()" upload-submit>
-        <i class="fa fa-spinner fa-spin" ng-show="task.pending"></i>
-        <span ng-show="task.pending" translate>Uploading...</span>
-        <span ng-hide="task.pending" translate>Upload</span>
+        <span translate>Upload</span>
       </button>
     </div>
 

data/lib/katello/tasks/delete_orphaned_content.rake

@@ -1,7 +1,14 @@
 namespace :katello do
   task :delete_orphaned_content => ["environment"] do
     User.current = User.anonymous_admin
-    Katello::Repository.delete_orphaned_content
+    SmartProxy.with_content.reverse.each do |proxy|
+      begin
+        ForemanTasks.async_task(Actions::Katello::CapsuleContent::RemoveOrphans,
+                                :capsule_id => proxy.id)
+      rescue RuntimeError => e
+        Rails.logger.error "Smart proxy with ID #{proxy.id} may be down: #{e}"
+      end
+    end
     puts _("Orphaned content deletion started in background.")
   end
 end

data/lib/katello/tasks/repository.rake

@@ -3,6 +3,26 @@ namespace :katello do
     ForemanTasks.dynflow.config.remote = true
   end
 
+  desc "Check for repositories that have not been published since their last sync, and republish if they have."
+  task :publish_unpublished_repositories => ["environment", "disable_dynflow", "check_ping"] do
+    needing_publish = []
+    Organization.find_each do |org|
+      org.default_content_view.versions.first.repositories.where.not(:url => nil).find_each do |repo|
+        begin
+          if repo.needs_metadata_publish?
+            Rails.logger.error("Repository metadata for #{repo.name} (#{repo.id}) is out of date, regenerating.")
+            needing_publish << repo
+          end
+        rescue => e
+          puts "Failed to check repository #{repo.id}: #{e}"
+        end
+      end
+    end
+    if needing_publish.any?
+      ForemanTasks.async_task(::Actions::BulkAction, ::Actions::Katello::Repository::MetadataGenerate, needing_publish)
+    end
+  end
+
   desc "Regnerate metadata for all repositories. Specify CONTENT_VIEW=name and LIFECYCLE_ENVIRONMENT=name to narrow repositories."
   task :regenerate_repo_metadata => ["environment", "disable_dynflow", "check_ping"] do
     User.current = User.anonymous_api_admin

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.4.2".freeze
+  VERSION = "3.4.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.4
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -492,13 +492,10 @@ files:
 - app/controllers/katello/concerns/organizations_controller_extensions.rb
 - app/controllers/katello/concerns/smart_proxies_controller_extensions.rb
 - app/controllers/katello/errata_controller.rb
-- app/controllers/katello/errors_controller.rb
-- app/controllers/katello/failed_authentication_controller.rb
 - app/controllers/katello/http_errors.rb
 - app/controllers/katello/products_controller.rb
 - app/controllers/katello/providers_controller.rb
 - app/controllers/katello/remote_execution_controller.rb
-- app/controllers/katello/sort_column_list.rb
 - app/controllers/katello/sync_management_controller.rb
 - app/helpers/katello/application_helper.rb
 - app/helpers/katello/concerns/foreman_docker/container_steps_helper_extensions.rb
@@ -864,6 +861,7 @@ files:
 - app/models/katello/content_view_version_component.rb
 - app/models/katello/cp_consumer_user.rb
 - app/models/katello/docker_manifest.rb
+- app/models/katello/docker_meta_tag.rb
 - app/models/katello/docker_tag.rb
 - app/models/katello/errata_status.rb
 - app/models/katello/erratum.rb
@@ -972,6 +970,7 @@ files:
 - app/services/katello/puppet_class_importer_extensions.rb
 - app/services/katello/repository_type.rb
 - app/services/katello/repository_type_manager.rb
+- app/views/common/400.html
 - app/views/dashboard/_content_views_widget.html.erb
 - app/views/dashboard/_errata_widget.html.erb
 - app/views/dashboard/_host_collection_widget.html.erb
@@ -1178,7 +1177,6 @@ files:
 - app/views/katello/sync_management/_sync_plans.html.erb
 - app/views/katello/sync_management/index.html.erb
 - app/views/overrides/about/_installed_packages.html.erb
-- app/views/overrides/about/_support_documentation.html.erb
 - app/views/overrides/about/_system_status.html.erb
 - app/views/overrides/activation_keys/_host_environment_select.html.erb
 - app/views/overrides/activation_keys/_host_media_type_select.html.erb
@@ -1388,6 +1386,7 @@ files:
 - db/migrate/20170220679403_remove_system_permissions.rb
 - db/migrate/20170222131211_change_pool_columns_to_dates.rb
 - db/migrate/20170321012632_fill_in_content_view_components.rb
+- db/migrate/20170523182831_create_docker_meta_tag.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/103-provisioning_templates.rb
@@ -1453,6 +1452,7 @@ files:
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/errata-content-hosts.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/errata-details.html
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-events.controller.js
+- engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-modal-helper.service.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-status.controller.js
 - engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-hosts-helper.service.js