katello 3.17.0 → 3.18.0

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

@@ -0,0 +1,47 @@
+import React, { Fragment } from 'react';
+import { CheckCircleIcon, ExclamationTriangleIcon, CloseIcon } from '@patternfly/react-icons';
+import { foremanUrl } from 'foremanReact/common/helpers';
+import PropTypes from 'prop-types';
+
+const LastSync = ({ lastSyncWords, lastSync }) => {
+  if (lastSync && lastSyncWords) {
+    let Icon;
+    let color = 'black';
+    const { result, id } = lastSync;
+
+    if (result === 'success') {
+      Icon = CheckCircleIcon;
+      color = 'green';
+    } else if (result === 'warning') {
+      Icon = ExclamationTriangleIcon;
+      color = 'orange';
+    } else if (result === 'error') {
+      Icon = CloseIcon;
+      color = 'red';
+    } else {
+      Icon = Fragment;
+    }
+
+    return (
+      <a href={foremanUrl(`/foreman_tasks/tasks/${id}/`)}>
+        <Icon style={{ color }} />&nbsp;{`${lastSyncWords} ago`}
+      </a>
+    );
+  }
+  return <div>Not Synced</div>;
+};
+
+LastSync.propTypes = {
+  lastSyncWords: PropTypes.string,
+  lastSync: PropTypes.shape({
+    id: PropTypes.string, // API returns string
+    result: PropTypes.string,
+  }),
+};
+
+LastSync.defaultProps = {
+  lastSyncWords: null,
+  lastSync: null,
+};
+
+export default LastSync;

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

@@ -0,0 +1,17 @@
+import React from 'react';
+import { Label } from '@patternfly/react-core';
+import { CheckCircleIcon } from '@patternfly/react-icons';
+import { ADDED, NOT_ADDED } from '../../ContentViewsConstants';
+
+const RepoAddedStatus = ({ added }) => {
+  if (added) {
+    return (
+      <Label variant="outline" color="green" icon={<CheckCircleIcon />}>
+        {ADDED}
+      </Label>
+    );
+  }
+  return NOT_ADDED;
+};
+
+export default RepoAddedStatus;

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

@@ -0,0 +1,23 @@
+import React from 'react';
+import { Tooltip } from '@patternfly/react-core';
+import { BundleIcon, MiddlewareIcon, BoxIcon, CodeBranchIcon, FanIcon, TenantIcon } from '@patternfly/react-icons';
+import PropTypes from 'prop-types';
+
+const RepoIcon = ({ type }) => {
+  const iconMap = {
+    yum: BundleIcon,
+    docker: MiddlewareIcon,
+    ostree: CodeBranchIcon,
+    file: TenantIcon,
+    deb: FanIcon,
+  };
+  const Icon = iconMap[type] || BoxIcon;
+
+  return <Tooltip content={<div>{type}</div>}><Icon /></Tooltip>;
+};
+
+RepoIcon.propTypes = {
+  type: PropTypes.string.isRequired,
+};
+
+export default RepoIcon;

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

@@ -0,0 +1,49 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { Select, SelectOption, SelectVariant, Level, LevelItem } from '@patternfly/react-core';
+
+const SelectableDropdown = ({
+  items, title, selected, setSelected,
+}) => {
+  const [isOpen, setIsOpen] = useState(false);
+  const onSelect = (event, selection) => {
+    setSelected(selection);
+    setIsOpen(false);
+  };
+  const onToggle = open => setIsOpen(open);
+
+  const selectItems = items.map(item => <SelectOption key={item} value={item} aria-label={`select ${item}`} />);
+
+  return (
+    <Level>
+      <LevelItem>
+        <label htmlFor={`select ${title}`} style={{ margin: '0px 5px' }}>
+          {`${title}:`}
+        </label>
+      </LevelItem>
+      <LevelItem aria-label={`select ${title} container`}>
+        <Select
+          id={`select ${title}`}
+          key="type-dropdown"
+          variant={SelectVariant.single}
+          onToggle={onToggle}
+          onSelect={onSelect}
+          selections={selected}
+          isOpen={isOpen}
+        >
+          {selectItems}
+        </Select>
+      </LevelItem>
+    </Level>
+  );
+};
+
+SelectableDropdown.propTypes = {
+  items: PropTypes.arrayOf(PropTypes.string).isRequired,
+  title: PropTypes.string.isRequired,
+  selected: PropTypes.string.isRequired,
+  setSelected: PropTypes.func.isRequired,
+};
+
+
+export default SelectableDropdown;

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

@@ -0,0 +1,154 @@
+{
+  "total": 14,
+  "subtotal": 14,
+  "page": 1,
+  "per_page": 20,
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": null,
+    "order": null
+  },
+  "results": [
+    {
+      "backend_identifier": "dbe0d30c-e77b-47aa-8bb7-c0e1a2697eb5",
+      "relative_path": "Orion/Library/custom/Lagoon_Nebula/Butterfly",
+      "container_repository_name": null,
+      "full_path": "http://centos7-katello-devel-stable.example.com/pulp/repos/Orion/Library/custom/Lagoon_Nebula/Butterfly/",
+      "library_instance_id": null,
+      "version_href": "/pulp/api/v3/repositories/rpm/rpm/ce16107a-b912-4d78-a5d1-9f90066acf8e/versions/1/",
+      "remote_href": "/pulp/api/v3/remotes/rpm/rpm/b491c3fb-d9e6-4b7e-a95a-312a8856bf1c/",
+      "publication_href": "/pulp/api/v3/publications/rpm/rpm/65b57edc-2e21-4742-be99-28ae6eeb588e/",
+      "id": 107,
+      "name": "Butterfly",
+      "label": "Butterfly",
+      "description": null,
+      "last_sync": {
+        "id": "0ea3e395-4be0-4b75-96be-9b2abf4bba78",
+        "username": "admin",
+        "started_at": "2020-08-17 13:33:27 -0400",
+        "ended_at": "2020-08-17 13:33:33 -0400",
+        "state": "stopped",
+        "result": "success",
+        "progress": 1
+      },
+      "content_view": {
+        "id": 9,
+        "name": "Default Organization View"
+      },
+      "content_view_version": {
+        "id": 19,
+        "name": "Default Organization View 1.0",
+        "content_view_id": 9
+      },
+      "kt_environment": {
+        "id": 15,
+        "name": "Library"
+      },
+      "content_type": "yum",
+      "url": "https://jlsherrill.fedorapeople.org/fake-repos/needed-errata/",
+      "arch": "noarch",
+      "content_id": "1597685535659",
+      "auto_enabled": true,
+      "major": null,
+      "minor": null,
+      "product": {
+        "id": 3,
+        "cp_id": "370238709909",
+        "name": "Lagoon Nebula",
+        "orphaned": false,
+        "redhat": false,
+        "sync_plan": null
+      },
+      "content_label": "Orion_Lagoon_Nebula_Butterfly",
+      "content_counts": {
+        "ostree_branch": 0,
+        "docker_manifest": 0,
+        "docker_manifest_list": 0,
+        "docker_tag": 0,
+        "rpm": 32,
+        "srpm": 0,
+        "package": 32,
+        "package_group": 0,
+        "erratum": 4,
+        "puppet_module": 0,
+        "file": 0,
+        "deb": 0,
+        "module_stream": 0,
+        "ansible_collection": 0
+      },
+      "last_sync_words": "30 days",
+      "added_to_content_view": true
+    },
+    {
+      "backend_identifier": "e0aff6e3-f187-452a-9d7b-f624adf7684d",
+      "relative_path": "Orion/Library/custom/Lagoon_Nebula/Coma",
+      "container_repository_name": null,
+      "full_path": "http://centos7-katello-devel-stable.example.com/pulp/repos/Orion/Library/custom/Lagoon_Nebula/Coma/",
+      "library_instance_id": null,
+      "version_href": "/pulp/api/v3/repositories/rpm/rpm/a6b32606-0e72-43e5-8470-adc33a7b23d4/versions/1/",
+      "remote_href": "/pulp/api/v3/remotes/rpm/rpm/8f194340-7bfa-4af5-8a61-95f3e9a13fb3/",
+      "publication_href": "/pulp/api/v3/publications/rpm/rpm/1666923a-3269-46bd-a948-0f4f21474327/",
+      "id": 106,
+      "name": "Coma",
+      "label": "Coma",
+      "description": null,
+      "last_sync": {
+        "id": "8fd554ff-e795-4662-ab16-97466618fd2e",
+        "username": "admin",
+        "started_at": "2020-08-17 13:33:17 -0400",
+        "ended_at": "2020-08-17 13:33:23 -0400",
+        "state": "stopped",
+        "result": "success",
+        "progress": 1
+      },
+      "content_view": {
+        "id": 9,
+        "name": "Default Organization View"
+      },
+      "content_view_version": {
+        "id": 19,
+        "name": "Default Organization View 1.0",
+        "content_view_id": 9
+      },
+      "kt_environment": {
+        "id": 15,
+        "name": "Library"
+      },
+      "content_type": "yum",
+      "url": "https://inecas.fedorapeople.org/fakerepos/zoo3/",
+      "arch": "noarch",
+      "content_id": "1597685531082",
+      "auto_enabled": true,
+      "major": null,
+      "minor": null,
+      "product": {
+        "id": 3,
+        "cp_id": "370238709909",
+        "name": "Lagoon Nebula",
+        "orphaned": false,
+        "redhat": false,
+        "sync_plan": null
+      },
+      "content_label": "Orion_Lagoon_Nebula_Coma",
+      "content_counts": {
+        "ostree_branch": 1,
+        "docker_manifest": 2,
+        "docker_manifest_list": 2,
+        "docker_tag": 0,
+        "rpm": 32,
+        "srpm": 2,
+        "package": 32,
+        "package_group": 2,
+        "erratum": 4,
+        "puppet_module": 2,
+        "file": 2,
+        "deb": 2,
+        "module_stream": 2,
+        "ansible_collection": 2
+      },
+      "last_sync_words": "30 days",
+      "added_to_content_view": true
+    }
+  ]
+}

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

@@ -0,0 +1,131 @@
+import React from 'react';
+import { renderWithRedux, patientlyWaitFor, fireEvent } 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 cvRepos = api.getApiUrl('/content_views/1/repositories');
+
+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);
+});
+
+afterEach(() => {
+  nock.cleanAll();
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+});
+
+test('Can call API and show repositories on page load', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const scope = nockInstance
+    .get(cvAllRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  const { getByText, queryByText } = renderWithRedux(
+    <ContentViewRepositories cvId={1} />,
+    renderOptions,
+  );
+
+  // Nothing will show at first, page is loading
+  expect(queryByText(firstRepo.name)).toBeNull();
+  // Assert that the repo name is now showing on the screen, but wait for it to appear.
+  await patientlyWaitFor(() => expect(getByText(firstRepo.name)).toBeTruthy());
+
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});
+
+test('Can filter by repository type', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const allTypesScope = nockInstance
+    .get(cvAllRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  // With the yum checkbox unchecked, we can expect the query params to not include 'yum'
+  const noYumScope = nockInstance
+    .get(cvAllRepos)
+    .query(queryObj => queryObj.content_type === 'yum')
+    .reply(200, repoData);
+
+  const { getByLabelText } = renderWithRedux(<ContentViewRepositories cvId={1} />, renderOptions);
+
+  // Patternfly's Select component makes it hard to attach a label, the existing options aren't
+  // working as expected, so querying by container label and getting first button to open dropdown
+  const toggleContainer = getByLabelText('select Type container');
+  const toggleButton = toggleContainer.querySelector('button');
+  fireEvent.click(toggleButton); // Open type dropdown
+  fireEvent.click(getByLabelText('select Yum repositories')); // select yum repos
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(allTypesScope);
+  assertNockRequest(noYumScope, done);
+});
+
+test('Can filter by Not added status', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const allStatusScope = nockInstance
+    .get(cvAllRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  const notAddedScope = nockInstance
+    .get(cvRepos)
+    .query(params => params.available_for === 'content_view')
+    .reply(200, repoData);
+
+  const { getByLabelText } = renderWithRedux(<ContentViewRepositories cvId={1} />, renderOptions);
+
+  const toggleContainer = getByLabelText('select Status container');
+  const toggleButton = toggleContainer.querySelector('button');
+  fireEvent.click(toggleButton);
+  fireEvent.click(getByLabelText('select Not added'));
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(allStatusScope);
+  assertNockRequest(notAddedScope, done);
+});
+
+test('Can filter by Added status', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const allStatusScope = nockInstance
+    .get(cvAllRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  const addedScope = nockInstance
+    .get(cvRepos)
+    .query(true)
+    .reply(200, repoData);
+
+  const { getByLabelText } = renderWithRedux(<ContentViewRepositories cvId={1} />, renderOptions);
+
+  const toggleContainer = getByLabelText('select Status container');
+  const toggleButton = toggleContainer.querySelector('button');
+  fireEvent.click(toggleButton);
+  fireEvent.click(getByLabelText('select Added'));
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(allStatusScope);
+  assertNockRequest(addedScope, done);
+});

data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetail.test.js

@@ -11,6 +11,9 @@ const cvDetailData = require('./contentViewDetails.fixtures.json');
 const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` };
 const cvDetailsPath = api.getApiUrl('/content_views/1');
 
+// The Repositories tab will load in the background, prevent this by mocking
+jest.mock('../Repositories/ContentViewRepositories.js', () => () => 'mocked!');
+
 test('Can call API and show details on page load', async (done) => {
   const { label, name, description } = cvDetailData;
   const scope = nockInstance

data/webpack/scenes/ContentViews/Table/ContentViewsTable.js

@@ -11,6 +11,7 @@ import getContentViews from '../ContentViewsActions';
 const ContentViewTable = ({ response, status, error }) => {
   const [table, setTable] = useState({ rows: [], columns: [] });
   const [rowMapping, setRowMapping] = useState({});
+  const [searchQuery, updateSearchQuery] = useState('');
   const { results, ...metadata } = response;
   const loadingResponse = status === STATUS.PENDING;
 
@@ -28,7 +29,7 @@ const ContentViewTable = ({ response, status, error }) => {
     [results, JSON.stringify(rowMapping)], // use JSON to check obj values eq not reference eq
   );
 
-  const onSelect = (event, isSelected, rowId) => {
+  const onSelect = (_event, isSelected, rowId) => {
     let rows;
     if (rowId === -1) {
       rows = table.rows.map(row => ({ ...row, selected: isSelected }));
@@ -90,6 +91,8 @@ const ContentViewTable = ({ response, status, error }) => {
         onSelect,
         onExpand,
         actionResolver,
+        searchQuery,
+        updateSearchQuery,
       }}
       status={tableStatus()}
       fetchItems={getContentViews}