katello 4.8.4 → 4.9.0.rc1

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import {
   Button,
@@ -24,17 +24,25 @@ import getEnvironmentPaths from '../../../components/EnvironmentPaths/Environmen
 import RemoveCVVersionWizard from '../Delete/RemoveCVVersionWizard';
 import ActionableDetail from '../../../../../components/ActionableDetail';
 import BulkDeleteModal from '../BulkDelete/BulkDeleteModal';
+import NeedsPublishIcon from '../../../components/NeedsPublishIcon';
+import FiltersAppliedIcon from '../../../components/FiltersAppliedIcon';
+import { selectCVNeedsPublish } from '../../ContentViewDetailSelectors';
+import { republishCVVRepoMetadata } from '../../ContentViewDetailActions';
 
 const ContentViewVersionDetailsHeader = ({
   versionDetails,
   onEdit,
-  details: { permissions },
+  details: {
+    permissions, latest_version_id: latestVersionId, needs_publish: needsPublish, composite,
+  },
   loading,
 }) => {
   const history = useHistory();
   const {
-    version, description, environments, content_view_id: cvId, id,
+    version, description, environments, filters_applied: filtersApplied, content_view_id: cvId, id,
+    repositories,
   } = versionDetails;
+  const needsPublishLocal = useSelector(state => selectCVNeedsPublish(state));
   const dispatch = useDispatch();
   useEffect(
     () => {
@@ -47,6 +55,15 @@ const ContentViewVersionDetailsHeader = ({
   const [removingFromEnv, setRemovingFromEnv] = useState(false);
   const [currentStep, setCurrentStep] = useState(1);
   const [bulkDeleteOpen, setBulkDeleteOpen] = useState(false);
+
+  const handleRepublish = () => {
+    dispatch(republishCVVRepoMetadata({ cvId, id }));
+    setDropdownOpen(false);
+  };
+
+  const anyReposUseCompleteMirroring =
+    repositories.some(repo => repo.mirroring_policy === 'mirror_complete');
+
   const dropDownItems = [
     <DropdownItem
       ouiaId="remove"
@@ -57,6 +74,16 @@ const ContentViewVersionDetailsHeader = ({
     >
       {__('Remove from environment')}
     </DropdownItem>,
+    <DropdownItem
+      ouiaId="republish"
+      key="republish"
+      isDisabled={anyReposUseCompleteMirroring}
+      onClick={() => {
+        handleRepublish();
+      }}
+    >
+      {__('Republish repository metadata')}
+    </DropdownItem>,
     <DropdownItem
       ouiaId="delete"
       key="delete"
@@ -72,7 +99,20 @@ const ContentViewVersionDetailsHeader = ({
     <Grid className="margin-0-24">
       <GridItem sm={6} >
         <TextContent>
-          <Text ouiaId="cv-version" component={TextVariants.h2}>{__('Version ')}{version}</Text>
+          <Text ouiaId="cv-version" component={TextVariants.h2}>
+            {__('Version ')}{version}
+            {(latestVersionId === id &&
+                    (needsPublish === null || needsPublish || needsPublishLocal)) &&
+                    <NeedsPublishIcon
+                      composite={composite}
+                      determinate={needsPublish !== null || needsPublishLocal}
+                    />
+            }
+            {(filtersApplied) &&
+            <FiltersAppliedIcon />
+            }
+          </Text>
+
         </TextContent>
       </GridItem>
       <GridItem sm={6} style={{ display: 'flex' }}>
@@ -111,8 +151,10 @@ const ContentViewVersionDetailsHeader = ({
           />
         </TextContent>
         <Flex>
-          {environments?.map(({ name, id: envId }) =>
-            <FlexItem key={name}><Label isTruncated color="purple" href={`/lifecycle_environments/${envId}`}>{name}</Label></FlexItem>)}
+          {environments?.map(({ name, id: envId }) => (
+            <FlexItem key={name}>
+              <Label isTruncated color="purple" href={`/lifecycle_environments/${envId}`}>{name}</Label>
+            </FlexItem>))}
         </Flex>
       </GridItem>
       {promoting &&
@@ -157,6 +199,9 @@ ContentViewVersionDetailsHeader.propTypes = {
     version: PropTypes.string,
     environments: PropTypes.arrayOf(PropTypes.shape({})),
     description: PropTypes.string,
+    repositories: PropTypes.arrayOf(PropTypes.shape({
+      mirroring_policy: PropTypes.string,
+    })),
     content_view_id: PropTypes.oneOfType([
       PropTypes.string,
       PropTypes.number,
@@ -165,10 +210,14 @@ ContentViewVersionDetailsHeader.propTypes = {
       PropTypes.string,
       PropTypes.number,
     ]),
+    filters_applied: PropTypes.bool,
   }).isRequired,
   onEdit: PropTypes.func.isRequired,
   details: PropTypes.shape({
     permissions: PropTypes.shape({}),
+    needs_publish: PropTypes.bool,
+    composite: PropTypes.bool,
+    latest_version_id: PropTypes.number,
   }).isRequired,
   loading: PropTypes.bool.isRequired,
 };

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

@@ -256,7 +256,8 @@
             },
             "permissions": {
                 "deletable": true
-            }
+            },
+            "filters_applied": true
         },
         {
             "version": "5.0",
@@ -458,7 +459,8 @@
             },
             "permissions": {
                 "deletable": true
-            }
+            },
+            "filters_applied": true
         },
         {
             "version": "2.0",
@@ -744,7 +746,8 @@
             },
             "permissions": {
                 "deletable": true
-            }
+            },
+            "filters_applied": true
         }
     ]
 }

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

@@ -153,5 +153,6 @@
     },
     "permissions": {
         "deletable": true
-    }
+    },
+    "filters_applied": true
 }

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

@@ -298,7 +298,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "3.0",
@@ -451,7 +452,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "2.0",
@@ -590,7 +592,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "1.0",
@@ -722,7 +725,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     }
   ]
 }

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

@@ -172,7 +172,7 @@ test('Can load for empty versions', async (done) => {
 
   expect(queryByText(`Version ${firstVersion.version}`)).toBeNull();
   await patientlyWaitFor(() =>
-    expect(queryByText("You currently don't have any versions for this content view.")).toBeInTheDocument());
+    expect(queryByText('No versions yet')).toBeInTheDocument());
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope);
   act(done);

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

@@ -558,7 +558,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     },
     {
       "version": "10.0",
@@ -705,7 +706,8 @@
       },
       "permissions": {
         "deletable": true
-      }
+      },
+      "filters_applied": true
     }
   ]
 }

data/webpack/scenes/ContentViews/Details/__tests__/contentViewDetails.fixtures.json

@@ -90,6 +90,7 @@
     }
   ],
   "components": [],
+  "filtered": true,
   "content_view_components": [],
   "activation_keys": [],
   "next_version": "6.0",

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

@@ -20,7 +20,7 @@ import { selectTaskPoll, selectTaskPollStatus } from '../Details/ContentViewDeta
 import { publishContentView } from '../ContentViewsActions';
 import Loading from '../../../components/Loading';
 import EmptyStateMessage from '../../../components/Table/EmptyStateMessage';
-import { cvVersionTaskPollingKey } from '../ContentViewsConstants';
+import { CONTENT_VIEW_NEEDS_PUBLISH_RESET, cvVersionTaskPollingKey } from '../ContentViewsConstants';
 import { clearPollTaskData, startPollingTask, stopPollingTask, toastTaskFinished } from '../../Tasks/TaskActions';
 import getContentViewDetails from '../Details/ContentViewDetailActions';
 
@@ -68,6 +68,7 @@ const CVPublishFinish = ({
             setSaving(false);
           },
         ));
+        dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH_RESET });
       }, () => { setSaving(false); }));
     }
   }, [POLLING_TASK_KEY, currentStep, cvId, description, dispatch, forcePromote,
@@ -84,6 +85,7 @@ const CVPublishFinish = ({
       dispatch(clearPollTaskData(POLLING_TASK_KEY));
       dispatch(getContentViewDetails(cvId));
       dispatch(toastTaskFinished(pollResponse));
+      dispatch({ type: CONTENT_VIEW_NEEDS_PUBLISH_RESET });
       history.push(`/content_views/${cvId}#/versions/${cvvID || ''}`);
       onClose();
     }
@@ -101,7 +103,7 @@ const CVPublishFinish = ({
     <>
       <EmptyState style={{ marginTop: '10px' }} variant={EmptyStateVariant.large}>
         <EmptyStateIcon icon={InProgressIcon} />
-        <Title headingLevel="h2" size="lg">
+        <Title headingLevel="h2" size="lg" ouiaId="publish-cv-title">
           {__('Publishing content view')}
         </Title>
       </EmptyState>

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

@@ -1,4 +1,5 @@
 import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import { translate as __ } from 'foremanReact/common/I18n';
 import {
@@ -10,12 +11,13 @@ import EnvironmentPaths from '../components/EnvironmentPaths/EnvironmentPaths';
 import ComponentEnvironments from '../Details/ComponentContentViews/ComponentEnvironments';
 import './cvPublishForm.scss';
 import WizardHeader from '../components/WizardHeader';
+import { selectCVNeedsPublish } from '../Details/ContentViewDetailSelectors';
 
 const CVPublishForm = ({
   description,
   setDescription,
   details: {
-    name, composite, next_version: nextVersion,
+    name, composite, next_version: nextVersion, needs_publish: needsPublish,
   },
   userCheckedItems,
   setUserCheckedItems,
@@ -24,6 +26,8 @@ const CVPublishForm = ({
   forcePromote,
 }) => {
   const [alertDismissed, setAlertDismissed] = useState(false);
+  const [needsPublishAlertDismissed, setNeedsPublishAlertDismissed] = useState(false);
+  const needsPublishLocal = useSelector(state => selectCVNeedsPublish(state));
 
   const checkPromote = (checked) => {
     if (!checked) {
@@ -36,11 +40,33 @@ const CVPublishForm = ({
       <WizardHeader
         title={__('Publish')}
         description={
-          <>{__('A new version of ')}<b>{composite ? <RegistryIcon /> : <EnterpriseIcon />} {name}</b>
+          <>
+            {!needsPublishAlertDismissed &&
+                !(needsPublish === null || needsPublish || needsPublishLocal) &&
+                (
+                <Alert
+                  ouiaId="needs-publish-alert"
+                  variant="info"
+                  isInline
+                  title={composite ?
+                    __('No available component content view updates') :
+                    __('No available repository or filter updates')}
+                  actionClose={
+                    <AlertActionCloseButton
+                      onClose={() => setNeedsPublishAlertDismissed(true)}
+                    />
+            }
+                  style={{ marginBottom: '24px' }}
+                >
+                  <TextContent>{__('Newly published version will be the same as the previous version.')}</TextContent>
+                </Alert>)
+            }
+            {__('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. ')
             }
-          </>}
+          </>
+      }
       />
       <TextContent>
         <Text ouiaId="next-version-text" component={TextVariants.h3}>
@@ -115,6 +141,7 @@ CVPublishForm.propTypes = {
       PropTypes.number,
       PropTypes.string,
     ]).isRequired,
+    needs_publish: PropTypes.bool,
   }).isRequired,
 };
 

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

@@ -1,4 +1,6 @@
 import React, { useMemo } from 'react';
+import { Alert } from '@patternfly/react-core';
+import { Link } from 'react-router-dom';
 import { useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
 import {
@@ -16,7 +18,7 @@ import WizardHeader from '../components/WizardHeader';
 
 const CVPublishReview = ({
   details: {
-    name, composite, next_version: nextVersion,
+    id, name, composite, filtered, next_version: nextVersion,
   },
   userCheckedItems,
 }) => {
@@ -40,7 +42,17 @@ const CVPublishReview = ({
         description={
           <>
             {__('Review your currently selected changes for ')}<b>{composite ? <RegistryIcon /> : <EnterpriseIcon />} {name}.</b>
-          </>}
+            {filtered && (
+            <Alert
+              ouiaId="filters-applied-alert"
+              variant="warning"
+              isInline
+              isPlain
+              title={__('Filters will be applied to this content view version.')}
+              style={{ marginTop: '24px' }}
+            />)}
+          </>
+          }
       />
       <TableComposable ouiaId="cv-publish-review-table" aria-label="Review Table">
         <Thead>
@@ -48,6 +60,7 @@ const CVPublishReview = ({
             <Th>{__('Content view name')}</Th>
             <Th>{__('Version')}</Th>
             <Th>{__('Environments')}</Th>
+            <Th>{__('Filters')}</Th>
           </Tr>
         </Thead>
         <Tbody>
@@ -61,6 +74,10 @@ const CVPublishReview = ({
             <Td>
               <ComponentEnvironments environments={promotedToEnvironments} />
             </Td>
+            {filtered
+              ? <Td><Link to={`/content_views/${id}#/filters`} target="_blank" rel="noopener noreferrer">{__('View Filters')} </Link> </Td>
+              : <Td>-</Td>
+            }
           </Tr>
         </Tbody>
       </TableComposable>
@@ -71,8 +88,13 @@ const CVPublishReview = ({
 CVPublishReview.propTypes = {
   userCheckedItems: PropTypes.arrayOf(PropTypes.shape({})).isRequired,
   details: PropTypes.shape({
+    id: PropTypes.oneOfType([
+      PropTypes.number,
+      PropTypes.string,
+    ]).isRequired,
     name: PropTypes.string.isRequired,
     composite: PropTypes.bool.isRequired,
+    filtered: PropTypes.bool.isRequired,
     next_version: PropTypes.oneOfType([
       PropTypes.number,
       PropTypes.string,

data/webpack/scenes/ContentViews/Publish/cvPublishForm.scss

@@ -6,4 +6,8 @@
   display: flex;
   grid-gap: 16px;
   flex-direction: column;
+}
+
+.pf-c-content h4 {
+  margin-top: 0px;
 }

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

@@ -129,8 +129,8 @@ const ContentViewTable = () => {
     [apiSortParams],
   );
 
-  const emptyContentTitle = __("You currently don't have any Content views.");
-  const emptyContentBody = __('A content view can be added by using the "Create content view" button below.');
+  const emptyContentTitle = __('No content views yet');
+  const emptyContentBody = __('You currently have no content views to display');
   const emptySearchTitle = __('No matching content views found');
   const emptySearchBody = __('Try changing your search settings.');
   const showPrimaryAction = true;

data/webpack/scenes/ContentViews/__tests__/contentViewPage.test.js

@@ -40,10 +40,8 @@ test('Can call API for CVs and show on screen on page load', async (done) => {
   await patientlyWaitFor(() => {
     expect(queryByText(firstCV.name)).toBeInTheDocument();
     expect(queryAllByText('Content views')[0]).toBeInTheDocument();
-    expect(queryByText('Composite content views')).toBeInTheDocument();
   });
 
-
   assertNockRequest(autocompleteScope);
   assertNockRequest(scope, done);
 });
@@ -159,7 +157,7 @@ test('Can handle no Content Views being present', async (done) => {
   const { queryByText } = renderWithRedux(<ContentViewsPage />, renderOptions);
 
   expect(queryByText(firstCV.name)).toBeNull();
-  await patientlyWaitFor(() => expect(queryByText(/don't have any Content views/i)).toBeInTheDocument());
+  await patientlyWaitFor(() => expect(queryByText('You currently have no content views to display')).toBeInTheDocument());
   assertNockRequest(scope, done);
 });
 

data/webpack/scenes/ContentViews/__tests__/mockDetails.fixtures.json

@@ -11,5 +11,6 @@
   "composite": false,
   "next_version": "1.0",
   "id": "5",
-  "version_count": 0
+  "version_count": 0,
+  "filtered": true
 }

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

@@ -30,11 +30,12 @@ const ContentViewSelect = ({
 ContentViewSelect.propTypes = {
   headerText: PropTypes.string,
   onClear: PropTypes.func.isRequired,
-  children: PropTypes.node.isRequired,
+  children: PropTypes.node,
 };
 
 ContentViewSelect.defaultProps = {
   headerText: __('Select content view'),
+  children: [],
 };
 
 export default ContentViewSelect;

data/webpack/scenes/ContentViews/components/ContentViewSelect/ContentViewSelectOption.js

@@ -44,10 +44,10 @@ export const relevantVersionObjFromCv = (cv, env) => { // returns the entire ver
 export const relevantVersionFromCv = (cv, env) =>
     relevantVersionObjFromCv(cv, env)?.version; // returns the version text e.g. "1.0"
 
-const ContentViewSelectOption = ({ cv, env }) => (
+const ContentViewSelectOption = ({ cv, env, value }) => (
   <SelectOption
     key={cv.id}
-    value={cv.name}
+    value={value}
   >
     <Flex
       direction={{ default: 'row', sm: 'row' }}
@@ -82,6 +82,7 @@ ContentViewSelectOption.propTypes = {
   env: PropTypes.shape({
     id: PropTypes.number.isRequired,
   }).isRequired,
+  value: PropTypes.string.isRequired,
 };
 
 export default ContentViewSelectOption;

data/webpack/scenes/ContentViews/components/ContentViewSelect/helpers.js

@@ -0,0 +1,32 @@
+import { STATUS } from 'foremanReact/constants';
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export const getCVPlaceholderText = ({
+  contentSourceId = null,
+  environments = [],
+  contentViewsStatus = STATUS.PENDING,
+  cvSelectOptions = [],
+}) => {
+  if (contentSourceId === '') return __('Select a content source first');
+  if (environments.length === 0) return __('Select an environment first');
+  if (contentViewsStatus === STATUS.PENDING) return __('Loading...');
+  if (contentViewsStatus === STATUS.ERROR) return __('Error loading content views');
+  if (cvSelectOptions.length === 0) return __('No content views available');
+  return __('Select a content view');
+};
+
+export const shouldDisableCVSelect = ({
+  contentSourceId = null,
+  environments = [],
+  contentViewsStatus = STATUS.PENDING,
+  cvSelectOptions = [],
+}) => {
+  if (contentSourceId === '') return true;
+  if (environments.length === 0) return true;
+  if (contentViewsStatus === STATUS.PENDING) return true;
+  if (contentViewsStatus === STATUS.ERROR) return true;
+  if (cvSelectOptions.length === 0) return true;
+  return false;
+};
+
+export default getCVPlaceholderText;

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

@@ -12,48 +12,58 @@ const ContentViewsCounter = () => {
     composite_content_views_count: composite,
     content_view_components_count: component,
   } = organization;
-  return (
-    <Grid>
-      <GridItem span={12}>
-        <b>
-          <Flex>
-            <FlexItem spacer={{ default: 'spacerXs' }}>
-              <ContentViewIcon composite={false} description={__('Content views')} count={(component || component === 0) ? component : <InProgressIcon />} />
-            </FlexItem>
-            <FlexItem>
-              <Tooltip
-                position="top"
-                content={
-                  __('Consists of repositories')
-                }
-              >
-                <OutlinedQuestionCircleIcon />
-              </Tooltip>
-            </FlexItem>
-          </Flex>
-        </b>
-      </GridItem>
-      <GridItem span={12}>
-        <b>
-          <Flex>
-            <FlexItem spacer={{ default: 'spacerXs' }}>
-              <ContentViewIcon composite description={__('Composite content views')} count={(composite || composite === 0) ? composite : <InProgressIcon />} />
-            </FlexItem>
-            <FlexItem>
-              <Tooltip
-                position="top"
-                content={
-                  __('Consists of content views')
-                }
-              >
-                <OutlinedQuestionCircleIcon />
-              </Tooltip>
-            </FlexItem>
-          </Flex>
-        </b>
-      </GridItem>
-    </Grid>
-  );
+  if (composite || component) {
+    return (
+      <Grid>
+        <GridItem span={12}>
+          <b>
+            <Flex>
+              <FlexItem spacer={{ default: 'spacerXs' }}>
+                <ContentViewIcon
+                  composite={false}
+                  description={__('Content views')}
+                  count={(component || component === 0) ? component : <InProgressIcon />}
+                />
+              </FlexItem>
+              <FlexItem>
+                <Tooltip
+                  position="top"
+                  content={
+                    __('Consists of repositories')
+                  }
+                >
+                  <OutlinedQuestionCircleIcon />
+                </Tooltip>
+              </FlexItem>
+            </Flex>
+          </b>
+        </GridItem>
+        <GridItem span={12}>
+          <b>
+            <Flex>
+              <FlexItem spacer={{ default: 'spacerXs' }}>
+                <ContentViewIcon
+                  composite
+                  description={__('Composite content views')}
+                  count={(composite || composite === 0) ? composite : <InProgressIcon />}
+                />
+              </FlexItem>
+              <FlexItem>
+                <Tooltip
+                  position="top"
+                  content={
+                    __('Consists of content views')
+                  }
+                >
+                  <OutlinedQuestionCircleIcon />
+                </Tooltip>
+              </FlexItem>
+            </Flex>
+          </b>
+        </GridItem>
+      </Grid>
+    );
+  } return <></>;
 };
 
 export default ContentViewsCounter;

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

@@ -54,6 +54,7 @@ const EnvironmentPaths = ({
                     envCheckedInList(env, userCheckedItems) ||
                     envCheckedInList(env, promotedEnvironments)}
                     isDisabled={isDisabled || (publishing && env.library)
+                    || env?.content_source?.environment_is_associated === false
                     || envCheckedInList(env, promotedEnvironments)}
                     className="env-path__labels-with-pointer"
                     key={`${env.id}${index}`}

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

@@ -0,0 +1,17 @@
+import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { Tooltip } from '@patternfly/react-core';
+import { FilterIcon } from '@patternfly/react-icons';
+
+const FiltersAppliedIcon = () => (
+  <Tooltip
+    position="auto"
+    enableFlip
+    entryDelay={400}
+    content={__('Filters were applied to this version.')}
+  >
+    <FilterIcon size="sm" style={{ color: '#0081db', margin: '0 9px' }} />
+  </Tooltip>
+);
+
+export default FiltersAppliedIcon;