katello 4.18.1 → 4.19.0.rc2

data/webpack/ForemanColumnExtensions/index.js

@@ -12,6 +12,7 @@ import {
   FlexItem,
   Popover,
   Badge,
+  Button,
   DescriptionList,
   DescriptionListGroup,
   DescriptionListDescription as Dd,
@@ -206,9 +207,9 @@ const hostsIndexColumnExtensions = [
               </Flex>
             }
           >
-            <FlexItem>
+            <Button variant="plain" style={{ padding: 0, color: 'inherit' }} ouiaId="content-view-environments-button">
               {truncate(contentViewEnvironments.map(cve => cve.label).join(', '), 35)}
-            </FlexItem>
+            </Button>
           </Popover>
         </Flex>
       );
@@ -237,6 +238,49 @@ const hostsIndexColumnExtensions = [
     weight: 2600,
     isSorted: true,
   },
+  {
+    columnName: 'host_collections',
+    title: __('Host collections'),
+    wrapper: (hostDetails) => {
+      const hostCollections = hostDetails?.host_collections ?? [];
+      if (hostCollections.length === 0) return '—';
+
+      // Show count badge if more than one collection
+      if (hostCollections.length > 1) {
+        return (
+          <Flex>
+            <FlexItem>
+              <Badge isRead>{hostCollections.length}</Badge>
+            </FlexItem>
+            <Popover
+              id="host-collections-tooltip"
+              className="host-collections-tooltip"
+              maxWidth="34rem"
+              headerContent={hostDetails.display_name}
+              bodyContent={
+                <Flex direction={{ default: 'column' }}>
+                  {hostCollections.map((hc, index) => (
+                    <FlexItem key={hc.id}>
+                      <Text component={TextVariants.p} ouiaId={`host-collection-name-${index}`}>{hc.name}</Text>
+                    </FlexItem>
+                  ))}
+                </Flex>
+              }
+            >
+              <Button variant="plain" style={{ padding: 0, color: 'inherit' }} ouiaId="host-collections-button">
+                {truncate(hostCollections.map(hc => hc.name).join(', '), 35)}
+              </Button>
+            </Popover>
+          </Flex>
+        );
+      }
+
+      // Just show the name if only one collection
+      return truncate(hostCollections[0].name, 35);
+    },
+    weight: 2700,
+    isSorted: false,
+  },
 ];
 
 hostsIndexColumnExtensions.forEach((column) => {

data/webpack/components/Content/Details/__tests__/__snapshots__/ContentDetails.test.js.snap

@@ -7,7 +7,7 @@ exports[`Content Details Info should render and contain appropriate components 1
     loadingText="Loading"
     timeout={300}
   >
-    <Uncontrolled(TabContainer)
+    <ForwardRef
       defaultActiveKey={1}
       id="content-tabs-container"
       style={
@@ -137,7 +137,7 @@ exports[`Content Details Info should render and contain appropriate components 1
           </TabPane>
         </TabContent>
       </Grid>
-    </Uncontrolled(TabContainer)>
+    </ForwardRef>
   </LoadingState>
 </div>
 `;

data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeEditModal.js

@@ -117,7 +117,6 @@ const SystemPurposeEditModal = ({
       dispatch(updateHostSysPurposeAttributes({
         id,
         attributes: {
-          autoheal: true,
           purpose_role: optionsToValue(roleOptions, selectedRole),
           purpose_usage: optionsToValue(usageOptions, selectedUsage),
           release_version: optionsToValue(releaseVersionOptions, selectedReleaseVersion),
@@ -129,7 +128,6 @@ const SystemPurposeEditModal = ({
       dispatch(updateAKSysPurposeAttributes({
         id,
         attributes: {
-          autoheal: true,
           purpose_role: optionsToValue(roleOptions, selectedRole),
           purpose_usage: optionsToValue(usageOptions, selectedUsage),
           release_version: optionsToValue(releaseVersionOptions, selectedReleaseVersion),

data/webpack/components/extensions/HostDetails/Cards/SystemPurposeCard/__tests__/SystemPurposeEditModal.test.js

@@ -130,7 +130,6 @@ describe('SystemPurposeEditModal', () => {
         id: 1,
         host: {
           subscription_facet_attributes: {
-            autoheal: true,
             // we're going to change role from 'Server' to 'Workstation'
             purpose_role: 'Red Hat Enterprise Linux Workstation',
             purpose_usage: 'Production',
@@ -187,7 +186,6 @@ describe('SystemPurposeEditModal', () => {
         id: 1,
         activation_key: {
           // we're going to change role from 'Server' to 'Workstation'
-          autoheal: true,
           purpose_role: 'Red Hat Enterprise Linux Workstation',
           purpose_usage: 'Production',
           release_version: '8',

data/webpack/components/extensions/Hosts/ActionsBar/index.js

@@ -41,6 +41,7 @@ const HostActionsBar = () => {
       'bulk-packages-wizard',
       'bulk-errata-wizard',
       'bulk-repo-sets-wizard',
+      'bulk-change-host-collections-modal',
     ].forEach((id) => {
       dispatch(addModal({ id }));
     });

data/webpack/components/extensions/Hosts/BulkActions/BulkActionsConstants.js

@@ -0,0 +1,7 @@
+const PACKAGE_CONTENT_TYPE_NAMES = {
+  INVALID: 'invalid',
+  DEBIAN: 'debs',
+  REDHAT: 'packages',
+};
+
+export default PACKAGE_CONTENT_TYPE_NAMES;

data/webpack/components/extensions/Hosts/BulkActions/BulkChangeHostCollectionsModal/BulkChangeHostCollectionsModal.js

@@ -0,0 +1,388 @@
+import React, { useState, useCallback } from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch } from 'react-redux';
+import { FormattedMessage } from 'react-intl';
+import {
+  Modal,
+  Button,
+  Radio,
+  TextContent,
+  Text,
+  ToolbarItem,
+} from '@patternfly/react-core';
+import { ExclamationTriangleIcon } from '@patternfly/react-icons';
+import { addToast } from 'foremanReact/components/ToastsList';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { STATUS } from 'foremanReact/constants';
+import { foremanUrl, noop } from 'foremanReact/common/helpers';
+import { APIActions } from 'foremanReact/redux/API';
+import {
+  HOSTS_API_PATH,
+  API_REQUEST_KEY,
+} from 'foremanReact/routes/Hosts/constants';
+import { useForemanOrganization } from 'foremanReact/Root/Context/ForemanContext';
+import { useTableIndexAPIResponse, useSetParamsAndApiAndSearch } from 'foremanReact/components/PF4/TableIndexPage/Table/TableIndexHooks';
+import { useBulkSelect } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
+import { getPageStats } from 'foremanReact/components/PF4/TableIndexPage/Table/helpers';
+import TableIndexPage from 'foremanReact/components/PF4/TableIndexPage/TableIndexPage';
+import { Table } from 'foremanReact/components/PF4/TableIndexPage/Table/Table';
+import SelectAllCheckbox from 'foremanReact/components/PF4/TableIndexPage/Table/SelectAllCheckbox';
+import {
+  bulkAddHostCollections,
+  bulkRemoveHostCollections,
+} from './actions';
+import katelloApi from '../../../../../services/api';
+
+const BulkChangeHostCollectionsModal = ({
+  isOpen,
+  closeModal,
+  fetchBulkParams,
+  selectedCount: selectedHostsCount,
+}) => {
+  const dispatch = useDispatch();
+  const [addRadioChecked, setAddRadioChecked] = useState(true);
+
+  const orgId = useForemanOrganization()?.id;
+  const DEFAULT_PER_PAGE = 5;
+  const hostCollectionsUrlForOrg =
+    katelloApi.getApiUrl(`/host_collections?per_page=${DEFAULT_PER_PAGE}&include_permissions=true&enabled=true&with_custom=true&organization_id=${orgId}`);
+  const apiOptions = { key: 'BULK_HOST_COLLECTIONS' };
+  const replacementResponse = isOpen ? false : { response: {} };
+
+  const hostCollectionsResponse = useTableIndexAPIResponse({
+    replacementResponse, // don't fetch data if modal is closed
+    apiUrl: hostCollectionsUrlForOrg,
+    apiOptions,
+    defaultParams: { per_page: DEFAULT_PER_PAGE },
+  });
+
+  const {
+    response: {
+      results: hostCollectionsResults,
+      ...hostCollectionsMetadata
+    },
+    setAPIOptions,
+    status: hostCollectionsLoadingStatus,
+  } = hostCollectionsResponse;
+
+  const {
+    total, page, subtotal, per_page: perPage,
+  } = hostCollectionsMetadata;
+
+  // Function to determine if a host collection row should be selectable
+  const isSelectableRow = useCallback((hc) => {
+    // When removing, all collections are selectable
+    if (!addRadioChecked) return true;
+
+    // When adding, check if there's enough space for the selected hosts
+    if (hc?.unlimited_hosts) return true; // Unlimited collections always have space
+
+    const currentHosts = Number(hc?.total_hosts || 0);
+    const maxHosts = Number(hc?.max_hosts || 0);
+    const availableSpace = maxHosts - currentHosts;
+
+    // Collection is selectable only if it has enough space for all selected hosts
+    return availableSpace >= selectedHostsCount;
+  }, [addRadioChecked, selectedHostsCount]);
+
+  const hostCollectionsBulkSelect = useBulkSelect({
+    results: hostCollectionsResults,
+    metadata: { total, page, selectable: subtotal },
+    isSelectable: isSelectableRow,
+  });
+
+  const {
+    setParamsAndAPI: setHostCollectionsParamsAndAPI,
+  } = useSetParamsAndApiAndSearch({
+    defaultParams: { search: '' },
+    apiOptions,
+    setAPIOptions,
+    updateSearchQuery: hostCollectionsBulkSelect.updateSearchQuery,
+    pushToHistory: false,
+  });
+
+  const {
+    selectNone,
+    selectOne,
+    selectPage,
+    isSelected,
+    selectedCount,
+    selectedResults,
+    areAllRowsSelected,
+    areAllRowsOnPageSelected,
+    updateSearchQuery,
+  } = hostCollectionsBulkSelect;
+
+  const pageStats = getPageStats({ total: subtotal, page, perPage });
+
+  // Handler for switching between Add/Remove modes
+  const handleRadioChange = (isAdd) => {
+    setAddRadioChecked(isAdd);
+
+    // If switching to "Add" mode, deselect any collections that don't have enough space
+    if (isAdd) {
+      selectedResults.forEach((hc) => {
+        if (!isSelectableRow(hc)) {
+          selectOne(false, hc.id);
+        }
+      });
+    }
+  };
+
+  // Derive selected IDs directly from selectedResults instead of storing in state
+  const HCIds = selectedResults.map(result => result.id);
+
+  const handleModalClose = () => {
+    setAddRadioChecked(true);
+    selectNone();
+    setHostCollectionsParamsAndAPI({ page: 1 });
+    closeModal();
+  };
+
+  const handleError = (error) => {
+    const message = error?.response?.data?.error?.message || __('An error occurred while updating host collections');
+    dispatch(addToast({ type: 'danger', message }));
+  };
+
+  const handleSuccess = (response) => {
+    const messages = response?.data?.displayMessages;
+    const message = Array.isArray(messages) && messages.length > 0
+      ? (
+        <>
+          {messages.map(msg => (
+            <div key={msg}>{msg}</div>
+          ))}
+        </>
+      )
+      : __('Host collections updated');
+
+    dispatch(addToast({ type: 'success', message }));
+    dispatch(APIActions.get({
+      key: API_REQUEST_KEY,
+      url: foremanUrl(HOSTS_API_PATH),
+    }));
+    handleModalClose();
+  };
+
+  const handleSave = () => {
+    const requestBody = {
+      included: {
+        search: fetchBulkParams(),
+      },
+      host_collection_ids: HCIds,
+      organization_id: orgId,
+    };
+
+    if (addRadioChecked) {
+      dispatch(bulkAddHostCollections(requestBody, handleSuccess, handleError));
+    } else {
+      dispatch(bulkRemoveHostCollections(requestBody, handleSuccess, handleError));
+    }
+  };
+
+  const isLoadingHostCollections = hostCollectionsLoadingStatus === STATUS.PENDING;
+  const isSaveDisabled = HCIds.length === 0 || isLoadingHostCollections;
+
+  // Selection toolbar
+  const selectionToolbar = (
+    <ToolbarItem key="selectAll">
+      <SelectAllCheckbox
+        {...{
+          selectAll: noop,
+          selectOne,
+          updateSearchQuery,
+          selectNone,
+          selectPage,
+          selectedCount,
+          pageRowCount: pageStats.pageRowCount,
+          areAllRowsSelected,
+          areAllRowsOnPageSelected,
+        }}
+        totalCount={total}
+        areAllRowsOnPageSelected={areAllRowsOnPageSelected()}
+        areAllRowsSelected={areAllRowsSelected()}
+      />
+    </ToolbarItem>
+  );
+
+  const modalActions = [
+    <Button
+      key="save"
+      ouiaId="bulk-change-host-collections-modal-save-button"
+      variant="primary"
+      onClick={handleSave}
+      isDisabled={isSaveDisabled}
+      isLoading={isLoadingHostCollections}
+    >
+      {__('Save')}
+    </Button>,
+    <Button
+      key="cancel"
+      ouiaId="bulk-change-host-collections-modal-cancel-button"
+      variant="link"
+      onClick={handleModalClose}
+    >
+      {__('Cancel')}
+    </Button>,
+  ];
+
+  const columns = {
+    name: {
+      title: __('Host collection'),
+      wrapper: hc => hc?.name || '',
+      isSorted: true,
+      weight: 50,
+    },
+    limit: {
+      title: __('Limit'),
+      wrapper: (hc) => {
+        const totalLimit = hc?.unlimited_hosts ? 'unlimited' : (hc?.max_hosts || 0);
+        const count = Number(hc?.total_hosts || 0);
+        const maxHosts = Number(hc?.max_hosts || 0);
+        const availableSpace = maxHosts - count;
+
+        // Show warning if collection doesn't have enough space for selected hosts (when adding)
+        const showWarning = addRadioChecked
+          && !hc?.unlimited_hosts
+          && availableSpace < selectedHostsCount;
+
+        return (
+          <>
+            {showWarning && (
+              <ExclamationTriangleIcon
+                color="var(--pf-v5-global--warning-color--100)"
+                style={{ marginRight: '8px' }}
+                aria-label={__('Insufficient space for selected hosts')}
+              />
+            )}
+            {`${count}/${totalLimit}`}
+          </>
+        );
+      },
+      isSorted: false,
+      weight: 100,
+    },
+    description: {
+      title: __('Description'),
+      wrapper: hc => hc?.description || '',
+      isSorted: false,
+      weight: 150,
+    },
+  };
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      onClose={handleModalClose}
+      onEscapePress={handleModalClose}
+      title={__('Change host collections')}
+      width="60%"
+      position="top"
+      actions={modalActions}
+      id="bulk-update-host-collections-modal"
+      key="bulk-update-host-collections-modal"
+      ouiaId="bulk-update-host-collections-modal"
+    >
+      <TextContent>
+        <Text ouiaId="bulk-update-host-collections-text">
+          <FormattedMessage
+            defaultMessage={__('Select host collections to change their associations with {selectedHosts}. Changing host collection will affect all your selected hosts. Some hosts may already be in your chosen collections.')}
+            values={{
+              selectedHosts: (
+                <strong>
+                  <FormattedMessage
+                    defaultMessage="{count, plural, one {# {singular}} other {# {plural}}}"
+                    values={{
+                      count: selectedHostsCount,
+                      singular: __('selected host'),
+                      plural: __('selected hosts'),
+                    }}
+                    id="bulk-change-host-collections-selected-hosts"
+                  />
+                </strong>
+              ),
+            }}
+            id="bulk-change-host-collections-description"
+          />
+        </Text>
+      </TextContent>
+      <h3><strong>{__('Select action')}</strong></h3>
+      <div style={{ display: 'flex', alignItems: 'baseline' }}>
+        <Radio
+          isChecked={addRadioChecked}
+          onChange={(_e, checked) => handleRadioChange(checked)}
+          name="radio-add"
+          label={__('Add to host collections')}
+          id="radio-add-action"
+          ouiaId="radio-add-action"
+        />
+        <Radio
+          isChecked={!addRadioChecked}
+          onChange={(_e, checked) => handleRadioChange(!checked)}
+          name="radio-remove"
+          label={__('Remove from host collections')}
+          id="radio-remove-action"
+          ouiaId="radio-remove-action"
+          style={{ marginLeft: '50px' }}
+        />
+      </div>
+      <div>
+        <TableIndexPage
+          selectionToolbar={selectionToolbar}
+          results={hostCollectionsResults}
+          metadata={hostCollectionsMetadata}
+          response={hostCollectionsResponse}
+          tableType="host_collections"
+          apiUrl={hostCollectionsUrlForOrg}
+          apiOptions={apiOptions}
+          selectedCount={selectedCount}
+          selectPage={selectPage}
+          selectNone={selectNone}
+          customSearchProps={{
+            autocomplete: {
+              url: katelloApi.getApiUrl('/host_collections/auto_complete_search'),
+            },
+          }}
+          bulkSelect={hostCollectionsBulkSelect}
+          updateParamsByUrl={false}
+          isSelectableRow={isSelectableRow}
+        >
+          <Table
+            showCheckboxes
+            selectOne={selectOne}
+            isSelected={isSelected}
+            isSelectable={isSelectableRow}
+            isEmbedded
+            idColumn="id"
+            columns={columns}
+            refreshData={noop}
+            url=""
+            results={hostCollectionsResults}
+            isPending={hostCollectionsLoadingStatus === STATUS.PENDING}
+            params={{ ...hostCollectionsMetadata, perPage, page }}
+            setParams={setHostCollectionsParamsAndAPI}
+            page={page}
+            perPage={perPage}
+            itemCount={subtotal}
+          />
+        </TableIndexPage>
+      </div>
+    </Modal>
+  );
+};
+
+BulkChangeHostCollectionsModal.propTypes = {
+  isOpen: PropTypes.bool,
+  closeModal: PropTypes.func,
+  fetchBulkParams: PropTypes.func,
+  selectedCount: PropTypes.number,
+};
+
+BulkChangeHostCollectionsModal.defaultProps = {
+  isOpen: false,
+  closeModal: () => {},
+  fetchBulkParams: () => '',
+  selectedCount: 0,
+};
+
+export default BulkChangeHostCollectionsModal;