katello 4.3.0.rc1 → 4.3.0.rc2

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

@@ -1,13 +1,15 @@
-import React, { useContext } from 'react';
+import React, { useContext, useState } from 'react';
 import { useSelector } from 'react-redux';
-import { Alert, Flex, FlexItem, Label } from '@patternfly/react-core';
+import { Alert, Flex, FlexItem, Label, AlertActionCloseButton } from '@patternfly/react-core';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { selectCVActivationKeys, selectCVHosts } from '../../../ContentViewDetailSelectors';
 import DeleteContext from '../DeleteContext';
 import { pluralize } from '../../../../../../utils/helpers';
+import WizardHeader from '../../../../components/WizardHeader';
 
 const CVVersionRemoveReview = () => {
+  const [alertDismissed, setAlertDismissed] = useState(false);
   const {
     cvId, versionNameToRemove, versionEnvironments, selectedEnvSet,
     selectedEnvForAK, selectedCVNameForAK, selectedCVNameForHosts,
@@ -20,16 +22,21 @@ const CVVersionRemoveReview = () => {
   const selectedEnv = versionEnvironments.filter(env => selectedEnvSet.has(env.id));
   const versionDeleteInfo = __(`Version ${versionNameToRemove} will be deleted from all environments. It will no longer be available for promotion.`);
   const removalNotice = __(`Version ${versionNameToRemove} will be removed from the environments listed below, and will remain available for later promotion. ` +
-      'Changes listed below will be effective after clicking Remove.');
+    'Changes listed below will be effective after clicking Remove.');
 
   return (
     <>
-      <h2>{__('Review Details')}</h2>
-      {(deleteFlow || removeDeletionFlow) &&
-      <Alert variant="warning" isInline title={__('Warning')}>
-        <p style={{ marginBottom: '0.5em' }}>{versionDeleteInfo}</p>
-      </Alert>}
-      {!(deleteFlow || removeDeletionFlow) && removalNotice}
+      <WizardHeader title={__('Review Details')} />
+      {!alertDismissed && (deleteFlow || removeDeletionFlow) &&
+        <Alert
+          variant="warning"
+          isInline
+          title={__('Warning')}
+          actionClose={<AlertActionCloseButton onClose={() => setAlertDismissed(true)} />}
+        >
+          <p style={{ marginBottom: '0.5em' }}>{versionDeleteInfo}</p>
+        </Alert>}
+      {!(deleteFlow || removeDeletionFlow) && <WizardHeader description={removalNotice} />}
       {(selectedEnv.length !== 0) &&
         <>
           <h3>{__('Environments')}</h3>
@@ -52,14 +59,14 @@ const CVVersionRemoveReview = () => {
           </Flex>
         </>}
       {affectedActivationKeys &&
-      <>
-        <h3>{__('Activation keys')}</h3>
-        <Flex>
-          <FlexItem><ExclamationTriangleIcon /></FlexItem>
-          <FlexItem><p>{__(`${pluralize(akResponse.length, 'activation key')} will be moved to content view ${selectedCVNameForAK} in `)}</p></FlexItem>
-          <FlexItem><Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForAK[0].id}`}>{selectedEnvForAK[0].name}</Label></FlexItem>
-        </Flex>
-      </>}
+        <>
+          <h3>{__('Activation keys')}</h3>
+          <Flex>
+            <FlexItem><ExclamationTriangleIcon /></FlexItem>
+            <FlexItem><p>{__(`${pluralize(akResponse.length, 'activation key')} will be moved to content view ${selectedCVNameForAK} in `)}</p></FlexItem>
+            <FlexItem><Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForAK[0].id}`}>{selectedEnvForAK[0].name}</Label></FlexItem>
+          </Flex>
+        </>}
     </>
   );
 };

data/webpack/scenes/ContentViews/Details/Versions/Delete/__tests__/versionsResponseData.fixtures.json

@@ -242,7 +242,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": null,
       "ansible_collection_repository_count": 0,
       "deb_repository_count": 0,
       "docker_repository_count": 0,
@@ -403,7 +402,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": null,
       "ansible_collection_repository_count": 0,
       "deb_repository_count": 0,
       "docker_repository_count": 0,
@@ -562,7 +560,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": null,
       "ansible_collection_repository_count": 0,
       "deb_repository_count": 0,
       "docker_repository_count": 0,
@@ -580,4 +577,4 @@
       }
     }
   ]
-}
+}

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

@@ -8,6 +8,7 @@ import {
   GridItem,
 } from '@patternfly/react-core';
 import InactiveText from '../../../components/InactiveText';
+import ContentConfig from '../../../../Content/ContentConfig';
 
 const ContentViewVersionRepositoryCell = ({
   data: {
@@ -49,9 +50,6 @@ const ContentViewVersionRepositoryCell = ({
       name: __('Module streams'),
       url: `products/${id}/repositories/${libraryInstanceId}/content/module_streams`,
     },
-    ostree_branch: {
-      name: __('OStree branches'),
-    },
     package: {
       name: __('Packages'),
       url: `products/${id}/repositories/${libraryInstanceId}/content/packages`,
@@ -69,6 +67,13 @@ const ContentViewVersionRepositoryCell = ({
     },
   };
 
+  ContentConfig().forEach((type) => {
+    CONTENT_COUNTS[type.names.singularLabel] = {
+      name: type.names.pluralLowercase,
+      url: `products/${id}/repositories/${libraryInstanceId}/content/${type.names.pluralLabel}`,
+    };
+  });
+
   const getContentSpan = (num) => {
     switch (true) {
       case num < 4:

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionComponent.fixtures.json

@@ -242,7 +242,6 @@
             "srpm_count": 0,
             "module_stream_count": 14,
             "package_count": 22,
-            "ostree_branch_count": null,
             "component_view_count": 0,
             "ansible_collection_repository_count": 1,
             "deb_repository_count": 0,
@@ -445,7 +444,6 @@
             "srpm_count": 0,
             "module_stream_count": 0,
             "package_count": 0,
-            "ostree_branch_count": null,
             "component_view_count": 0,
             "ansible_collection_repository_count": 0,
             "deb_repository_count": 1,
@@ -732,7 +730,6 @@
             "srpm_count": 0,
             "module_stream_count": 0,
             "package_count": 0,
-            "ostree_branch_count": null,
             "component_view_count": 0,
             "ansible_collection_repository_count": 0,
             "deb_repository_count": 0,
@@ -750,4 +747,4 @@
             }
         }
     ]
-}
+}

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetails.fixtures.json

@@ -138,7 +138,6 @@
     "srpm_count": 0,
     "module_stream_count": 0,
     "package_count": 0,
-    "ostree_branch_count": null,
     "component_view_count": 0,
     "ansible_collection_repository_count": 0,
     "deb_repository_count": 0,
@@ -155,4 +154,4 @@
     "permissions": {
         "deletable": true
     }
-}
+}

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionDetailsCounts.fixtures.json

@@ -12,7 +12,6 @@
         "srpm_count": 0,
         "module_stream_count": 14,
         "package_count": 22,
-        "ostree_branch_count": null,
         "component_view_count": 3,
         "ansible_collection_repository_count": 1,
         "deb_repository_count": 1,
@@ -70,4 +69,4 @@
                 "library_instance_id": 22
             }
         ]
-    }
+    }

data/webpack/scenes/ContentViews/Details/Versions/VersionDetails/__tests__/ContentViewVersionRepositories.fixtures.json

@@ -52,7 +52,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Ansible_Collection_uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -110,7 +109,6 @@
             },
             "content_label": "rhel-7-server-ansible-tower-3.3-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -168,7 +166,6 @@
             },
             "content_label": "rhel-7-server-ansible-tower-3.4-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -226,7 +223,6 @@
             },
             "content_label": "rhel-7-server-ansible-tower-3.5-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -284,7 +280,6 @@
             },
             "content_label": "rhel-7-server-ansible-tower-3.6-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -342,7 +337,6 @@
             },
             "content_label": "rhel-7-server-ansible-tower-3.8-textonly-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -400,7 +394,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Deb_distro_Uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -458,7 +451,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Docker_Repo_Dos",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 407,
                 "docker_manifest_list": 76,
                 "docker_tag": 162,
@@ -516,7 +508,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Docker_Repo_Uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 1,
                 "docker_manifest_list": 0,
                 "docker_tag": 1,
@@ -574,7 +565,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_File_Repo_Uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -632,7 +622,6 @@
             },
             "content_label": "a-mq-clients-1-for-rhel-5-server-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -690,7 +679,6 @@
             },
             "content_label": "a-mq-clients-1-for-rhel-6-server-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -748,7 +736,6 @@
             },
             "content_label": "a-mq-clients-1-for-rhel-6-server-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -806,7 +793,6 @@
             },
             "content_label": "a-mq-clients-1-for-rhel-7-server-rpms",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -864,7 +850,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Module_Stream_Uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -922,7 +907,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Zoo_Repo_Dos",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -980,7 +964,6 @@
             },
             "content_label": "Default_Organization_Nemero_Uno_Producto_Zoo_Repo_Uno",
             "content_counts": {
-                "ostree_branch": 0,
                 "docker_manifest": 0,
                 "docker_manifest_list": 0,
                 "docker_tag": 0,
@@ -997,4 +980,4 @@
             "last_sync_words": null
         }
     ]
-}
+}

data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.fixtures.json

@@ -288,7 +288,8 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": 0,
+      "ostree_ref_count": 2,
+      "python_package_count": 80,
       "errata_counts": {
         "security": 5,
         "bugfix": 3,
@@ -442,7 +443,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": 0,
       "errata_counts": {
         "security": null,
         "bugfix": 0,
@@ -582,7 +582,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": 0,
       "errata_counts": {
         "security": null,
         "bugfix": 0,
@@ -713,7 +712,8 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 0,
-      "ostree_branch_count": 0,
+      "ostree_ref_count": 0,
+      "python_package_count": 0,
       "errata_counts": {
         "security": null,
         "bugfix": 0,
@@ -725,4 +725,4 @@
       }
     }
   ]
-}
+}

data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersions.test.js

@@ -152,6 +152,7 @@ test('Can show additional content and link to list page', async () => {
       .toHaveAttribute('href', '/content_views/5#/versions/11/files/');
     expect(getByText('1 Deb packages').closest('a'))
       .toHaveAttribute('href', '/versions/11/debPackages');
+    expect(getByText(/80 Python packages\s*2 OSTree refs/)).toBeInTheDocument();
   });
 
   assertNockRequest(autocompleteScope);

data/webpack/scenes/ContentViews/Details/Versions/__tests__/contentViewVersionsWithTask.fixtures.json

@@ -550,7 +550,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 0,
-      "ostree_branch_count": null,
       "errata_counts": {
         "security": null,
         "bugfix": 0,
@@ -698,7 +697,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 8,
-      "ostree_branch_count": null,
       "errata_counts": {
         "security": null,
         "bugfix": 0,
@@ -710,4 +708,4 @@
       }
     }
   ]
-}
+}

data/webpack/scenes/ContentViews/Details/contentViewInfo.scss

@@ -1,7 +1,3 @@
-.foreman-spaced-icon {
-  margin: 0px 10px;
-}
-
 // Keeps spacing in the list even despite contents
 .foreman-spaced-list {
   min-height: 40px;

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

@@ -1,80 +1,93 @@
-import React from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
-import { Alert, Switch, Flex, FlexItem, TextContent, Text, TextVariants, Form, FormGroup, TextArea } from '@patternfly/react-core';
+import {
+  Alert, Switch, TextContent, Text,
+  TextVariants, Form, FormGroup, TextArea, AlertActionCloseButton,
+} from '@patternfly/react-core';
 import { EnterpriseIcon, RegistryIcon } from '@patternfly/react-icons';
 import EnvironmentPaths from '../components/EnvironmentPaths/EnvironmentPaths';
 import ComponentEnvironments from '../Details/ComponentContentViews/ComponentEnvironments';
 import './cvPublishForm.scss';
+import WizardHeader from '../components/WizardHeader';
 
 const CVPublishForm = ({
   description,
   setDescription,
-  details,
+  details: {
+    name, composite, next_version: nextVersion,
+  },
   userCheckedItems,
   setUserCheckedItems,
   promote,
   setPromote,
   forcePromote,
 }) => {
-  const {
-    name, composite, next_version: nextVersion,
-  } = details;
+  const [alertDismissed, setAlertDismissed] = useState(false);
 
+  const checkPromote = (checked) => {
+    if (!checked) {
+      setUserCheckedItems([]);
+    }
+    setPromote(checked);
+  };
   return (
     <>
-      <>
-        <TextContent>
-          <Text style={{ marginBottom: '1em' }} component={TextVariants.h1}>{__('Publish')}</Text>
-        </TextContent>
-        <Flex flex={{ default: 'inlineFlex' }}>
-          <FlexItem>{__('A new version of ')}<b>{composite ? <RegistryIcon /> : <EnterpriseIcon />} {name}</b>
+      <WizardHeader
+        title={__('Publish')}
+        description={
+          <>{__('A new version of ')}<b>{composite ? <RegistryIcon /> : <EnterpriseIcon />} {name}</b>
             {__(' will be created and automatically promoted to the ' +
-          'Library environment. You can promote to other environments as well. ')}
-          </FlexItem>
-        </Flex>
-        <TextContent>
-          <Text style={{ marginTop: '1em', marginBottom: '1em' }} component={TextVariants.h3}>{__('Publish new version - ')}{nextVersion || '1.0'}</Text>
-        </TextContent>
-        <Form>
-          <FormGroup label="Description" fieldId="description">
-            <TextArea
-              isRequired
-              type="text"
-              id="description"
-              aria-label="input_description"
-              name="description"
-              value={description}
-              onChange={value => setDescription(value)}
-            />
-          </FormGroup>
-          <FormGroup label="Promote" fieldId="promote" style={{ marginBottom: '2em', outlineStyle: 'none' }}>
-            <Switch
-              id="promote-switch"
-              aria-label="promote-switch"
-              isChecked={promote}
-              onChange={checked => setPromote(checked)}
-            />
-          </FormGroup>
-        </Form>
-      </>
-      <>
-        {forcePromote.length > 0 && (
-        <Alert variant="info" isInline title="Force Promotion">
-          <p>{__('Selected environments are out of the environment order. ' +
-            'The recommended practice is to promote to the next environment in the path.')}
-          </p>
-          <ComponentEnvironments environments={forcePromote} />
-        </Alert>
-        )
-        }
-        {promote &&
+              'Library environment. You can promote to other environments as well. ')
+            }
+          </>}
+      />
+      <TextContent>
+        <Text component={TextVariants.h3}>{__('Publish new version - ')}{nextVersion || '1.0'}</Text>
+      </TextContent>
+      <Form>
+        <FormGroup label="Description" fieldId="description">
+          <TextArea
+            isRequired
+            type="text"
+            id="description"
+            aria-label="input_description"
+            name="description"
+            value={description}
+            onChange={setDescription}
+          />
+        </FormGroup>
+        <FormGroup label="Promote" fieldId="promote">
+          <Switch
+            id="promote-switch"
+            aria-label="promote-switch"
+            isChecked={promote}
+            onChange={checkPromote}
+          />
+        </FormGroup>
+      </Form>
+      {!alertDismissed && promote && forcePromote.length > 0 && (
+        <Alert
+          variant="info"
+          isInline
+          title={__('Force promotion')}
+          actionClose={<AlertActionCloseButton onClose={() => setAlertDismissed(true)} />}
+        >
+          <TextContent>
+            {forcePromote.length > 1 ? __('Selected environments ') : __('Selected environment ')}
+            <ComponentEnvironments environments={forcePromote} />
+            {forcePromote.length > 1 ?
+              __(' are out of the environment path order. The recommended practice is to promote the next environment in the path.') :
+              __(' is out of the environment path order. The recommended practice is to promote the next environment in the path.')
+            }
+          </TextContent>
+        </Alert>)}
+      {promote &&
         <EnvironmentPaths
           userCheckedItems={userCheckedItems}
           setUserCheckedItems={setUserCheckedItems}
         />
-        }
-      </>
+      }
     </>
   );
 };

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

@@ -1,16 +1,23 @@
 import React, { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
-import { TableComposable, Thead, Tbody, Tr, Th, Td } from '@patternfly/react-table';
+import {
+  TableComposable, Thead, Tbody, Tr, Th,
+  Td,
+} from '@patternfly/react-table';
+import { EnterpriseIcon, RegistryIcon } from '@patternfly/react-icons';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import ContentViewIcon from '../components/ContentViewIcon';
 import InactiveText from '../components/InactiveText';
 import ComponentEnvironments from '../Details/ComponentContentViews/ComponentEnvironments';
 import { selectEnvironmentPaths, selectEnvironmentPathsStatus } from '../components/EnvironmentPaths/EnvironmentPathSelectors';
+import WizardHeader from '../components/WizardHeader';
 
 const CVPublishReview = ({
-  details,
+  details: {
+    name, composite, next_version: nextVersion,
+  },
   userCheckedItems,
 }) => {
   const environmentPathResponse = useSelector(selectEnvironmentPaths);
@@ -26,33 +33,38 @@ const CVPublishReview = ({
     return [];
   }, [environmentPathResponse, environmentPathLoading, userCheckedItems]);
 
-  const {
-    name, composite, next_version: nextVersion,
-  } = details;
-
   return (
-    <TableComposable aria-label="Review Table">
-      <Thead>
-        <Tr>
-          <Th>{__('Content view')}</Th>
-          <Th>{__('Version')}</Th>
-          <Th>{__('Environments')}</Th>
-        </Tr>
-      </Thead>
-      <Tbody>
-        <Tr>
-          <Td>
-            <><ContentViewIcon composite={composite} description={name} /><InactiveText text={__('Newly published')} /></>
-          </Td>
-          <Td>
-            {__('Version')} {nextVersion}
-          </Td>
-          <Td>
-            <ComponentEnvironments environments={promotedToEnvironments} />
-          </Td>
-        </Tr>
-      </Tbody>
-    </TableComposable>
+    <>
+      <WizardHeader
+        title={__('Review details')}
+        description={
+          <>
+            {__('Review your currently selected changes for ')}<b>{composite ? <RegistryIcon /> : <EnterpriseIcon />} {name}.</b>
+          </>}
+      />
+      <TableComposable aria-label="Review Table">
+        <Thead>
+          <Tr>
+            <Th>{__('Content view name')}</Th>
+            <Th>{__('Version')}</Th>
+            <Th>{__('Environments')}</Th>
+          </Tr>
+        </Thead>
+        <Tbody>
+          <Tr>
+            <Td>
+              <><ContentViewIcon composite={composite} description={name} /><InactiveText text={__('Newly published')} /></>
+            </Td>
+            <Td>
+              {__('Version')} {nextVersion}
+            </Td>
+            <Td>
+              <ComponentEnvironments environments={promotedToEnvironments} />
+            </Td>
+          </Tr>
+        </Tbody>
+      </TableComposable>
+    </>
   );
 };