katello 3.11.0 → 3.11.1

data/webpack/components/WithOrganization/withOrganization.test.js

@@ -1,9 +1,13 @@
 import React from 'react';
+import thunk from 'redux-thunk';
+import configureMockStore from 'redux-mock-store';
 import { mount } from 'enzyme';
 import toJson from 'enzyme-to-json';
 import withOrganization from './withOrganization';
 
 jest.mock('../SelectOrg/SetOrganization');
+const mockStore = configureMockStore([thunk]);
+const store = mockStore({ katello: { organization: {} } });
 
 describe('subscriptions page', () => {
   const WrappedComponent = () => <div> Wrapped! </div>;
@@ -12,7 +16,7 @@ describe('subscriptions page', () => {
     global.document.getElementById = () => ({ dataset: { id: 1 } });
 
     const Component = withOrganization(WrappedComponent, '/test');
-    const page = mount(<Component />);
+    const page = mount(<Component store={store} />);
     expect(toJson(page)).toMatchSnapshot();
   });
 
@@ -20,7 +24,7 @@ describe('subscriptions page', () => {
     global.document.getElementById = () => ({ dataset: { id: '' } });
 
     const Component = withOrganization(WrappedComponent, '/test');
-    const page = mount(<Component />);
+    const page = mount(<Component store={store} />);
     expect(toJson(page)).toMatchSnapshot();
   });
 });

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

@@ -0,0 +1,13 @@
+import { getArchFromPath } from '../helpers.js';
+
+describe('getArchFromPath', () => {
+  it('should return arch from path', () => {
+    const arch = getArchFromPath('/this/has/x86_64/as/arch');
+    expect(arch).toBe('x86_64');
+  });
+
+  it('should return falsey value for no arch', () => {
+    const arch = getArchFromPath('/hello/there/');
+    expect(arch).toBeFalsy();
+  });
+});

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

@@ -1,3 +1,5 @@
+import { first, intersection } from 'lodash';
+
 const repoTypeSearchQueryMap = {
   rpm: '(name !~ source rpm) and (name !~ debug rpm) and (content_type = yum) and (name !~ beta) and (product_name !~ beta)',
   sourceRpm: '(name ~ source rpm) and (content_type = yum)',
@@ -73,4 +75,11 @@ export const joinSearchQueries = parts => parts
 
 export const recommendedRepositorySetsQuery = createLablesQuery(recommendedRepositorySetLables);
 
+export const getArchFromPath = (path) => {
+  const architectures = ['x86_64', 's390x', 'ppc64le', 'aarch64', 'multiarch', 'ppc64'];
+  const splitPath = path.split('/').map(h => h.toLowerCase());
+  const arches = intersection(splitPath, architectures);
+  return first(arches);
+};
+
 export default normalizeRepositorySets;

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

@@ -1,5 +1,6 @@
 import api from '../../../services/api';
 import { apiError, apiSuccess } from '../../../move_to_foreman/common/helpers.js';
+import { getArchFromPath } from './helpers.js';
 
 import {
   REPOSITORY_SET_REPOSITORIES_REQUEST,
@@ -22,6 +23,7 @@ export function normalizeContentSetRepositories(repos, contentId, productId) {
     productId: parseInt(productId, 10),
     arch: repo.substitutions.basearch,
     releasever: repo.substitutions.releasever,
+    displayArch: repo.substitutions.basearch || getArchFromPath(repo.path),
     enabled: repo.enabled,
     error: false,
     loading: false,

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

@@ -62,9 +62,9 @@ class RepositorySetRepository extends Component {
   }
 
   render() {
-    const { arch, releasever, type } = this.props;
+    const { displayArch, releasever, type } = this.props;
 
-    const archLabel = arch || __('Unspecified');
+    const archLabel = displayArch || __('Unspecified');
     const releaseverLabel = releasever || '';
 
     const yStreamHelpText =
@@ -135,6 +135,7 @@ class RepositorySetRepository extends Component {
 RepositorySetRepository.propTypes = {
   contentId: PropTypes.number.isRequired,
   productId: PropTypes.number.isRequired,
+  displayArch: PropTypes.string,
   arch: PropTypes.string,
   releasever: PropTypes.string,
   type: PropTypes.string,
@@ -160,6 +161,7 @@ RepositorySetRepository.defaultProps = {
   label: '',
   releasever: undefined,
   arch: undefined,
+  displayArch: undefined,
   enabledSearch: {},
   loading: false,
   error: false,

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

@@ -18,7 +18,7 @@ describe('RepositorySetRepository Component', () => {
       contentId={1}
       productId={1}
       label="some label"
-      arch="foo"
+      displayArch="foo"
       releaseVer="1.1.1"
       type="foo"
       enabledPagination={{}}

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

@@ -42,7 +42,7 @@ class SearchBar extends Component {
 
   componentDidMount() {
     // load all products until we use filtering and pagination
-    this.props.loadOrganizationProducts({ per_page: 1000 });
+    this.props.loadOrganizationProducts({ per_page: 1000, redhat_only: true });
   }
 
   onSearch(query) {

data/webpack/scenes/Subscriptions/SubscriptionReducer.js

@@ -31,6 +31,7 @@ import { GET_SETTING_SUCCESS } from '../../move_to_foreman/Settings/SettingsCons
 
 const initialState = Immutable({
   ...initialApiState,
+  disconnected: false,
   searchQuery: '',
   manifestModalOpened: false,
   deleteModalOpened: false,

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -34,7 +34,6 @@ class SubscriptionsPage extends Component {
   componentDidMount() {
     this.props.resetTasks();
     this.props.loadSetting('content_disconnected');
-    this.props.loadSubscriptions();
   }
 
   componentDidUpdate(prevProps) {
@@ -69,7 +68,16 @@ class SubscriptionsPage extends Component {
       }
     }
 
-    if (!isEqual(organization, prevProps.organization)) {
+    const getOrgInfo = (org) => {
+      // remove the loading attribute so the action isn't called when org starts loading
+      const { loading, ...info } = org;
+      return info;
+    };
+
+    const currentOrgInfo = getOrgInfo(organization);
+    const prevOrgInfo = getOrgInfo(prevProps.organization);
+
+    if (!isEqual(currentOrgInfo, prevOrgInfo)) {
       this.pollTasks();
     }
   }
@@ -313,7 +321,7 @@ SubscriptionsPage.propTypes = {
   loadTables: PropTypes.func.isRequired,
   createColumns: PropTypes.func.isRequired,
   updateColumns: PropTypes.func.isRequired,
-  subscriptionTableSettings: PropTypes.shape({}).isRequired,
+  subscriptionTableSettings: PropTypes.shape({}),
   tasks: PropTypes.arrayOf(PropTypes.shape({})),
   deleteSubscriptions: PropTypes.func.isRequired,
   refreshManifest: PropTypes.func.isRequired,
@@ -343,6 +351,7 @@ SubscriptionsPage.defaultProps = {
   deleteModalOpened: false,
   taskModalOpened: false,
   deleteButtonDisabled: true,
+  subscriptionTableSettings: {},
 };
 
 export default SubscriptionsPage;

data/webpack/scenes/Subscriptions/SubscriptionsSelectors.js

@@ -18,3 +18,6 @@ export const selectDeleteButtonDisabled = state =>
 
 export const selectSubscriptionsTasks = state =>
   selectSubscriptionsState(state).tasks;
+
+export const selectTableSettings = (state, tableName) =>
+  state.katello.settings.tables[tableName] || undefined;

data/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsReducer.test.js.snap

@@ -5,6 +5,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": false,
   "manifestModalOpened": false,
@@ -27,6 +28,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -49,6 +51,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": false,
   "manifestModalOpened": false,
@@ -94,6 +97,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -116,6 +120,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -138,6 +143,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -160,6 +166,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -182,6 +189,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -204,6 +212,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -226,6 +235,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -252,6 +262,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -274,6 +285,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": false,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -296,6 +308,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": false,
   "manifestModalOpened": false,
@@ -318,6 +331,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": true,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -340,6 +354,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": true,
@@ -362,6 +377,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -384,6 +400,7 @@ Object {
   "availableQuantities": Object {},
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -406,6 +423,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -428,6 +446,7 @@ Object {
   "availableQuantities": "some-quantities-data",
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -450,6 +469,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -472,6 +492,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 20,
   "loading": false,
   "manifestModalOpened": false,
@@ -496,6 +517,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -518,6 +540,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -540,6 +563,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": false,
   "manifestModalOpened": false,
@@ -562,6 +586,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -584,6 +609,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": false,
   "manifestModalOpened": false,
@@ -606,6 +632,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,
@@ -631,6 +658,7 @@ Object {
   "availableQuantities": null,
   "deleteButtonDisabled": true,
   "deleteModalOpened": false,
+  "disconnected": false,
   "itemCount": 0,
   "loading": true,
   "manifestModalOpened": false,

data/webpack/scenes/Subscriptions/index.js

@@ -2,7 +2,6 @@ import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 
 import * as subscriptionActions from './SubscriptionActions';
-
 import * as taskActions from '../Tasks/TaskActions';
 import * as settingActions from '../../move_to_foreman/Settings/SettingsActions';
 import * as tableActions from '../Settings/Tables/TableActions';
@@ -16,6 +15,7 @@ import {
   selectTaskModalOpened,
   selectDeleteButtonDisabled,
   selectSubscriptionsTasks,
+  selectTableSettings,
 } from './SubscriptionsSelectors';
 
 import reducer from './SubscriptionReducer';
@@ -25,7 +25,7 @@ import SubscriptionsPage from './SubscriptionsPage';
 // map state to props
 const mapStateToProps = (state) => {
   const subscriptions = selectSubscriptionsState(state);
-  const subscriptionTableSettings = state.katello.settings.tables[SUBSCRIPTION_TABLE_NAME] || {};
+  const subscriptionTableSettings = selectTableSettings(state, SUBSCRIPTION_TABLE_NAME);
 
   return {
     subscriptions,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.11.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,6 +118,9 @@ dependencies:
   name: foreman_docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.1.1
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
@@ -125,6 +128,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.1.1
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
@@ -1353,7 +1359,6 @@ files:
 - app/views/katello/sync_management/_product.html.erb
 - app/views/katello/sync_management/_products.html.erb
 - app/views/katello/sync_management/_repo.html.erb
-- app/views/katello/sync_management/_sync_plans.html.erb
 - app/views/katello/sync_management/index.html.erb
 - app/views/overrides/about/_installed_packages.html.erb
 - app/views/overrides/about/_system_status.html.erb
@@ -1628,6 +1633,7 @@ files:
 - db/migrate/20181027014323_add_applicable_modules.rb
 - db/migrate/20181219205642_create_yum_metadata_file.rb
 - db/migrate/20190107160723_units_uuid_to_backend_ident.rb
+- db/migrate/20190326145039_remove_version_date_from_ostree_branch.rb
 - db/seeds.d/101-locations.rb
 - db/seeds.d/102-organizations.rb
 - db/seeds.d/104-proxy.rb
@@ -2438,6 +2444,7 @@ files:
 - webpack/redux/OrganizationProducts/__tests__/__snapshots__/OrganizationProductsReducer.test.js.snap
 - webpack/redux/OrganizationProducts/__tests__/__snapshots__/OrganizationProductsSelectors.test.js.snap
 - webpack/redux/OrganizationProducts/index.js
+- webpack/redux/actions/RedHatRepositories/__tests__/helpers.test.js
 - webpack/redux/actions/RedHatRepositories/enabled.js
 - webpack/redux/actions/RedHatRepositories/helpers.js
 - webpack/redux/actions/RedHatRepositories/repositorySetRepositories.js