katello 3.12.0 → 3.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1014f15535a58f5e1728c5a9bb6c564a9b9a095b1efa80efa6a9f4249d56824c
-  data.tar.gz: f655e1161eb1767cc87b8e9de5883befe95968202ade0a29eae5912c2436e9d4
+  metadata.gz: 45cc83708ed5880a23368a5f1b29b58e0c442475b96036d324f6e92c4d5aa308
+  data.tar.gz: e23464e83cf613250d03c4b980482716a5f5cee3640784669f5a8b7c0a09cc4f
 SHA512:
-  metadata.gz: 9295f9e67103e6913e61ed365389c705113ca12638a413d21020f7d596fc0ffd0063652fcd7435fa496facc62122d1f948cb713bc7f375c0b96e642002d8e204
-  data.tar.gz: 84f9ad06abe7182a733551da25fecfdea1857927f77b98670fc54fbe832c2455e3d5701912bb6b15e9d3d9889d675d460e159a18ea73f277d2cb4f1f8702a2bc
+  metadata.gz: 75174382112a3331e2917fb949f30c66987b9a7b5b0f71363de706ca8f4b85094f662c25310b3cc37500e49c07f4b2c9d5011030926a5dc7e5dfcffa026e840c
+  data.tar.gz: 5ce0ed0ad5fd4f2666730c73d5ece96452132b5a6e26702d0c36eb14422392dc6b6852ce30189a167a2f47b382b9884102fb742c91262b74527210e47e4a7967

data/app/lib/actions/candlepin/product/content_update.rb

@@ -19,7 +19,7 @@ module Actions
                      id: input[:content_id],
                      name: input[:name],
                      contentUrl: input[:content_url],
-                     gpgUrl: input[:gpg_key_url],
+                     gpgUrl: input[:gpg_key_url] || '', #candlepin ignores nil
                      type: input[:type],
                      arches: input[:arches],
                      label: input[:label],

data/app/lib/actions/katello/host/update.rb

@@ -45,7 +45,11 @@ module Actions
         end
 
         def resource_locks
-          :update
+          if Setting[:host_update_lock]
+            :link
+          else
+            :update
+          end
         end
 
         def rescue_strategy

data/app/lib/actions/katello/product/content_destroy.rb

@@ -19,7 +19,7 @@ module Actions
                           owner: root_repository.product.organization.label,
                           content_id: root_repository.content_id)
 
-              ::Katello::Content.find(katello_content_id)&.destroy!
+              ::Katello::Content.find_by_id(katello_content_id)&.destroy!
             end
           end
         end

data/app/lib/katello/resources/candlepin/content.rb

@@ -12,8 +12,9 @@ module Katello
             JSON.parse(content_json).with_indifferent_access
           end
 
-          def all(owner_label)
-            content_json = Candlepin::CandlepinResource.get(path(owner_label), self.default_headers).body
+          def all(owner_label, include_only: nil)
+            includes = include_only ? "?#{included_list(include_only)}" : ""
+            content_json = Candlepin::CandlepinResource.get(path(owner_label) + includes, self.default_headers).body
             JSON.parse(content_json)
           end
 

data/app/models/katello/concerns/smart_proxy_extensions.rb

@@ -145,12 +145,11 @@ module Katello
       end
 
       def pulp_mirror?
-        self.features.map(&:name).include?(PULP_NODE_FEATURE)
+        self.has_feature? PULP_NODE_FEATURE
       end
 
       def pulp_master?
-        # use map instead of pluck in case the features aren't saved yet during create
-        self.features.map(&:name).include?(PULP_FEATURE)
+        self.has_feature? PULP_FEATURE
       end
 
       #deprecated methods
@@ -162,7 +161,7 @@ module Katello
       end
 
       def associate_default_locations
-        return unless pulp_master?
+        return unless self.pulp_master?
         ['puppet_content', 'subscribed_hosts'].each do |type|
           default_location = ::Location.unscoped.find_by_title(
             ::Setting[:"default_location_#{type}"])

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

@@ -10,7 +10,7 @@ module Katello
         lazy_accessor :subscription_facts, :initializer => lambda { |_s| self.subscription ? self.subscription.attributes : {} }
 
         lazy_accessor :pool_derived, :owner, :source_pool_id, :virt_limit, :arch, :description, :product_family,
-          :variant, :suggested_quantity, :support_type, :product_id, :type, :upstream_entitlement_id,
+          :variant, :suggested_quantity, :support_type, :product_id, :type, :upstream_entitlement_id, :role, :usage, :addons,
           :initializer => :pool_facts
 
         lazy_accessor :name, :support_level, :org, :sockets, :cores, :instance_multiplier,

data/app/models/katello/host/info_provider.rb

@@ -28,7 +28,7 @@ module Katello
           'label' => host.content_view.try(:label),
           'latest-version' => host.content_view.try(:latest_version),
           'version' => content_version.try(:version),
-          'published' => content_version.try(:created_at).try(:time),
+          'published' => content_version.try(:created_at).try(:time).to_s,
           'components' => content_view_components
         }
 
@@ -43,7 +43,7 @@ module Katello
           cv_label = cv.component_version.content_view.label
           components[cv_label] = {}
           components[cv_label]['version'] = cv.component_version.try(:version)
-          components[cv_label]['published'] = cv.component_version.try(:created_at).try(:time)
+          components[cv_label]['published'] = cv.component_version.try(:created_at).try(:time).to_s
         end
         components
       end

data/app/models/katello/host/subscription_facet.rb

@@ -29,6 +29,8 @@ module Katello
 
       attr_accessor :facts
 
+      DMI_UUID_ALLOWED_DUPS = ['', 'Not Settable', 'Not Present'].freeze
+
       def host_type
         host_facts = self.host.facts
         host_facts["virt::host_type"] || host_facts["hypervisor::type"]
@@ -249,7 +251,7 @@ module Katello
 
         hosts = ::Host.unscoped.distinct.left_outer_joins(:fact_values)
                 .where("#{::Host.table_name}.name = ? OR (#{FactValue.table_name}.fact_name_id = ?
-               AND #{FactValue.table_name}.value = ?)", host_name, uuid_fact_id, host_uuid)
+               AND #{FactValue.table_name}.value = ? AND #{FactValue.table_name}.value NOT IN (?))", host_name, uuid_fact_id, host_uuid, DMI_UUID_ALLOWED_DUPS)
 
         return if hosts.empty?
 

data/app/models/katello/subscription.rb

@@ -42,6 +42,10 @@ module Katello
       pools.any?(&:recently_expired?)
     end
 
+    def multi_entitlement?
+      pools.where("#{Katello::Pool.table_name}.multi_entitlement" => true).any?
+    end
+
     def virt_who_pools
       pools.where("#{Katello::Pool.table_name}.virt_who" => true)
     end

data/app/models/setting/content.rb

@@ -106,6 +106,8 @@ class Setting::Content < Setting
                  N_('Default Location where new Puppet content will be put upon Content View publish'),
                  nil, N_('Default Location Puppet content'), nil,
                  :collection => proc { Hash[Location.unscoped.all.map { |loc| [loc[:title], loc[:title]] }] }),
+        self.set('host_update_lock', N_("Allow multiple concurrent Actions::Katello::Host::Update calls for one host to be processed at the same time."),
+                 false, N_('Concurrent Actions::Katello::Host::Update allowed')),
         self.set('expire_soon_days', N_('The number of days remaining in a subscription before you will be reminded about renewing it.'),
                  120, N_('Expire soon days')),
         self.set('content_view_solve_dependencies',

data/app/views/katello/api/v2/errata/_counts.json.rabl

@@ -5,11 +5,11 @@ node :security do |_presenter|
 end
 
 node :bugfix do |_presenter|
-  totals[:bugfix]
+  totals[:bugfix].to_i + totals[:recommended].to_i
 end
 
 node :enhancement do |_presenter|
-  totals[:enhancement]
+  totals[:enhancement].to_i + totals[:optional].to_i
 end
 
 node :total do |_presenter|

data/app/views/katello/api/v2/subscriptions/base.json.rabl

@@ -10,7 +10,8 @@ attributes :account_number, :contract_number
 attributes :support_level
 attributes :product_id
 attributes :sockets, :cores, :ram
-attributes :instance_multiplier, :stacking_id, :multi_entitlement
+attributes :instance_multiplier, :stacking_id
+attributes :multi_entitlement? => :multi_entitlement
 attributes :type
 attributes :name => :product_name
 attributes :unmapped_guest

data/app/views/katello/api/v2/subscriptions/show.json.rabl

@@ -5,6 +5,7 @@ extends "katello/api/v2/subscriptions/base"
 attributes :arch
 attributes :description
 attributes :support_type
+attributes :role, :usage, :addons
 
 node(:host_count) do |subscription|
   subscription.hosts.count

data/app/views/overrides/smart_proxies/_environment_tab.html.erb

@@ -1,4 +1,4 @@
-<% if !@smart_proxy.new_record? && @smart_proxy.features.pluck(:name).include?(SmartProxy::PULP_NODE_FEATURE) -%>
+<% if !@smart_proxy.new_record? && @smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) -%>
   <li id="kt_environments_tab">
     <a href="#kt_environments" data-toggle="tab"><%= _('Lifecycle Environments') %></a>
   </li>

data/app/views/overrides/smart_proxies/_environment_tab_pane.html.erb

@@ -1,4 +1,4 @@
-<% if !@smart_proxy.new_record? && @smart_proxy.features.pluck(:name).include?(SmartProxy::PULP_NODE_FEATURE) -%>
+<% if !@smart_proxy.new_record? && @smart_proxy.has_feature?(SmartProxy::PULP_NODE_FEATURE) -%>
   <div class="tab-pane" id="kt_environments">
     <%= multiple_selects f, :lifecycle_environments, Katello::KTEnvironment.completer_scope(:organization_id => ::Organization.current.try(:id)), @smart_proxy.lifecycle_environment_ids, {:label => _('Lifecycle Environments')}, @smart_proxy.default_capsule? ? {:disabled => :disabled } : {}  %>
 

data/db/migrate/20190205142619_add_content_constraints.rb

@@ -13,15 +13,19 @@ class AddContentConstraints < ActiveRecord::Migration[5.2]
     duplicates.each do |dup|
       contents = Katello::Content.where(organization_id: dup.organization_id, cp_content_id: dup.cp_content_id).to_a
       first = contents.pop
+      content_to_delete = []
       contents.each do |content|
         content.product_contents.each do |pc|
-          unless first.products.include?(pc.product)
+          if !first.products.include?(pc.product)
             pc.content = first
             pc.save!
+          else
+            pc.delete
           end
         end
-        content.delete
+        content_to_delete << content.id
       end
+      ::Katello::Content.where(id: content_to_delete).delete_all
     end
 
     add_index :katello_contents, [:cp_content_id, :organization_id], :unique => true, :name => :katello_contents_cpcid_orgid_uniq

data/db/seeds.d/111-upgrade_tasks.rb

@@ -5,6 +5,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:clean_backend_objects', :long_running => true, :skip_failure => true, :always_run => true},
     {:name => 'katello:upgrades:3.8:clear_checksum_type'},
     {:name => 'katello:upgrades:3.10:clear_invalid_repo_credentials'},
+    {:name => 'katello:upgrades:3.10:update_gpg_key_urls'},
     {:name => 'katello:upgrades:3.11:import_yum_metadata'},
     {:name => 'katello:upgrades:3.11:update_puppet_repos'},
     {:name => 'katello:upgrades:3.11:clear_checksum_type', :task_name => 'katello:upgrades:3.8:clear_checksum_type'},

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-errata.html

@@ -121,11 +121,11 @@
                   <i class="fa fa-warning inline-icon" title="{{ 'Security' | translate }}"></i>
                 </span>
 
-                <span ng-show="erratum.type == 'bugfix'">
+                <span ng-show="erratum.type == 'bugfix' || erratum.type == 'recommended'">
                   <i class="fa fa-bug inline-icon" title="{{ 'Bug Fix' | translate }}"></i>
                 </span>
 
-                <span ng-show="erratum.type == 'enhancement'">
+                <span ng-show="erratum.type == 'enhancement' || erratum.type == 'optional'">
                   <i class="fa fa-plus-square inline-icon" title="{{ 'Enhancement' | translate }}"></i>
                 </span>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html

@@ -208,7 +208,7 @@
 
         <dt translate>Bug Fix</dt>
         <dd>
-          <a ui-sref="content-host.errata.index({getSearch: 'type=bugfix'})" ng-class="{black: !host.content_facet_attributes.errata_counts.bugfix, yellow: host.content_facet_attributes.errata_counts.bugfix > 0}">
+          <a ui-sref="content-host.errata.index({getSearch: 'type=bugfix or type=recommended'})" ng-class="{black: !host.content_facet_attributes.errata_counts.bugfix, yellow: host.content_facet_attributes.errata_counts.bugfix > 0}">
             <i class="fa fa-bug inline-icon" title="{{ 'Bug Fix' | translate }}"></i>
             {{ host.content_facet_attributes.errata_counts.bugfix || 0 }}
           </a>
@@ -216,7 +216,7 @@
 
         <dt translate>Enhancement</dt>
         <dd>
-          <a ui-sref="content-host.errata.index({getSearch: 'type=enhancement'})" ng-class="{black: !host.content_facet_attributes.errata_counts.enhancement, yellow: host.content_facet_attributes.errata_counts.enhancement > 0}">
+          <a ui-sref="content-host.errata.index({getSearch: 'type=enhancement or type=optional'})" ng-class="{black: !host.content_facet_attributes.errata_counts.enhancement, yellow: host.content_facet_attributes.errata_counts.enhancement > 0}">
             <i class="fa fa-plus-square inline-icon" title="{{ 'Enhancement' | translate }}"></i>
             {{ host.content_facet_attributes.errata_counts.enhancement || 0 }}
           </a>

data/lib/katello/tasks/upgrades/3.10/update_gpg_key_urls.rake

@@ -0,0 +1,32 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.10' do
+      desc "Update repositories with API V1 GPG URLs"
+      task :update_gpg_key_urls => ["environment", "katello:check_ping"] do
+        User.current = User.anonymous_admin
+
+        ::Organization.all.each do |org|
+          org_contents = Katello::Resources::Candlepin::Content.all(org.label, include_only: [:id, :gpgUrl])
+
+          org_contents.each do |cp_content|
+            gpg_url = cp_content['gpgUrl']
+            if gpg_url && gpg_url.match(/katello\/api\/repositories/)
+              content = Katello::Content.where(cp_content_id: cp_content['id'], organization: org).first
+
+              if content.nil?
+                Rails.logger.warn("Candlepin Content id=#{cp_content['id']} isn't in our DB. Try running 'rake katello:reimport' first.")
+              else
+                root_repo = Katello::RootRepository.in_organization(org).where(content_id: content.cp_content_id).first
+                new_gpg_url = root_repo.library_instance.yum_gpg_key_url
+                cp_content['gpgUrl'] = new_gpg_url
+                Katello::Resources::Candlepin::Content.update(org.label, cp_content)
+                content.gpg_url = new_gpg_url
+                content.save!
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.12.0".freeze
+  VERSION = "3.12.1".freeze
 end

data/webpack/components/SelectOrg/SetOrganization.js

@@ -96,7 +96,9 @@ SetOrganization.propTypes = {
   list: PropTypes.arrayOf(PropTypes.object),
   loading: PropTypes.bool.isRequired,
   changeCurrentOrganization: PropTypes.func.isRequired,
-  history: PropTypes.shape({}).isRequired,
+  history: PropTypes.shape({
+    push: PropTypes.func,
+  }).isRequired,
   redirectPath: PropTypes.string.isRequired,
   getOrganiztionsList: PropTypes.func.isRequired,
 };

data/webpack/components/WithOrganization/withOrganization.js

@@ -62,7 +62,10 @@ function withOrganization(WrappedComponent, redirectPath) {
   CheckOrg.propTypes = {
     location: PropTypes.shape({}),
     loadOrganization: PropTypes.func.isRequired,
-    organization: PropTypes.shape({}).isRequired,
+    organization: PropTypes.shape({
+      label: PropTypes.string,
+      loading: PropTypes.bool,
+    }).isRequired,
   };
 
   CheckOrg.defaultProps = {

data/webpack/move_to_foreman/components/common/ModalProgressBar/ModalProgressBar.js

@@ -32,7 +32,12 @@ const ModalProgressBar = (props) => {
 ModalProgressBar.propTypes = {
   show: PropTypes.bool.isRequired,
   container: PropTypes.shape({}),
-  task: PropTypes.shape({}),
+  task: PropTypes.shape({
+    progress: PropTypes.number,
+    humanized: PropTypes.shape({
+      action: PropTypes.string,
+    }),
+  }),
 };
 
 ModalProgressBar.defaultProps = {

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

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import api from '../../../services/api';
 import { apiError, apiSuccess } from '../../../move_to_foreman/common/helpers.js';
 import { getArchFromPath } from './helpers.js';
@@ -76,4 +77,12 @@ const loadRepositorySetRepos = (contentId, productId) => (dispatch) => {
     });
 };
 
+loadRepositorySetRepos.propTypes = {
+  data: PropTypes.shape({
+    error: PropTypes.shape({
+      displayMessage: PropTypes.string,
+    }),
+  }),
+};
+
 export default loadRepositorySetRepos;

data/webpack/scenes/ModuleStreams/Details/ModuleStreamDetails.js

@@ -141,7 +141,14 @@ ModuleStreamDetails.propTypes = {
       id: PropTypes.string.isRequired,
     }).isRequired,
   }).isRequired,
-  moduleStreamDetails: PropTypes.shape({}).isRequired,
+  moduleStreamDetails: PropTypes.shape({
+    loading: PropTypes.bool,
+    name: PropTypes.string,
+    profiles: PropTypes.array,
+    repositories: PropTypes.array,
+    artifacts: PropTypes.array,
+    stream: PropTypes.string,
+  }).isRequired,
 };
 
 export default ModuleStreamDetails;

data/webpack/scenes/ModuleStreams/ModuleStreamsTable.js

@@ -31,7 +31,12 @@ const ModuleStreamsTable = ({ moduleStreams, onPaginationChange }) => {
 };
 
 ModuleStreamsTable.propTypes = {
-  moduleStreams: PropTypes.shape({}).isRequired,
+  moduleStreams: PropTypes.shape({
+    loading: PropTypes.bool,
+    results: PropTypes.array,
+    pagination: PropTypes.shape({}),
+    itemCount: PropTypes.number,
+  }).isRequired,
   onPaginationChange: PropTypes.func.isRequired,
 };
 

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

@@ -81,6 +81,9 @@ RepositorySetRepositories.propTypes = {
   data: PropTypes.shape({
     loading: PropTypes.bool.isRequired,
     repositories: PropTypes.arrayOf(PropTypes.object),
+    error: PropTypes.shape({
+      displayMessage: PropTypes.string,
+    }),
   }).isRequired,
 };
 

data/webpack/scenes/RedHatRepositories/index.js

@@ -94,8 +94,15 @@ RedHatRepositoriesPage.propTypes = {
   loadEnabledRepos: PropTypes.func.isRequired,
   loadRepositorySets: PropTypes.func.isRequired,
   updateRecommendedRepositorySets: PropTypes.func.isRequired,
-  enabledRepositories: PropTypes.shape({}).isRequired,
-  repositorySets: PropTypes.shape({}).isRequired,
+  enabledRepositories: PropTypes.shape({
+    loading: PropTypes.bool,
+    search: PropTypes.string,
+  }).isRequired,
+  repositorySets: PropTypes.shape({
+    recommended: PropTypes.array,
+    loading: PropTypes.bool,
+    search: PropTypes.string,
+  }).isRequired,
 };
 
 const mapStateToProps = ({

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

@@ -10,10 +10,9 @@ export default {
   product_id: __('Product ID'),
   contract_number: __('Contract Number'),
   account_number: __('Account Number'),
-  support_level: __('Support Level'),
   support_type: __('Support Type'),
   arch: __('Architecture(s)'),
   type: __('Type'),
-  mutli_entitlement: __('Multi-entitlement'),
+  multi_entitlement: __('Multi-entitlement'),
   stacking_id: __('Stacking ID'),
 };

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

@@ -42,7 +42,11 @@ const SubscriptionDetailAssociations = ({ subscriptionDetails }) => {
 };
 
 SubscriptionDetailAssociations.propTypes = {
-  subscriptionDetails: PropTypes.shape({}).isRequired,
+  subscriptionDetails: PropTypes.shape({
+    id: PropTypes.number,
+    host_count: PropTypes.number,
+    activation_keys: PropTypes.array,
+  }).isRequired,
 };
 
 export default SubscriptionDetailAssociations;

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

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import { Table } from 'react-bootstrap';
 import { translate as __ } from 'foremanReact/common/I18n';
 import subscriptionAttributes from './SubscriptionAttributes';
+import subscriptionPurposeAttributes from './SubscriptionPurposeAttributes';
 
 const SubscriptionDetailInfo = ({ subscriptionDetails }) => {
   const subscriptionLimits = (subDetails) => {
@@ -54,7 +55,17 @@ const SubscriptionDetailInfo = ({ subscriptionDetails }) => {
           </tr>
         </tbody>
       </Table>
-
+      <h2>{__('System Purpose')}</h2>
+      <Table>
+        <tbody>
+          {Object.keys(subscriptionPurposeAttributes).map(key => (
+            <tr key={key}>
+              <td><b>{__(subscriptionPurposeAttributes[key])}</b></td>
+              <td>{subscriptionDetailValue(subscriptionDetails, key)}</td>
+            </tr>
+            ))}
+        </tbody>
+      </Table>
     </div>
   );
 };

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

@@ -30,7 +30,15 @@ const SubscriptionDetailProduct = ({ content }) => (
 );
 
 SubscriptionDetailProduct.propTypes = {
-  content: PropTypes.shape({}).isRequired,
+  content: PropTypes.shape({
+    id: PropTypes.string,
+    name: PropTypes.string,
+    enabled: PropTypes.bool,
+    content_url: PropTypes.string,
+    gpg_url: PropTypes.string,
+    type: PropTypes.string,
+    enable: PropTypes.bool,
+  }).isRequired,
 };
 
 export default SubscriptionDetailProduct;

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

@@ -48,7 +48,9 @@ const SubscriptionDetailProductContent = ({ productContent }) => {
 };
 
 SubscriptionDetailProductContent.propTypes = {
-  productContent: PropTypes.shape({}).isRequired,
+  productContent: PropTypes.shape({
+    results: PropTypes.array,
+  }).isRequired,
 };
 
 export default SubscriptionDetailProductContent;

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

@@ -16,7 +16,9 @@ const SubscriptionDetailProducts = ({ subscriptionDetails }) => (
 );
 
 SubscriptionDetailProducts.propTypes = {
-  subscriptionDetails: PropTypes.shape({}).isRequired,
+  subscriptionDetails: PropTypes.shape({
+    provided_products: PropTypes.array,
+  }).isRequired,
 };
 
 export default SubscriptionDetailProducts;

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

@@ -135,7 +135,12 @@ class SubscriptionDetails extends Component {
 SubscriptionDetails.propTypes = {
   loadSubscriptionDetails: PropTypes.func.isRequired,
   loadProducts: PropTypes.func.isRequired,
-  subscriptionDetails: PropTypes.shape({}).isRequired,
+  subscriptionDetails: PropTypes.shape({
+    error: PropTypes.shape({}),
+    loading: PropTypes.bool,
+    name: PropTypes.string,
+    productContent: PropTypes.shape({}),
+  }).isRequired,
   history: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired,
   match: PropTypes.shape({
     params: PropTypes.shape({

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

@@ -0,0 +1,8 @@
+import { translate as __ } from 'foremanReact/common/I18n';
+
+export default {
+  support_level: __('Service Level (SLA)'),
+  usage: __('Usage Type'),
+  role: __('Role'),
+  addons: __('Add ons'),
+};

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

@@ -10,6 +10,7 @@ describe('subscriptions detail associations page', () => {
     const testInstance = testRenderer.root;
 
     expect(testRenderer.toJSON()).toMatchSnapshot();
-    expect(testInstance.findByType('h2').children[0]).toBe('Subscription Info');
+    expect(testInstance.findAllByType('h2')[0].children[0]).toBe('Subscription Info');
+    expect(testInstance.findAllByType('h2')[1].children[0]).toBe('System Purpose');
   });
 });

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

@@ -99,16 +99,6 @@ exports[`subscriptions detail associations page renders correctly 1`] = `
           1212729
         </td>
       </tr>
-      <tr>
-        <td>
-          <b>
-            Support Level
-          </b>
-        </td>
-        <td>
-          Self-Support
-        </td>
-      </tr>
       <tr>
         <td>
           <b>
@@ -146,7 +136,7 @@ exports[`subscriptions detail associations page renders correctly 1`] = `
           </b>
         </td>
         <td>
-          
+          true
         </td>
       </tr>
       <tr>
@@ -181,5 +171,54 @@ exports[`subscriptions detail associations page renders correctly 1`] = `
       </tr>
     </tbody>
   </table>
+  <h2>
+    System Purpose
+  </h2>
+  <table
+    className="table"
+  >
+    <tbody>
+      <tr>
+        <td>
+          <b>
+            Service Level (SLA)
+          </b>
+        </td>
+        <td>
+          Self-Support
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <b>
+            Usage Type
+          </b>
+        </td>
+        <td>
+           Development
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <b>
+            Role
+          </b>
+        </td>
+        <td>
+          Test Role
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <b>
+            Add ons
+          </b>
+        </td>
+        <td>
+          Addon1, Addon2
+        </td>
+      </tr>
+    </tbody>
+  </table>
 </div>
 `;

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

@@ -91,6 +91,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                         Object {
                           "account_number": 1212729,
                           "activation_keys": Array [],
+                          "addons": "Addon1, Addon2",
                           "arch": "ia64,ppc,ppc64,ppc64le,s390,s390x,x86,x86_64",
                           "available": 1,
                           "consumed": 0,
@@ -204,6 +205,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                           ],
                           "quantity": 1,
                           "ram": null,
+                          "role": "Test Role",
                           "sockets": null,
                           "stacking_id": "SER0421",
                           "start_date": "2013-03-01 00:00:00 -0500",
@@ -213,6 +215,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                           "type": "NORMAL",
                           "unmapped_guest": false,
                           "upstream": true,
+                          "usage": " Development",
                           "virt_only": false,
                           "virt_who": false,
                         }
@@ -229,6 +232,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                         Object {
                           "account_number": 1212729,
                           "activation_keys": Array [],
+                          "addons": "Addon1, Addon2",
                           "arch": "ia64,ppc,ppc64,ppc64le,s390,s390x,x86,x86_64",
                           "available": 1,
                           "consumed": 0,
@@ -342,6 +346,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                           ],
                           "quantity": 1,
                           "ram": null,
+                          "role": "Test Role",
                           "sockets": null,
                           "stacking_id": "SER0421",
                           "start_date": "2013-03-01 00:00:00 -0500",
@@ -351,6 +356,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                           "type": "NORMAL",
                           "unmapped_guest": false,
                           "upstream": true,
+                          "usage": " Development",
                           "virt_only": false,
                           "virt_who": false,
                         }
@@ -361,6 +367,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                         Object {
                           "account_number": 1212729,
                           "activation_keys": Array [],
+                          "addons": "Addon1, Addon2",
                           "arch": "ia64,ppc,ppc64,ppc64le,s390,s390x,x86,x86_64",
                           "available": 1,
                           "consumed": 0,
@@ -474,6 +481,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                           ],
                           "quantity": 1,
                           "ram": null,
+                          "role": "Test Role",
                           "sockets": null,
                           "stacking_id": "SER0421",
                           "start_date": "2013-03-01 00:00:00 -0500",
@@ -483,6 +491,7 @@ exports[`subscriptions details page should render and contain appropiate compone
                           "type": "NORMAL",
                           "unmapped_guest": false,
                           "upstream": true,
+                          "usage": " Development",
                           "virt_only": false,
                           "virt_who": false,
                         }

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

@@ -25,6 +25,9 @@ export const subDetails = Immutable({
   arch: 'ia64,ppc,ppc64,ppc64le,s390,s390x,x86,x86_64',
   description: 'OpenShift Enterprise',
   support_type: 'L1-L3',
+  role: 'Test Role',
+  usage: ' Development',
+  addons: 'Addon1, Addon2',
   id: 48,
   cp_id: '4028f92a6317cfbd0163b419377f3bee',
   subscription_id: 3,

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

@@ -295,13 +295,26 @@ ManageManifestModal.propTypes = {
   refresh: PropTypes.func.isRequired,
   delete: PropTypes.func.isRequired,
   loadManifestHistory: PropTypes.func.isRequired,
-  organization: PropTypes.shape({}).isRequired,
+  organization: PropTypes.shape({
+    loading: PropTypes.bool,
+    redhat_repository_url: PropTypes.string,
+    owner_details: PropTypes.shape({
+      upstreamConsumer: PropTypes.shape({
+        uuid: PropTypes.string,
+        name: PropTypes.string,
+        webUrl: PropTypes.string,
+      }),
+    }),
+  }).isRequired,
   disableManifestActions: PropTypes.bool,
   disabledReason: PropTypes.string,
   loadOrganization: PropTypes.func.isRequired,
   saveOrganization: PropTypes.func.isRequired,
   taskInProgress: PropTypes.bool.isRequired,
-  manifestHistory: PropTypes.shape({}).isRequired,
+  manifestHistory: PropTypes.shape({
+    loading: PropTypes.bool,
+    results: PropTypes.array,
+  }).isRequired,
   showModal: PropTypes.bool.isRequired,
   onClose: PropTypes.func,
 };

data/webpack/scenes/Subscriptions/SubscriptionsPage.js

@@ -308,8 +308,13 @@ SubscriptionsPage.propTypes = {
   updateQuantity: PropTypes.func.isRequired,
   loadTableColumns: PropTypes.func.isRequired,
   taskDetails: PropTypes.shape({}),
-  subscriptions: PropTypes.shape({}).isRequired,
+  subscriptions: PropTypes.shape({
+    disconnected: PropTypes.bool,
+    tableColumns: PropTypes.array,
+    selectedTableColumns: PropTypes.array,
+  }).isRequired,
   organization: PropTypes.shape({
+    id: PropTypes.number,
     owner_details: PropTypes.shape({
       displayName: PropTypes.string,
     }),

data/webpack/scenes/Subscriptions/UpstreamSubscriptions/UpstreamSubscriptionsPage.js

@@ -261,7 +261,13 @@ UpstreamSubscriptionsPage.propTypes = {
   loadUpstreamSubscriptions: PropTypes.func.isRequired,
   saveUpstreamSubscriptions: PropTypes.func.isRequired,
   upstreamSubscriptions: PropTypes.shape({
-    task: PropTypes.shape({}),
+    loading: PropTypes.bool,
+    itemCount: PropTypes.number,
+    results: PropTypes.array,
+    pagination: PropTypes.shape({}),
+    task: PropTypes.shape({
+      id: PropTypes.number,
+    }),
   }).isRequired,
   history: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired,
 };

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/SubscriptionsTable.js

@@ -288,6 +288,8 @@ SubscriptionsTable.propTypes = {
   updateQuantity: PropTypes.func.isRequired,
   emptyState: PropTypes.shape({}).isRequired,
   subscriptions: PropTypes.shape({
+    loading: PropTypes.bool,
+    availableQuantities: PropTypes.shape({}),
     results: PropTypes.array,
   }).isRequired,
   subscriptionDeleteModalOpen: PropTypes.bool.isRequired,

data/webpack/scenes/Subscriptions/components/SubscriptionsTable/components/Table.js

@@ -89,11 +89,17 @@ Table.propTypes = {
   emptyState: PropTypes.shape({}).isRequired,
   tableColumns: PropTypes.arrayOf(PropTypes.string).isRequired,
   subscriptions: PropTypes.shape({
+    searchIsActive: PropTypes.bool,
+    itemCount: PropTypes.number,
+    pagination: PropTypes.shape({}),
     results: PropTypes.array,
   }).isRequired,
   loadSubscriptions: PropTypes.func.isRequired,
   selectionController: PropTypes.shape({}).isRequired,
-  inlineEditController: PropTypes.shape({}).isRequired,
+  inlineEditController: PropTypes.shape({
+    onCancel: PropTypes.func,
+    onConfirm: PropTypes.func,
+  }).isRequired,
   groupedSubscriptions: PropTypes.shape({}).isRequired,
   editing: PropTypes.bool.isRequired,
   rows: PropTypes.arrayOf(PropTypes.object).isRequired,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.12.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -3919,6 +3919,7 @@ files:
 - lib/katello/tasks/update_subscription_facet_backend_data.rake
 - lib/katello/tasks/upgrade_check.rake
 - lib/katello/tasks/upgrades/3.10/clear_invalid_repo_credentials.rake
+- lib/katello/tasks/upgrades/3.10/update_gpg_key_urls.rake
 - lib/katello/tasks/upgrades/3.11/import_yum_metadata_file.rake
 - lib/katello/tasks/upgrades/3.11/update_puppet_repos.rake
 - lib/katello/tasks/upgrades/3.12/remove_pulp2_notifier.rake
@@ -4244,6 +4245,7 @@ files:
 - webpack/scenes/Subscriptions/Details/SubscriptionDetailReducer.js
 - webpack/scenes/Subscriptions/Details/SubscriptionDetails.js
 - webpack/scenes/Subscriptions/Details/SubscriptionDetails.scss
+- webpack/scenes/Subscriptions/Details/SubscriptionPurposeAttributes.js
 - webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetailActions.test.js
 - webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetailAssociations.test.js
 - webpack/scenes/Subscriptions/Details/__tests__/SubscriptionDetailInfo.test.js