katello 4.10.0 → 4.11.0.rc2

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ContentViewComponents.js

@@ -30,7 +30,7 @@ import AddedStatusLabel from '../../../../components/AddedStatusLabel';
 import ComponentVersion from './ComponentVersion';
 import ComponentEnvironments from './ComponentEnvironments';
 import ContentViewIcon from '../../components/ContentViewIcon';
-import { ADDED, ALL_STATUSES, CONTENT_VIEW_NEEDS_PUBLISH, NOT_ADDED } from '../../ContentViewsConstants';
+import { ADDED, ALL_STATUSES, NOT_ADDED } from '../../ContentViewsConstants';
 import SelectableDropdown from '../../../../components/SelectableDropdown/SelectableDropdown';
 import '../../../../components/EditableTextInput/editableTextInput.scss';
 import ComponentContentViewAddModal from './ComponentContentViewAddModal';
@@ -98,7 +98,7 @@ const ContentViewComponents = ({ cvId, details }) => {
       dispatch(addComponent({
         compositeContentViewId: cvId,
         components: [{ latest: true, content_view_id: componentCvId }],
-      }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
+      }, () => dispatch(getContentViewDetails(cvId))));
     }
   }, [cvId, dispatch]);
 
@@ -108,7 +108,7 @@ const ContentViewComponents = ({ cvId, details }) => {
     dispatch(removeComponent({
       compositeContentViewId: cvId,
       component_ids: componentIds,
-    }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
+    }, () => dispatch(getContentViewDetails(cvId))));
   };
 
   const addBulk = () => {
@@ -122,7 +122,7 @@ const ContentViewComponents = ({ cvId, details }) => {
     dispatch(removeComponent({
       compositeContentViewId: cvId,
       component_ids: [componentIdToRemove],
-    }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
+    }, () => dispatch(getContentViewDetails(cvId))));
   };
 
   const toggleBulkAction = () => {
@@ -156,7 +156,7 @@ const ContentViewComponents = ({ cvId, details }) => {
                 <SplitItem>
                   <Button
                     ouiaId={`edit-component-version-${componentCvId}`}
-                    className="foreman-edit-icon"
+                    className="katello-edit-icon foreman-edit-icon"
                     aria-label="edit_version"
                     variant="plain"
                     onClick={() => {

data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/compositeCVDetails.fixtures.json

@@ -0,0 +1,393 @@
+{
+  "content_host_count": 0,
+  "composite": true,
+  "component_ids": [
+    5,
+    7
+  ],
+  "duplicate_repositories_to_publish": [
+    {
+      "id": 1,
+      "name": "repo1",
+      "components": [
+        {
+          "content_view_name": "test",
+          "content_view_version": "2.0"
+        },
+        {
+          "content_view_name": "dev",
+          "content_view_version": "3.0"
+        }
+      ]
+    }
+  ],
+  "default": false,
+  "version_count": 1,
+  "latest_version": "1.0",
+  "latest_version_id": 10,
+  "auto_publish": false,
+  "solve_dependencies": false,
+  "import_only": false,
+  "generated_for": "none",
+  "related_cv_count": 2,
+  "related_composite_cvs": [],
+  "needs_publish": false,
+  "filtered": false,
+  "repository_ids": [
+    39,
+    50,
+    51,
+    52,
+    49
+  ],
+  "id": 4,
+  "name": "dup_container",
+  "label": "dup_container",
+  "description": "",
+  "organization_id": 1,
+  "organization": {
+    "name": "Default Organization",
+    "label": "Default_Organization",
+    "id": 1
+  },
+  "created_at": "2023-09-15 13:19:51 -0400",
+  "updated_at": "2023-09-15 14:34:29 -0400",
+  "last_task": {
+    "id": "14bb82d0-fdea-4316-a4dc-0e3f914acf8e",
+    "started_at": "2023-09-15 14:34:28 -0400",
+    "result": "success",
+    "last_sync_words": "3 days"
+  },
+  "latest_version_environments": [
+    {
+      "id": 1,
+      "name": "Library",
+      "label": "Library"
+    }
+  ],
+  "repositories": [
+    {
+      "id": 39,
+      "name": "repo1",
+      "label": "repo1",
+      "content_type": "yum"
+    },
+    {
+      "id": 50,
+      "name": "repo1",
+      "label": "repo1",
+      "content_type": "yum"
+    },
+    {
+      "id": 51,
+      "name": "docker_repo",
+      "label": "docker_repo",
+      "content_type": "docker"
+    },
+    {
+      "id": 52,
+      "name": "python-pulp",
+      "label": "python-pulp",
+      "content_type": "python"
+    },
+    {
+      "id": 49,
+      "name": "test_ansible",
+      "label": "test_ansible",
+      "content_type": "ansible_collection"
+    }
+  ],
+  "versions": [
+    {
+      "id": 10,
+      "version": "1.0",
+      "published": "2023-09-15 14:34:29 -0400",
+      "description": "",
+      "environment_ids": [
+        1
+      ],
+      "filters_applied": false,
+      "published_at_words": "3 days"
+    }
+  ],
+  "components": [
+    {
+      "id": 5,
+      "name": "test 2.0",
+      "content_view_id": 2,
+      "version": "2.0",
+      "environments": [
+        {
+          "id": 2,
+          "name": "dev",
+          "label": "dev"
+        },
+        {
+          "id": 3,
+          "name": "test",
+          "label": "test"
+        }
+      ],
+      "content_view": {
+        "id": 2,
+        "name": "test",
+        "label": "test",
+        "description": "",
+        "next_version": 4,
+        "latest_version": "3.0"
+      },
+      "repositories": [
+        {
+          "id": 39,
+          "name": "repo1",
+          "label": "repo1",
+          "description": null
+        }
+      ]
+    },
+    {
+      "id": 7,
+      "name": "dev 3.0",
+      "content_view_id": 3,
+      "version": "3.0",
+      "environments": [
+        {
+          "id": 2,
+          "name": "dev",
+          "label": "dev"
+        }
+      ],
+      "content_view": {
+        "id": 3,
+        "name": "dev",
+        "label": "dev",
+        "description": "",
+        "next_version": 5,
+        "latest_version": "4.0"
+      },
+      "repositories": [
+        {
+          "id": 50,
+          "name": "repo1",
+          "label": "repo1",
+          "description": null
+        },
+        {
+          "id": 51,
+          "name": "docker_repo",
+          "label": "docker_repo",
+          "description": null
+        },
+        {
+          "id": 52,
+          "name": "python-pulp",
+          "label": "python-pulp",
+          "description": null
+        },
+        {
+          "id": 49,
+          "name": "test_ansible",
+          "label": "test_ansible",
+          "description": null
+        }
+      ]
+    }
+  ],
+  "content_view_components": [
+    {
+      "latest": false,
+      "id": 2,
+      "created_at": "2023-09-15 13:28:32 -0400",
+      "updated_at": "2023-09-15 13:28:32 -0400",
+      "composite_content_view": {
+        "id": 6,
+        "name": "dup_container",
+        "label": "dup_container",
+        "description": "",
+        "next_version": 2,
+        "latest_version": "1.0",
+        "version_count": 1
+      },
+      "content_view": {
+        "id": 2,
+        "name": "test",
+        "label": "test",
+        "description": "",
+        "next_version": 4,
+        "latest_version": "3.0",
+        "version_count": 3
+      },
+      "content_view_version": {
+        "id": 5,
+        "name": "test 2.0",
+        "content_view_id": 2,
+        "version": "2.0",
+        "content_view": {
+          "id": 2,
+          "name": "test",
+          "label": "test",
+          "description": ""
+        },
+        "environments": [
+          {
+            "id": 2,
+            "name": "dev",
+            "label": "dev"
+          },
+          {
+            "id": 3,
+            "name": "test",
+            "label": "test"
+          }
+        ],
+        "repositories": [
+          {
+            "id": 39,
+            "name": "repo1",
+            "label": "repo1",
+            "description": null
+          }
+        ]
+      },
+      "component_content_view_versions": [
+        {
+          "id": 8,
+          "version": "3.0",
+          "description": "",
+          "published_at_words": "3 days"
+        },
+        {
+          "id": 5,
+          "version": "2.0",
+          "description": "",
+          "published_at_words": "4 days"
+        },
+        {
+          "id": 3,
+          "version": "1.0",
+          "description": "",
+          "published_at_words": "18 days"
+        }
+      ]
+    },
+    {
+      "latest": false,
+      "id": 1,
+      "created_at": "2023-09-15 13:28:32 -0400",
+      "updated_at": "2023-09-15 13:58:39 -0400",
+      "composite_content_view": {
+        "id": 6,
+        "name": "dup_container",
+        "label": "dup_container",
+        "description": "",
+        "next_version": 2,
+        "latest_version": "1.0",
+        "version_count": 1
+      },
+      "content_view": {
+        "id": 3,
+        "name": "dev",
+        "label": "dev",
+        "description": "",
+        "next_version": 5,
+        "latest_version": "4.0",
+        "version_count": 4
+      },
+      "content_view_version": {
+        "id": 7,
+        "name": "dev 3.0",
+        "content_view_id": 3,
+        "version": "3.0",
+        "content_view": {
+          "id": 3,
+          "name": "dev",
+          "label": "dev",
+          "description": ""
+        },
+        "environments": [
+          {
+            "id": 2,
+            "name": "dev",
+            "label": "dev"
+          }
+        ],
+        "repositories": [
+          {
+            "id": 50,
+            "name": "repo1",
+            "label": "repo1",
+            "description": null
+          },
+          {
+            "id": 51,
+            "name": "docker_repo",
+            "label": "docker_repo",
+            "description": null
+          },
+          {
+            "id": 52,
+            "name": "python-pulp",
+            "label": "python-pulp",
+            "description": null
+          },
+          {
+            "id": 49,
+            "name": "test_ansible",
+            "label": "test_ansible",
+            "description": null
+          }
+        ]
+      },
+      "component_content_view_versions": [
+        {
+          "id": 9,
+          "version": "4.0",
+          "description": "",
+          "published_at_words": "3 days"
+        },
+        {
+          "id": 7,
+          "version": "3.0",
+          "description": "",
+          "published_at_words": "4 days"
+        },
+        {
+          "id": 6,
+          "version": "2.0",
+          "description": "",
+          "published_at_words": "4 days"
+        },
+        {
+          "id": 2,
+          "version": "1.0",
+          "description": "",
+          "published_at_words": "18 days"
+        }
+      ]
+    }
+  ],
+  "activation_keys": [],
+  "hosts": [],
+  "next_version": "2.0",
+  "last_published": "2023-09-15 14:34:29 -0400",
+  "environments": [
+    {
+      "id": 1,
+      "label": "Library",
+      "name": "Library",
+      "activation_keys": [],
+      "hosts": [],
+      "permissions": {
+        "readable": true
+      }
+    }
+  ],
+  "permissions": {
+    "view_content_views": true,
+    "edit_content_views": true,
+    "destroy_content_views": true,
+    "publish_content_views": true,
+    "promote_or_remove_content_views": true
+  },
+  "errors": null
+}

data/webpack/scenes/ContentViews/Details/ComponentContentViews/__tests__/contentViewComponents.test.js

@@ -8,12 +8,14 @@ import cvComponentData from './contentViewComponents.fixtures.json';
 import cvUnpublishedComponentData from './unpublishedCVComponents.fixtures.json';
 import cvPublishedComponentData from './publishedContentViewDetails.fixtures.json';
 import cvDetails from '../../__tests__/contentViewDetails.fixtures.json';
+import compositeCvDetails from './compositeCVDetails.fixtures.json';
 
 const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` };
 const cvComponentsWithoutSearch = api.getApiUrl('/content_views/4/content_view_components/show_all?per_page=20&page=1&status=All');
 const cvComponents = api.getApiUrl('/content_views/4/content_view_components/show_all?per_page=20&page=1&search=&status=All');
 const addComponentURL = api.getApiUrl('/content_views/4/content_view_components/add');
 const publishedComponentDetailsURL = api.getApiUrl('/content_views/13');
+const cvDetailsPath = api.getApiUrl('/content_views/4');
 const removeComponentURL = api.getApiUrl('/content_views/4/content_view_components/remove');
 const autocompleteUrl = '/content_views/auto_complete_search';
 const autocompleteQuery = {
@@ -208,6 +210,11 @@ test('Can add published component views to content view with modal', async (done
     .put(addComponentURL, addComponentParams)
     .reply(200, {});
 
+  const cvDetailsScope = nockInstance
+    .get(cvDetailsPath)
+    .query(true)
+    .reply(200, compositeCvDetails);
+
   const {
     getByText, getByLabelText, queryByLabelText, getAllByLabelText,
   } = renderWithRedux(
@@ -234,7 +241,8 @@ test('Can add published component views to content view with modal', async (done
   assertNockRequest(scope);
   assertNockRequest(publishedComponentVersionsScope);
   assertNockRequest(addComponentScope);
-  assertNockRequest(returnScope, done);
+  assertNockRequest(returnScope);
+  assertNockRequest(cvDetailsScope, done);
 });
 
 test('Can add unpublished component views to content view', async (done) => {
@@ -256,6 +264,11 @@ test('Can add unpublished component views to content view', async (done) => {
     .put(addComponentURL, addComponentParams)
     .reply(200, {});
 
+  const cvDetailsScope = nockInstance
+    .get(cvDetailsPath)
+    .query(true)
+    .reply(200, compositeCvDetails);
+
   const { getByText, getAllByLabelText } = renderWithRedux(
     <ContentViewComponents cvId={4} details={cvDetails} />,
     renderOptions,
@@ -270,7 +283,8 @@ test('Can add unpublished component views to content view', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
   assertNockRequest(addComponentScope);
-  assertNockRequest(returnScope, done);
+  assertNockRequest(returnScope);
+  assertNockRequest(cvDetailsScope, done);
 });
 
 test('Can remove component views from content view', async (done) => {
@@ -292,6 +306,11 @@ test('Can remove component views from content view', async (done) => {
     .put(removeComponentURL, removeComponentParams)
     .reply(200, {});
 
+  const cvDetailsScope = nockInstance
+    .get(cvDetailsPath)
+    .query(true)
+    .reply(200, compositeCvDetails);
+
   const { getByText, getAllByLabelText } = renderWithRedux(
     <ContentViewComponents cvId={4} details={cvDetails} />,
     renderOptions,
@@ -306,7 +325,8 @@ test('Can remove component views from content view', async (done) => {
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
   assertNockRequest(removeComponentScope);
-  assertNockRequest(returnScope, done);
+  assertNockRequest(returnScope);
+  assertNockRequest(cvDetailsScope, done);
 });
 
 test('Can bulk add component views to content view with modal', async (done) => {
@@ -328,6 +348,11 @@ test('Can bulk add component views to content view with modal', async (done) =>
     .put(addComponentURL, addComponentParams)
     .reply(200, {});
 
+  const cvDetailsScope = nockInstance
+    .get(cvDetailsPath)
+    .query(true)
+    .reply(200, compositeCvDetails);
+
   const {
     getAllByText, getByLabelText, queryByText, getAllByRole,
   } = renderWithRedux(
@@ -360,5 +385,6 @@ test('Can bulk add component views to content view with modal', async (done) =>
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
   assertNockRequest(addComponentScope);
-  assertNockRequest(returnScope, done);
+  assertNockRequest(returnScope);
+  assertNockRequest(cvDetailsScope, done);
 });

data/webpack/scenes/ContentViews/Details/Filters/CVErrataDateFilterContent.js

@@ -21,7 +21,9 @@ export const dateFormat = date => `${(date.getMonth() + 1).toString().padStart(2
 
 export const convertAPIDateToUIFormat = (dateString) => {
   if (!dateString || dateString === '') return '';
-  return dateFormat(new Date(dateString));
+  const dateTZ = new Date(dateString);
+  dateTZ.setMinutes(dateTZ.getMinutes() + dateTZ.getTimezoneOffset());
+  return dateFormat(dateTZ);
 };
 
 export const dateParse = (date) => {

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

@@ -39,6 +39,7 @@ import {
   Th,
   Td,
 } from '@patternfly/react-table';
+import { useSelectionSet } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import { useKatelloDocUrl } from '../../../../utils/useKatelloDocUrl';
 import AddedStatusLabel from '../../../../components/AddedStatusLabel';
 import SelectableDropdown from '../../../../components/SelectableDropdown';
@@ -64,7 +65,6 @@ import {
 import ContentCounts from './ContentCounts';
 import LastSync from './LastSync';
 import RepoIcon from './RepoIcon';
-import { useSelectionSet } from '../../../../components/Table/TableHooks';
 
 const allRepositories = 'All repositories';
 
@@ -227,7 +227,7 @@ const ContentViewRepositories = ({ cvId, details }) => {
 
   const rowDropdownItems = ({ id }) => [
     {
-      title: 'Add',
+      title: __('Add'),
       ouiaId: `add-repository-${id}`,
       isDisabled: importOnly || generatedContentView || repositoryIds.includes(id),
       onClick: () => {
@@ -235,7 +235,7 @@ const ContentViewRepositories = ({ cvId, details }) => {
       },
     },
     {
-      title: 'Remove',
+      title: __('Remove'),
       ouiaId: `remove-repository-${id}`,
       isDisabled: importOnly || generatedContentView || !repositoryIds.includes(id),
       onClick: () => {

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Tooltip } from '@patternfly/react-core';
-import { BundleIcon, MiddlewareIcon, BoxIcon, CodeBranchIcon, FanIcon, TenantIcon } from '@patternfly/react-icons';
+import { BundleIcon, MiddlewareIcon, BoxIcon, CodeBranchIcon, FanIcon, TenantIcon, AnsibleTowerIcon } from '@patternfly/react-icons';
 import PropTypes from 'prop-types';
 
 const RepoIcon = ({ type }) => {
@@ -10,6 +10,7 @@ const RepoIcon = ({ type }) => {
     ostree: CodeBranchIcon,
     file: TenantIcon,
     deb: FanIcon,
+    ansible_collection: AnsibleTowerIcon,
   };
   const Icon = iconMap[type] || BoxIcon;
 

data/webpack/scenes/ContentViews/Details/Versions/Compare/CVVersionCompareTable.js

@@ -4,10 +4,10 @@ import {
 } from 'react-redux';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { useTableSort } from 'foremanReact/components/PF4/Helpers/useTableSort';
 import { TableVariant, Tr, Th, Tbody, Td, Thead } from '@patternfly/react-table';
 import { TableType } from './CVVersionCompareConfig';
 import TableWrapper from '../../../../../components/Table/TableWrapper';
-import { useTableSort } from '../../../../../components/Table/TableHooks';
 import './CVVersionCompare.scss';
 
 const CVVersionCompareTable = ({

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

@@ -8,7 +8,7 @@ import { STATUS } from 'foremanReact/constants';
 import { Link } from 'react-router-dom';
 import PropTypes from 'prop-types';
 import { first } from 'lodash';
-import { useSelectionSet } from '../../../../components/Table/TableHooks';
+import { useSelectionSet } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import TableWrapper from '../../../../components/Table/TableWrapper';
 import InactiveText from '../../components/InactiveText';
 import ContentViewVersionEnvironments from './ContentViewVersionEnvironments';

data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveCVVersionWizard.js

@@ -3,6 +3,7 @@ import { useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 import { Wizard } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { useSet } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import getEnvironmentPaths from '../../../components/EnvironmentPaths/EnvironmentPathActions';
 import CVEnvironmentSelectionForm from './RemoveSteps/CVEnvironmentSelectionForm';
 import CVReassignActivationKeysForm from './RemoveSteps/CVReassignActivationKeysForm';
@@ -12,7 +13,6 @@ import CVVersionDeleteFinish from './RemoveSteps/CVVersionDeleteFinish';
 import getContentViewDetails from '../../ContentViewDetailActions';
 import getContentViews from '../../../ContentViewsActions';
 import DeleteContext from './DeleteContext';
-import { useSet } from '../../../../../components/Table/TableHooks';
 
 const RemoveCVVersionWizard = ({
   cvId, versionIdToRemove, versionNameToRemove,

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

@@ -21,7 +21,7 @@ import {
   Thead,
   Tr,
 } from '@patternfly/react-table';
-import { useUrlParams } from '../../../../../components/Table/TableHooks';
+import { useUrlParams } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import TableWrapper from '../../../../../components/Table/TableWrapper';
 import { TableType } from './ContentViewVersionDetailConfig';