katello 4.9.1 → 4.10.0.rc2

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

@@ -54,6 +54,7 @@ const ContentViewComponents = ({ cvId, details }) => {
   const [componentCvEditing, setComponentCvEditing] = useState(null);
   const [componentLatest, setComponentLatest] = useState(false);
   const [componentId, setComponentId] = useState(null);
+  const [componentVersionId, setComponentVersionId] = useState(null);
   const [selectedComponentsToAdd, setSelectedComponentsToAdd] = useState(null);
   const [bulkAdding, setBulkAdding] = useState(false);
   const [bulkActionOpen, setBulkActionOpen] = useState(false);
@@ -86,6 +87,11 @@ const ContentViewComponents = ({ cvId, details }) => {
       setVersionEditing(true);
       setCompositeCvEditing(cvId);
       setComponentCvEditing(componentCvId);
+      if (added) {
+        setComponentVersionId(published?.id);
+      } else {
+        setComponentVersionId(null);
+      }
       setComponentLatest(latest);
       setComponentId(added);
     } else { // if no versions are present, default to always latest and add cv without modal
@@ -297,6 +303,7 @@ const ContentViewComponents = ({ cvId, details }) => {
               componentCvId={componentCvEditing}
               componentId={componentId}
               latest={componentLatest}
+              componentVersionId={componentVersionId}
               show={versionEditing}
               setIsOpen={setVersionEditing}
               aria-label="edit_component_modal"

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

@@ -13,6 +13,7 @@
     {
       "latest": true,
       "id": 28,
+      "description": "Description_28",
       "created_at": "2021-06-29 11:11:23 -0400",
       "updated_at": "2021-06-29 11:11:23 -0400",
       "composite_content_view": {
@@ -38,6 +39,7 @@
     {
       "latest": true,
       "id": 23,
+      "description": "Description_23",
       "created_at": "2021-06-29 10:25:52 -0400",
       "updated_at": "2021-06-29 10:25:52 -0400",
       "composite_content_view": {
@@ -61,8 +63,9 @@
       "content_view_version": null
     },
     {
-      "latest": true,
+      "latest": false,
       "id": null,
+      "description": "Description_no_version",
       "created_at": null,
       "updated_at": null,
       "composite_content_view": {
@@ -125,16 +128,22 @@
       },
       "component_content_view_versions": [
         {
-          "id": 36,
-          "version": "1.0"
+          "id": 44,
+          "version": "4.0",
+          "description": "Version 4.0",
+          "published_at_words": "3 days"
         },
         {
           "id": 42,
-          "version": "3.0"
+          "version": "3.0",
+          "description": "Version 3.0",
+          "published_at_words": "4 days"
         },
         {
-          "id": 44,
-          "version": "4.0"
+          "id": 36,
+          "version": "1.0",
+          "description": "Version 1.0",
+          "published_at_words": "5 days"
         }
       ]
     },

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

@@ -201,7 +201,7 @@ test('Can add published component views to content view with modal', async (done
 
   const addComponentParams = {
     compositeContentViewId: 4,
-    components: [{ content_view_version_id: 85 }],
+    components: [{ content_view_version_id: 13 }],
   };
 
   const addComponentScope = nockInstance
@@ -321,7 +321,7 @@ test('Can bulk add component views to content view with modal', async (done) =>
 
   const addComponentParams = {
     compositeContentViewId: 4,
-    components: [{ content_view_version_id: 44 }, { latest: true, content_view_id: 9 }],
+    components: [{ content_view_version_id: 42 }, { latest: true, content_view_id: 9 }],
   };
 
   const addComponentScope = nockInstance
@@ -329,7 +329,7 @@ test('Can bulk add component views to content view with modal', async (done) =>
     .reply(200, {});
 
   const {
-    getAllByText, getByLabelText, queryByText,
+    getAllByText, getByLabelText, queryByText, getAllByRole,
   } = renderWithRedux(
     <ContentViewComponents cvId={4} details={cvDetails} />,
     renderOptions,
@@ -346,9 +346,10 @@ test('Can bulk add component views to content view with modal', async (done) =>
   fireEvent.click(getByLabelText('bulk_add_components'));
   await patientlyWaitFor(() => {
     expect(getAllByText('Add content views')[1]).toBeInTheDocument();
+    expect(getAllByRole('textbox')[0]).toHaveValue('Version 4.0 (3 days ago)');
   });
-  fireEvent.click(getByLabelText('version-select-cv-10'));
-  fireEvent.click(getByLabelText('cv-10-3.0'));
+  fireEvent.click(getAllByRole('textbox')[0]);
+  fireEvent.click(queryByText('Version 3.0'));
 
   fireEvent.click(getByLabelText('add_components'));
   await patientlyWaitFor(() => {

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

@@ -139,214 +139,60 @@
   "repositories": [],
   "versions": [
     {
-      "id": 52,
-      "version": "1.0",
-      "published": "2021-06-22 06:07:43 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 53,
-      "version": "2.0",
-      "published": "2021-06-22 06:09:02 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 54,
-      "version": "3.0",
-      "published": "2021-06-22 06:09:33 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 55,
-      "version": "4.0",
-      "published": "2021-06-22 06:29:29 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 56,
-      "version": "5.0",
-      "published": "2021-06-22 06:29:56 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 57,
+      "id": 13,
       "version": "6.0",
-      "published": "2021-06-22 06:30:29 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 58,
-      "version": "7.0",
-      "published": "2021-06-22 06:32:10 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 59,
-      "version": "8.0",
-      "published": "2021-06-22 06:38:01 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 60,
-      "version": "9.0",
-      "published": "2021-06-22 06:41:03 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 61,
-      "version": "10.0",
-      "published": "2021-06-22 06:53:06 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 62,
-      "version": "11.0",
-      "published": "2021-06-22 06:55:03 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 63,
-      "version": "12.0",
-      "published": "2021-06-22 06:57:47 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 64,
-      "version": "13.0",
-      "published": "2021-06-22 06:58:13 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 65,
-      "version": "14.0",
-      "published": "2021-06-22 06:58:44 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 66,
-      "version": "15.0",
-      "published": "2021-06-22 07:00:51 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 67,
-      "version": "16.0",
-      "published": "2021-06-22 07:02:35 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 68,
-      "version": "17.0",
-      "published": "2021-06-22 07:03:15 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 69,
-      "version": "18.0",
-      "published": "2021-06-22 07:12:38 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 70,
-      "version": "19.0",
-      "published": "2021-06-22 07:38:55 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 71,
-      "version": "20.0",
-      "published": "2021-06-22 07:39:27 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 72,
-      "version": "21.0",
-      "published": "2021-06-22 08:09:53 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 73,
-      "version": "22.0",
-      "published": "2021-06-22 08:10:23 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 74,
-      "version": "23.0",
-      "published": "2021-06-22 09:24:48 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 75,
-      "version": "24.0",
-      "published": "2021-06-22 09:28:09 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 76,
-      "version": "25.0",
-      "published": "2021-06-22 09:31:50 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 77,
-      "version": "26.0",
-      "published": "2021-06-22 09:33:03 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 78,
-      "version": "27.0",
-      "published": "2021-06-22 09:34:31 -1000",
-      "environment_ids": []
-    },
-    {
-      "id": 79,
-      "version": "28.0",
-      "published": "2021-06-22 09:35:00 -1000",
-      "environment_ids": []
+      "published": "2023-08-11 10:32:48 -0400",
+      "description": "aaa",
+      "environment_ids": [
+        1
+      ],
+      "filters_applied": false,
+      "published_at_words": "3 days"
     },
     {
-      "id": 80,
-      "version": "29.0",
-      "published": "2021-06-22 09:35:18 -1000",
-      "environment_ids": []
+      "id": 12,
+      "version": "5.0",
+      "published": "2023-08-11 10:32:22 -0400",
+      "description": "aa",
+      "environment_ids": [],
+      "filters_applied": false,
+      "published_at_words": "3 days"
     },
     {
-      "id": 81,
-      "version": "30.0",
-      "published": "2021-06-22 10:55:48 -1000",
-      "environment_ids": []
+      "id": 11,
+      "version": "4.0",
+      "published": "2023-08-11 10:31:12 -0400",
+      "description": "aa",
+      "environment_ids": [],
+      "filters_applied": false,
+      "published_at_words": "3 days"
     },
     {
-      "id": 83,
-      "version": "31.0",
-      "published": "2021-06-22 10:58:09 -1000",
-      "environment_ids": []
+      "id": 9,
+      "version": "3.0",
+      "published": "2023-08-10 13:47:47 -0400",
+      "description": "ab",
+      "environment_ids": [],
+      "filters_applied": false,
+      "published_at_words": "4 days"
     },
     {
-      "id": 84,
-      "version": "32.0",
-      "published": "2021-06-22 10:58:37 -1000",
-      "environment_ids": [
-        8,
-        10,
-        11,
-        12,
-        13
-      ]
+      "id": 8,
+      "version": "2.0",
+      "published": "2023-08-10 13:47:09 -0400",
+      "description": "",
+      "environment_ids": [],
+      "filters_applied": false,
+      "published_at_words": "4 days"
     },
     {
-      "id": 85,
-      "version": "33.0",
-      "published": "2021-06-22 11:03:15 -1000",
-      "environment_ids": [
-        1,
-        5,
-        6,
-        7,
-        9
-      ]
+      "id": 7,
+      "version": "1.0",
+      "published": "2023-08-10 13:46:58 -0400",
+      "description": "",
+      "environment_ids": [],
+      "filters_applied": false,
+      "published_at_words": "4 days"
     }
   ],
   "components": [],

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

@@ -300,7 +300,7 @@ const CVErrataDateFilterContent = ({
                   isDisabled={saveDisabled}
                   type="submit"
                 >
-                  {__('Edit rule')}
+                  {__('Save')}
                 </Button>
                 <Link to={`/content_views/${cvId}#/filters`}>
                   <Button ouiaId="cancel-save-filter-rule-button" variant="link">

data/webpack/scenes/ContentViews/Details/Filters/Rules/Package/AddEditPackageRuleModal.js

@@ -222,7 +222,7 @@ const AddEditPackageRuleModal = ({
             isDisabled={saving || submitDisabled}
             type="submit"
           >
-            {selectedFilterRuleData ? __('Edit rule') : __('Add rule')}
+            {selectedFilterRuleData ? __('Save') : __('Add rule')}
           </Button>
           <Button ouiaId="add-edit-package-modal-cancel" variant="link" onClick={onClose}>
             {__('Cancel')}

data/webpack/scenes/ContentViews/Details/Promote/ContentViewVersionPromote.js

@@ -92,10 +92,10 @@ const ContentViewVersionPromote = ({
   );
 
   const isValid = useCallback((env) => {
-    if (!env.prior) return true;
+    if (!env.prior || versionEnvironments.some(item => item.id === env.prior.id)) return true;
     if (!isChecked(prior(env))) return false;
     return isValid(prior(env));
-  }, [prior, isChecked]);
+  }, [prior, isChecked, versionEnvironments]);
 
   useDeepCompareEffect(() => {
     setForcePromote(userCheckedItems.filter(item => !isValid(item)));

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

@@ -137,7 +137,7 @@ export default ({
         selectRPMPackagesComparison(state, versionOneId, versionTwoId, viewBy),
       statusSelector: state =>
         selectRPMPackagesComparisonStatus(state, versionOneId, versionTwoId, viewBy),
-      autocompleteEndpoint: 'katello/api/v2/packages',
+      autocompleteEndpoint: '/katello/api/v2/packages',
       bookmarkController: 'katello_content_view_components',
       fetchItems: params => getRPMPackagesComparison(
         versionOneId,

data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.fixtures.json

@@ -56,20 +56,6 @@
         },
         {
           "id": 2,
-          "name": "dev",
-          "label": "dev",
-          "publish_date": "4 days",
-          "permissions": {
-            "readable": true,
-            "promotable_or_removable": true,
-            "all_hosts_editable": true,
-            "all_keys_editable": true
-          },
-          "host_count": 0,
-          "activation_key_count": 0
-        },
-        {
-          "id": 3,
           "name": "dev1",
           "label": "dev1",
           "publish_date": "4 days",
@@ -81,90 +67,6 @@
           },
           "host_count": 0,
           "activation_key_count": 0
-        },
-        {
-          "id": 4,
-          "name": "dev2",
-          "label": "dev2",
-          "publish_date": "4 days",
-          "permissions": {
-            "readable": true,
-            "promotable_or_removable": true,
-            "all_hosts_editable": true,
-            "all_keys_editable": true
-          },
-          "host_count": 0,
-          "activation_key_count": 0
-        },
-        {
-          "id": 5,
-          "name": "dev3",
-          "label": "dev3",
-          "publish_date": "4 days",
-          "permissions": {
-            "readable": true,
-            "promotable_or_removable": true,
-            "all_hosts_editable": true,
-            "all_keys_editable": true
-          },
-          "host_count": 0,
-          "activation_key_count": 0
-        },
-        {
-          "id": 6,
-          "name": "test",
-          "label": "test",
-          "publish_date": "4 days",
-          "permissions": {
-            "readable": true,
-            "promotable_or_removable": true,
-            "all_hosts_editable": true,
-            "all_keys_editable": true
-          },
-          "host_count": 0,
-          "activation_key_count": 0
-        },
-        {
-          "id": 7,
-          "name": "test1",
-          "label": "test1",
-          "publish_date": "4 days",
-          "permissions": {
-            "readable": true,
-            "promotable_or_removable": true,
-            "all_hosts_editable": true,
-            "all_keys_editable": true
-          },
-          "host_count": 0,
-          "activation_key_count": 0
-        },
-        {
-          "id": 9,
-          "name": "test2",
-          "label": "test2",
-          "publish_date": "4 days",
-          "permissions": {
-            "readable": true,
-            "promotable_or_removable": true,
-            "all_hosts_editable": true,
-            "all_keys_editable": true
-          },
-          "host_count": 0,
-          "activation_key_count": 0
-        },
-        {
-          "id": 8,
-          "name": "test3",
-          "label": "test3",
-          "publish_date": "4 days",
-          "permissions": {
-            "readable": true,
-            "promotable_or_removable": true,
-            "all_hosts_editable": true,
-            "all_keys_editable": true
-          },
-          "host_count": 0,
-          "activation_key_count": 0
         }
       ],
       "repositories": [

data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js

@@ -6,6 +6,7 @@ import api from '../../../../../services/api';
 import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
 import ContentViewVersions from '../ContentViewVersions';
 import cvVersionsData from './contentViewVersions.fixtures.json';
+import cvVersionsOutOfEnvData from './contentViewVersionsLatestEnvironment.fixtures.json';
 import emptyCVVersionData from './emptyCVVersion.fixtures.json';
 import cvVersionsTasksData from './contentViewVersionsWithTask.fixtures.json';
 import contentViewTaskInProgressResponseData from './contentViewTaskInProgressResponse.fixtures.json';
@@ -16,6 +17,7 @@ import cvIndexData from '../../../__tests__/contentViewList.fixtures.json';
 import contentViewFilterData from '../../Filters/__tests__/contentViewFilters.fixtures.json';
 
 const cvPromotePath = api.getApiUrl('/content_view_versions/10/promote');
+const cvPromotePath2 = api.getApiUrl('/content_view_versions/11/promote');
 const cvIndexPath = api.getApiUrl('/content_views');
 const promoteResponseData = contentViewTaskInProgressResponseData;
 
@@ -93,7 +95,7 @@ test('Can link to view environment and see publish time', async (done) => {
     expect(getAllByText('Library')[0].closest('a'))
       .toHaveAttribute('href', '/lifecycle_environments/1');
     expect(getByText('5 days ago')).toBeTruthy();
-    expect(getAllByText('dev')[0].closest('a'))
+    expect(getAllByText('dev1')[0].closest('a'))
       .toHaveAttribute('href', '/lifecycle_environments/2');
     expect(getAllByText('4 days ago')[0]).toBeTruthy();
 
@@ -273,6 +275,106 @@ test('Can open Promote Modal', async (done) => {
   act(done);
 });
 
+test('Can open Promote Modal and show out of path warnings', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const cvScope = nockInstance
+    .get(cvIndexPath)
+    .query(true)
+    .reply(200, cvIndexData);
+
+  const scope = nockInstance
+    .get(cvVersions)
+    .query(true)
+    .reply(200, cvVersionsOutOfEnvData);
+
+  const cvPromoteParams = {
+    id: 11,
+    versionEnvironments: [
+      {
+        id: 1,
+        name: 'Library',
+        label: 'Library',
+        publish_date: '5 days',
+        permissions: {
+          readable: true,
+          promotable_or_removable: true,
+          all_hosts_editable: true,
+          all_keys_editable: true,
+        },
+        host_count: 0,
+        activation_key_count: 0,
+      },
+      {
+        id: 3,
+        name: 'test',
+        label: 'test',
+        publish_date: '4 days',
+        permissions: {
+          readable: true,
+          promotable_or_removable: true,
+          all_hosts_editable: true,
+          all_keys_editable: true,
+        },
+        host_count: 0,
+        activation_key_count: 0,
+      },
+    ],
+    description: '',
+    environment_ids: [5, 4],
+    force: true,
+  };
+
+  const promoteScope = nockInstance
+    .post(cvPromotePath2, cvPromoteParams)
+    .reply(202, promoteResponseData);
+
+  const {
+    getByText, queryByText, getByLabelText, getAllByLabelText,
+  } = renderWithRedux(
+    withCVRoute(<ContentViewVersions cvId={5} details={cvDetailData} />),
+    renderOptions,
+  );
+
+  expect(queryByText(`Version ${firstVersion.version}`)).toBeNull();
+  await patientlyWaitFor(() => {
+    expect(getByText(`Version ${firstVersion.version}`)).toBeInTheDocument();
+  });
+  // Expand Row Action
+  expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
+  fireEvent.click(getAllByLabelText('Actions')[0]);
+  expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
+  fireEvent.click(getByText('Promote'));
+  await patientlyWaitFor(() => {
+    expect(getByText('Select a lifecycle environment from the available promotion paths to promote new version.')).toBeInTheDocument();
+    expect(getByLabelText('prod')).toBeInTheDocument();
+  });
+  // Select env prod out of Env path: Library, dev1, test, test2, prod
+  fireEvent.click(getByLabelText('prod'));
+  await patientlyWaitFor(() => {
+    // Force promotion info is shown because test -> prod is out of order
+    expect(getByText('Force promotion')).toBeInTheDocument();
+  });
+  fireEvent.click(getByLabelText('test2'));
+  await patientlyWaitFor(() => {
+    // Force promotion info is shown because test -> test2 -> prod is out of order
+    expect(queryByText('Force promotion')).toBeNull();
+  });
+
+  fireEvent.click(getByLabelText('promote_content_view'));
+  // Modal closes itself
+  await patientlyWaitFor(() => {
+    expect(queryByText('Select a lifecycle environment from the available promotion paths to promote new version.')).toBeNull();
+    expect(getByText(`Version ${firstVersion.version}`)).toBeInTheDocument();
+  });
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(promoteScope);
+  // Page is refreshed
+  assertNockRequest(scope);
+  assertNockRequest(cvScope);
+  act(done);
+});
+
 test('Can reload versions upon task completion', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const { results: withTaskResults } = cvVersionsTasksData;