katello 3.13.4 → 3.14.0.rc1

data/webpack/containers/Application/config.js

@@ -7,6 +7,8 @@ import SetOrganization from '../../components/SelectOrg/SetOrganization';
 import WithOrganization from '../../components/WithOrganization/withOrganization';
 import ModuleStreams from '../../scenes/ModuleStreams';
 import ModuleStreamDetails from '../../scenes/ModuleStreams/Details';
+import AnsibleCollections from '../../scenes/AnsibleCollections';
+import AnsibleCollectionDetails from '../../scenes/AnsibleCollections/Details';
 import withHeader from './withHeaders';
 
 // eslint-disable-next-line import/prefer-default-export
@@ -40,4 +42,12 @@ export const links = [
     path: 'module_streams/:id([0-9]+)',
     component: withHeader(ModuleStreamDetails, { title: __('Module Stream Details') }),
   },
+  {
+    path: 'ansible_collections',
+    component: withHeader(AnsibleCollections, { title: __('Ansible Collections') }),
+  },
+  {
+    path: 'ansible_collections/:id([0-9]+)',
+    component: withHeader(AnsibleCollectionDetails, { title: __('Ansible Collection Details') }),
+  },
 ];

data/webpack/containers/Application/overrides.scss

@@ -14,6 +14,11 @@ html .pagination-pf-pagesize.btn-group {
   margin-top: -6px !important;
 }
 
+td, th {
+  overflow: auto;
+  word-wrap: break-word;
+}
+
 // override foreman's .editable styles, that are conflicting with the patternfly ones
 .pf-table-inline-edit {
   .editable {

data/webpack/move_to_foreman/common/helpers.js

@@ -23,7 +23,7 @@ const getCustomMessage = (actionType, message) => {
   return customMessage;
 };
 
-export const getResponseErrorMsgs = ({ data, actionType }) => {
+export const getResponseErrorMsgs = ({ data, actionType } = {}) => {
   if (data) {
     const customMessage = getCustomMessage(actionType, data.displayMessage);
     const messages =

data/webpack/move_to_foreman/components/common/table/components/TableSelectionCell.js

@@ -5,17 +5,18 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import { noop } from 'foremanReact/common/helpers';
 
 const TableSelectionCell = ({
-  id, before, after, label, checked, onChange, ...props
+  id, before, after, label, checked, hide, onChange, ...props
 }) => (
   <Table.SelectionCell>
     {before}
+    {!hide &&
     <Table.Checkbox
       id={id}
       label={label}
       checked={checked}
       onChange={onChange}
       {...props}
-    />
+    />}
     {after}
   </Table.SelectionCell>
 );
@@ -26,6 +27,7 @@ TableSelectionCell.propTypes = {
   after: PropTypes.node,
   label: PropTypes.string,
   checked: PropTypes.bool,
+  hide: PropTypes.bool,
   onChange: PropTypes.func,
 };
 
@@ -34,6 +36,7 @@ TableSelectionCell.defaultProps = {
   after: null,
   label: __('Select row'),
   checked: false,
+  hide: false,
   onChange: noop,
 };
 

data/webpack/move_to_foreman/components/common/table/formatters/EntitlementsInlineEditFormatter.js

@@ -5,12 +5,18 @@ import { Table, FormControl, FormGroup, HelpBlock, Spinner } from 'patternfly-re
 import { validateQuantity } from '../../../../../scenes/Subscriptions/SubscriptionValidations';
 
 const renderValue = (value, additionalData, onActivate) => {
-  const { available, upstream_pool_id: upstreamPoolId } = additionalData.rowData;
-  if (available < 0 || !upstreamPoolId) {
+  const { available, upstream_pool_id: upstreamPoolId, collapsible } = additionalData.rowData;
+
+  if (collapsible) {
+    return (
+      <td>{__('NA')}</td>
+    );
+  } else if (available < 0 || !upstreamPoolId) {
     return (
       <td>{available < 0 ? __('Unlimited') : available}</td>
     );
   }
+
   return (
     <td className="editable">
       <div
@@ -34,6 +40,7 @@ const renderEdit = (hasChanged, onChange, value, additionalData) => {
   const {
     upstreamAvailable, upstreamAvailableLoaded, maxQuantity,
   } = additionalData.rowData;
+
   const className = hasChanged(additionalData)
     ? 'editable editing changed'
     : 'editable editing';

data/webpack/move_to_foreman/components/common/table/formatters/collapseableAndSelectionCellFormatter.js

@@ -4,8 +4,10 @@ import CollapseSubscriptionGroupButton from '../components/CollapseSubscriptionG
 
 export default (collapseableController, selectionController, additionalData) => {
   const shouldShowCollapseButton = collapseableController.isCollapseable(additionalData);
+  const isGenericRow = additionalData.rowData.collapsible;
 
   return selectionCellFormatter(
+    isGenericRow,
     selectionController,
     additionalData,
     shouldShowCollapseButton && (

data/webpack/move_to_foreman/components/common/table/formatters/selectionCellFormatter.js

@@ -2,14 +2,17 @@ import React from 'react';
 import TableSelectionCell from '../components/TableSelectionCell';
 
 export default (
+  isGenericRow,
   selectionController,
   additionalData,
   before,
   after,
 ) => (
+
   <TableSelectionCell
     id={`select${additionalData.rowIndex}`}
     checked={selectionController.isSelected(additionalData)}
+    hide={isGenericRow}
     onChange={() => selectionController.selectRow(additionalData)}
     before={before}
     after={after}

data/webpack/move_to_pf/TypeAhead/TypeAhead.js

@@ -81,6 +81,7 @@ class TypeAhead extends Component {
                       case KEYCODES.ENTER:
                         if (!isOpen || !activeItems[highlightedIndex]) {
                           onSearch(this.state.inputValue);
+                          e.nativeEvent.preventDownshiftDefault = true;
                           e.preventDefault();
                         }
 

data/webpack/redux/OrganizationProducts/OrganizationProductsActions.js

@@ -7,18 +7,18 @@ import {
 } from './OrganizationProductsConstants';
 import { apiError } from '../../move_to_foreman/common/helpers';
 
-export const loadOrganizationProducts = (params = {}, orgId = getOrgId()) => (dispatch) => {
+export const loadOrganizationProducts = (params = {}, orgId = getOrgId()) => async (dispatch) => {
   dispatch({ type: ORGANIZATION_PRODUCTS_REQUEST });
 
-  return api
-    .get(`/organizations/${orgId}/products/`, {}, params)
-    .then(({ data }) => {
-      dispatch({
-        type: ORGANIZATION_PRODUCTS_SUCCESS,
-        payload: { orgId, ...data },
-      });
-    })
-    .catch(result => dispatch(apiError(ORGANIZATION_PRODUCTS_FAILURE, result)));
+  try {
+    const { data } = await api.get(`/organizations/${orgId}/products/`, {}, params);
+    return dispatch({
+      type: ORGANIZATION_PRODUCTS_SUCCESS,
+      payload: { orgId, ...data },
+    });
+  } catch (error) {
+    return dispatch(apiError(ORGANIZATION_PRODUCTS_FAILURE, error));
+  }
 };
 
 export default loadOrganizationProducts;

data/webpack/redux/actions/RedHatRepositories/__tests__/enabled.test.js

@@ -0,0 +1,39 @@
+import thunk from 'redux-thunk';
+import Immutable from 'seamless-immutable';
+import configureMockStore from 'redux-mock-store';
+import { disableRepository, loadEnabledRepos } from '../enabled.js';
+import {
+  ENABLED_REPOSITORIES_REQUEST,
+  DISABLE_REPOSITORY_REQUEST,
+} from '../../../consts';
+
+const mockStore = configureMockStore([thunk]);
+const store = mockStore({ e: Immutable({}) });
+
+describe('RedHatRepositories enabled actions', () => {
+  describe('disableRepository', () => {
+    it('dispatches DISABLE_REPOSITORY_REQUEST', async () => {
+      const mockRepo = { // don't need actual values because just checking that the action matches
+        productId: null,
+        contentId: null,
+        basearch: null,
+        releasever: null,
+      };
+      await store.dispatch(disableRepository(mockRepo));
+      expect(store.getActions()).toContainEqual({
+        type: DISABLE_REPOSITORY_REQUEST,
+        repository: mockRepo,
+      });
+    });
+  });
+  describe('loadEnabledRepos', () => {
+    it('dispatches ENABLED_REPOSITORIES_REQUEST', async () => {
+      await store.dispatch(loadEnabledRepos());
+      expect(store.getActions()).toContainEqual({
+        type: ENABLED_REPOSITORIES_REQUEST,
+        silent: false,
+        params: {},
+      });
+    });
+  });
+});

data/webpack/redux/actions/RedHatRepositories/enabled.js

@@ -1,5 +1,5 @@
 import { propsToSnakeCase } from 'foremanReact/common/helpers';
-
+import { get } from 'lodash';
 import api, { orgId } from '../../../services/api';
 import {
   normalizeRepositorySets,
@@ -34,7 +34,7 @@ export const createEnabledRepoParams = (extendedParams = {}) => {
   ]);
 
   const repoParams = {
-    ...{ organization_id: orgId(), enabled: 'true' },
+    ...{ organization_id: orgId(), enabled: 'true', include_permissions: 'true' },
     ...propsToSnakeCase(extendedParams),
     search,
   };
@@ -42,7 +42,7 @@ export const createEnabledRepoParams = (extendedParams = {}) => {
   return { searchParams, repoParams };
 };
 
-export const disableRepository = repository => (dispatch) => {
+export const disableRepository = repository => async (dispatch) => {
   const {
     productId, contentId, arch, releasever,
   } = repository;
@@ -53,33 +53,33 @@ export const disableRepository = repository => (dispatch) => {
     basearch: arch,
     releasever,
   };
-
   dispatch({ type: DISABLE_REPOSITORY_REQUEST, repository });
-
   const url = `/products/${productId}/repository_sets/${contentId}/disable`;
-  return api
-    .put(url, repoData)
-    .then(result => dispatch(apiSuccess(DISABLE_REPOSITORY_SUCCESS, result)))
-    .catch(result => dispatch(apiError(DISABLE_REPOSITORY_FAILURE, result, { repository })));
+  try {
+    const result = await api.put(url, repoData);
+    return dispatch(apiSuccess(DISABLE_REPOSITORY_SUCCESS, result));
+  } catch (error) {
+    return dispatch(apiError(DISABLE_REPOSITORY_FAILURE, error, { repository }));
+  }
 };
 
-export const loadEnabledRepos = (extendedParams = {}, silent = false) => (dispatch) => {
+export const loadEnabledRepos = (extendedParams = {}, silent = false) => async (dispatch) => {
   dispatch({ type: ENABLED_REPOSITORIES_REQUEST, params: extendedParams, silent });
   const { searchParams, repoParams } = createEnabledRepoParams(extendedParams);
 
-  return api
-    .get('/repositories', {}, repoParams)
-    .then(({ data }) => {
-      dispatch({
-        type: ENABLED_REPOSITORIES_SUCCESS,
-        response: normalizeRepositorySets(data),
-        search: searchParams,
-      });
-    })
-    .catch((result) => {
-      dispatch({
-        type: ENABLED_REPOSITORIES_FAILURE,
-        result,
-      });
+  try {
+    const { data } = await api.get('/repositories', {}, repoParams);
+    return dispatch({
+      type: ENABLED_REPOSITORIES_SUCCESS,
+      response: normalizeRepositorySets(data),
+      search: searchParams,
+    });
+  } catch (error) {
+    const missingPermissions = get(error, ['response', 'data', 'error', 'missing_permissions']);
+    return dispatch({
+      type: ENABLED_REPOSITORIES_FAILURE,
+      result: error,
+      missingPermissions,
     });
+  }
 };

data/webpack/redux/actions/RedHatRepositories/helpers.js

@@ -25,16 +25,16 @@ const recommendedRepositoriesRHEL = [
 ];
 
 const recommendedRepositoriesSatTools = [
-  'satellite-tools-6.5-for-rhel-8-x86_64-rpms',
-  'rhel-7-server-satellite-tools-6.5-rpms',
-  'rhel-6-server-satellite-tools-6.5-rpms',
-  'rhel-5-server-els-satellite-tools-6.5-rpms',
+  'satellite-tools-6.6-for-rhel-8-x86_64-rpms',
+  'rhel-7-server-satellite-tools-6.6-rpms',
+  'rhel-6-server-satellite-tools-6.6-rpms',
+  'rhel-5-server-els-satellite-tools-6.6-rpms',
   'rhel-7-server-satellite-maintenance-6-rpms',
 ];
 
 const recommendedRepositoriesMisc = [
   'rhel-server-rhscl-7-rpms',
-  'rhel-7-server-satellite-capsule-6.5-rpms',
+  'rhel-7-server-satellite-capsule-6.6-rpms',
   'rhel-7-server-ansible-2.8-rpms',
 ];
 

data/webpack/redux/actions/RedHatRepositories/repositorySetRepositories.js

@@ -31,7 +31,7 @@ export function normalizeContentSetRepositories(repos, contentId, productId) {
   }));
 }
 
-export const enableRepository = repository => (dispatch) => {
+export const enableRepository = repository => async (dispatch) => {
   const {
     productId, contentId, arch, releasever,
   } = repository;
@@ -46,35 +46,36 @@ export const enableRepository = repository => (dispatch) => {
   dispatch({ type: ENABLE_REPOSITORY_REQUEST, repository });
 
   const url = `/products/${productId}/repository_sets/${contentId}/enable`;
-  return api
-    .put(url, repoData)
-    .then(result => dispatch(apiSuccess(ENABLE_REPOSITORY_SUCCESS, result)))
-    .catch(result => dispatch(apiError(ENABLE_REPOSITORY_FAILURE, result, { repository })));
+  try {
+    const result = await api.put(url, repoData);
+    return dispatch(apiSuccess(ENABLE_REPOSITORY_SUCCESS, result));
+  } catch (error) {
+    return dispatch(apiError(ENABLE_REPOSITORY_FAILURE, error, { repository }));
+  }
 };
 
-const loadRepositorySetRepos = (contentId, productId) => (dispatch) => {
+const loadRepositorySetRepos = (contentId, productId) => async (dispatch) => {
   dispatch({
     type: REPOSITORY_SET_REPOSITORIES_REQUEST,
     contentId,
   });
 
-  api
-    .get(`/products/${productId}/repository_sets/${contentId}/available_repositories`)
-    .then(({ data }) => {
-      dispatch({
-        type: REPOSITORY_SET_REPOSITORIES_SUCCESS,
-        contentId,
-        productId,
-        results: data.results,
-      });
-    })
-    .catch(({ response: { data: error } }) => {
-      dispatch({
-        type: REPOSITORY_SET_REPOSITORIES_FAILURE,
-        contentId,
-        error,
-      });
+  try {
+    const { data } = await api.get(`/products/${productId}/repository_sets/${contentId}/available_repositories`);
+    return dispatch({
+      type: REPOSITORY_SET_REPOSITORIES_SUCCESS,
+      contentId,
+      productId,
+      results: data.results,
     });
+  } catch (response) {
+    const error = response && response.data && response.data.error;
+    return dispatch({
+      type: REPOSITORY_SET_REPOSITORIES_FAILURE,
+      contentId,
+      error,
+    });
+  }
 };
 
 loadRepositorySetRepos.propTypes = {

data/webpack/redux/actions/RedHatRepositories/sets.js

@@ -17,11 +17,10 @@ import {
 } from '../../consts';
 
 // eslint-disable-next-line import/prefer-default-export
-export const loadRepositorySets = (extendedParams = {}) => (dispatch, getState) => {
-  const { recommended } = getState().katello.redHatRepositories.sets;
-
+export const loadRepositorySets = (extendedParams = {}) => async (dispatch, getState) => {
   dispatch({ type: REPOSITORY_SETS_REQUEST, params: extendedParams });
-
+  // Assemble params
+  const { recommended } = getState().katello.redHatRepositories.sets;
   const searchParams = extendedParams.search || {};
   const search = joinSearchQueries([
     repoTypeFilterToSearchQuery(searchParams.filters || []),
@@ -29,30 +28,27 @@ export const loadRepositorySets = (extendedParams = {}) => (dispatch, getState)
     searchParams.query,
     recommended ? recommendedRepositorySetsQuery : '',
   ]);
-
   const params = {
     ...{ organization_id: orgId(), with_active_subscription: true },
     ...propsToSnakeCase(extendedParams),
     search,
   };
 
-  api
-    .get('/repository_sets', {}, params)
-    .then(({ data }) => {
-      dispatch({
-        type: REPOSITORY_SETS_SUCCESS,
-        payload: {
-          response: normalizeRepositorySets(data),
-          search: searchParams,
-        },
-      });
-    })
-    .catch((result) => {
-      dispatch({
-        type: REPOSITORY_SETS_FAILURE,
-        payload: result,
-      });
+  try {
+    const { data } = await api.get('/repository_sets', {}, params);
+    return dispatch({
+      type: REPOSITORY_SETS_SUCCESS,
+      payload: {
+        response: normalizeRepositorySets(data),
+        search: searchParams,
+      },
+    });
+  } catch (error) {
+    return dispatch({
+      type: REPOSITORY_SETS_FAILURE,
+      payload: error,
     });
+  }
 };
 
 export const updateRecommendedRepositorySets = value => (dispatch, getState) => {