katello 3.7.0 → 3.7.1

data/app/models/katello/subscription_status.rb

@@ -38,7 +38,7 @@ module Katello
 
     def to_status(options = {})
       return UNKNOWN unless host.subscription_facet.try(:uuid)
-      status_override = 'unsubscribed_hypervisor' if host.subscription_facet.hypervisor && host.subscription_facet.candlepin_consumer.entitlements.empty?
+      status_override = 'unsubscribed_hypervisor' if host.subscription_facet.hypervisor && !host.subscription_facet.candlepin_consumer.entitlements?
       status_override ||= options.fetch(:status_override, nil)
       status = status_override || Katello::Candlepin::Consumer.new(host.subscription_facet.uuid, host.organization.label).entitlement_status
 

data/app/services/katello/candlepin/consumer.rb

@@ -120,6 +120,14 @@ module Katello
         self.class.friendly_compliance_reasons(Resources::Candlepin::Consumer.compliance(uuid)['reasons'])
       end
 
+      def entitlements?
+        # use cahced consumer_attributes if possible
+        count = @consumer_attributes.try(:[], 'entitlementCount')
+        return count > 0 if count
+
+        !entitlements.empty?
+      end
+
       def self.friendly_compliance_reasons(candlepin_reasons)
         candlepin_reasons.map do |reason|
           product_name = reason['productName'] || reason['attributes']['name']

data/app/views/overrides/activation_keys/_host_environment_select.html.erb

@@ -35,12 +35,11 @@ end %>
 <% cs_select_name =  using_hostgroups_page? ? 'hostgroup[content_source_id]' : 'host[content_facet_attributes][content_source_id]' %>
 <% cs_select_attr = using_hostgroups_page? ? 'content_source' : 'content_facet.content_source' %>
 
-<% proxies = accessible_content_proxies(@host || @hostgroup) %>
 <%= field(f, cs_select_attr, {:label => _("Content Source")}) do
   if using_hostgroups_page?
-    select_tag cs_select_id, options_from_collection_for_select(proxies, :id, :name, @hostgroup.content_source_id), :data => {"spinner_path" => spinner_path},
+    select_tag cs_select_id, content_source_options(@hostgroup, :selected_host_group => @hostgroup.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_source)), :data => {"spinner_path" => spinner_path},
                :class => 'form-control',  :name => cs_select_name, include_blank: true
   else
-    select_tag cs_select_id, options_from_collection_for_select(proxies, :id, :name, @host.content_source_id), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cs_select_name, include_blank: true
+    select_tag cs_select_id, content_source_options(@host, :selected_host_group => @host.hostgroup, :include_blank => blank_or_inherit_with_id(f, :content_source)), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cs_select_name, include_blank: true
   end
 end %>

data/config/routes.rb

@@ -23,4 +23,5 @@ Katello::Engine.routes.draw do
 
   match '/xui' => 'react#index', :via => [:get]
   match '/xui/*page' => 'react#index', :via => [:get]
+  match '/organization_select' => 'react#index', :via => [:get]
 end

data/db/migrate/20180612163403_add_foreign_key_to_hypervisor_id.rb

@@ -1,5 +1,8 @@
 class AddForeignKeyToHypervisorId < ActiveRecord::Migration[5.1]
   def up
+    # Update all pools that have a hypervisor reference that's not a host before we add the FK
+    ::Katello::Pool.where.not(hypervisor_id: nil).where.not(hypervisor_id: Host::Managed.all).update_all(hypervisor_id: nil)
+
     add_foreign_key(:katello_pools, :hosts,
                     :name => 'katello_pools_hypervisor_fk', :column => 'hypervisor_id')
   end

data/db/seeds.d/75-job_templates.rb

@@ -7,10 +7,13 @@ if Katello.with_remote_execution?
         sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
         # import! was renamed to import_raw! around 1.3.1
         if JobTemplate.respond_to?('import_raw!')
-          JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
         else
-          JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
+          template = JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
         end
+
+        template.organizations << Organization.unscoped.all if template && template.organizations.empty?
+        template.locations << Location.unscoped.all if template && template.locations.empty?
       end
     end
   end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-repository-sets-modal.controller.js

@@ -28,14 +28,15 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkRepositorySe
         nutupaneParams = {
             'organization_id': CurrentOrganization,
             'offset': 0,
-            'sort_by': 'name',
-            'sort_order': 'ASC',
             'paged': true
         };
 
-        nutupane = new Nutupane(RepositorySet, nutupaneParams, 'queryPaged');
+        nutupane = new Nutupane(RepositorySet, nutupaneParams,
+          'queryPaged', {disableAutoLoad: true});
         $scope.controllerName = 'katello_repository_sets';
         nutupane.masterOnly = true;
+        nutupane.setSearchKey('repoSetsSearch');
+        nutupane.load();
 
         $scope.table = nutupane.table;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-subscriptions-modal.controller.js

@@ -44,11 +44,14 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscription
                 });
             };
 
-            $scope.contentNutupane = new Nutupane(Subscription, params);
+
+            $scope.contentNutupane = new Nutupane(Subscription, params,
+              'queryPaged', {disableAutoLoad: true});
             $scope.controllerName = 'katello_subscriptions';
             $scope.table = $scope.contentNutupane.table;
             $scope.contentNutupane.setSearchKey('subscriptionSearch');
             $scope.contentNutupane.masterOnly = true;
+            $scope.contentNutupane.load();
             $scope.groupedSubscriptions = {};
 
             $scope.$watch('table.rows', function (rows) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js

@@ -18,7 +18,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesInstalled
         var packagesNutupane;
 
         $scope.removeSelectedPackages = function () {
-            var selected = $scope.table.getSelected();
+            var selected = _.map($scope.table.getSelected(), 'name');
 
             if (!$scope.working) {
                 $scope.working = true;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery-create.html

@@ -44,7 +44,7 @@
 
     <div bst-form-group ng-show="createRepoChoices.newProduct === 'true' && contentCredentials.length !== 0"
          label="{{ 'GPG Key' | translate }}">
-      <select class="form-control" ng-model="createRepoChoices.product.content_credential_id"
+      <select class="form-control" ng-model="createRepoChoices.product.gpg_key_id"
               ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials"/>
     </div>
 

data/engines/bastion_katello/app/assets/stylesheets/bastion_katello/bastion_katello.scss

@@ -38,3 +38,8 @@
 .bottom-padded-content {
   padding-bottom: 10%;
 }
+
+.modal-body .uib-time input {
+  width: 100%;
+  padding-right: 6px;
+}

data/lib/katello/tasks/clean_backend_objects.rake

@@ -42,17 +42,17 @@ namespace :katello do
     def cleanup_hosts(cleaner)
       cleaner.hosts_with_nil_facets.each do |host|
         print "Host #{host.id} #{host.name} is partially missing subscription information.  Un-registering\n"
-        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host) }
+        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host, host_unregister_options(host)) }
       end
 
       cleaner.hosts_with_no_subscriptions.each do |host|
         print "Host #{host.id} #{host.name} #{host.subscription_facet.try(:uuid)} is partially missing subscription information.  Un-registering\n"
-        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host) }
+        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host, host_unregister_options(host)) }
       end
 
       cleaner.hosts_with_no_content.each do |host|
         print "Host #{host.id} #{host.name} #{host.content_facet.try(:uuid)} is partially missing content information.  Un-registering\n"
-        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host) }
+        execute("Failed to delete host") { Katello::RegistrationManager.unregister_host(host, host_unregister_options(host)) }
       end
     end
 
@@ -72,6 +72,15 @@ namespace :katello do
       end
     end
 
+    def host_unregister_options(host)
+      if host.managed? || host.compute_resource
+        print "Leaving provisioning record for #{host.name} in place, it is either managed or assigned to a compute resource."
+        {:unregistering => true}
+      else
+        {}
+      end
+    end
+
     # rubocop:disable HandleExceptions
     def execute(error_msg)
       if ENV['COMMIT'] == 'true'

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.7.0".freeze
+  VERSION = "3.7.1".freeze
 end

data/package.json

@@ -9,7 +9,9 @@
     "test:current": "jest webpack --watch",
     "format": "prettier --single-quote --trailing-comma es5 --write 'webpack/**/*.js'",
     "build": "npm run format && npm run lint",
-    "lint": "eslint --fix webpack/ || exit 0"
+    "lint": "eslint webpack/ || exit 0",
+    "lint:fix": "eslint --fix webpack/ || exit 0",
+    "lint:test": "npm run lint && npm test"
   },
   "repository": {
     "type": "git",
@@ -22,11 +24,11 @@
     "@storybook/react": "^3.2.17",
     "@storybook/storybook-deployer": "^2.0.0",
     "babel-core": "^6.26.3",
-    "babel-jest": "^21.2.0",
+    "babel-jest": "^23.4.0",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
-    "babel-preset-env": "^1.6.0",
     "babel-polyfill": "^6.26.0",
+    "babel-preset-env": "^1.6.0",
     "babel-preset-react": "^6.24.1",
     "enzyme": "^3.2.0",
     "enzyme-adapter-react-16": "^1.1.0",
@@ -34,11 +36,11 @@
     "eslint": "^4.8.0",
     "eslint-config-airbnb": "^16.0.0",
     "eslint-plugin-import": "^2.7.0",
-    "eslint-plugin-jest": "^21.2.0",
+    "eslint-plugin-jest": "^21.18.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-react": "^7.4.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^21.2.1",
+    "jest": "^23.4.1",
     "prettier": "^1.7.4",
     "react-test-renderer": "^16.0.0",
     "redux-mock-store": "^1.3.0",
@@ -53,10 +55,10 @@
     "jed": "^1.1.1",
     "lodash": "^4.17.5",
     "patternfly": "^3.41.1",
-    "patternfly-react": "2.5.1",
+    "patternfly-react": "^2.5.1",
     "prop-types": "^15.6.0",
     "react": "^16.3.1",
-    "react-bootstrap": "^0.31.5",
+    "react-bootstrap": "^0.32.1",
     "react-bootstrap-tooltip-button": "^1.0.6",
     "react-dom": "^16.3.1",
     "react-ellipsis-with-tooltip": "^1.0.7",
@@ -72,6 +74,7 @@
       "raf/polyfill",
       "./webpack/test_setup.js"
     ],
+    "setupTestFrameworkScriptFile": "./webpack/global_test_setup.js",
     "testPathIgnorePatterns": [
       "/node_modules/",
       "<rootDir>/foreman/",

data/webpack/__mocks__/foremanReact/redux.js

@@ -0,0 +1,3 @@
+const state = { katello: { setOrganization: { currentId: 1 } } };
+const store = { getState: () => state };
+export default store;

data/webpack/__mocks__/foremanReact/redux/actions/toasts.js

@@ -4,3 +4,5 @@ export const addToast = toast => ({
     message: toast,
   },
 });
+
+export default addToast;

data/webpack/components/Search/Search.test.js

@@ -1,17 +1,19 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import toJson from 'enzyme-to-json';
+import { mock as mockApi } from '../../mockRequest';
 
 import Search from '../Search';
 
 describe('Search component', () => {
   const getBaseProps = () => ({
     onSearch: () => {},
-    getAutoCompleteParams: () => ({}),
+    getAutoCompleteParams: () => ({ endpoint: '/fake' }),
   });
 
   describe('rendering', () => {
     it('renders correctly', () => {
+      mockApi.onGet('/katello/api/v2/fake').reply(200, []);
       const component = shallow(<Search {...getBaseProps()} />);
 
       expect(toJson(component)).toMatchSnapshot();

data/webpack/components/SelectOrg/SelectOrg.scss

@@ -0,0 +1,3 @@
+#select-org.well {
+    margin-top: 30px;  
+}

data/webpack/components/SelectOrg/SelectOrgAction.js

@@ -0,0 +1,41 @@
+import { foremanApi, foremanEndpoint } from '../../services/api';
+import {
+  GET_ORGANIZATIONS_LIST_SUCCESS,
+  GET_ORGANIZATIONS_LIST_FAILURE,
+  CHANGE_CURRENT_ORGANIZATION_SUCCESS,
+  CHANGE_CURRENT_ORGANIZATION_FAILURE,
+  GET_ORGANIZATIONS_LIST_REQUEST,
+} from '../../redux/consts';
+
+export const getOrganiztionsList = () => (dispatch) => {
+  dispatch({ type: GET_ORGANIZATIONS_LIST_REQUEST });
+  foremanApi
+    .get('/organizations')
+    .then(({ data }) => {
+      dispatch({
+        type: GET_ORGANIZATIONS_LIST_SUCCESS,
+        payload: data,
+      });
+    })
+    .catch((result) => {
+      dispatch({
+        type: GET_ORGANIZATIONS_LIST_FAILURE,
+        payload: result,
+      });
+    });
+};
+
+export const changeCurrentOrgaziation = orgID => dispatch => foremanEndpoint
+  .get(`organizations/${orgID}/select`)
+  .then(() => {
+    dispatch({
+      type: CHANGE_CURRENT_ORGANIZATION_SUCCESS,
+      payload: orgID,
+    });
+  })
+  .catch(() => {
+    dispatch({
+      type: CHANGE_CURRENT_ORGANIZATION_FAILURE,
+      payload: orgID,
+    });
+  });

data/webpack/components/SelectOrg/SelectOrgReducer.js

@@ -0,0 +1,33 @@
+import Immutable from 'seamless-immutable';
+import {
+  GET_ORGANIZATIONS_LIST_SUCCESS,
+  GET_ORGANIZATIONS_LIST_REQUEST,
+  GET_ORGANIZATIONS_LIST_FAILURE,
+  CHANGE_CURRENT_ORGANIZATION_SUCCESS,
+} from '../../redux/consts';
+
+const initialState = Immutable({ loading: false });
+export default (state = initialState, action) => {
+  const { payload } = action;
+
+  switch (action.type) {
+    case GET_ORGANIZATIONS_LIST_REQUEST:
+      return state.set('loading', true);
+
+    case GET_ORGANIZATIONS_LIST_SUCCESS:
+      return state
+        .set('list', payload.results)
+        .set('loading', false);
+
+    case CHANGE_CURRENT_ORGANIZATION_SUCCESS:
+      return state
+        .set('currentId', payload)
+        .set('loading', false);
+
+    case GET_ORGANIZATIONS_LIST_FAILURE:
+      return state
+        .set('error', payload);
+    default:
+      return state;
+  }
+};

data/webpack/components/SelectOrg/SetOrganization.js

@@ -0,0 +1,116 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { Form, Button } from 'patternfly-react';
+import { withRouter } from 'react-router';
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import Select from '../../move_to_pf/Select/Select';
+import * as SelectOrgActions from './SelectOrgAction';
+import reducer from './SelectOrgReducer';
+import { LoadingState } from '../../move_to_pf/LoadingState';
+import './SelectOrg.scss';
+
+class SetOrganization extends Component {
+  constructor(props) {
+    super(props);
+    this.onSelectItem = this.onSelectItem.bind(this);
+    this.onSend = this.onSend.bind(this);
+    this.state = { disabled: true };
+  }
+
+  componentDidMount() {
+    this.props.getOrganiztionsList();
+  }
+
+  onSelectItem(e) {
+    this.setState({
+      item: e.target.options[e.target.selectedIndex].text,
+      id: e.target.value,
+      disabled: false,
+    });
+  }
+
+  onSend() {
+    const {
+      history,
+      changeCurrentOrgaziation,
+      redirectPath,
+    } = this.props;
+    const { id, item } = this.state;
+
+    changeCurrentOrgaziation(`${id}-${item}`).then(() =>
+      history.push({
+        pathname: redirectPath,
+        state: { orgChanged: this.state.item },
+      }));
+  }
+
+  render() {
+    const {
+      list,
+      loading,
+    } = this.props;
+
+    return (
+      <div id="select-org" className="well col-sm-6 col-sm-offset-3">
+        <LoadingState loading={loading} loadingText={__('Loading')}>
+          <Form>
+            <h1 className="text-center">{__('Select an Organization')}</h1>
+            <p className="text-center">
+              {__('The page you are attempting to access requires selecting a specific organization.')}
+            </p>
+            <p className="text-center">
+              {__('Please select one from the list below and you will be redirected.')}
+            </p>
+
+            <div className="form-group">
+              <div className="col-sm-6 col-sm-offset-3">
+                <Select
+                  value={this.state.id}
+                  placeholder={__('Select an organization')}
+                  id="organization"
+                  name="organization"
+                  className="form-control"
+                  options={list}
+                  onChange={this.onSelectItem}
+                />
+
+              </div>
+
+              <div className="col-sm-3">
+                <Button disabled={this.state.disabled} className="btn btn-primary" onClick={this.onSend}>
+                  {__('Select')}
+                </Button>
+              </div>
+            </div>
+          </Form>
+        </LoadingState>
+      </div>
+    );
+  }
+}
+
+
+SetOrganization.propTypes = {
+  list: PropTypes.arrayOf(PropTypes.object),
+  loading: PropTypes.bool.isRequired,
+  changeCurrentOrgaziation: PropTypes.func.isRequired,
+  history: PropTypes.shape({}).isRequired,
+  redirectPath: PropTypes.string.isRequired,
+  getOrganiztionsList: PropTypes.func.isRequired,
+};
+
+SetOrganization.defaultProps = {
+  list: [],
+};
+
+const mapStateToProps = state => ({
+  orgId: state.katello.setOrganization.currentId,
+  list: state.katello.setOrganization.list,
+  loading: state.katello.setOrganization.loading,
+});
+export const setOrganization = reducer;
+const mapDispatchToProps = dispatch =>
+  bindActionCreators(SelectOrgActions, dispatch);
+
+export default connect(mapStateToProps, mapDispatchToProps)(withRouter(SetOrganization));