katello 3.7.0.rc1 → 3.7.0.rc2

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/views/new-environment.html

@@ -18,11 +18,14 @@
     <h1 translate>New Environment</h1>
   </header>
 
-  <div ng-show="priorEnvironment.successor && !loading">
-    <p translate>Lifecycle Environment "{{ priorEnvironment.name }}" exists within the middle of a path. New Lifecycle Environments can only be added to the end of a path.</p>
+  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+
+  <div ng-show="loading" class="loading-mask">
+    <i class="fa fa-spinner fa-spin"></i>
+      {{ "Loading..." | translate }}
   </div>
 
-  <div ng-show="!priorEnvironment.successor && !loading" class="row">
+  <div ng-show="!loading" class="row">
 
     <p class="col-sm-12" translate>Adding Lifecycle Environment to the end of "{{ priorEnvironment.name }}"</p>
 
@@ -54,6 +57,16 @@
         </textarea>
       </div>
 
+      <div bst-form-group label="{{ 'Prior Environment' | translate }}"
+           ng-show="currentPath != null">
+        <select id="prior_id"
+                name="prior_id"
+                ng-model="environment.prior_id"
+                ng-options="env.id as env.name for env in currentPath"
+                tabindex="4">
+        </select>
+      </div>
+
       <div bst-form-buttons
            on-cancel="transitionTo('environments')"
            on-save="save(environment)"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/products-bulk-advanced-sync-modal.controller.js

@@ -27,7 +27,7 @@ angular.module('Bastion.products').controller('ProductsBulkAdvancedSyncModalCont
                 message = translate("Product syncs has been initiated in the background. " +
                     "Click %s to monitor the progress.");
 
-                Notification.setRenderedSuccessMessage(message.replace('%s', taskLink));
+                Notification.setSuccessMessage(message.replace('%s', taskLink));
             };
 
             error = function (response) {

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

@@ -64,7 +64,7 @@ angular.module('Bastion.products').controller('ProductsController',
             taskUrl = $scope.taskUrl(taskId);
             taskLink = $sce.trustAsHtml("<a href=" + taskUrl + ">here</a>");
             message = translate("Product delete operation has been initiated in the background. Click %s to monitor the progress.");
-            Notification.setRenderedSuccessMessage(message.replace("%", taskLink));
+            Notification.setSuccessMessage(message.replace("%", taskLink));
         });
 
         $scope.unsetProductDeletionTaskId = function () {
@@ -95,7 +95,7 @@ angular.module('Bastion.products').controller('ProductsController',
                 message = translate("Product sync has been initiated in the background. " +
                     "Click %s to monitor the progress.");
 
-                Notification.setRenderedSuccessMessage(message.replace('%s', taskLink));
+                Notification.setSuccessMessage(message.replace('%s', taskLink));
             };
 
             ProductBulkAction.syncProducts(getBulkParams(), success, bulkError);

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

@@ -9,7 +9,7 @@
  */
 angular.module('Bastion.subscriptions').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('subscriptions', {
-        url: '/subscriptions',
+        url: '/legacy_subscriptions',
         permission: 'view_subscriptions',
         template: '<div ui-view></div>',
         views: {
@@ -25,7 +25,7 @@ angular.module('Bastion.subscriptions').config(['$stateProvider', function ($sta
 
     $stateProvider.state('subscription', {
         abstract: true,
-        url: '/subscriptions/:subscriptionId',
+        url: '/legacy_subscriptions/:subscriptionId',
         permission: 'view_subscriptions',
         controller: 'SubscriptionDetailsController',
         templateUrl: 'subscriptions/details/views/subscription-details.html'
@@ -72,7 +72,7 @@ angular.module('Bastion.subscriptions').config(['$stateProvider', function ($sta
 
     $stateProvider.state('subscriptions-manifest', {
         abstract: true,
-        url: '/subscriptions/manifest',
+        url: '/legacy_subscriptions/manifest',
         permission: 'import_manifest',
         controller: 'ManifestController',
         templateUrl: 'subscriptions/manifest/views/manifest.html'

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

@@ -27,11 +27,6 @@ angular.module('Bastion.tasks').config(['$stateProvider', function ($stateProvid
         abstract: true,
         templateUrl: 'tasks/views/tasks.html'
     })
-    .state('tasks.index', {
-        url: 'katello_tasks',
-        permission: 'view_tasks',
-        templateUrl: 'tasks/views/tasks-index.html'
-    })
     .state('tasks.details', {
         url: 'katello_tasks/:taskId',
         permission: 'view_tasks',
@@ -40,7 +35,7 @@ angular.module('Bastion.tasks').config(['$stateProvider', function ($stateProvid
         templateUrl: 'tasks/views/task-details-standalone.html'
     })
     .state('task', {
-        url: 'katello_tasks/single/:taskId',
+        url: 'foreman_tasks/tasks/:taskId',
         controller: 'TaskDetailsController',
         permission: 'view_tasks',
         templateUrl: 'tasks/views/task-details-standalone.html'

data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/bastion_katello.scss

@@ -34,3 +34,7 @@
 .list-aligned {
   list-style-position: inside;
 }
+
+.bottom-padded-content {
+  padding-bottom: 10%;
+}

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

@@ -30,7 +30,7 @@ module BastionKatello
           lifecycle_environments
           products
           puppet_modules
-          subscriptions
+          legacy_subscriptions
           sync_plans
           host_collections
           katello_tasks

data/lib/katello/plugin.rb

@@ -3,7 +3,7 @@ require 'katello/repository_types.rb'
 
 # rubocop:disable Metrics/BlockLength
 Foreman::Plugin.register :katello do
-  requires_foreman '>= 1.17'
+  requires_foreman '>= 1.18'
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'),
            :icon => 'fa fa-book', :after => :monitor_menu do
@@ -11,7 +11,7 @@ Foreman::Plugin.register :katello do
          :red_hat_subscriptions,
          :caption => N_('Subscriptions'),
          :url => '/subscriptions',
-         :url_hash => {:controller => 'katello/api/v2/subscriptions',
+         :url_hash => {:controller => 'katello/react',
                        :action => 'index'},
          :engine => Katello::Engine,
          :turbolinks => false
@@ -191,15 +191,6 @@ Foreman::Plugin.register :katello do
        :after => :content_hosts,
        :turbolinks => false
 
-  menu :labs_menu,
-       :experimental_ui,
-       :url => '/xui/subscriptions',
-       :url_hash => {:controller => 'katello/react',
-                     :action => 'index'},
-       :caption => N_('Red Hat Subscriptions'),
-       :parent => :lab_features_menu,
-       :turbolinks => false
-
   allowed_template_helpers :subscription_manager_configuration_url, :repository_url
   search_path_override("Katello") do |resource|
     "/#{Katello::Util::Model.model_to_controller_path(resource)}/auto_complete_search"

data/lib/katello/scheduled_jobs.rb

@@ -1,18 +1,6 @@
 # First, we check if there's a job already enqueued for any notifications
 ::Foreman::Application.dynflow.config.on_init do |world|
-  pending_jobs = world.persistence.find_execution_plans(filters: { :state => 'scheduled' })
-  scheduled_pulp_job = pending_jobs.select do |job|
-    delayed_plan = world.persistence.load_delayed_plan job.id
-    next if delayed_plan.blank?
-    delayed_plan.to_hash[:serialized_args].first.try(:[], 'job_class') == 'CreatePulpDiskSpaceNotifications'
+  [CreatePulpDiskSpaceNotifications, SendExpireSoonNotifications].each do |job_class|
+    job_class.spawn_if_missing(world)
   end
-  scheduled_subs_expiration_job = pending_jobs.select do |job|
-    delayed_plan = world.persistence.load_delayed_plan job.id
-    next if delayed_plan.blank?
-    delayed_plan.to_hash[:serialized_args].first.try(:[], 'job_class') == 'SendExpireSoonNotifications'
-  end
-
-  # Only create notifications if there isn't a scheduled job
-  CreatePulpDiskSpaceNotifications.perform_later if scheduled_pulp_job.blank?
-  SendExpireSoonNotifications.perform_later if scheduled_subs_expiration_job.blank?
 end

data/lib/katello/tasks/clean_backend_objects.rake

@@ -59,12 +59,14 @@ namespace :katello do
     def clean_backend_orphans(cleaner)
       cp_uuids = cleaner.cp_orphaned_host_uuids
       print "#{cp_uuids.count} orphaned consumer id(s) found in candlepin.\n"
+      print "Candlepin orphaned consumers: #{cp_uuids}\n"
       cp_uuids.each do |consumer_id|
         execute("exception when destroying candlepin consumer #{consumer_id}") { Katello::Resources::Candlepin::Consumer.destroy(consumer_id) }
       end
 
       pulp_uuids = cleaner.pulp_orphaned_host_uuids
       print "#{pulp_uuids.count} orphaned consumer id(s) found in pulp.\n"
+      print "Pulp orphaned consumers: #{pulp_uuids}\n"
       pulp_uuids.each do |consumer_id|
         execute("exception when destroying pulp consumer #{consumer_id}") { Katello.pulp_server.extensions.consumer.delete(consumer_id) }
       end

data/lib/katello/tasks/repository.rake

@@ -29,7 +29,7 @@ namespace :katello do
     repos = lookup_repositories
 
     if repos.any?
-      task = ForemanTasks.async_task(Actions::Katello::Repository::BulkMetadataGenerate, repos.all.sort)
+      task = ForemanTasks.async_task(Actions::Katello::Repository::BulkMetadataGenerate, repos.all.order(:name))
       puts "Regenerating #{repos.count} repositories.  You can monitor these on task id #{task.id}\n"
     else
       puts "No repositories found for regeneration."
@@ -42,7 +42,7 @@ namespace :katello do
     repos = lookup_repositories
 
     if repos.any?
-      task = ForemanTasks.async_task(::Actions::BulkAction, Actions::Katello::Repository::RefreshRepository, repos.all.sort)
+      task = ForemanTasks.async_task(::Actions::BulkAction, Actions::Katello::Repository::RefreshRepository, repos.all.order(:name))
       puts "Refreshing #{repos.count} repositories.  You can monitor these on task id #{task.id}\n"
     else
       puts "No repositories found for regeneration."
@@ -102,6 +102,15 @@ namespace :katello do
     end
   end
 
+  desc "Refresh pulp sync schedules"
+  task :refresh_sync_schedule => ["environment", "check_ping"] do
+    User.current = User.anonymous_api_admin
+    Katello::Product.all.each do |product|
+      puts "Updating #{product}"
+      ForemanTasks.sync_task(::Actions::Pulp::Repos::Update, product)
+    end
+  end
+
   def lookup_repositories
     lifecycle_envs = Katello::KTEnvironment.where(:name => ENV['LIFECYCLE_ENVIRONMENT']) if ENV['LIFECYCLE_ENVIRONMENT']
     content_views = Katello::ContentView.where(:name => ENV['CONTENT_VIEW']) if ENV['CONTENT_VIEW']

data/lib/katello/tasks/upgrades/3.7/import_pools.rake

@@ -0,0 +1,12 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.7' do
+      task :import_pools => ["environment"] do
+        User.current = User.anonymous_api_admin
+
+        puts _("Importing Pools")
+        Katello::Pool.import_all
+      end
+    end
+  end
+end

data/lib/katello/version.rb

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

data/package.json

@@ -26,6 +26,7 @@
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-preset-env": "^1.6.0",
+    "babel-polyfill": "^6.26.0",
     "babel-preset-react": "^6.24.1",
     "enzyme": "^3.2.0",
     "enzyme-adapter-react-16": "^1.1.0",
@@ -52,12 +53,12 @@
     "jed": "^1.1.1",
     "lodash": "^4.17.5",
     "patternfly": "^3.41.1",
-    "patternfly-react": "^2.1.0",
+    "patternfly-react": "2.5.1",
     "prop-types": "^15.6.0",
-    "react": "^16.0.0",
+    "react": "^16.3.1",
     "react-bootstrap": "^0.31.5",
     "react-bootstrap-tooltip-button": "^1.0.6",
-    "react-dom": "^16.0.0",
+    "react-dom": "^16.3.1",
     "react-ellipsis-with-tooltip": "^1.0.7",
     "react-redux": "^5.0.6",
     "react-router": "^4.2.0",

data/webpack/components/PaginationRow/index.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Paginator } from 'patternfly-react';
+import { isEqual } from 'lodash';
 
 const defaultPerPageOptions = [5, 10, 15, 25, 50];
 
@@ -26,8 +27,11 @@ class PaginationRow extends Component {
     this.onPerPageSelect = this.onPerPageSelect.bind(this);
   }
 
-  componentWillReceiveProps(newProps) {
-    this.setState(initPagination(newProps));
+  static getDerivedStateFromProps(newProps, prevState) {
+    if (!isEqual(newProps.pagination, prevState.pagination)) {
+      return { ...newProps.pagination };
+    }
+    return null;
   }
 
   onPageSet(page) {

data/webpack/containers/Application/config.js

@@ -1,6 +1,7 @@
 import Repos from '../../scenes/RedHatRepositories';
 import Subscriptions from '../../scenes/Subscriptions';
 import UpstreamSubscriptions from '../../scenes/Subscriptions/UpstreamSubscriptions/index';
+import SubscriptionDetails from '../../scenes/Subscriptions/Details';
 
 // eslint-disable-next-line import/prefer-default-export
 export const links = [
@@ -11,11 +12,15 @@ export const links = [
   },
   {
     text: 'RH Subscriptions',
-    path: 'xui/subscriptions',
+    path: 'subscriptions',
     component: Subscriptions,
   },
   {
-    path: 'xui/subscriptions/add',
+    path: 'subscriptions/add',
     component: UpstreamSubscriptions,
   },
+  {
+    path: 'subscriptions/:id(\[0-9]*$\)',
+    component: SubscriptionDetails,
+  },
 ];

data/webpack/index.js

@@ -4,15 +4,13 @@
 /* eslint-disable import/no-unresolved */
 
 import componentRegistry from 'foremanReact/components/componentRegistry';
-import { mount } from 'foremanReact/common/MountingService';
-import ExperimentalUi from './containers/Application/index';
+import Application from './containers/Application/index';
 import './redux';
 // Not currently mocking anything
 // import './services/api/setupMocks';
 
 componentRegistry.register({
-  name: 'xui_katello',
-  type: ExperimentalUi,
+  name: 'katello',
+  type: Application,
 });
 
-mount('xui_katello', '#reactRoot');

data/webpack/move_to_foreman/common/helpers.js

@@ -1,10 +1,11 @@
-import React from 'react';
-import { Table } from 'patternfly-react';
-
 export default {
   urlBuilder(controller, action, id = undefined) {
     return `/${controller}/${id ? `${id}/` : ''}${action}`;
   },
+
+  urlWithSearch(base, searchQuery) {
+    return `/${base}?search=${searchQuery}`;
+  },
 };
 
 export const KEY_CODES = {
@@ -13,24 +14,4 @@ export const KEY_CODES = {
   ESCAPE_KEY: 27,
 };
 
-export const selectionHeaderCellFormatter = (selectionController, label) => (
-  <Table.SelectionHeading aria-label={label}>
-    <Table.Checkbox
-      id="selectAll"
-      label={label}
-      checked={selectionController.allRowsSelected()}
-      onChange={() => selectionController.selectAllRows()}
-    />
-  </Table.SelectionHeading>
-);
-
-export const selectionCellFormatter = (selectionController, value, additionalData) => (
-  <Table.SelectionCell>
-    <Table.Checkbox
-      id={`select${additionalData.rowIndex}`}
-      label={__('Select row')}
-      checked={selectionController.isSelected(additionalData)}
-      onChange={() => selectionController.selectRow(additionalData)}
-    />
-  </Table.SelectionCell>
-);
+export const getResponseError = ({ data }) => data && (data.displayMessage || data.error);

data/webpack/move_to_foreman/components/common/emptyState/index.js

@@ -1,6 +1,7 @@
 /* eslint-disable */
 import React from 'react';
 import { EmptyState as PfEmptyState, Button } from 'patternfly-react';
+import { LinkContainer } from 'react-router-bootstrap';
 
 const EmptyState = (props) => {
   const {
@@ -29,18 +30,22 @@ const EmptyState = (props) => {
       )}
       {action && (
         <PfEmptyState.Action>
-          <Button href={action.url} bsStyle="primary" bsSize="large">
-            {action.title}
-          </Button>
+          <LinkContainer to={action.url}>
+            <Button href={action.url} bsStyle="primary" bsSize="large">
+              {action.title}
+            </Button>
+          </LinkContainer>
         </PfEmptyState.Action>
       )}
       {secondayActions && (
         <PfEmptyState.Action secondary>
           {secondayActions.map(item => (
-            <Button href={action.url} title={action.title}>
-              {item.title}
-            </Button>
-              ))}
+            <LinkContainer to={item.url}>
+              <Button href={item.url} title={item.title}>
+                {item.title}
+              </Button>
+            </LinkContainer>
+          ))}
         </PfEmptyState.Action>
         )}
     </PfEmptyState>

data/webpack/move_to_foreman/components/common/table/components/CollapseSubscriptionGroupButton.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { noop } from 'foremanReact/common/helpers';
+import { Icon } from 'patternfly-react';
+
+const CollapseSubscriptionGroupButton = ({
+  collapsed, onClick, ...props
+}) => {
+  const iconName = collapsed ? 'angle-right' : 'angle-down';
+
+  return (
+    <Icon
+      className="collapse-subscription-group-button"
+      name={iconName}
+      onClick={onClick}
+      {...props}
+    />
+  );
+};
+
+CollapseSubscriptionGroupButton.propTypes = {
+  collapsed: PropTypes.bool,
+  onClick: PropTypes.func,
+};
+
+CollapseSubscriptionGroupButton.defaultProps = {
+  collapsed: false,
+  onClick: noop,
+};
+
+export default CollapseSubscriptionGroupButton;