katello 4.11.0 → 4.12.0.rc1

data/webpack/components/extensions/HostDetails/Tabs/PackagesTab/PackagesTab.js

@@ -50,6 +50,8 @@ import { runSubmanRepos } from '../../Cards/ContentViewDetailsCard/HostContentVi
 const invokeRexJobs = ['create_job_invocations'];
 const createBookmarks = ['create_bookmarks'];
 
+export const hidePackagesTab = ({ hostDetails }) => !(hostDetails?.operatingsystem_family?.match(/RedHat|SUSE/i));
+
 const UpdateVersionsSelect = ({
   packageName,
   rowIndex,

data/webpack/components/extensions/HostDetails/Tabs/RemoteExecutionActions.js

@@ -15,7 +15,7 @@ const baseParams = ({
   job_invocation: {
     feature,
     inputs,
-    descriptionFormat,
+    description_format: descriptionFormat,
     search_query: `name ^ (${hostname})`,
   },
 });
@@ -41,7 +41,7 @@ const katelloPackageInstallBySearchParams = ({ hostname, search, descriptionForm
     hostname,
     inputs: { [PACKAGE_SEARCH_QUERY]: search },
     feature: REX_FEATURES.KATELLO_PACKAGE_INSTALL_BY_SEARCH,
-    description_format: descriptionFormat,
+    descriptionFormat,
   });
 
 const katelloPackageRemoveParams = ({ hostname, packageName }) =>
@@ -56,19 +56,20 @@ const katelloPackagesRemoveParams = ({ hostname, search, descriptionFormat }) =>
     hostname,
     inputs: { [PACKAGES_SEARCH_QUERY]: search },
     feature: REX_FEATURES.KATELLO_PACKAGES_REMOVE_BY_SEARCH,
-    description_format: descriptionFormat,
+    descriptionFormat,
   });
 
-const katelloPackageUpdateParams = ({ hostname, packageName }) =>
+const katelloPackageUpdateParams = ({ hostname, packageName, descriptionFormat }) =>
   baseParams({
     hostname,
     inputs: { package: packageName },
     feature: REX_FEATURES.KATELLO_PACKAGE_UPDATE,
+    descriptionFormat,
   });
 
 const katelloPackagesUpdateParams = ({
   hostname, search, versions, descriptionFormat,
-}) => ({
+}) => ({ // this doesn't use baseParams so looks different from the others
   job_invocation: {
     feature: REX_FEATURES.KATELLO_PACKAGES_UPDATE_BY_SEARCH,
     inputs: { [PACKAGES_SEARCH_QUERY]: search, [SELECTED_UPDATE_VERSIONS]: versions },

data/webpack/components/extensions/HostDetails/Tabs/RepositorySetsTab/RepositorySetsTab.js

@@ -56,7 +56,7 @@ import {
   setContentOverrides,
 } from './RepositorySetsActions';
 
-import { selectOrganization, selectOrganizationStatus } from '../../Cards/SystemPurposeCard/SystemPurposeSelectors';
+import { selectOrganizationStatus } from '../../Cards/SystemPurposeCard/SystemPurposeSelectors';
 import { getOrganization } from '../../Cards/SystemPurposeCard/SystemPurposeActions';
 
 import { REPOSITORY_SETS_KEY, STATUSES, STATUS_TO_PARAM, PARAM_TO_FRIENDLY_NAME, PROVIDER_TYPES, PROVIDER_TYPE_PARAM_TO_FRIENDLY_NAME, PROVIDER_TYPE_TO_PARAM } from './RepositorySetsConstants.js';
@@ -172,9 +172,6 @@ const RepositorySetsTab = () => {
     organization_id: orgId,
   } = hostDetails;
 
-  const {
-    simple_content_access: simpleContentAccess,
-  } = useSelector(state => selectOrganization(state, orgId));
   const orgStatus = useSelector(state => selectOrganizationStatus(state, orgId));
   const orgNotLoaded = orgStatus !== STATUS.RESOLVED;
 
@@ -265,14 +262,14 @@ const RepositorySetsTab = () => {
       }
       return getHostRepositorySets({
         content_access_mode_env: toggleGroupState === LIMIT_TO_ENVIRONMENT,
-        content_access_mode_all: simpleContentAccess,
+        content_access_mode_all: true,
         host_id: hostId,
         ...apiSortParams,
         ...modifiedParams,
       });
     },
     [hostId, statusSelected, STATUS_LABEL, repoTypeSelected,
-      REPO_TYPE_LABEL, toggleGroupState, LIMIT_TO_ENVIRONMENT, simpleContentAccess, apiSortParams],
+      REPO_TYPE_LABEL, toggleGroupState, LIMIT_TO_ENVIRONMENT, apiSortParams],
   );
 
   useEffect(() => {
@@ -377,7 +374,7 @@ const RepositorySetsTab = () => {
       singular: singular || selectedCount === 1,
     }));
   };
-  const bulkParams = () => fetchBulkParams('cp_content_id');
+  const bulkParams = () => fetchBulkParams({ idColumnName: 'cp_content_id' });
   const enableRepoSets = () => updateOverrides({ enabled: true, search: bulkParams() });
   const disableRepoSets = () => updateOverrides({ enabled: false, search: bulkParams() });
   const resetToDefaultRepoSets = () => updateOverrides({ remove: true, search: bulkParams() });
@@ -501,21 +498,10 @@ const RepositorySetsTab = () => {
 
   const hostEnvText = 'the "{contentViewName}" content view and "{lifecycleEnvironmentName}" environment';
 
-  const scaAlert = (toggleGroupState === LIMIT_TO_ENVIRONMENT ?
+  const alertText = (toggleGroupState === LIMIT_TO_ENVIRONMENT ?
     `Showing only repositories in ${hostEnvText}.` :
     'Showing all available repositories.');
 
-  const nonScaAlert = (toggleGroupState === LIMIT_TO_ENVIRONMENT ?
-    `Showing repositories in ${hostEnvText} that are available through subscriptions.` :
-    'Showing all repositories available through subscriptions.');
-
-  let alertText;
-  if (simpleContentAccess) {
-    alertText = scaAlert;
-  } else {
-    alertText = nonScaAlert;
-  }
-
   return (
     <div>
       <div id="repo-sets-tab">

data/webpack/components/extensions/HostDetails/Tabs/TracesTab/TracesTab.js

@@ -2,10 +2,11 @@ import React, { useState, useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 import {
   Skeleton, Split, SplitItem, ActionList, ActionListItem, Dropdown,
-  DropdownItem, DropdownToggle, DropdownToggleAction,
+  DropdownItem, DropdownToggle, DropdownToggleAction, Alert,
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { TableVariant, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
+import { ExclamationTriangleIcon } from '@patternfly/react-icons';
 import { useSelector } from 'react-redux';
 import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
 import { useBulkSelect, useUrlParams } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
@@ -27,6 +28,7 @@ import { HOST_TRACES_KEY } from './HostTracesConstants';
 
 const invokeRexJobs = ['create_job_invocations'];
 const createBookmarks = ['create_bookmarks'];
+const containsStaticType = (results = []) => results.some(result => result.app_type === 'static');
 
 const TracesTab = () => {
   const hostDetails = useSelector(state => selectAPIResponse(state, 'HOST_DETAILS'));
@@ -78,13 +80,16 @@ const TracesTab = () => {
   const tracesSearchQuery = id => `id = ${id}`;
   const {
     selectOne, isSelected, searchQuery, selectedCount, isSelectable,
-    updateSearchQuery, selectNone, fetchBulkParams, ...selectAll
+    updateSearchQuery, selectNone, fetchBulkParams, selectedResults,
+    selectAllMode, ...selectAll
   } = useBulkSelect({
     results,
     metadata: meta,
     isSelectable: result => !!result.restart_command,
     initialSearchQuery: searchParam || '',
   });
+  const willRestartHost = containsStaticType(selectedResults)
+    || (selectAllMode && containsStaticType(results));
 
   const BulkRestartTracesAction = () => resolveTraces({
     hostname, search: fetchBulkParams(),
@@ -163,7 +168,7 @@ const TracesTab = () => {
                   ouiaId="bulk_actions"
                   splitButtonItems={[
                     <DropdownToggleAction key="action" onClick={onBulkRestartApp}>
-                      {__('Restart app')}
+                      {willRestartHost ? __('Reboot host') : __('Restart app')}
                     </DropdownToggleAction>,
                   ]}
                   isDisabled={selectedCount === 0}
@@ -192,6 +197,9 @@ const TracesTab = () => {
   return (
     <div id="traces-tab">
       <h3>{__('Tracer helps administrators identify applications that need to be restarted after a system is patched.')}</h3>
+      {willRestartHost && (
+      <Alert isInline variant="warning" ouiaId="host-will-reboot-alert" title={__('At least one of the selected items requires the host to reboot')} />
+      )}
       <TableWrapper
         {...{
           emptyContentTitle,
@@ -267,7 +275,7 @@ const TracesTab = () => {
                         'aria-label': `check-${application}`,
                       },
                       isSelected: isSelected(id),
-                      onSelect: (event, selected) => selectOne(selected, id),
+                      onSelect: (event, selected) => selectOne(selected, id, result),
                       rowIndex,
                       variant: 'checkbox',
                     }}
@@ -277,7 +285,7 @@ const TracesTab = () => {
                 }
                 <Td>{application}</Td>
                 <Td>{appType}</Td>
-                <Td>{helper}</Td>
+                <Td>{appType === 'static' ? <ExclamationTriangleIcon /> : null} {helper}</Td>
                 {showActions && (
                   <Td
                     actions={{

data/webpack/components/extensions/HostDetails/Tabs/__tests__/debs.fixtures.json

@@ -0,0 +1,31 @@
+{
+  "total": 3,
+  "subtotal": 3,
+  "page": 1,
+  "per_page": 20,
+  "error": null,
+  "search": null,
+  "results": [
+    {
+  "id": 1682,
+  "name": "libmagic1",
+  "version": "1:5.41-3",
+  "architecture": "amd64",
+  "upgradable_versions": ["1:5.41-3ubuntu0.1"]
+    },
+    {
+  "id": 1562,
+  "name": "libapt-pkg6.0",
+  "version": "2.4.9",
+  "architecture": "amd64",
+  "upgradable_versions": ["2.4.10"]
+    },
+    {
+  "id": 676,
+  "name": "libacl1",
+  "version": "2.3.1-1",
+  "architecture": "amd64",
+  "upgradable_versions": null
+     }
+  ]
+}

data/webpack/components/extensions/HostDetails/Tabs/__tests__/debsInstallModal.test.js

@@ -0,0 +1,226 @@
+import React from 'react';
+import { renderWithRedux, patientlyWaitFor, fireEvent, within } from 'react-testing-lib-wrapper';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete } from '../../../../../test-utils/nockWrapper';
+import katelloApi from '../../../../../services/api';
+import mockDebsData from './installableDebs.fixtures.json';
+import DebInstallModal from '../DebsTab/DebInstallModal';
+import { HOST_INSTALLABLE_DEBS_KEY } from '../DebsTab/InstallableDebsConstants';
+import { REX_FEATURES } from '../RemoteExecutionConstants';
+
+jest.mock('../../hostDetailsHelpers', () => ({
+  ...jest.requireActual('../../hostDetailsHelpers'),
+  userPermissionsFromHostDetails: () => ({
+    create_job_invocations: true,
+    edit_hosts: true,
+  }),
+}));
+
+const contentFacetAttributes = {
+  id: 11,
+  uuid: 'e5761ea3-4117-4ecf-83d0-b694f99b389e',
+  content_view_default: false,
+  lifecycle_environment_library: false,
+};
+
+const renderOptions = (facetAttributes = contentFacetAttributes) => ({
+  apiNamespace: HOST_INSTALLABLE_DEBS_KEY,
+  initialState: {
+    API: {
+      HOST_DETAILS: {
+        response: {
+          id: 1,
+          name: 'test-host',
+          content_facet_attributes: { ...facetAttributes },
+        },
+        status: 'RESOLVED',
+      },
+    },
+  },
+});
+
+const hostInstallableDebs = katelloApi.getApiUrl('/debs');
+const autocompleteUrl = '/hosts/1/debs/auto_complete_search';
+
+const defaultQuery = {
+  host_id: 1,
+  per_page: 20,
+  page: 1,
+  packages_restrict_not_installed: true,
+  packages_restrict_applicable: false,
+};
+
+let firstPackages;
+
+beforeEach(() => {
+  const { results } = mockDebsData;
+  [firstPackages] = results;
+});
+
+test('Can call API for installable deb packages and show on screen on page load', async (done) => {
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+
+  const scope = nockInstance
+    .get(hostInstallableDebs)
+    .query(defaultQuery)
+    .reply(200, mockDebsData);
+
+  const { getAllByText }
+     = renderWithRedux(<DebInstallModal
+       isOpen
+       closeModal={jest.fn()}
+       hostId={1}
+       hostName="test-host"
+       triggerPackageInstall={jest.fn()}
+     />, renderOptions());
+
+  // Assert that the packages are now showing on the screen, but wait for them to appear.
+  await patientlyWaitFor(() => expect(getAllByText(firstPackages.name)[0]).toBeInTheDocument());
+  // Assert request was made and completed, see helper function
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});
+
+test('Can handle no installable deb packages being present', async (done) => {
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+
+  const noResults = {
+    total: 0,
+    subtotal: 0,
+    page: 1,
+    per_page: 20,
+    results: [],
+  };
+
+  const scope = nockInstance
+    .get(hostInstallableDebs)
+    .query(defaultQuery)
+    .reply(200, noResults);
+
+  const { queryByText }
+    = renderWithRedux(<DebInstallModal
+      isOpen
+      closeModal={jest.fn()}
+      hostId={1}
+      hostName="test-host"
+      triggerPackageInstall={jest.fn()}
+    />, renderOptions());
+
+  // Assert that there are not any packages showing on the screen.
+  await patientlyWaitFor(() => expect(queryByText('No packages available to install')).toBeInTheDocument());
+  // Assert request was made and completed, see helper function
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done); // Pass jest callback to confirm test is done
+});
+
+
+test('Can install a deb package via remote execution', async (done) => {
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostInstallableDebs)
+    .query(defaultQuery)
+    .reply(200, mockDebsData);
+  const triggerPackageInstall = jest.fn();
+
+  const {
+    getAllByText, getByText, getByRole,
+  } = renderWithRedux(<DebInstallModal
+    isOpen
+    closeModal={jest.fn()}
+    hostId={1}
+    hostName="test-host"
+    triggerPackageInstall={triggerPackageInstall}
+  />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getAllByText(firstPackages.name)[0]).toBeInTheDocument());
+  // find and select the first two packages
+  const checkbox1 = getByRole('checkbox', { name: 'Select row 0' });
+  const checkbox2 = getByRole('checkbox', { name: 'Select row 1' });
+  fireEvent.click(checkbox1);
+  fireEvent.click(checkbox2);
+  // click the Install dropdown
+  const footer = getByRole('contentinfo');
+  const dropdown = await patientlyWaitFor(() => within(footer).getByRole('button', { name: 'Select' }));
+  fireEvent.click(dropdown);
+  const rexOption = getByText('Install via remote execution');
+  fireEvent.click(rexOption);
+
+  expect(triggerPackageInstall).toHaveBeenCalled();
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});
+
+test('Can install a deb package via customized remote execution', async (done) => {
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostInstallableDebs)
+    .query(defaultQuery)
+    .reply(200, mockDebsData);
+
+  const {
+    getAllByText, queryByText, getByRole,
+  } = renderWithRedux(<DebInstallModal
+    isOpen
+    closeModal={jest.fn()}
+    hostId={1}
+    hostName="test-host"
+    triggerPackageInstall={jest.fn()}
+  />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getAllByText(firstPackages.name)[0]).toBeInTheDocument());
+  // find and select the first two packages
+  const checkbox1 = getByRole('checkbox', { name: 'Select row 0' });
+  const checkbox2 = getByRole('checkbox', { name: 'Select row 1' });
+  fireEvent.click(checkbox1);
+  fireEvent.click(checkbox2);
+  // click the Install dropdown
+  const footer = getByRole('contentinfo');
+  const dropdown = await patientlyWaitFor(() => within(footer).getByRole('button', { name: 'Select' }));
+  fireEvent.click(dropdown);
+  const customizedRexOption = queryByText('Install via customized remote execution');
+  expect(customizedRexOption).toBeInTheDocument();
+  expect(customizedRexOption).toHaveAttribute(
+    'href',
+    `/job_invocations/new?feature=${REX_FEATURES.KATELLO_PACKAGE_INSTALL}&search=name%20%5E%20(test-host)&inputs%5Bpackage%5D=duck,cheetah`,
+  );
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});
+
+test('Uses packages_install_by_search_query template when in select all mode', async (done) => {
+  const autocompleteScope = mockForemanAutocomplete(nockInstance, autocompleteUrl);
+  const scope = nockInstance
+    .get(hostInstallableDebs)
+    .query(defaultQuery)
+    .reply(200, mockDebsData);
+
+  const {
+    getAllByText, queryByText, getByRole,
+  } = renderWithRedux(<DebInstallModal
+    isOpen
+    closeModal={jest.fn()}
+    hostId={1}
+    hostName="test-host"
+    triggerPackageInstall={jest.fn()}
+  />, renderOptions());
+
+  await patientlyWaitFor(() => expect(getAllByText(firstPackages.name)[0]).toBeInTheDocument());
+  // find and click the select all checkbox
+  const selectAllCheckbox = getByRole('checkbox', { name: 'Select all' });
+  fireEvent.click(selectAllCheckbox);
+  // find and deselect the first package
+  const checkbox1 = getByRole('checkbox', { name: 'Select row 0' });
+  fireEvent.click(checkbox1);
+  // click the Install dropdown
+  const footer = getByRole('contentinfo');
+  const dropdown = await patientlyWaitFor(() => within(footer).getByRole('button', { name: 'Select' }));
+  fireEvent.click(dropdown);
+  const customizedRexOption = queryByText('Install via customized remote execution');
+  expect(customizedRexOption).toBeInTheDocument();
+  expect(customizedRexOption).toHaveAttribute(
+    'href',
+    `/job_invocations/new?feature=${REX_FEATURES.KATELLO_PACKAGE_INSTALL_BY_SEARCH}&search=name%20%5E%20(test-host)&inputs%5BPackage%20search%20query%5D=id%20!%5E%20(32376)`,
+  );
+  assertNockRequest(autocompleteScope);
+  assertNockRequest(scope, done);
+});
+