katello 4.10.0 → 4.11.0.rc1

data/webpack/components/extensions/RegistrationCommands/RegistrationCommandsPageHelpers.js

@@ -1,21 +1,27 @@
 // Activation Keys helpers
 
-export const validateAKField = (hostGroupId, userKeys, hgKeys) => {
+export const validateAKField = (
+  hasInteraction,
+  hostGroupId,
+  activationKeys,
+  userKeys,
+  hgKeys,
+) => {
   if (hostGroupId === '') {
-    return (userKeys?.length > 0 ? 'success' : 'error');
+    return userKeys?.length > 0 ? 'success' : 'error';
   }
 
-  if (userKeys === undefined && hgKeys === undefined) {
-    return ('default');
+  if (!hasInteraction && activationKeys?.length > 0) {
+    return 'default';
   }
 
-  return ((userKeys?.length > 0 || hgKeys?.length > 0) ? 'success' : 'error');
+  return userKeys?.length > 0 || hgKeys?.length > 0 ? 'success' : 'error';
 };
 
 export const akHasValidValue = (hostGroupId, userKeys, hgKeys) => {
   if (hostGroupId === '') {
-    return (userKeys?.length > 0);
+    return userKeys?.length > 0;
   }
 
-  return (hgKeys?.length > 0 || userKeys?.length > 0);
+  return hgKeys?.length > 0 || userKeys?.length > 0;
 };

data/webpack/components/extensions/RegistrationCommands/__tests__/__snapshots__/ActivationKeys.test.js.snap

@@ -11,13 +11,21 @@ exports[`ActivationKeys renders 1`] = `
       Create new activation key
     </a>
   }
+  helperTextInvalidIcon={
+    <ExclamationCircleIcon
+      color="currentColor"
+      noVerticalAlign={false}
+      size="sm"
+    />
+  }
   isRequired={true}
   label="Activation Keys"
   labelIcon={
     <LabelIcon
-      text="Activation key(s) for Subscription Manager."
+      text="Activation key(s) to use during registration"
     />
   }
+  onFocus={[Function]}
   validated="error"
 >
   <Select

data/webpack/components/extensions/RegistrationCommands/fields/ActivationKeys.js

@@ -1,16 +1,21 @@
-
 /* eslint-disable max-len, react/forbid-prop-types */
 import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import {
   FormGroup,
-  Select, SelectOption, SelectVariant,
+  Select,
+  SelectOption,
+  SelectVariant,
 } from '@patternfly/react-core';
 
 import LabelIcon from 'foremanReact/components/common/LabelIcon';
+import { ExclamationCircleIcon } from '@patternfly/react-icons';
 import { sprintf, translate as __ } from 'foremanReact/common/I18n';
 
-import { validateAKField, akHasValidValue } from '../RegistrationCommandsPageHelpers';
+import {
+  validateAKField,
+  akHasValidValue,
+} from '../RegistrationCommandsPageHelpers';
 
 const ActivationKeys = ({
   activationKeys,
@@ -23,14 +28,22 @@ const ActivationKeys = ({
   handleInvalidField,
 }) => {
   const [isOpen, setIsOpen] = useState(false);
+  const [hasInteraction, setHasInteraction] = useState(false);
 
   const updatePluginValues = (keys) => {
     onChange({ activationKeys: keys });
-    handleInvalidField('Activation Keys', akHasValidValue(hostGroupId, pluginValues?.activationKeys, hostGroupActivationKeys));
+    handleInvalidField(
+      'Activation Keys',
+      akHasValidValue(
+        hostGroupId,
+        pluginValues?.activationKeys,
+        hostGroupActivationKeys,
+      ),
+    );
   };
 
   const onSelect = (_e, value) => {
-    if (selectedKeys.find((key => key === value))) {
+    if (selectedKeys.find(key => key === value)) {
       updatePluginValues(selectedKeys.filter(sk => sk !== value));
     } else {
       updatePluginValues([...selectedKeys, value]);
@@ -39,48 +52,100 @@ const ActivationKeys = ({
 
   // Validate field when hostgroup is changed (host group may have some keys)
   useEffect(() => {
-    handleInvalidField('Activation Keys', akHasValidValue(hostGroupId, pluginValues?.activationKeys, hostGroupActivationKeys));
+    handleInvalidField(
+      'Activation Keys',
+      akHasValidValue(
+        hostGroupId,
+        pluginValues?.activationKeys,
+        hostGroupActivationKeys,
+      ),
+    );
   }, [handleInvalidField, hostGroupId, hostGroupActivationKeys, pluginValues]);
 
+  useEffect(() => {
+    if (activationKeys?.length === 1) {
+      onChange({ activationKeys: [activationKeys[0].name] });
+    }
+  }, [activationKeys, onChange]);
+
   return (
     <FormGroup
+      onFocus={() => setHasInteraction(true)}
       label={__('Activation Keys')}
       fieldId="activation_keys_field"
-      helperText={hostGroupActivationKeys && sprintf('From host group: %s', hostGroupActivationKeys)}
-      helperTextInvalid={activationKeys?.length === 0 ? <a href="/activation_keys/new">{__('Create new activation key')}</a> : __('No Activation Keys selected')}
-      validated={validateAKField(hostGroupId, pluginValues?.activationKeys, hostGroupActivationKeys)}
-      labelIcon={<LabelIcon text={__('Activation key(s) for Subscription Manager.')} />}
+      helperText={
+        hostGroupActivationKeys &&
+        sprintf('From host group: %s', hostGroupActivationKeys)
+      }
+      helperTextInvalid={
+        activationKeys?.length === 0 ? (
+          <a href="/activation_keys/new">{__('Create new activation key')}</a>
+        ) : (
+          __('No Activation Keys selected')
+        )
+      }
+      helperTextInvalidIcon={<ExclamationCircleIcon />}
+      labelIcon={
+        <LabelIcon text={__('Activation key(s) to use during registration')} />
+      }
+      validated={validateAKField(
+        hasInteraction,
+        hostGroupId,
+        activationKeys,
+        pluginValues?.activationKeys,
+        hostGroupActivationKeys,
+      )}
       isRequired
     >
       <Select
         ouiaId="activation-keys-field"
         selections={selectedKeys}
         variant={SelectVariant.typeaheadMulti}
-        onToggle={() => setIsOpen(!isOpen)}
+        onToggle={() => {
+          setHasInteraction(true);
+          setIsOpen(!isOpen);
+        }}
         onSelect={onSelect}
         onClear={() => updatePluginValues([])}
         isOpen={isOpen}
+        validated={
+          activationKeys?.length > 0
+            ? validateAKField(
+              hasInteraction,
+              hostGroupId,
+              activationKeys,
+                pluginValues?.activationKeys,
+                hostGroupActivationKeys,
+            )
+            : 'default'
+        }
         id="activation_keys_field"
         className="without_select2"
         isDisabled={isLoading || activationKeys?.length === 0}
-        placeholderText={activationKeys?.length === 0 ? __('No Activation keys to select') : ''}
+        placeholderText={
+          activationKeys?.length === 0 ? __('No Activation keys to select') : ''
+        }
       >
-        {activationKeys && activationKeys.map(ack => (
-          <SelectOption
-            key={ack.name}
-            value={ack.name}
-            description={(ack?.lce ? ack.lce : __('No environment'))}
-          />
-        ))}
+        {activationKeys &&
+          activationKeys.map(ack => (
+            <SelectOption
+              key={ack.name}
+              value={ack.name}
+              description={ack?.lce ? ack.lce : __('No environment')}
+            />
+          ))}
       </Select>
-    </FormGroup>);
+    </FormGroup>
+  );
 };
 
-
 ActivationKeys.propTypes = {
   activationKeys: PropTypes.array,
   selectedKeys: PropTypes.array,
-  hostGroupActivationKeys: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
+  hostGroupActivationKeys: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.array,
+  ]),
   hostGroupId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   pluginValues: PropTypes.objectOf(PropTypes.shape({})),
   onChange: PropTypes.func.isRequired,

data/webpack/components/extensions/RegistrationCommands/index.js

@@ -3,62 +3,38 @@ import PropTypes from 'prop-types';
 import { noop } from 'foremanReact/common/helpers';
 
 import ActivationKeys from './fields/ActivationKeys';
-import LifecycleEnvironment from './fields/LifecycleEnvironment';
 import IgnoreSubmanErrors from './fields/IgnoreSubmanErrors';
 import Force from './fields/Force';
 
 export const RegistrationCommands = ({
-  organizationId,
-  hostGroupId,
   pluginValues,
-  pluginData,
   onChange,
   isLoading,
-}) => {
-  useEffect(() => {
-    onChange({ lifecycleEnvironmentId: '' });
-  }, [onChange, organizationId, hostGroupId]);
-
-  return (
-    <>
-      <LifecycleEnvironment
-        pluginValues={pluginValues}
-        lifecycleEnvironments={pluginData?.lifecycleEnvironments}
-        hostGroupEnvironment={pluginData?.hostGroupEnvironment}
-        organizationId={organizationId}
-        onChange={onChange}
-        isLoading={isLoading}
-      />
-      <IgnoreSubmanErrors
-        value={pluginValues?.ignoreSubmanErrors}
-        pluginValues={pluginValues}
-        onChange={onChange}
-        isLoading={isLoading}
-      />
-      <Force
-        value={pluginValues?.force}
-        pluginValues={pluginValues}
-        onChange={onChange}
-        isLoading={isLoading}
-      />
-    </>
-  );
-};
+}) => (
+  <>
+    <IgnoreSubmanErrors
+      value={pluginValues?.ignoreSubmanErrors}
+      pluginValues={pluginValues}
+      onChange={onChange}
+      isLoading={isLoading}
+    />
+    <Force
+      value={pluginValues?.force}
+      pluginValues={pluginValues}
+      onChange={onChange}
+      isLoading={isLoading}
+    />
+  </>
+);
 
 RegistrationCommands.propTypes = {
-  organizationId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-  hostGroupId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   pluginValues: PropTypes.object, // eslint-disable-line react/forbid-prop-types
-  pluginData: PropTypes.object, // eslint-disable-line react/forbid-prop-types
   onChange: PropTypes.func,
   isLoading: PropTypes.bool,
 };
 
 RegistrationCommands.defaultProps = {
-  organizationId: undefined,
-  hostGroupId: undefined,
   pluginValues: {},
-  pluginData: {},
   isLoading: false,
   onChange: noop,
 };
@@ -80,7 +56,7 @@ export const RegistrationActivationKeys = ({
     <ActivationKeys
       activationKeys={pluginData?.activationKeys}
       organizationId={organizationId}
-      selectedKeys={(pluginValues?.activationKeys || [])}
+      selectedKeys={pluginValues?.activationKeys || []}
       hostGroupActivationKeys={pluginData?.hostGroupActivationKeys}
       hostGroupId={hostGroupId}
       pluginValues={pluginValues}

data/webpack/global_index.js

@@ -25,7 +25,8 @@ import {
   SystemPropertiesCardVirtualization,
   SystemPropertiesCardTracer,
 } from './components/extensions/HostDetails/DetailsTabCards/SystemPropertiesCardExtensions';
-import HostActionsBar from './components/extensions/HostDetails/ActionsBar';
+import HostDetailsActionsBar from './components/extensions/HostDetails/ActionsBar';
+import HostsIndexActionsBar from './components/extensions/Hosts/ActionsBar';
 import RecentCommunicationCardExtensions from './components/extensions/HostDetails/DetailsTabCards/RecentCommunicationCardExtensions';
 import SystemPurposeCard from './components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeCard';
 
@@ -67,7 +68,15 @@ addGlobalFill('host-details-tab-properties-3', 'Virtualization', <SystemProperti
 addGlobalFill(
   'host-details-kebab',
   'katello-host-details-kebab',
-  <HostActionsBar key="katello-host-details-kebab" />,
+  <HostDetailsActionsBar key="katello-host-details-kebab" />,
   100,
 );
+
+addGlobalFill(
+  'hosts-index-kebab',
+  'katello-hosts-index-kebab',
+  <HostsIndexActionsBar key="katello-hosts-index-kebab" />,
+  100,
+);
+
 addGlobalFill('host-tab-details-cards', 'HW properties', <HwPropertiesCard key="hw-properties" />, 200);

data/webpack/redux/reducers/RedHatRepositories/enabled.fixtures.js

@@ -55,6 +55,7 @@ export const requestSuccessResponse = Immutable({
         ],
       },
       last_sync: null,
+      content_view_versions: [],
       content_counts: {
         docker_manifest: 0,
         docker_manifest_list: 0,
@@ -95,6 +96,7 @@ export const requestSuccessResponse = Immutable({
         ],
       },
       last_sync: null,
+      content_view_versions: [1],
       content_counts: {
         docker_manifest: 0,
         docker_manifest_list: 0,
@@ -128,6 +130,7 @@ export const successState = Immutable({
       productId: 20,
       releasever: '7.0',
       type: 'yum',
+      canDisable: true,
     },
     {
       arch: 'x86_64',
@@ -139,6 +142,7 @@ export const successState = Immutable({
       productId: 20,
       releasever: '7.1',
       type: 'yum',
+      canDisable: false,
     },
   ],
   searchIsActive: false,

data/webpack/redux/reducers/RedHatRepositories/enabled.js

@@ -31,6 +31,7 @@ const mapRepo = (repo) => {
     orphaned: repo.product.orphaned,
     contentId: parseInt(repo.content_id, 10),
     productId: parseInt(repo.product.id, 10),
+    canDisable: repo.content_view_versions.length === 0,
   });
 };
 

data/webpack/scenes/ActivationKeys/Details/ActivationKeyDetails.js

@@ -25,6 +25,7 @@ import {
   Flex,
   FlexItem,
   Panel,
+  PageSection,
 } from '@patternfly/react-core';
 import './ActivationKeyDetails.scss';
 import EditModal from './components/EditModal';
@@ -32,6 +33,7 @@ import DeleteMenu from './components/DeleteMenu';
 import { getActivationKey } from './ActivationKeyActions';
 import DeleteModal from './components/DeleteModal';
 import InactiveText from '../../ContentViews/components/InactiveText';
+import SystemPurposeCard from '../../../components/extensions/HostDetails/Cards/SystemPurposeCard/SystemPurposeCard';
 
 const ActivationKeyDetails = ({ match }) => {
   const dispatch = useDispatch();
@@ -51,7 +53,7 @@ const ActivationKeyDetails = ({ match }) => {
   };
 
   return (
-    <div >
+    <div id="ak-details-katello" >
       <Panel className="ak-details-header">
         <div className="breadcrumb-bar-pf4">
           <Breadcrumb ouiaId="ak-breadcrumbs" className="breadcrumb-display">
@@ -106,6 +108,13 @@ const ActivationKeyDetails = ({ match }) => {
           }
         </div>
       </Panel>
+      <PageSection className="ak-details-tab-page">
+        <Grid className="ak-details-tab-page" hasGutter>
+          <GridItem span={6}>
+            <SystemPurposeCard akDetails={akDetails} />
+          </GridItem>
+        </Grid>
+      </PageSection>
       <DeleteModal isModalOpen={isModalOpen} handleModalToggle={handleModalToggle} akId={akId} />
     </div>
   );

data/webpack/scenes/ActivationKeys/Details/ActivationKeyDetails.scss

@@ -1,37 +1,39 @@
-.ak-details-header {
-  margin: 0 24px 16px;
-  padding-top: 16px;
-}
+#ak-details-katello {
+  .ak-details-header {
+    margin: 0 24px 16px;
+    padding-top: 16px;
+  }
 
-.ak-details-description {
-  padding-top: 16px;
-}
+  .ak-details-description {
+    padding-top: 16px;
+  }
 
-.breadcrumb-bar-pf4 {
-  margin: 0 0 16px;
-}
+  .breadcrumb-bar-pf4 {
+    margin: 0 0 16px;
+  }
 
-.breadcrumb-display {
-  display: block;
-}
+  .breadcrumb-display {
+    display: block;
+  }
 
-.breadcrumb-list {
-  display: flex;
-  flex-wrap: wrap;
-  align-items: center;
-}
+  .breadcrumb-list {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+  }
 
-.ak-name-truncate {
-  text-overflow: ellipsis;
-  max-width: 100%;
-  white-space: nowrap;
-  overflow: hidden;
-  display: inline-block;
-  margin-right: 16px
-}
+  .ak-name-truncate {
+    text-overflow: ellipsis;
+    max-width: 100%;
+    white-space: nowrap;
+    overflow: hidden;
+    display: inline-block;
+    margin-right: 16px;
+  }
 
-.ak-name-wrapper {
-  display: inline-flex;
-  max-width: 60%;
-  margin-right: 8px;
-}
+  .ak-name-wrapper {
+    display: inline-flex;
+    max-width: 60%;
+    margin-right: 8px;
+  }
+}

data/webpack/scenes/AlternateContentSources/MainTable/ACSTable.js

@@ -27,13 +27,15 @@ import {
   TextVariants,
 } from '@patternfly/react-core';
 import { TableVariant, Tbody, Td, Th, Thead, Tr, ActionsColumn } from '@patternfly/react-table';
+import { useSelectionSet } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
+import { useTableSort } from 'foremanReact/components/PF4/Helpers/useTableSort';
+
 import TableWrapper from '../../../components/Table/TableWrapper';
 import {
   selectAlternateContentSources,
   selectAlternateContentSourcesError,
   selectAlternateContentSourcesStatus,
 } from '../ACSSelectors';
-import { useSelectionSet, useTableSort } from '../../../components/Table/TableHooks';
 import getAlternateContentSources, { deleteACS, bulkDeleteACS, getACSDetails, refreshACS, bulkRefreshACS } from '../ACSActions';
 import ACSCreateWizard from '../Create/ACSCreateWizard';
 import LastSync from '../../ContentViews/Details/Repositories/LastSync';

data/webpack/scenes/Content/ContentConfig.js

@@ -16,6 +16,7 @@ export default [
       singularLowercase: __('Python package'),
       pluralLabel: 'python_packages',
       singularLabel: 'python_package',
+      capsuleCountLabel: 'python_package',
     },
     columnHeaders: [
       { title: __('Name'), getProperty: unit => (<a href={urlBuilder(`content/python_packages/${unit?.id}`, '')}>{unit?.name}</a>) },
@@ -81,6 +82,7 @@ export default [
       singularLowercase: __('OSTree ref'),
       pluralLabel: 'ostree_refs',
       singularLabel: 'ostree_ref',
+      capsuleCountLabel: 'ostree_ref',
     },
     columnHeaders: [
       { title: __('Name'), getProperty: unit => (<a href={urlBuilder(`content/ostree_refs/${unit?.id}`, '')}>{unit?.name}</a>) },
@@ -142,6 +144,7 @@ export default [
       singularLowercase: __('Ansible collection'),
       pluralLabel: 'ansible_collections',
       singularLabel: 'ansible_collection',
+      capsuleCountLabel: 'ansible_collection',
     },
     columnHeaders: [
       { title: __('Name'), getProperty: unit => (<a href={urlBuilder(`content/ansible_collections/${unit?.id}`, '')}>{unit?.name}</a>) },

data/webpack/scenes/ContentViews/Create/CreateContentViewForm.js

@@ -76,10 +76,12 @@ const CreateContentViewForm = ({ setModalOpen }) => {
   const submitDisabled = !name?.length || !label?.length || saving || redirect || labelValidated === 'error';
 
   return (
-    <Form onSubmit={(e) => {
-      e.preventDefault();
-      onSave();
-    }}
+    <Form
+      onSubmit={(e) => {
+        e.preventDefault();
+        onSave();
+      }}
+      id="create-content-view-form"
     >
       <FormGroup label={__('Name')} isRequired fieldId="name">
         <TextInput

data/webpack/scenes/ContentViews/Create/CreateContentViewForm.scss

@@ -1,7 +1,9 @@
-.pf-c-tile__title {
-  font-size: 16px;
-}
+#create-content-view-form {
+  .pf-c-tile__title {
+    font-size: 16px;
+  }
 
-.pf-c-tile__icon {
-  min-height: 38px;
-}
+  .pf-c-tile__icon {
+    min-height: 38px;
+  }
+}

data/webpack/scenes/ContentViews/Delete/ContentViewDeleteWizard.js

@@ -151,6 +151,7 @@ const ContentViewDeleteWizard =
             setIsOpen(false);
           }}
           isOpen={show}
+          id="content-view-delete-wizard"
         />
       </CVDeleteContext.Provider>
     );

data/webpack/scenes/ContentViews/Delete/Steps/CVEnvironmentSelectionForm.scss

@@ -1,4 +1,6 @@
-.pf-c-expandable-section__content {
+#content-view-delete-wizard {
+  .pf-c-expandable-section__content {
     margin-bottom: 1em;
     margin-top: 1em;
-}
+  }
+}

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewAddModal.js

@@ -13,8 +13,7 @@ import {
   selectCVDetails,
   selectCVDetailStatus,
 } from '../../Details/ContentViewDetailSelectors';
-import { addComponent } from '../ContentViewDetailActions';
-import { CONTENT_VIEW_NEEDS_PUBLISH } from '../../ContentViewsConstants';
+import getContentViewDetails, { addComponent } from '../ContentViewDetailActions';
 
 const ComponentContentViewAddModal = ({
   cvId, componentCvId, componentId, latest, componentVersionId, show, setIsOpen,
@@ -67,12 +66,12 @@ const ComponentContentViewAddModal = ({
       dispatch(addComponent({
         compositeContentViewId: cvId,
         components: getUpdateParams(),
-      }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
+      }, () => dispatch(getContentViewDetails(cvId))));
     } else {
       dispatch(addComponent({
         compositeContentViewId: cvId,
         components: getAddParams(),
-      }, () => dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH })));
+      }, () => dispatch(getContentViewDetails(cvId))));
     }
     setIsOpen(false);
   };

data/webpack/scenes/ContentViews/Details/ComponentContentViews/ComponentContentViewBulkAddModal.js

@@ -8,7 +8,7 @@ import {
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import { useDispatch } from 'react-redux';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { addComponent } from '../ContentViewDetailActions';
+import getContentViewDetails, { addComponent } from '../ContentViewDetailActions';
 
 const ComponentContentViewBulkAddModal = ({ cvId, rowsToAdd, onClose }) => {
   const dispatch = useDispatch();
@@ -37,7 +37,7 @@ const ComponentContentViewBulkAddModal = ({ cvId, rowsToAdd, onClose }) => {
     dispatch(addComponent({
       compositeContentViewId: cvId,
       components: bulkAddParams(),
-    }));
+    }, () => dispatch(getContentViewDetails(cvId))));
     onClose();
   };