katello 4.0.3 → 4.1.0.rc1

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

@@ -0,0 +1,116 @@
+import React from 'react';
+import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
+import { Route } from 'react-router-dom';
+
+import ContentViewFilterDetails from '../ContentViewFilterDetails';
+import { cvFilterDetailsKey } from '../../../ContentViewsConstants';
+import nock, {
+  nockInstance,
+  assertNockRequest,
+  mockAutocomplete,
+  mockSetting,
+} from '../../../../../test-utils/nockWrapper';
+import api from '../../../../../services/api';
+
+const allPackageGroups = require('./allFilterPackageGroups.fixtures.json');
+const cvFilterDetails = require('./contentViewFilterDetail.fixtures.json');
+
+const cvFilterDetailsPath = api.getApiUrl('/content_view_filters/1');
+const packageGroupsPath = api.getApiUrl('/package_groups');
+const autocompleteUrl = '/package_groups/auto_complete_search';
+const renderOptions = {
+  apiNamespace: cvFilterDetailsKey(1, 1),
+  routerParams: {
+    initialEntries: [{ hash: '#filters?subContentId=1', pathname: '/labs/content_views/2' }],
+    initialIndex: 1,
+  },
+};
+
+const withCVRoute = component => <Route path="/labs/content_views/:id">{component}</Route>;
+
+let searchDelayScope;
+let autoSearchScope;
+beforeEach(() => {
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
+  // Autosearch can cause some asynchronous issues with the typing timeout, using basic search
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', false);
+});
+
+afterEach(() => {
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+  nock.cleanAll();
+});
+
+test('Can show filter details and package groups on page load', async (done) => {
+  const { name: cvFilterName } = cvFilterDetails;
+  const cvFilterScope = nockInstance
+    .get(cvFilterDetailsPath)
+    .query(true)
+    .reply(200, cvFilterDetails);
+  const packageGroupsScope = nockInstance
+    .get(packageGroupsPath)
+    .query(true)
+    .reply(200, allPackageGroups);
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const { getByText, queryByText } =
+    renderWithRedux(withCVRoute(<ContentViewFilterDetails cvId={1} />), renderOptions);
+
+  // Nothing will show at first, page is loading
+  expect(queryByText(cvFilterName)).toBeNull();
+  await patientlyWaitFor(() => {
+    expect(getByText(cvFilterName)).toBeInTheDocument();
+  });
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(cvFilterScope);
+  assertNockRequest(packageGroupsScope, done);
+});
+
+test('Can search for package groups in package group filter', async (done) => {
+  const firstPackageGroup = allPackageGroups.results[0];
+  const lastPackageGroup = allPackageGroups.results.slice(-1)[0];
+  const { name: cvFilterName } = cvFilterDetails;
+  const { name: firstPackageGroupName } = firstPackageGroup;
+  const { name: lastPackageGroupName } = lastPackageGroup;
+  const searchQueryMatcher = actualParams => actualParams?.search?.includes(lastPackageGroupName);
+
+  const cvFilterScope = nockInstance
+    .get(cvFilterDetailsPath)
+    .query(true)
+    .reply(200, cvFilterDetails);
+  const packageGroupsScope = nockInstance
+    .get(packageGroupsPath)
+    .query(true)
+    .reply(200, allPackageGroups);
+  const packageGroupSearchScope = nockInstance
+    .get(packageGroupsPath)
+    .query(searchQueryMatcher)
+    .reply(200, { results: [lastPackageGroup] });
+
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, searchQueryMatcher);
+  const { getByText, queryByText, getByLabelText } =
+    renderWithRedux(withCVRoute(<ContentViewFilterDetails cvId={1} />), renderOptions);
+
+  // Basic results showing
+  await patientlyWaitFor(() => {
+    expect(getByText(cvFilterName)).toBeInTheDocument();
+    expect(getByText(firstPackageGroupName)).toBeInTheDocument();
+  });
+
+  // Search and only searched result shows
+  fireEvent.change(getByLabelText(/text input for search/i), { target: { value: lastPackageGroupName } });
+  getByLabelText(/search button/i).click();
+  await patientlyWaitFor(() => {
+    expect(getByText(lastPackageGroupName)).toBeInTheDocument();
+    expect(queryByText(firstPackageGroupName)).not.toBeInTheDocument();
+  });
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(cvFilterScope);
+  assertNockRequest(packageGroupsScope);
+  assertNockRequest(withSearchScope);
+  assertNockRequest(packageGroupSearchScope, done);
+});

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

@@ -0,0 +1,147 @@
+{
+  "inclusion": true,
+  "original_packages": false,
+  "id": 2,
+  "name": "test_package_filter",
+  "description": null,
+  "created_at": "2021-03-30 16:00:19 -0400",
+  "updated_at": "2021-03-31 12:59:12 -0400",
+  "content_view": {
+    "composite": false,
+    "component_ids": [],
+    "default": false,
+    "version_count": 4,
+    "latest_version": "4.0",
+    "auto_publish": false,
+    "solve_dependencies": false,
+    "import_only": false,
+    "repository_ids": [
+      1,
+      2
+    ],
+    "id": 2,
+    "name": "test",
+    "label": "test",
+    "description": "",
+    "organization_id": 1,
+    "organization": {
+      "name": "Default Organization",
+      "label": "Default_Organization",
+      "id": 1
+    },
+    "created_at": "2021-03-30 11:11:07 -0400",
+    "updated_at": "2021-03-30 16:04:18 -0400",
+    "environments": [
+      {
+        "id": 1,
+        "name": "Library",
+        "label": "Library",
+        "permissions": {
+          "readable": true
+        }
+      }
+    ],
+    "repositories": [
+      {
+        "id": 1,
+        "name": "test",
+        "label": "test",
+        "content_type": "yum",
+        "product": {
+          "id": 1,
+          "name": "test"
+        },
+        "content_counts": {
+          "ostree_branch": 0,
+          "docker_manifest": 0,
+          "docker_tag": 0,
+          "rpm": 8,
+          "package": 8,
+          "package_group": 0,
+          "erratum": 2,
+          "module_stream": 0
+        }
+      },
+      {
+        "id": 2,
+        "name": "test1",
+        "label": "test1",
+        "content_type": "yum",
+        "product": {
+          "id": 1,
+          "name": "test"
+        },
+        "content_counts": {
+          "ostree_branch": 0,
+          "docker_manifest": 0,
+          "docker_tag": 0,
+          "rpm": 8,
+          "package": 8,
+          "package_group": 2,
+          "erratum": 2,
+          "module_stream": 0
+        }
+      }
+    ],
+    "versions": [
+      {
+        "id": 2,
+        "version": "1.0",
+        "published": "2021-03-30 11:11:39 -0400",
+        "environment_ids": []
+      },
+      {
+        "id": 3,
+        "version": "2.0",
+        "published": "2021-03-30 11:11:57 -0400",
+        "environment_ids": []
+      },
+      {
+        "id": 4,
+        "version": "3.0",
+        "published": "2021-03-30 16:01:42 -0400",
+        "environment_ids": []
+      },
+      {
+        "id": 5,
+        "version": "4.0",
+        "published": "2021-03-30 16:04:18 -0400",
+        "environment_ids": [
+          1
+        ]
+      }
+    ],
+    "components": [],
+    "content_view_components": [],
+    "activation_keys": [],
+    "next_version": "5.0",
+    "last_published": "2021-03-30 16:04:18 -0400",
+    "permissions": {
+      "view_content_views": true,
+      "edit_content_views": true,
+      "destroy_content_views": true,
+      "publish_content_views": true,
+      "promote_or_remove_content_views": true
+    }
+  },
+  "repositories": [],
+  "type": "rpm",
+  "rules": [
+    {
+      "content_view_filter_id": 2,
+      "max_version": "0.4",
+      "architecture": "noarch",
+      "id": 2,
+      "name": "monkey",
+      "created_at": "2021-03-30 16:14:50 -0400",
+      "updated_at": "2021-03-30 16:15:39 -0400"
+    },
+    {
+      "content_view_filter_id": 2,
+      "id": 4,
+      "name": "elephant",
+      "created_at": "2021-04-01 11:35:39 -0400",
+      "updated_at": "2021-04-01 11:35:39 -0400"
+    }
+  ]
+}

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

@@ -0,0 +1,30 @@
+{
+  "total": 2,
+  "subtotal": 2,
+  "page": "1",
+  "per_page": "20",
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": "id",
+    "order": "asc"
+  },
+  "results": [
+    {
+      "content_view_filter_id": 2,
+      "max_version": "0.4",
+      "architecture": "noarch",
+      "id": 2,
+      "name": "monkey",
+      "created_at": "2021-03-30 16:14:50 -0400",
+      "updated_at": "2021-03-30 16:15:39 -0400"
+    },
+    {
+      "content_view_filter_id": 2,
+      "id": 4,
+      "name": "elephant",
+      "created_at": "2021-04-01 11:35:39 -0400",
+      "updated_at": "2021-04-01 11:35:39 -0400"
+    }
+  ]
+}

data/webpack/scenes/ContentViews/Details/Histories/ContentViewHistories.js

@@ -0,0 +1,136 @@
+import React, { useState, useEffect } from 'react';
+import { useSelector } from 'react-redux';
+import { TableVariant, TableText } from '@patternfly/react-table';
+import { Label } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import LongDateTime from 'foremanReact/components/common/dates/LongDateTime';
+import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import { STATUS } from 'foremanReact/constants';
+import PropTypes from 'prop-types';
+
+import TableWrapper from '../../../../components/Table/TableWrapper';
+import { getContentViewHistories } from '../ContentViewDetailActions';
+import {
+  selectCVHistories,
+  selectCVHistoriesStatus,
+  selectCVHistoriesError,
+} from '../ContentViewDetailSelectors';
+
+const ContentViewHistories = ({ cvId }) => {
+  const response = useSelector(state => selectCVHistories(state, cvId));
+  const status = useSelector(state => selectCVHistoriesStatus(state, cvId));
+  const error = useSelector(state => selectCVHistoriesError(state, cvId));
+  const loading = status === STATUS.PENDING;
+
+  const [rows, setRows] = useState([]);
+  const [metadata, setMetadata] = useState({});
+  const [searchQuery, updateSearchQuery] = useState('');
+
+  const taskTypes = {
+    publish: 'Actions::Katello::ContentView::Publish',
+    promotion: 'Actions::Katello::ContentView::Promote',
+    removal: 'Actions::Katello::ContentView::Remove',
+    incrementalUpdate: 'Actions::Katello::ContentView::IncrementalUpdates',
+    export: 'Actions::Katello::ContentViewVersion::Export',
+  };
+
+  const columnHeaders = [
+    __('Date'),
+    __('Version'),
+    __('Status'),
+    __('Action'),
+    __('Description'),
+    __('User'),
+  ];
+
+
+  useEffect(() => {
+    const actionText = (history) => {
+      const {
+        action,
+        task,
+        environment,
+      } = history;
+
+      const taskType = task ? task.label : taskTypes[action];
+
+      if (taskType === taskTypes.removal) {
+        return <React.Fragment> Deleted from <Label key="1" color="blue" href={`/lifecycle_environments/${environment.id}`}>{`${environment.name}`}</Label>{}</React.Fragment>;
+      } else if (taskType === taskTypes.promotion) {
+        return <React.Fragment> Promoted to <Label key="2" color="blue" href={`/lifecycle_environments/${environment.id}`}>{`${environment.name}`}</Label>{}</React.Fragment>;
+      } else if (taskType === taskTypes.publish) {
+        return ('Published new version');
+      } else if (taskType === taskTypes.export) {
+        return ('Exported content view');
+      } else if (taskType === taskTypes.incrementalUpdate) {
+        return ('Incremental update');
+      }
+      return '';
+    };
+
+    const buildRows = (results) => {
+      const newRows = [];
+      results.forEach((history) => {
+        const {
+          version,
+          version_id: versionId,
+          created_at: createdAt,
+          status: taskStatus,
+          description,
+          user,
+        } = history;
+
+        const actionMessage = actionText(history);
+
+        const cells = [
+          { title: <LongDateTime date={createdAt} showRelativeTimeTooltip /> },
+          { title: <a href={urlBuilder(`content_views/${cvId}/versions/${versionId}`, '')}>{`Version ${version}`}</a> },
+          taskStatus,
+          actionMessage,
+          { title: <TableText wrapModifier="truncate">{description}</TableText> },
+          user,
+        ];
+
+        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 history for this content view.");
+  const emptyContentBody = __('History will appear here when the content view is published or promoted.'); // needs link
+  const emptySearchTitle = __('No matching history record 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_views/${cvId}/history/auto_complete_search`}
+      fetchItems={params => getContentViewHistories(cvId, params)}
+    />);
+};
+
+ContentViewHistories.propTypes = {
+  cvId: PropTypes.number.isRequired,
+};
+export default ContentViewHistories;