katello 3.4.0.rc2 → 3.4.0

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

@@ -40,15 +40,6 @@ angular.module('Bastion.products').config(['$stateProvider', function ($statePro
         ncyBreadcrumb: {
             label: "{{ 'New Product' | translate }}"
         }
-    })
-    .state('products.new.sync-plan', {
-        url: '/new/sync-plan',
-        permission: 'create_sync_plans',
-        controller: 'NewSyncPlanController',
-        templateUrl: 'sync-plans/new/views/new-sync-plan-form.html',
-        ncyBreadcrumb: {
-            label: "{{ 'New Sync Plan' | translate }}"
-        }
     });
 
     $stateProvider.state("product-discovery", {
@@ -93,16 +84,6 @@ angular.module('Bastion.products').config(['$stateProvider', function ($statePro
             label: "{{ product.name }}",
             parent: 'products'
         }
-    })
-    .state('product.new-sync-plan', {
-        url: '/sync-plan/new',
-        permission: 'create_sync_plans',
-        controller: 'NewSyncPlanController',
-        templateUrl: 'products/details/views/product-new-sync-plan.html',
-        ncyBreadcrumb: {
-            label: "{{ 'New Sync Plan'  | translate}}",
-            parent: 'product.info'
-        }
     });
 
     $stateProvider.state('product.tasks', {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/content-access-mode-banner.directive.js

@@ -0,0 +1,22 @@
+/**
+ * @ngdoc directive
+ * @name Bastion.subscriptions:contentAccessModeBanner
+ *
+ * @requires contentAccessMode
+ *
+ * @description
+ *   Component for showing information about content access mode (whether content is
+ *   allowed with or without a subscription)
+ */
+angular.module('Bastion.subscriptions').directive('contentAccessModeBanner',
+    ['contentAccessMode',
+    function (contentAccessMode) {
+        return {
+            restrict: 'AE',
+            controller: ['$scope', function ($scope) {
+                $scope.contentAccessMode = contentAccessMode;
+            }],
+            templateUrl: 'subscriptions/views/content-access-mode-banner.html'
+        };
+    }
+]);

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

@@ -6,6 +6,7 @@
   </header>
 
   <nav data-block="navigation">
+    <div content-access-mode-banner></div>
     <ul class="nav nav-tabs details-nav">
       <li ng-class="{active: isState('subscription.info')}">
         <a translate ui-sref="subscription.info({subscriptionId: subscription.id})">
@@ -42,4 +43,4 @@
   <div data-block="content">
     <section ui-view></section>
   </div>
-</div>
+</div>

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

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

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

@@ -4,6 +4,8 @@
   </header>
 
   <nav data-block="navigation">
+    <div content-access-mode-banner></div>
+
     <ul class="nav nav-tabs details-nav" role="menu">
       <li role="menuitem" ui-sref-active="active">
         <a ui-sref="subscriptions-manifest.details">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html

@@ -0,0 +1,5 @@
+<div bst-alert="info" ng-show="contentAccessMode === 'org_environment'">
+  <span translate>
+    Access to repositories is unrestricted in this organization. Hosts can consume all repositories available in the Content View they are registered to, regardless of subscription status.
+  </span>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html

@@ -63,9 +63,6 @@
           on-save="save(syncPlan)">
       </dd>
 
-      <dt translate>Interval</dt>
-      <dd>{{ syncPlan.interval }}</dd>
-
       <dt translate>Products</dt>
       <dd>
         <a ui-sref="sync-plan.products.list">

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

@@ -5,51 +5,43 @@
  * @requires $scope
  * @requires translate
  * @requires SyncPlan
+ * @requires SyncPlanHelper
+ * @requires GlobalNotification
  *
  * @description
  *   Controls the creation of an empty SyncPlan object for use by sub-controllers.
  */
 angular.module('Bastion.sync-plans').controller('NewSyncPlanController',
-    ['$scope', 'translate', 'SyncPlan', 'GlobalNotification',
-        function ($scope, translate, SyncPlan, GlobalNotification) {
-            $scope.intervals = [
-                {id: 'hourly', value: translate('hourly')},
-                {id: 'daily', value: translate('daily')},
-                {id: 'weekly', value: translate('weekly')}
-            ];
+    ['$scope', '$rootScope', 'translate', 'SyncPlan', 'SyncPlanHelper', 'GlobalNotification',
+        function ($scope, $rootScope, translate, SyncPlan, SyncPlanHelper, GlobalNotification) {
+            $scope.intervals = SyncPlanHelper.getIntervals();
 
             $scope.syncPlan = new SyncPlan();
             $scope.syncPlan.interval = $scope.intervals[0].id;
 
             function success(syncPlan) {
                 $scope.working = false;
+                $scope.$state.go('sync-plan.info', {syncPlanId: syncPlan.id});
                 GlobalNotification.setSuccessMessage(translate('New sync plan successfully created.'));
-                if ($scope.product) {
-                    $scope.product['sync_plan_id'] = syncPlan.id;
-                    $scope.$state.go('product.info', {productId: $scope.product.id});
-                } else {
-                    $scope.$state.go('sync-plan.info', {syncPlanId: syncPlan.id});
-                }
             }
 
             function error(response) {
-                $scope.working = false;
+                var form = SyncPlanHelper.getForm();
+
                 angular.forEach(response.data.errors, function (errors, field) {
-                    $scope.syncPlanForm[field].$setValidity('server', false);
-                    $scope.syncPlanForm[field].$error.messages = errors;
+                    form[field].$setValidity('server', false);
+                    form[field].$error.messages = errors;
                 });
+
+                $scope.working = false;
             }
 
             $scope.createSyncPlan = function (syncPlan) {
-                var GMT_OFFSET_MILLISECONDS = syncPlan.startDate.getTimezoneOffset() * 60000,
-                    syncDate = new Date(syncPlan.startDate.getTime() + GMT_OFFSET_MILLISECONDS),
-                    syncTime = new Date(syncPlan.startTime || new Date());
-                syncDate.setHours(syncTime.getHours());
-                syncDate.setMinutes(syncTime.getMinutes());
-                syncDate.setSeconds(0);
+                SyncPlanHelper.createSyncPlan(syncPlan, success, error);
+            };
 
-                syncPlan['sync_date'] = syncDate.toString();
-                syncPlan.$save(success, error);
+            $scope.setForm = function (form) {
+                SyncPlanHelper.setForm(form);
             };
         }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/new/views/new-sync-plan-form.html

@@ -1,65 +1,69 @@
-<form ng-controller="NewSyncPlanController" name="syncPlanForm" class="col-sm-5" novalidate role="form">
- <div bst-form-group label="{{ 'Name' | translate }}">
-   <input id="name"
-          name="name"
-          ng-model="syncPlan.name"
-          type="text"
-          tabindex="1"
-          autofocus
-          required/>
- </div>
+<div ng-form name="syncPlanForm" novalidate role="form">
+  <div bst-form-group label="{{ 'Name' | translate }}">
+    <input id="name"
+           name="name"
+           ng-model="syncPlan.name"
+           type="text"
+           tabindex="1"
+           autofocus
+           required/>
+  </div>
 
- <div bst-form-group label="{{ 'Description' | translate }}">
+  <div bst-form-group label="{{ 'Description' | translate }}">
    <textarea id="description"
              name="description"
              ng-model="syncPlan.description"
              tabindex="2">
    </textarea>
- </div>
+  </div>
 
- <div bst-form-group label="{{ 'Interval' | translate }}">
-   <select id="interval"
-           name="interval"
-           ng-model="syncPlan.interval"
-           ng-options="interval.id as interval.value for interval in intervals"
-           tabindex="3"
-           required>
+  <div bst-form-group label="{{ 'Interval' | translate }}">
+    <select id="interval"
+            name="interval"
+            ng-model="syncPlan.interval"
+            ng-options="interval.id as interval.value for interval in intervals"
+            tabindex="3"
+            required>
       <option value="" translate>-- select an interval --</option>
-   </select>
- </div>
+    </select>
+  </div>
 
- <div bst-form-group label="{{ 'Start Date' | translate }}">
-   <div class="input-group">
-     <input type="text" uib-datepicker-popup
-            id="startDate"
-            name="startDate"
-            is-open="isOpen"
-            ng-model="syncPlan.startDate"
-            show-weeks="false"
-            tabindex="4"
-            required/>
+  <div bst-form-group label="{{ 'Start Date' | translate }}">
+    <div class="input-group">
+      <input type="text" uib-datepicker-popup
+             id="startDate"
+             name="startDate"
+             is-open="isOpen"
+             ng-model="syncPlan.startDate"
+             show-weeks="false"
+             tabindex="4"
+             required/>
 
      <span class="input-group-btn">
        <button type="button" class="btn btn-default" ng-click="isOpen = !isOpen">
          <i class="fa fa-calendar"></i>
        </button>
      </span>
-   </div>
- </div>
+    </div>
+  </div>
 
- <div bst-form-group label="{{ 'Start Time' | translate }}">
-   <div uib-timepicker show-meridian="false"
-          id="startTime"
-          name="startTime"
-          ng-model="syncPlan.startTime"
-          tabindex="5">
-   </div>
-   <p class="help-block" translate>The time the sync should happen in your current time zone.</p>
- </div>
+  <div bst-form-group label="{{ 'Start Time' | translate }}">
+    <div uib-timepicker show-meridian="false"
+         id="startTime"
+         name="startTime"
+         ng-model="syncPlan.startTime"
+         tabindex="5">
+    </div>
+    <p class="help-block" translate>The time the sync should happen in your current time zone.</p>
+  </div>
 
- <div bst-form-buttons
-      on-cancel="transitionBack()"
-      on-save="createSyncPlan(syncPlan)"
-      working="working">
- </div>
-</form>
+  <div ng-init="setForm(syncPlanForm);"></div>
+
+  <div ng-show="isState('sync-plans.new')">
+    <div bst-form-buttons
+         on-cancel="transitionBack()"
+         on-save="createSyncPlan(syncPlan)"
+         working="working">
+    </div>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/new/views/new-sync-plan.html

@@ -6,6 +6,8 @@
   </header>
 
   <div data-block="content">
-    <div ng-include="'sync-plans/new/views/new-sync-plan-form.html'"></div>
+    <div class="row">
+      <div class="col-sm-5" ng-include="'sync-plans/new/views/new-sync-plan-form.html'"></div>
+    </div>
   </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/sync-plan-helper.service.js

@@ -0,0 +1,66 @@
+(function () {
+
+    /**
+     * @ngdoc service
+     * @name Bastion.sync-plans.service:SyncPlanHelper
+     *
+     * @description
+     *   Provides a helper service for Sync Plans
+     *
+     */
+    function SyncPlanHelper(translate) {
+
+        /**
+         * Get the set form.  Allows the sharing of form data across controllers
+         *
+         * @param form the form to set
+         */
+        this.setForm = function (form) {
+            this.form = form;
+        };
+
+        /**
+         * Set the form.  Allows the sharing of form data across controllers
+         *
+         * @returns {form|*} the stored form
+         */
+        this.getForm = function () {
+            return this.form;
+        };
+
+        /**
+         * Returns the valid sync plan intervals.
+         *
+         * @returns {{id: string, value: *}[]}
+         */
+        this.getIntervals = function () {
+            return [
+                {id: 'hourly', value: translate('hourly')},
+                {id: 'daily', value: translate('daily')},
+                {id: 'weekly', value: translate('weekly')}
+            ];
+
+        };
+
+        /**
+         * Create a sync plan, including setting the dates correctly.
+         *
+         * @returns $resource sync plan
+         */
+        this.createSyncPlan = function (syncPlan, success, error) {
+            var GMT_OFFSET_MILLISECONDS = syncPlan.startDate.getTimezoneOffset() * 60000,
+                syncDate = new Date(syncPlan.startDate.getTime() + GMT_OFFSET_MILLISECONDS),
+                syncTime = new Date(syncPlan.startTime || new Date());
+            syncDate.setHours(syncTime.getHours());
+            syncDate.setMinutes(syncTime.getMinutes());
+            syncDate.setSeconds(0);
+
+            syncPlan['sync_date'] = syncDate.toString();
+            syncPlan.$save(success, error);
+            return syncPlan;
+        };
+    }
+
+    angular.module('Bastion.sync-plans').service('SyncPlanHelper', SyncPlanHelper);
+    SyncPlanHelper.$inject = ['translate'];
+})();

data/lib/katello/engine.rb

@@ -2,6 +2,15 @@ module Katello
   class Engine < ::Rails::Engine
     isolate_namespace Katello
 
+    initializer 'katello.selective_params_parser', :before => :build_middleware_stack do |app|
+      require 'katello/params_parser_wrapper'
+      app.middleware.swap(
+        ActionDispatch::ParamsParser,
+        Katello::ParamsParserWrapper,
+        ->(env) { env['PATH_INFO'] =~ /consumers/ && env['PATH_INFO'] =~ /profile|packages/ }
+      )
+    end
+
     initializer 'katello.mount_engine', :after => :build_middleware_stack do |app|
       app.routes_reloader.paths << "#{Katello::Engine.root}/config/routes/mount_engine.rb"
     end
@@ -241,6 +250,7 @@ module Katello
       end
 
       Katello::EventQueue.register_event(Katello::Events::ImportHostApplicability::EVENT_TYPE, Katello::Events::ImportHostApplicability)
+      Katello::EventQueue.register_event(Katello::Events::ImportPool::EVENT_TYPE, Katello::Events::ImportPool)
 
       ::HostsController.class_eval do
         helper Katello::Concerns::HostsAndHostgroupsHelperExtensions

data/lib/katello/params_parser_wrapper.rb

@@ -0,0 +1,16 @@
+module Katello
+  class ParamsParserWrapper < ActionDispatch::ParamsParser
+    def initialize(app, excludes)
+      @exclude = excludes
+      super(app)
+    end
+
+    def call(env)
+      if @exclude && @exclude.call(env)
+        @app.call(env)
+      else
+        super(env)
+      end
+    end
+  end
+end

data/lib/katello/permissions/host_permissions.rb

@@ -24,10 +24,13 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
   'katello/api/v2/hosts_bulk_actions/auto_attach',
   'katello/api/v2/hosts_bulk_actions/content_overrides',
   'katello/api/v2/hosts_bulk_actions/environment_content_view',
-  'katello/api/rhsm/candlepin_proxies/upload_package_profile',
+  'katello/api/rhsm/candlepin_dynflow_proxy/upload_package_profile',
   'katello/api/rhsm/candlepin_proxies/regenerate_identity_certificates',
   'katello/api/rhsm/candlepin_proxies/hypervisors_update',
-  'katello/api/rhsm/candlepin_proxies/upload_tracer_profile'
+  'katello/api/rhsm/candlepin_proxies/async_hypervisors_update',
+  'katello/api/rhsm/candlepin_proxies/upload_tracer_profile',
+  'katello/remote_execution/new',
+  'katello/remote_execution/create'
 ]
 
 Foreman::AccessControl.permission(:view_hosts).actions.concat [
@@ -54,5 +57,6 @@ Foreman::AccessControl.permission(:create_hosts).actions.concat [
   'katello/api/v2/host_subscriptions/create',
   'katello/api/rhsm/candlepin_proxies/consumer_create',
   'katello/api/rhsm/candlepin_proxies/consumer_show',
-  'katello/api/rhsm/candlepin_proxies/hypervisors_update'
+  'katello/api/rhsm/candlepin_proxies/hypervisors_update',
+  'katello/api/rhsm/candlepin_proxies/async_hypervisors_update'
 ]

data/lib/katello/plugin.rb

@@ -244,13 +244,13 @@ Foreman::Plugin.register :katello do
 
   add_controller_action_scope(HostsController, :index) do |base_scope|
     base_scope
-      .includes(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata)
-      .includes(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment])
+      .preload(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata)
+      .preload(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment])
   end
 
   add_controller_action_scope(Api::V2::HostsController, :index) do |base_scope|
     base_scope
-      .includes(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata)
-      .includes(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment])
+      .preload(:content_view, :lifecycle_environment, :subscription_facet, :applicable_errata)
+      .preload(content_facet: [:bound_repositories, :applicable_errata, :content_view, :lifecycle_environment])
   end
 end