katello 3.8.0.rc2 → 3.8.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a29f4138e7efc30092c57d2d41cba2daa63d8f96
-  data.tar.gz: 2d6286442b855654c1baaa52db2c96946b153c39
+  metadata.gz: c1e8d4def57738f812e6e9463c3a80a0ef587333
+  data.tar.gz: b2150d3ceeafdbd2b34ec05c8d85b69597183f10
 SHA512:
-  metadata.gz: 98f1753327006589d1804417424b7b5252bbe60ba35cef2cac87a8b2f5088548dbfeedc5212f88d70240b97f7b80c12fad55e87c9d1985fae771120baff2bb39
-  data.tar.gz: d7fed987e7d06d564e141b5675c08be8dc960f8b0f2e87531f3ef2268bf72250b228c518d4f6cc04ca261d4be69e166b88556ce760e5d0d6c3bf9b57fc0aef46
+  metadata.gz: 560eabd60a83230da3567573dfa0be73d488d92e47e5c4a1124356f1f0b54a9b82614fae8a8c3d6fa86a589779d8db6d4bc6109ef1bd5e318e7fa54ac51ca2a4
+  data.tar.gz: 4aa5dfd8a7d86cb8e402685d1e1da7da3a03e32baa30ae1f991eccb524f127f623a1b053357f5bb09d0a24f7e82b81f167269519cc8102cc111c5d3194eb97db

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

@@ -69,6 +69,7 @@ module Katello
     param :deb_id, String, :desc => N_("Id of a deb package to find repositories that contain the deb")
     param :erratum_id, String, :desc => N_("Id of an erratum to find repositories that contain the erratum")
     param :rpm_id, String, :desc => N_("Id of a rpm package to find repositories that contain the rpm")
+    param :file_id, String, :desc => N_("Id of a file to find repositories that contain the file")
     param :ostree_branch_id, String, :desc => N_("Id of an ostree branch to find repositories that contain that branch")
     param :library, :bool, :desc => N_("show repositories in Library and the default content view")
     param :content_type, RepositoryTypeManager.repository_types.keys, :desc => N_("limit to only repositories of this type")
@@ -107,32 +108,9 @@ module Katello
       query = index_relation_product(query)
       query = query.where(:content_type => params[:content_type]) if params[:content_type]
       query = query.where(:name => params[:name]) if params[:name]
-
-      if params[:deb_id]
-        query = query.joins(:debs).where("#{Deb.table_name}.id" => Deb.with_identifiers(params[:deb_id]))
-      end
-
-      if params[:erratum_id]
-        query = query.joins(:errata).where("#{Erratum.table_name}.id" => Erratum.with_identifiers(params[:erratum_id]))
-      end
-
-      if params[:rpm_id]
-        query = query.joins(:rpms).where("#{Rpm.table_name}.id" => Rpm.with_identifiers(params[:rpm_id]))
-      end
-
-      if params[:ostree_branch_id]
-        query = query.joins(:ostree_branches).where("#{OstreeBranch.table_name}.id" => OstreeBranch.with_identifiers(params[:ostree_branch_id]))
-      end
-
-      if params[:puppet_module_id]
-        query = query
-                  .joins(:puppet_modules)
-                  .where("#{PuppetModule.table_name}.id" => PuppetModule.with_identifiers(params[:puppet_module_id]))
-      end
-
+      query = index_relation_content_unit(query)
       query = index_relation_content_view(query)
       query = index_relation_environment(query)
-
       query
     end
 
@@ -171,6 +149,41 @@ module Katello
       query
     end
 
+    def index_relation_content_unit(query)
+      if params[:deb_id]
+        query = query.joins(:debs)
+          .where("#{Deb.table_name}.id" => Deb.with_identifiers(params[:deb_id]))
+      end
+
+      if params[:erratum_id]
+        query = query.joins(:errata)
+          .where("#{Erratum.table_name}.id" => Erratum.with_identifiers(params[:erratum_id]))
+      end
+
+      if params[:rpm_id]
+        query = query.joins(:rpms)
+          .where("#{Rpm.table_name}.id" => Rpm.with_identifiers(params[:rpm_id]))
+      end
+
+      if params[:file_id]
+        query = query.joins(:files)
+          .where("#{FileUnit.table_name}.id" => FileUnit.with_identifiers(params[:file_id]))
+      end
+
+      if params[:ostree_branch_id]
+        query = query.joins(:ostree_branches)
+          .where("#{OstreeBranch.table_name}.id" => OstreeBranch.with_identifiers(params[:ostree_branch_id]))
+      end
+
+      if params[:puppet_module_id]
+        query = query
+                  .joins(:puppet_modules)
+                  .where("#{PuppetModule.table_name}.id" => PuppetModule.with_identifiers(params[:puppet_module_id]))
+      end
+
+      query
+    end
+
     api :POST, "/repositories", N_("Create a custom repository")
     param :name, String, :required => true
     param_group :repo_create

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/views/content-host-errata.html

@@ -17,7 +17,7 @@
         Content View and Lifecycle Environment.  In order to apply such Errata an Incremental Update is required.
       </span>
 
-      <a ui-sref="errata.index" translate>Click here to select Errata for an Incremental Update.</a>
+      <a ui-sref="errata" translate>Click here to select Errata for an Incremental Update.</a>
     </p>
   </div>
 

data/lib/katello/version.rb

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

data/webpack/scenes/Products/ProductActions.js

@@ -0,0 +1,24 @@
+import api, { orgId } from '../../services/api';
+
+import {
+  PRODUCTS_REQUEST,
+  PRODUCTS_SUCCESS,
+  PRODUCTS_FAILURE,
+} from './ProductConstants';
+import { apiError } from '../../move_to_foreman/common/helpers.js';
+
+export const loadProducts = (params = {}) => (dispatch) => {
+  dispatch({ type: PRODUCTS_REQUEST });
+
+  return api
+    .get(`/organizations/${orgId()}/products/`, {}, params)
+    .then(({ data }) => {
+      dispatch({
+        type: PRODUCTS_SUCCESS,
+        response: data,
+      });
+    })
+    .catch(result => dispatch(apiError(PRODUCTS_FAILURE, result)));
+};
+
+export default loadProducts;

data/webpack/scenes/Products/ProductConstants.js

@@ -0,0 +1,3 @@
+export const PRODUCTS_REQUEST = 'PRODUCTS_REQUEST';
+export const PRODUCTS_SUCCESS = 'PRODUCTS_SUCCESS';
+export const PRODUCTS_FAILURE = 'PRODUCTS_FAILURE';

data/webpack/scenes/Products/__tests__/ProductActions.test.js

@@ -0,0 +1,40 @@
+import thunk from 'redux-thunk';
+import Immutable from 'seamless-immutable';
+import configureMockStore from 'redux-mock-store';
+import { mock, mockRequest, mockErrorRequest } from '../../../mockRequest';
+import {
+  failureActions,
+  successActions,
+  requestSuccessResponse,
+} from './products.fixtures';
+import { loadProducts } from '../ProductActions';
+
+const mockStore = configureMockStore([thunk]);
+const store = mockStore({ e: Immutable({}) });
+
+beforeEach(() => {
+  store.clearActions();
+  mock.reset();
+});
+
+describe('product actions', () => {
+  describe('loadProducts', () => {
+    it('handles failed PRODUCTS_REQUEST', () => {
+      mockErrorRequest({
+        url: '/katello/api/v2/organizations/1/products/',
+        status: 422,
+      });
+      return store.dispatch(loadProducts())
+        .then(() => expect(store.getActions()).toEqual(failureActions));
+    });
+
+    it('handles successful PRODUCTS_REQUEST', () => {
+      mockRequest({
+        url: '/katello/api/v2/organizations/1/products/',
+        response: requestSuccessResponse,
+      });
+      return store.dispatch(loadProducts())
+        .then(() => expect(store.getActions()).toEqual(successActions));
+    });
+  });
+});

data/webpack/scenes/Products/__tests__/products.fixtures.js

@@ -0,0 +1,90 @@
+import Immutable from 'seamless-immutable';
+import { toastErrorAction, failureAction } from '../../../services/api/testHelpers';
+
+export const initialState = Immutable({
+  loading: true,
+  results: [],
+  pagination: {
+    page: 0,
+    perPage: 20,
+  },
+});
+
+export const loadingState = Immutable({
+  ...initialState,
+});
+
+export const emptyState = Immutable({
+  ...loadingState,
+  loading: false,
+});
+
+export const availableContent = Immutable({
+  enabled: true,
+  product_id: 114,
+  content: {
+    name: 'Red Hat Enterprise Linux 7 Server (RPMs)',
+    label: 'rhel-7-server-rpms',
+    vendor: 'Red Hat',
+    content_url: '/content/dist/rhel/server/7/$releasever/$basearch/os',
+    gpg_url: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release',
+    id: '2456',
+    type: 'yum',
+    gpgUrl: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release',
+    contentUrl: '/content/dist/rhel/server/7/$releasever/$basearch/os',
+  },
+});
+
+export const product = (content = []) => ({
+  id: 114,
+  cp_id: '69',
+  name: 'Red Hat Enterprise Linux Server',
+  label: 'Red_Hat_Enterprise_Linux_Server',
+  description: null,
+  provider_id: 2,
+  sync_plan_id: null,
+  sync_summary: {},
+  gpg_key_id: null,
+  ssl_ca_cert_id: null,
+  ssl_client_cert_id: null,
+  ssl_client_key_id: null,
+  sync_state: null,
+  last_sync: null,
+  last_sync_words: null,
+  organization_id: 1,
+  organization: {
+    name: 'Default Organization',
+    label: 'Default_Organization',
+    id: 1,
+  },
+  available_content: content,
+  sync_plan: null,
+  repository_count: 1,
+});
+
+export const requestSuccessResponse = Immutable({
+  results: [
+    product([availableContent]),
+  ],
+});
+
+const request = {
+  type: 'PRODUCTS_REQUEST',
+};
+
+export const successActions = [
+  request,
+  {
+    type: 'PRODUCTS_SUCCESS',
+    response: requestSuccessResponse,
+    search: undefined,
+  },
+];
+
+export const failureActions = [
+  {
+    type: 'PRODUCTS_REQUEST',
+  },
+  failureAction('PRODUCTS_FAILURE'),
+  toastErrorAction(),
+];

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

@@ -0,0 +1,54 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Col, ListView } from 'patternfly-react';
+import SubscriptionDetailProduct from './SubscriptionDetailProduct';
+
+const SubscriptionDetailEnabledProducts = ({ enabledProducts }) => {
+  const listItems = enabledProducts.results.map(product => ({
+    index: product.id,
+    title: product.name,
+    availableContent: (
+      product.available_content.map(c => (
+        {
+          enabled: c.enabled,
+          ...c.content,
+        }
+      ))
+    ),
+  }));
+
+  if (listItems.length > 0) {
+    return (
+      <ListView>
+        {listItems.map(({
+              index,
+              title,
+              availableContent,
+            }) => (
+              <ListView.Item
+                key={index}
+                heading={title}
+                hideCloseIcon
+              >
+
+                <Col sm={12}>
+                  {availableContent.map(content => (
+                    <SubscriptionDetailProduct key={content.id} content={content} />
+                  ))}
+                </Col>
+              </ListView.Item>
+        ))}
+      </ListView>
+    );
+  }
+
+  return (
+    <div>{ __('No products are enabled.') }</div>
+  );
+};
+
+SubscriptionDetailEnabledProducts.propTypes = {
+  enabledProducts: PropTypes.shape({}).isRequired,
+};
+
+export default SubscriptionDetailEnabledProducts;

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

@@ -0,0 +1,29 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Row, Col } from 'patternfly-react';
+
+const SubscriptionDetailProduct = ({ content }) => (
+  <Row key={content.id}>
+    <Col sm={12}>
+      <Row><u>{content.name}</u></Row>
+    </Col>
+    <Col sm={3}>
+      <Row>{ __('Content Download URL') }</Row>
+      <Row>{ __('GPG Key URL') }</Row>
+      <Row>{ __('Repo Type') }</Row>
+      <Row>{ __('Enabled?') }</Row>
+    </Col>
+    <Col sm={9}>
+      <Row>{content.content_url}</Row>
+      <Row>{content.gpg_url}</Row>
+      <Row>{content.type}</Row>
+      <Row>{content.enabled ? __('yes') : __('no')}</Row>
+    </Col>
+  </Row>
+);
+
+SubscriptionDetailProduct.propTypes = {
+  content: PropTypes.shape({}).isRequired,
+};
+
+export default SubscriptionDetailProduct;

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

@@ -4,9 +4,18 @@ import {
   SUBSCRIPTION_DETAILS_SUCCESS,
   SUBSCRIPTION_DETAILS_FAILURE,
 } from './SubscriptionDetailConstants';
+import {
+  PRODUCTS_REQUEST,
+  PRODUCTS_SUCCESS,
+  PRODUCTS_FAILURE,
+} from '../../Products/ProductConstants';
 
 const initialState = Immutable({
   loading: false,
+  enabledProducts: {
+    results: [],
+    total: 0,
+  },
 });
 
 export default (state = initialState, action) => {
@@ -15,6 +24,10 @@ export default (state = initialState, action) => {
       return state.set('loading', true);
     }
 
+    case PRODUCTS_REQUEST: {
+      return state.set('loading', true);
+    }
+
     case SUBSCRIPTION_DETAILS_SUCCESS: {
       const subscriptionDetails = action.response;
 
@@ -24,6 +37,15 @@ export default (state = initialState, action) => {
       });
     }
 
+    case PRODUCTS_SUCCESS: {
+      const enabledProducts = { enabledProducts: action.response };
+
+      return state.merge({
+        ...enabledProducts,
+        loading: false,
+      });
+    }
+
     case SUBSCRIPTION_DETAILS_FAILURE: {
       return state.merge({
         error: action.payload.message,
@@ -31,6 +53,13 @@ export default (state = initialState, action) => {
       });
     }
 
+    case PRODUCTS_FAILURE: {
+      return state.merge({
+        error: action.payload.message,
+        loading: false,
+      });
+    }
+
     default:
       return state;
   }

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

@@ -1,10 +1,11 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Grid, Row, Col } from 'patternfly-react';
+import { Nav, NavItem, TabPane, TabContent, TabContainer, 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 SubscriptionDetailEnabledProducts from './SubscriptionDetailEnabledProducts';
 import { LoadingState } from '../../../move_to_pf/LoadingState';
 import { notify } from '../../../move_to_foreman/foreman_toast_notifications';
 import api from '../../../services/api';
@@ -18,12 +19,22 @@ class SubscriptionDetails extends Component {
     // eslint-disable-next-line react/prop-types
     const routerParams = this.props.match.params;
     this.props.loadSubscriptionDetails(parseInt(routerParams.id, 10));
+    this.props.loadProducts({
+      subscription_id: parseInt(routerParams.id, 10),
+      include_available_content: true,
+      enabled: true,
+    });
   }
 
   componentDidUpdate(prevProps) {
     const routerParams = this.props.match.params;
     if (routerParams.id !== prevProps.match.params.id) {
       this.props.loadSubscriptionDetails(parseInt(routerParams.id, 10));
+      this.props.loadProducts({
+        subscription_id: parseInt(routerParams.id, 10),
+        include_available_content: true,
+        enabled: true,
+      });
     }
   }
 
@@ -34,6 +45,8 @@ class SubscriptionDetails extends Component {
 
   render() {
     const { subscriptionDetails } = this.props;
+
+
     const resource = {
       nameField: 'name',
       resourceUrl: api.getApiUrl('/subscriptions'),
@@ -45,7 +58,7 @@ class SubscriptionDetails extends Component {
     }
 
     return (
-      <Grid bsClass="container-fluid">
+      <div>
         {!subscriptionDetails.loading && <BreadcrumbsBar
           onSwitcherItemClick={(e, url) => this.handleBreadcrumbSwitcherItem(e, url)}
           data={{
@@ -63,32 +76,64 @@ class SubscriptionDetails extends Component {
             resource,
           }}
         />}
-        <div>
-          <LoadingState loading={subscriptionDetails.loading} loadingText={__('Loading')}>
-            <Row>
-              <Col sm={6}>
-                <SubscriptionDetailInfo
-                  subscriptionDetails={subscriptionDetails}
-                />
-              </Col>
-              <Col sm={6}>
-                <SubscriptionDetailAssociations
-                  subscriptionDetails={subscriptionDetails}
-                />
-                <SubscriptionDetailProducts
-                  subscriptionDetails={subscriptionDetails}
-                />
-              </Col>
-            </Row>
-          </LoadingState>
-        </div>
-      </Grid>
+
+        <TabContainer id="subscription-tabs-container" defaultActiveKey={1}>
+          <div>
+            <LoadingState loading={subscriptionDetails.loading} loadingText={__('Loading')}>
+              <Nav bsClass="nav nav-tabs">
+                <NavItem eventKey={1}>
+                  <div>{__('Details')}</div>
+                </NavItem>
+                <NavItem eventKey={2}>
+                  <div>{__('Enabled Products')}</div>
+                </NavItem>
+              </Nav>
+              <Grid bsClass="container-fluid">
+                <TabContent animation={false}>
+                  <TabPane eventKey={1}>
+                    <div>
+                      <Row>
+                        <Col sm={6}>
+                          <SubscriptionDetailInfo
+                            subscriptionDetails={subscriptionDetails}
+                          />
+                        </Col>
+                        <Col sm={6}>
+                          <SubscriptionDetailAssociations
+                            subscriptionDetails={subscriptionDetails}
+                          />
+                          <SubscriptionDetailProducts
+                            subscriptionDetails={subscriptionDetails}
+                          />
+                        </Col>
+                      </Row>
+                    </div>
+                  </TabPane>
+
+                  <TabPane eventKey={2}>
+                    <div>
+                      <Row>
+                        <Col sm={12}>
+                          <SubscriptionDetailEnabledProducts
+                            enabledProducts={subscriptionDetails.enabledProducts}
+                          />
+                        </Col>
+                      </Row>
+                    </div>
+                  </TabPane>
+                </TabContent>
+              </Grid>
+            </LoadingState>
+          </div>
+        </TabContainer>
+      </div>
     );
   }
 }
 
 SubscriptionDetails.propTypes = {
   loadSubscriptionDetails: PropTypes.func.isRequired,
+  loadProducts: PropTypes.func.isRequired,
   subscriptionDetails: PropTypes.shape({}).isRequired,
   history: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired,
 };