katello 4.3.0.rc4 → 4.4.0.rc2

data/webpack/components/extensions/HostDetails/Cards/__tests__/errataOverviewCard.test.js

@@ -0,0 +1,56 @@
+import React from 'react';
+import { render } from 'react-testing-lib-wrapper';
+import ErrataOverviewCard from '../ErrataOverviewCard';
+import nock from '../../../../../test-utils/nockWrapper';
+
+describe('Without errata', () => {
+  afterEach(() => {
+    nock.cleanAll();
+  });
+
+  test('does not show piechart when there are 0 errata', () => {
+    const hostDetails = {
+      id: 2,
+      content_facet_attributes: {
+        errata_counts: {
+          bugfix: 0,
+          enhancement: 0,
+          security: 0,
+          total: 0,
+        },
+      },
+    };
+    /* eslint-disable max-len */
+    const { queryByLabelText, getByText } = render(<ErrataOverviewCard hostDetails={hostDetails} />);
+    /* eslint-enable max-len */
+    expect(queryByLabelText('errataChart')).not.toBeInTheDocument();
+    expect(getByText('0 errata')).toBeInTheDocument();
+  });
+});
+
+describe('With errata', () => {
+  afterEach(() => {
+    nock.cleanAll();
+  });
+
+  test('show piechart when there are errata', () => {
+    const hostDetails = {
+      id: 2,
+      content_facet_attributes: {
+        errata_counts: {
+          bugfix: 10,
+          enhancement: 20,
+          security: 30,
+          total: 60,
+        },
+      },
+    };
+    const { getByText, container } = render(<ErrataOverviewCard hostDetails={hostDetails} />);
+    expect(container.getElementsByClassName('erratachart')).toHaveLength(1);
+    expect(container.getElementsByClassName('erratalegend')).toHaveLength(1);
+    expect(getByText('60 errata')).toBeInTheDocument();
+    expect(getByText('30 security advisories')).toBeInTheDocument();
+    expect(getByText('10 bug fixes')).toBeInTheDocument();
+    expect(getByText('20 enhancements')).toBeInTheDocument();
+  });
+});

data/webpack/components/extensions/HostDetails/HostDetailsActions.js

@@ -0,0 +1,2 @@
+const hostIdNotReady = { type: 'NOOP_HOST_ID_NOT_READY' };
+export default hostIdNotReady;

data/webpack/components/extensions/HostDetails/HostPackages/HostPackagesActions.js

@@ -1,6 +1,18 @@
-import { API_OPERATIONS, get } from 'foremanReact/redux/API';
+import { API_OPERATIONS, get, put } from 'foremanReact/redux/API';
+import { renderTaskStartedToast } from '../../../../scenes/Tasks/helpers';
 import { foremanApi } from '../../../../services/api';
-import { HOST_PACKAGES_KEY } from './HostPackagesConstants';
+import { getResponseErrorMsgs } from '../../../../utils/helpers';
+import {
+  HOST_PACKAGES_INSTALL_KEY,
+  HOST_PACKAGES_KEY,
+  HOST_PACKAGES_REMOVE_KEY,
+  HOST_PACKAGES_UPGRADE_KEY,
+} from './HostPackagesConstants';
+
+const errorToast = (error) => {
+  const message = getResponseErrorMsgs(error.response);
+  return message;
+};
 
 export const getInstalledPackagesWithLatest = (hostId, params) => get({
   type: API_OPERATIONS.GET,
@@ -9,3 +21,38 @@ export const getInstalledPackagesWithLatest = (hostId, params) => get({
   params,
 });
 export default getInstalledPackagesWithLatest;
+
+export const installPackageViaKatelloAgent = (hostId, params) => put({
+  type: API_OPERATIONS.PUT,
+  key: HOST_PACKAGES_INSTALL_KEY,
+  url: foremanApi.getApiUrl(`/hosts/${hostId}/packages/install`),
+  handleSuccess: ({ data }) => renderTaskStartedToast(data),
+  errorToast: error => errorToast(error),
+  params,
+});
+
+export const removePackageViaKatelloAgent = (hostId, params) => put({
+  type: API_OPERATIONS.PUT,
+  key: HOST_PACKAGES_REMOVE_KEY,
+  url: foremanApi.getApiUrl(`/hosts/${hostId}/packages/remove`),
+  handleSuccess: ({ data }) => renderTaskStartedToast(data),
+  errorToast: error => errorToast(error),
+  params,
+});
+
+export const upgradePackageViaKatelloAgent = (hostId, params) => put({
+  type: API_OPERATIONS.PUT,
+  key: HOST_PACKAGES_UPGRADE_KEY,
+  url: foremanApi.getApiUrl(`/hosts/${hostId}/packages/upgrade`),
+  handleSuccess: ({ data }) => renderTaskStartedToast(data),
+  errorToast: error => errorToast(error),
+  params,
+});
+
+export const upgradeAllViaKatelloAgent = hostId => put({
+  type: API_OPERATIONS.PUT,
+  key: HOST_PACKAGES_UPGRADE_KEY,
+  url: foremanApi.getApiUrl(`/hosts/${hostId}/packages/upgrade_all`),
+  handleSuccess: ({ data }) => renderTaskStartedToast(data),
+  errorToast: error => errorToast(error),
+});

data/webpack/components/extensions/HostDetails/HostPackages/HostPackagesConstants.js

@@ -1,2 +1,15 @@
 export const HOST_PACKAGES_KEY = 'HOST_PACKAGES';
-export default HOST_PACKAGES_KEY;
+export const HOST_PACKAGES_INSTALL_KEY = 'HOST_PACKAGES_KATELLO_AGENT_INSTALL';
+export const HOST_PACKAGES_REMOVE_KEY = 'HOST_PACKAGES_REMOVE';
+export const HOST_PACKAGES_UPGRADE_KEY = 'HOST_PACKAGES_UPGRADE';
+export const PACKAGES_SEARCH_QUERY = 'Packages search query';
+
+export const PACKAGES_VERSION_STATUSES = {
+  UPGRADABLE: 'Upgradable',
+  UP_TO_DATE: 'Up-to date',
+};
+
+export const VERSION_STATUSES_TO_PARAM = {
+  [PACKAGES_VERSION_STATUSES.UPGRADABLE]: 'upgradable',
+  [PACKAGES_VERSION_STATUSES.UP_TO_DATE]: 'up-to-date',
+};

data/webpack/components/extensions/HostDetails/Tabs/ContentTab/SecondaryTabsRoutes.js

@@ -1,20 +1,22 @@
 import React from 'react';
 import { Route, Switch, Redirect } from 'react-router-dom';
 import { PackagesTab } from '../PackagesTab';
-import { ErrataTab } from '../ErrataTab';
+import { ErrataTab } from '../ErrataTab/ErrataTab.js';
+import { ModuleStreamsTab } from '../ModuleStreamsTab/ModuleStreamsTab';
 import { route } from './helpers';
 
 const SecondaryTabRoutes = () => (
   <Switch>
-    <Route exact path="/Content">
-      <Redirect to={route('errata')} />
-    </Route>
     <Route path={route('packages')}>
       <PackagesTab />
     </Route>
     <Route path={route('errata')}>
       <ErrataTab />
     </Route>
+    <Route path={route('module-streams')}>
+      <ModuleStreamsTab />
+    </Route>
+    <Redirect to={route('errata')} />
   </Switch>
 );
 

data/webpack/components/extensions/HostDetails/Tabs/ContentTab/constants.js

@@ -3,6 +3,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 const SECONDARY_TABS = [
   { key: 'packages', title: __('Packages') },
   { key: 'errata', title: __('Errata') },
+  { key: 'module-streams', title: __('Module streams') },
 ];
 
 export default SECONDARY_TABS;

data/webpack/components/extensions/HostDetails/Tabs/ContentTab/index.js

@@ -11,6 +11,7 @@ const ContentTab = ({ location: { pathname } }) => {
   return (
     <>
       <Tabs
+        className="margin-0-24"
         onSelect={(evt, subTab) => hashHistory.push(subTab)}
         isSecondary
         activeKey={activeTab(pathname)}

data/webpack/components/extensions/HostDetails/Tabs/{ErrataTab.js → ErrataTab/ErrataTab.js}

@@ -1,7 +1,9 @@
 import React, { useCallback, useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { Button, Split, SplitItem, ActionList, ActionListItem, Dropdown,
-  DropdownItem, KebabToggle, Skeleton, Tooltip, ToggleGroup, ToggleGroupItem } from '@patternfly/react-core';
+import {
+  Button, Split, SplitItem, ActionList, ActionListItem, Dropdown,
+  DropdownItem, KebabToggle, Skeleton, Tooltip, ToggleGroup, ToggleGroupItem,
+} from '@patternfly/react-core';
 import { TimesIcon, CheckIcon } from '@patternfly/react-icons';
 import {
   TableVariant,
@@ -18,18 +20,20 @@ import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
 import IsoDate from 'foremanReact/components/common/dates/IsoDate';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
 import { propsToCamelCase } from 'foremanReact/common/helpers';
-import SelectableDropdown from '../../../SelectableDropdown';
-import { useSet, useBulkSelect } from '../../../../components/Table/TableHooks';
-import TableWrapper from '../../../../components/Table/TableWrapper';
-import { ErrataType, ErrataSeverity } from '../../../../components/Errata';
-import { getInstallableErrata, regenerateApplicability, applyViaKatelloAgent } from '../HostErrata/HostErrataActions';
+import SelectableDropdown from '../../../../SelectableDropdown';
+import { useSet, useBulkSelect, useUrlParams } from '../../../../../components/Table/TableHooks';
+import TableWrapper from '../../../../../components/Table/TableWrapper';
+import { ErrataType, ErrataSeverity } from '../../../../../components/Errata';
+import { getInstallableErrata, regenerateApplicability, applyViaKatelloAgent } from './HostErrataActions';
 import ErratumExpansionDetail from './ErratumExpansionDetail';
 import ErratumExpansionContents from './ErratumExpansionContents';
-import { selectHostErrataStatus } from '../HostErrata/HostErrataSelectors';
-import { HOST_ERRATA_KEY, ERRATA_TYPES, ERRATA_SEVERITIES, TYPES_TO_PARAM, SEVERITIES_TO_PARAM } from '../HostErrata/HostErrataConstants';
-import { installErrata } from './RemoteExecutionActions';
-import { errataInstallUrl } from './customizedRexUrlHelpers';
+import { selectHostErrataStatus } from './HostErrataSelectors';
+import { HOST_ERRATA_KEY, ERRATA_TYPES, ERRATA_SEVERITIES, TYPES_TO_PARAM, SEVERITIES_TO_PARAM, PARAM_TO_FRIENDLY_NAME } from './HostErrataConstants';
+import { installErrata } from '../RemoteExecutionActions';
+import { errataInstallUrl } from '../customizedRexUrlHelpers';
 import './ErrataTab.scss';
+import hostIdNotReady from '../../HostDetailsActions';
+import defaultRemoteActionMethod, { KATELLO_AGENT } from '../../hostDetailsHelpers';
 
 export const ErrataTab = () => {
   const hostDetails = useSelector(state => selectAPIResponse(state, 'HOST_DETAILS'));
@@ -44,14 +48,21 @@ export const ErrataTab = () => {
   const [ALL, INSTALLABLE] = toggleGroupStates;
   const ERRATA_TYPE = __('Type');
   const ERRATA_SEVERITY = __('Severity');
-  const [toggleGroupState, setToggleGroupState] = useState(INSTALLABLE);
-
   const [isBulkActionOpen, setIsBulkActionOpen] = useState(false);
   const toggleBulkAction = () => setIsBulkActionOpen(prev => !prev);
   const expandedErrata = useSet([]);
   const erratumIsExpanded = id => expandedErrata.has(id);
-  const [errataTypeSelected, setErrataTypeSelected] = useState(ERRATA_TYPE);
-  const [errataSeveritySelected, setErrataSeveritySelected] = useState(ERRATA_SEVERITY);
+  const {
+    type: initialType,
+    severity: initialSeverity,
+    show,
+    searchParam,
+  } = useUrlParams();
+  const [toggleGroupState, setToggleGroupState] = useState(show ?? INSTALLABLE);
+  const [errataTypeSelected, setErrataTypeSelected]
+    = useState(PARAM_TO_FRIENDLY_NAME[initialType] ?? ERRATA_TYPE);
+  const [errataSeveritySelected, setErrataSeveritySelected]
+    = useState(PARAM_TO_FRIENDLY_NAME[initialSeverity] ?? ERRATA_SEVERITY);
   const activeFilters = [errataTypeSelected, errataSeveritySelected];
   const defaultFilters = [ERRATA_TYPE, ERRATA_SEVERITY];
 
@@ -70,7 +81,7 @@ export const ErrataTab = () => {
 
   const fetchItems = useCallback(
     (params) => {
-      if (!hostId) return null;
+      if (!hostId) return hostIdNotReady;
       const modifiedParams = { ...params };
       if (errataTypeSelected !== ERRATA_TYPE) {
         modifiedParams.type = TYPES_TO_PARAM[errataTypeSelected];
@@ -102,6 +113,7 @@ export const ErrataTab = () => {
     metadata,
     idColumn: 'errata_id',
     isSelectable: result => result.installable,
+    initialSearchQuery: searchParam || '',
   });
 
   if (!hostId) return <Skeleton />;
@@ -144,13 +156,12 @@ export const ErrataTab = () => {
     { errata_ids: [id] },
   ));
 
-  const katelloAgentAvailable = (contentFacet.katelloAgentInstalled &&
-                                 contentFacet.katelloAgentEnabled);
+  const defaultRemoteAction = defaultRemoteActionMethod({ hostDetails });
   const apply = () => {
-    if (contentFacet.remoteExecutionByDefault || !katelloAgentAvailable) {
-      applyViaRemoteExecution();
-    } else {
+    if (defaultRemoteAction === KATELLO_AGENT) {
       applyByKatelloAgent();
+    } else {
+      applyViaRemoteExecution();
     }
   };
 
@@ -165,7 +176,7 @@ export const ErrataTab = () => {
     </DropdownItem>,
   ];
 
-  if (katelloAgentAvailable) {
+  if (defaultRemoteAction === KATELLO_AGENT) {
     dropdownItems.push((
       <DropdownItem
         aria-label="apply_via_katello_agent"
@@ -237,7 +248,7 @@ export const ErrataTab = () => {
   );
 
   const hostIsNonLibrary = (
-    !contentFacet.contentViewDefault && !contentFacet.lifecycleEnvironmentLibrary
+    contentFacet?.contentViewDefault === false && contentFacet.lifecycleEnvironmentLibrary === false
   );
   const toggleGroup = (
     <Split hasGutter>
@@ -262,26 +273,26 @@ export const ErrataTab = () => {
         />
       </SplitItem>
       {hostIsNonLibrary &&
-      <SplitItem>
-        <ToggleGroup aria-label="Installable Errata">
-          <ToggleGroupItem
-            text={__('All')}
-            buttonId="allToggle"
-            aria-label="Show All"
-            isSelected={toggleGroupState === ALL}
-            onChange={() => setToggleGroupState(ALL)}
-          />
+        <SplitItem>
+          <ToggleGroup aria-label="Installable Errata">
+            <ToggleGroupItem
+              text={__('All')}
+              buttonId="allToggle"
+              aria-label="Show All"
+              isSelected={toggleGroupState === ALL}
+              onChange={() => setToggleGroupState(ALL)}
+            />
 
-          <ToggleGroupItem
-            text={__('Installable')}
-            buttonId="installableToggle"
-            aria-label="Show Installable"
-            isSelected={toggleGroupState === INSTALLABLE}
-            onChange={() => setToggleGroupState(INSTALLABLE)}
-          />
-        </ToggleGroup>
-      </SplitItem>
-  }
+            <ToggleGroupItem
+              text={__('Installable')}
+              buttonId="installableToggle"
+              aria-label="Show Installable"
+              isSelected={toggleGroupState === INSTALLABLE}
+              onChange={() => setToggleGroupState(INSTALLABLE)}
+            />
+          </ToggleGroup>
+        </SplitItem>
+      }
     </Split>
   );
 
@@ -290,21 +301,21 @@ export const ErrataTab = () => {
       <div id="errata-tab">
         <TableWrapper
           {...{
-                metadata,
-                emptyContentTitle,
-                emptyContentBody,
-                emptySearchTitle,
-                emptySearchBody,
-                status,
-                activeFilters,
-                defaultFilters,
-                actionButtons,
-                searchQuery,
-                updateSearchQuery,
-                selectedCount,
-                selectNone,
-                toggleGroup,
-                }
+            metadata,
+            emptyContentTitle,
+            emptyContentBody,
+            emptySearchTitle,
+            emptySearchBody,
+            status,
+            activeFilters,
+            defaultFilters,
+            actionButtons,
+            searchQuery,
+            updateSearchQuery,
+            selectedCount,
+            selectNone,
+            toggleGroup,
+          }
           }
           additionalListeners={[
             hostId, toggleGroupState, errataTypeSelected, errataSeveritySelected]}
@@ -352,9 +363,9 @@ export const ErrataTab = () => {
 
                 if (contentFacet.katelloAgentInstalled && contentFacet.katelloAgentEnabled) {
                   rowActions.unshift({
-                      title: __('Apply via Katello agent'),
-                      onClick: () => applyErratumViaKatelloAgent(errataId),
-                    });
+                    title: __('Apply via Katello agent'),
+                    onClick: () => applyErratumViaKatelloAgent(errataId),
+                  });
                 }
               } else {
                 rowActions = [
@@ -374,15 +385,15 @@ export const ErrataTab = () => {
                         rowIndex,
                         isExpanded,
                         onToggle: (_event, _rInx, isOpen) => expandedErrata.onToggle(isOpen, id),
-                    }}
+                      }}
                     />
                     <Td select={{
-                        disable: !isSelectable(errataId),
-                        isSelected: isSelected(errataId),
-                        onSelect: (event, selected) => selectOne(selected, errataId),
-                        rowIndex,
-                        variant: 'checkbox',
-                        }}
+                      disable: !isSelectable(errataId),
+                      isSelected: isSelected(errataId),
+                      onSelect: (event, selected) => selectOne(selected, errataId),
+                      rowIndex,
+                      variant: 'checkbox',
+                    }}
                     />
                     <Td>
                       <a href={urlBuilder(`errata/${id}`, '')}>{errataId}</a>
@@ -390,13 +401,13 @@ export const ErrataTab = () => {
                     <Td><ErrataType {...erratum} /></Td>
                     <Td><ErrataSeverity {...erratum} /></Td>
                     <Td>
-                      { isInstallable ?
+                      {isInstallable ?
                         <span><CheckIcon /> {__('Yes')}</span> :
                         <span>
                           <Tooltip
                             content={
-                                         __("This erratum is not installable because it is not in this host's content view and lifecycle environment.")
-                                      }
+                              __("This erratum is not installable because it is not in this host's content view and lifecycle environment.")
+                            }
                           >
 
                             <TimesIcon />
@@ -410,8 +421,8 @@ export const ErrataTab = () => {
                     <Td
                       key={`rowActions-${id}`}
                       actions={{
-                          items: rowActions,
-                        }}
+                        items: rowActions,
+                      }}
 
                     />
                   </Tr>
@@ -428,9 +439,9 @@ export const ErrataTab = () => {
                     </Td>
                   </Tr>
                 </Tbody>
-                );
-              })
-              }
+              );
+            })
+            }
           </>
         </TableWrapper>
       </div>

data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/ErrataTab.scss

@@ -0,0 +1,11 @@
+#errata-tab {
+  margin: 16px 0;
+}
+
+#errata-alert {
+  margin: 16px 24px;
+}
+
+.pf-c-toggle-group__text {
+  color: black;
+}

data/webpack/components/extensions/HostDetails/Tabs/{ErratumExpansionContents.js → ErrataTab/ErratumExpansionContents.js}

@@ -50,10 +50,10 @@ ErratumExpansionContents.propTypes = {
     description: PropTypes.string,
     summary: PropTypes.string,
     solution: PropTypes.string,
-    bugs: PropTypes.arrayOf(PropTypes.object),
-    cves: PropTypes.arrayOf(PropTypes.object),
+    bugs: PropTypes.arrayOf(PropTypes.shape({})),
+    cves: PropTypes.arrayOf(PropTypes.shape({})),
     packages: PropTypes.arrayOf(PropTypes.string),
-    module_streams: PropTypes.arrayOf(PropTypes.object),
+    module_streams: PropTypes.arrayOf(PropTypes.shape({})),
   }).isRequired,
 };
 

data/webpack/components/extensions/HostDetails/{HostErrata → Tabs/ErrataTab}/HostErrataActions.js

@@ -1,8 +1,8 @@
 import { API_OPERATIONS, get, put } from 'foremanReact/redux/API';
-import { foremanApi } from '../../../../services/api';
+import { foremanApi } from '../../../../../services/api';
 import { HOST_ERRATA_KEY, HOST_ERRATA_APPLICABILITY_KEY, HOST_ERRATA_APPLY_KEY } from './HostErrataConstants';
-import { getResponseErrorMsgs } from '../../../../utils/helpers';
-import { renderTaskStartedToast } from '../../../../scenes/Tasks/helpers';
+import { getResponseErrorMsgs } from '../../../../../utils/helpers';
+import { renderTaskStartedToast } from '../../../../../scenes/Tasks/helpers';
 
 const errorToast = (error) => {
   const message = getResponseErrorMsgs(error.response);

data/webpack/components/extensions/HostDetails/{HostErrata → Tabs/ErrataTab}/HostErrataConstants.js

@@ -29,6 +29,17 @@ export const SEVERITIES_TO_PARAM = {
   [ERRATA_SEVERITIES.CRITICAL]: 'Critical',
 };
 
+export const PARAM_TO_FRIENDLY_NAME = {
+  security: 'Security',
+  bugfix: 'Bugfix',
+  enhancement: 'Enhancement',
+  none: 'N/A',
+  low: 'Low',
+  moderate: 'Moderate',
+  important: 'Important',
+  critical: 'Critical',
+};
+
 export default HOST_ERRATA_KEY;
 
 export const ERRATA_SEARCH_QUERY = 'Errata search query';

data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsActions.js

@@ -0,0 +1,16 @@
+import { API_OPERATIONS, get } from 'foremanReact/redux/API';
+import { foremanApi } from '../../../../../services/api';
+import { getResponseErrorMsgs } from '../../../../../utils/helpers';
+import { MODULE_STREAMS_KEY } from './ModuleStreamsConstants';
+
+const errorToast = error => getResponseErrorMsgs(error.response);
+
+export const getHostModuleStreams = (hostId, params) => get({
+  type: API_OPERATIONS.GET,
+  key: MODULE_STREAMS_KEY,
+  url: foremanApi.getApiUrl(`/hosts/${hostId}/module_streams`),
+  errorToast: error => errorToast(error),
+  params,
+});
+
+export default getHostModuleStreams;

data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsConstants.js

@@ -0,0 +1,3 @@
+export const MODULE_STREAMS_KEY = 'MODULE_STREAMS';
+
+export default MODULE_STREAMS_KEY;

data/webpack/components/extensions/HostDetails/Tabs/ModuleStreamsTab/ModuleStreamsSelectors.js

@@ -0,0 +1,19 @@
+import {
+  selectAPIStatus,
+  selectAPIError,
+  selectAPIResponse,
+} from 'foremanReact/redux/API/APISelectors';
+import { STATUS } from 'foremanReact/constants';
+import { MODULE_STREAMS_KEY } from './ModuleStreamsConstants';
+
+export const selectModuleStream = state =>
+  selectAPIResponse(state, MODULE_STREAMS_KEY) ?? {};
+
+export const selectHostId = state =>
+  selectAPIResponse(state, MODULE_STREAMS_KEY) ?? {};
+
+export const selectModuleStreamStatus = state =>
+  selectAPIStatus(state, MODULE_STREAMS_KEY) ?? STATUS.PENDING;
+
+export const selecModuleStreamError = state =>
+  selectAPIError(state, MODULE_STREAMS_KEY);