katello 3.7.0.rc1 → 3.7.0.rc2

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

@@ -1,20 +1,43 @@
-export function normalizeRepositorySets(data) {
-  data.results.forEach((repositorySet) => {
-    /* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["id"] }] */
-    repositorySet.id = parseInt(repositorySet.id, 10);
-  });
-  return data;
-}
-
 const repoTypeSearchQueryMap = {
   rpm: '(name ~ rpms) and (name !~ source rpm) and (name !~ debug rpm)',
   sourceRpm: 'name ~ source rpm',
   debugRpm: 'name ~ debug rpm',
-  kickstarter: 'name ~ kickstart',
+  kickstart: 'name ~ kickstart',
   ostree: 'name ~ ostree',
   beta: 'name ~ beta',
 };
 
+const recommendedRepositorySetLables = [
+  'rhel-7-server-rpms',
+  'rhel-6-server-rpms',
+  'rhel-6-server-satellite-tools-6.3-rpms',
+  'rhel-server-rhscl-7-rpms',
+  'rhel-7-server-satellite-capsule-6.3-rpms',
+  'rhel-7-server-satellite-capsule-6.4-rpms',
+  'rhel-7-server-satellite-tools-6.3-rpms',
+  'rhel-6-server-satellite-tools-6.3-rpms',
+  'rhel-7-server-ansible-2.5-rpms',
+  'rhel-7-server-optional-rpms',
+  'rhel-7-server-extras-rpms',
+  'rhel-5-server-els-rpms',
+  'rhel-7-server-eus-rpms',
+];
+
+const createLablesQuery = lables =>
+  lables.map(label => `label = ${label}`).join(' or ');
+
+const isRecommendedRepositorySet = ({ label }) => recommendedRepositorySetLables.includes(label);
+
+export const normalizeRepositorySets = (data) => {
+  data.results.forEach((repositorySet) => {
+    /* eslint no-param-reassign: ["error", { "ignorePropertyModificationsFor": ["id"] }] */
+    repositorySet.id = parseInt(repositorySet.id, 10);
+    repositorySet.recommended = isRecommendedRepositorySet(repositorySet);
+  });
+
+  return data;
+};
+
 const maptToSearchQuery = (filter) => {
   if (filter === 'other') {
     const joined = Object.keys(repoTypeSearchQueryMap)
@@ -35,4 +58,6 @@ export const joinSearchQueries = parts => parts
   .map(v => `(${v})`)
   .join(' and ');
 
+export const recommendedRepositorySetsQuery = createLablesQuery(recommendedRepositorySetLables);
+
 export default normalizeRepositorySets;

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

@@ -1,25 +1,34 @@
 import api, { orgId } from '../../../services/api';
-import { normalizeRepositorySets, repoTypeFilterToSearchQuery, joinSearchQueries } from './helpers';
+import {
+  normalizeRepositorySets,
+  repoTypeFilterToSearchQuery,
+  joinSearchQueries,
+  recommendedRepositorySetsQuery,
+} from './helpers';
 
 import {
   REPOSITORY_SETS_REQUEST,
   REPOSITORY_SETS_SUCCESS,
   REPOSITORY_SETS_FAILURE,
+  REPOSITORY_SETS_UPDATE_RECOMMENDED,
 } from '../../consts';
 import { propsToSnakeCase } from '../../../services/index';
 
 // eslint-disable-next-line import/prefer-default-export
-export const loadRepositorySets = (extendedParams = {}) => (dispatch) => {
+export const loadRepositorySets = (extendedParams = {}) => (dispatch, getState) => {
+  const { recommended } = getState().katello.redHatRepositories.sets;
+
   dispatch({ type: REPOSITORY_SETS_REQUEST, params: extendedParams });
 
   const searchParams = extendedParams.search || {};
   const search = joinSearchQueries([
     repoTypeFilterToSearchQuery(searchParams.filters || []),
     searchParams.query,
+    recommended ? recommendedRepositorySetsQuery : '',
   ]);
 
   const params = {
-    ...{ organization_id: orgId },
+    ...{ organization_id: orgId() },
     ...propsToSnakeCase(extendedParams),
     search,
   };
@@ -29,14 +38,27 @@ export const loadRepositorySets = (extendedParams = {}) => (dispatch) => {
     .then(({ data }) => {
       dispatch({
         type: REPOSITORY_SETS_SUCCESS,
-        response: normalizeRepositorySets(data),
-        search: searchParams,
+        payload: {
+          response: normalizeRepositorySets(data),
+          search: searchParams,
+        },
       });
     })
     .catch((result) => {
       dispatch({
         type: REPOSITORY_SETS_FAILURE,
-        result,
+        payload: result,
       });
     });
 };
+
+export const updateRecommendedRepositorySets = value => (dispatch, getState) => {
+  const { search } = getState().katello.redHatRepositories.sets;
+
+  dispatch({
+    type: REPOSITORY_SETS_UPDATE_RECOMMENDED,
+    payload: value,
+  });
+
+  dispatch(loadRepositorySets({ search }));
+};

data/webpack/redux/consts.js

@@ -13,6 +13,7 @@ export const ENABLED_REPOSITORIES_FAILURE = 'ENABLED_REPOSITORIES_FAILURE';
 export const REPOSITORY_SET_REPOSITORIES_REQUEST = 'REPOSITORY_SET_REPOSITORIES_REQUEST';
 export const REPOSITORY_SET_REPOSITORIES_SUCCESS = 'REPOSITORY_SET_REPOSITORIES_SUCCESS';
 export const REPOSITORY_SET_REPOSITORIES_FAILURE = 'REPOSITORY_SET_REPOSITORIES_FAILURE';
+export const REPOSITORY_SETS_UPDATE_RECOMMENDED = 'REPOSITORY_SETS_UPDATE_RECOMMENDED';
 
 export const REPOSITORY_ENABLED = 'REPOSITORY_ENABLED';
 export const REPOSITORY_DISABLED = 'REPOSITORY_DISABLED';

data/webpack/redux/reducers/RedHatRepositories/sets.fixtures.js

@@ -2,12 +2,21 @@ import Immutable from 'seamless-immutable';
 
 export const initialState = Immutable({
   loading: true,
+  recommended: false,
+  results: [],
+  pagination: {},
+});
+
+export const recommendedState = Immutable({
+  loading: true,
+  recommended: true,
   results: [],
   pagination: {},
 });
 
 export const loadingState = Immutable({
   loading: true,
+  recommended: false,
   results: [],
   pagination: {},
 });
@@ -107,9 +116,10 @@ export const requestSuccessResponse = Immutable({
 
 export const successState = Immutable({
   loading: false,
+  recommended: false,
   results: requestSuccessResponse.results,
-  searchIsActive: false,
-  search: undefined,
+  searchIsActive: true,
+  search: requestSuccessResponse.search,
   pagination: {
     page: 1,
     perPage: 5,

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

@@ -5,37 +5,44 @@ import {
   REPOSITORY_SETS_REQUEST,
   REPOSITORY_SETS_SUCCESS,
   REPOSITORY_SETS_FAILURE,
+  REPOSITORY_SETS_UPDATE_RECOMMENDED,
 } from '../../consts';
 
 import { initialState } from './sets.fixtures.js';
 
 export default (state = initialState, action) => {
-  if (action.type === REPOSITORY_SETS_REQUEST) {
-    return state.set('loading', true);
-  } else if (action.type === REPOSITORY_SETS_SUCCESS) {
-    const {
-      page, per_page, subtotal, results, // eslint-disable-line camelcase
-    } = action.response;
-
-    return Immutable({
-      results,
-      pagination: {
-        page: Number(page),
-        // server can return per_page: null when there's error in the search query,
-        // don't store it in such case
-        // eslint-disable-next-line camelcase
-        perPage: Number(per_page || state.pagination.perPage),
-      },
-      itemCount: Number(subtotal),
-      loading: false,
-      searchIsActive: !isEmpty(action.search),
-      search: action.search,
-    });
-  } else if (action.type === REPOSITORY_SETS_FAILURE) {
-    return Immutable({
-      error: action.error,
-      loading: false,
-    });
+  const { payload } = action;
+
+  switch (action.type) {
+    case REPOSITORY_SETS_REQUEST:
+      return state.set('loading', true);
+
+    case REPOSITORY_SETS_UPDATE_RECOMMENDED:
+      return state
+        .set('recommended', payload);
+
+    case REPOSITORY_SETS_SUCCESS:
+      return state
+        .set('results', payload.response.results)
+        .set('pagination', {
+          page: Number(payload.response.page),
+          // server can return per_page: null when there's error in the search query,
+          // don't store it in such case
+          // eslint-disable-next-line camelcase
+          perPage: Number(payload.response.per_page || state.pagination.perPage),
+        })
+        .set('itemCount', Number(payload.response.subtotal))
+        .set('loading', false)
+        .set('searchIsActive', !isEmpty(payload.search))
+        .set('search', payload.search);
+
+    case REPOSITORY_SETS_FAILURE:
+      return Immutable({
+        error: payload,
+        loading: false,
+      });
+
+    default:
+      return state;
   }
-  return state;
 };

data/webpack/redux/reducers/RedHatRepositories/sets.test.js

@@ -2,6 +2,7 @@ import * as types from '../../consts';
 
 import {
   initialState,
+  recommendedState,
   loadingState,
   requestSuccessResponse,
   successState,
@@ -14,6 +15,13 @@ describe('sets reducer', () => {
     expect(reducer(undefined, {})).toEqual(initialState);
   });
 
+  it('should update the recommended value on REPOSITORY_SETS_UPDATE_RECOMMENDED', () => {
+    expect(reducer(initialState, {
+      type: types.REPOSITORY_SETS_UPDATE_RECOMMENDED,
+      payload: true,
+    })).toEqual(recommendedState);
+  });
+
   it('should keep loading state on REPOSITORY_SETS_REQUEST', () => {
     expect(reducer(initialState, {
       type: types.REPOSITORY_SETS_REQUEST,
@@ -23,14 +31,14 @@ describe('sets reducer', () => {
   it('should flatten repositories response REPOSITORY_SETS_SUCCESS', () => {
     expect(reducer(initialState, {
       type: types.REPOSITORY_SETS_SUCCESS,
-      response: requestSuccessResponse,
+      payload: { response: requestSuccessResponse, search: requestSuccessResponse.search },
     })).toEqual(successState);
   });
 
   it('should have error on REPOSITORY_SETS_FAILURE', () => {
     expect(reducer(initialState, {
       type: types.REPOSITORY_SETS_FAILURE,
-      error: 'Unable to process request.',
+      payload: 'Unable to process request.',
     })).toEqual(errorState);
   });
 });

data/webpack/redux/reducers/index.js

@@ -4,6 +4,7 @@ import redHatRepositories from './RedHatRepositories';
 import { subscriptions } from '../../scenes/Subscriptions';
 import { upstreamSubscriptions } from '../../scenes/Subscriptions/UpstreamSubscriptions';
 import { manifestHistory } from '../../scenes/Subscriptions/Manifest';
+import { subscriptionDetails } from '../../scenes/Subscriptions/Details';
 
 export default combineReducers({
   organization,
@@ -11,4 +12,5 @@ export default combineReducers({
   subscriptions,
   upstreamSubscriptions,
   manifestHistory,
+  subscriptionDetails,
 });

data/webpack/scenes/Organizations/OrganizationActions.js

@@ -18,7 +18,7 @@ export const loadOrganization = (extendedParams = {}) => (dispatch) => {
   };
 
   return api
-    .get(`/organizations/${orgId}`, {}, params)
+    .get(`/organizations/${orgId()}`, {}, params)
     .then(({ data }) => {
       dispatch({
         type: GET_ORGANIZATION_SUCCESS,
@@ -37,12 +37,12 @@ export const saveOrganization = (extendedParams = {}) => (dispatch) => {
   dispatch({ type: SAVE_ORGANIZATION_REQUEST });
 
   const params = {
-    ...{ id: orgId },
+    ...{ id: orgId() },
     ...propsToSnakeCase(extendedParams),
   };
 
   return api
-    .put(`/organizations/${orgId}`, params)
+    .put(`/organizations/${orgId()}`, params)
     .then(({ data }) => {
       dispatch({
         type: SAVE_ORGANIZATION_SUCCESS,

data/webpack/scenes/RedHatRepositories/components/RecommendedRepositorySetsToggler.js

@@ -0,0 +1,44 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { Switch, Icon, FieldLevelHelp } from 'patternfly-react';
+
+import './RecommendedRepositorySetsToggler.scss';
+
+const RecommendedRepositorySetsToggler = ({
+  enabled,
+  className,
+  children,
+  help,
+  onChange,
+  ...props
+}) => {
+  const classes = classNames('recommended-repositories-toggler-container', className);
+
+  return (
+    <div className={classes} {...props}>
+      <Switch bsSize="mini" value={enabled} onChange={() => onChange(!enabled)} />
+      <Icon type="fa" name="star" />
+      {children}
+      <FieldLevelHelp content={help} />
+    </div>
+  );
+};
+
+RecommendedRepositorySetsToggler.propTypes = {
+  enabled: PropTypes.bool,
+  className: PropTypes.string,
+  children: PropTypes.node,
+  help: PropTypes.node,
+  onChange: PropTypes.func,
+};
+
+RecommendedRepositorySetsToggler.defaultProps = {
+  enabled: false,
+  className: '',
+  children: __('Recommended Repositories'),
+  help: __('This shows repositories that are used in a typical setup.'),
+  onChange: () => null,
+};
+
+export default RecommendedRepositorySetsToggler;

data/webpack/scenes/RedHatRepositories/components/RecommendedRepositorySetsToggler.scss

@@ -0,0 +1,16 @@
+@import '~patternfly/dist/sass/patternfly/_color-variables';
+
+.recommended-repositories-toggler-container {
+
+  > * {
+    margin: 0 3px;
+
+    &.fa.fa-star {
+      color: $color-pf-gold-300;
+    }
+
+    &:last-child {
+      margin: 0;
+    }
+  }
+}

data/webpack/scenes/RedHatRepositories/components/RepositorySet.js

@@ -1,12 +1,12 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { ListView } from 'patternfly-react';
+import { ListView, Icon } from 'patternfly-react';
 
 import RepositoryTypeIcon from './RepositoryTypeIcon';
 import RepositorySetRepositories from './RepositorySetRepositories';
 
 const RepositorySet = ({
-  type, id, name, label, product,
+  type, id, name, label, product, recommended,
 }) => (
   <ListView.Item
     id={id}
@@ -15,6 +15,7 @@ const RepositorySet = ({
     heading={name}
     leftContent={<RepositoryTypeIcon id={id} type={type} />}
     stacked
+    actions={recommended ? <Icon type="fa" name="star" className="recommended-repository-set-icon" /> : ''}
     hideCloseIcon
   >
     <RepositorySetRepositories contentId={id} productId={product.id} />
@@ -30,6 +31,11 @@ RepositorySet.propTypes = {
     name: PropTypes.string.isRequired,
     id: PropTypes.number.isRequired,
   }).isRequired,
+  recommended: PropTypes.bool,
+};
+
+RepositorySet.defaultProps = {
+  recommended: false,
 };
 
 export default RepositorySet;

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepositories.js

@@ -25,14 +25,16 @@ class RepositorySetRepositories extends Component {
         </Alert>
       );
     }
-
-    const repos = data.repositories
+    const availableRepos = data.repositories
       .filter(({ enabled }) => !enabled)
       .map(repo => <RepositorySetRepository key={repo.arch + repo.releasever} {...repo} />);
 
+    const repoMessage = (data.repositories.length > 0 && availableRepos.length === 0 ?
+      __('All available architectures for this repo are enabled.') : __('No repositories available.'));
+
     return (
       <Spinner loading={data.loading}>
-        {repos.length ? repos : <div>{__('No repositories available.')}</div>}
+        {availableRepos.length ? availableRepos : <div>{repoMessage}</div>}
       </Spinner>
     );
   }

data/webpack/scenes/RedHatRepositories/components/RepositorySetRepository.js

@@ -8,6 +8,8 @@ import { setRepositoryEnabled } from '../../../redux/actions/RedHatRepositories/
 import '../index.scss';
 import api from '../../../services/api';
 
+const UNSPECIFIED_ARCH = 'Unspecified';
+
 class RepositorySetRepository extends Component {
   constructor(props) {
     super(props);
@@ -48,7 +50,7 @@ class RepositorySetRepository extends Component {
       const data = {
         id: contentId,
         product_id: productId,
-        basearch: arch,
+        basearch: arch == UNSPECIFIED_ARCH ? undefined : arch,
         releasever: releasever || undefined,
       };
 
@@ -121,7 +123,7 @@ RepositorySetRepository.propTypes = {
 
 RepositorySetRepository.defaultProps = {
   releasever: '',
-  arch: __('Unspecified'),
+  arch: __(UNSPECIFIED_ARCH),
 };
 
 export default connect(null, { setRepositoryEnabled })(RepositorySetRepository);