katello 4.4.0.rc1 → 4.4.0.rc2

data/webpack/scenes/ContentViews/Details/Filters/CVPackageGroupFilterContent.js

@@ -74,19 +74,19 @@ const CVPackageGroupFilterContent = ({
   const fetchItems = useCallback((params) => {
     const adjustedParams = { ...params };
     switch (selectedIndex) {
-      case 0:
-        adjustedParams.show_all_for = 'content_view_filter';
-        adjustedParams.available_for = undefined;
-        break;
-      case 1:
-        adjustedParams.show_all_for = undefined;
-        adjustedParams.available_for = undefined;
-        break;
-      case 2:
-        adjustedParams.show_all_for = undefined;
-        adjustedParams.available_for = 'content_view_filter';
-        break;
-      default:
+    case 0:
+      adjustedParams.show_all_for = 'content_view_filter';
+      adjustedParams.available_for = undefined;
+      break;
+    case 1:
+      adjustedParams.show_all_for = undefined;
+      adjustedParams.available_for = undefined;
+      break;
+    case 2:
+      adjustedParams.show_all_for = undefined;
+      adjustedParams.available_for = 'content_view_filter';
+      break;
+    default:
     }
 
     return getCVFilterPackageGroups(cvId, filterId, adjustedParams);
@@ -234,7 +234,7 @@ const CVPackageGroupFilterContent = ({
                   </Select>
                 </SplitItem>
                 <SplitItem>
-                  <Button isDisabled={!hasNotAddedSelected} onClick={bulkAdd} variant="secondary" aria-label="add_filter_rule">
+                  <Button isDisabled={!hasNotAddedSelected} onClick={bulkAdd} variant="primary" aria-label="add_filter_rule">
                     {__('Add filter rule')}
                   </Button>
                 </SplitItem>

data/webpack/scenes/ContentViews/Details/Filters/CVRpmFilterContent.js

@@ -179,7 +179,7 @@ const CVRpmFilterContent = ({
                 {hasPermission(permissions, 'edit_content_views') &&
                   <Split hasGutter>
                     <SplitItem>
-                      <Button onClick={() => setModalOpen(true)} variant="secondary" aria-label="add_rpm_rule">
+                      <Button onClick={() => setModalOpen(true)} variant="primary" aria-label="add_rpm_rule">
                         {__('Add RPM rule')}
                       </Button>
                     </SplitItem>

data/webpack/scenes/ContentViews/Details/Filters/ContentViewFilters.js

@@ -136,7 +136,7 @@ const ContentViewFilters = ({ cvId, details }) => {
         <>
           <Split hasGutter>
             <SplitItem>
-              <Button onClick={openAddModal} variant="secondary" aria-label="create_filter">
+              <Button onClick={openAddModal} variant="primary" aria-label="create_filter">
                 {__('Create filter')}
               </Button>
             </SplitItem>

data/webpack/scenes/ContentViews/Details/Filters/Rules/Package/AddEditPackageRuleModal.js

@@ -36,11 +36,11 @@ const AddEditPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData })
 
   const versionText = () => {
     switch (true) {
-      case !!editingVersion: return VersionModifiers['Equal to'];
-      case !!editingMinVersion && !editingMaxVersion: return VersionModifiers['Greater than'];
-      case !editingMinVersion && !!editingMaxVersion: return VersionModifiers['Less than'];
-      case !!editingMinVersion && !!editingMaxVersion: return VersionModifiers.Range;
-      default: return VersionModifiers['All versions'];
+    case !!editingVersion: return VersionModifiers['Equal to'];
+    case !!editingMinVersion && !editingMaxVersion: return VersionModifiers['Greater than'];
+    case !editingMinVersion && !!editingMaxVersion: return VersionModifiers['Less than'];
+    case !!editingMinVersion && !!editingMaxVersion: return VersionModifiers.Range;
+    default: return VersionModifiers['All versions'];
     }
   };
 
@@ -64,18 +64,18 @@ const AddEditPackageRuleModal = ({ filterId, onClose, selectedFilterRuleData })
 
   const formVersionParams = () => {
     switch (versionComparator) {
-      case 'All versions':
-        return {};
-      case 'Equal to':
-        return { version };
-      case 'Greater than':
-        return { min_version: minVersion };
-      case 'Less than':
-        return { max_version: maxVersion };
-      case 'Range':
-        return { min_version: minVersion, max_version: maxVersion };
-      default:
-        return {};
+    case 'All versions':
+      return {};
+    case 'Equal to':
+      return { version };
+    case 'Greater than':
+      return { min_version: minVersion };
+    case 'Less than':
+      return { max_version: maxVersion };
+    case 'Range':
+      return { min_version: minVersion, max_version: maxVersion };
+    default:
+      return {};
     }
   };
 

data/webpack/scenes/ContentViews/Details/Repositories/ContentViewRepositories.js

@@ -284,7 +284,7 @@ const ContentViewRepositories = ({ cvId, details }) => {
             <SplitItem>
               <ActionList>
                 <ActionListItem>
-                  <Button onClick={addBulk} isDisabled={!hasNotAddedSelected} variant="secondary" aria-label="add_repositories">
+                  <Button onClick={addBulk} isDisabled={!hasNotAddedSelected} variant="primary" aria-label="add_repositories">
                     {__('Add repositories')}
                   </Button>
                 </ActionListItem>

data/webpack/scenes/ContentViews/Details/Versions/ContentViewVersionContent.js

@@ -1,10 +1,10 @@
 import React from 'react';
-import PropTypes from 'prop-types';
-import { camelCase } from 'lodash';
-import { Link } from 'react-router-dom';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
-import ContentConfig from './../../../Content/ContentConfig';
+import { camelCase } from 'lodash';
+import PropTypes from 'prop-types';
+import { Link } from 'react-router-dom';
+import ContentConfig from '../../../Content/ContentConfig';
 import InactiveText from '../../components/InactiveText';
 
 const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
@@ -19,19 +19,20 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
 
 
   const contentConfigTypes = ContentConfig.filter(({ names: { singularLabel } }) =>
-    !!cvVersion[`${singularLabel}_count`]).map(({
-    names: {
-      singularLabel, singularLowercase, pluralLowercase, pluralLabel,
-    },
-  }) => {
-    const countParam = `${singularLabel}_count`;
-    const count = cvVersion[countParam];
-    return {
-      pluralLabel,
-      label: count > 1 ? pluralLowercase : singularLowercase,
-      count,
-    };
-  });
+    !!cvVersion[`${singularLabel}_count`])
+    .map(({
+      names: {
+        singularLabel, singularLowercase, pluralLowercase, pluralLabel,
+      },
+    }) => {
+      const countParam = `${singularLabel}_count`;
+      const count = cvVersion[countParam];
+      return {
+        pluralLabel,
+        label: count > 1 ? pluralLowercase : singularLowercase,
+        count,
+      };
+    });
 
   const noCounts =
     !Number(debCount) && !Number(dockerManifestCount) && !Number(dockerTagCount) &&
@@ -61,7 +62,7 @@ const ContentViewVersionContent = ({ cvId, versionId, cvVersion }) => {
       {dockerManifestCount > 0 && dockerTagCount > 0 &&
         <>
           <Link to={`/versions/${versionId}/dockerTags`}>
-            {`${dockerTagCount} Docker tags`}
+            {`${dockerTagCount} Container tags`}
           </Link><br />
           <a href={urlBuilder(`content_views/${cvId}#/versions/${versionId}/dockerTags`, '')}>{`${dockerManifestCount} Container manifests`}</a><br />
         </>

data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVEnvironmentSelectionForm.js

@@ -96,24 +96,24 @@ const CVEnvironmentSelectionForm = () => {
               id, name, activation_key_count: akCount,
               host_count: hostCount,
             }, rowIndex) =>
-            (
-              <Tr key={`${name}_${id}`}>
-                <Td
-                  key={`${name}__${id}_select`}
-                  select={{
-                    rowIndex,
-                    onSelect: (event, isSelected) => onSelect(event, isSelected, id),
-                    isSelected: selectedEnvSet.has(id) || deleteFlow || removeDeletionFlow,
-                    disable: deleteFlow || removeDeletionFlow,
-                  }}
-                />
-                <Td>
-                  {name}
-                </Td>
-                <Td>{hostCount}</Td>
-                <Td>{akCount}</Td>
-              </Tr>
-            ))
+              (
+                <Tr key={`${name}_${id}`}>
+                  <Td
+                    key={`${name}__${id}_select`}
+                    select={{
+                      rowIndex,
+                      onSelect: (event, isSelected) => onSelect(event, isSelected, id),
+                      isSelected: selectedEnvSet.has(id) || deleteFlow || removeDeletionFlow,
+                      disable: deleteFlow || removeDeletionFlow,
+                    }}
+                  />
+                  <Td>
+                    {name}
+                  </Td>
+                  <Td>{hostCount}</Td>
+                  <Td>{akCount}</Td>
+                </Tr>
+              ))
             }
           </Tbody>
         </TableComposable>}

data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignActivationKeysForm.js

@@ -117,9 +117,9 @@ const CVReassignActivationKeysForm = () => {
       >
         <AffectedActivationKeys
           {...{
-          cvId,
-          versionEnvironments,
-          selectedEnvSet,
+            cvId,
+            versionEnvironments,
+            selectedEnvSet,
           }}
           deleteCV={false}
         />

data/webpack/scenes/ContentViews/Details/Versions/Delete/RemoveSteps/CVReassignHostsForm.js

@@ -114,9 +114,9 @@ const CVReassignHostsForm = () => {
       >
         <AffectedHosts
           {...{
-          cvId,
-          versionEnvironments,
-          selectedEnvSet,
+            cvId,
+            versionEnvironments,
+            selectedEnvSet,
           }}
           deleteCV={false}
         />

data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedActivationKeys.js

@@ -71,7 +71,7 @@ const AffectedActivationKeys = ({
             </Td>
             <Td><EnvironmentLabels environments={environment} /></Td>
           </Tr>
-            ))
+        ))
         }
       </Tbody>
     </TableWrapper>

data/webpack/scenes/ContentViews/Details/Versions/Delete/affectedHosts.js

@@ -72,7 +72,7 @@ const AffectedHosts = ({
             <Td><EnvironmentLabels environments={environment} /></Td>
           </Tr>
         ))
-      }
+        }
       </Tbody>
     </TableWrapper>
   );

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailConfig.js

@@ -284,7 +284,7 @@ export default ({ cvId, versionId }) => [
     ],
   },
   {
-    name: __('Docker Tags'),
+    name: __('Container tags'),
     route: 'dockerTags',
     repoType: 'docker',
     getCountKey: item => item?.docker_tag_count,

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionDetailsTable.js

@@ -1,21 +1,31 @@
 /* eslint-disable react/no-array-index-key */
-import React, { useState, useEffect } from 'react';
-import { head } from 'lodash';
-import PropTypes from 'prop-types';
-import { useSelector, shallowEqual } from 'react-redux';
-import { Grid, Select, SelectOption, SelectVariant } from '@patternfly/react-core';
+import React, { useState } from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { TableVariant, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
+import PropTypes from 'prop-types';
+import {
+  shallowEqual,
+  useSelector,
+} from 'react-redux';
+import {
+  Grid,
+  Select,
+  SelectOption,
+  SelectVariant,
+} from '@patternfly/react-core';
+import {
+  TableVariant,
+  Tbody,
+  Td,
+  Th,
+  Thead,
+  Tr,
+} from '@patternfly/react-table';
+import { useUrlParams } from '../../../../../components/Table/TableHooks';
 import TableWrapper from '../../../../../components/Table/TableWrapper';
 import { TableType } from './ContentViewVersionDetailConfig';
 
-const ContentViewVersionDetailsTable = ({ tableConfig, repositories }) => {
-  const ALL_REPOSITORIES = __('All Repositories');
-  const [searchQuery, updateSearchQuery] = useState('');
-  const [open, setOpen] = useState(false);
-  const [selected, setSelected] = useState(0);
-  const [selectedList, setSelectedList] = useState([]);
-  const {
+const ContentViewVersionDetailsTable = ({
+  tableConfig: {
     name,
     repoType,
     responseSelector,
@@ -24,33 +34,35 @@ const ContentViewVersionDetailsTable = ({ tableConfig, repositories }) => {
     fetchItems,
     columnHeaders,
     disableSearch,
-  } = tableConfig;
+  }, repositories,
+}) => {
+  const ALL_REPOSITORIES = __('All Repositories');
+  const [searchQuery, updateSearchQuery] = useState('');
+  const [open, setOpen] = useState(false);
+  const { repository_id: urlParamId } = useUrlParams();
+
+  const relevantRepositories = repositories
+    .filter(({ content_type: contentType }) => repoType === contentType);
+
+  const selectedList = relevantRepositories.length > 1 ? [
+    {
+      id: undefined,
+      name: ALL_REPOSITORIES,
+    },
+    ...relevantRepositories] :
+    relevantRepositories;
+
+  const presetIndex = selectedList
+    .findIndex(({ library_instance_id: id }) =>
+      id === Number(urlParamId));
+  const [selected, setSelected] = useState(presetIndex ?? 0);
 
   const response = useSelector(responseSelector, shallowEqual);
   const { results, ...metadata } = response;
   const status = useSelector(statusSelector, shallowEqual);
 
-  useEffect(() => {
-    const relevantRepositories = repositories
-      .filter(({ content_type: contentType }) => repoType === contentType);
-
-    switch (relevantRepositories.length) {
-      case 1:
-        setSelected(head(relevantRepositories));
-        setSelectedList([...relevantRepositories]);
-        break;
-      default:
-        setSelected(0);
-        setSelectedList([{
-          id: undefined,
-          name: ALL_REPOSITORIES,
-        }, ...relevantRepositories]);
-        break;
-    }
-  }, [repositories, ALL_REPOSITORIES, repoType]);
-
   const fetchItemsWithRepositoryId = (params) => {
-    if (selectedList.length === 1) return fetchItems(params);
+    if (selectedList?.length === 1) return fetchItems(params);
     return fetchItems({ repository_id: selectedList[selected]?.id, ...params });
   };
 

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/ContentViewVersionRepositoryCell.js

@@ -1,14 +1,18 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { urlBuilder } from 'foremanReact/common/urlHelpers';
-import { isEmpty } from 'lodash';
+import {
+  camelCase,
+  isEmpty,
+} from 'lodash';
+import PropTypes from 'prop-types';
+import { Link } from 'react-router-dom';
 import {
   Grid,
   GridItem,
 } from '@patternfly/react-core';
-import InactiveText from '../../../components/InactiveText';
 import ContentConfig from '../../../../Content/ContentConfig';
+import InactiveText from '../../../components/InactiveText';
 
 const ContentViewVersionRepositoryCell = ({
   data: {
@@ -18,49 +22,45 @@ const ContentViewVersionRepositoryCell = ({
   },
 }) => {
   const CONTENT_COUNTS = {
-    ansible_collection: {
-      name: __('Ansible collections'),
-      url: `ansible_collections?repositoryId=${libraryInstanceId}`,
+    rpm: {
+      name: __('RPM packages'),
+      to: `rpmPackages?repository_id=${libraryInstanceId}`,
+    },
+    module_stream: {
+      name: __('Module streams'),
+      to: `moduleStreams?repository_id=${libraryInstanceId}`,
+    },
+    erratum: {
+      name: __('Errata'),
+      to: `errata?repository_id=${libraryInstanceId}`,
     },
     deb: {
       name: __('Deb packages'),
-      url: `debs?repositoryId=${libraryInstanceId}`,
+      to: `debPackages?repository_id=${libraryInstanceId}`,
+    },
+    ansible_collection: {
+      name: __('Ansible collections'),
+      to: `ansibleCollections?repository_id=${libraryInstanceId}`,
     },
     docker_manifest: {
       name: __('Container manifests'),
-      url: `products/${id}/repositories/${libraryInstanceId}/content/content/docker_manifests`,
+      url: `products/${id}/repositories/${libraryInstanceId}/content/docker_manifests`,
     },
     docker_manifest_list: {
       name: __('Container manifest lists'),
-      url: `products/${id}/repositories/${libraryInstanceId}/content/content/docker_manifest_lists`,
+      url: `products/${id}/repositories/${libraryInstanceId}/content/docker_manifest_lists`,
     },
     docker_tag: {
       name: __('Container image tags'),
-      url: `docker_tags?repositoryId=${libraryInstanceId}`,
-    },
-    erratum: {
-      name: __('Errata'),
-      url: `errata?repositoryId=${libraryInstanceId}`,
+      to: `dockerTags?repository_id=${libraryInstanceId}`,
     },
     file: {
       name: __('Files'),
-      url: `files?repositoryId=${libraryInstanceId}`,
-    },
-    module_stream: {
-      name: __('Module streams'),
-      url: `products/${id}/repositories/${libraryInstanceId}/content/module_streams`,
-    },
-    package: {
-      name: __('Packages'),
-      url: `products/${id}/repositories/${libraryInstanceId}/content/packages`,
+      to: `files?repository_id=${libraryInstanceId}`,
     },
     package_group: {
       name: __('Package groups'),
-      url: `products/${id}/repositories/${libraryInstanceId}/content/package_groups`,
-    },
-    rpm: {
-      name: __('Rpm packages'),
-      url: `packages?repositoryId=${libraryInstanceId}`,
+      to: `rpmPackageGroups?repository_id=${libraryInstanceId}`,
     },
     srpm: {
       name: __('Source RPMs'),
@@ -70,40 +70,57 @@ const ContentViewVersionRepositoryCell = ({
   ContentConfig.forEach((type) => {
     CONTENT_COUNTS[type.names.singularLabel] = {
       name: type.names.pluralLowercase,
-      url: `products/${id}/repositories/${libraryInstanceId}/content/${type.names.pluralLabel}`,
+      to: `${camelCase(type.names.pluralLabel)}?repository_id=${libraryInstanceId}`,
     };
   });
 
   const getContentSpan = (num) => {
     switch (true) {
-      case num < 4:
-        return 12;
-      case num > 4 && num < 9:
-        return 6;
-      case num > 9:
-        return 4;
-      default:
-        return 12;
+    case num < 4:
+      return 12;
+    case num > 4 && num < 9:
+      return 6;
+    case num > 9:
+      return 4;
+    default:
+      return 12;
+    }
+  };
+
+  const CountComponent = ({ countKey }) => {
+    const { to, url, name } = CONTENT_COUNTS[countKey];
+    const count = ContentCounts[countKey];
+    switch (true) {
+    case !!url:
+      return (
+        <a href={urlBuilder(url, '')}>
+          {count} {name}
+        </a>);
+    case !!to:
+      return (
+        <Link to={to}>
+          {count} {name}
+        </Link>);
+    default:
+      return `${count} ${name} `;
     }
   };
 
+  CountComponent.propTypes = {
+    countKey: PropTypes.string.isRequired,
+  };
+
   const contentCountArray = Object.keys(CONTENT_COUNTS);
   const contentCountToShow = contentCountArray.filter(key => !!ContentCounts[key]);
   const contentSpan = getContentSpan(contentCountToShow.length);
+
   return (
     <Grid>
       {!isEmpty(contentCountToShow) ?
-        contentCountToShow.map((countKey) => {
-          const { url = undefined, name } = CONTENT_COUNTS[countKey];
-          const count = ContentCounts[countKey];
-          return (
-            <GridItem key={countKey} span={contentSpan}>
-              {url ?
-                <a href={urlBuilder(url, '')}>
-                  {count} {name}
-                </a> : `${count} ${name} `}
-            </GridItem>);
-        }) : <InactiveText text={__('N/A')} />
+        contentCountToShow.map(countKey => (
+          <GridItem key={countKey} span={contentSpan}>
+            <CountComponent countKey={countKey} />
+          </GridItem>)) : <InactiveText text={__('N/A')} />
       }
     </Grid >
   );

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.test.js

@@ -176,7 +176,7 @@ const testConfig = [
       last(ContentViewVersionAnsibleCollectionsData.results).checksum],
   },
   {
-    name: 'Docker Tags',
+    name: 'Container tags',
     countKey: 'docker_tag_count',
     autoCompleteUrl: '/docker_tags/auto_complete_search',
     dataUrl: api.getApiUrl('/docker_tags'),

data/webpack/scenes/ContentViews/Publish/CVPublishFinish.js

@@ -136,8 +136,8 @@ const CVPublishFinish = ({
             <Bullseye>
               <Button
                 onClick={() => {
-                handleEndTask({ taskComplete: false });
-              }}
+                  handleEndTask({ taskComplete: false });
+                }}
                 variant="primary"
                 aria-label="publish_content_view"
               >

data/webpack/scenes/ContentViews/Table/ContentViewsTable.js

@@ -166,10 +166,10 @@ const ContentViewTable = () => {
 
   const indexToSortVariable = (key) => {
     switch (key) {
-      case 2:
-        return 'name';
-      default:
-        return undefined;
+    case 2:
+      return 'name';
+    default:
+      return undefined;
     }
   };
 

data/webpack/scenes/ContentViews/components/EnvironmentLabels.js

@@ -5,24 +5,24 @@ const EnvironmentLabels = (environments) => {
   const { environments: singleEnvironment } = environments || {};
   const { name } = singleEnvironment || {};
   switch (environments) {
-    case Array:
-      return environments.map(env => (
-        <React.Fragment key={env.id} style={{ marginBottom: '5px' }}>
-          <Label
-            color="purple"
-            isTruncated
-          >{env.name}
-          </Label>
-        </React.Fragment>
-      ));
-    default:
-      return (
-        <React.Fragment>
-          <Label color="purple" isTruncated>
-            {name}
-          </Label>
-        </React.Fragment>
-      );
+  case Array:
+    return environments.map(env => (
+      <React.Fragment key={env.id} style={{ marginBottom: '5px' }}>
+        <Label
+          color="purple"
+          isTruncated
+        >{env.name}
+        </Label>
+      </React.Fragment>
+    ));
+  default:
+    return (
+      <React.Fragment>
+        <Label color="purple" isTruncated>
+          {name}
+        </Label>
+      </React.Fragment>
+    );
   }
 };