katello 4.2.1 → 4.3.0.rc1

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/CVRpmMatchContentModal.js

@@ -0,0 +1,96 @@
+import React, { useState, useCallback } from 'react';
+import { useSelector, shallowEqual } from 'react-redux';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import {
+  Modal, ModalVariant,
+} from '@patternfly/react-core';
+import { TableVariant, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
+import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import TableWrapper from '../../../../../components/Table/TableWrapper';
+import { getRPMPackages } from '../../ContentViewDetailActions';
+import { selectRPMPackages, selectRPMPackagesStatus } from '../../ContentViewDetailSelectors';
+
+
+const columnHeaders = [
+  __('RPM name'),
+  __('Summary'),
+];
+
+const emptyContentTitle = __('No matching RPM found.');
+const emptyContentBody = __("Given criteria doesn't match any RPMs. Try changing your rule.");
+const emptySearchTitle = __('Your search returned no matching RPMs.');
+const emptySearchBody = __('Try changing your search criteria.');
+
+const CVRpmMatchContentModal = ({ filterId, onClose, filterRuleId }) => {
+  const [searchQuery, updateSearchQuery] = useState('');
+  const response = useSelector(state => selectRPMPackages(state), shallowEqual);
+  const status = useSelector(state => selectRPMPackagesStatus(state), shallowEqual);
+
+  const fetchItems = useCallback(params => getRPMPackages({
+    content_view_filter_rule_id: filterRuleId, filterId, ...params,
+  }), [filterRuleId, filterId]);
+
+  const { results, ...metadata } = response;
+
+  return (
+    <Modal
+      title={__('Matching content')}
+      variant={ModalVariant.medium}
+      isOpen
+      onClose={onClose}
+      appendTo={document.body}
+    >
+      <TableWrapper
+        {...{
+          metadata,
+          emptyContentTitle,
+          emptyContentBody,
+          emptySearchTitle,
+          emptySearchBody,
+          searchQuery,
+          updateSearchQuery,
+          fetchItems,
+          status,
+        }}
+        autocompleteEndpoint="/packages/auto_complete_search"
+        variant={TableVariant.compact}
+      >
+        <Thead>
+          <Tr>
+            {columnHeaders.map(col =>
+              <Th key={col}>{col}</Th>)}
+          </Tr>
+        </Thead>
+        <Tbody>
+          {results?.map((result) => {
+            const {
+              nvra, summary = '-', id,
+            } = result;
+            return (
+              <Tr key={`${nvra}_${summary}_${id}`}>
+                <Td>
+                  <a rel="noreferrer" target="_blank" href={urlBuilder(`packages/${id}`, '')}>{nvra}</a>
+                </Td>
+                <Td>{summary}</Td>
+              </Tr>
+            );
+          })
+          }
+        </Tbody>
+      </TableWrapper>
+    </Modal>
+  );
+};
+
+CVRpmMatchContentModal.propTypes = {
+  filterRuleId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  filterId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  onClose: PropTypes.func,
+};
+
+CVRpmMatchContentModal.defaultProps = {
+  onClose: undefined,
+};
+
+export default CVRpmMatchContentModal;

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContent.fixtures.json

@@ -0,0 +1,166 @@
+{
+  "total": 8,
+  "subtotal": 8,
+  "page": "1",
+  "per_page": "20",
+  "error": null,
+  "search": " ",
+  "sort": {
+    "by": null,
+    "order": null
+  },
+  "results": [
+    {
+      "id": 8,
+      "pulp_id": "/pulp/api/v3/content/rpm/packages/381cbc8f-48dd-4564-93f7-89f6f9a28e30/",
+      "name": "cheetah",
+      "version": "0.3",
+      "release": "0.8",
+      "arch": "noarch",
+      "epoch": "0",
+      "summary": "A dummy package of cheetah",
+      "modular": false,
+      "filename": "cheetah-0.3-0.8.noarch.rpm",
+      "sourcerpm": "cheetah-0.3-0.8.src.rpm",
+      "checksum": "422d0baa0cd9d7713ae796e886a23e17f578f924f74880debdbb7d65fb368dae",
+      "nvrea": "cheetah-0.3-0.8.noarch",
+      "nvra": "cheetah-0.3-0.8.noarch",
+      "uuid": "/pulp/api/v3/content/rpm/packages/381cbc8f-48dd-4564-93f7-89f6f9a28e30/",
+      "hosts_available_count": 0,
+      "hosts_applicable_count": 0
+    },
+    {
+      "id": 4,
+      "pulp_id": "/pulp/api/v3/content/rpm/packages/0930f3d8-d699-4afc-b259-6240bb8d1a86/",
+      "name": "elephant",
+      "version": "0.3",
+      "release": "0.8",
+      "arch": "noarch",
+      "epoch": "0",
+      "summary": "A dummy package of elephant",
+      "modular": false,
+      "filename": "elephant-0.3-0.8.noarch.rpm",
+      "sourcerpm": "elephant-0.3-0.8.src.rpm",
+      "checksum": "3e1c70cd1b421328acaf6397cb3d16145306bb95f65d1b095fc31372a0a701f3",
+      "nvrea": "elephant-0.3-0.8.noarch",
+      "nvra": "elephant-0.3-0.8.noarch",
+      "uuid": "/pulp/api/v3/content/rpm/packages/0930f3d8-d699-4afc-b259-6240bb8d1a86/",
+      "hosts_available_count": 0,
+      "hosts_applicable_count": 0
+    },
+    {
+      "id": 1,
+      "pulp_id": "/pulp/api/v3/content/rpm/packages/d326af3f-b494-401c-925f-80e164a953c7/",
+      "name": "giraffe",
+      "version": "0.3",
+      "release": "0.8",
+      "arch": "noarch",
+      "epoch": "0",
+      "summary": "A dummy package of giraffe",
+      "modular": false,
+      "filename": "giraffe-0.3-0.8.noarch.rpm",
+      "sourcerpm": "giraffe-0.3-0.8.src.rpm",
+      "checksum": "f25d67d1d9da04f12e57ca323247b43891ac46533e355b82de6d1922009f9f14",
+      "nvrea": "giraffe-0.3-0.8.noarch",
+      "nvra": "giraffe-0.3-0.8.noarch",
+      "uuid": "/pulp/api/v3/content/rpm/packages/d326af3f-b494-401c-925f-80e164a953c7/",
+      "hosts_available_count": 0,
+      "hosts_applicable_count": 0
+    },
+    {
+      "id": 2,
+      "pulp_id": "/pulp/api/v3/content/rpm/packages/a9e456de-87f4-4703-bc8c-f2c8795d7bea/",
+      "name": "lion",
+      "version": "0.3",
+      "release": "0.8",
+      "arch": "noarch",
+      "epoch": "0",
+      "summary": "A dummy package of lion",
+      "modular": false,
+      "filename": "lion-0.3-0.8.noarch.rpm",
+      "sourcerpm": "lion-0.3-0.8.src.rpm",
+      "checksum": "12400dc95c23a4c160725a908716cd3fcdd7a8981585437ab64cd62efa3e4ae4",
+      "nvrea": "lion-0.3-0.8.noarch",
+      "nvra": "lion-0.3-0.8.noarch",
+      "uuid": "/pulp/api/v3/content/rpm/packages/a9e456de-87f4-4703-bc8c-f2c8795d7bea/",
+      "hosts_available_count": 0,
+      "hosts_applicable_count": 0
+    },
+    {
+      "id": 7,
+      "pulp_id": "/pulp/api/v3/content/rpm/packages/45fa1216-74c1-4438-b093-b4cba590955b/",
+      "name": "monkey",
+      "version": "0.3",
+      "release": "0.8",
+      "arch": "noarch",
+      "epoch": "0",
+      "summary": "A dummy package of monkey",
+      "modular": false,
+      "filename": "monkey-0.3-0.8.noarch.rpm",
+      "sourcerpm": "monkey-0.3-0.8.src.rpm",
+      "checksum": "0e8fa50d0128fbabc7ccc5632e3fa25d39b0280169f6166cb8e2c84de8501db1",
+      "nvrea": "monkey-0.3-0.8.noarch",
+      "nvra": "monkey-0.3-0.8.noarch",
+      "uuid": "/pulp/api/v3/content/rpm/packages/45fa1216-74c1-4438-b093-b4cba590955b/",
+      "hosts_available_count": 0,
+      "hosts_applicable_count": 0
+    },
+    {
+      "id": 5,
+      "pulp_id": "/pulp/api/v3/content/rpm/packages/04e694c1-e787-4668-864e-d35de1b2297b/",
+      "name": "penguin",
+      "version": "0.3",
+      "release": "0.8",
+      "arch": "noarch",
+      "epoch": "0",
+      "summary": "A dummy package of penguin",
+      "modular": false,
+      "filename": "penguin-0.3-0.8.noarch.rpm",
+      "sourcerpm": "penguin-0.3-0.8.src.rpm",
+      "checksum": "3fcb2c927de9e13bf68469032a28b139d3e5ad2e58564fc210fd6e48635be694",
+      "nvrea": "penguin-0.3-0.8.noarch",
+      "nvra": "penguin-0.3-0.8.noarch",
+      "uuid": "/pulp/api/v3/content/rpm/packages/04e694c1-e787-4668-864e-d35de1b2297b/",
+      "hosts_available_count": 0,
+      "hosts_applicable_count": 0
+    },
+    {
+      "id": 3,
+      "pulp_id": "/pulp/api/v3/content/rpm/packages/e068629b-7015-49cd-9545-fc40610fb160/",
+      "name": "squirrel",
+      "version": "0.3",
+      "release": "0.8",
+      "arch": "noarch",
+      "epoch": "0",
+      "summary": "A dummy package of squirrel",
+      "modular": false,
+      "filename": "squirrel-0.3-0.8.noarch.rpm",
+      "sourcerpm": "squirrel-0.3-0.8.src.rpm",
+      "checksum": "251768bdd15f13d78487c27638aa6aecd01551e253756093cde1c0ae878a17d2",
+      "nvrea": "squirrel-0.3-0.8.noarch",
+      "nvra": "squirrel-0.3-0.8.noarch",
+      "uuid": "/pulp/api/v3/content/rpm/packages/e068629b-7015-49cd-9545-fc40610fb160/",
+      "hosts_available_count": 0,
+      "hosts_applicable_count": 0
+    },
+    {
+      "id": 6,
+      "pulp_id": "/pulp/api/v3/content/rpm/packages/285e8795-8647-49f9-af2c-39eeb2d2ed1c/",
+      "name": "walrus",
+      "version": "0.3",
+      "release": "0.8",
+      "arch": "noarch",
+      "epoch": "0",
+      "summary": "A dummy package of walrus",
+      "modular": false,
+      "filename": "walrus-0.3-0.8.noarch.rpm",
+      "sourcerpm": "walrus-0.3-0.8.src.rpm",
+      "checksum": "6e8d6dc057e3e2c9819f0dc7e6c7b7f86bf2e8571bba414adec7fb621a461dfd",
+      "nvrea": "walrus-0.3-0.8.noarch",
+      "nvra": "walrus-0.3-0.8.noarch",
+      "uuid": "/pulp/api/v3/content/rpm/packages/285e8795-8647-49f9-af2c-39eeb2d2ed1c/",
+      "hosts_available_count": 0,
+      "hosts_applicable_count": 0
+    }
+  ]
+}

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentModal.test.js

@@ -0,0 +1,90 @@
+import React from 'react';
+import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+
+
+import api from '../../../../../../services/api';
+import CVRpmMatchContentModal from '../CVRpmMatchContentModal';
+import nock, { nockInstance, assertNockRequest, mockSetting, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
+
+import CVMatchedContent from './CVRpmMatchContent.fixtures.json';
+import CVMatchContentSearch from './CVRpmMatchContentSearch.fixtures.json';
+
+const firstMatchContent = CVMatchedContent.results[0];
+const { nvra: secondMatchContentName } = CVMatchedContent.results[1];
+const cvMatchContentPath = api.getApiUrl('/packages');
+const autocompleteUrl = '/packages/auto_complete_search';
+
+const onClose = jest.fn();
+
+const MatchContentModal =
+  <CVRpmMatchContentModal filterId={194} filterRuleId={13} onClose={onClose} />;
+
+let searchDelayScope;
+let autoSearchScope;
+beforeEach(() => {
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', true);
+});
+
+afterEach(() => {
+  nock.cleanAll();
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+});
+
+
+test('Can show matching content modal', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const cvMatchContentscope = nockInstance
+    .get(cvMatchContentPath)
+    .query(true)
+    .reply(200, CVMatchedContent);
+
+  const { queryByText } = renderWithRedux(MatchContentModal);
+  await patientlyWaitFor(() => {
+    expect(queryByText('Matching content')).toBeInTheDocument();
+    expect(queryByText(firstMatchContent.nvra)).toBeInTheDocument();
+  });
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(cvMatchContentscope, done);
+});
+
+test('Can search with filter', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const getMatchContentscope = nockInstance
+    .get(cvMatchContentPath)
+    .query(true)
+    .reply(200, CVMatchedContent);
+
+  const autocompleteSearchScope = nockInstance
+    .get(api.getApiUrl(autocompleteUrl))
+    .query(true)
+    .reply(200, []);
+
+  const secondGetMatchContentscope = nockInstance
+    .get(cvMatchContentPath)
+    .query(true)
+    .reply(200, CVMatchContentSearch);
+
+  const { queryByText, getByLabelText } = renderWithRedux(MatchContentModal);
+
+  await patientlyWaitFor(() => {
+    expect(queryByText('Matching content')).toBeInTheDocument();
+    expect(queryByText(secondMatchContentName)).toBeInTheDocument();
+  });
+
+  fireEvent.change(getByLabelText(/text input for search/i), { target: { value: firstMatchContent.nvra } });
+
+  await patientlyWaitFor(() => {
+    expect(queryByText('Matching content')).toBeInTheDocument();
+    expect(queryByText(firstMatchContent.nvra)).toBeInTheDocument();
+    expect(queryByText(secondMatchContentName)).not.toBeInTheDocument();
+  });
+
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(getMatchContentscope);
+  assertNockRequest(autocompleteSearchScope);
+  assertNockRequest(secondGetMatchContentscope, done);
+});

data/webpack/scenes/ContentViews/Details/Filters/MatchContentModal/__tests__/CVRpmMatchContentSearch.fixtures.json

@@ -0,0 +1,33 @@
+{
+  "total": 8,
+  "subtotal": 1,
+  "page": "1",
+  "per_page": "20",
+  "error": null,
+  "search": "cheetah-0.3-0.8.noarch",
+  "sort": {
+    "by": null,
+    "order": null
+  },
+  "results": [
+    {
+      "id": 8,
+      "pulp_id": "/pulp/api/v3/content/rpm/packages/381cbc8f-48dd-4564-93f7-89f6f9a28e30/",
+      "name": "cheetah",
+      "version": "0.3",
+      "release": "0.8",
+      "arch": "noarch",
+      "epoch": "0",
+      "summary": "A dummy package of cheetah",
+      "modular": false,
+      "filename": "cheetah-0.3-0.8.noarch.rpm",
+      "sourcerpm": "cheetah-0.3-0.8.src.rpm",
+      "checksum": "422d0baa0cd9d7713ae796e886a23e17f578f924f74880debdbb7d65fb368dae",
+      "nvrea": "cheetah-0.3-0.8.noarch",
+      "nvra": "cheetah-0.3-0.8.noarch",
+      "uuid": "/pulp/api/v3/content/rpm/packages/381cbc8f-48dd-4564-93f7-89f6f9a28e30/",
+      "hosts_available_count": 0,
+      "hosts_applicable_count": 0
+    }
+  ]
+}

data/webpack/scenes/ContentViews/Details/Filters/Rules/ContainerTag/AddEditContainerTagRuleModal.js

@@ -0,0 +1,91 @@
+import React, { useState } from 'react';
+import { useDispatch } from 'react-redux';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { Modal, ModalVariant, Form, FormGroup, TextInput, ActionGroup, Button } from '@patternfly/react-core';
+import { addCVFilterRule, editCVFilterRule, getCVFilterRules } from '../../../ContentViewDetailActions';
+
+const AddEditContainerTagRuleModal = ({
+  onClose, filterId, selectedFilterRuleData,
+}) => {
+  const { name, id } = selectedFilterRuleData;
+  const dispatch = useDispatch();
+  const [tagName, setTagName] = useState(name);
+  const [saving, setSaving] = useState(false);
+  const isEditing = name && id;
+
+  const onSubmit = () => {
+    setSaving(true);
+    if (isEditing) {
+      dispatch(editCVFilterRule(
+        filterId,
+        { id, name: tagName },
+        () => dispatch(getCVFilterRules(filterId)),
+      ));
+    } else {
+      dispatch(addCVFilterRule(
+        filterId,
+        { name: tagName },
+        () => dispatch(getCVFilterRules(filterId)),
+      ));
+    }
+    onClose();
+  };
+
+  return (
+    <Modal
+      title={isEditing ? __('Edit rule') : __('Add rule')}
+      variant={ModalVariant.small}
+      isOpen
+      onClose={onClose}
+      appendTo={document.body}
+    >
+      <Form onSubmit={(e) => {
+        e.preventDefault();
+        onSubmit();
+      }}
+      >
+        <FormGroup label={__('Tag name')} isRequired fieldId="tag_name">
+          <TextInput
+            autoFocus
+            isRequired
+            type="text"
+            id="tag_name"
+            aria-label="input_tag"
+            name="tagName"
+            value={tagName}
+            onChange={value => setTagName(value)}
+          />
+        </FormGroup>
+        <ActionGroup>
+          <Button
+            aria-label="add_edit_filter_rule"
+            variant="primary"
+            isDisabled={saving || tagName.length === 0}
+            type="submit"
+          >
+            {isEditing ? __('Edit rule') : __('Add rule')}
+          </Button>
+          <Button variant="link" onClick={onClose}>
+            {__('Cancel')}
+          </Button>
+        </ActionGroup>
+      </Form >
+    </Modal >
+  );
+};
+
+AddEditContainerTagRuleModal.propTypes = {
+  filterId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+  onClose: PropTypes.func.isRequired,
+  selectedFilterRuleData: PropTypes.shape({
+    name: PropTypes.string,
+    id: PropTypes.number,
+  }),
+};
+
+AddEditContainerTagRuleModal.defaultProps = {
+  selectedFilterRuleData: { name: '', id: undefined },
+};
+
+export default AddEditContainerTagRuleModal;