katello 4.0.3 → 4.1.0.rc1

data/webpack/scenes/ContentViews/Details/Repositories/LastSync.js

@@ -1,23 +1,27 @@
 import React, { Fragment } from 'react';
-import { CheckCircleIcon, ExclamationTriangleIcon, CloseIcon } from '@patternfly/react-icons';
+import { CheckCircleIcon, ExclamationTriangleIcon, CloseIcon, InProgressIcon } from '@patternfly/react-icons';
 import { foremanUrl } from 'foremanReact/common/helpers';
 import PropTypes from 'prop-types';
+import InactiveText from '../../components/InactiveText';
 
-const LastSync = ({ lastSyncWords, lastSync }) => {
+const LastSync = ({ lastSyncWords, lastSync, emptyMessage }) => {
   if (lastSync && lastSyncWords) {
     let Icon;
     let color = 'black';
     const { result, id } = lastSync;
 
-    if (result === 'success') {
+    if (result === 'success' || result === 'successful') {
       Icon = CheckCircleIcon;
       color = 'green';
     } else if (result === 'warning') {
       Icon = ExclamationTriangleIcon;
       color = 'orange';
-    } else if (result === 'error') {
+    } else if (result === 'error' || result === 'failed') {
       Icon = CloseIcon;
       color = 'red';
+    } else if (result === 'in progress') {
+      Icon = InProgressIcon;
+      color = 'blue';
     } else {
       Icon = Fragment;
     }
@@ -28,7 +32,7 @@ const LastSync = ({ lastSyncWords, lastSync }) => {
       </a>
     );
   }
-  return <div>Not Synced</div>;
+  return <InactiveText text={emptyMessage} />;
 };
 
 LastSync.propTypes = {
@@ -37,11 +41,13 @@ LastSync.propTypes = {
     id: PropTypes.string, // API returns string
     result: PropTypes.string,
   }),
+  emptyMessage: PropTypes.string,
 };
 
 LastSync.defaultProps = {
   lastSyncWords: null,
   lastSync: null,
+  emptyMessage: 'Not Synced',
 };
 
 export default LastSync;

data/webpack/scenes/ContentViews/Details/Repositories/RepoIcon.js

@@ -17,7 +17,11 @@ const RepoIcon = ({ type }) => {
 };
 
 RepoIcon.propTypes = {
-  type: PropTypes.string.isRequired,
+  type: PropTypes.string,
+};
+
+RepoIcon.defaultProps = {
+  type: '', // prevent errors if data isn't loaded yet
 };
 
 export default RepoIcon;

data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewAddRemove.test.js

@@ -0,0 +1,138 @@
+import React from 'react';
+import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
+
+import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import api from '../../../../../services/api';
+import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
+import ContentViewRepositories from '../ContentViewRepositories';
+
+const repoData = require('./contentViewDetailRepos.fixtures.json');
+
+const autocompleteUrl = '/repositories/auto_complete_search';
+const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` };
+const cvAllRepos = api.getApiUrl('/content_views/1/repositories/show_all');
+const repoTypesResponse = [{ name: 'deb' }, { name: 'docker' }, { name: 'file' }, { name: 'ostree' }, { name: 'yum' }];
+const cvDetailData = require('../../__tests__/contentViewDetails.fixtures.json');
+
+const cvDetailsPath = api.getApiUrl('/content_views/1');
+const cvRepoAddData = require('./contentViewRepoAdd.fixture.json');
+
+let firstRepo;
+let searchDelayScope;
+let autoSearchScope;
+
+beforeEach(() => {
+  const { results } = repoData;
+  [firstRepo] = results;
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', true);
+  nockInstance
+    .persist() // match any query to this endpoint, gets cleaned up by `nock.cleanAll()`
+    .get(api.getApiUrl('/repositories/repository_types'))
+    .query(true)
+    .reply(200, repoTypesResponse);
+});
+
+afterEach(() => {
+  nock.cleanAll();
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+});
+
+test('Can enable and disable add repositories button', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const scope = nockInstance
+    .get(cvAllRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  const { getByText, getByLabelText } = renderWithRedux(
+    <ContentViewRepositories cvId={1} />,
+    renderOptions,
+  );
+
+  await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeTruthy());
+  expect(getByLabelText('Select all rows')).toBeInTheDocument();
+  expect(getByLabelText('add_repositories')).toHaveAttribute('aria-disabled', 'true');
+  getByLabelText('Select all rows').click();
+  await patientlyWaitFor(() => {
+    expect(getByLabelText('add_repositories')).toHaveAttribute('aria-disabled', 'false');
+  });
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});
+
+test('Can add repositories', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const cvAddparams = { repository_ids: [107, 106] };
+
+  const repoAddscope = nockInstance
+    .put(cvDetailsPath, cvAddparams)
+    .reply(200, cvRepoAddData);
+
+  const cvDetailScope = nockInstance
+    .get(cvDetailsPath)
+    .query(true)
+    .reply(200, cvDetailData);
+
+  const scope = nockInstance
+    .get(cvAllRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  const { getByText, getByLabelText } = renderWithRedux(
+    <ContentViewRepositories cvId={1} />,
+    renderOptions,
+  );
+
+  await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeInTheDocument());
+  expect(getByLabelText('Select all rows')).toBeInTheDocument();
+  expect(getByLabelText('add_repositories')).toHaveAttribute('aria-disabled', 'true');
+  getByLabelText('Select all rows').click();
+  getByLabelText('add_repositories').click();
+  assertNockRequest(repoAddscope);
+
+  assertNockRequest(cvDetailScope);
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});
+
+test('Can remove repositories', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const cvRemoveParams = { repository_ids: [] };
+  const scope = nockInstance
+    .get(cvAllRepos)
+    .query(true)
+    .reply(200, repoData);
+  const cvDetailScope = nockInstance
+    .get(cvDetailsPath)
+    .query(true)
+    .reply(200, cvDetailData);
+  const repoRemoveScope = nockInstance
+    .put(cvDetailsPath, cvRemoveParams)
+    .reply(200, cvRepoAddData);
+
+  const { getByText, getByLabelText } = renderWithRedux(
+    <ContentViewRepositories cvId={1} />,
+    renderOptions,
+  );
+
+  await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeTruthy());
+  expect(getByLabelText('Select all rows')).toBeInTheDocument();
+  getByLabelText('Select all rows').click();
+  await patientlyWaitFor(() => {
+    expect(getByLabelText('bulk_actions')).toHaveAttribute('aria-expanded', 'false');
+  });
+  getByLabelText('bulk_actions').click();
+  await patientlyWaitFor(() => {
+    expect(getByLabelText('bulk_actions')).toHaveAttribute('aria-expanded', 'true');
+    expect(getByLabelText('bulk_remove')).toBeInTheDocument();
+  });
+  getByLabelText('bulk_remove').click();
+  assertNockRequest(repoRemoveScope);
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(cvDetailScope);
+  assertNockRequest(scope, done);
+});

data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.fixtures.json

@@ -71,7 +71,6 @@
         "package": 32,
         "package_group": 0,
         "erratum": 4,
-        "puppet_module": 0,
         "file": 0,
         "deb": 0,
         "module_stream": 0,
@@ -141,7 +140,6 @@
         "package": 32,
         "package_group": 2,
         "erratum": 4,
-        "puppet_module": 2,
         "file": 2,
         "deb": 2,
         "module_stream": 2,

data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewDetailRepos.test.js

@@ -12,7 +12,7 @@ const autocompleteUrl = '/repositories/auto_complete_search';
 const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` };
 const cvAllRepos = api.getApiUrl('/content_views/1/repositories/show_all');
 const cvRepos = api.getApiUrl('/content_views/1/repositories');
-const repoTypesResponse = [{ name: 'deb' }, { name: 'docker' }, { name: 'file' }, { name: 'ostree' }, { name: 'puppet' }, { name: 'yum' }];
+const repoTypesResponse = [{ name: 'deb' }, { name: 'docker' }, { name: 'file' }, { name: 'ostree' }, { name: 'yum' }];
 
 let firstRepo;
 let searchDelayScope;

data/webpack/scenes/ContentViews/Details/Repositories/__tests__/contentViewRepoAdd.fixture.json

@@ -0,0 +1,57 @@
+{
+  "content_host_count": 0,
+  "composite": false,
+  "component_ids": [],
+  "default": false,
+  "version_count": 0,
+  "latest_version": null,
+  "auto_publish": false,
+  "solve_dependencies": false,
+  "import_only": false,
+  "repository_ids": [
+    1,
+    2
+  ],
+  "id": 1,
+  "name": "test",
+  "label": "test",
+  "description": "",
+  "organization_id": 1,
+  "organization": {
+    "name": "Default Organization",
+    "label": "Default_Organization",
+    "id": 1
+  },
+  "created_at": "2021-03-02 12:21:59 -0500",
+  "updated_at": "2021-03-02 12:21:59 -0500",
+  "environments": [],
+  "repositories": [
+    {
+      "id": 1,
+      "name": "zzo",
+      "label": "zzo",
+      "content_type": "yum"
+    },
+    {
+      "id": 2,
+      "name": "zoo2",
+      "label": "zoo2",
+      "content_type": "yum"
+    }
+  ],
+  "versions": [],
+  "components": [],
+  "content_view_components": [],
+  "activation_keys": [],
+  "next_version": "1.0",
+  "last_published": null,
+  "permissions": {
+    "view_content_views": true,
+    "edit_content_views": true,
+    "destroy_content_views": true,
+    "publish_content_views": true,
+    "promote_or_remove_content_views": true
+  },
+  "duplicate_repositories_to_publish": [],
+  "errors": null
+}

data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionContent.js

@@ -0,0 +1,73 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  Text,
+  TextContent,
+  TextVariants,
+} from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { urlBuilder } from 'foremanReact/common/urlHelpers';
+
+const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
+  const {
+    deb_count: debCount,
+    docker_manifest_count: dockerManifestCount,
+    docker_tag_count: dockerTagCount,
+    file_count: fileCount,
+    module_stream_count: moduleStreamCount,
+  } = cvVersion;
+
+  return (
+    <React.Fragment>
+      {(moduleStreamCount > 0 &&
+      <><a href={urlBuilder(`content_views/${cvId}/versions/${versionId}/module_streams`, '')}>{`${moduleStreamCount} Module Streams`}</a><br /></>)
+      }
+      {(debCount > 0 &&
+      <><a href={urlBuilder(`content_views/${cvId}/versions/${versionId}/deb`, '')}>{`${debCount} Deb Packages`}</a><br /></>)
+      }
+      {(dockerManifestCount > 0 && dockerTagCount > 0 &&
+      <>
+        <a href={urlBuilder(`content_views/${cvId}/versions/${versionId}/docker`, '')}>{`${dockerTagCount} Docker tags`}</a><br />
+        <a href={urlBuilder(`content_views/${cvId}/versions/${versionId}/docker`, '')}>{`${dockerManifestCount} Docker manifests`}</a><br />
+      </>)
+      }
+      {(fileCount > 0 &&
+      <><a href={urlBuilder(`content_views/${cvId}/versions/${versionId}/file`, '')}>{`${fileCount} Files`}</a><br /></>)
+      }
+      {(moduleStreamCount === 0 && debCount === 0 &&
+        dockerManifestCount === 0 && dockerTagCount === 0 &&
+        fileCount === 0 &&
+        <TextContent>
+          <Text component={TextVariants.small}>{__('N/A')}</Text>
+        </TextContent>
+      )
+      }
+    </React.Fragment>
+  );
+};
+
+ContentViewVersionContent.propTypes = {
+  cvId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  versionId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  cvVersion: PropTypes.shape({
+    deb_count: PropTypes.number,
+    docker_manifest_count: PropTypes.number,
+    docker_tag_count: PropTypes.number,
+    file_count: PropTypes.number,
+    module_stream_count: PropTypes.number,
+  }),
+};
+
+ContentViewVersionContent.defaultProps = {
+  cvId: '',
+  versionId: '',
+  cvVersion: {
+    deb_count: 0,
+    docker_manifest_count: 0,
+    docker_tag_count: 0,
+    file_count: 0,
+    module_stream_count: 0,
+  },
+};
+
+export default ContentViewVersionContent;

data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionEnvironments.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Label, Flex, FlexItem } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import InactiveText from '../../components/InactiveText';
+
+const ContentViewVersionEnvironments = ({ environments }) => {
+  if (environments.length === 0) {
+    return (
+      <InactiveText text={__('No environments')} />
+    );
+  }
+
+  return environments.map(env => (
+    <React.Fragment key={env.id}>
+      <Flex>
+        <FlexItem>
+          <Label color="purple" href={`/lifecycle_environments/${env.id}`}>{`${env.name}`}</Label>
+        </FlexItem>
+        <FlexItem>
+          <InactiveText text={` ${env.publish_date} ago`} /><br />
+        </FlexItem>
+      </Flex>
+    </React.Fragment>));
+};
+
+ContentViewVersionEnvironments.propTypes = {
+  environments: PropTypes.instanceOf(Array).isRequired,
+};
+
+export default ContentViewVersionEnvironments;

data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionErrata.js

@@ -0,0 +1,64 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  BugIcon,
+  SecurityIcon,
+  EnhancementIcon,
+} from '@patternfly/react-icons';
+import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import './ContentViewVersionErrata.scss';
+
+const ContentViewVersionErrata = ({ cvId, versionId, errataCounts }) => {
+  const {
+    total,
+  } = errataCounts;
+
+  const errataIcons = {
+    security: SecurityIcon,
+    bugfix: BugIcon,
+    enhancement: EnhancementIcon,
+  };
+
+  const getHref = type => `/content_views/${cvId}/versions/${versionId}/errata?queryPagedSearch=%20type%20%3D%20${type}`;
+
+  const ErrataLinkwithIcon = () => Object.keys(errataIcons).map((type) => {
+    const ErrataIcon = errataIcons[type];
+    return (
+      <React.Fragment key={type}>
+        <ErrataIcon title={type} />
+        <a className="errata-icons-with-commas" href={getHref(type)}> {`${errataCounts[type] || '0'}`} </a>
+      </React.Fragment>
+    );
+  });
+
+  return (
+    <React.Fragment>
+      <a href={urlBuilder(`content_views/${cvId}/versions/${versionId}/errata`, '')}>{`${total || 0} `}</a>
+      (<ErrataLinkwithIcon />)
+    </React.Fragment>
+  );
+};
+
+ContentViewVersionErrata.propTypes = {
+  cvId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  versionId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  errataCounts: PropTypes.shape({
+    security: PropTypes.number,
+    bugfix: PropTypes.number,
+    enhancement: PropTypes.number,
+    total: PropTypes.number,
+  }),
+};
+
+ContentViewVersionErrata.defaultProps = {
+  cvId: '',
+  versionId: '',
+  errataCounts: {
+    security: 0,
+    bugfix: 0,
+    enhancement: 0,
+    total: 0,
+  },
+};
+
+export default ContentViewVersionErrata;

data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionErrata.scss

@@ -0,0 +1,8 @@
+.errata-icons-with-commas {
+  &:not(:last-child):after {
+    content: ', ';
+    margin-right: 5px;
+  }
+  display: inline-flex;
+  margin-left: 2px;
+}

data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersions.js

@@ -0,0 +1,105 @@
+import React, { useState, useEffect } from 'react';
+import { useSelector } from 'react-redux';
+import { TableVariant, TableText } from '@patternfly/react-table';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import { STATUS } from 'foremanReact/constants';
+import PropTypes from 'prop-types';
+
+import TableWrapper from '../../../../components/Table/TableWrapper';
+import InactiveText from '../../components/InactiveText';
+import ContentViewVersionEnvironments from './ContentViewVersionEnvironments';
+import ContentViewVersionErrata from './ContentViewVersionErrata';
+import ContentViewVersionContent from './ContentViewVersionContent';
+import { getContentViewVersions } from '../ContentViewDetailActions';
+import {
+  selectCVVersions,
+  selectCVVersionsStatus,
+  selectCVVersionsError,
+} from '../ContentViewDetailSelectors';
+
+const ContentViewVersions = ({ cvId }) => {
+  const response = useSelector(state => selectCVVersions(state, cvId));
+  const status = useSelector(state => selectCVVersionsStatus(state, cvId));
+  const error = useSelector(state => selectCVVersionsError(state, cvId));
+  const loading = status === STATUS.PENDING;
+
+  const [rows, setRows] = useState([]);
+  const [metadata, setMetadata] = useState({});
+  const [searchQuery, updateSearchQuery] = useState('');
+
+  const columnHeaders = [
+    __('Version'),
+    __('Environments'),
+    __('Packages'),
+    __('Errata'),
+    __('Additional content'),
+    __('Description'),
+  ];
+
+
+  useEffect(() => {
+    const buildRows = (results) => {
+      const newRows = [];
+      results.forEach((cvVersion) => {
+        const {
+          version,
+          description,
+          id: versionId,
+          environments,
+          rpm_count: packageCount,
+          errata_counts: errataCounts,
+        } = cvVersion;
+
+        const cells = [
+          { title: <a href={urlBuilder(`content_views/${cvId}/versions/${versionId}`, '')}>{`Version ${version}`}</a> },
+          { title: <ContentViewVersionEnvironments {...{ environments }} /> },
+          { title: <a href={urlBuilder(`content_views/${cvId}/versions/${versionId}/packages`, '')}>{`${packageCount}`}</a> },
+          { title: <ContentViewVersionErrata {...{ cvId, versionId, errataCounts }} /> },
+          { title: <ContentViewVersionContent {...{ cvId, versionId, cvVersion }} /> },
+          { title: description ? <TableText wrapModifier="truncate">{description}</TableText> : <InactiveText text={__('No description')} /> },
+        ];
+
+        newRows.push({ cells });
+      });
+      return newRows;
+    };
+
+    const { results, ...meta } = response;
+    setMetadata(meta);
+    if (!loading && results) {
+      const newRows = buildRows(results);
+      setRows(newRows);
+    }
+  }, [JSON.stringify(response)], setMetadata, loading, setRows);
+
+  const emptyContentTitle = __("You currently don't have any versions for this content view.");
+  const emptyContentBody = __('Versions will appear here when the content view is published.'); // needs link
+  const emptySearchTitle = __('No matching version found');
+  const emptySearchBody = __('Try changing your search settings.');
+
+  return (
+    <TableWrapper
+      {...{
+        rows,
+        metadata,
+        emptyContentTitle,
+        emptyContentBody,
+        emptySearchTitle,
+        emptySearchBody,
+        searchQuery,
+        updateSearchQuery,
+        error,
+        status,
+      }}
+      cells={columnHeaders}
+      variant={TableVariant.compact}
+      autocompleteEndpoint={`/content_view_versions/auto_complete_search?content_view_id=${cvId}`}
+      fetchItems={params => getContentViewVersions(cvId, params)}
+    />);
+};
+
+ContentViewVersions.propTypes = {
+  cvId: PropTypes.number.isRequired,
+};
+export default ContentViewVersions;