katello 4.13.0.rc1 → 4.13.1

data/lib/katello.rb

@@ -8,7 +8,6 @@ require "gettext_i18n_rails"
 require "foreman-tasks"
 require "foreman_remote_execution"
 require "rest_client"
-require "anemone"
 require "securerandom"
 
 require "deface"
@@ -21,7 +20,6 @@ require lib_foreman if Dir.exist?(lib_foreman)
 
 require File.expand_path("../engines/bastion/lib/bastion", File.dirname(__FILE__))
 require File.expand_path("../engines/bastion_katello/lib/bastion_katello", File.dirname(__FILE__))
-require "monkeys/anemone"
 
 module Katello
   require "katello/version"

data/package.json

@@ -51,7 +51,6 @@
     "angular": "1.8.2",
     "bootstrap-select": "1.13.18",
     "ngreact": "^0.5.0",
-    "query-string": "^6.1.0",
     "react-bootstrap": "^0.32.1",
     "use-deep-compare-effect": "^1.6.1"
   }

data/webpack/components/Content/ContentTable.js

@@ -20,7 +20,6 @@ const ContentTable = ({ content, tableSchema, onPaginationChange }) => {
       loadingText={__('Loading')}
     >
       <Table
-        ouiaId="content-table-table"
         columns={tableSchema}
         rows={results}
         pagination={pagination}

data/webpack/components/Content/__tests__/__snapshots__/ContentTable.test.js.snap

@@ -15,7 +15,6 @@ exports[`Content Table should render and contain appropriate components 1`] = `
     }
     itemCount={2}
     onPaginationChange={[Function]}
-    ouiaId="content-table-table"
     pagination={Object {}}
     rows={
       Array [

data/webpack/global_test_setup.js.bak

@@ -0,0 +1,59 @@
+import nock from 'nock';
+import checkForOuiaIds from './ouia_id_check';
+
+// runs before each test to make sure console.error output will
+// fail a test (i.e. default PropType missing). Check the error
+// output and traceback for actual error.
+const originalConsoleError = global.console.error;
+global.console.error = (error, stack) => {
+  originalConsoleError(error); // ensure error is printed to console, comment
+  // in case of ouia-id check
+
+  /* Uncomment block below to filter out PF4 ouiaId errors */
+  // const ignore = ['in ForwardRef (created by Tabs)',
+  //    'in Button (created by Label)', 'created by _default',
+  //    'created by PaginationOptionsMenu', 'created by TypeAheadItems',
+  //    'The prop `ouiaId` is marked as required in `Modal`, but its value is `undefined`',
+  //    'created by WizardHeader', 'created by Navigation',
+  //    'created by ActionsColumn', 'created by InactiveText', 'created by Select',
+  //    'created by Context.Consumer', 'created by DualListSelector'];
+
+  /* eslint-disable-next-line no-console */
+  if (stack) console.log(stack); // Prints out original stack trace
+
+  /* Uncomment block below to filter out PF4 ouiaId errors */
+  //  if (error && !ignore.some(e => error.includes(e))) {
+  //   originalConsoleError(error); // ensure error is printed to console
+  //   console.log(stack); // Prints out original stack trace
+  // }
+
+  throw new Error(error); // comment this and uncomment the next line when checking for ouia ids
+  // if (!error.includes('Failed prop type')) throw new Error(error);
+};
+
+// Increase jest timeout as some tests using multiple http mocks can time out on CI systems.
+jest.setTimeout(process.env.JEST_TIMEOUT || 15000);
+
+// uncomment this to see if tests are trying to make real API requests
+// beforeAll(() => {
+//   nock.disableNetConnect();
+// });
+
+afterAll(() => {
+  jest.resetModules();
+  if (global.gc) global.gc();
+});
+
+beforeEach(() => {
+  if (!nock.isActive()) { nock.activate(); }
+});
+
+// To see where you need to add ouiaIds:
+// 1. uncomment this and the import above
+checkForOuiaIds();
+// 2. (optional) uncomment the line in global.console.error function above
+
+afterEach(() => {
+  nock.cleanAll();
+});
+

data/webpack/scenes/ModuleStreams/ModuleStreamsPage.js

@@ -1,59 +1,53 @@
-import React, { Component } from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import qs from 'query-string';
+import { useUrlParams } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { orgId } from '../../services/api';
 import TableSchema from '../ModuleStreams/ModuleStreamsTableSchema';
 import GenericContentPage from '../../components/Content/GenericContentPage';
 
-class ModuleStreamsPage extends Component {
-  constructor(props) {
-    super(props);
+const ModuleStreamsPage = (props) => {
+  const { searchParam } = useUrlParams();
+  const [searchQuery, setSearchQuery] = useState(searchParam || '');
+  const { getModuleStreams } = props;
 
-    const queryParams = qs.parse(this.props.location.search);
-    this.state = {
-      searchQuery: queryParams.search || '',
-    };
-  }
-
-  componentDidMount() {
-    this.props.getModuleStreams({
-      search: this.state.searchQuery,
+  useEffect(() => {
+    getModuleStreams({
+      search: searchQuery,
     });
-  }
+  }, [getModuleStreams, searchQuery]);
 
-  onPaginationChange = (pagination) => {
-    this.props.getModuleStreams({
+  const onPaginationChange = (pagination) => {
+    props.getModuleStreams({
       ...pagination,
     });
   };
 
-  onSearch = (search) => {
-    this.props.getModuleStreams({ search });
+  const onSearch = (search) => {
+    props.getModuleStreams({ search });
   };
 
-  updateSearchQuery = (searchQuery) => {
-    this.setState({ searchQuery });
+  const updateSearchQuery = (newSearchQuery) => {
+    setSearchQuery(newSearchQuery);
   };
 
-  render() {
-    const { moduleStreams } = this.props;
-    return (
-      <GenericContentPage
-        header={__('Module Streams')}
-        content={moduleStreams}
-        tableSchema={TableSchema}
-        onSearch={this.onSearch}
-        autocompleteEndpoint="/katello/api/v2/module_streams"
-        autocompleteQueryParams={{ organization_id: orgId() }}
-        bookmarkController="katello_module_streams"
-        updateSearchQuery={this.updateSearchQuery}
-        initialInputValue={this.state.searchQuery}
-        onPaginationChange={this.onPaginationChange}
-      />
-    );
-  }
-}
+  const { moduleStreams } = props;
+  return (
+    <GenericContentPage
+      header={__('Module Streams')}
+      content={moduleStreams}
+      tableSchema={TableSchema}
+      onSearch={onSearch}
+      autocompleteEndpoint="/katello/api/v2/module_streams"
+      autocompleteQueryParams={{ organization_id: orgId() }}
+      bookmarkController="katello_module_streams"
+      updateSearchQuery={updateSearchQuery}
+      initialInputValue={searchQuery}
+      onPaginationChange={onPaginationChange}
+    />
+  );
+};
+
 
 ModuleStreamsPage.propTypes = {
   location: PropTypes.shape({

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

@@ -1,19 +1,21 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
+import * as hooks from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import ModuleStreamsPage from '../ModuleStreamsPage';
 import GenericContentPage from '../../../components/Content/GenericContentPage';
 
 describe('Module streams page', () => {
   it('should render and contain appropiate components', async () => {
     const moduleStreams = {};
-    const mockLocation = { search: '' };
+    jest.spyOn(hooks, 'useUrlParams').mockImplementation(() => ({
+      searchParam: '',
+    }));
     const getModuleStreams = () => {};
 
     const wrapper = shallow(<ModuleStreamsPage
       moduleStreams={moduleStreams}
       getModuleStreams={getModuleStreams}
-      location={mockLocation}
     />);
 
     expect(toJson(wrapper)).toMatchSnapshot();

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

@@ -88,7 +88,6 @@ exports[`Module streams table should render and contain appropiate components 1`
     }
     itemCount={0}
     onPaginationChange={[Function]}
-    ouiaId="content-table-table"
     pagination={Object {}}
     rows={Array []}
   />

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

@@ -137,6 +137,8 @@ class ManageManifestModal extends Component {
       return name;
     };
 
+    const manifestExpiredMessage = manifestExpirationDate ? __('Your manifest expired on {expirationDate}. To continue using Red Hat content, import a new manifest.') : __('Your manifest has expired. To continue using Red Hat content, import a new manifest.');
+
     return (
       <ForemanModal id={MANAGE_MANIFEST_MODAL_ID} title={__('Manage Manifest')}>
         <Tabs id="manifest-history-tabs">
@@ -181,7 +183,7 @@ class ManageManifestModal extends Component {
                           title={__('Manifest expired')}
                         >
                           <FormattedMessage
-                            defaultMessage={__('Your manifest expired on {expirationDate}. To continue using Red Hat content, import a new manifest.')}
+                            defaultMessage={manifestExpiredMessage}
                             values={{
                               expirationDate: new Date(manifestExpirationDate).toDateString(),
                             }}
@@ -198,7 +200,7 @@ class ManageManifestModal extends Component {
                           {getManifestName()}
                         </Col>
                       </Row>
-                      {isManifestImported && manifestExpirationDate &&
+                      {isManifestImported && Boolean(manifestExpirationDate) &&
                         <Row>
                           <Col sm={5} />
                           <Col sm={7}>