katello 4.12.0.rc3 → 4.13.0.rc1

data/webpack/ForemanColumnExtensions/index.js

@@ -0,0 +1,129 @@
+/* eslint-disable no-param-reassign */
+import React from 'react';
+import {
+  BugIcon,
+  SecurityIcon,
+  EnhancementIcon,
+  PackageIcon,
+} from '@patternfly/react-icons';
+import { Link } from 'react-router-dom';
+import { Flex, FlexItem } from '@patternfly/react-core';
+import { translate as __ } from 'foremanReact/common/I18n';
+import RelativeDateTime from 'foremanReact/components/common/dates/RelativeDateTime';
+
+const hostsIndexColumnExtensions = [
+  {
+    columnName: 'rhel_lifecycle_status',
+    title: __('RHEL Lifecycle status'),
+    wrapper: (hostDetails) => {
+      const rhelLifecycle = hostDetails?.rhel_lifecycle_status_label;
+      return rhelLifecycle || '—';
+    },
+    weight: 2000,
+    isSorted: true,
+  },
+  {
+    columnName: 'installable_updates',
+    title: __('Installable updates'),
+    wrapper: (hostDetails) => {
+      const errataCounts = hostDetails?.content_facet_attributes?.errata_counts;
+      const registered = !!hostDetails?.subscription_facet_attributes?.uuid;
+      const { security, bugfix, enhancement } = errataCounts ?? {};
+      const upgradableRpmCount = hostDetails?.content_facet_attributes?.upgradable_package_count;
+      if (!registered) return '—';
+      const hostErrataUrl = type => `hosts/${hostDetails?.name}#/Content/errata?type=${type}&show=installable`;
+      return (
+        <Flex alignContent={{ default: 'alignContentSpaceBetween' }}>
+          {security !== undefined &&
+            <FlexItem>
+              <SecurityIcon color="#0066cc" />
+              <Link to={hostErrataUrl('security')}>{security}</Link>
+            </FlexItem>
+          }
+          {bugfix !== undefined &&
+            <FlexItem>
+              <BugIcon color="#8bc1f7" />
+              <Link to={hostErrataUrl('bugfix')}>{bugfix}</Link>
+            </FlexItem>
+          }
+          {enhancement !== undefined &&
+            <FlexItem>
+              <EnhancementIcon color="#002f5d" />
+              <Link to={hostErrataUrl('enhancement')}>{enhancement}</Link>
+            </FlexItem>
+          }
+          {upgradableRpmCount !== undefined &&
+            <FlexItem>
+              <PackageIcon />
+              <Link to={`hosts/${hostDetails?.name}#/Content/Packages?status=Upgradable`}>{upgradableRpmCount}</Link>
+            </FlexItem>
+          }
+        </Flex>
+      );
+    },
+    weight: 2100,
+    isSorted: false,
+  },
+  {
+    columnName: 'last_checkin',
+    title: __('Last seen'),
+    wrapper: (hostDetails) => {
+      const lastCheckin =
+        hostDetails?.subscription_facet_attributes?.last_checkin;
+      return <RelativeDateTime defaultValue="—" date={lastCheckin} />;
+    },
+    weight: 2200,
+    isSorted: true,
+  },
+  {
+    columnName: 'lifecycle_environment',
+    title: __('Lifecycle environment'),
+    wrapper: (hostDetails) => {
+      const lifecycleEnvironment =
+        hostDetails?.content_facet_attributes?.lifecycle_environment?.name;
+      return lifecycleEnvironment || '—';
+    },
+    weight: 2300,
+    isSorted: true,
+  },
+  {
+    columnName: 'content_view',
+    title: __('Content view'),
+    wrapper: (hostDetails) => {
+      const contentView =
+        hostDetails?.content_facet_attributes?.content_view?.name;
+      return contentView || '—';
+    },
+    weight: 2400,
+    isSorted: true,
+  },
+  {
+    columnName: 'content_source',
+    title: __('Content source'),
+    wrapper: (hostDetails) => {
+      const contentSource =
+        hostDetails?.content_facet_attributes?.content_source_name;
+      return contentSource || '—';
+    },
+    weight: 2500,
+    isSorted: false,
+  },
+  {
+    columnName: 'registered_at',
+    title: __('Registered at'),
+    wrapper: (hostDetails) => {
+      const registeredAt = hostDetails?.subscription_facet_attributes?.registered_at;
+      return <RelativeDateTime defaultValue="—" date={registeredAt} />;
+    },
+    weight: 2600,
+    isSorted: true,
+  },
+];
+
+hostsIndexColumnExtensions.forEach((column) => {
+  column.tableName = 'hosts';
+  column.categoryName = 'Content';
+  column.categoryKey = 'content';
+});
+
+export default hostsIndexColumnExtensions;

data/webpack/components/ActivationKeysSearch/ActivationKeysSearch.test.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { renderWithRedux } from 'react-testing-lib-wrapper';
+import ActivationKeysSearch from './index';
+
+describe('ActivationKeysSearch', () => {
+  const mockQuerySelector = jest.spyOn(document, 'querySelector');
+  mockQuerySelector.mockImplementation((selector) => {
+    if (selector === '#hostgroup_lifecycle_environment_id') {
+      return {
+        options: [{}],
+        selectedIndex: 0,
+        value: '1',
+      };
+    }
+    if (selector === '#hostgroup_content_view_id') {
+      return {
+        options: [{}],
+        selectedIndex: 0,
+        value: '2 ',
+      };
+    }
+    return null;
+  });
+  it('renders without crashing', () => {
+    const { getByText } = renderWithRedux(<ActivationKeysSearch />, {});
+    expect(getByText('Activation Key information')).toBeInTheDocument();
+  });
+});

data/webpack/components/ActivationKeysSearch/index.js

@@ -0,0 +1,222 @@
+import React, { useState, useEffect, useCallback, useMemo } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import {
+  Form,
+  FormGroup,
+  Spinner,
+  EmptyState,
+  Title,
+  Button,
+  Select,
+  SelectOption,
+  SelectVariant,
+  Alert,
+} from '@patternfly/react-core';
+import { FormattedMessage } from 'react-intl';
+import $ from 'jquery';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { get } from 'foremanReact/redux/API';
+import { foremanUrl } from 'foremanReact/common/helpers';
+import { STATUS } from 'foremanReact/constants';
+import { selectAPIStatus } from 'foremanReact/redux/API/APISelectors';
+
+const getSelectedEnvId = () => {
+  const selectElement = document.querySelector('#hostgroup_lifecycle_environment_id');
+  const selectedOption = selectElement.options[selectElement.selectedIndex];
+  let dataId = selectedOption?.getAttribute?.('data-id');
+  if (!dataId) {
+    dataId = selectElement.value;
+  }
+  return dataId;
+};
+const getSelectedContentViewId = () => {
+  const selectElement = document.querySelector('#hostgroup_content_view_id');
+  const selectedOption = selectElement.options[selectElement.selectedIndex];
+  let dataId = selectedOption?.getAttribute?.('data-id');
+  if (!dataId) {
+    dataId = selectElement.value;
+  }
+  return dataId;
+};
+const ActivationKeysSearch = () => {
+  const ACTIVATION_KEYS = 'ACTIVATION_KEYS';
+  const KT_AK_LABEL = 'kt_activation_keys';
+  const [selectedEnvId, setSelectedEnvId] = useState(getSelectedEnvId());
+  const [selectedContentViewId, setSelectedContentViewId] = useState(getSelectedContentViewId());
+  const isLoading =
+    useSelector(state => selectAPIStatus(state, ACTIVATION_KEYS)) === STATUS.PENDING;
+  const [activationKeys, setActivationKeys] = useState([]);
+  const [selectedKeys, setSelectedKeys] = useState([]);
+  const [isOpen, setIsOpen] = useState(false);
+  const dispatch = useDispatch();
+
+  const ktLoadActivationKeys = useCallback(() => {
+    if (selectedEnvId && selectedContentViewId) {
+      dispatch(get({
+        key: ACTIVATION_KEYS,
+        url: foremanUrl(`/katello/api/v2/environments/${selectedEnvId}/activation_keys`),
+        params: { content_view_id: selectedContentViewId },
+        handleSuccess: ({ data }) => {
+          setActivationKeys(data.results);
+        },
+        errorToast: () =>
+          __('There was a problem retrieving Activation Key data from the server.'),
+      }));
+    }
+  }, [dispatch, selectedEnvId, selectedContentViewId, setActivationKeys]);
+  const paramContainer = useMemo(() => {
+    let ret;
+    const inputs = document.querySelectorAll("div#parameters .fields input[type='text']");
+    inputs.forEach((input) => {
+      if (input.value === KT_AK_LABEL) {
+        ret = input.closest('.fields');
+      }
+    });
+    return ret;
+  }, []);
+
+  useEffect(() => {
+    $('#hostgroup_lifecycle_environment_id').on('change', () => setSelectedEnvId(getSelectedEnvId)); // cant use eventlistener on select2
+    $('#hostgroup_content_view_id').on('change', () =>
+      setSelectedContentViewId(getSelectedContentViewId())); // cant use eventlistener on select2
+    if (selectedEnvId && selectedContentViewId) {
+      ktLoadActivationKeys();
+    }
+
+    const ktHideParams = () => {
+      if (paramContainer) {
+        paramContainer.style.display = 'none';
+      }
+    };
+
+    const ktAkGetKeysFromParam = () => {
+      let keys = [];
+      if (paramContainer) {
+        const textarea = paramContainer.querySelector('textarea');
+        if (textarea) {
+          keys = textarea.value.split(',').map(key => key.trim());
+        }
+      }
+      return keys;
+    };
+    ktHideParams();
+    setSelectedKeys(ktAkGetKeysFromParam());
+  }, [ktLoadActivationKeys, paramContainer, selectedContentViewId, selectedEnvId]);
+
+  useEffect(() => {
+    function ktSetParam() {
+      let paramContainerCopy = paramContainer;
+      if (selectedKeys.length > 0) {
+        const value = selectedKeys.map(key => key.trim()).join(',');
+        if (!paramContainerCopy) {
+          // we create the param for kt_activation_keys
+          const addParameterButton = document.querySelector('#parameters .btn-primary');
+          addParameterButton.click();
+          const directionOfAddedItems = addParameterButton.getAttribute('direction');
+          const paramContainers = document.querySelectorAll('#parameters .fields');
+          if (directionOfAddedItems === 'append') {
+            paramContainerCopy = paramContainers[paramContainers.length - 1];
+          } else {
+            [paramContainerCopy] = paramContainers;
+          }
+          paramContainerCopy.querySelector("input[name*='name']").value = KT_AK_LABEL;
+        }
+        paramContainerCopy.querySelector('textarea').value = value;
+        paramContainerCopy.querySelector("input[type='hidden']").value = 0;
+      } else if (paramContainerCopy) {
+        // we remove the param by setting destroy to 1
+        paramContainerCopy.querySelector("input[type='hidden']").value = 1;
+      }
+    }
+    ktSetParam();
+  }, [paramContainer, selectedKeys]);
+
+  if (!(selectedEnvId && selectedContentViewId)) {
+    return (
+      <EmptyState>
+        <Title headingLevel="h4" size="lg" ouiaId="ak-empty-state-title">
+          {__('Please select a lifecycle environment and content view to view activation keys.')}
+        </Title>
+      </EmptyState>
+    );
+  }
+
+  const onSelect = (event, selection) => {
+    setIsOpen(false);
+    if (selectedKeys.includes(selection)) {
+      setSelectedKeys(prevState => prevState.filter(item => item !== selection));
+    } else {
+      setSelectedKeys(prevState => [...prevState, selection]);
+    }
+  };
+  const isEmptyResults = activationKeys.length === 0;
+  return (
+    <div>
+      <Form isHorizontal>
+        <FormGroup label={__('Activation Keys')}>
+          <Select
+            ouiaId="ak-select"
+            variant={SelectVariant.typeaheadMulti}
+            onToggle={setIsOpen}
+            onSelect={onSelect}
+            selections={selectedKeys}
+            isOpen={isOpen}
+            isCreatable
+            shouldResetOnSelect
+            isDisabled={isLoading || isEmptyResults}
+            placeholderText={
+              isEmptyResults
+                ? __('The selected lifecycle environment contains no activation keys')
+                : null
+            }
+          >
+            {activationKeys.map(({ id, name }) => (
+              <SelectOption key={id} value={name} />
+            ))}
+          </Select>
+        </FormGroup>
+        <Alert title={__('Activation Key information')} variant="info" ouiaId="ak-info">
+          <p>{__("The value will be available in templates as @host.params['kt_activation_keys']")}</p>
+          <p>
+            <FormattedMessage
+              id="ak-link-manage"
+              defaultMessage={__('Activation keys can be managed {here}.')}
+              values={{
+                here: (
+                  <b>
+                    <a href="/activation_keys" target="_blank">
+                      {__('here')}
+                    </a>
+                  </b>
+                ),
+              }}
+            />
+          </p>
+          <p>
+            <FormattedMessage
+              id="ak-subscriptions-info"
+              defaultMessage={__('Activation keys may be used during {system_registration}.')}
+              values={{
+                system_registration: <a href="/hosts/register">{__('system registration')}</a>,
+              }}
+            />
+          </p>
+          <p>
+            <Button
+              id="ak_refresh_subscriptions"
+              variant="link"
+              onClick={ktLoadActivationKeys}
+              ouiaId="ak-refresh-button"
+              isInline
+            >
+              {__('Reload data')}
+            </Button>
+          </p>
+        </Alert>
+      </Form>
+      {isLoading && <Spinner id="ak-subscriptions-spinner" />}
+    </div>
+  );
+};
+
+export default ActivationKeysSearch;

data/webpack/components/Table/TableWrapper.js

@@ -36,10 +36,12 @@ const TableWrapper = ({
   selectAll,
   selectAllMode,
   selectNone,
+  selectDefault,
   selectPage,
   areAllRowsOnPageSelected,
   areAllRowsSelected,
   selectedCount,
+  selectedDefaultCount,
   selectedResults,
   clearSelectedResults,
   emptySearchBody,
@@ -49,6 +51,8 @@ const TableWrapper = ({
   nodesBelowSearch,
   bookmarkController,
   readOnlyBookmarks,
+  inclusionSet,
+  exclusionSet,
   ...allTableProps
 }) => {
   const dispatch = useDispatch();
@@ -182,7 +186,9 @@ const TableWrapper = ({
                 selectAll,
                 selectPage,
                 selectNone,
+                selectDefault,
                 selectedCount,
+                selectedDefaultCount,
                 pageRowCount,
               }
               }
@@ -298,11 +304,13 @@ TableWrapper.propTypes = {
   ])),
   displaySelectAllCheckbox: PropTypes.bool,
   selectedCount: PropTypes.number,
+  selectedDefaultCount: PropTypes.number,
   selectedResults: PropTypes.arrayOf(PropTypes.shape({})),
   clearSelectedResults: PropTypes.func,
   selectAll: PropTypes.func,
   selectAllMode: PropTypes.bool,
   selectNone: PropTypes.func,
+  selectDefault: PropTypes.func,
   selectPage: PropTypes.func,
   areAllRowsOnPageSelected: PropTypes.func,
   areAllRowsSelected: PropTypes.func,
@@ -314,6 +322,8 @@ TableWrapper.propTypes = {
   bookmarkController: PropTypes.string,
   readOnlyBookmarks: PropTypes.bool,
   resetFilters: PropTypes.func,
+  inclusionSet: PropTypes.oneOfType([PropTypes.array, PropTypes.element, PropTypes.object]),
+  exclusionSet: PropTypes.oneOfType([PropTypes.array, PropTypes.element, PropTypes.object]),
 };
 
 TableWrapper.defaultProps = {
@@ -329,11 +339,13 @@ TableWrapper.defaultProps = {
   toggleGroup: null,
   displaySelectAllCheckbox: false,
   selectedCount: 0,
+  selectedDefaultCount: 0,
   selectedResults: [],
   clearSelectedResults: noop,
   selectAll: undefined,
   selectAllMode: false,
   selectNone: undefined,
+  selectDefault: undefined,
   selectPage: undefined,
   areAllRowsOnPageSelected: noop,
   areAllRowsSelected: noop,
@@ -346,6 +358,8 @@ TableWrapper.defaultProps = {
   readOnlyBookmarks: false,
   resetFilters: undefined,
   autocompleteQueryParams: undefined,
+  inclusionSet: new Set([]),
+  exclusionSet: new Set([]),
 };
 
 export default TableWrapper;

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

@@ -65,7 +65,7 @@ const HostActionsBar = () => {
       <DropdownItem
         ouiaId="katello-change-host-content-source"
         key="katello-change-host-content-source"
-        href={foremanUrl(`/change_host_content_source?host_id=${hostDetails?.id}`)}
+        href={foremanUrl(`/change_host_content_source?host_id=${hostDetails?.id}&initialContentSourceId=${hostDetails?.content_facet_attributes?.content_source_id}`)}
         icon={<CubeIcon />}
       >
         {__('Change content source')}

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

@@ -617,7 +617,7 @@ export const PackagesTab = () => {
           closeModal={closeModal}
           hostId={hostId}
           key={hostId}
-          hostName={hostname}
+          hostName={hostDetails.display_name}
           triggerPackageInstall={triggerPackageInstall}
         />
       }

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

@@ -31,6 +31,7 @@ const renderOptions = (facetAttributes = contentFacetAttributes) => ({
           id: 1,
           name: 'test-host',
           content_facet_attributes: { ...facetAttributes },
+          display_name: 'test-host',
         },
         status: 'RESOLVED',
       },

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

@@ -33,6 +33,7 @@ const renderOptions = (facetAttributes = contentFacetAttributes) => ({
           id: 1,
           name: hostname,
           content_facet_attributes: { ...facetAttributes },
+          display_name: hostname,
         },
         status: 'RESOLVED',
       },

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

@@ -1,8 +1,11 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect } from 'react';
+import { useDispatch } from 'react-redux';
 import { DropdownItem } from '@patternfly/react-core';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { foremanUrl } from 'foremanReact/common/helpers';
 import { ForemanHostsIndexActionsBarContext } from 'foremanReact/components/HostsIndex';
+import { useForemanModal } from 'foremanReact/components/ForemanModal/ForemanModalHooks';
+import { addModal } from 'foremanReact/components/ForemanModal/ForemanModalActions';
 
 const HostActionsBar = () => {
   const {
@@ -11,6 +14,14 @@ const HostActionsBar = () => {
     selectAllMode,
   } = useContext(ForemanHostsIndexActionsBarContext);
 
+  const dispatch = useDispatch();
+  useEffect(() => {
+    dispatch(addModal({
+      id: 'bulk-change-cv-modal',
+    }));
+  }, [dispatch]);
+  const { setModalOpen } = useForemanModal({ id: 'bulk-change-cv-modal' });
+
   let href = '';
   if (selectAllMode) {
     const query = fetchBulkParams({ selectAllQuery: 'created_at < "1 second ago"' });
@@ -29,6 +40,14 @@ const HostActionsBar = () => {
       >
         {__('Change content source')}
       </DropdownItem>
+      <DropdownItem
+        ouiaId="bulk-change-cv-dropdown-item"
+        key="bulk-change-cv-dropdown-item"
+        onClick={setModalOpen}
+        isDisabled={selectedCount === 0}
+      >
+        {__('Change content view environments')}
+      </DropdownItem>
     </>
   );
 };