katello 4.1.4 → 4.2.0.rc1

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

@@ -1,47 +1,97 @@
 {
-  "total": 2,
-  "subtotal": 2,
+  "total": 4,
+  "subtotal": 4,
   "page": "1",
   "per_page": "20",
   "error": null,
   "search": null,
   "sort": {
-    "by": "label",
-    "order": "asc"
+    "by": null,
+    "order": null
   },
   "results": [
     {
-      "latest": false,
-      "id": 5,
-      "created_at": "2021-04-12 21:18:08 -0400",
-      "updated_at": "2021-04-16 10:34:00 -0400",
+      "latest": true,
+      "id": 28,
+      "created_at": "2021-06-29 11:11:23 -0400",
+      "updated_at": "2021-06-29 11:11:23 -0400",
       "composite_content_view": {
-        "id": 5,
-        "name": "composite1",
-        "label": "composite1",
-        "description": null,
+        "id": 4,
+        "name": "ccv123",
+        "label": "ccv1",
+        "description": "blah",
+        "next_version": 2,
+        "latest_version": "1.0",
+        "version_count": 1
+      },
+      "content_view": {
+        "id": 14,
+        "name": "11",
+        "label": "11",
+        "description": "",
         "next_version": 1,
         "latest_version": null,
         "version_count": 0
       },
+      "content_view_version": null
+    },
+    {
+      "latest": true,
+      "id": 23,
+      "created_at": "2021-06-29 10:25:52 -0400",
+      "updated_at": "2021-06-29 10:25:52 -0400",
+      "composite_content_view": {
+        "id": 4,
+        "name": "ccv123",
+        "label": "ccv1",
+        "description": "blah",
+        "next_version": 2,
+        "latest_version": "1.0",
+        "version_count": 1
+      },
       "content_view": {
-        "id": 3,
-        "name": "component1",
-        "label": "component1",
-        "description": "Test Description",
-        "next_version": 5,
-        "latest_version": "4.0",
-        "version_count": 4
+        "id": 10,
+        "name": "7",
+        "label": "7",
+        "description": "",
+        "next_version": 1,
+        "latest_version": null,
+        "version_count": 0
+      },
+      "content_view_version": null
+    },
+    {
+      "latest": true,
+      "id": null,
+      "created_at": null,
+      "updated_at": null,
+      "composite_content_view": {
+        "id": 4,
+        "name": "ccv123",
+        "label": "ccv1",
+        "description": "blah",
+        "next_version": 2,
+        "latest_version": "1.0",
+        "version_count": 1
+      },
+      "content_view": {
+        "id": 13,
+        "name": "10",
+        "label": "10",
+        "description": "",
+        "next_version": 34,
+        "latest_version": "33.0",
+        "version_count": 33
       },
       "content_view_version": {
-        "id": 11,
-        "name": "component1 4.0",
-        "content_view_id": 3,
-        "version": "4.0",
+        "id": 85,
+        "name": "10 33.0",
+        "content_view_id": 13,
+        "version": "33.0",
         "content_view": {
-          "id": 3,
-          "name": "component1",
-          "label": "component1",
+          "id": 13,
+          "name": "10",
+          "label": "10",
           "description": ""
         },
         "environments": [
@@ -51,111 +101,53 @@
             "label": "Library"
           },
           {
-            "id": 2,
-            "name": "dev",
-            "label": "dev"
-          },
-          {
-            "id": 3,
+            "id": 5,
             "name": "dev1",
             "label": "dev1"
           },
-          {
-            "id": 4,
-            "name": "dev2",
-            "label": "dev2"
-          },
-          {
-            "id": 5,
-            "name": "dev3",
-            "label": "dev3"
-          },
           {
             "id": 6,
-            "name": "test",
-            "label": "test"
-          },
-          {
-            "id": 7,
             "name": "test1",
             "label": "test1"
           },
           {
-            "id": 9,
-            "name": "test2",
-            "label": "test2"
+            "id": 7,
+            "name": "prod1",
+            "label": "prod1"
           },
           {
-            "id": 8,
-            "name": "test3",
-            "label": "test3"
+            "id": 9,
+            "name": "dev2",
+            "label": "dev2"
           }
         ],
-        "repositories": [
-          {
-            "id": 25,
-            "name": "test",
-            "label": "test",
-            "description": null
-          },
-          {
-            "id": 27,
-            "name": "fileRepo1",
-            "label": "fileRepo1",
-            "description": null
-          },
-          {
-            "id": 26,
-            "name": "fileRepo",
-            "label": "fileRepo",
-            "description": null
-          }
-        ]
+        "repositories": []
       }
     },
     {
       "latest": true,
-      "id": 4,
-      "created_at": "2021-04-12 21:14:48 -0400",
-      "updated_at": "2021-04-12 21:14:48 -0400",
+      "id": null,
+      "created_at": null,
+      "updated_at": null,
       "composite_content_view": {
-        "id": 5,
-        "name": "composite1",
-        "label": "composite1",
-        "description": null,
-        "next_version": 1,
-        "latest_version": null,
-        "version_count": 0
-      },
-      "content_view": {
         "id": 4,
-        "name": "component2",
-        "label": "component2",
-        "description": null,
+        "name": "ccv123",
+        "label": "ccv1",
+        "description": "blah",
         "next_version": 2,
         "latest_version": "1.0",
         "version_count": 1
       },
-      "content_view_version": {
-        "id": 8,
-        "name": "component2 1.0",
-        "content_view_id": 4,
-        "version": "1.0",
-        "content_view": {
-          "id": 4,
-          "name": "component2",
-          "label": "component2",
-          "description": null
-        },
-        "environments": [
-          {
-            "id": 1,
-            "name": "Library",
-            "label": "Library"
-          }
-        ],
-        "repositories": []
-      }
+      "content_view": {
+        "id": 9,
+        "name": "6",
+        "label": "6",
+        "description": "",
+        "next_version": 1,
+        "latest_version": null,
+        "version_count": 0
+      },
+      "content_view_version": null
     }
   ]
 }

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

@@ -7,9 +7,14 @@ import ContentViewComponents from '../ContentViewComponents';
 
 const cvComponentData = require('./contentViewComponents.fixtures.json');
 const cvUnpublishedComponentData = require('./unpublishedCVComponents.fixtures.json');
+const cvPublishedComponentData = require('./publishedContentViewDetails.fixtures.json');
 
 const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` };
-const cvComponents = api.getApiUrl('/content_views/5/content_view_components');
+const cvComponents = api.getApiUrl('/content_views/4/content_view_components/show_all?per_page=20&page=1&status=All');
+const addComponentURL = api.getApiUrl('/content_views/4/content_view_components/add');
+const publishedComponentDetailsURL = api.getApiUrl('/content_views/13');
+const removeComponentURL = api.getApiUrl('/content_views/4/content_view_components/remove');
+const cvComponentsSearchURL = api.getApiUrl('/content_views/4/content_view_components/show_all?per_page=20&page=1&search=name+%3D+%227%22&status=All');
 const autocompleteUrl = '/content_views/auto_complete_search';
 
 let firstComponent;
@@ -33,18 +38,18 @@ test('Can call API and show components on page load', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(cvComponents)
-    .query(true)
     .reply(200, cvComponentData);
 
   const { getByText, queryByText } = renderWithRedux(
-    <ContentViewComponents cvId={5} />,
+    <ContentViewComponents cvId={4} />,
     renderOptions,
   );
 
   // Nothing will show at first, page is loading
   expect(queryByText(firstComponent.content_view.label)).toBeNull();
   // Assert that the repo name is now showing on the screen, but wait for it to appear.
-  await patientlyWaitFor(() => expect(getByText(firstComponent.content_view.label)).toBeTruthy());
+  await patientlyWaitFor(() => expect(getByText(firstComponent.content_view.label))
+    .toBeInTheDocument());
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
 });
@@ -53,13 +58,12 @@ test('Can call API and show unpublished components', async (done) => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(cvComponents)
-    .query(true)
     .reply(200, cvUnpublishedComponentData);
 
   const unpublishedComponent = cvUnpublishedComponentData.results[1];
 
   const { getByText, queryByText, getAllByText } = renderWithRedux(
-    <ContentViewComponents cvId={5} />,
+    <ContentViewComponents cvId={4} />,
     renderOptions,
   );
 
@@ -78,11 +82,10 @@ test('Can link to view environment', async () => {
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const scope = nockInstance
     .get(cvComponents)
-    .query(true)
     .reply(200, cvComponentData);
 
   const { getAllByText } = renderWithRedux(
-    <ContentViewComponents cvId={5} />,
+    <ContentViewComponents cvId={4} />,
     renderOptions,
   );
 
@@ -95,7 +98,7 @@ test('Can link to view environment', async () => {
   assertNockRequest(scope);
 });
 
-test('Can search for component content views in component view', async (done) => {
+test('Can search for component content views in composite view', async (done) => {
   const lastComponent = cvComponentData.results[1];
   const { name: firstComponentName } = firstComponent.content_view;
   const { name: lastComponentName } = lastComponent.content_view;
@@ -103,17 +106,15 @@ test('Can search for component content views in component view', async (done) =>
 
   const cvComponentsScope = nockInstance
     .get(cvComponents)
-    .query(true)
     .reply(200, cvComponentData);
   const cvComponentsSearchScope = nockInstance
-    .get(cvComponents)
-    .query(searchQueryMatcher)
+    .get(cvComponentsSearchURL)
     .reply(200, { results: [lastComponent] });
 
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
   const withSearchScope = mockAutocomplete(nockInstance, autocompleteUrl, searchQueryMatcher);
   const { getByText, queryByText, getByLabelText } =
-    renderWithRedux(<ContentViewComponents cvId={5} />, renderOptions);
+    renderWithRedux(<ContentViewComponents cvId={4} />, renderOptions);
 
   // Basic results showing
   await patientlyWaitFor(() => {
@@ -149,15 +150,138 @@ test('Can handle no components being present', async (done) => {
   };
   const scope = nockInstance
     .get(cvComponents)
-    .query(true)
     .reply(200, noResults);
 
   const mockDetails = { label: 'test_empty' };
   const { queryByText } =
-    renderWithRedux(<ContentViewComponents cvId={5} details={mockDetails} />, renderOptions);
+    renderWithRedux(<ContentViewComponents cvId={4} details={mockDetails} />, renderOptions);
 
   expect(queryByText(firstComponent.content_view.label)).toBeNull();
-  await patientlyWaitFor(() => expect(queryByText('No content views belong to test_empty')).toBeTruthy());
+  await patientlyWaitFor(() => expect(queryByText('No content views belong to test_empty')).toBeInTheDocument());
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
 });
+
+test('Can add published component views to content view with modal', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(cvComponents)
+    .reply(200, cvComponentData);
+
+  const returnScope = nockInstance
+    .get(cvComponents)
+    .reply(200, cvComponentData);
+
+  const publishedComponentVersionsScope = nockInstance
+    .get(publishedComponentDetailsURL)
+    .reply(200, cvPublishedComponentData);
+
+  const addComponentParams = {
+    compositeContentViewId: 4,
+    components: [{ content_view_version_id: 85 }],
+  };
+
+  const addComponentScope = nockInstance
+    .put(addComponentURL, addComponentParams)
+    .reply(200, {});
+
+  const {
+    getByText, getByLabelText, queryByLabelText, getAllByLabelText,
+  } = renderWithRedux(
+    <ContentViewComponents cvId={4} />,
+    renderOptions,
+  );
+  await patientlyWaitFor(() => {
+    expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'false');
+  });
+  fireEvent.click(getAllByLabelText('Actions')[2]);
+  expect(getAllByLabelText('Actions')[2]).toHaveAttribute('aria-expanded', 'true');
+  await patientlyWaitFor(() => {
+    expect(getByText('Add')).toBeInTheDocument();
+  });
+  fireEvent.click(getByText('Add'));
+  await patientlyWaitFor(() => {
+    expect(getByText('Add component')).toBeInTheDocument();
+  });
+  fireEvent.click(getByLabelText('add_component'));
+  await patientlyWaitFor(() => {
+    expect(queryByLabelText('add_component')).not.toBeInTheDocument();
+  });
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(publishedComponentVersionsScope);
+  assertNockRequest(addComponentScope);
+  assertNockRequest(returnScope, done);
+});
+
+test('Can add unpublished component views to content view', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(cvComponents)
+    .reply(200, cvComponentData);
+
+  const returnScope = nockInstance
+    .get(cvComponents)
+    .reply(200, cvComponentData);
+
+  const addComponentParams = {
+    compositeContentViewId: 4,
+    components: [{ latest: true, content_view_id: 9 }],
+  };
+
+  const addComponentScope = nockInstance
+    .put(addComponentURL, addComponentParams)
+    .reply(200, {});
+
+  const { getByText, getAllByLabelText } = renderWithRedux(
+    <ContentViewComponents cvId={4} />,
+    renderOptions,
+  );
+  await patientlyWaitFor(() => {
+    expect(getAllByLabelText('Actions').slice(-1)[0]).toHaveAttribute('aria-expanded', 'false');
+  });
+  fireEvent.click(getAllByLabelText('Actions').slice(-1)[0]);
+  expect(getAllByLabelText('Actions').slice(-1)[0]).toHaveAttribute('aria-expanded', 'true');
+  await patientlyWaitFor(() => expect(getByText('Add')).toBeInTheDocument());
+  fireEvent.click(getByText('Add'));
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(addComponentScope);
+  assertNockRequest(returnScope, done);
+});
+
+test('Can remove component views from content view', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(cvComponents)
+    .reply(200, cvComponentData);
+
+  const returnScope = nockInstance
+    .get(cvComponents)
+    .reply(200, cvComponentData);
+
+  const removeComponentParams = {
+    compositeContentViewId: 4,
+    component_ids: [28],
+  };
+
+  const removeComponentScope = nockInstance
+    .put(removeComponentURL, removeComponentParams)
+    .reply(200, {});
+
+  const { getByText, getAllByLabelText } = renderWithRedux(
+    <ContentViewComponents cvId={4} />,
+    renderOptions,
+  );
+  await patientlyWaitFor(() => {
+    expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'false');
+  });
+  fireEvent.click(getAllByLabelText('Actions')[0]);
+  expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
+  await patientlyWaitFor(() => expect(getByText('Remove')).toBeInTheDocument());
+  fireEvent.click(getByText('Remove'));
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+  assertNockRequest(removeComponentScope);
+  assertNockRequest(returnScope, done);
+});