katello 3.10.2 → 3.11.0.rc1

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.18'
+  requires_foreman '>= 1.21'
 
   sub_menu :top_menu, :content_menu, :caption => N_('Content'),
            :icon => 'fa fa-book', :after => :monitor_menu do
@@ -296,13 +296,13 @@ Foreman::Plugin.register :katello do
                   'bastion/bastion/index_ie should have a permission that grants access'
                 ])
 
-  add_controller_action_scope(HostsController, :index) do |base_scope|
+  add_controller_action_scope('HostsController', :index) do |base_scope|
     base_scope
       .preload(:content_view, :lifecycle_environment, :subscription_facet)
       .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])
   end
 
-  add_controller_action_scope(Api::V2::HostsController, :index) do |base_scope|
+  add_controller_action_scope('Api::V2::HostsController', :index) do |base_scope|
     base_scope
       .preload(:content_view, :lifecycle_environment, :subscription_facet)
       .preload(content_facet: [:bound_repositories, :content_view, :lifecycle_environment])

data/lib/katello/repository_types/deb.rb

@@ -1,3 +1,4 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::DEB_TYPE) do
   service_class Katello::Pulp::Repository::Deb
+  prevent_unneeded_metadata_publish
 end

data/lib/katello/repository_types/yum.rb

@@ -1,3 +1,4 @@
 Katello::RepositoryTypeManager.register(::Katello::Repository::YUM_TYPE) do
   service_class Katello::Pulp::Repository::Yum
+  prevent_unneeded_metadata_publish
 end

data/lib/katello/tasks/reimport.rake

@@ -23,6 +23,7 @@ namespace :katello do
               Katello::Rpm,
               Katello::Srpm,
               Katello::ModuleStream,
+              Katello::YumMetadataFile,
               Katello::Deb,
               Katello::FileUnit,
               Katello::Subscription,

data/lib/katello/tasks/repository.rake

@@ -98,7 +98,7 @@ namespace :katello do
     repos.find_each.with_index do |repo, index|
       puts "Processing Repository #{index + 1}/#{repos.count}: #{repo.name} (#{repo.id})"
       begin
-        ForemanTasks.sync_task(::Actions::Katello::Repository::Update, repo,
+        ForemanTasks.sync_task(::Actions::Katello::Repository::Update, repo.root,
                                download_policy: policy)
       rescue => e
         puts "Failed to update repository #{repo.name} (#{repo.id}): #{e.message}"

data/lib/katello/tasks/upgrades/3.11/import_yum_metadata_file.rake

@@ -0,0 +1,12 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.11' do
+      desc "Import yum metadata file units from pulp"
+      task :import_yum_metadata => ["environment"] do
+        User.current = User.anonymous_api_admin
+        puts _("Importing Yum Metadata Files")
+        Katello::YumMetadataFile.import_all
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.10.2".freeze
+  VERSION = "3.11.0.rc1".freeze
 end

data/package.json

@@ -59,7 +59,9 @@
     "jed": "^1.1.1",
     "lodash": "^4.17.5",
     "patternfly": "^3.41.1",
-    "patternfly-react": "<=2.32.0",
+    "patternfly-react": "^2.5.1",
+    "angular": "1.5.5",
+    "ngreact": "^0.5.0",
     "prop-types": "^15.6.0",
     "query-string": "^6.1.0",
     "react": "^16.4.0",

data/webpack/__mocks__/foremanReact/components/Pagination/PaginationWrapper.js

@@ -0,0 +1,2 @@
+const PaginationWrapper = () => jest.fn();
+export default PaginationWrapper;

data/webpack/__mocks__/foremanReact/components/common/EmptyState.js

@@ -0,0 +1,8 @@
+import React from 'react';
+
+const EmptyState = props => (
+  <div>
+    {`EmptyState: ${JSON.stringify(props)}`}
+  </div>
+);
+export default EmptyState;

data/webpack/common_index.js

@@ -0,0 +1,6 @@
+/* eslint import/no-unresolved: [2, { ignore: [foremanReact/*] }] */
+/* eslint-disable import/no-extraneous-dependencies */
+/* eslint-disable import/extensions */
+/* eslint-disable import/no-unresolved */
+
+require('ngreact');

data/webpack/containers/Application/config.js

@@ -21,7 +21,7 @@ export const links = [
   {
     path: 'subscriptions',
     component: WithOrganization(
-      withHeader(Subscriptions, { title: __('RH Subscriptions') }),
+      withHeader(Subscriptions, { title: __('Subscriptions') }),
       '/subscriptions',
     ),
   },
@@ -31,7 +31,7 @@ export const links = [
   },
   {
     // eslint-disable-next-line no-useless-escape
-    path: 'subscriptions/:id([0-9]+)',
+    path: 'subscriptions/:id([0-9]*$)',
     component: withHeader(SubscriptionDetails, { title: __('Subscription Details') }),
   },
   {
@@ -43,7 +43,7 @@ export const links = [
     component: withHeader(ModuleStreams, { title: __('Module Streams') }),
   },
   {
-    path: 'module_streams/:id([0-9]+)',
+    path: 'module_streams/:id([0-9]*$)',
     component: withHeader(ModuleStreamDetails, { title: __('Module Stream Details') }),
   },
 ];

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

@@ -2,8 +2,8 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Table as PfTable } from 'patternfly-react';
 import { noop } from 'foremanReact/common/helpers';
-import EmptyState from '../../EmptyState';
-import PaginationRow from '../../../../../components/PaginationRow/index';
+import EmptyState from 'foremanReact/components/common/EmptyState';
+import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
 
 import TableBody from './TableBody';
 
@@ -42,7 +42,7 @@ const Table = ({
         {body}
       </PfTable.PfProvider>
       {shouldRenderPagination && (
-        <PaginationRow
+        <Pagination
           viewType="table"
           itemCount={itemCount}
           pagination={pagination}

data/webpack/move_to_foreman/components/common/table/components/Table.test.js

@@ -3,6 +3,8 @@ import { testComponentSnapshotsWithFixtures } from '../../../../../move_to_pf/te
 import Table from './Table';
 import { columnsFixtures, rowsFixtures } from './TableFixtures';
 
+jest.mock('foremanReact/components/Pagination/PaginationWrapper');
+
 const fixtures = {
   'renders Table with emptyState': {
     columns: columnsFixtures,

data/webpack/move_to_foreman/components/common/table/components/__snapshots__/Table.test.js.snap

@@ -137,24 +137,8 @@ exports[`Table renders Table with pagination 1`] = `
   >
     some children
   </TablePfProvider>
-  <PaginationRow
-    className=""
-    dropdownButtonId="pagination-row-dropdown"
+  <PaginationWrapper
     itemCount={2}
-    messages={
-      Object {
-        "currentPage": "Current Page",
-        "firstPage": "First Page",
-        "lastPage": "Last Page",
-        "nextPage": "Next Page",
-        "of": "of",
-        "perPage": "per page",
-        "previousPage": "Previous Page",
-      }
-    }
-    onChange={[Function]}
-    onPageSet={[Function]}
-    onPerPageSelect={[Function]}
     pagination={
       Object {
         "page": 1,

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -7,22 +7,31 @@ const repoTypeSearchQueryMap = {
   beta: 'name ~ beta',
 };
 
-const recommendedRepositorySetLables = [
+const recommendedRepositoriesRHEL = [
   'rhel-7-server-rpms',
-  'rhel-6-server-rpms',
-  'rhel-6-server-satellite-tools-6.3-rpms',
-  'rhel-server-rhscl-7-rpms',
-  'rhel-7-server-satellite-capsule-6.3-rpms',
-  'rhel-7-server-satellite-capsule-6.4-rpms',
-  'rhel-7-server-satellite-tools-6.3-rpms',
-  'rhel-6-server-satellite-tools-6.3-rpms',
-  'rhel-7-server-ansible-2.5-rpms',
   'rhel-7-server-optional-rpms',
   'rhel-7-server-extras-rpms',
-  'rhel-5-server-els-rpms',
   'rhel-7-server-eus-rpms',
+  'rhel-6-server-rpms',
+  'rhel-5-server-els-rpms',
 ];
 
+const recommendedRepositoriesSatTools = [
+  'rhel-7-server-satellite-tools-6.4-rpms',
+  'rhel-6-server-satellite-tools-6.4-rpms',
+  'rhel-5-server-els-satellite-tools-6.4-rpms',
+];
+
+const recommendedRepositoriesMisc = [
+  'rhel-server-rhscl-7-rpms',
+  'rhel-7-server-satellite-capsule-6.4-rpms',
+  'rhel-7-server-ansible-2.6-rpms',
+];
+
+const recommendedRepositorySetLables = recommendedRepositoriesRHEL
+  .concat(recommendedRepositoriesSatTools)
+  .concat(recommendedRepositoriesMisc);
+
 const createLablesQuery = lables =>
   lables.map(label => `label = ${label}`).join(' or ');
 

data/webpack/scenes/ModuleStreams/Details/Profiles/__tests__/ModuleStreamDetailProfiles.test.js

@@ -2,6 +2,8 @@ import ModuleStreamDetailProfiles from '../ModuleStreamDetailProfiles';
 import { testComponentSnapshotsWithFixtures } from '../../../../../move_to_pf/test-utils/testHelpers';
 import { details } from '../../__tests__/moduleStreamDetails.fixtures';
 
+jest.mock('foremanReact/components/Pagination/PaginationWrapper');
+
 const fixtures = {
   'renders with profiles': {
     profiles: details.profiles,

data/webpack/scenes/ModuleStreams/Details/Repositories/__tests__/ModuleStreamDetailRepositories.test.js

@@ -2,6 +2,8 @@ import ModuleStreamDetailRepositories from '../ModuleStreamDetailRepositories';
 import { testComponentSnapshotsWithFixtures } from '../../../../../move_to_pf/test-utils/testHelpers';
 import { details } from '../../__tests__/moduleStreamDetails.fixtures';
 
+jest.mock('foremanReact/components/Pagination/PaginationWrapper');
+
 const fixtures = {
   'renders with repositories': {
     repositories: details.repositories,

data/webpack/scenes/ModuleStreams/Details/__tests__/ModuleStreamDetails.test.js

@@ -2,6 +2,8 @@ import ModuleStreamDetails from '../ModuleStreamDetails';
 import { testComponentSnapshotsWithFixtures } from '../../../../move_to_pf/test-utils/testHelpers';
 import { details, loadingState } from './moduleStreamDetails.fixtures';
 
+jest.mock('foremanReact/components/Pagination/PaginationWrapper');
+
 const mockFunc = jest.fn();
 
 const baseProps = {

data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamPage.test.js

@@ -6,6 +6,7 @@ import ModuleStreamsTable from '../ModuleStreamsTable';
 import Search from '../../../components/Search/index';
 
 jest.mock('../../../move_to_foreman/foreman_toast_notifications');
+jest.mock('foremanReact/components/Pagination/PaginationWrapper', () => (<div>Pagination Mock</div>));
 
 describe('Module streams page', () => {
   it('should render and contain appropiate components', async () => {

data/webpack/scenes/ModuleStreams/__tests__/ModuleStreamsTable.test.js

@@ -5,6 +5,7 @@ import ModuleStreamsTable from '../ModuleStreamsTable';
 import { Table } from '../../../move_to_foreman/components/common/table';
 
 jest.mock('../../../move_to_foreman/foreman_toast_notifications');
+jest.mock('foremanReact/components/Pagination/PaginationWrapper', () => (<div>Pagination Mock</div>));
 
 describe('Module streams table', () => {
   it('should render and contain appropiate components', async () => {

data/webpack/scenes/RedHatRepositories/helpers.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { ListView } from 'patternfly-react';
 import { sprintf } from 'foremanReact/common/I18n';
+import Pagination from 'foremanReact/components/Pagination/PaginationWrapper';
 
-import PaginationRow from '../../components/PaginationRow/index';
 import RepositorySet from './components/RepositorySet';
 import EnabledRepository from './components/EnabledRepository';
 
@@ -33,7 +33,7 @@ export const getSetsComponent = (repoSetsState, onPaginationChange) => {
   return (
     <ListView>
       <div className="sticky-pagination">
-        <PaginationRow
+        <Pagination
           viewType="list"
           itemCount={itemCount}
           pagination={pagination}
@@ -63,7 +63,7 @@ export const getEnabledComponent = (enabledReposState, onPaginationChange) => {
   return (
     <ListView>
       <div className="sticky-pagination sticky-pagination-grey">
-        <PaginationRow
+        <Pagination
           viewType="list"
           itemCount={itemCount}
           pagination={pagination}

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetailProductContent.test.js.snap

@@ -6,6 +6,7 @@ exports[`subscription detail product content page renders correctly 1`] = `
 >
   <div
     className="list-group-item"
+    initExpanded={false}
   >
     <div
       className="list-group-item-header"

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -112,7 +112,7 @@ class ManageManifestModal extends Component {
       header: __('There is no Manifest History to display.'),
       description: __('Import a Manifest using the manifest tab above.'),
       documentation: {
-        title: __('Learn more about adding Subscription Manifests'),
+        label: __('Learn more about adding Subscription Manifests'),
         url: 'http://redhat.com',
       },
     });

data/webpack/scenes/Subscriptions/Manifest/__tests__/ManageManifestModal.test.js

@@ -5,6 +5,7 @@ import ManageManifestModal from '../ManageManifestModal';
 import { manifestHistorySuccessState } from './manifest.fixtures';
 
 jest.mock('../../../../move_to_foreman/foreman_toast_notifications');
+jest.mock('foremanReact/components/Pagination/PaginationWrapper', () => (<div>Pagination Mock</div>));
 
 describe('manage manifest modal', () => {
   const noop = () => {};

data/webpack/scenes/Subscriptions/Manifest/__tests__/__snapshots__/ManageManifestModal.test.js.snap

@@ -312,7 +312,7 @@ exports[`manage manifest modal should render 1`] = `
               Object {
                 "description": "Import a Manifest using the manifest tab above.",
                 "documentation": Object {
-                  "title": "Learn more about adding Subscription Manifests",
+                  "label": "Learn more about adding Subscription Manifests",
                   "url": "http://redhat.com",
                 },
                 "header": "There is no Manifest History to display.",

data/webpack/scenes/Subscriptions/SubscriptionActions.js

@@ -24,6 +24,10 @@ import {
   SUBSCRIPTIONS_CLOSE_MANIFEST_MODAL,
   SUBSCRIPTIONS_OPEN_DELETE_MODAL,
   SUBSCRIPTIONS_CLOSE_DELETE_MODAL,
+  SUBSCRIPTIONS_OPEN_TASK_MODAL,
+  SUBSCRIPTIONS_CLOSE_TASK_MODAL,
+  SUBSCRIPTIONS_DISABLE_DELETE_BUTTON,
+  SUBSCRIPTIONS_ENABLE_DELETE_BUTTON,
 } from './SubscriptionConstants';
 import { filterRHSubscriptions, selectSubscriptionsQuantitiesFromResponse } from './SubscriptionHelpers.js';
 import { apiError } from '../../move_to_foreman/common/helpers.js';
@@ -136,4 +140,10 @@ export const closeManageManifestModal = () => ({ type: SUBSCRIPTIONS_CLOSE_MANIF
 export const openDeleteModal = () => ({ type: SUBSCRIPTIONS_OPEN_DELETE_MODAL });
 export const closeDeleteModal = () => ({ type: SUBSCRIPTIONS_CLOSE_DELETE_MODAL });
 
+export const openTaskModal = () => ({ type: SUBSCRIPTIONS_OPEN_TASK_MODAL });
+export const closeTaskModal = () => ({ type: SUBSCRIPTIONS_CLOSE_TASK_MODAL });
+
+export const disableDeleteButton = () => ({ type: SUBSCRIPTIONS_DISABLE_DELETE_BUTTON });
+export const enableDeleteButton = () => ({ type: SUBSCRIPTIONS_ENABLE_DELETE_BUTTON });
+
 export default loadSubscriptions;

data/webpack/scenes/Subscriptions/SubscriptionConstants.js

@@ -27,6 +27,12 @@ export const SUBSCRIPTIONS_CLOSE_MANIFEST_MODAL = 'SUBSCRIPTIONS_CLOSE_MANIFEST_
 export const SUBSCRIPTIONS_OPEN_DELETE_MODAL = 'SUBSCRIPTIONS_OPEN_DELETE_MODAL';
 export const SUBSCRIPTIONS_CLOSE_DELETE_MODAL = 'SUBSCRIPTIONS_CLOSE_DELETE_MODAL';
 
+export const SUBSCRIPTIONS_OPEN_TASK_MODAL = 'SUBSCRIPTIONS_OPEN_TASK_MODAL';
+export const SUBSCRIPTIONS_CLOSE_TASK_MODAL = 'SUBSCRIPTIONS_CLOSE_TASK_MODAL';
+
+export const SUBSCRIPTIONS_DISABLE_DELETE_BUTTON = 'SUBSCRIPTIONS_DISABLE_DELETE_BUTTON';
+export const SUBSCRIPTIONS_ENABLE_DELETE_BUTTON = 'SUBSCRIPTIONS_ENABLE_DELETE_BUTTON';
+
 export const BLOCKING_FOREMAN_TASK_TYPES = [
   'Actions::Katello::Organization::ManifestImport',
   'Actions::Katello::Organization::ManifestRefresh',

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -22,6 +22,10 @@ import {
   SUBSCRIPTIONS_CLOSE_MANIFEST_MODAL,
   SUBSCRIPTIONS_OPEN_DELETE_MODAL,
   SUBSCRIPTIONS_CLOSE_DELETE_MODAL,
+  SUBSCRIPTIONS_OPEN_TASK_MODAL,
+  SUBSCRIPTIONS_CLOSE_TASK_MODAL,
+  SUBSCRIPTIONS_DISABLE_DELETE_BUTTON,
+  SUBSCRIPTIONS_ENABLE_DELETE_BUTTON,
 } from './SubscriptionConstants';
 import { GET_SETTING_SUCCESS } from '../../move_to_foreman/Settings/SettingsConstants';
 
@@ -30,6 +34,8 @@ const initialState = Immutable({
   searchQuery: '',
   manifestModalOpened: false,
   deleteModalOpened: false,
+  taskModalOpened: false,
+  deleteButtonDisabled: true,
   quantitiesLoading: false,
   availableQuantities: null,
   tasks: [],
@@ -147,6 +153,16 @@ export default (state = initialState, action) => {
     case SUBSCRIPTIONS_CLOSE_DELETE_MODAL:
       return state.set('deleteModalOpened', false);
 
+    case SUBSCRIPTIONS_OPEN_TASK_MODAL:
+      return state.set('taskModalOpened', true);
+    case SUBSCRIPTIONS_CLOSE_TASK_MODAL:
+      return state.set('taskModalOpened', false);
+
+    case SUBSCRIPTIONS_DISABLE_DELETE_BUTTON:
+      return state.set('deleteButtonDisabled', true);
+    case SUBSCRIPTIONS_ENABLE_DELETE_BUTTON:
+      return state.set('deleteButtonDisabled', false);
+
     default:
       return state;
   }

data/webpack/scenes/Subscriptions/SubscriptionValidations.js

@@ -1,7 +1,7 @@
 import { translate as __ } from 'foremanReact/common/I18n';
 import { filterRHSubscriptions } from './SubscriptionHelpers.js';
 
-export const validateQuantity = (quantity, availableQuantity) => {
+export const validateQuantity = (quantity, maxQuantity) => {
   let state;
   let message;
 
@@ -12,7 +12,7 @@ export const validateQuantity = (quantity, availableQuantity) => {
   } else if (numberValue <= 0) {
     state = 'error';
     message = __('Has to be > 0');
-  } else if (availableQuantity && availableQuantity >= 0 && numberValue > availableQuantity) {
+  } else if (maxQuantity && maxQuantity >= 0 && numberValue > maxQuantity) {
     state = 'error';
     message = __('Exceeds available quantity');
   }
@@ -23,4 +23,4 @@ export const validateQuantity = (quantity, availableQuantity) => {
 };
 
 export const recordsValid = rows =>
-  filterRHSubscriptions(rows).every(row => validateQuantity(row.quantity, row.availableQuantity).state !== 'error');
+  filterRHSubscriptions(rows).every(row => validateQuantity(row.quantity, row.maxQuantity).state !== 'error');