katello 4.5.0.rc1 → 4.5.0.rc2

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

@@ -12,13 +12,12 @@ import {
 } from '@patternfly/react-core';
 import { CaretDownIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { useSelector, useDispatch } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
-import { installTracerPackage } from './HostTracesActions';
 import { katelloPackageInstallUrl } from '../customizedRexUrlHelpers';
 import { KATELLO_TRACER_PACKAGE } from './HostTracesConstants';
 
-const EnableTracerModal = ({ isOpen, setIsOpen }) => {
+const EnableTracerModal = ({ isOpen, setIsOpen, triggerJobStart }) => {
   const title = __('Enable Tracer');
   const body = __('Enabling will install the katello-host-tools-tracer package on the host.');
   const [isDropdownOpen, setIsDropdownOpen] = useState(false);
@@ -29,16 +28,19 @@ const EnableTracerModal = ({ isOpen, setIsOpen }) => {
     __('via customized remote execution'),
   ];
   const [selectedOption, setSelectedOption] = useState(dropdownOptions[0]);
-  const dispatch = useDispatch();
   const hostDetails = useSelector(state => selectAPIResponse(state, 'HOST_DETAILS'));
   const { name: hostname } = hostDetails;
   const handleSelect = () => {
     setIsDropdownOpen(false);
   };
-  const enableTracer = () => {
-    dispatch(installTracerPackage({ hostname }));
+  const handleClose = () => {
     setIsOpen(false);
   };
+  const enableTracer = () => {
+    setButtonLoading(true);
+    triggerJobStart();
+    handleClose();
+  };
 
   const dropdownItems = dropdownOptions.map(text => (
     <DropdownItem key={`option_${text}`} onClick={() => setSelectedOption(text)}>{text}</DropdownItem>
@@ -54,6 +56,8 @@ const EnableTracerModal = ({ isOpen, setIsOpen }) => {
           key="enable_button"
           type="submit"
           variant="primary"
+          isLoading={buttonLoading}
+          isDisabled={buttonLoading}
           onClick={enableTracer}
         >
           {title}
@@ -65,6 +69,7 @@ const EnableTracerModal = ({ isOpen, setIsOpen }) => {
         key="enable_button"
         component="a"
         isLoading={buttonLoading}
+        isDisabled={buttonLoading}
         onClick={() => setButtonLoading(true)}
         variant="primary"
         href={customizedRexUrl}
@@ -80,7 +85,7 @@ const EnableTracerModal = ({ isOpen, setIsOpen }) => {
       title={title}
       width="28em"
       isOpen={isOpen}
-      onClose={() => setIsOpen(false)}
+      onClose={handleClose}
       actions={[
         getEnableTracerButton(),
         <Button key="cancel_button" variant="link" onClick={() => setIsOpen(false)}>{__('Cancel')}</Button>,
@@ -96,6 +101,7 @@ const EnableTracerModal = ({ isOpen, setIsOpen }) => {
                 id="toggle-enable-tracer-modal-dropdown"
                 onToggle={toggleDropdownOpen}
                 toggleIndicator={CaretDownIcon}
+                isDisabled={buttonLoading}
               >
                 {selectedOption}
               </DropdownToggle>
@@ -114,6 +120,7 @@ const EnableTracerModal = ({ isOpen, setIsOpen }) => {
 EnableTracerModal.propTypes = {
   isOpen: PropTypes.bool.isRequired,
   setIsOpen: PropTypes.func.isRequired,
+  triggerJobStart: PropTypes.func.isRequired,
 };
 
 export default EnableTracerModal;

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

@@ -13,7 +13,8 @@ export const getHostTraces = (hostId, params) => get({
   params,
 });
 
-export const installTracerPackage = ({ hostname }) => installPackage({
+export const installTracerPackage = ({ hostname, handleSuccess }) => installPackage({
   hostname,
   packageName: KATELLO_TRACER_PACKAGE,
+  handleSuccess,
 });

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

@@ -0,0 +1,104 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import {
+  EmptyState,
+  EmptyStateIcon,
+  EmptyStateBody,
+  Title,
+  EmptyStateVariant,
+  Button,
+  Flex,
+  FlexItem,
+  Spinner,
+} from '@patternfly/react-core';
+import { WrenchIcon } from '@patternfly/react-icons';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import EnableTracerModal from './EnableTracerModal';
+import { useRexJobPolling } from '../RemoteExecutionHooks';
+import { installTracerPackage } from './HostTracesActions';
+import { getHostDetails } from '../../HostDetailsActions';
+
+const EnableTracerButton = ({ setEnableTracerModalOpen, pollingStarted }) => (
+  <Button
+    onClick={() => setEnableTracerModalOpen(true)}
+    isDisabled={pollingStarted}
+  >
+    {__('Enable Traces')}
+  </Button>
+);
+
+const ViewTaskButton = ({ jobId }) => (
+  <Button
+    component="a"
+    href={urlBuilder('job_invocations', '', jobId)}
+    variant="secondary"
+    isDisabled={!jobId}
+  >
+    {__('View the job')}
+  </Button>
+);
+
+ViewTaskButton.propTypes = {
+  jobId: PropTypes.number,
+};
+ViewTaskButton.defaultProps = {
+  jobId: null,
+};
+
+EnableTracerButton.propTypes = {
+  setEnableTracerModalOpen: PropTypes.func.isRequired,
+  pollingStarted: PropTypes.bool.isRequired,
+};
+
+const TracesEnabler = ({ hostname }) => {
+  const title = __('Traces are not enabled');
+  const enablingTitle = __('Traces are being enabled');
+  const body = __('Traces help administrators identify applications that need to be restarted after a system is patched.');
+  const [enableTracerModalOpen, setEnableTracerModalOpen] = useState(false);
+  const initialAction = installTracerPackage({ hostname });
+  const successAction = getHostDetails({ hostname });
+  const {
+    pollingStarted,
+    rexJobId,
+    triggerJobStart,
+  } = useRexJobPolling(initialAction, successAction);
+
+  return (
+    <EmptyState variant={EmptyStateVariant.small}>
+      {pollingStarted ?
+        <Spinner /> :
+        <EmptyStateIcon icon={WrenchIcon} />
+      }
+      <Title headingLevel="h2" size="lg">
+        {pollingStarted ? enablingTitle : title}
+      </Title>
+      <EmptyStateBody>
+        <Flex direction={{ default: 'column' }}>
+          <FlexItem>{body}</FlexItem>
+          <FlexItem>
+            {pollingStarted ?
+              <ViewTaskButton jobId={rexJobId} /> :
+              <EnableTracerButton {...{
+                setEnableTracerModalOpen,
+                pollingStarted,
+              }}
+              />
+            }
+          </FlexItem>
+        </Flex>
+      </EmptyStateBody>
+      <EnableTracerModal
+        isOpen={enableTracerModalOpen}
+        setIsOpen={setEnableTracerModalOpen}
+        triggerJobStart={triggerJobStart}
+      />
+    </EmptyState>
+  );
+};
+
+TracesEnabler.propTypes = {
+  hostname: PropTypes.string.isRequired,
+};
+
+export default TracesEnabler;

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

@@ -1,14 +1,14 @@
 import React, { useState, useCallback } from 'react';
 import { FormattedMessage } from 'react-intl';
 import {
-  Skeleton, Button, Split, SplitItem, ActionList, ActionListItem, Dropdown,
-  DropdownItem, KebabToggle,
+  Skeleton, Split, SplitItem, ActionList, ActionListItem, Dropdown,
+  DropdownItem, DropdownToggle, DropdownToggleAction,
 } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { TableVariant, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
-import { useSelector, useDispatch } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
-import EnableTracerEmptyState from './EnableTracerEmptyState';
+import TracesEnabler from './TracesEnabler';
 import TableWrapper from '../../../../Table/TableWrapper';
 import { useBulkSelect, useTableSort, useUrlParams } from '../../../../Table/TableHooks';
 import { getHostTraces } from './HostTracesActions';
@@ -18,24 +18,33 @@ import { resolveTraceUrl } from '../customizedRexUrlHelpers';
 import './TracesTab.scss';
 import hostIdNotReady from '../../HostDetailsActions';
 import SortableColumnHeaders from '../../../../Table/components/SortableColumnHeaders';
+import { useRexJobPolling } from '../RemoteExecutionHooks';
+import { hasRequiredPermissions as can,
+  missingRequiredPermissions as cannot,
+  userPermissionsFromHostDetails } from '../../hostDetailsHelpers';
+
+const invokeRexJobs = ['create_job_invocations'];
+const createBookmarks = ['create_bookmarks'];
 
 const TracesTab = () => {
   const hostDetails = useSelector(state => selectAPIResponse(state, 'HOST_DETAILS'));
-  const dispatch = useDispatch();
   const {
     id: hostId,
     name: hostname,
     content_facet_attributes: contentFacetAttributes,
   } = hostDetails;
+  const showActions = can(invokeRexJobs, userPermissionsFromHostDetails({ hostDetails }));
   const showEnableTracer = (contentFacetAttributes?.katello_tracer_installed === false);
-  const emptyContentTitle = __('No applications to restart');
-  const emptyContentBody = (<FormattedMessage
+  const emptyContentTitle = showActions ? __('No applications to restart') : __('Traces not available');
+  const tracesNotAvailBody = showEnableTracer ? __('Traces may be enabled by a user with the appropriate permissions.') :
+    __('Traces will be shown here to a user with the appropriate permissions.');
+  const emptyContentBody = showActions ? (<FormattedMessage
     id="traces-happy-empty"
     values={{
       pkgLink: <a href="#/Content/packages?status=Upgradable">{__('installing or updating packages')}</a>,
     }}
     defaultMessage={__('Traces may be listed here after {pkgLink}.')}
-  />);
+  />) : tracesNotAvailBody;
   const emptySearchTitle = __('No matching traces found');
   const emptySearchBody = __('Try changing your search settings.');
   const errorSearchTitle = __('Problem searching traces');
@@ -74,6 +83,26 @@ const TracesTab = () => {
     initialSearchQuery: searchParam || '',
   });
 
+  const BulkRestartTracesAction = () => resolveTraces({
+    hostname, search: fetchBulkParams(),
+  });
+  const {
+    triggerJobStart: triggerBulkRestart, lastCompletedJob: lastCompletedBulkRestart,
+    isPolling: isBulkRestartInProgress,
+  } = useRexJobPolling(BulkRestartTracesAction);
+
+  const restartTraceAction = id => resolveTraces({
+    hostname,
+    search: tracesSearchQuery(id),
+  });
+
+  const {
+    triggerJobStart: triggerAppRestart, lastCompletedJob: lastCompletedAppRestart,
+    isPolling: isAppRestartInProgress,
+  } = useRexJobPolling(restartTraceAction);
+
+  const actionInProgress = (isBulkRestartInProgress || isAppRestartInProgress);
+
   const fetchItems = useCallback(
     params =>
       (hostId ? getHostTraces(hostId, { ...apiSortParams, ...params }) : hostIdNotReady),
@@ -81,23 +110,19 @@ const TracesTab = () => {
   );
 
   const onBulkRestartApp = () => {
-    dispatch(resolveTraces({
-      hostname, search: fetchBulkParams(),
-    }));
+    triggerBulkRestart();
     selectNone();
-    const params = { page: meta.page, per_page: meta.per_page, search: meta.search };
-    dispatch(getHostTraces(hostId, params));
   };
 
-  const onRestartApp = id => dispatch(resolveTraces({
-    hostname,
-    search: tracesSearchQuery(id),
-  }));
+  const onRestartApp = id => triggerAppRestart(id);
 
   const bulkCustomizedRexUrl = () => resolveTraceUrl({
     hostname, search: (selectedCount > 0) ? fetchBulkParams() : '',
   });
 
+  const readOnlyBookmarks =
+  cannot(createBookmarks, userPermissionsFromHostDetails({ hostDetails }));
+
   const dropdownItems = [
     <DropdownItem isDisabled={selectedCount === 0} aria-label="bulk_rex" key="bulk_rex" component="button" onClick={onBulkRestartApp}>
       {__('Restart via remote execution')}
@@ -107,24 +132,28 @@ const TracesTab = () => {
     </DropdownItem>,
   ];
 
-  const actionButtons = (
+  const actionButtons = showActions ? (
     <Split hasGutter>
       <SplitItem>
         <ActionList isIconList>
-          <ActionListItem>
-            <Button
-              variant="secondary"
-              isDisabled={selectedCount === 0}
-              onClick={onBulkRestartApp}
-            >
-              {__('Restart app')}
-            </Button>
-          </ActionListItem>
           <ActionListItem>
             <Dropdown
-              toggle={<KebabToggle aria-label="bulk_actions" onToggle={toggleBulkAction} />}
+              aria-label="bulk_actions_dropdown"
+              toggle={
+                <DropdownToggle
+                  aria-label="bulk_actions"
+                  splitButtonItems={[
+                    <DropdownToggleAction key="action" onClick={onBulkRestartApp}>
+                      {__('Restart app')}
+                    </DropdownToggleAction>,
+                  ]}
+                  isDisabled={selectedCount === 0}
+                  splitButtonVariant="action"
+                  toggleVariant="primary"
+                  onToggle={toggleBulkAction}
+                />
+              }
               isOpen={isBulkActionOpen}
-              isPlain
               dropdownItems={dropdownItems}
             />
           </ActionListItem>
@@ -132,9 +161,9 @@ const TracesTab = () => {
       </SplitItem>
     </Split>
 
-  );
+  ) : null;
   const status = useSelector(state => selectHostTracesStatus(state));
-  if (showEnableTracer) return <EnableTracerEmptyState />;
+  if (showEnableTracer && showActions) return <TracesEnabler hostname={hostname} />;
 
   if (!hostId) return <Skeleton />;
 
@@ -159,16 +188,18 @@ const TracesTab = () => {
           actionButtons,
         }
         }
-        happyEmptyContent
+        happyEmptyContent={showActions}
         ouiaId="host-traces-table"
         metadata={meta}
         bookmarkController="katello_host_tracers"
+        readOnlyBookmarks={readOnlyBookmarks}
         autocompleteEndpoint={`/hosts/${hostId}/traces/auto_complete_search`}
         foremanApiAutoComplete
         rowsCount={results?.length}
         variant={TableVariant.compact}
-        displaySelectAllCheckbox
-        additionalListeners={[activeSortColumn, activeSortDirection]}
+        additionalListeners={[activeSortColumn, activeSortDirection,
+          lastCompletedAppRestart, lastCompletedBulkRestart]}
+        displaySelectAllCheckbox={showActions}
         {...selectAll}
       >
         <Thead>
@@ -191,8 +222,11 @@ const TracesTab = () => {
               app_type: appType,
             } = result;
             const resolveDisabled = !isSelectable(id);
+            let disabledReason;
+            if (resolveDisabled) disabledReason = __('Traces that require logout cannot be restarted remotely');
+            if (actionInProgress) disabledReason = __('A remote execution job is in progress');
             let rowDropdownItems = [
-              { title: 'Restart via remote execution', onClick: () => onRestartApp(id) },
+              { title: 'Restart via remote execution', onClick: () => onRestartApp(id), isDisabled: actionInProgress },
               {
                 component: 'a', href: resolveTraceUrl({ hostname, search: tracesSearchQuery(id) }), title: 'Restart via customized remote execution',
               },
@@ -204,25 +238,32 @@ const TracesTab = () => {
             }
             return (
               <Tr key={id} >
-                <Td select={{
-                  disable: resolveDisabled,
-                  props: {
-                    'aria-label': `check-${application}`,
-                  },
-                  isSelected: isSelected(id),
-                  onSelect: (event, selected) => selectOne(selected, id),
-                  rowIndex,
-                  variant: 'checkbox',
-                }}
-                />
+                {showActions ? (
+                  <Td
+                    select={{
+                      disable: actionInProgress || resolveDisabled,
+                      props: {
+                        'aria-label': `check-${application}`,
+                      },
+                      isSelected: isSelected(id),
+                      onSelect: (event, selected) => selectOne(selected, id),
+                      rowIndex,
+                      variant: 'checkbox',
+                    }}
+                    title={disabledReason}
+                  />
+                ) : <Td>&nbsp;</Td>
+                }
                 <Td>{application}</Td>
                 <Td>{appType}</Td>
                 <Td>{helper}</Td>
-                <Td
-                  actions={{
-                    items: rowDropdownItems,
-                  }}
-                />
+                {showActions && (
+                  <Td
+                    actions={{
+                      items: rowDropdownItems,
+                    }}
+                  />
+                )}
               </Tr>
             );
           })

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

@@ -10,6 +10,14 @@ import mockErrataData from './errata.fixtures.json';
 import mockResolveErrataTask from './resolveErrata.fixtures.json';
 import mockBookmarkData from './bookmarks.fixtures.json';
 
+jest.mock('../../hostDetailsHelpers', () => ({
+  ...jest.requireActual('../../hostDetailsHelpers'),
+  userPermissionsFromHostDetails: () => ({
+    create_job_invocations: true,
+    edit_hosts: true,
+  }),
+}));
+
 const contentFacetAttributes = {
   id: 11,
   uuid: 'e5761ea3-4117-4ecf-83d0-b694f99b389e',
@@ -875,7 +883,7 @@ test('Can bulk apply via katello agent', async (done) => {
   getByLabelText('Select row 0').click();
   getByLabelText('Select row 1').click();
 
-  const actionMenu = getByLabelText('bulk_actions');
+  const actionMenu = getByLabelText('expand_errata_toggle');
   actionMenu.click();
   const viaAction = queryByText('Apply via Katello agent');
   expect(viaAction).toBeInTheDocument();
@@ -923,7 +931,7 @@ test('Can select all, exclude and bulk apply via katello agent', async (done) =>
 
   getByLabelText('Select row 0').click(); // deselect
 
-  const actionMenu = getByLabelText('bulk_actions');
+  const actionMenu = getByLabelText('expand_errata_toggle');
   actionMenu.click();
   const viaAction = queryByText('Apply via Katello agent');
   expect(viaAction).toBeInTheDocument();
@@ -949,11 +957,6 @@ test('Apply button chooses remote execution', async (done) => {
     .query(defaultQuery)
     .reply(200, mockErrata);
 
-  const scope1 = nockInstance
-    .get(hostErrata)
-    .query(baseQuery)
-    .reply(200, mockErrata);
-
   const resolveErrataScope = nockInstance
     .post(jobInvocations)
     .reply(201, mockResolveErrataTask);
@@ -974,7 +977,6 @@ test('Apply button chooses remote execution', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(resolveErrataScope);
-  assertNockRequest(scope1);
   assertNockRequest(scope, done);
 });
 
@@ -987,11 +989,6 @@ test('Can bulk apply via remote execution', async (done) => {
     .query(defaultQuery)
     .reply(200, mockErrata);
 
-  const scope1 = nockInstance
-    .get(hostErrata)
-    .query(baseQuery)
-    .reply(200, mockErrata);
-
   // eslint-disable-next-line camelcase
   const jobInvocationBody = ({ job_invocation: { inputs, feature, search_query } }) =>
     inputs[ERRATA_SEARCH_QUERY] === `errata_id ^ (${results[0].errata_id},${results[1].errata_id})` &&
@@ -1013,7 +1010,7 @@ test('Can bulk apply via remote execution', async (done) => {
   getByLabelText('Select row 0').click();
   getByLabelText('Select row 1').click();
 
-  const actionMenu = getByLabelText('bulk_actions');
+  const actionMenu = getByLabelText('expand_errata_toggle');
   actionMenu.click();
   const viaRexAction = queryByText('Apply via remote execution');
   expect(viaRexAction).toBeInTheDocument();
@@ -1021,7 +1018,6 @@ test('Can bulk apply via remote execution', async (done) => {
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(resolveErrataScope);
-  assertNockRequest(scope1);
   assertNockRequest(scope, done);
 });
 
@@ -1036,11 +1032,6 @@ test('Can select all, exclude and bulk apply via remote execution', async (done)
     .query(defaultQuery)
     .reply(200, mockErrata);
 
-  const scope1 = nockInstance
-    .get(hostErrata)
-    .query(baseQuery)
-    .reply(200, mockErrata);
-
   const jobInvocationBody = ({ job_invocation: { inputs } }) =>
     inputs[ERRATA_SEARCH_QUERY] === `errata_id !^ (${results[0].errata_id})`;
 
@@ -1059,7 +1050,7 @@ test('Can select all, exclude and bulk apply via remote execution', async (done)
 
   getByLabelText('Select row 0').click(); // de select
 
-  const actionMenu = getByLabelText('bulk_actions');
+  const actionMenu = getByLabelText('expand_errata_toggle');
   actionMenu.click();
   const viaRexAction = queryByText('Apply via remote execution');
   expect(viaRexAction).toBeInTheDocument();
@@ -1067,7 +1058,6 @@ test('Can select all, exclude and bulk apply via remote execution', async (done)
 
   assertNockRequest(autocompleteScope);
   assertNockRequest(resolveErrataScope);
-  assertNockRequest(scope1);
   assertNockRequest(scope, done);
 });
 
@@ -1091,7 +1081,7 @@ test('Can apply errata in bulk via customized remote execution', async (done) =>
   getByLabelText('Select row 1').click();
   const errata = `${results[0].errata_id},${results[1].errata_id}`;
   const feature = REX_FEATURES.KATELLO_HOST_ERRATA_INSTALL_BY_SEARCH;
-  const actionMenu = getByLabelText('bulk_actions');
+  const actionMenu = getByLabelText('expand_errata_toggle');
   actionMenu.click();
   const viaRexAction = queryByText('Apply via customized remote execution');
   expect(viaRexAction).toBeInTheDocument();

data/webpack/components/extensions/HostDetails/Tabs/{ModuleStreamsTab/__tests__ → __tests__}/moduleStreamsTab.test.js

@@ -1,12 +1,19 @@
 import React from 'react';
 import { act } from 'react-test-renderer';
 import { renderWithRedux, patientlyWaitFor, within, fireEvent } from 'react-testing-lib-wrapper';
-import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../../test-utils/nockWrapper';
-import { foremanApi } from '../../../../../../services/api';
-import { ModuleStreamsTab } from '../ModuleStreamsTab';
-import mockModuleStreams from './modules.fixtures.json';
-import { MODULE_STREAMS_KEY } from '../ModuleStreamsConstants';
-import mockBookmarkData from '../../__tests__/bookmarks.fixtures.json';
+import { nockInstance, assertNockRequest, mockForemanAutocomplete, mockSetting } from '../../../../../test-utils/nockWrapper';
+import { ModuleStreamsTab } from '../ModuleStreamsTab/ModuleStreamsTab.js';
+import mockModuleStreams from './moduleStreams.fixtures.json';
+import mockBookmarkData from './bookmarks.fixtures.json';
+import { MODULE_STREAMS_KEY } from '../../../../../scenes/ModuleStreams/ModuleStreamsConstants';
+import { foremanApi } from '../../../../../services/api';
+
+jest.mock('../../hostDetailsHelpers', () => ({
+  ...jest.requireActual('../../hostDetailsHelpers'),
+  userPermissionsFromHostDetails: () => ({
+    create_job_invocations: true,
+  }),
+}));
 
 const moduleBookmarks = foremanApi.getApiUrl('/bookmarks?search=controller%3Dkatello_host_available_module_streams');