katello 4.0.3 → 4.1.0.rc1

data/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.fixtures.json

@@ -0,0 +1,370 @@
+{
+  "total": 4,
+  "subtotal": 4,
+  "page": "1",
+  "per_page": "20",
+  "error": null,
+  "search": null,
+  "sort": {
+    "by": "content_view_version_id",
+    "order": "asc"
+  },
+  "results": [
+    {
+      "user": "admin",
+      "status": "successful",
+      "description": "description1",
+      "action": "removal",
+      "created_at": "2021-03-26 09:44:18 -0400",
+      "updated_at": "2021-03-26 09:44:20 -0400",
+      "environment": {
+        "id": 2,
+        "name": "test"
+      },
+      "task": {
+        "id": "6b2a9627-1240-4fad-9bd9-0810c65cd820",
+        "label": "Actions::Katello::ContentView::Remove",
+        "pending": false,
+        "action": "Remove Versions and Associations content view 'cv1'; organization 'Default Organization'",
+        "username": "admin",
+        "started_at": "2021-03-26 09:44:18 -0400",
+        "ended_at": "2021-03-26 09:44:20 -0400",
+        "state": "stopped",
+        "result": "success",
+        "progress": 1,
+        "input": {
+          "content_view": {
+            "id": 2,
+            "name": "cv1",
+            "label": "cv1"
+          },
+          "organization": {
+            "id": 1,
+            "name": "Default Organization",
+            "label": "Default_Organization"
+          },
+          "services_checked": [
+            "pulp3",
+            "candlepin",
+            "candlepin_auth"
+          ],
+          "content_view_id": 2,
+          "environment_ids": [
+            2
+          ],
+          "environment_names": [
+            "test"
+          ],
+          "version_ids": [],
+          "content_view_history_ids": [
+            6
+          ],
+          "locale": "en",
+          "current_request_id": "dcbe37e4-29d3-46e0-9491-5ae682a165a5",
+          "current_timezone": "America/New_York",
+          "current_organization_id": 1,
+          "current_location_id": 2,
+          "current_user_id": 4
+        },
+        "output": {},
+        "humanized": {
+          "action": "Remove Versions and Associations",
+          "input": [
+            [
+              "content_view",
+              {
+                "text": "content view 'cv1'",
+                "link": "/content_views/2/versions"
+              }
+            ],
+            [
+              "organization",
+              {
+                "text": "organization 'Default Organization'",
+                "link": "/organizations/1/edit"
+              }
+            ]
+          ],
+          "output": "",
+          "errors": []
+        },
+        "cli_example": null,
+        "start_at": "2021-03-26 09:44:18 -0400",
+        "available_actions": {
+          "cancellable": false,
+          "resumable": false
+        }
+      },
+      "version": "3.0",
+      "publish": false,
+      "version_id": 4,
+      "triggered_by": null,
+      "triggered_by_id": null
+    },
+    {
+      "user": "admin",
+      "status": "successful",
+      "description": "description2",
+      "action": "promotion",
+      "created_at": "2021-03-26 09:43:59 -0400",
+      "updated_at": "2021-03-26 09:44:03 -0400",
+      "environment": {
+        "id": 2,
+        "name": "test"
+      },
+      "task": {
+        "id": "c0ed4349-6d1e-433a-bf33-50b4700923ff",
+        "label": "Actions::Katello::ContentView::Promote",
+        "pending": false,
+        "action": "Promote content view 'cv1'; organization 'Default Organization'",
+        "username": "admin",
+        "started_at": "2021-03-26 09:43:59 -0400",
+        "ended_at": "2021-03-26 09:44:03 -0400",
+        "state": "stopped",
+        "result": "success",
+        "progress": 1,
+        "input": {
+          "content_view": {
+            "id": 2,
+            "name": "cv1",
+            "label": "cv1"
+          },
+          "organization": {
+            "id": 1,
+            "name": "Default Organization",
+            "label": "Default_Organization"
+          },
+          "environments": [
+            "test"
+          ],
+          "services_checked": [
+            "candlepin",
+            "candlepin_auth",
+            "pulp3"
+          ],
+          "locale": "en",
+          "current_request_id": "6ea7c18b-b5ed-4ca0-869d-3342d325961b",
+          "current_timezone": "America/New_York",
+          "current_organization_id": 1,
+          "current_location_id": 2,
+          "current_user_id": 4
+        },
+        "output": {},
+        "humanized": {
+          "action": "Promote",
+          "input": [
+            [
+              "content_view",
+              {
+                "text": "content view 'cv1'",
+                "link": "/content_views/2/versions"
+              }
+            ],
+            [
+              "organization",
+              {
+                "text": "organization 'Default Organization'",
+                "link": "/organizations/1/edit"
+              }
+            ]
+          ],
+          "output": "",
+          "errors": []
+        },
+        "cli_example": null,
+        "start_at": "2021-03-26 09:43:59 -0400",
+        "available_actions": {
+          "cancellable": false,
+          "resumable": false
+        }
+      },
+      "version": "3.0",
+      "publish": false,
+      "version_id": 4,
+      "triggered_by": null,
+      "triggered_by_id": null
+    },
+    {
+      "user": "admin",
+      "status": "successful",
+      "description": "description3",
+      "action": "publish",
+      "created_at": "2021-03-26 09:39:30 -0400",
+      "updated_at": "2021-03-26 09:39:35 -0400",
+      "environment": null,
+      "task": {
+        "id": "d126ec01-e308-4604-9e70-337a45e9b8d4",
+        "label": "Actions::Katello::ContentView::Publish",
+        "pending": false,
+        "action": "Publish content view 'cv1'; organization 'Default Organization'",
+        "username": "admin",
+        "started_at": "2021-03-26 09:39:30 -0400",
+        "ended_at": "2021-03-26 09:39:35 -0400",
+        "state": "stopped",
+        "result": "success",
+        "progress": 1,
+        "input": {
+          "content_view": {
+            "id": 2,
+            "name": "cv1",
+            "label": "cv1"
+          },
+          "organization": {
+            "id": 1,
+            "name": "Default Organization",
+            "label": "Default_Organization"
+          },
+          "services_checked": [
+            "pulp3",
+            "pulp",
+            "pulp_auth",
+            "candlepin",
+            "candlepin_auth"
+          ],
+          "history_id": 3,
+          "content_view_id": 2,
+          "auto_publish_composite_ids": [],
+          "content_view_version_name": "cv1 3.0",
+          "content_view_version_id": 4,
+          "environment_id": 1,
+          "user_id": 4,
+          "skip_promotion": null,
+          "locale": "en",
+          "current_request_id": "af6cc6b0-9615-4e2e-8941-16193b1a6acd",
+          "current_timezone": "America/New_York",
+          "current_organization_id": 1,
+          "current_location_id": 2,
+          "current_user_id": 4
+        },
+        "output": {
+          "content_view_id": 2,
+          "content_view_version_id": 4,
+          "skip_promotion": null
+        },
+        "humanized": {
+          "action": "Publish",
+          "input": [
+            [
+              "content_view",
+              {
+                "text": "content view 'cv1'",
+                "link": "/content_views/2/versions"
+              }
+            ],
+            [
+              "organization",
+              {
+                "text": "organization 'Default Organization'",
+                "link": "/organizations/1/edit"
+              }
+            ]
+          ],
+          "output": "",
+          "errors": []
+        },
+        "cli_example": null,
+        "start_at": "2021-03-26 09:39:30 -0400",
+        "available_actions": {
+          "cancellable": false,
+          "resumable": false
+        }
+      },
+      "version": "3.0",
+      "publish": true,
+      "version_id": 4,
+      "triggered_by": null,
+      "triggered_by_id": null
+    },
+    {
+      "user": "admin",
+      "status": "successful",
+      "description": "A new version of cv1 will be created and promoted to the Library environment. It can be promoted to other environments from the Versions tab of this Content View.\nA new version of cv1 will be created and promoted to the Library environment. It can be promoted to other environments from the Versions tab of this Content View.\nA new version of cv1 will be created and promoted to the Library environment. It can be promoted to other environments from the Versions tab of this Content View.\nA new version of cv1 will be created and promoted to the Library environment. It can be promoted to other environments from the Versions tab of this Content View.",
+      "action": "publish",
+      "created_at": "2021-03-26 11:36:27 -0400",
+      "updated_at": "2021-03-26 11:36:32 -0400",
+      "environment": null,
+      "task": {
+        "id": "65b8eff5-c144-44b8-8765-ef9c89f3fe68",
+        "label": "Actions::Katello::ContentView::Publish",
+        "pending": false,
+        "action": "Publish content view 'cv1'; organization 'Default Organization'",
+        "username": "admin",
+        "started_at": "2021-03-26 11:36:27 -0400",
+        "ended_at": "2021-03-26 11:36:32 -0400",
+        "state": "stopped",
+        "result": "success",
+        "progress": 1,
+        "input": {
+          "content_view": {
+            "id": 2,
+            "name": "cv1",
+            "label": "cv1"
+          },
+          "organization": {
+            "id": 1,
+            "name": "Default Organization",
+            "label": "Default_Organization"
+          },
+          "services_checked": [
+            "pulp3",
+            "pulp",
+            "pulp_auth",
+            "candlepin",
+            "candlepin_auth"
+          ],
+          "history_id": 8,
+          "content_view_id": 2,
+          "auto_publish_composite_ids": [],
+          "content_view_version_name": "cv1 4.0",
+          "content_view_version_id": 5,
+          "environment_id": 1,
+          "user_id": 4,
+          "skip_promotion": null,
+          "locale": "en",
+          "current_request_id": "0ea97e4c-57c1-4248-b98f-81529db7e070",
+          "current_timezone": "America/New_York",
+          "current_organization_id": 1,
+          "current_location_id": 2,
+          "current_user_id": 4
+        },
+        "output": {
+          "content_view_id": 2,
+          "content_view_version_id": 5,
+          "skip_promotion": null
+        },
+        "humanized": {
+          "action": "Publish",
+          "input": [
+            [
+              "content_view",
+              {
+                "text": "content view 'cv1'",
+                "link": "/content_views/2/versions"
+              }
+            ],
+            [
+              "organization",
+              {
+                "text": "organization 'Default Organization'",
+                "link": "/organizations/1/edit"
+              }
+            ]
+          ],
+          "output": "",
+          "errors": []
+        },
+        "cli_example": null,
+        "start_at": "2021-03-26 11:36:27 -0400",
+        "available_actions": {
+          "cancellable": false,
+          "resumable": false
+        }
+      },
+      "version": "4.0",
+      "publish": true,
+      "version_id": 5,
+      "triggered_by": null,
+      "triggered_by_id": null
+    }
+  ]
+}

data/webpack/scenes/ContentViews/Details/Histories/__tests__/contentViewHistory.test.js

@@ -0,0 +1,94 @@
+import React from 'react';
+import { renderWithRedux, patientlyWaitFor } from 'react-testing-lib-wrapper';
+
+import nock, { nockInstance, assertNockRequest, mockAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import api from '../../../../../services/api';
+import CONTENT_VIEWS_KEY from '../../../ContentViewsConstants';
+import ContentViewHistories from '../ContentViewHistories';
+
+const historyData = require('./contentViewHistory.fixtures.json');
+
+const renderOptions = { apiNamespace: `${CONTENT_VIEWS_KEY}_1` };
+const cvHistories = api.getApiUrl('/content_views/1/history');
+const autocompleteUrl = '/content_views/1/history/auto_complete_search';
+
+let firstHistory;
+let searchDelayScope;
+let autoSearchScope;
+
+beforeEach(() => {
+  const { results } = historyData;
+  [firstHistory] = results;
+  searchDelayScope = mockSetting(nockInstance, 'autosearch_delay', 500);
+  autoSearchScope = mockSetting(nockInstance, 'autosearch_while_typing', true);
+});
+
+afterEach(() => {
+  nock.cleanAll();
+  assertNockRequest(searchDelayScope);
+  assertNockRequest(autoSearchScope);
+});
+
+test('Can call API and show history on page load', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(cvHistories)
+    .query(true)
+    .reply(200, historyData);
+
+  const { getByText, queryByText } = renderWithRedux(
+    <ContentViewHistories cvId={1} />,
+    renderOptions,
+  );
+
+  // Nothing will show at first, page is loading
+  expect(queryByText(firstHistory.description)).toBeNull();
+  // Assert that the repo name is now showing on the screen, but wait for it to appear.
+  await patientlyWaitFor(() => expect(getByText(firstHistory.description)).toBeTruthy());
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});
+
+test('Can link to view environment', async () => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(cvHistories)
+    .query(true)
+    .reply(200, historyData);
+
+  const { getAllByText } = renderWithRedux(
+    <ContentViewHistories cvId={1} />,
+    renderOptions,
+  );
+
+  await patientlyWaitFor(() => {
+    expect(getAllByText('test')[0].closest('a'))
+      .toHaveAttribute('href', '/lifecycle_environments/2');
+  });
+
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope);
+});
+
+test('Can handle no History being present', async (done) => {
+  const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
+
+  const noResults = {
+    total: 0,
+    subtotal: 0,
+    page: 1,
+    per_page: 20,
+    results: [],
+  };
+  const scope = nockInstance
+    .get(cvHistories)
+    .query(true)
+    .reply(200, noResults);
+
+  const { queryByText } = renderWithRedux(<ContentViewHistories cvId={1} />, renderOptions);
+
+  expect(queryByText(firstHistory.description)).toBeNull();
+  await patientlyWaitFor(() => expect(queryByText("You currently don't have any history for this content view.")).toBeTruthy());
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});

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

@@ -15,7 +15,6 @@ const repoLabels = {
   file: ['files', 'file', 'content/files'],
   ostree_branch: ['ostree branches', 'ostree branch', 'content/ostree_branches'],
   package_group: ['package groups', 'package group', 'package_groups'],
-  puppet_module: ['puppet modules', 'puppet module', 'content/puppet_modules'],
   srpm: ['source RPMs', 'source RPM', 'source_rpms'], // no link?
 };
 

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

@@ -1,6 +1,16 @@
 import React, { useState, useEffect } from 'react';
 import { useSelector, shallowEqual, useDispatch } from 'react-redux';
-import { Bullseye, Split, SplitItem } from '@patternfly/react-core';
+import {
+  Bullseye,
+  Split,
+  SplitItem,
+  Button,
+  ActionList,
+  ActionListItem,
+  Dropdown,
+  DropdownItem,
+  KebabToggle,
+} from '@patternfly/react-core';
 import { TableVariant, fitContent } from '@patternfly/react-table';
 import { STATUS } from 'foremanReact/constants';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -9,19 +19,20 @@ import PropTypes from 'prop-types';
 
 import TableWrapper from '../../../../components/Table/TableWrapper';
 import onSelect from '../../../../components/Table/helpers';
-import { getContentViewRepositories, getRepositoryTypes } from '../ContentViewDetailActions';
+import { getContentViewRepositories, getRepositoryTypes, updateContentView } from '../ContentViewDetailActions';
 import {
   selectCVRepos,
   selectCVReposStatus,
   selectCVReposError,
   selectRepoTypes,
   selectRepoTypesStatus,
+  selectCVDetails,
 } from '../ContentViewDetailSelectors';
 import { ADDED, NOT_ADDED, ALL_STATUSES } from '../../ContentViewsConstants';
 import ContentCounts from './ContentCounts';
 import LastSync from './LastSync';
-import RepoAddedStatus from './RepoAddedStatus';
 import RepoIcon from './RepoIcon';
+import AddedStatusLabel from '../../../../components/AddedStatusLabel';
 import SelectableDropdown from '../../../../components/SelectableDropdown';
 import { capitalize } from '../../../../utils/helpers';
 
@@ -41,6 +52,7 @@ const ContentViewRepositories = ({ cvId }) => {
   const error = useSelector(state => selectCVReposError(state, cvId), shallowEqual);
   const repoTypesResponse = useSelector(state => selectRepoTypes(state), shallowEqual);
   const repoTypesStatus = useSelector(state => selectRepoTypesStatus(state), shallowEqual);
+  const details = useSelector(state => selectCVDetails(state, cvId), shallowEqual);
 
   const [rows, setRows] = useState([]);
   const [metadata, setMetadata] = useState({});
@@ -49,6 +61,8 @@ const ContentViewRepositories = ({ cvId }) => {
   const [statusSelected, setStatusSelected] = useState(ALL_STATUSES);
   // repoTypes object format: [displayed_value]: API_value
   const [repoTypes, setRepoTypes] = useState({});
+  const [bulkActionOpen, setBulkActionOpen] = useState(false);
+  const [bulkActionEnabled, setBulkActionEnabled] = useState(false);
 
   const columnHeaders = [
     { title: __('Type'), transforms: [fitContent] },
@@ -81,22 +95,14 @@ const ContentViewRepositories = ({ cvId }) => {
         { title: <LastSync {...{ lastSyncWords, lastSync }} /> },
         { title: <ContentCounts {...{ counts, productId }} repoId={id} /> },
         {
-          title: <RepoAddedStatus added={addedToCV || statusSelected === ADDED} />,
+          title: <AddedStatusLabel added={addedToCV || statusSelected === ADDED} />,
         },
       ];
-
-      newRows.push({ cells });
+      newRows.push({ repoId: id, cells });
     });
     return newRows;
   };
 
-  const getCVReposWithOptions = (params = {}) => {
-    const allParams = { ...params };
-    if (typeSelected !== 'All repositories') allParams.content_type = repoTypes[typeSelected];
-
-    return getContentViewRepositories(cvId, allParams, statusSelected);
-  };
-
   useEffect(() => {
     const { results, ...meta } = response;
     setMetadata(meta);
@@ -111,6 +117,11 @@ const ContentViewRepositories = ({ cvId }) => {
     dispatch(getRepositoryTypes());
   }, []);
 
+  useEffect(() => {
+    const rowsAreSelected = rows.some(row => row.selected);
+    setBulkActionEnabled(rowsAreSelected);
+  }, [rows]);
+
   // Get repo type filter selections dynamically from the API
   useEffect(() => {
     if (repoTypesStatus === STATUS.RESOLVED && repoTypesResponse) {
@@ -126,12 +137,76 @@ const ContentViewRepositories = ({ cvId }) => {
     }
   }, [JSON.stringify(repoTypesResponse), repoTypesStatus]);
 
+  const toggleBulkAction = () => {
+    setBulkActionOpen(!bulkActionOpen);
+  };
+
+  const onAdd = (repos) => {
+    const { repository_ids: repositoryIds = [] } = details;
+    dispatch(updateContentView(cvId, { repository_ids: repositoryIds.concat(repos) }));
+  };
+
+  const onRemove = (repos) => {
+    const reposToDelete = [].concat(repos);
+    const { repository_ids: repositoryIds = [] } = details;
+    const deletedRepos = repositoryIds.filter(x => !reposToDelete.includes(x));
+    dispatch(updateContentView(cvId, { repository_ids: deletedRepos }));
+  };
+
+  const addBulk = () => {
+    const reposToAdd = [];
+    rows.forEach(row => row.selected && reposToAdd.push(row.repoId));
+    onAdd(reposToAdd);
+  };
+
+  const removeBulk = () => {
+    const reposToDelete = [];
+    rows.forEach(row => row.selected && reposToDelete.push(row.repoId));
+    onRemove(reposToDelete);
+  };
+
+  const actionResolver = (rowData, { _rowIndex }) => {
+    if (rowData.parent || rowData.compoundParent || rowData.noactions) return null;
+    const { repository_ids: repositoryIds } = details;
+    return [
+      {
+        title: 'Add',
+        isDisabled: repositoryIds && repositoryIds.includes(rowData.repoId),
+        onClick: (_event, rowId, rowInfo) => {
+          onAdd(rowInfo.repoId);
+        },
+      },
+      {
+        title: 'Remove',
+        isDisabled: repositoryIds && !repositoryIds.includes(rowData.repoId),
+        onClick: (_event, rowId, rowInfo) => {
+          onRemove(rowInfo.repoId);
+        },
+      },
+    ];
+  };
+
+  const getCVReposWithOptions = (params = {}) => {
+    const allParams = { ...params };
+    if (typeSelected !== 'All repositories') allParams.content_type = repoTypes[typeSelected];
+
+    return getContentViewRepositories(cvId, allParams, statusSelected);
+  };
+
   const emptyContentTitle = __("You currently don't have any repositories to add to this content view.");
   const emptyContentBody = __('Please add some repositories.'); // needs link
   const emptySearchTitle = __('No matching repositories found');
   const emptySearchBody = __('Try changing your search settings.');
   const activeFilters = (typeSelected && typeSelected !== allRepositories) ||
     (statusSelected && statusSelected !== ALL_STATUSES);
+  const dropdownItems = [
+    <DropdownItem aria-label="bulk_add" key="bulk_add" isDisabled={!bulkActionEnabled} component="button" onClick={addBulk}>
+      Add
+    </DropdownItem>,
+    <DropdownItem aria-label="bulk_remove" key="bulk_remove" isDisabled={!bulkActionEnabled} component="button" onClick={removeBulk}>
+      Remove
+    </DropdownItem>,
+  ];
 
   return (
     <TableWrapper
@@ -144,6 +219,7 @@ const ContentViewRepositories = ({ cvId }) => {
         emptySearchBody,
         searchQuery,
         updateSearchQuery,
+        actionResolver,
         error,
         status,
         activeFilters,
@@ -176,6 +252,23 @@ const ContentViewRepositories = ({ cvId }) => {
             placeholderText="Status"
           />
         </SplitItem>
+        <SplitItem>
+          <ActionList>
+            <ActionListItem>
+              <Button onClick={addBulk} isDisabled={!bulkActionEnabled} variant="secondary" aria-label="add_repositories">
+                Add repositories
+              </Button>
+            </ActionListItem>
+            <ActionListItem>
+              <Dropdown
+                toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
+                isOpen={bulkActionOpen}
+                isPlain
+                dropdownItems={dropdownItems}
+              />
+            </ActionListItem>
+          </ActionList>
+        </SplitItem>
       </Split>
     </TableWrapper>
   );