katello 4.5.0.rc2 → 4.6.0.rc2

data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/emptyStateCVVersionOneDetails.fixtures.json

@@ -0,0 +1,145 @@
+{
+  "version": "1.0",
+  "major": 1,
+  "minor": 0,
+  "composite_content_view_ids": [],
+  "published_in_composite_content_view_ids": [],
+  "content_view_id": 4,
+  "default": false,
+  "description": "",
+  "id": 12,
+  "name": "cv3 1.0",
+  "created_at": "2022-08-01 15:22:50 -0400",
+  "updated_at": "2022-08-01 15:22:51 -0400",
+  "content_view": {
+    "id": 4,
+    "name": "cv3",
+    "label": "cv3",
+    "generated_for": "none"
+  },
+  "composite_content_views": [],
+  "composite_content_view_versions": [],
+  "published_in_composite_content_views": [],
+  "environments": [],
+  "repositories": [],
+  "last_event": {
+    "user": "admin",
+    "status": "successful",
+    "description": "",
+    "action": "publish",
+    "created_at": "2022-08-01 15:22:50 -0400",
+    "updated_at": "2022-08-01 15:22:51 -0400",
+    "environment": null,
+    "task": {
+      "id": "a62cbf13-4a6c-49dd-8566-104f4cdb8597",
+      "label": "Actions::Katello::ContentView::Publish",
+      "pending": false,
+      "action": "Publish content view 'cv3'; organization 'Default Organization'",
+      "username": "admin",
+      "started_at": "2022-08-01 15:22:50 -0400",
+      "ended_at": "2022-08-01 15:22:51 -0400",
+      "state": "stopped",
+      "result": "success",
+      "progress": 1,
+      "input": {
+        "content_view": {
+          "id": 4,
+          "name": "cv3",
+          "label": "cv3"
+        },
+        "organization": {
+          "id": 1,
+          "name": "Default Organization",
+          "label": "Default_Organization"
+        },
+        "services_checked": [
+          "candlepin",
+          "candlepin_auth"
+        ],
+        "history_id": 20,
+        "content_view_id": 4,
+        "auto_publish_composite_ids": [],
+        "content_view_version_name": "cv3 1.0",
+        "content_view_version_id": 12,
+        "environment_id": 1,
+        "user_id": 4,
+        "skip_promotion": null,
+        "locale": "en",
+        "current_request_id": "d0d99070-f4ce-4d2f-af07-2bc9c074c919",
+        "current_timezone": "America/New_York",
+        "current_organization_id": 1,
+        "current_location_id": 2,
+        "current_user_id": 4
+      },
+      "output": {
+        "content_view_id": 4,
+        "content_view_version_id": 12,
+        "skip_promotion": null,
+        "history_id": 20
+      },
+      "humanized": {
+        "action": "Publish",
+        "input": [
+          [
+            "content_view",
+            {
+              "text": "content view 'cv3'",
+              "link": "/content_views/4/versions"
+            }
+          ],
+          [
+            "organization",
+            {
+              "text": "organization 'Default Organization'",
+              "link": "/organizations/1/edit"
+            }
+          ]
+        ],
+        "output": "",
+        "errors": []
+      },
+      "cli_example": null,
+      "start_at": "2022-08-01 15:22:50 -0400",
+      "available_actions": {
+        "cancellable": false,
+        "resumable": false
+      }
+    },
+    "version": "1.0",
+    "publish": true,
+    "version_id": 12,
+    "triggered_by": null,
+    "triggered_by_id": null
+  },
+  "active_history": [],
+  "ansible_collection_count": 0,
+  "deb_count": 0,
+  "docker_manifest_count": 0,
+  "docker_manifest_list_count": 0,
+  "docker_tag_count": 0,
+  "file_count": 0,
+  "python_package_count": 0,
+  "rpm_count": 0,
+  "modulemd_count": 0,
+  "erratum_count": 0,
+  "package_group_count": 0,
+  "srpm_count": 0,
+  "module_stream_count": 0,
+  "package_count": 0,
+  "component_view_count": 0,
+  "ansible_collection_repository_count": 0,
+  "deb_repository_count": 0,
+  "docker_repository_count": 0,
+  "file_repository_count": 0,
+  "python_repository_count": 0,
+  "yum_repository_count": 0,
+  "errata_counts": {
+    "security": 0,
+    "bugfix": 0,
+    "enhancement": 0,
+    "total": 0
+  },
+  "permissions": {
+    "deletable": true
+  }
+}

data/webpack/scenes/ContentViews/Details/Versions/Compare/__tests__/emptyStateCVVersionTwoDetails.fixtures.json

@@ -0,0 +1,145 @@
+{
+  "version": "2.0",
+  "major": 2,
+  "minor": 0,
+  "composite_content_view_ids": [],
+  "published_in_composite_content_view_ids": [],
+  "content_view_id": 4,
+  "default": false,
+  "description": "",
+  "id": 13,
+  "name": "cv3 2.0",
+  "created_at": "2022-08-01 15:23:03 -0400",
+  "updated_at": "2022-08-01 15:23:04 -0400",
+  "content_view": {
+    "id": 4,
+    "name": "cv3",
+    "label": "cv3",
+    "generated_for": "none"
+  },
+  "composite_content_views": [],
+  "composite_content_view_versions": [],
+  "published_in_composite_content_views": [],
+  "environments": [],
+  "repositories": [],
+  "last_event": {
+    "user": "admin",
+    "status": "successful",
+    "description": "",
+    "action": "publish",
+    "created_at": "2022-08-01 15:23:03 -0400",
+    "updated_at": "2022-08-01 15:23:04 -0400",
+    "environment": null,
+    "task": {
+      "id": "5490d19a-7aaa-49c4-bfc0-fead774a7055",
+      "label": "Actions::Katello::ContentView::Publish",
+      "pending": false,
+      "action": "Publish content view 'cv3'; organization 'Default Organization'",
+      "username": "admin",
+      "started_at": "2022-08-01 15:23:03 -0400",
+      "ended_at": "2022-08-01 15:23:04 -0400",
+      "state": "stopped",
+      "result": "success",
+      "progress": 1,
+      "input": {
+        "content_view": {
+          "id": 4,
+          "name": "cv3",
+          "label": "cv3"
+        },
+        "organization": {
+          "id": 1,
+          "name": "Default Organization",
+          "label": "Default_Organization"
+        },
+        "services_checked": [
+          "candlepin",
+          "candlepin_auth"
+        ],
+        "history_id": 21,
+        "content_view_id": 4,
+        "auto_publish_composite_ids": [],
+        "content_view_version_name": "cv3 2.0",
+        "content_view_version_id": 13,
+        "environment_id": 1,
+        "user_id": 4,
+        "skip_promotion": null,
+        "locale": "en",
+        "current_request_id": "76529ab7-a394-4b31-9dc4-4ce1b022497a",
+        "current_timezone": "America/New_York",
+        "current_organization_id": 1,
+        "current_location_id": 2,
+        "current_user_id": 4
+      },
+      "output": {
+        "content_view_id": 4,
+        "content_view_version_id": 13,
+        "skip_promotion": null,
+        "history_id": 21
+      },
+      "humanized": {
+        "action": "Publish",
+        "input": [
+          [
+            "content_view",
+            {
+              "text": "content view 'cv3'",
+              "link": "/content_views/4/versions"
+            }
+          ],
+          [
+            "organization",
+            {
+              "text": "organization 'Default Organization'",
+              "link": "/organizations/1/edit"
+            }
+          ]
+        ],
+        "output": "",
+        "errors": []
+      },
+      "cli_example": null,
+      "start_at": "2022-08-01 15:23:03 -0400",
+      "available_actions": {
+        "cancellable": false,
+        "resumable": false
+      }
+    },
+    "version": "2.0",
+    "publish": true,
+    "version_id": 13,
+    "triggered_by": null,
+    "triggered_by_id": null
+  },
+  "active_history": [],
+  "ansible_collection_count": 0,
+  "deb_count": 0,
+  "docker_manifest_count": 0,
+  "docker_manifest_list_count": 0,
+  "docker_tag_count": 0,
+  "file_count": 0,
+  "python_package_count": 0,
+  "rpm_count": 0,
+  "modulemd_count": 0,
+  "erratum_count": 0,
+  "package_group_count": 0,
+  "srpm_count": 0,
+  "module_stream_count": 0,
+  "package_count": 0,
+  "component_view_count": 0,
+  "ansible_collection_repository_count": 0,
+  "deb_repository_count": 0,
+  "docker_repository_count": 0,
+  "file_repository_count": 0,
+  "python_repository_count": 0,
+  "yum_repository_count": 0,
+  "errata_counts": {
+    "security": 0,
+    "bugfix": 0,
+    "enhancement": 0,
+    "total": 0
+  },
+  "permissions": {
+    "deletable": true
+  }
+}

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

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { TableVariant, TableText, Tbody, Thead, Td, Tr, Th } from '@patternfly/react-table';
-import { Checkbox, Dropdown, DropdownItem, Grid, KebabToggle } from '@patternfly/react-core';
+import { Checkbox, Dropdown, DropdownItem, Grid, KebabToggle, GridItem, Button } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
 import { STATUS } from 'foremanReact/constants';
@@ -14,11 +14,12 @@ import InactiveText from '../../components/InactiveText';
 import ContentViewVersionEnvironments from './ContentViewVersionEnvironments';
 import ContentViewVersionErrata from './ContentViewVersionErrata';
 import ContentViewVersionContent from './ContentViewVersionContent';
-import { getContentViewVersions } from '../ContentViewDetailActions';
+import getContentViewDetails, { getContentViewVersions } from '../ContentViewDetailActions';
 import {
   selectCVVersions,
   selectCVVersionsStatus,
   selectCVVersionsError,
+  selectCVDetails,
 } from '../ContentViewDetailSelectors';
 import getEnvironmentPaths from '../../components/EnvironmentPaths/EnvironmentPathActions';
 import ContentViewVersionPromote from '../Promote/ContentViewVersionPromote';
@@ -27,12 +28,13 @@ import RemoveCVVersionWizard from './Delete/RemoveCVVersionWizard';
 import { hasPermission } from '../../helpers';
 import BulkDeleteModal from './BulkDelete/BulkDeleteModal';
 import { selectEnvironmentPathsStatus } from '../../components/EnvironmentPaths/EnvironmentPathSelectors';
-
+import PublishContentViewWizard from '../../Publish/PublishContentViewWizard';
+import CVVersionCompare from './Compare/CVVersionCompare';
 
 const ContentViewVersions = ({ cvId, details }) => {
   const response = useSelector(state => selectCVVersions(state, cvId));
   const { results, ...metadata } = response;
-
+  const { versions: cvDetails } = useSelector(state => selectCVDetails(state, cvId));
   const firstIdWithActiveHistory =
     results?.find(({ active_history: activeHistory }) =>
       activeHistory?.length)?.id;
@@ -49,6 +51,7 @@ const ContentViewVersions = ({ cvId, details }) => {
   const [versionNameToRemove, setVersionNameToRemove] = useState('');
   const [versionEnvironments, setVersionEnvironments] = useState([]);
   const [bulkDeleteModalOpen, setBulkDeleteModalOpen] = useState(false);
+  const [isPublishModalOpen, setIsPublishModalOpen] = useState(false);
   const [promoting, setPromoting] = useState(false);
   const [removingFromEnv, setRemovingFromEnv] = useState(false);
   const [deleteVersion, setDeleteVersion] = useState(false);
@@ -56,8 +59,11 @@ const ContentViewVersions = ({ cvId, details }) => {
   const { permissions } = details;
   const [kebabOpen, setKebabOpen] = useState(false);
   const hasActionPermissions = hasPermission(permissions, 'promote_or_remove_content_views');
+  const hasPublishCvPermissions = hasPermission(permissions, 'publish_content_views');
   const renderActionButtons =
     hasActionPermissions && status === STATUS.RESOLVED && !!results?.length;
+  const renderPublishCvModal =
+    hasPublishCvPermissions && status === STATUS.RESOLVED && isPublishModalOpen;
   const {
     selectOne, isSelected, isSelectable: _isSelectable,
     selectedCount, selectionSet, ...selectionSetVars
@@ -66,6 +72,23 @@ const ContentViewVersions = ({ cvId, details }) => {
     metadata,
   });
 
+  const showPrimaryAction = true;
+  const primaryActionButton =
+    (
+      <Button
+        ouiaId="cv-details-publish-button"
+        onClick={() => setIsPublishModalOpen(true)}
+        variant="primary"
+        aria-label="publish_content_view"
+      > {__('Publish new version')}
+      </Button>);
+
+  const versionOneId = String([...selectionSet].sort()[0]);
+  const versionTwoId = String([...selectionSet].sort()[1]);
+  const fetchItems = useCallback((params) => {
+    selectionSet.clear();
+    return getContentViewVersions(cvId, params);
+  }, [cvId, selectionSet]);
   const columnHeaders = [
     '',
     __('Version'),
@@ -76,6 +99,10 @@ const ContentViewVersions = ({ cvId, details }) => {
     __('Description'),
   ];
 
+  const versionOneLabel = String(cvDetails?.find(version =>
+    Number(version.id) === Number(versionOneId))?.version);
+  const versionTwoLabel = String(cvDetails?.find(version =>
+    Number(version.id) === Number(versionTwoId))?.version);
   useEffect(
     () => {
       if (envStatus !== STATUS.RESOLVED) { dispatch(getEnvironmentPaths()); }
@@ -115,10 +142,9 @@ const ContentViewVersions = ({ cvId, details }) => {
     return [
       <Checkbox
         id={versionId}
+        aria-label={`Select version ${versionId}`}
         isChecked={isSelected(versionId)}
-        onChange={selected =>
-          selectOne(selected, versionId)
-        }
+        onChange={selected => selectOne(selected, versionId)}
       />,
       <Link to={`/versions/${versionId}`}>{__('Version ')}{version}</Link>,
       <ContentViewVersionEnvironments {...{ environments }} />,
@@ -187,10 +213,27 @@ const ContentViewVersions = ({ cvId, details }) => {
     ];
 
   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 emptyContentBody = __('Versions will appear here when the content view is published.');
   const emptySearchTitle = __('No matching version found');
   const emptySearchBody = __('Try changing your search settings.');
-
+  const selectedVersionIds = {
+    versionOneId,
+    versionTwoId,
+  };
+  const [hasTwoVersions, setHasTwoVersions] = useState(false);
+  if (hasTwoVersions) {
+    const versionLabels = {
+      versionOneLabel,
+      versionTwoLabel,
+    };
+    return (
+      <CVVersionCompare
+        versionIds={selectedVersionIds}
+        cvId={cvId}
+        versionLabels={versionLabels}
+      />
+    );
+  }
   return (
     <TableWrapper
       {...{
@@ -204,40 +247,63 @@ const ContentViewVersions = ({ cvId, details }) => {
         error,
         status,
         selectedCount,
+        showPrimaryAction,
+        primaryActionButton,
       }}
       ouiaId="content-view-versions-table"
       variant={TableVariant.compact}
       autocompleteEndpoint={`/content_view_versions/auto_complete_search?content_view_id=${cvId}`}
-      fetchItems={useCallback((params) => {
-        selectionSet.clear();
-        return getContentViewVersions(cvId, params);
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-      }, [cvId])}
+      fetchItems={fetchItems}
       {...hasActionPermissions ? selectionSetVars : []}
       actionButtons={
-        renderActionButtons && (
-          <Grid>
-            <Dropdown
-              toggle={<KebabToggle aria-label="bulk_actions" onToggle={setKebabOpen} />}
-              isOpen={kebabOpen}
-              isPlain
-              dropdownItems={[
-                <DropdownItem
-                  aria-label="bulk_delete"
-                  key="bulk_delete"
-                  isDisabled={selectedCount < 1}
-                  component="button"
-                  onClick={() => {
-                    setKebabOpen(false);
-                    setBulkDeleteModalOpen(true);
-                  }}
+        <>
+          {renderPublishCvModal &&
+            <PublishContentViewWizard
+              details={details}
+              show={isPublishModalOpen}
+              onClose={(step3) => {
+                if (step3) dispatch(getContentViewDetails(cvId));
+                setIsPublishModalOpen(false);
+              }}
+              aria-label="publish_content_view_modal"
+            />}
+          {renderActionButtons && (
+            <Grid>
+              <GridItem md={8} sm={12}>
+                <Button
+                  variant="primary"
+                  onClick={() => setHasTwoVersions(true)}
+                  isDisabled={selectedCount !== 2}
+                  aria-label="compare_two_versions"
                 >
-                  {__('Delete')}
-                </DropdownItem>]}
-            />
-          </Grid>
-        )}
-      displaySelectAllCheckbox={hasActionPermissions}
+                  {__('Compare')}
+                </Button>
+              </GridItem>
+              <GridItem md={4} sm={12}>
+                <Dropdown
+                  toggle={<KebabToggle aria-label="bulk_actions" onToggle={setKebabOpen} />}
+                  isOpen={kebabOpen}
+                  isPlain
+                  dropdownItems={[
+                    <DropdownItem
+                      aria-label="bulk_delete"
+                      key="bulk_delete"
+                      isDisabled={selectedCount < 1}
+                      component="button"
+                      onClick={() => {
+                        setKebabOpen(false);
+                        setBulkDeleteModalOpen(true);
+                      }}
+                    >
+                      {__('Delete')}
+                    </DropdownItem>]}
+                />
+              </GridItem>
+            </Grid>
+          )}
+        </>
+      }
+      displaySelectAllCheckbox={renderActionButtons}
     >
       <Thead>
         {bulkDeleteModalOpen &&

data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/cvVersionRemove.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { renderWithRedux, patientlyWaitFor, fireEvent } from 'react-testing-lib-wrapper';
-import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockForemanAutocomplete, mockSetting } from '../../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockAutocomplete, mockForemanAutocomplete, mockSetting } from '../../../../../../test-utils/nockWrapper';
 import api, { foremanApi } from '../../../../../../services/api';
 import CONTENT_VIEWS_KEY from '../../../../ContentViewsConstants';
 import ContentViewVersions from '../../ContentViewVersions';
@@ -43,7 +43,6 @@ beforeEach(() => {
 });
 
 afterEach(() => {
-  nock.cleanAll();
   assertNockRequest(envScope);
   assertNockRequest(searchDelayScope);
   assertNockRequest(autoSearchScope);

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js

@@ -9,6 +9,7 @@ import {
   SecurityIcon,
   EnhancementIcon,
 } from '@patternfly/react-icons';
+import { Tooltip } from '@patternfly/react-core';
 import {
   getContentViewVersions,
   getDebPackages,
@@ -217,8 +218,9 @@ export default ({ cvId, versionId }) => [
             enhancements: EnhancementIcon,
           };
           const ErrataIcon = errataIcons[item?.type];
-          if (!ErrataIcon) return startCase(item?.type);
-          return <><ErrataIcon />{' '}{startCase(item?.type)}{item?.severity && ` - ${item.severity}`}</>;
+          const itemType = startCase(item?.type);
+          if (!ErrataIcon) return itemType;
+          return <><Tooltip content={itemType} ><ErrataIcon style={{ marginRight: '4px' }} /></Tooltip>{itemType}{item?.severity !== 'None' && ` - ${item.severity}`}</>;
         },
       },
       {

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
 import { Route } from 'react-router-dom';
 import { head, last } from 'lodash';
-import nock, { nockInstance, assertNockRequest, mockSetting, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest, mockSetting, mockAutocomplete } from '../../../../../../test-utils/nockWrapper';
 import api from '../../../../../../services/api';
 import { cvVersionDetailsKey } from '../../../../ContentViewsConstants';
 import ContentViewVersionDetails from '../ContentViewVersionDetails';
@@ -51,7 +51,6 @@ beforeEach(() => {
 
 afterEach(() => {
   assertNockRequest(envScope);
-  nock.cleanAll();
 });
 // This is written separately, as the autocomplete/search scopes are not needed.
 test('Can show versions details - Components Tab', async (done) => {

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsEmpty.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { renderWithRedux, patientlyWaitFor, act } from 'react-testing-lib-wrapper';
 import { Route } from 'react-router-dom';
 
-import nock, { nockInstance, assertNockRequest } from '../../../../../../test-utils/nockWrapper';
+import { nockInstance, assertNockRequest } from '../../../../../../test-utils/nockWrapper';
 import api from '../../../../../../services/api';
 import { cvVersionDetailsKey } from '../../../../ContentViewsConstants';
 import ContentViewVersionDetails from '../ContentViewVersionDetails';
@@ -39,7 +39,6 @@ beforeEach(() => {
 afterEach(() => {
   assertNockRequest(envScope);
   assertNockRequest(versionScope);
-  nock.cleanAll();
 });
 
 test('Can show versions detail header', async (done) => {