katello 3.13.4 → 3.14.0.rc1

data/lib/katello/tasks/reimport.rake

@@ -24,6 +24,7 @@ namespace :katello do
               Katello::Srpm,
               Katello::ModuleStream,
               Katello::YumMetadataFile,
+              Katello::Deb,
               Katello::FileUnit,
               Katello::Subscription,
               Katello::Pool,
@@ -34,7 +35,6 @@ namespace :katello do
               Katello::Content]
 
     models << Katello::OstreeBranch if Katello::RepositoryTypeManager.find(Katello::Repository::OSTREE_TYPE).present?
-    models << Katello::Deb if Katello::RepositoryTypeManager.find(Katello::Repository::DEB_TYPE).present?
 
     models.each do |model|
       print "Importing #{model.name}\n"

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.13.4".freeze
+  VERSION = "3.14.0.rc1".freeze
 end

data/package.json

@@ -25,10 +25,10 @@
   "devDependencies": {
     "@storybook/react": "^3.2.17",
     "@storybook/storybook-deployer": "^2.0.0",
-    "@theforeman/vendor-dev": "^0.1.1",
+    "@theforeman/vendor-dev": "^1.4.0",
     "axios-mock-adapter": "^1.10.0",
     "babel-core": "^6.26.3",
-    "babel-eslint": "^8.2.6",
+    "babel-eslint": "^10.0.3",
     "babel-jest": "^23.4.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
@@ -40,12 +40,13 @@
     "enzyme": "^3.4.0",
     "enzyme-adapter-react-16": "^1.4.0",
     "enzyme-to-json": "^3.1.2",
-    "eslint": "^4.19.1",
+    "eslint": "^6.2.2",
     "eslint-config-airbnb": "^16.0.0",
     "eslint-plugin-babel": "^5.1.0",
     "eslint-plugin-import": "^2.7.0",
     "eslint-plugin-jest": "^21.18.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-react": "^7.4.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^23.4.1",
@@ -55,7 +56,7 @@
     "redux-mock-store": "^1.3.0"
   },
   "dependencies": {
-    "@theforeman/vendor": "^0.1.1",
+    "@theforeman/vendor": "^1.4.0",
     "angular": "1.5.5",
     "bootstrap-select": "1.12.4",
     "downshift": "^1.28.0",
@@ -86,7 +87,10 @@
       "<rootDir>/.+fixtures.+",
       "<rootDir>/engines"
     ],
-    "moduleDirectories": ["node_modules/@theforeman/vendor-core/node_modules", "node_modules"],
+    "moduleDirectories": [
+      "node_modules/@theforeman/vendor-core/node_modules",
+      "node_modules"
+    ],
     "moduleNameMapper": {
       "^.+\\.(css|scss)$": "identity-obj-proxy"
     }

data/webpack/__mocks__/foremanReact/common/helpers.js

@@ -1,4 +1,4 @@
-import { snakeCase } from 'lodash';
+import { snakeCase, camelCase } from 'lodash';
 
 export const stringIsPositiveNumber = (value) => {
   const reg = new RegExp('^[0-9]+$');
@@ -16,3 +16,6 @@ const propsToCase = (casingFn, errorMsg, ob) => {
 
 export const propsToSnakeCase = ob =>
   propsToCase(snakeCase, 'propsToSnakeCase only takes objects', ob);
+
+export const propsToCamelCase = ob =>
+  propsToCase(camelCase, 'propsToCamelCase only takes objects', ob);

data/webpack/__mocks__/foremanReact/components/PermissionDenied/index.js

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

data/webpack/components/Content/ContentPage.js

@@ -0,0 +1,55 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Grid, Col, Row, Form, FormGroup } from 'react-bootstrap';
+import Search from '../../components/Search/index';
+import ContentTable from './ContentTable';
+
+const ContentPage = ({
+  header, onSearch, getAutoCompleteParams,
+  updateSearchQuery, initialInputValue,
+  content, tableSchema, onPaginationChange,
+}) => (
+  <Grid bsClass="container-fluid">
+    <Row>
+      <Col sm={12}>
+        <h1>{header}</h1>
+      </Col>
+    </Row>
+    <Row>
+      <Col sm={6}>
+        <Form className="toolbar-pf-actions">
+          <FormGroup className="toolbar-pf toolbar-pf-filter">
+            <Search
+              onSearch={onSearch}
+              getAutoCompleteParams={getAutoCompleteParams}
+              updateSearchQuery={updateSearchQuery}
+              initialInputValue={initialInputValue}
+            />
+          </FormGroup>
+        </Form>
+      </Col>
+    </Row>
+    <Row>
+      <Col sm={12}>
+        <ContentTable
+          content={content}
+          tableSchema={tableSchema}
+          onPaginationChange={onPaginationChange}
+        />
+      </Col>
+    </Row>
+  </Grid>
+);
+
+ContentPage.propTypes = {
+  header: PropTypes.string.isRequired,
+  content: PropTypes.shape({}).isRequired,
+  tableSchema: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
+  onSearch: PropTypes.func.isRequired,
+  getAutoCompleteParams: PropTypes.func.isRequired,
+  updateSearchQuery: PropTypes.func.isRequired,
+  initialInputValue: PropTypes.string.isRequired,
+  onPaginationChange: PropTypes.func.isRequired,
+};
+
+export default ContentPage;

data/webpack/{scenes/ModuleStreams/ModuleStreamsTable.js → components/Content/ContentTable.js}

@@ -3,16 +3,15 @@ import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 import { Table } from '../../move_to_foreman/components/common/table';
-import TableSchema from './ModuleStreamsTableSchema';
 import { LoadingState } from '../../move_to_pf/LoadingState';
 
-const ModuleStreamsTable = ({ moduleStreams, onPaginationChange }) => {
+const ContentTable = ({ content, tableSchema, onPaginationChange }) => {
   const {
     loading, results, pagination, itemCount,
-  } = moduleStreams;
+  } = content;
 
   const emptyStateData = {
-    header: __('No Module Streams found'),
+    header: __('No Content found'),
   };
 
   return (
@@ -21,7 +20,7 @@ const ModuleStreamsTable = ({ moduleStreams, onPaginationChange }) => {
       loadingText={__('Loading')}
     >
       <Table
-        columns={TableSchema}
+        columns={tableSchema}
         rows={results}
         pagination={pagination}
         onPaginationChange={onPaginationChange}
@@ -32,14 +31,16 @@ const ModuleStreamsTable = ({ moduleStreams, onPaginationChange }) => {
   );
 };
 
-ModuleStreamsTable.propTypes = {
-  moduleStreams: PropTypes.shape({
+ContentTable.propTypes = {
+  content: PropTypes.shape({
     loading: PropTypes.bool,
     results: PropTypes.array,
     pagination: PropTypes.shape({}),
     itemCount: PropTypes.number,
   }).isRequired,
   onPaginationChange: PropTypes.func.isRequired,
+  tableSchema: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
 };
 
-export default ModuleStreamsTable;
+
+export default ContentTable;

data/webpack/components/Content/Details/ContentDetailInfo.js

@@ -0,0 +1,33 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Table } from 'react-bootstrap';
+
+// using Map to preserve order
+
+const createRows = (details, mapping) => {
+  const rows = [];
+  /* eslint-disable no-restricted-syntax, react/jsx-closing-tag-location */
+  for (const key of mapping.keys()) {
+    rows.push(<tr key={key}>
+      <td><b>{mapping.get(key)}</b></td>
+      <td>{Array.isArray(details[key]) ? details[key].join(', ') : details[key]}</td>
+    </tr>);
+  }
+  /* eslint-enable no-restricted-syntax, react/jsx-closing-tag-location */
+  return rows;
+};
+
+const ContentDetailInfo = ({ contentDetails, displayMap }) => (
+  <Table>
+    <tbody>
+      {createRows(contentDetails, displayMap)}
+    </tbody>
+  </Table>
+);
+
+ContentDetailInfo.propTypes = {
+  contentDetails: PropTypes.shape({}).isRequired,
+  displayMap: PropTypes.instanceOf(Map).isRequired,
+};
+
+export default ContentDetailInfo;

data/webpack/{scenes/ModuleStreams/Details/Repositories/ModuleStreamDetailRepositories.js → components/Content/Details/ContentDetailRepositories.js}

@@ -1,9 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Table } from 'patternfly-react';
-import TableSchema from './TableSchema';
+import TableSchema from './ContentDetailRepositoryTableSchema';
 
-const ModuleStreamDetailRepositories = ({ repositories }) => (
+const ContentDetailRepositories = ({ repositories }) => (
   <div>
     <Table.PfProvider columns={TableSchema}>
       <Table.Header />
@@ -12,8 +12,8 @@ const ModuleStreamDetailRepositories = ({ repositories }) => (
   </div>
 );
 
-ModuleStreamDetailRepositories.propTypes = {
+ContentDetailRepositories.propTypes = {
   repositories: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
 };
 
-export default ModuleStreamDetailRepositories;
+export default ContentDetailRepositories;

data/webpack/{scenes/ModuleStreams/Details/Repositories/TableSchema.js → components/Content/Details/ContentDetailRepositoryTableSchema.js}

@@ -4,7 +4,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import {
   headerFormatter,
   cellFormatter,
-} from '../../../../move_to_foreman/components/common/table';
+} from '../../../move_to_foreman/components/common/table';
 
 const TableSchema = [
   {

data/webpack/components/Content/Details/ContentDetails.js

@@ -0,0 +1,70 @@
+import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { Nav, NavItem, TabPane, TabContent, TabContainer, Grid, Row, Col } from 'patternfly-react';
+import { PropTypes } from 'prop-types';
+import { LoadingState } from '../../../move_to_pf/LoadingState/index';
+
+const ContentDetails = (props) => {
+  const { contentDetails, schema } = props;
+  const { loading } = contentDetails;
+
+  const tabHeaders = () => {
+    const tabs = schema.map(node => (
+      <NavItem key={node.key} eventKey={node.key}>
+        <div>{node.tabHeader}</div>
+      </NavItem>
+    ));
+    return tabs;
+  };
+
+  const tabPanes = () => {
+    const tabPane = schema.map(node => (
+      <TabPane key={node.key} eventKey={node.key}>
+        <Row>
+          <Col sm={12}>
+            {node.tabContent}
+          </Col>
+        </Row>
+      </TabPane>
+    ));
+    return tabPane;
+  };
+
+  return (
+    <div>
+      <LoadingState
+        loading={loading}
+        loadingText={__('Loading')}
+      >
+        <TabContainer id="content-tabs-container" defaultActiveKey={1}>
+          <Grid bsClass="container-fluid">
+            <Row>
+              <Col sm={12}>
+                <Nav id="content-nav-container" bsClass="nav nav-tabs">
+                  {schema && tabHeaders()}
+                </Nav>
+              </Col>
+            </Row>
+            <TabContent animation={false}>
+              {schema && tabPanes()}
+            </TabContent>
+          </Grid>
+        </TabContainer>
+      </LoadingState>
+    </div>
+  );
+};
+
+ContentDetails.propTypes = {
+  contentDetails: PropTypes.shape({
+    loading: PropTypes.bool,
+    name: PropTypes.string,
+    profiles: PropTypes.array,
+    repositories: PropTypes.array,
+    artifacts: PropTypes.array,
+    stream: PropTypes.string,
+  }).isRequired,
+  schema: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
+};
+
+export default ContentDetails;

data/webpack/components/Content/Details/__tests__/ContentDetailInfo.test.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+import { Table } from 'react-bootstrap';
+import ContentDetailInfo from '../ContentDetailInfo';
+
+jest.mock('foremanReact/components/Pagination/PaginationWrapper', () => (<div>Pagination Mock</div>));
+
+describe('Content Details Info', () => {
+  it('should render and contain appropriate components', async () => {
+    const displayMap = new Map([
+      ['dummy_name', 'Name'],
+      ['dummy_details_field', 'Details Field'],
+    ]);
+    const detailInfo = {
+      dummy_name: 'dummy name',
+      dummy_details_field: 'dummy details',
+    };
+
+    const wrapper = shallow(<ContentDetailInfo
+      contentDetails={detailInfo}
+      displayMap={displayMap}
+    />);
+
+    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper.find(Table)).toHaveLength(1);
+  });
+});

data/webpack/components/Content/Details/__tests__/ContentDetailRepositories.test.js

@@ -0,0 +1,22 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import ContentDetailRepositories from '../ContentDetailRepositories';
+
+jest.mock('foremanReact/components/Pagination/PaginationWrapper');
+
+const fixtures = {
+  'renders with repositories': {
+    repositories: [
+      {
+        id: 1,
+        name: 'dummy name',
+        product_id: 1,
+        product_name: 'dummy product',
+      },
+    ],
+  },
+};
+
+describe('Content detail repositories component', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(ContentDetailRepositories, fixtures));
+});

data/webpack/components/Content/Details/__tests__/ContentDetails.test.js

@@ -0,0 +1,64 @@
+import React from 'react';
+import { shallow } from 'enzyme';
+import toJson from 'enzyme-to-json';
+// import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import ContentDetailInfo from '../ContentDetailInfo';
+import ContentDetailRepositories from '../ContentDetailRepositories';
+import ContentDetails from '../ContentDetails';
+
+jest.mock('foremanReact/components/Pagination/PaginationWrapper', () => (<div>Pagination Mock</div>));
+
+describe('Content Details Info', () => {
+  it('should render and contain appropriate components', async () => {
+    const detail = {
+      loading: true,
+      name: 'dummy name',
+    };
+
+    const detailInfo = {
+      dummy_name: 'dummy name',
+      dummy_details_field: 'dummy details',
+    };
+
+    const displayMap = new Map([
+      ['dummy_name', 'Name'],
+      ['dummy_details_field', 'Details Field'],
+    ]);
+
+    const repositories = [
+      {
+        id: 155,
+        name: 'dummy_name',
+        product_id: 1,
+        product_name: 'dummy_product',
+      },
+    ];
+
+    const schema = [
+      {
+        key: 1,
+        tabHeader: 'Details',
+        tabContent: (
+          <ContentDetailInfo contentDetails={detailInfo} displayMap={displayMap} />
+        ),
+      },
+      {
+        key: 2,
+        tabHeader: 'Repositories',
+        tabContent: (repositories && repositories.length ?
+          <ContentDetailRepositories repositories={repositories} /> :
+          'No repositories to show'
+        ),
+      },
+    ];
+
+    const wrapper = shallow(<ContentDetails
+      contentDetails={detail}
+      schema={schema}
+    />);
+
+    expect(toJson(wrapper)).toMatchSnapshot();
+    expect(wrapper.find(ContentDetailInfo)).toHaveLength(1);
+    expect(wrapper.find(ContentDetailRepositories)).toHaveLength(1);
+  });
+});