katello 4.4.2.2 → 4.5.0.rc1

data/webpack/components/extensions/HostDetails/Cards/HostCollectionsCard/__tests__/removableHostCollections.fixtures.json

@@ -0,0 +1,45 @@
+{
+    "total": 3,
+    "subtotal": 3,
+    "selectable": 3,
+    "page": "1",
+    "per_page": "20",
+    "error": null,
+    "search": null,
+    "sort": {
+        "by": "name",
+        "order": "asc"
+    },
+    "results": [
+        {
+            "name": "Jer Hosts",
+            "organization_id": 1,
+            "max_hosts": null,
+            "description": null,
+            "total_hosts": 4,
+            "unlimited_hosts": true,
+            "created_at": "2021-11-24 10:12:39 -0500",
+            "updated_at": "2021-11-24 10:12:39 -0500",
+            "id": 1,
+            "permissions": {
+                "deletable": true,
+                "editable": true
+            }
+        },
+        {
+            "name": "Jturel hosts",
+            "organization_id": 1,
+            "max_hosts": 43,
+            "description": "This is my awesome description\n\n\nyeeah\nhi",
+            "total_hosts": 4,
+            "unlimited_hosts": false,
+            "created_at": "2022-02-28 16:18:30 -0500",
+            "updated_at": "2022-02-28 16:23:52 -0500",
+            "id": 2,
+            "permissions": {
+                "deletable": true,
+                "editable": true
+            }
+        }
+    ]
+}

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

@@ -15,9 +15,33 @@ describe('Without errata', () => {
     nock.cleanAll();
   });
 
-  test('does not show piechart when there are 0 errata', () => {
+  test('shows zero counts when there are 0 installable errata', () => {
     const hostDetails = {
       ...baseHostDetails,
+      errata_status: 1,
+      content_facet_attributes: {
+        errata_counts: {
+          bugfix: 0,
+          enhancement: 0,
+          security: 0,
+          total: 0,
+        },
+      },
+    };
+    /* eslint-disable max-len */
+    const { queryByLabelText, getByLabelText } = render(<ErrataOverviewCard hostDetails={hostDetails} />);
+    /* eslint-enable max-len */
+    expect(queryByLabelText('errataChart')).not.toBeInTheDocument();
+    expect(getByLabelText('0 total errata')).toBeInTheDocument();
+    expect(getByLabelText('0 security advisories')).toBeInTheDocument();
+    expect(getByLabelText('0 bug fixes')).toBeInTheDocument();
+    expect(getByLabelText('0 enhancements')).toBeInTheDocument();
+  });
+
+  test('shows empty state when there are 0 errata', () => {
+    const hostDetails = {
+      ...baseHostDetails,
+      errata_status: 0,
       content_facet_attributes: {
         errata_counts: {
           bugfix: 0,
@@ -31,7 +55,7 @@ describe('Without errata', () => {
     const { queryByLabelText, getByText } = render(<ErrataOverviewCard hostDetails={hostDetails} />);
     /* eslint-enable max-len */
     expect(queryByLabelText('errataChart')).not.toBeInTheDocument();
-    expect(getByText('0 errata')).toBeInTheDocument();
+    expect(getByText('All errata up-to-date')).toBeInTheDocument();
   });
 
   test('does not show errata card when host not registered', () => {
@@ -60,7 +84,7 @@ describe('With errata', () => {
     nock.cleanAll();
   });
 
-  test('shows piechart when there are errata', () => {
+  test('shows links when there are errata', () => {
     const hostDetails = {
       ...baseHostDetails,
       content_facet_attributes: {
@@ -72,12 +96,13 @@ describe('With errata', () => {
         },
       },
     };
-    const { getByText, container } = render(<ErrataOverviewCard hostDetails={hostDetails} />);
+    const { getByLabelText, 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();
+
+    expect(getByLabelText('60 total errata')).toBeInTheDocument();
+    expect(getByLabelText('30 security advisories')).toBeInTheDocument();
+    expect(getByLabelText('20 enhancements')).toBeInTheDocument();
+    expect(getByLabelText('10 bug fixes')).toBeInTheDocument();
   });
 });

data/webpack/components/extensions/HostDetails/DetailsTabCards/InstalledProductsCard.js

@@ -0,0 +1,44 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { List, ListItem } from '@patternfly/react-core';
+import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
+
+const InstalledProductsCard = ({ isExpandedGlobal, hostDetails }) => {
+  const installedProducts = hostDetails?.subscription_facet_attributes?.installed_products;
+  if (!installedProducts?.length) return null;
+  return (
+    <CardTemplate
+      header={__('Installed products')}
+      expandable
+      isExpandedGlobal={isExpandedGlobal}
+    >
+      <List isPlain>
+        {installedProducts.map(product => (
+          <ListItem key={product.productId}>
+            {product.productName}
+          </ListItem>
+        ))}
+      </List>
+    </CardTemplate>
+  );
+};
+
+InstalledProductsCard.propTypes = {
+  isExpandedGlobal: PropTypes.bool,
+  hostDetails: PropTypes.shape({
+    subscription_facet_attributes: PropTypes.shape({
+      installed_products: PropTypes.arrayOf(PropTypes.shape({
+        productId: PropTypes.string,
+        productName: PropTypes.string,
+      })),
+    }),
+  }),
+};
+
+InstalledProductsCard.defaultProps = {
+  isExpandedGlobal: false,
+  hostDetails: {},
+};
+
+export default InstalledProductsCard;

data/webpack/components/extensions/HostDetails/DetailsTabCards/RegistrationCard.js

@@ -0,0 +1,107 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { translate as __ } from 'foremanReact/common/I18n';
+import {
+  DescriptionList,
+  DescriptionListTerm,
+  DescriptionListGroup,
+  DescriptionListDescription,
+  List,
+  ListItem,
+  Text,
+  TextVariants,
+} from '@patternfly/react-core';
+import { urlBuilder } from 'foremanReact/common/urlHelpers';
+import { propsToCamelCase } from 'foremanReact/common/helpers';
+import IsoDate from 'foremanReact/components/common/dates/IsoDate';
+import CardTemplate from 'foremanReact/components/HostDetails/Templates/CardItem/CardTemplate';
+
+export const RegisteredBy = ({ user, activationKeys }) => {
+  if (user) {
+    return (
+      <DescriptionListDescription>{user}</DescriptionListDescription>
+    );
+  }
+  return (
+    <>
+      <List isPlain>
+        <Text component={TextVariants.h4}>{activationKeys.length > 1 ? __('Activation keys') : __('Activation key')}</Text>
+        {activationKeys.map(key => (
+          <ListItem key={key.id}>
+            <a href={urlBuilder(`activation_keys/${key.id}`, '')}>{key.name}</a>
+          </ListItem>
+        ))}
+      </List>
+    </>
+  );
+};
+
+RegisteredBy.propTypes = {
+  user: PropTypes.string,
+  activationKeys: PropTypes.arrayOf(PropTypes.shape({
+    id: PropTypes.number,
+    name: PropTypes.string,
+  })),
+};
+
+RegisteredBy.defaultProps = {
+  user: '',
+  activationKeys: {},
+};
+
+const RegistrationCard = ({ isExpandedGlobal, hostDetails }) => {
+  const subscriptionFacetAttributes
+    = propsToCamelCase(hostDetails?.subscription_facet_attributes || {});
+  const {
+    registeredAt, registeredThrough, activationKeys, user,
+  }
+    = subscriptionFacetAttributes;
+  const login = user?.login;
+  if (!registeredAt) return null;
+  return (
+    <CardTemplate
+      header={__('Registration details')}
+      expandable
+      isExpandedGlobal={isExpandedGlobal}
+    >
+      <DescriptionList isHorizontal>
+        <DescriptionListGroup>
+          <DescriptionListTerm>{__('Registered on')}</DescriptionListTerm>
+          <DescriptionListDescription><IsoDate date={registeredAt} /></DescriptionListDescription>
+        </DescriptionListGroup>
+        <DescriptionListGroup>
+          <DescriptionListTerm>{__('Registered by')}</DescriptionListTerm>
+          <RegisteredBy user={login} activationKeys={activationKeys} />
+        </DescriptionListGroup>
+        <DescriptionListGroup>
+          <DescriptionListTerm>{__('Registered through')}</DescriptionListTerm>
+          <DescriptionListDescription>{registeredThrough}</DescriptionListDescription>
+        </DescriptionListGroup>
+      </DescriptionList>
+    </CardTemplate>
+  );
+};
+
+RegistrationCard.propTypes = {
+  isExpandedGlobal: PropTypes.bool,
+  hostDetails: PropTypes.shape({
+    subscription_facet_attributes: PropTypes.shape({
+      user: PropTypes.shape({
+        login: PropTypes.string,
+      }),
+      registered_at: PropTypes.string,
+      registered_through: PropTypes.string,
+      activation_keys: PropTypes.arrayOf(PropTypes.shape({
+        id: PropTypes.number,
+        name: PropTypes.string,
+      })),
+    }),
+  }),
+};
+
+RegistrationCard.defaultProps = {
+  isExpandedGlobal: false,
+  hostDetails: {},
+};
+
+export default RegistrationCard;

data/webpack/components/extensions/HostDetails/DetailsTabCards/SystemPropertiesCardExtensions.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  DescriptionListGroup,
+  DescriptionListTerm,
+  DescriptionListDescription,
+  ClipboardCopy,
+} from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+const SystemPropertiesCardExtensions = ({ hostDetails }) => {
+  const subscriptionUuid = hostDetails?.subscription_facet_attributes?.uuid;
+  if (!subscriptionUuid) return null;
+  return (
+    <DescriptionListGroup>
+      <DescriptionListTerm>{__('Subscription UUID')}</DescriptionListTerm>
+      <DescriptionListDescription>
+        <ClipboardCopy isBlock variant="inline-compact" clickTip={__('Copied to clipboard')}>
+          {subscriptionUuid}
+        </ClipboardCopy>
+      </DescriptionListDescription>
+    </DescriptionListGroup>
+  );
+};
+
+SystemPropertiesCardExtensions.propTypes = {
+  hostDetails: PropTypes.shape({
+    subscription_facet_attributes: PropTypes.shape({
+      uuid: PropTypes.string,
+    }),
+  }),
+};
+
+SystemPropertiesCardExtensions.defaultProps = {
+  hostDetails: {},
+};
+
+export default SystemPropertiesCardExtensions;

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

@@ -21,7 +21,7 @@ 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, useUrlParams } from '../../../../../components/Table/TableHooks';
+import { useSet, useBulkSelect, useUrlParams, useTableSort } from '../../../../../components/Table/TableHooks';
 import TableWrapper from '../../../../../components/Table/TableWrapper';
 import { ErrataType, ErrataSeverity } from '../../../../../components/Errata';
 import { getInstallableErrata, regenerateApplicability, applyViaKatelloAgent } from './HostErrataActions';
@@ -34,6 +34,7 @@ import { errataInstallUrl } from '../customizedRexUrlHelpers';
 import './ErrataTab.scss';
 import hostIdNotReady from '../../HostDetailsActions';
 import { defaultRemoteActionMethod, KATELLO_AGENT } from '../../hostDetailsHelpers';
+import SortableColumnHeaders from '../../../../Table/components/SortableColumnHeaders';
 
 export const ErrataTab = () => {
   const hostDetails = useSelector(state => selectAPIResponse(state, 'HOST_DETAILS'));
@@ -41,6 +42,7 @@ export const ErrataTab = () => {
     id: hostId,
     name: hostname,
     content_facet_attributes: contentFacetAttributes,
+    errata_status: errataStatus,
   } = hostDetails;
   const contentFacet = propsToCamelCase(contentFacetAttributes ?? {});
   const dispatch = useDispatch();
@@ -65,11 +67,12 @@ export const ErrataTab = () => {
     = useState(PARAM_TO_FRIENDLY_NAME[initialSeverity] ?? ERRATA_SEVERITY);
   const activeFilters = [errataTypeSelected, errataSeveritySelected];
   const defaultFilters = [ERRATA_TYPE, ERRATA_SEVERITY];
-
-  const emptyContentTitle = __('This host does not have any installable errata.');
-  const emptyContentBody = __('Installable errata will appear here when available.');
+  const allUpToDate = errataStatus === 0;
+  const emptyContentTitle = allUpToDate ? __('All errata up-to-date') : __('This host has errata that are applicable, but not installable.');
+  const emptyContentBody = allUpToDate ? __('No action is needed because there are no applicable errata for this host.') : __("You may want to check the host's content view and lifecycle environment.");
   const emptySearchTitle = __('No matching errata found');
   const emptySearchBody = __('Try changing your search settings.');
+  const errorSearchTitle = __('Problem searching errata');
   const columnHeaders = [
     __('Errata'),
     __('Type'),
@@ -78,18 +81,22 @@ export const ErrataTab = () => {
     __('Synopsis'),
     __('Published date'),
   ];
-
-  const filtersQuery = () => {
-    const query = [];
-    if (errataTypeSelected !== ERRATA_TYPE) {
-      query.push(`type=${TYPES_TO_PARAM[errataTypeSelected]}`);
-    }
-    if (errataSeveritySelected !== ERRATA_SEVERITY) {
-      query.push(`severity=${SEVERITIES_TO_PARAM[errataSeveritySelected]}`);
-    }
-    return query.join(' and ');
+  const COLUMNS_TO_SORT_PARAMS = {
+    [columnHeaders[0]]: 'errata_id',
+    [columnHeaders[1]]: 'type',
+    [columnHeaders[2]]: 'severity',
+    [columnHeaders[5]]: 'updated',
   };
 
+  const {
+    pfSortParams, apiSortParams,
+    activeSortColumn, activeSortDirection,
+  } = useTableSort({
+    allColumns: columnHeaders,
+    columnsToSortParams: COLUMNS_TO_SORT_PARAMS,
+    initialSortColumnName: 'Errata',
+  });
+
   const fetchItems = useCallback(
     (params) => {
       if (!hostId) return hostIdNotReady;
@@ -104,16 +111,18 @@ export const ErrataTab = () => {
         hostId,
         {
           include_applicable: toggleGroupState === ALL,
+          ...apiSortParams,
           ...modifiedParams,
         },
       );
     },
     [hostId, toggleGroupState, ALL, ERRATA_SEVERITY, ERRATA_TYPE,
-      errataTypeSelected, errataSeveritySelected],
+      errataTypeSelected, errataSeveritySelected, apiSortParams],
   );
 
   const response = useSelector(state => selectAPIResponse(state, HOST_ERRATA_KEY));
   const { results, ...metadata } = response;
+  const { error: errorSearchBody } = metadata;
   const status = useSelector(state => selectHostErrataStatus(state));
   const errataSearchQuery = id => `errata_id = ${id}`;
   const {
@@ -123,11 +132,18 @@ export const ErrataTab = () => {
     results,
     metadata,
     idColumn: 'errata_id',
-    filtersQuery: filtersQuery(),
     isSelectable: result => result.installable,
     initialSearchQuery: searchParam || '',
   });
 
+  const tdSelect = useCallback((errataId, rowIndex) => ({
+    disable: !isSelectable(errataId),
+    isSelected: isSelected(errataId),
+    onSelect: (event, selected) => selectOne(selected, errataId),
+    rowIndex,
+    variant: 'checkbox',
+  }), [isSelectable, isSelected, selectOne]);
+
   if (!hostId) return <Skeleton />;
 
   const applyErratumViaRemoteExecution = id => dispatch(installErrata({
@@ -260,7 +276,7 @@ export const ErrataTab = () => {
   );
 
   const hostIsNonLibrary = (
-    contentFacet?.contentViewDefault === false || contentFacet.lifecycleEnvironmentLibrary === false
+    contentFacet?.contentViewDefault === false && contentFacet.lifecycleEnvironmentLibrary === false
   );
   const toggleGroup = (
     <Split hasGutter>
@@ -272,6 +288,7 @@ export const ErrataTab = () => {
           items={Object.values(ERRATA_TYPES)}
           selected={errataTypeSelected}
           setSelected={handleErrataTypeSelected}
+          isDisabled={!results?.length}
         />
       </SplitItem>
       <SplitItem>
@@ -282,6 +299,7 @@ export const ErrataTab = () => {
           items={Object.values(ERRATA_SEVERITIES)}
           selected={errataSeveritySelected}
           setSelected={handleErrataSeveritySelected}
+          isDisabled={!results?.length}
         />
       </SplitItem>
       {hostIsNonLibrary &&
@@ -294,7 +312,6 @@ export const ErrataTab = () => {
               isSelected={toggleGroupState === ALL}
               onChange={() => setToggleGroupState(ALL)}
             />
-
             <ToggleGroupItem
               text={__('Installable')}
               buttonId="installableToggle"
@@ -318,6 +335,8 @@ export const ErrataTab = () => {
             emptyContentBody,
             emptySearchTitle,
             emptySearchBody,
+            errorSearchTitle,
+            errorSearchBody,
             status,
             activeFilters,
             defaultFilters,
@@ -329,9 +348,13 @@ export const ErrataTab = () => {
             toggleGroup,
           }
           }
+          happyEmptyContent={allUpToDate}
+          ouiaId="host-errata-table"
           additionalListeners={[
-            hostId, toggleGroupState, errataTypeSelected, errataSeveritySelected]}
+            hostId, toggleGroupState, errataTypeSelected,
+            errataSeveritySelected, activeSortColumn, activeSortDirection]}
           fetchItems={fetchItems}
+          bookmarkController="katello_errata"
           autocompleteEndpoint={`/hosts/${hostId}/errata/auto_complete_search`}
           foremanApiAutoComplete
           rowsCount={results?.length}
@@ -343,8 +366,11 @@ export const ErrataTab = () => {
             <Tr>
               <Th key="expand-carat" />
               <Th key="select-all" />
-              {columnHeaders.map(col =>
-                <Th key={col}>{col}</Th>)}
+              <SortableColumnHeaders
+                columnHeaders={columnHeaders}
+                pfSortParams={pfSortParams}
+                columnsToSortParams={COLUMNS_TO_SORT_PARAMS}
+              />
               <Th key="action-menu" />
             </Tr>
           </Thead>
@@ -399,14 +425,7 @@ export const ErrataTab = () => {
                         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',
-                    }}
-                    />
+                    <Td select={tdSelect(errataId, rowIndex)} />
                     <Td>
                       <a href={urlBuilder(`errata/${id}`, '')}>{errataId}</a>
                     </Td>
@@ -439,16 +458,20 @@ export const ErrataTab = () => {
                     />
                   </Tr>
                   <Tr key="child_row" isExpanded={isExpanded}>
-                    <Td colSpan={3}>
-                      <ExpandableRowContent>
-                        <ErratumExpansionContents erratum={erratum} />
-                      </ExpandableRowContent>
-                    </Td>
-                    <Td colSpan={4}>
-                      <ExpandableRowContent>
-                        <ErratumExpansionDetail erratum={erratum} />
-                      </ExpandableRowContent>
-                    </Td>
+                    {isExpanded && (
+                      <>
+                        <Td colSpan={3}>
+                          <ExpandableRowContent>
+                            <ErratumExpansionContents erratum={erratum} />
+                          </ExpandableRowContent>
+                        </Td>
+                        <Td colSpan={4}>
+                          <ExpandableRowContent>
+                            <ErratumExpansionDetail erratum={erratum} />
+                          </ExpandableRowContent>
+                        </Td>
+                      </>
+                    )}
                   </Tr>
                 </Tbody>
               );

data/webpack/components/extensions/HostDetails/Tabs/ErrataTab/HostErrataActions.js

@@ -1,13 +1,7 @@
 import { API_OPERATIONS, get, put } from 'foremanReact/redux/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';
-
-const errorToast = (error) => {
-  const message = getResponseErrorMsgs(error.response);
-  return message;
-};
+import { errorToast, renderTaskStartedToast } from '../../../../../scenes/Tasks/helpers';
 
 export const getInstallableErrata = (hostId, params) => get({
   type: API_OPERATIONS.GET,

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

@@ -1,10 +1,8 @@
 import { API_OPERATIONS, get } from 'foremanReact/redux/API';
+import { errorToast } from '../../../../../scenes/Tasks/helpers';
 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,

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

@@ -1,3 +1,31 @@
 export const MODULE_STREAMS_KEY = 'MODULE_STREAMS';
 
+export const INSTALLED_STATE = {
+  UPGRADEABLE: 'Upgradable',
+  UPTODATE: 'Up-to-date',
+  NOTINSTALLED: 'Not installed',
+};
+
+export const HOST_MODULE_STREAM_STATUSES = {
+  ENABLED: 'Enabled',
+  INSTALLED: 'Installed',
+  DISABLED: 'Disabled',
+  UNKNOWN: 'Unknown',
+  UPGRADABLE: 'Upgradable',
+};
+
+export const STATUS_PARAM_TO_FRIENDLY_NAME = {
+  enabled: 'Enabled',
+  installed: 'Installed',
+  disabled: 'Disabled',
+  unknown: 'Unknown',
+  upgradable: 'Upgradable',
+};
+
+export const INSTALL_STATUS_PARAM_TO_FRIENDLY_NAME = {
+  not_installed: 'Not installed',
+  up_to_date: 'Up-to-date',
+  upgradable: 'Upgradable',
+};
+
 export default MODULE_STREAMS_KEY;