katello 4.14.0 → 4.15.0.rc1

data/webpack/scenes/SmartProxy/ExpandableCvDetails.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import { useDispatch } from 'react-redux';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { TableComposable, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
 import { CheckCircleIcon, TimesCircleIcon } from '@patternfly/react-icons';
@@ -8,17 +9,26 @@ import { urlBuilder } from 'foremanReact/common/urlHelpers';
 import { useSet } from 'foremanReact/components/PF4/TableIndexPage/Table/TableHooks';
 import ContentViewIcon from '../ContentViews/components/ContentViewIcon';
 import ExpandedSmartProxyRepositories from './ExpandedSmartProxyRepositories';
+import { updateSmartProxyContentCounts } from './SmartProxyContentActions';
 
-const ExpandableCvDetails = ({ contentViews, contentCounts, envId }) => {
+const ExpandableCvDetails = ({
+  smartProxyId, contentViews, contentCounts, envId,
+}) => {
   const columnHeaders = [
     __('Content view'),
     __('Version'),
     __('Last published'),
     __('Synced'),
   ];
-  // const { content_counts: contentCounts } = counts;
+  const dispatch = useDispatch();
   const expandedTableRows = useSet([]);
   const tableRowIsExpanded = id => expandedTableRows.has(id);
+  const refreshCountAction = cvId => ({
+    title: __('Refresh counts'),
+    onClick: () => {
+      dispatch(updateSmartProxyContentCounts(smartProxyId, { content_view_id: cvId }));
+    },
+  });
 
   return (
     <TableComposable
@@ -68,6 +78,12 @@ const ExpandableCvDetails = ({ contentViews, contentCounts, envId }) => {
               </Td>
               <Td><LongDateTime date={cv.last_published} showRelativeTimeTooltip /></Td>
               <Td>{upToDateVal}</Td>
+              <Td
+                key={`rowActions-${id}`}
+                actions={{
+                  items: [refreshCountAction(id)],
+                }}
+              />
             </Tr>
             <Tr key="child_row" ouiaId={`ContentViewTableRowChild-${id}`} isExpanded={isExpanded}>
               <Td colSpan={12}>
@@ -89,6 +105,10 @@ const ExpandableCvDetails = ({ contentViews, contentCounts, envId }) => {
 };
 
 ExpandableCvDetails.propTypes = {
+  smartProxyId: PropTypes.oneOfType([
+    PropTypes.number,
+    PropTypes.string,
+  ]).isRequired,
   contentViews: PropTypes.arrayOf(PropTypes.shape({})),
   contentCounts: PropTypes.shape({
     content_view_versions: PropTypes.shape({}),

data/webpack/scenes/SmartProxy/ExpandedSmartProxyRepositories.js

@@ -19,7 +19,6 @@ const ExpandedSmartProxyRepositories = ({
         filteredData[key] = entry;
       }
     });
-
     return filteredData;
   };
   const envContentCounts = filterDataByEnvId();
@@ -48,6 +47,43 @@ const ExpandedSmartProxyRepositories = ({
     /* eslint-enable max-len */
     return cellList;
   };
+
+  const getDataListItems = () => {
+    if (Object.keys(envContentCounts).length) {
+      return Object.keys(envContentCounts).map((repo, index) => (
+        <DataListItem key={`${repo.id}-${index}`}>
+          <DataListItemRow>
+            <DataListItemCells
+              dataListCells={dataListCellLists(envContentCounts[repo], repo)}
+            />
+          </DataListItemRow>
+        </DataListItem>
+      ));
+    }
+
+    if (repositories?.length) {
+      return repositories.map((repo, index) => (
+        <DataListItem key={`${repo.id}-${index}`}>
+          <DataListItemRow>
+            <DataListItemCells
+              dataListCells={dataListCellListsNotSynced(repo)}
+            />
+          </DataListItemRow>
+        </DataListItem>
+      ));
+    }
+
+    return (
+      <DataListItem key="empty">
+        <DataListItemRow>
+          <DataListItemCells
+            dataListCells={[<DataListCell key="cv-empty"><InactiveText text={__('Content view version is empty')} /></DataListCell>]}
+          />
+        </DataListItemRow>
+      </DataListItem>
+    );
+  };
+
   if (syncedToCapsule) {
     return (
       <DataList aria-label="Expanded repository details" isCompact>
@@ -64,24 +100,7 @@ const ExpandedSmartProxyRepositories = ({
             />
           </DataListItemRow>
         </DataListItem>
-        {Object.keys(envContentCounts).length ?
-          Object.keys(envContentCounts).map((repo, index) => (
-            <DataListItem key={`${repo.id}-${index}`}>
-              <DataListItemRow>
-                <DataListItemCells
-                  dataListCells={dataListCellLists(envContentCounts[repo], repo)}
-                />
-              </DataListItemRow>
-            </DataListItem>
-          )) :
-          <DataListItem key="empty">
-            <DataListItemRow>
-              <DataListItemCells
-                dataListCells={[<DataListCell key="cv-empty"><InactiveText text={__('Content view version is empty')} /></DataListCell>]}
-              />
-            </DataListItemRow>
-          </DataListItem>
-          }
+        {getDataListItems()}
       </DataList>
     );
   }
@@ -112,7 +131,7 @@ const ExpandedSmartProxyRepositories = ({
         <DataListItem key="empty">
           <DataListItemRow>
             <DataListItemCells
-              dataListCells={[<DataListCell key="cv-empty"><InactiveText text={__('Content view version is empty')} /></DataListCell>]}
+              dataListCells={[<DataListCell key="cv-empty"><InactiveText text={__('Content view version is empty or content counts are not up to date')} /></DataListCell>]}
             />
           </DataListItemRow>
         </DataListItem>

data/webpack/scenes/SmartProxy/SmartProxyContentActions.js

@@ -18,10 +18,11 @@ export const getSmartProxies = () => get({
   params: { organization_id: orgId(), per_page: 'all' },
 });
 
-export const updateSmartProxyContentCounts = smartProxyId => post({
+export const updateSmartProxyContentCounts = (smartProxyId, params) => post({
   type: API_OPERATIONS.POST,
   key: SMART_PROXY_COUNTS_UPDATE_KEY,
   url: api.getApiUrl(`/capsules/${smartProxyId}/content/update_counts`),
+  params,
   handleSuccess: (response) => {
     renderTaskStartedToast(response?.data, __('Smart proxy content count refresh has started in the background'));
   },

data/webpack/scenes/SmartProxy/SmartProxyExpandableTable.js

@@ -35,12 +35,13 @@ const SmartProxyExpandableTable = ({ smartProxyId, organizationId }) => {
     __('Last sync'),
   ];
 
-  const refreshCountAction = {
+  const refreshCountAction = envId => ({
     title: __('Refresh counts'),
     onClick: () => {
-      dispatch(updateSmartProxyContentCounts(smartProxyId));
+      dispatch(updateSmartProxyContentCounts(smartProxyId, { environment_id: envId }));
     },
-  };
+  });
+
   const fetchItems = useCallback(
     () => getSmartProxyContent({ smartProxyId, organizationId }),
     [smartProxyId, organizationId],
@@ -109,7 +110,7 @@ const SmartProxyExpandableTable = ({ smartProxyId, organizationId }) => {
                   <Td
                     key={`rowActions-${id}`}
                     actions={{
-                      items: [refreshCountAction],
+                      items: [refreshCountAction(id)],
                     }}
                   />
                 </Tr>
@@ -117,6 +118,7 @@ const SmartProxyExpandableTable = ({ smartProxyId, organizationId }) => {
                   <Td colSpan={4}>
                     {isExpanded ?
                       <ExpandableCvDetails
+                        smartProxyId={smartProxyId}
                         contentViews={contentViews}
                         contentCounts={contentCounts}
                         envId={id}

data/webpack/scenes/SmartProxy/__tests__/SmartProxyContentTest.js

@@ -8,6 +8,7 @@ import SmartProxyExpandableTable from '../SmartProxyExpandableTable';
 const smartProxyContentData = require('./SmartProxyContentTest.fixtures.json');
 
 const smartProxyContentPath = api.getApiUrl('/capsules/1/content/sync');
+const smartProxyRefreshCountPath = api.getApiUrl('/capsules/1/content/update_counts');
 
 const smartProxyContent = { ...smartProxyContentData };
 
@@ -48,3 +49,64 @@ test('Can display Smart proxy content table and expand env and cv details', asyn
   expect(getAllByText(/2 Package groups/i)[0]).toBeInTheDocument();
   assertNockRequest(detailsScope, done);
 });
+
+test('Can call content count refresh for environment', async (done) => {
+  const detailsScope = nockInstance
+    .get(smartProxyContentPath)
+    .query(true)
+    .reply(200, smartProxyContent);
+
+  const countsEnvRefreshScope = nockInstance
+    .post(smartProxyRefreshCountPath, {
+      environment_id: 1,
+    })
+    .reply(202);
+
+  const {
+    getByText, queryAllByLabelText,
+  } = renderWithRedux(contentTable);
+  await patientlyWaitFor(() => expect(getByText('Environment')).toBeInTheDocument());
+  const envRowActions = queryAllByLabelText('Actions')[0];
+  envRowActions.click();
+  await patientlyWaitFor(() => expect(getByText('Refresh counts')).toBeInTheDocument());
+  const refreshEnv = getByText('Refresh counts');
+  refreshEnv.click();
+
+  assertNockRequest(detailsScope);
+  assertNockRequest(countsEnvRefreshScope, done);
+});
+
+test('Can call content count refresh for content view', async (done) => {
+  const detailsScope = nockInstance
+    .get(smartProxyContentPath)
+    .query(true)
+    .reply(200, smartProxyContent);
+
+  const countsCVRefreshScope = nockInstance
+    .post(smartProxyRefreshCountPath, {
+      content_view_id: 1,
+    })
+    .reply(202);
+
+
+  const {
+    getByText, getAllByText, getByLabelText, queryAllByLabelText,
+  } = renderWithRedux(contentTable);
+  await patientlyWaitFor(() => expect(getByText('Environment')).toBeInTheDocument());
+  const tdEnvExpand = getByLabelText('expand-env-1');
+  const envExpansion = within(tdEnvExpand).getByLabelText('Details');
+  envExpansion.click();
+  await patientlyWaitFor(() => expect(getAllByText('Content view')[0]).toBeInTheDocument());
+  expect(getAllByText('Last published')[0]).toBeInTheDocument();
+  expect(getAllByText('Repository')[0]).toBeInTheDocument();
+  expect(getAllByText('Synced')[0]).toBeInTheDocument();
+  const cvRowActions = queryAllByLabelText('Actions')[1];
+  cvRowActions.click();
+
+  await patientlyWaitFor(() => expect(getByText('Refresh counts')).toBeInTheDocument());
+  const refreshCvCounts = getByText('Refresh counts');
+  refreshCvCounts.click();
+
+  assertNockRequest(detailsScope, done);
+  assertNockRequest(countsCVRefreshScope, done);
+});

data/webpack/scenes/Subscriptions/Manifest/ManageManifestModal.js

@@ -4,7 +4,7 @@ import { Grid, Col, Row, Tabs, Tab, FormControl, ControlLabel } from 'react-boot
 import { FormattedMessage } from 'react-intl';
 import { Button, Spinner } from 'patternfly-react';
 import { Alert } from '@patternfly/react-core';
-import { propsToCamelCase } from 'foremanReact/common/helpers';
+import { propsToCamelCase, getDocsURL } from 'foremanReact/common/helpers';
 import ForemanModal from 'foremanReact/components/ForemanModal';
 import Slot from 'foremanReact/components/common/Slot';
 import { translate as __ } from 'foremanReact/common/I18n';
@@ -12,6 +12,7 @@ import TooltipButton from '../../../components/TooltipButton';
 import { LoadingState } from '../../../components/LoadingState';
 import { Table } from '../../../components/pf3Table';
 
+
 import { columns } from './ManifestHistoryTableSchema';
 import DeleteManifestModalText from './DeleteManifestModalText';
 import { MANAGE_MANIFEST_MODAL_ID, DELETE_MANIFEST_MODAL_ID } from './ManifestConstants';
@@ -32,7 +33,7 @@ class ManageManifestModal extends Component {
     }
 
     if (prevProps.taskInProgress && !this.props.taskInProgress) {
-      this.props.loadOrganization();
+      this.props.loadOrganization({ force_manifest_expire_cache: true });
       this.props.loadManifestHistory();
     }
 
@@ -111,8 +112,9 @@ class ManageManifestModal extends Component {
       header: __('There is no manifest history to display.'),
       description: __('Import a manifest using the Manifest tab above.'),
       documentation: {
-        label: __('Learn more about adding subscription manifests '),
-        url: 'https://access.redhat.com/solutions/3410771',
+        label: __('Learn more about adding subscription manifests in '),
+        buttonLabel: __('the documentation.'),
+        url: getDocsURL('Managing_Content', 'Managing_Red_Hat_Subscriptions_content-management'),
       },
     });
 

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -204,7 +204,7 @@ class SubscriptionsPage extends Component {
         description: __('Add subscriptions using the Add Subscriptions button.'),
         action: {
           title: __('Add subscriptions'),
-          url: 'subscriptions/add',
+          url: '/subscriptions/add',
         },
       }
       : {