katello 3.7.0.rc2 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a4f6bd736dcb2608d0f0eb09fc42a3365633e81
-  data.tar.gz: d4d554bed1a2b7d416f8c57cf6e786fc2188aaa5
+  metadata.gz: 8fac07da0f8761539cf0d1277ef31e4afd4252e7
+  data.tar.gz: 0c327b63c0b1ea5296657f5551e80e61c98f84fd
 SHA512:
-  metadata.gz: b4e75ade9c719b6f7ba594591fdef8e7665440bf5781802ad5c80dc42d413bb8c2ce71ab17c7805665dfef6dc56e270d30227cbc6127e3f0db3956a0b5ea45d5
-  data.tar.gz: 3318e9625546af01d1f72dc7dc30f998d0213f124189cdb2cc4572652a644648d84935fc114e5d98c1c8368f979319929bb29b033a2c8f05519e717cbaeea9ce
+  metadata.gz: 0fa3348cfe3b738493a89038154f305bf1ba9ecb142c89e23851049f4d548e50bcdaeb564ed6bc7132e227cb54975df908f1b0114efc521b8c73e55e131c2924
+  data.tar.gz: '0941f97d419cea37695d53344727dfd59c8bae0104fa27ffe42bfcbb031dbdba8d029ab6b428383f5d494a1f74a426911685d39c3816bddc100787c786f17e43'

data/app/controllers/katello/api/v2/repository_sets_controller.rb

@@ -17,6 +17,7 @@ module Katello
     param :product_id, :number, :required => true, :desc => N_("ID of a product to list repository sets from")
     param :name, String, :required => false, :desc => N_("Repository set name to search on")
     param :enabled, :bool, :required => false, :desc => N_("If true, only return repository sets that have been enabled. Defaults to false")
+    param :with_active_subscription, :bool, :required => false, :desc => N_("If true, only return repository sets that are associated with an active subscriptions")
     param_group :search, Api::V2::ApiController
     def index
       respond(:collection => scoped_search(index_relation, nil, nil, :custom_sort => default_sort,
@@ -92,7 +93,15 @@ module Katello
         relation = @product.displayable_product_contents
       end
 
-      relation = relation.enabled(@organization) if ::Foreman::Cast.to_bool(params[:enabled])
+      if ::Foreman::Cast.to_bool(params[:enabled])
+        relation = relation.enabled(@organization)
+      elsif ::Foreman::Cast.to_bool(params[:with_active_subscription])
+        relation = relation.with_valid_subscription(@organization)
+      else
+        relation = relation.where(:id => Katello::ProductContent.with_valid_subscription(@organization)).or(
+            relation.where(:id => Katello::ProductContent.enabled(@organization)))
+      end
+
       relation = relation.where(Katello::Content.table_name => {:name => params[:name]}) if params[:name].present?
       relation.redhat
     end

data/app/models/katello/glue/candlepin/owner.rb

@@ -39,14 +39,6 @@ module Katello
         self.owner_details['contentAccessMode']
       end
 
-      def pools(consumer_uuid = nil)
-        if consumer_uuid
-          Resources::Candlepin::Owner.pools self.label, :consumer => consumer_uuid
-        else
-          Resources::Candlepin::Owner.pools self.label
-        end
-      end
-
       def generate_debug_cert
         Resources::Candlepin::Owner.generate_ueber_cert(label)
       end

data/app/models/katello/product_content.rb

@@ -12,7 +12,6 @@ module Katello
 
     scope :displayable, -> {
       joins(:content).where.not("#{content_table_name}.content_type IN (?)", Katello::Repository.undisplayable_types)
-      .order("LOWER(#{content_table_name}.name) ASC")
     }
 
     scope :redhat, -> {
@@ -32,6 +31,10 @@ module Katello
       joins(:content).where("#{self.content_table_name}.cp_content_id" => Katello::Repository.in_organization(organization).select(:content_id))
     end
 
+    def self.with_valid_subscription(organization)
+      where(:product_id => Katello::PoolProduct.where(:pool_id => organization.pools).select(:product_id))
+    end
+
     # used by Katello::Api::V2::RepositorySetsController#index
     def repositories
       product.repositories.in_default_view.has_url.where(:content_id => content.cp_content_id)

data/app/services/katello/ui_notifications/pulp/proxy_disk_space.rb

@@ -5,7 +5,9 @@ module Katello
         class << self
           def deliver!
             SmartProxy.unscoped.with_content.each do |proxy|
-              percentage = proxy.statuses[:pulp].storage['pulp_dir']['percent']
+              status = proxy.statuses[:pulp] || proxy.statuses[:pulpnode]
+              next unless (percentage = status&.storage&.dig('pulp_dir', 'percent'))
+
               if percentage[0..2].to_i < 90 && notification_already_exists?(proxy)
                 blueprint.notifications.where(subject: proxy).destroy_all
               elsif update_notifications(proxy).empty? && percentage[0..2].to_i > 90

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

@@ -41,6 +41,6 @@ end %>
     select_tag cs_select_id, options_from_collection_for_select(proxies, :id, :name, @hostgroup.content_source_id), :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, (@hostgroup || @host).content_source_id), :data => {"spinner_path" => spinner_path}, :class => 'form-control',  :name => cs_select_name, include_blank: true
+    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
   end
 end %>

data/lib/katello/version.rb

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

data/package.json

@@ -75,7 +75,8 @@
     "testPathIgnorePatterns": [
       "/node_modules/",
       "<rootDir>/foreman/",
-      "<rootDir>/.+fixtures.+"
+      "<rootDir>/.+fixtures.+",
+      "<rootDir>/engines"
     ],
     "moduleNameMapper": {
       "^.+\\.(css|scss)$": "identity-obj-proxy"

data/webpack/__mocks__/foremanReact/components/BreadcrumbBar.js

@@ -0,0 +1,3 @@
+
+const BreadcrumbsBar = () => jest.fn();
+export default BreadcrumbsBar;

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

@@ -0,0 +1,6 @@
+export const addToast = toast => ({
+  type: 'TOASTS_ADD',
+  payload: {
+    message: toast,
+  },
+});

data/webpack/mockRequest.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import MockAdapter from 'axios-mock-adapter';
 
 // TODO: figure out way to reuse this from foreman
-const mock = new MockAdapter(axios);
+export const mock = new MockAdapter(axios);
 const methods = {
   GET: 'onGet',
   POST: 'onPost',
@@ -15,10 +15,10 @@ const errorResponse = msg => ({ displayMessage: msg });
 export const mockRequest = ({
   method = 'GET',
   url,
-  data = null,
+  data,
   status = 200,
   response = null,
-}) => mock[methods[method]](url, data).reply(status, response);
+}) => mock[methods[method.toUpperCase()]](url, data).reply(status, response);
 
 export const mockErrorRequest = ({
   status = 500,

data/webpack/move_to_foreman/common/helpers.js

@@ -1,11 +1,41 @@
-export default {
-  urlBuilder(controller, action, id = undefined) {
-    return `/${controller}/${id ? `${id}/` : ''}${action}`;
-  },
+import { addToast } from 'foremanReact/redux/actions/toasts';
+
+const urlBuilder = (controller, action, id = undefined) =>
+  `/${controller}/${id ? `${id}/` : ''}${action}`;
+
+const urlWithSearch = (base, searchQuery) =>
+  `/${base}?search=${searchQuery}`;
+
+const stringIsInteger = (value) => {
+  // checking for positive integers only
+  const reg = new RegExp('^[0-9]+$');
+  return reg.test(value);
+};
 
-  urlWithSearch(base, searchQuery) {
-    return `/${base}?search=${searchQuery}`;
-  },
+export const getResponseErrorMsgs = ({ data }) => {
+  if (data) {
+    const messages = (data.errors || data.displayMessage || data.message || data.error);
+    return (Array.isArray(messages) ? messages : [messages]);
+  }
+  return [];
+};
+
+export const apiError = (actionType, result) => (dispatch) => {
+  const messages = getResponseErrorMsgs(result.response);
+  dispatch({
+    type: actionType,
+    payload: {
+      result,
+      messages,
+    },
+  });
+  messages.forEach((msg) => {
+    dispatch(addToast({
+      type: 'error',
+      message: msg,
+      sticky: true,
+    }));
+  });
 };
 
 export const KEY_CODES = {
@@ -14,4 +44,11 @@ export const KEY_CODES = {
   ESCAPE_KEY: 27,
 };
 
-export const getResponseError = ({ data }) => data && (data.displayMessage || data.error);
+export default {
+  urlBuilder,
+  urlWithSearch,
+  getResponseErrorMsgs,
+  apiError,
+  KEY_CODES,
+  stringIsInteger,
+};

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

@@ -28,7 +28,7 @@ export const loadRepositorySets = (extendedParams = {}) => (dispatch, getState)
   ]);
 
   const params = {
-    ...{ organization_id: orgId() },
+    ...{ organization_id: orgId(), with_active_subscription: true },
     ...propsToSnakeCase(extendedParams),
     search,
   };

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailActions.js

@@ -4,7 +4,7 @@ import {
   SUBSCRIPTION_DETAILS_SUCCESS,
   SUBSCRIPTION_DETAILS_FAILURE,
 } from './SubscriptionDetailConstants';
-import { getResponseError } from '../../../move_to_foreman/common/helpers.js';
+import { apiError } from '../../../move_to_foreman/common/helpers.js';
 
 export const loadSubscriptionDetails = subscriptionId => (dispatch) => {
   dispatch({ type: SUBSCRIPTION_DETAILS_REQUEST });
@@ -17,12 +17,7 @@ export const loadSubscriptionDetails = subscriptionId => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: SUBSCRIPTION_DETAILS_FAILURE,
-        error: getResponseError(result.response),
-      });
-    });
+    .catch(result => dispatch(apiError(SUBSCRIPTION_DETAILS_FAILURE, result)));
 };
 
 export default loadSubscriptionDetails;

data/webpack/scenes/Subscriptions/Details/SubscriptionDetailReducer.js

@@ -26,7 +26,7 @@ export default (state = initialState, action) => {
 
     case SUBSCRIPTION_DETAILS_FAILURE: {
       return state.merge({
-        error: action.error,
+        error: action.payload.message,
         loading: false,
       });
     }

data/webpack/scenes/Subscriptions/Details/SubscriptionDetails.js

@@ -1,33 +1,70 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Grid, Row, Col } from 'patternfly-react';
+import BreadcrumbsBar from 'foremanReact/components/BreadcrumbBar';
 import SubscriptionDetailInfo from './SubscriptionDetailInfo';
 import SubscriptionDetailAssociations from './SubscriptionDetailAssociations';
 import SubscriptionDetailProducts from './SubscriptionDetailProducts';
 import { LoadingState } from '../../../move_to_pf/LoadingState';
 import { notify } from '../../../move_to_foreman/foreman_toast_notifications';
+import api from '../../../services/api';
 
 class SubscriptionDetails extends Component {
+  constructor() {
+    super();
+    this.handleBreadcrumbSwitcherItem = this.handleBreadcrumbSwitcherItem.bind(this);
+  }
   componentDidMount() {
     // eslint-disable-next-line react/prop-types
     const routerParams = this.props.match.params;
     this.props.loadSubscriptionDetails(parseInt(routerParams.id, 10));
   }
 
+  componentDidUpdate(prevProps) {
+    const routerParams = this.props.match.params;
+    if (routerParams.id !== prevProps.match.params.id) {
+      this.props.loadSubscriptionDetails(parseInt(routerParams.id, 10));
+    }
+  }
+
+  handleBreadcrumbSwitcherItem(e, url) {
+    this.props.history.push(url);
+    e.preventDefault();
+  }
+
   render() {
     const { subscriptionDetails } = this.props;
+    const resource = {
+      nameField: 'name',
+      resourceUrl: api.getApiUrl('/subscriptions'),
+      switcherItemUrl: '/subscriptions/:id',
+    };
 
-    if (subscriptionDetails.error) { notify({ message: subscriptionDetails.error }); }
+    if (subscriptionDetails.error) {
+      notify({ message: subscriptionDetails.error });
+    }
 
     return (
       <Grid bsClass="container-fluid">
+        {!subscriptionDetails.loading && <BreadcrumbsBar
+          onSwitcherItemClick={(e, url) => this.handleBreadcrumbSwitcherItem(e, url)}
+          data={{
+            isSwitchable: true,
+            breadcrumbItems: [
+              {
+                caption: __('Subscriptions'),
+                onClick: () =>
+                  this.props.history.push('/subscriptions'),
+              },
+              {
+                caption: String(subscriptionDetails.name),
+              },
+            ],
+            resource,
+          }}
+        />}
         <div>
           <LoadingState loading={subscriptionDetails.loading} loadingText={__('Loading')}>
-            <Row>
-              <Col sm={12}>
-                <h1>{subscriptionDetails.name}</h1>
-              </Col>
-            </Row>
             <Row>
               <Col sm={6}>
                 <SubscriptionDetailInfo
@@ -53,6 +90,7 @@ class SubscriptionDetails extends Component {
 SubscriptionDetails.propTypes = {
   loadSubscriptionDetails: PropTypes.func.isRequired,
   subscriptionDetails: PropTypes.shape({}).isRequired,
+  history: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired,
 };
 
 export default SubscriptionDetails;

data/webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetailReducer.test.js

@@ -30,7 +30,9 @@ describe('subscriptions reducer', () => {
     const error = 'nothing worked';
     expect(reducer(initialState, {
       type: types.SUBSCRIPTION_DETAILS_FAILURE,
-      error,
+      payload: {
+        message: error,
+      },
     })).toEqual({
       ...initialState,
       error,

data/webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetails.test.js

@@ -19,7 +19,6 @@ describe('subscriptions details page', () => {
       subscriptionDetails={successState}
       match={match}
     />);
-    expect(wrapper.find('h1').text()).toEqual(successState.name);
     expect(wrapper.find(SubscriptionDetailAssociations)).toHaveLength(1);
     expect(wrapper.find(SubscriptionDetailInfo)).toHaveLength(1);
     expect(wrapper.find(SubscriptionDetailProducts)).toHaveLength(1);

data/webpack/scenes/Subscriptions/Details/__tests__/__snapshots__/SubscriptionDetails.test.js.snap

@@ -6,25 +6,33 @@ exports[`subscriptions details page should render and contain appropiate compone
   componentClass="div"
   fluid={false}
 >
+  <BreadcrumbsBar
+    data={
+      Object {
+        "breadcrumbItems": Array [
+          Object {
+            "caption": "Subscriptions",
+            "onClick": [Function],
+          },
+          Object {
+            "caption": "OpenShift Employee Subscription",
+          },
+        ],
+        "isSwitchable": true,
+        "resource": Object {
+          "nameField": "name",
+          "resourceUrl": "/katello/api/v2/subscriptions",
+          "switcherItemUrl": "/subscriptions/:id",
+        },
+      }
+    }
+    onSwitcherItemClick={[Function]}
+  />
   <div>
     <LoadingState
       loading={false}
       loadingText="Loading"
     >
-      <Row
-        bsClass="row"
-        componentClass="div"
-      >
-        <Col
-          bsClass="col"
-          componentClass="div"
-          sm={12}
-        >
-          <h1>
-            OpenShift Employee Subscription
-          </h1>
-        </Col>
-      </Row>
       <Row
         bsClass="row"
         componentClass="div"

data/webpack/scenes/Subscriptions/Details/__tests__/subscriptionDetails.fixtures.js

@@ -1,4 +1,5 @@
 import Immutable from 'seamless-immutable';
+import { toastErrorAction, failureAction } from '../../../../services/api/testHelpers';
 
 export const initialState = Immutable({
   loading: false,
@@ -148,10 +149,8 @@ export const loadSubscriptionsDetailsFailureActions = [
   {
     type: 'SUBSCRIPTION_DETAILS_REQUEST',
   },
-  {
-    error: 'Request failed with status code 500',
-    type: 'SUBSCRIPTION_DETAILS_FAILURE',
-  },
+  failureAction('SUBSCRIPTION_DETAILS_FAILURE', 'Request failed with status code 500'),
+  toastErrorAction('Request failed with status code 500'),
 ];
 
 export const loadSubscriptionsDetailsSuccessActions = [

data/webpack/scenes/Subscriptions/Details/index.js

@@ -1,6 +1,6 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
-
+import { withRouter } from 'react-router';
 import reducer from './SubscriptionDetailReducer';
 import * as subscriptionDetailActions from './SubscriptionDetailActions';
 import SubscriptionDetails from './SubscriptionDetails';
@@ -16,4 +16,4 @@ const mapDispatchToProps = dispatch => bindActionCreators(subscriptionDetailActi
 export const subscriptionDetails = reducer;
 
 // export connected component
-export default connect(mapStateToProps, mapDispatchToProps)(SubscriptionDetails);
+export default connect(mapStateToProps, mapDispatchToProps)(withRouter(SubscriptionDetails));

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

@@ -1,5 +1,6 @@
 import api, { orgId } from '../../../services/api';
 import { propsToSnakeCase } from '../../../services/index';
+import { apiError } from '../../../move_to_foreman/common/helpers.js';
 
 import {
   UPLOAD_MANIFEST_REQUEST,
@@ -34,12 +35,7 @@ export const uploadManifest = file => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: UPLOAD_MANIFEST_FAILURE,
-        result,
-      });
-    });
+    .catch(result => dispatch(apiError(UPLOAD_MANIFEST_FAILURE, result)));
 };
 
 export const refreshManifest = (extendedParams = {}) => (dispatch) => {
@@ -57,12 +53,7 @@ export const refreshManifest = (extendedParams = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: REFRESH_MANIFEST_FAILURE,
-        result,
-      });
-    });
+    .catch(result => dispatch(apiError(REFRESH_MANIFEST_FAILURE, result)));
 };
 
 export const deleteManifest = (extendedParams = {}) => (dispatch) => {
@@ -80,12 +71,7 @@ export const deleteManifest = (extendedParams = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: DELETE_MANIFEST_FAILURE,
-        result,
-      });
-    });
+    .catch(result => dispatch(apiError(DELETE_MANIFEST_FAILURE, result)));
 };
 
 export const loadManifestHistory = (extendedParams = {}) => (dispatch) => {
@@ -103,12 +89,7 @@ export const loadManifestHistory = (extendedParams = {}) => (dispatch) => {
         response: data,
       });
     })
-    .catch((result) => {
-      dispatch({
-        type: MANIFEST_HISTORY_FAILURE,
-        result,
-      });
-    });
+    .catch(result => dispatch(apiError(MANIFEST_HISTORY_FAILURE, result)));
 };
 
 export default loadManifestHistory;