katello 4.3.0.rc1 → 4.3.0.rc2

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

@@ -62,7 +62,7 @@ const ContentViewDeleteWizard =
 
     const environmentSelectionStep = {
       id: 1,
-      name: __('Remove from environments'),
+      name: __('Remove versions from environments'),
       component: <CVDeleteEnvironmentSelection />,
     };
     const affectedHostsStep = {
@@ -78,7 +78,7 @@ const ContentViewDeleteWizard =
     };
     const reviewStep = {
       id: 4,
-      name: __('Review'),
+      name: __('Review details'),
       component: <CVDeletionReview />,
       canJumpTo: canReview,
       nextButtonText: __('Delete'),
@@ -135,7 +135,7 @@ const ContentViewDeleteWizard =
         setSelectedCVNameForHosts,
         affectedActivationKeys,
         affectedHosts,
-        }}
+      }}
       >
         <Wizard
           title={__('Delete content view')}
@@ -143,9 +143,9 @@ const ContentViewDeleteWizard =
           steps={steps}
           startAtStep={currentStep}
           onClose={() => {
-              setIsOpen(false);
-              setCurrentStep(0);
-            }}
+            setIsOpen(false);
+            setCurrentStep(0);
+          }}
           isOpen={show}
         />
       </CVDeleteContext.Provider>

data/webpack/scenes/ContentViews/Delete/Steps/CVDeleteEnvironmentsSelection.js

@@ -9,6 +9,7 @@ import { pluralize } from '../../../../utils/helpers';
 import Loading from '../../../../components/Loading';
 import './CVEnvironmentSelectionForm.scss';
 import InactiveText from '../../components/InactiveText';
+import WizardHeader from '../../components/WizardHeader';
 
 const CVDeleteEnvironmentSelection = () => {
   const {
@@ -35,25 +36,26 @@ const CVDeleteEnvironmentSelection = () => {
 
   return (
     <>
-      <h2>{__('Remove versions from environments')}</h2>
-      {!resolved && <Loading loadingText={__('Loading versions')} />}
-      {resolved &&
-        <>
+      <WizardHeader
+        title={__('Remove versions from environments')}
+        description={resolved &&
           <Flex>
-            <FlexItem><ExclamationTriangleIcon /></FlexItem>
+            <FlexItem style={{ marginRight: '8px' }}><ExclamationTriangleIcon /></FlexItem>
             {versionCount ?
-              (
-                <FlexItem style={{ marginBottom: '0.5em' }}>
-                  {__(`${pluralize(versionCount, 'content view version')} in the environments below will be removed when content view is deleted`)}
-                </FlexItem>
-              ) :
-              (
-                <FlexItem style={{ marginBottom: '0.5em' }}>
-                  {__('This content view does not have any versions associated.')}
-                </FlexItem>
-              )
+              <FlexItem>
+                {__(`${pluralize(versionCount, 'content view version')} in the environments below will be removed when content view is deleted`)}
+              </FlexItem>
+              :
+              <FlexItem>
+                {__('This content view does not have any versions associated.')}
+              </FlexItem>
             }
-          </Flex>
+          </Flex>}
+      />
+      {!resolved ?
+        <Loading loadingText={__('Loading versions')} /> :
+        <>
+
           {results?.map((version, index) => (
             <ExpandableSection
               key={version.id}
@@ -72,27 +74,27 @@ const CVDeleteEnvironmentSelection = () => {
                   </Thead>
                   <Tbody>
                     {version?.environments?.map((env, rowIndex) => {
-                  const {
-                    id, name, activation_key_count: akCount, host_count: hostCount,
-                  } = env;
-                  return (
-                    <Tr key={`${name}_${id}`}>
-                      <Td
-                        key={`${name}__${id}_select`}
-                        select={{
-                          rowIndex,
-                          isSelected: true,
-                          disable: true,
-                        }}
-                      />
-                      <Td>
-                        {name}
-                      </Td>
-                      <Td>{hostCount}</Td>
-                      <Td>{akCount}</Td>
-                    </Tr>
-                  );
-                })}
+                      const {
+                        id, name, activation_key_count: akCount, host_count: hostCount,
+                      } = env;
+                      return (
+                        <Tr key={`${name}_${id}`}>
+                          <Td
+                            key={`${name}__${id}_select`}
+                            select={{
+                              rowIndex,
+                              isSelected: true,
+                              disable: true,
+                            }}
+                          />
+                          <Td>
+                            {name}
+                          </Td>
+                          <Td>{hostCount}</Td>
+                          <Td>{akCount}</Td>
+                        </Tr>
+                      );
+                    })}
                   </Tbody>
                 </TableComposable> :
                 <InactiveText text={__('This version is not promoted to any environments.')} />

data/webpack/scenes/ContentViews/Delete/Steps/CVDeletionReview.js

@@ -6,6 +6,7 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import CVDeleteContext from '../CVDeleteContext';
 import { selectCVActivationKeys, selectCVHosts } from '../../Details/ContentViewDetailSelectors';
 import { pluralize } from '../../../../utils/helpers';
+import WizardHeader from '../../components/WizardHeader';
 
 const CVDeletionReview = () => {
   const {
@@ -19,42 +20,43 @@ const CVDeletionReview = () => {
   const { results: akResponse } = activationKeysResponse || {};
   return (
     <>
-      <h2>{__('Review Details')}</h2>
-      {cvEnvironments.length ?
-        (__('This content view will be deleted along with all versions from the environments listed below. ' +
-          'Changes listed below will be effective after clicking Delete.')) :
-        (__('This content view will be deleted. Changes will be effective after clicking Delete.'))
-      }
+      <WizardHeader
+        title={__('Review details')}
+        description={cvEnvironments.length ?
+          (__('This content view will be deleted along with all versions from the environments listed below. ' +
+            'Changes listed below will be effective after clicking Delete.')) :
+          (__('This content view will be deleted. Changes will be effective after clicking Delete.'))}
+      />
       {(cvEnvironments.length !== 0) &&
-      <>
-        <h3>{__('Environments')}</h3>
-        <Flex>
-          <FlexItem><ExclamationTriangleIcon /></FlexItem>
-          <FlexItem style={{ marginBottom: '0.5em' }}>{__('All versions will be removed from these environments')}</FlexItem>
-        </Flex>
-        <Flex>
-          {cvEnvironments?.map(({ name, id }) =>
-            <FlexItem key={name}><Label isTruncated color="purple" href={`/lifecycle_environments/${id}`}>{name}</Label></FlexItem>)}
-        </Flex>
-      </>}
+        <>
+          <h3>{__('Environments')}</h3>
+          <Flex>
+            <FlexItem><ExclamationTriangleIcon /></FlexItem>
+            <FlexItem style={{ marginBottom: '0.5em' }}>{__('All versions will be removed from these environments')}</FlexItem>
+          </Flex>
+          <Flex>
+            {cvEnvironments?.map(({ name, id }) =>
+              <FlexItem key={name}><Label isTruncated color="purple" href={`/lifecycle_environments/${id}`}>{name}</Label></FlexItem>)}
+          </Flex>
+        </>}
       {affectedHosts &&
-      <>
-        <h3>{__('Content hosts')}</h3>
-        <Flex>
-          <FlexItem><ExclamationTriangleIcon /></FlexItem>
-          <FlexItem><p>{__(`${pluralize(hostResponse.length, 'host')} will be moved to content view ${selectedCVNameForHosts} in `)}</p></FlexItem>
-          <FlexItem><Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForHost[0].id}`}>{selectedEnvForHost[0].name}</Label></FlexItem>
-        </Flex>
-      </>}
+        <>
+          <h3>{__('Content hosts')}</h3>
+          <Flex>
+            <FlexItem><ExclamationTriangleIcon /></FlexItem>
+            <FlexItem><p>{__(`${pluralize(hostResponse.length, 'host')} will be moved to content view ${selectedCVNameForHosts} in `)}</p></FlexItem>
+            <FlexItem><Label isTruncated color="purple" href={`/lifecycle_environments/${selectedEnvForHost[0].id}`}>{selectedEnvForHost[0].name}</Label></FlexItem>
+          </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/Delete/__tests__/contentViewDelete.test.js

@@ -75,7 +75,9 @@ test('Can call API for CVs and show Delete Wizard for the row', async (done) =>
     .query(true)
     .reply(200, cvDetailsData);
 
-  const { getByText, getAllByLabelText, queryByText } =
+  const {
+    getAllByText, getByText, getAllByLabelText, queryByText,
+  } =
     renderWithRedux(<ContentViewsPage />, renderOptions);
   expect(queryByText(firstCV.name)).toBeNull();
   // Assert that the CV name is now showing on the screen, but wait for it to appear.
@@ -84,7 +86,7 @@ test('Can call API for CVs and show Delete Wizard for the row', async (done) =>
   fireEvent.click(getAllByLabelText('Actions')[0]);
   expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
   fireEvent.click(getByText('Delete'));
-  await patientlyWaitFor(() => expect(queryByText('Remove versions from environments')).toBeInTheDocument());
+  await patientlyWaitFor(() => expect(getAllByText('Remove versions from environments')[1]).toBeInTheDocument());
 
   assertNockRequest(scope);
   assertNockRequest(scopeBookmark);
@@ -132,7 +134,7 @@ test('Can open Delete wizard and delete CV with all steps', async (done) => {
     system_environment_id: 9,
     key_content_view_id: 2,
     key_environment_id: 9,
-    id: '20',
+    id: 20,
   };
 
   const cvDeleteScope = nockInstance
@@ -166,7 +168,7 @@ test('Can open Delete wizard and delete CV with all steps', async (done) => {
   expect(getAllByLabelText('Actions')[0]).toHaveAttribute('aria-expanded', 'true');
   fireEvent.click(getByText('Delete'));
   await patientlyWaitFor(() => {
-    expect(queryByText('Remove versions from environments')).toBeInTheDocument();
+    expect(getAllByText('Remove versions from environments')[1]).toBeInTheDocument();
     expect(queryByText('Version 1.0')).toBeInTheDocument();
   });
   fireEvent.click(getByText('Next'));
@@ -210,7 +212,7 @@ test('Can open Delete wizard and delete CV with all steps', async (done) => {
   // Move to Review
   fireEvent.click(getByText('Next'));
   await patientlyWaitFor(() => {
-    expect(getByText('Review Details')).toBeInTheDocument();
+    expect(getAllByText('Review details')[1]).toBeInTheDocument();
     expect(getByText('Environments')).toBeInTheDocument();
     expect(getByText('Content hosts')).toBeInTheDocument();
     expect(getByText('1 host will be moved to content view cv2 in')).toBeInTheDocument();

data/webpack/scenes/ContentViews/Delete/__tests__/cvVersionsData.fixtures.json

@@ -246,7 +246,6 @@
       "srpm_count": 0,
       "module_stream_count": 14,
       "package_count": 22,
-      "ostree_branch_count": null,
       "component_view_count": 0,
       "python_repository_count": 1,
       "deb_repository_count": 0,
@@ -517,8 +516,7 @@
       "srpm_count": 0,
       "module_stream_count": 14,
       "package_count": 22,
-      "ostree_branch_count": null,
-      "component_view_count": 0,
+           "component_view_count": 0,
       "python_repository_count": 1,
       "deb_repository_count": 1,
       "file_repository_count": 1,
@@ -680,7 +678,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 0,
-      "ostree_branch_count": null,
       "component_view_count": 0,
       "python_repository_count": 0,
       "deb_repository_count": 0,
@@ -843,7 +840,6 @@
       "srpm_count": 0,
       "module_stream_count": 0,
       "package_count": 0,
-      "ostree_branch_count": null,
       "component_view_count": 0,
       "python_repository_count": 0,
       "deb_repository_count": 0,
@@ -862,4 +858,4 @@
       }
     }
   ]
-}
+}

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

@@ -1,20 +1,19 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { Label, Flex, FlexItem } from '@patternfly/react-core';
+import { Label } from '@patternfly/react-core';
+
+const ComponentEnvironments = ({ environments }) => environments.map((env, index) => (
+  <Label
+    key={env.id}
+    style={{ margin: `4px 0 4px ${index > 0 ? '4px' : '0'}` }}
+    color="purple"
+    href={`/lifecycle_environments/${env.id}`}
+    isTruncated
+  >
+    {`${env.name}`}
+  </Label>
+));
 
-const ComponentEnvironments = ({ environments }) => {
-  const envList = environments.map(env =>
-    (
-      <FlexItem key={env.id} style={{ marginTop: '0.25em', marginBottom: '0.25em' }}>
-        <Label color="purple" href={`/lifecycle_environments/${env.id}`} isTruncated>{`${env.name}`}</Label>
-      </FlexItem>
-    ));
-  return (
-    <Flex grow={{ default: 'grow' }} spaceItems={{ default: 'spaceItemsSm' }}>
-      {envList}
-    </Flex>
-  );
-};
 
 ComponentEnvironments.propTypes = {
   environments: PropTypes.instanceOf(Array),

data/webpack/scenes/ContentViews/Details/ContentViewDetails.js

@@ -62,17 +62,26 @@ export default () => {
   return (
     <Grid className="grid-with-margin">
       <DetailsContainer cvId={cvId}>
-        <React.Fragment>
+        <>
           <CVBreadCrumb />
-          <GridItem xl={8} lg={7} sm={12} >
-            <Flex>
+          <GridItem xl={8} lg={7} sm={12} style={{ margin: '10px 0' }}>
+            <Flex alignItems={{
+              default: 'alignItemsCenter',
+            }}
+            >
               <FlexItem>
                 <TextContent>
-                  <Text component={TextVariants.h1}>{`${name} content view`}</Text>
+                  <Text component={TextVariants.h1}>
+                    {name} {__('content view')}
+                  </Text>
                 </TextContent>
               </FlexItem>
-              <FlexItem spacer={{ default: 'spacerXl' }}>
-                <Text component={TextVariants.h1}><ContentViewIcon composite={composite} /></Text>
+              <FlexItem>
+                <TextContent>
+                  <Text component={TextVariants.h2}>
+                    <ContentViewIcon composite={composite} />
+                  </Text>
+                </TextContent>
               </FlexItem>
             </Flex>
           </GridItem>
@@ -110,8 +119,8 @@ export default () => {
           <GridItem span={12}>
             <RoutedTabs tabs={tabs} defaultTabIndex={1} />
           </GridItem>
-        </React.Fragment>
-      </DetailsContainer>
-    </Grid>
+        </ >
+      </DetailsContainer >
+    </Grid >
   );
 };

data/webpack/scenes/ContentViews/Details/ContentViewInfo.js

@@ -70,8 +70,9 @@ const ContentViewInfo = ({ cvId, details }) => {
         </TextListItem>
         <TextListItem component={TextListItemVariants.dd} className="foreman-spaced-list">
           <Flex>
-            <FlexItem spacer={{ default: 'spacerXs' }}><ContentViewIcon composite={composite} /></FlexItem>
-            <FlexItem>{composite ? 'Composite' : 'Component'}</FlexItem>
+            <FlexItem spacer={{ default: 'spacerXs' }}>
+              <ContentViewIcon composite={composite} description={composite ? __('Composite') : __('Component')} />
+            </FlexItem>
           </Flex>
         </TextListItem>
         <ActionableDetail

data/webpack/scenes/ContentViews/Details/Filters/Add/__tests__/cvFilterCreateResult.fixtures.json

@@ -76,7 +76,6 @@
           "name": "test1"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 8,
@@ -121,4 +120,4 @@
   "repositories": [],
   "type": "package_group",
   "rules": []
-}
+}

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

@@ -83,7 +83,7 @@ test('Can show filter details and package groups on page load', async (done) =>
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(cvPackageFilterRulesScope, done);
-  await act(() => Promise.resolve());
+  act(done);
 });
 
 test('Can search for package rules in package filter details', async (done) => {

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewErrataByDateDetails.fixtures.json

@@ -141,7 +141,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 8,
@@ -161,7 +160,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 8,
@@ -181,7 +179,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 22,
@@ -201,7 +198,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 1,
           "docker_tag": 1,
           "rpm": 0,
@@ -221,7 +217,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 0,
@@ -241,7 +236,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 0,
@@ -261,7 +255,6 @@
           "name": "test_all_types"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 0,
@@ -356,4 +349,4 @@
       "updated_at": "2021-10-06 09:50:25 -0400"
     }
   ]
-}
+}

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetail.fixtures.json

@@ -41,7 +41,6 @@
                "name": "prod1"
             },
             "content_counts": {
-               "ostree_branch": 0,
                "docker_manifest": 0,
                "docker_tag": 0,
                "rpm": 32,
@@ -86,4 +85,4 @@
          "updated_at": "2021-02-23 20:57:19 -0500"
       }
    ]
-}
+}

data/webpack/scenes/ContentViews/Details/Filters/__tests__/contentViewFilterDetails.test.js

@@ -44,11 +44,6 @@ afterEach(() => {
   nock.cleanAll();
 });
 
-jest.mock('../../../../../utils/useDebounce', () => ({
-  __esModule: true,
-  default: value => value,
-}));
-
 test('Can show filter details and package groups on page load', async (done) => {
   const { name: cvFilterName } = cvFilterDetails;
   const cvFilterScope = nockInstance
@@ -64,7 +59,6 @@ test('Can show filter details and package groups on page load', async (done) =>
     .query(true)
     .reply(200, allPackageGroups);
   const autocompleteScope = mockAutocomplete(nockInstance, autocompleteUrl);
-
   const { getByText, queryByText } =
     renderWithRedux(withCVRoute(<ContentViewFilterDetails
       cvId={1}
@@ -77,11 +71,12 @@ test('Can show filter details and package groups on page load', async (done) =>
   await patientlyWaitFor(() => {
     expect(getByText(cvFilterName)).toBeInTheDocument();
   });
-  await act(() => Promise.resolve());
+
   assertNockRequest(autocompleteScope);
   assertNockRequest(cvFilterScope);
   assertNockRequest(cvFiltersScope);
   assertNockRequest(packageGroupsScope, done);
+  act(done);
 });
 
 test('Can search for package groups in package group filter', async (done) => {
@@ -137,5 +132,5 @@ test('Can search for package groups in package group filter', async (done) => {
   assertNockRequest(packageGroupsScope);
   assertNockRequest(withSearchScope);
   assertNockRequest(packageGroupSearchScope, done);
-  await act(() => Promise.resolve());
+  act(done);
 });

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvAllRepos.fixtures.json

@@ -62,7 +62,6 @@
       },
       "content_label": "Default_Organization_yums_test",
       "content_counts": {
-        "ostree_branch": 0,
         "docker_manifest": 0,
         "docker_manifest_list": 0,
         "docker_tag": 0,
@@ -130,7 +129,6 @@
       },
       "content_label": "Default_Organization_test_testYums",
       "content_counts": {
-        "ostree_branch": 0,
         "docker_manifest": 0,
         "docker_manifest_list": 0,
         "docker_tag": 0,

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvErratumFilterDetails.fixtures.json

@@ -41,7 +41,6 @@
                  "name": "prod1"
               },
               "content_counts": {
-                 "ostree_branch": 0,
                  "docker_manifest": 0,
                  "docker_tag": 0,
                  "rpm": 32,
@@ -86,4 +85,4 @@
           "updated_at": "2013-01-27"
        }
     ]
- }
+ }

data/webpack/scenes/ContentViews/Details/Filters/__tests__/cvFilterDetailModuleAffectedRepos.fixtures.json

@@ -75,7 +75,6 @@
           "name": "yums"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 22,
@@ -95,7 +94,6 @@
           "name": "test"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 8,
@@ -115,7 +113,6 @@
           "name": "test"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 1,
           "docker_tag": 1,
           "rpm": 0,
@@ -135,7 +132,6 @@
           "name": "test"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 0,
@@ -155,7 +151,6 @@
           "name": "test"
         },
         "content_counts": {
-          "ostree_branch": 0,
           "docker_manifest": 0,
           "docker_tag": 0,
           "rpm": 0,
@@ -268,7 +263,6 @@
       },
       "content_label": "Default_Organization_test_testYums",
       "content_counts": {
-        "ostree_branch": 0,
         "docker_manifest": 0,
         "docker_manifest_list": 0,
         "docker_tag": 0,
@@ -336,7 +330,6 @@
       },
       "content_label": "Default_Organization_yums_test",
       "content_counts": {
-        "ostree_branch": 0,
         "docker_manifest": 0,
         "docker_manifest_list": 0,
         "docker_tag": 0,
@@ -380,4 +373,4 @@
          "updated_at": "2021-09-07 12:51:46 -0400"
        }
      ]
-}
+}