katello 4.2.1 → 4.3.0.rc1

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.fixtures.json

@@ -1,134 +1,150 @@
 {
-  "total":6,
-  "subtotal":6,
-  "page":"1",
-  "per_page":"20",
-  "error":null,
-  "search":null,
-  "sort":{
-     "by":"name",
-     "order":"asc"
-  },
-  "results":[
-     {
-        "inclusion":true,
-        "id":4,
-        "name":"af1",
-        "description":"A really great filter",
-        "created_at":"2020-12-07 09:58:36 -0500",
-        "updated_at":"2020-12-07 10:42:05 -0500",
-        "content_view":{
-        },
-        "repositories":[
-           
-        ],
-        "type":"rpm",
-        "rules":[
-           
-        ]
-     },
-     {
-        "inclusion":false,
-        "id":5,
-        "name":"Another filter",
-        "description":"hey",
-        "created_at":"2020-12-07 12:59:12 -0500",
-        "updated_at":"2020-12-07 12:59:12 -0500",
-        "content_view":{
-        },
-        "repositories":[
-           
-        ],
-        "type":"package_group",
-        "rules":[
-           
-        ]
-     },
-     {
-        "inclusion":true,
-        "id":6,
-        "name":"f2",
-        "description":null,
-        "created_at":"2020-12-08 09:26:11 -0500",
-        "updated_at":"2020-12-08 09:26:11 -0500",
-        "content_view":{
-        },
-        "repositories":[
-           
-        ],
-        "type":"erratum",
-        "rules":[
-           {
-              "content_view_filter_id":6,
-              "errata_id":"RHEA-2012:0059",
-              "date_type":"updated",
-              "id":3,
-              "created_at":"2020-12-08 10:32:25 -0500",
-              "updated_at":"2020-12-08 10:32:25 -0500"
-           }
-        ]
-     },
-     {
-        "inclusion":false,
-        "id":7,
-        "name":"f3",
-        "description":null,
-        "created_at":"2020-12-08 09:26:27 -0500",
-        "updated_at":"2020-12-08 09:26:27 -0500",
-        "content_view":{
-        },
-        "repositories":[
-           
-        ],
-        "type":"erratum",
-        "rules":[
-           {
-              "content_view_filter_id":7,
-              "types":[
-                 "security",
-                 "enhancement",
-                 "bugfix"
-              ],
-              "date_type":"updated",
-              "id":2,
-              "created_at":"2020-12-08 09:26:27 -0500",
-              "updated_at":"2020-12-08 09:26:27 -0500"
-           }
-        ]
-     },
-     {
-        "inclusion":false,
-        "id":8,
-        "name":"f4",
-        "description":null,
-        "created_at":"2020-12-08 09:26:51 -0500",
-        "updated_at":"2020-12-08 09:26:51 -0500",
-        "content_view":{
-        },
-        "repositories":[
-           
-        ],
-        "type":"modulemd",
-        "rules":[
-           
-        ]
-     },
-     {
-        "inclusion":true,
-        "id":9,
-        "name":"f5",
-        "description":null,
-        "created_at":"2020-12-08 09:32:53 -0500",
-        "updated_at":"2020-12-08 09:32:53 -0500",
-        "content_view":{
-        },
-        "repositories":[
-           
-        ],
-        "type":"docker",
-        "rules":[
-           
-        ]
-     }
-  ]
+   "total": 6,
+   "subtotal": 6,
+   "page": "1",
+   "per_page": "20",
+   "error": null,
+   "search": null,
+   "sort": {
+      "by": "name",
+      "order": "asc"
+   },
+   "results": [
+      {
+         "inclusion": false,
+         "id": 1,
+         "name": "Another filter",
+         "description": "hey",
+         "created_at": "2020-12-07 12:59:12 -0500",
+         "updated_at": "2020-12-07 12:59:12 -0500",
+         "content_view": {},
+         "repositories": [],
+         "type": "package_group",
+         "rules": [
+            {
+               "content_view_filter_id": 1,
+               "errata_id": "RHEA-2012:0059",
+               "date_type": "updated",
+               "uuid": "/pulp/api/v3/content/rpm/packagegroups/4bb006f1-64e8-498a-9ea9-8224cf56c9a6/",
+               "id": 1,
+               "created_at": "2020-12-08 10:32:25 -0500",
+               "updated_at": "2020-12-08 10:32:25 -0500"
+            },
+            {
+               "content_view_filter_id": 2,
+               "errata_id": "RHEA-2012:0059",
+               "date_type": "updated",
+               "uuid": "/pulp/api/v3/content/rpm/packagegroups/f463e64a-feb8-4303-8f49-68cac03403ae/",
+               "id": 2,
+               "created_at": "2020-12-08 10:32:25 -0500",
+               "updated_at": "2020-12-08 10:32:25 -0500"
+            }
+         ]
+      },
+      {
+         "inclusion": true,
+         "id": 4,
+         "name": "af1",
+         "description": "A really great filter",
+         "created_at": "2020-12-07 09:58:36 -0500",
+         "updated_at": "2020-12-07 10:42:05 -0500",
+         "content_view": {},
+         "repositories": [],
+         "type": "rpm",
+         "rules": []
+      },
+      {
+         "inclusion": true,
+         "id": 6,
+         "name": "f2",
+         "description": null,
+         "created_at": "2020-12-08 09:26:11 -0500",
+         "updated_at": "2020-12-08 09:26:11 -0500",
+         "content_view": {},
+         "repositories": [],
+         "type": "erratum",
+         "rules": [
+            {
+               "content_view_filter_id": 6,
+               "errata_id": "RHEA-2012:0055",
+               "date_type": "updated",
+               "id": 4,
+               "created_at": "2012-01-27",
+               "updated_at": "2012-01-27"
+            },
+            {
+               "content_view_filter_id": 6,
+               "errata_id": "RHEA-2012:0058",
+               "date_type": "updated",
+               "id": 1,
+               "created_at": "2013-01-27",
+               "updated_at": "2013-01-27"
+            }
+         ]
+      },
+      {
+         "inclusion": false,
+         "id": 7,
+         "name": "f3",
+         "description": null,
+         "created_at": "2020-12-08 09:26:27 -0500",
+         "updated_at": "2020-12-08 09:26:27 -0500",
+         "content_view": {},
+         "repositories": [],
+         "type": "erratum",
+         "rules": [
+            {
+               "content_view_filter_id": 7,
+               "types": [
+                  "security",
+                  "enhancement",
+                  "bugfix"
+               ],
+               "date_type": "updated",
+               "id": 2,
+               "created_at": "2020-12-08 09:26:27 -0500",
+               "updated_at": "2020-12-08 09:26:27 -0500"
+            }
+         ]
+      },
+      {
+         "inclusion": false,
+         "id": 8,
+         "name": "f4",
+         "description": null,
+         "created_at": "2020-12-08 09:26:51 -0500",
+         "updated_at": "2020-12-08 09:26:51 -0500",
+         "content_view": {},
+         "repositories": [],
+         "type": "modulemd",
+         "rules": [
+            {
+               "content_view_filter_id": 8,
+               "module_stream_id": 14,
+               "id": 12,
+               "created_at": "2021-09-07 12:44:22 -0400",
+               "updated_at": "2021-09-07 12:44:22 -0400"
+             },
+             {
+               "content_view_filter_id": 8,
+               "module_stream_id": 12,
+               "id": 13,
+               "created_at": "2021-09-07 12:44:22 -0400",
+               "updated_at": "2021-09-07 12:44:22 -0400"
+             }
+            ]
+         },
+      {
+         "inclusion": true,
+         "id": 9,
+         "name": "f5",
+         "description": null,
+         "created_at": "2020-12-08 09:32:53 -0500",
+         "updated_at": "2020-12-08 09:32:53 -0500",
+         "content_view": {},
+         "repositories": [],
+         "type": "docker",
+         "rules": []
+      }
+   ]
 }

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilters.test.js

@@ -1,16 +1,28 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import { Route } from 'react-router-dom';
 
 import api from '../../../../../services/api';
 import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
 import ContentViewFilters from '../ContentViewFilters';
 import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
+import cvFilterFixtures from './contentViewFilters.fixtures.json';
+import details from '../../../__tests__/mockDetails.fixtures.json';
+
+const withCVRoute = component =>
+  <Route path="/content_views/:id([0-9]+)#/filters">{component}</Route>;
+
+const renderOptions = {
+  apiNamespace: `${CONTENT_VIEWS_KEY}_1`,
+  routerParams: {
+    initialEntries: [{ pathname: '/content_views/1#/filters' }],
+    initialIndex: 1,
+  },
+};
 
-const cvFilterFixtures = require('./contentViewFilters.fixtures.json');
 
 const cvFilters = api.getApiUrl('/content_view_filters');
 const autocompleteUrl = '/content_view_filters/auto_complete_search';
-const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` };
 
 let firstFilter;
 let lastFilter;
@@ -19,6 +31,7 @@ let autoSearchScope;
 beforeEach(() => {
   const { results } = cvFilterFixtures;
   [firstFilter] = results;
+  // lastFilter = results.pop();
   [lastFilter] = results.slice(-1);
   searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
   // Autosearch can cause some asynchronous issues with the typing timeout, using basic search
@@ -31,6 +44,11 @@ afterEach(() => {
   nock.cleanAll();
 });
 
+jest.mock('../../../../../utils/useDebounce', () => ({
+  __esModule: true,
+  default: value => value,
+}));
+
 test('Can call API and show filters on page load', async (done) => {
   const { name, description } = firstFilter;
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
@@ -41,7 +59,7 @@ test('Can call API and show filters on page load', async (done) => {
     .reply(200, cvFilterFixtures);
 
   const { getByText, queryByText } =
-    renderWithRedux(<ContentViewFilters cvId={1} />, renderOptions);
+    renderWithRedux(withCVRoute(<ContentViewFilters cvId={1} details={details} />), renderOptions);
 
   // Nothing will show at first, page is loading
   expect(queryByText(name)).toBeNull();
@@ -70,7 +88,7 @@ test('Can search for filter', async (done) => {
     .reply(200, { results: [firstFilter] });
 
   const { queryByText, getByLabelText, getByText } = renderWithRedux(
-    <ContentViewFilters cvId={1} />,
+    withCVRoute(<ContentViewFilters cvId={1} details={details} />),
     renderOptions,
   );
 
@@ -111,7 +129,7 @@ test('Can remove a filter', async (done) => {
     .reply(200, {});
 
   const { getAllByLabelText, getByText } = renderWithRedux(
-    <ContentViewFilters cvId={1} />,
+    withCVRoute(<ContentViewFilters cvId={1} details={details} />),
     renderOptions,
   );
 
@@ -139,7 +157,7 @@ test('Can remove multiple filters', async (done) => {
   const removeFilterScope = nockInstance
     .put(
       api.getApiUrl('/content_views/1/remove_filters'),
-      { filter_ids: [4, 5, 6, 7, 8, 9] },
+      { filter_ids: [1, 4, 6, 7, 8, 9] },
     )
     .reply(200, {});
 
@@ -149,7 +167,7 @@ test('Can remove multiple filters', async (done) => {
     .reply(200, {});
 
   const { getAllByLabelText, getByLabelText, getByText } = renderWithRedux(
-    <ContentViewFilters cvId={1} />,
+    withCVRoute(<ContentViewFilters cvId={1} details={details} />),
     renderOptions,
   );
 

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvAllRepos.fixtures.json

@@ -0,0 +1,150 @@
+{
+  "total": 2,
+  "subtotal": 2,
+  "page": "1",
+  "per_page": "20",
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": "name",
+    "order": "asc"
+  },
+  "results": [
+    {
+      "backend_identifier": "39d2e304-d5d4-449a-9a5f-be76f049a453",
+      "relative_path": "Default_Organization/Library/custom/yums/test",
+      "container_repository_name": null,
+      "full_path": "https://centos7-devel4.samir.example.com/pulp/content/Default_Organization/Library/custom/yums/test/",
+      "library_instance_id": null,
+      "version_href": "/pulp/api/v3/repositories/rpm/rpm/756e0921-5720-48e1-9d05-a6e7b7b7e244/versions/1/",
+      "remote_href": "/pulp/api/v3/remotes/rpm/rpm/f902b9c3-b2ff-45a7-a9d4-1f77440ddd37/",
+      "publication_href": "/pulp/api/v3/publications/rpm/rpm/5882fc5f-09f1-465c-9e56-856d1f281623/",
+      "id": 5,
+      "name": "test",
+      "label": "test",
+      "description": null,
+      "last_sync": {
+        "id": "4fb95099-c70a-4232-92ff-265d8c2ddb47",
+        "username": "admin",
+        "started_at": "2021-08-23 13:46:08 -0400",
+        "ended_at": "2021-08-23 13:46:23 -0400",
+        "state": "stopped",
+        "result": "success",
+        "progress": 1
+      },
+      "content_view": {
+        "id": 1,
+        "name": "Default Organization View"
+      },
+      "content_view_version": {
+        "id": 1,
+        "name": "Default Organization View 1.0",
+        "content_view_id": 1
+      },
+      "kt_environment": {
+        "id": 1,
+        "name": "Library"
+      },
+      "content_type": "yum",
+      "url": "https://partha.fedorapeople.org/test-repos/pteradactyl/",
+      "arch": "noarch",
+      "os_versions": [],
+      "content_id": "1629740760647",
+      "major": null,
+      "minor": null,
+      "product": {
+        "id": 2,
+        "cp_id": "223156604128",
+        "name": "yums",
+        "orphaned": false,
+        "redhat": false,
+        "sync_plan": null
+      },
+      "content_label": "Default_Organization_yums_test",
+      "content_counts": {
+        "ostree_branch": 0,
+        "docker_manifest": 0,
+        "docker_manifest_list": 0,
+        "docker_tag": 0,
+        "rpm": 22,
+        "srpm": 0,
+        "package": 22,
+        "package_group": 2,
+        "erratum": 7,
+        "file": 0,
+        "deb": 0,
+        "module_stream": 14,
+        "ansible_collection": 0
+      },
+      "last_sync_words": "7 days"
+    },
+    {
+      "backend_identifier": "c83b4257-6f48-4c98-b9cf-34735a61e79f",
+      "relative_path": "Default_Organization/Library/custom/test/testYums",
+      "container_repository_name": null,
+      "full_path": "https://centos7-devel4.samir.example.com/pulp/content/Default_Organization/Library/custom/test/testYums/",
+      "library_instance_id": null,
+      "version_href": "/pulp/api/v3/repositories/rpm/rpm/9c2245b0-4b29-4d11-abc3-70c8115b852e/versions/1/",
+      "remote_href": "/pulp/api/v3/remotes/rpm/rpm/182015f7-92bd-4091-b26e-98903ea73512/",
+      "publication_href": "/pulp/api/v3/publications/rpm/rpm/b5ae1af4-08c4-4edb-ad49-87a6a9a321a0/",
+      "id": 9,
+      "name": "testYums",
+      "label": "testYums",
+      "description": null,
+      "last_sync": {
+        "id": "9c33f47e-dafc-463d-85bd-663e45599102",
+        "username": "admin",
+        "started_at": "2021-08-26 11:07:49 -0400",
+        "ended_at": "2021-08-26 11:07:57 -0400",
+        "state": "stopped",
+        "result": "success",
+        "progress": 1
+      },
+      "content_view": {
+        "id": 1,
+        "name": "Default Organization View"
+      },
+      "content_view_version": {
+        "id": 1,
+        "name": "Default Organization View 1.0",
+        "content_view_id": 1
+      },
+      "kt_environment": {
+        "id": 1,
+        "name": "Library"
+      },
+      "content_type": "yum",
+      "url": "https://fedorapeople.org/groups/katello/fakerepos/zoo2/",
+      "arch": "noarch",
+      "os_versions": [],
+      "content_id": "1629990461833",
+      "major": null,
+      "minor": null,
+      "product": {
+        "id": 1,
+        "cp_id": "884044190914",
+        "name": "test",
+        "orphaned": false,
+        "redhat": false,
+        "sync_plan": null
+      },
+      "content_label": "Default_Organization_test_testYums",
+      "content_counts": {
+        "ostree_branch": 0,
+        "docker_manifest": 0,
+        "docker_manifest_list": 0,
+        "docker_tag": 0,
+        "rpm": 8,
+        "srpm": 0,
+        "package": 8,
+        "package_group": 2,
+        "erratum": 2,
+        "file": 0,
+        "deb": 0,
+        "module_stream": 0,
+        "ansible_collection": 0
+      },
+      "last_sync_words": "4 days"
+    }
+  ]
+}

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErrataDateFilterContent.test.js

@@ -0,0 +1,74 @@
+import React from 'react';
+import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import * as reactRedux from 'react-redux';
+import {
+  nockInstance,
+  assertNockRequest,
+} from '../../../../../test-utils/nockWrapper';
+import api from '../../../../../services/api';
+import CVErrataDateFilterContent from '../CVErrataDateFilterContent';
+import cvFilterDetails from './contentViewErrataByDateDetails.fixtures.json';
+import details from '../../../__tests__/mockDetails.fixtures.json';
+
+const cvFilterDetailsPath = api.getApiUrl('/content_view_filters/36');
+
+const cvErrataDateRuleEditPath = api.getApiUrl('/content_view_filters/36/rules/35');
+
+test('Can display errata-date filter rule and edit', async (done) => {
+  const useSelectorMock = jest.spyOn(reactRedux, 'useSelector');
+  useSelectorMock.mockReturnValue(cvFilterDetails);
+
+  const cvFilterScope = nockInstance
+    .get(cvFilterDetailsPath)
+    .query(true)
+    .reply(200, cvFilterDetails);
+
+  const editDetails = {
+    id: 35,
+    content_view_filter_id: '36',
+    start_date: null,
+    end_date: '2020-08-15T12:00:00.000Z',
+    types: ['enhancement', 'security'],
+    date_type: 'issued',
+  };
+
+  const ruleEditScope = nockInstance
+    .put(cvErrataDateRuleEditPath, editDetails)
+    .reply(200, cvFilterDetails);
+
+  const {
+    getByText, queryByText, getByLabelText, getAllByText, queryAllByText,
+  } = renderWithRedux(<CVErrataDateFilterContent
+    cvId={1}
+    filterId="36"
+    showAffectedRepos={false}
+    setShowAffectedRepos={() => {}}
+    details={details}
+  />);
+
+  await patientlyWaitFor(() => {
+    expect(getAllByText('ANY')).toHaveLength(2);
+    expect(getByLabelText('save_filter_rule')).toHaveAttribute('aria-disabled', 'true');
+  });
+  fireEvent.change(getByLabelText('start_date_input'), { target: { value: '08/15/1990' } });
+  fireEvent.change(getByLabelText('end_date_input'), { target: { value: '08/15/2020' } });
+  await patientlyWaitFor(() => {
+    expect(queryAllByText('ANY')).toHaveLength(0);
+    expect(getByText('08/15/1990')).toBeInTheDocument();
+    expect(getByText('08/15/2020')).toBeInTheDocument();
+  });
+  // Can clear date with chip
+  getByLabelText('08/15/1990').click();
+  await patientlyWaitFor(() => {
+    expect(getByText('ANY')).toBeInTheDocument();
+    expect(queryByText('08/15/1990')).not.toBeInTheDocument();
+    expect(getByText('08/15/2020')).toBeInTheDocument();
+    // Enabled Edit rule button
+    expect(getByLabelText('save_filter_rule')).toHaveAttribute('aria-disabled', 'false');
+  });
+  getByLabelText('save_filter_rule').click();
+
+  useSelectorMock.mockClear();
+  assertNockRequest(ruleEditScope, done);
+  assertNockRequest(cvFilterScope, done);
+});