katello 3.15.0.rc1.1 → 3.15.0.rc1.2

data/db/migrate/20200121213430_katello_repository_rpms_id_big_int.rb

@@ -0,0 +1,5 @@
+class KatelloRepositoryRpmsIdBigInt < ActiveRecord::Migration[5.2]
+  def change
+    change_column :katello_repository_rpms, :id, :bigint
+  end
+end

data/db/migrate/20200129172534_add_epoch_version_release_arch_to_katello_installed_packages.rb

@@ -0,0 +1,40 @@
+class AddEpochVersionReleaseArchToKatelloInstalledPackages < ActiveRecord::Migration[5.2]
+  def up
+    add_column :katello_installed_packages, :nvrea, :string
+    add_column :katello_installed_packages, :epoch, :string
+    add_column :katello_installed_packages, :version, :string
+    add_column :katello_installed_packages, :release, :string
+    add_column :katello_installed_packages, :arch, :string
+
+    epoch_non_0 = ::Katello::Rpm.where.not(epoch: [0, nil]).pluck(:nvra, :epoch).to_h
+    installed_packages = []
+
+    ::Katello::InstalledPackage.reset_column_information
+    ::Katello::InstalledPackage.find_each do |pkg|
+      epoch = epoch_non_0[pkg.nvra] || "0"
+
+      attributes_hash = ::Katello::Util::Package.parse_nvrea(pkg.nvra)
+      attributes_hash[:epoch] = epoch
+      attributes_hash[:nvra] = pkg.nvra
+      if epoch == "0"
+        attributes_hash[:nvrea] = pkg.nvra
+      else
+        attributes_hash[:nvrea] = "#{pkg.name}-#{epoch}:#{attributes_hash[:version]}-"\
+                                  "#{attributes_hash[:release]}.#{attributes_hash[:arch]}"
+      end
+
+      installed_packages << ::Katello::InstalledPackage.new(attributes_hash)
+    end
+    ::Katello::InstalledPackage.import(installed_packages, validate: false, batch_size: 50_000,
+                                       on_duplicate_key_update: {conflict_target: [:nvra],
+                                                                 columns: [:nvrea, :epoch, :version, :release, :arch]})
+  end
+
+  def down
+    remove_column :katello_installed_packages, :nvrea, :string
+    remove_column :katello_installed_packages, :epoch, :string
+    remove_column :katello_installed_packages, :version, :string
+    remove_column :katello_installed_packages, :release, :string
+    remove_column :katello_installed_packages, :arch, :string
+  end
+end

data/engines/bastion/app/views/bastion/layouts/assets.html.erb

@@ -18,7 +18,7 @@
     angular.module('Bastion.features').value('FeatureSettings', angular.fromJson(<%= SETTINGS[:features].nil? ? {} : SETTINGS[:features].to_json.html_safe %>));
     angular.module('Bastion').value('currentLocale', '<%= I18n.locale %>');
     angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id if Organization.current %>");
-    angular.module('Bastion').value('contentAccessMode', "<%= Organization.current.try(:content_access_mode) if Organization.current %>");
+    angular.module('Bastion').value('simpleContentAccessEnabled', <%= Organization.current.simple_content_access? if Organization.current %>);
     angular.module('Bastion').value('foreman', tfm);
     angular.module('Bastion').value('repositoryTypes', angular.fromJson('<%= Katello::RepositoryTypeManager.repository_types.values.to_json.html_safe %>'));
     angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson('<%= Setting[:unregister_delete_host] %>'));

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

@@ -29,6 +29,13 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
             var params = hostIds;
             params['content_type'] = 'errata';
             params.content = _.map($scope.table.getSelected(), 'errata_id');
+
+            if (nutupane.table.allResultsSelected) {
+                params['install_all'] = true;
+            } else {
+                params['install_all'] = false;
+            }
+
             params['organization_id'] = CurrentOrganization;
             return params;
         }
@@ -38,6 +45,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
         }
 
         nutupane = new Nutupane(HostBulkAction, hostIds, 'installableErrata');
+        nutupane.enableSelectAllResults();
+
         $scope.controllerName = 'katello_errata';
         nutupane.masterOnly = true;
         $scope.showErrata = false;

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

@@ -12,13 +12,14 @@
  * @requires SubscriptionsHelper
  * @requires Notification
  * @requires hostIds
+ * @requires simpleContentAccessEnabled
  *
  * @description
  *   A controller for providing bulk action functionality to the content hosts page.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscriptionsModalController',
-    ['$scope', '$location', '$uibModalInstance', 'Nutupane', 'CurrentOrganization', 'HostBulkAction', 'Subscription', 'SubscriptionsHelper', 'Notification', 'hostIds', 'contentAccessMode',
-        function ($scope, $location, $uibModalInstance, Nutupane, CurrentOrganization, HostBulkAction, Subscription, SubscriptionsHelper, Notification, hostIds, contentAccessMode) {
+    ['$scope', '$location', '$uibModalInstance', 'Nutupane', 'CurrentOrganization', 'HostBulkAction', 'Subscription', 'SubscriptionsHelper', 'Notification', 'hostIds', 'simpleContentAccessEnabled',
+        function ($scope, $location, $uibModalInstance, Nutupane, CurrentOrganization, HostBulkAction, Subscription, SubscriptionsHelper, Notification, hostIds, simpleContentAccessEnabled) {
             var success, error, params = {
                 'organization_id': CurrentOrganization,
                 'sort_order': 'ASC',
@@ -44,7 +45,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscription
                 });
             };
 
-
             $scope.contentNutupane = new Nutupane(Subscription, params,
               'queryPaged', {disableAutoLoad: true});
             $scope.controllerName = 'katello_subscriptions';
@@ -53,7 +53,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkSubscription
             $scope.contentNutupane.masterOnly = true;
             $scope.contentNutupane.load();
             $scope.groupedSubscriptions = {};
-            $scope.contentAccessMode = contentAccessMode;
+            $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
 
             $scope.$watch('table.rows', function (rows) {
                 $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);

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

@@ -64,6 +64,8 @@
       </span>
 
       <div data-block="table">
+        <div data-extend-template="layouts/select-all-results.html"></div>
+
         <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
          <thead>
            <tr bst-table-head row-select>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-subscriptions-modal.html

@@ -7,11 +7,11 @@
 
     <div class="row">
       <div class="col-sm-12">
-        <button type="button" class="btn btn-default" ng-click="autoAttach()" ng-disabled="table.numSelected > 0 || contentAccessMode === 'org_environment'">
+        <button type="button" class="btn btn-default" ng-click="autoAttach()" ng-disabled="table.numSelected > 0 || simpleContentAccessEnabled">
           <span translate>Auto-Attach</span>
         </button>
 
-        <p class="help-text" ng-show="table.numSelected === 0 && contentAccessMode != 'org_environment'">
+        <p class="help-text" ng-show="table.numSelected === 0 && !simpleContentAccessEnabled">
           Auto-attach available subscriptions to all selected hosts.
         </p>
 
@@ -19,7 +19,7 @@
         <div content-access-mode-banner/>
         </p>
 
-        <p class="help-text" ng-show="table.numSelected > 0 && contentAccessMode != 'org_environment'">
+        <p class="help-text" ng-show="table.numSelected > 0 && !simpleContentAccessEnabled">
           Auto-attach uses all available subscriptions, not a selected subset.
         </p>
       </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-modal-helper.service.js

@@ -39,6 +39,7 @@ angular.module('Bastion.content-hosts').service('ContentHostsModalHelper', ['$ui
             $uibModal.open({
                 templateUrl: 'content-hosts/bulk/views/content-hosts-bulk-errata-modal.html',
                 controller: 'ContentHostsBulkErrataModalController',
+                openedClass: 'bastion',
                 size: 'lg',
                 resolve: {
                     hostIds: this.resolveFunc()

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

@@ -141,6 +141,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
             return false;
         };
 
+        $scope.autoHealOptions = function () {
+            return [{value: true, name: translate("Yes")}, {value: true, name: translate("No")}];
+        };
+
         $scope.serviceLevels = function () {
             return $scope.organization.$promise.then(function(org) {
                 return _.union(org.service_levels, $scope.defaultServiceLevels);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/content-host-subscriptions.controller.js

@@ -8,13 +8,14 @@
  * @requires Subscription
  * @requires SubscriptionsHelper
  * @requires Notification
+ * @requires simpleContentAccessEnabled
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'Host', 'HostSubscription', 'SubscriptionsHelper', 'Notification',
-    function ($scope, $location, translate, Nutupane, CurrentOrganization, Subscription, Host, HostSubscription, SubscriptionsHelper, Notification) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Subscription', 'Host', 'HostSubscription', 'SubscriptionsHelper', 'Notification', 'simpleContentAccessEnabled',
+    function ($scope, $location, translate, Nutupane, CurrentOrganization, Subscription, Host, HostSubscription, SubscriptionsHelper, Notification, simpleContentAccessEnabled) {
 
         var params = {
             'organization_id': CurrentOrganization,
@@ -30,6 +31,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsCont
         $scope.nutupane.masterOnly = true;
         $scope.isRemoving = false;
         $scope.contextAdd = false;
+        $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
         $scope.groupedSubscriptions = {};
         $scope.$watch('table.rows', function (rows) {
             $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);

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

@@ -82,12 +82,12 @@
         </dd>
 
         <dt translate>Auto-Attach</dt>
-        <dd bst-edit-checkbox="host.subscription_facet_attributes.autoheal"
+        <dd ng-if= "simpleContentAccessEnabled" translate> Not Applicable </dd>
+        <dd ng-if= "!simpleContentAccessEnabled" bst-edit-select="host.subscription_facet_attributes.autoheal"
             readonly="denied('edit_hosts', host)"
             formatter="booleanToYesNo"
             on-save="saveSubscriptionFacet(host)">
         </dd>
-
       </dl>
 
       <div class="divider"></div>

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

@@ -25,22 +25,27 @@
 
         <dt translate>Auto-Attach</dt>
         <dd>
+          <span ng-if="simpleContentAccessEnabled" translate>
+            Not Applicable
+          </span>
+          <div ng-if="!simpleContentAccessEnabled">
           <div bst-edit-checkbox="host.subscription_facet_attributes.autoheal"
                formatter="booleanToYesNo"
                readonly="denied('edit_hosts', host)"
                on-save="saveSubscriptionFacet(host)">
           </div>
+            <a ng-hide="denied('edit_hosts', host)"
+               ng-click="autoAttachSubscriptions()"
+               class="btn btn-default"
+               ng-disabled="subscription.workingMode">
+              <span translate>Run Auto-Attach</span>
+            </a>
 
-          <a ng-hide="denied('edit_hosts', host)"
-             ng-click="autoAttachSubscriptions()"
-             ng-disabled="subscription.workingMode">
-            <span translate>Run Auto-Attach</span>
-          </a>
-
-          <span ng-show="subscription.workingMode">
-            <i class="fa fa-spinner inline-icon fa-spin"></i>
-            <span translate>Working</span>
-          </span>
+            <span ng-show="subscription.workingMode">
+              <i class="fa fa-spinner inline-icon fa-spin"></i>
+              <span translate>Working</span>
+            </span>
+          </div>
         </dd>
 
         <dt translate>Service Level</dt>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/views/package-info.html

@@ -79,7 +79,7 @@
       <dd>{{ package.buildhost }}</dd>
 
       <dt translate>Build Time</dt>
-      <dd>{{ package.build_time }}</dd>
+      <dd><long-date-time date="package.build_time_utc" /></dd>
     </dl>
   </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/content-access-mode-banner.directive.js

@@ -2,19 +2,19 @@
  * @ngdoc directive
  * @name Bastion.subscriptions:contentAccessModeBanner
  *
- * @requires contentAccessMode
+ * @requires simpleContentAccessEnabled
  *
  * @description
  *   Component for showing information about content access mode (whether content is
  *   allowed with or without a subscription)
  */
 angular.module('Bastion.subscriptions').directive('contentAccessModeBanner',
-    ['contentAccessMode',
-    function (contentAccessMode) {
+    ['simpleContentAccessEnabled',
+    function (simpleContentAccessEnabled) {
         return {
             restrict: 'AE',
             controller: ['$scope', function ($scope) {
-                $scope.contentAccessMode = contentAccessMode;
+                $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
             }],
             templateUrl: 'subscriptions/views/content-access-mode-banner.html'
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/content-access-mode-banner.html

@@ -1,4 +1,4 @@
-<div bst-alert="info" ng-show="contentAccessMode === 'org_environment'">
+<div bst-alert="info" ng-show="simpleContentAccessEnabled">
   <span translate>
 This organization has Simple Content Access enabled. Hosts can consume from all repositories in their Content View regardless of subscription status.
   </span>

data/lib/katello/tasks/pulp3_migration.rake

@@ -1,7 +1,7 @@
 namespace :katello do
   desc "Runs a Pulp 2 to 3 Content Migration for supported types.  May be run multiple times.  Use wait=false to immediately return with a task url."
   task :pulp3_migration => ["environment", "disable_dynflow", "check_ping"] do
-    task = ForemanTasks.async_task(Actions::Pulp3::ContentMigration, [Katello::Repository::FILE_TYPE])
+    task = ForemanTasks.async_task(Actions::Pulp3::ContentMigration)
 
     if ENV['wait'].nil? || ::Foreman::Cast.to_bool(ENV['wait'])
       until !task.pending? || task.paused?

data/lib/katello/tasks/pulp3_post_migration_check.rake

@@ -0,0 +1,32 @@
+require File.expand_path("../engine", File.dirname(__FILE__))
+
+namespace :katello do
+  desc "Runs a post Pulp3 migration check for supported content types."
+  task :pulp3_post_migration_check => :environment do
+    repository_types = Katello::Pulp3::Migration::REPOSITORY_TYPES
+
+    repository_types.each do |type|
+      filter = 'version_href is NULL OR remote_href is NULL'
+
+      unless type == Katello::Repository::DOCKER_TYPE
+        filter += ' OR publication_href is NULL'
+      end
+      repositories = Katello::Repository.with_type(type).where(filter)
+
+      if repositories.any?
+        $stderr.print("ERROR: #{type} repository #{repositories.first.id} has a NULL value for remote_href, version_href, publication_href\n")
+        exit 1
+      end
+
+      non_archived_repositories = Katello::Repository.with_type(type).non_archived
+      with_no_distribution_references = non_archived_repositories
+        .left_outer_joins(:distribution_references)
+        .where(katello_distribution_references: { id: nil })
+
+      if with_no_distribution_references.any?
+        $stderr.print("ERROR: A non-archive #{type} repository #{with_no_distribution_references.first.id} did not have a distribution reference\n")
+        exit 1
+      end
+    end
+  end
+end

data/lib/katello/tasks/repository.rake

@@ -11,14 +11,17 @@ namespace :katello do
   task :publish_unpublished_repositories => ["environment", "disable_dynflow", "check_ping"] do
     needing_publish = []
     Organization.find_each do |org|
-      org.default_content_view.versions.first.repositories.where.not(:url => nil).find_each do |repo|
-        begin
-          if repo.needs_metadata_publish?
-            Rails.logger.error("Repository metadata for #{repo.name} (#{repo.id}) is out of date, regenerating.")
-            needing_publish << repo.id
+      if org.default_content_view && !org.default_content_view.versions.empty?
+        org.default_content_view.versions.first.repositories.joins(:root)
+          .where.not(katello_root_repositories: { url: nil }).find_each do |repo|
+          begin
+            if repo.needs_metadata_publish?
+              Rails.logger.error("Repository metadata for #{repo.name} (#{repo.id}) is out of date, regenerating.")
+              needing_publish << repo.id
+            end
+          rescue => e
+            puts "Failed to check repository #{repo.id}: #{e}"
           end
-        rescue => e
-          puts "Failed to check repository #{repo.id}: #{e}"
         end
       end
     end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.15.0.rc1.1".freeze
+  VERSION = "3.15.0.rc1.2".freeze
 end

data/webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalActions.js

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

data/webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalSelectors.js

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

data/webpack/__mocks__/foremanReact/components/ForemanModal/index.js

@@ -0,0 +1,4 @@
+const ForemanModal = () => jest.fn();
+ForemanModal.Header = () => jest.fn();
+ForemanModal.Footer = () => jest.fn();
+export default ForemanModal;

data/webpack/scenes/Organizations/OrganizationSelectors.js

@@ -0,0 +1,4 @@
+export const selectOrganizationState = state => state.katello.organization;
+
+export const selectSimpleContentAccessEnabled = state =>
+  selectOrganizationState(state).simple_content_access;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import { translate as __ } from 'foremanReact/common/I18n';
 
 const question = __('Are you sure you want to delete the manifest?');
@@ -11,14 +12,18 @@ const l4 = __(`Require you to upload the subscription-manifest and re-attach
 const debug = __(`This action should only be taken in extreme circumstances or
                   for debugging purposes.`);
 
-const DeleteManifestModalText = `<p>${question}</p>
-<p>${note}</p>
-<ul class="list-aligned">
-  <li>${l1}</li>
-  <li>${l2}</li>
-  <li>${l3}</li>
-  <li>${l4}</li>
-</ul>
-<p>${debug}</p>`;
+const DeleteManifestModalText = () => (
+  <React.Fragment>
+    <p>{question}</p>
+    <p>{note}</p>
+    <ul className="list-aligned">
+      <li>{l1}</li>
+      <li>{l2}</li>
+      <li>{l3}</li>
+      <li>{l4}</li>
+    </ul>
+    <p>{debug}</p>
+  </React.Fragment>
+);
 
 export default DeleteManifestModalText;

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

@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Col, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel } from 'react-bootstrap';
-import { Button, Icon, Modal, Spinner, OverlayTrigger, Tooltip, MessageDialog } from 'patternfly-react';
+import { Grid, Col, Row, Tabs, Tab, Form, FormGroup, FormControl, ControlLabel } from 'react-bootstrap';
+import { Button, Spinner, OverlayTrigger, Tooltip, Icon } from 'patternfly-react';
+import ForemanModal from 'foremanReact/components/ForemanModal';
 import { isEqual } from 'lodash';
 import { translate as __ } from 'foremanReact/common/I18n';
 import TooltipButton from '../../../move_to_pf/TooltipButton';
@@ -10,25 +11,24 @@ import { Table } from '../../../move_to_foreman/components/common/table';
 import { manifestExists } from '../SubscriptionHelpers';
 import { columns } from './ManifestHistoryTableSchema';
 import DeleteManifestModalText from './DeleteManifestModalText';
+import { MANAGE_MANIFEST_MODAL_ID, DELETE_MANIFEST_MODAL_ID } from './ManifestConstants';
+
+import './ManageManifestModal.scss';
 
 class ManageManifestModal extends Component {
   constructor(props) {
     super(props);
 
     this.state = {
-      showModal: props.showModal,
       actionInProgress: props.taskInProgress,
-      showDeleteManifestModalDialog: false,
     };
   }
 
   static getDerivedStateFromProps(newProps, prevState) {
     if (
-      !isEqual(newProps.showModal, prevState.showModal) ||
       !isEqual(newProps.taskInProgress, prevState.actionInProgress)
     ) {
       return {
-        showModal: newProps.showModal,
         actionInProgress: newProps.taskInProgress,
       };
     }
@@ -52,10 +52,16 @@ class ManageManifestModal extends Component {
   }
 
   hideModal = () => {
-    this.setState({ showModal: false, showDeleteManifestModalDialog: false });
-    this.props.onClose();
+    if (this.props.deleteManifestModalIsOpen) this.hideDeleteManifestModal();
+    this.props.setModalClosed({ id: MANAGE_MANIFEST_MODAL_ID });
   };
 
+  showDeleteManifestModal = () =>
+    this.props.setModalOpen({ id: DELETE_MANIFEST_MODAL_ID });
+
+  hideDeleteManifestModal = () =>
+    this.props.setModalClosed({ id: DELETE_MANIFEST_MODAL_ID });
+
   updateRepositoryUrl = (event) => {
     this.setState({ redhat_repository_url: event.target.value });
   };
@@ -82,13 +88,6 @@ class ManageManifestModal extends Component {
     this.hideModal();
     this.setState({ actionInProgress: true });
     this.props.delete();
-    this.showDeleteManifestModal(false);
-  };
-
-  showDeleteManifestModal = (show) => {
-    this.setState({
-      showDeleteManifestModalDialog: show,
-    });
   };
 
   disabledTooltipText = () => {
@@ -107,6 +106,7 @@ class ManageManifestModal extends Component {
       canImportManifest,
       canDeleteManifest,
       canEditOrganizations,
+      simpleContentAccess,
     } = this.props;
 
     const showRedHatProviderDetails = canEditOrganizations;
@@ -150,166 +150,177 @@ class ManageManifestModal extends Component {
     };
 
     return (
-      <Modal show={this.state.showModal} onHide={this.hideModal}>
-        <Modal.Header>
-          <button
-            className="close"
-            onClick={this.hideModal}
-            aria-label={__('Close')}
-          >
-            <Icon type="pf" name="close" />
-          </button>
-          <Modal.Title>{__('Manage Manifest')}</Modal.Title>
-        </Modal.Header>
-        <Modal.Body>
-          <Tabs id="manifest-history-tabs">
-            {showManifestTab &&
-              <Tab eventKey={1} title={__('Manifest')}>
-                <Form className="form-horizontal">
-                  {showRedHatProviderDetails &&
-                    <React.Fragment>
-                      <h5>{__('Red Hat Provider Details')}</h5>
-                      <hr />
-                      <FormGroup>
-                        <Col sm={3}>
-                          <ControlLabel htmlFor="cdnUrl">
-                            {__('Red Hat CDN URL')}
-                          </ControlLabel>
-                        </Col>
-                        <Col sm={9}>
-                          <FormControl
-                            id="cdnUrl"
-                            type="text"
-                            defaultValue={this.state.redhat_repository_url || organization.redhat_repository_url || ''}
-                            onBlur={this.updateRepositoryUrl}
-                          />
-                        </Col>
-                      </FormGroup>
-                      <FormGroup>
-                        <Col smOffset={3} sm={3}>
-                          <Button onClick={this.saveOrganization} disabled={organization.loading}>
-                            {organization.loading ? buttonLoading : __('Update')}
-                          </Button>
-                        </Col>
-                      </FormGroup>
-                      <br />
-                    </React.Fragment>
-                  }
-                  {showSubscriptionManifest &&
-                    <React.Fragment>
-                      <h5>{__('Subscription Manifest')}</h5>
-                      <hr />
-
-                      <FormGroup>
-                        <ControlLabel
-                          className="col-sm-3 control-label"
-                          htmlFor="usmaFile"
-                          style={{ paddingTop: '0' }}
-                        >
-                          <OverlayTrigger
-                            overlay={
-                              <Tooltip id="usma-tooltip">
-                                {__('Upstream Subscription Management Application')}
-                              </Tooltip>
-                            }
-                            placement="bottom"
-                            trigger={['hover', 'focus']}
-                            rootClose={false}
-                          >
-                            <span>{__('USMA')}</span>
-                          </OverlayTrigger>
-                        </ControlLabel>
-
-                        <Col sm={9} className="manifest-actions">
-                          <Spinner loading={actionInProgress} inline />
-
-                          {getManifestName()}
-                          {canImportManifest &&
+      <ForemanModal id={MANAGE_MANIFEST_MODAL_ID} title={__('Manage Manifest')}>
+        <Tabs id="manifest-history-tabs">
+          {showManifestTab &&
+            <Tab eventKey={1} title={__('Manifest')}>
+              <Form className="form-horizontal">
+                {showRedHatProviderDetails &&
+                  <React.Fragment>
+                    <h5>{__('Red Hat Provider Details')}</h5>
+                    <hr />
+                    <FormGroup>
+                      <Grid>
+                        <Row>
+                          <Col sm={4}>
+                            <ControlLabel htmlFor="cdnUrl">
+                              {__('Red Hat CDN URL')}
+                            </ControlLabel>
+                          </Col>
+                          <Col sm={8}>
                             <FormControl
-                              id="usmaFile"
-                              type="file"
-                              accept=".zip"
-                              disabled={actionInProgress}
-                              onChange={e => this.uploadManifest(e.target.files)}
+                              id="cdnUrl"
+                              type="text"
+                              defaultValue={this.state.redhat_repository_url || organization.redhat_repository_url || ''}
+                              onBlur={this.updateRepositoryUrl}
                             />
-                          }
-                          <div id="manifest-actions-row">
+                          </Col>
+                        </Row>
+                      </Grid>
+                    </FormGroup>
+                    <FormGroup>
+                      <Grid>
+                        <Row>
+                          <Col smOffset={4} sm={4}>
+                            <Button onClick={this.saveOrganization} disabled={organization.loading}>
+                              {organization.loading ? buttonLoading : __('Update')}
+                            </Button>
+                          </Col>
+                        </Row>
+                      </Grid>
+                    </FormGroup>
+                    <br />
+                  </React.Fragment>
+                }
+                {showSubscriptionManifest &&
+                  <React.Fragment>
+
+                    <FormGroup>
+                      <Grid>
+                        <h5>{__('Subscription Manifest')}</h5>
+                        <hr />
+                        <Row>
+                          <Col sm={4}>
+                            <ControlLabel
+                              className="control-label"
+                              htmlFor="usmaFile"
+                              style={{ paddingTop: '0' }}
+                            >
+                              <OverlayTrigger
+                                overlay={
+                                  <Tooltip id="usma-tooltip">
+                                    {__('Upstream Subscription Management Application')}
+                                  </Tooltip>
+                                }
+                                placement="bottom"
+                                trigger={['hover', 'focus']}
+                                rootClose={false}
+                              >
+                                <div>{__('USMA')}</div>
+                              </OverlayTrigger>
+                            </ControlLabel>
+                          </Col>
+                          <Col sm={8}>
+                            {getManifestName()}
+                          </Col>
+                        </Row>
+                        <Row>
+                          <Col sm={4}>
+                            <div>{__('Simple Content Access')}</div>
+                          </Col>
+                          <Col sm={8} className="manifest-actions">
+                            <Spinner loading={actionInProgress} inline />
+                            {simpleContentAccess ? __('Yes') : __('No')}
+                            <OverlayTrigger
+                              overlay={
+                                <Tooltip id="sca-tooltip">
+                                  {__('When Simple Content Access is enabled, hosts can consume from all repositories in their Content View regardless of subscription status.')}
+                                </Tooltip>
+                              }
+                              placement="bottom"
+                              trigger={['hover', 'focus']}
+                              rootClose={false}
+                            >
+                              <Icon type="pf" name="info" />
+                            </OverlayTrigger>
                             {canImportManifest &&
-                              <TooltipButton
-                                onClick={this.refreshManifest}
-                                tooltipId="refresh-manifest-button-tooltip"
-                                tooltipText={disabledReason}
-                                tooltipPlacement="top"
-                                title={__('Refresh')}
-                                disabled={!manifestExists(organization) ||
-                                  actionInProgress || disableManifestActions}
-                              />
-                            }
-                            {canDeleteManifest &&
-                            <React.Fragment>
-                              <TooltipButton
-                                renderedButton={(
-                                  <Button
-                                    disabled={!manifestExists(organization) || actionInProgress}
-                                    bsStyle="danger"
-                                    onClick={() => this.showDeleteManifestModal(true)}
-                                  >
-                                    {__('Delete')}
-                                  </Button>
-                                  )}
-
-                                tooltipId="delete-manifest-button-tooltip"
-                                tooltipText={this.disabledTooltipText()}
-                                tooltipPlacement="top"
-
-                              />
-                            </React.Fragment>
-                            }
-                          </div>
-
-                          <MessageDialog
-                            show={this.state.showDeleteManifestModalDialog}
-                            title={__('Confirm delete manifest')}
-                            secondaryContent={
-                              // eslint-disable-next-line react/no-danger
-                              <p dangerouslySetInnerHTML={{
-                              __html: DeleteManifestModalText,
-                              }}
+                              <FormControl
+                                id="usmaFile"
+                                type="file"
+                                accept=".zip"
+                                disabled={actionInProgress}
+                                onChange={e => this.uploadManifest(e.target.files)}
                               />
                             }
-                            primaryActionButtonContent={__('Delete')}
-                            primaryActionButtonBsStyle="danger"
-                            primaryAction={() => this.deleteManifest()}
-                            secondaryActionButtonContent={__('Cancel')}
-                            secondaryAction={() => this.showDeleteManifestModal(false)}
-                            onHide={() => this.showDeleteManifestModal(false)}
-                            accessibleName="deleteConfirmationDialog"
-                            accessibleDescription="deleteConfirmationDialogContent"
-                          />
-                        </Col>
-                      </FormGroup>
-                    </React.Fragment>
-                  }
-                </Form>
-              </Tab>
-            }
-            <Tab eventKey={2} title={__('Manifest History')}>
-              <LoadingState loading={manifestHistory.loading} loadingText={__('Loading')}>
-                <Table
-                  rows={manifestHistory.results}
-                  columns={columns}
-                  emptyState={emptyStateData()}
-                />
-              </LoadingState>
+                            <div id="manifest-actions-row">
+                              {canImportManifest &&
+                                <TooltipButton
+                                  onClick={this.refreshManifest}
+                                  tooltipId="refresh-manifest-button-tooltip"
+                                  tooltipText={disabledReason}
+                                  tooltipPlacement="top"
+                                  title={__('Refresh')}
+                                  disabled={!manifestExists(organization) ||
+                                    actionInProgress || disableManifestActions}
+                                />
+                              }
+                              {canDeleteManifest &&
+                              <React.Fragment>
+                                <TooltipButton
+                                  renderedButton={(
+                                    <Button
+                                      disabled={!manifestExists(organization) || actionInProgress}
+                                      bsStyle="danger"
+                                      onClick={this.showDeleteManifestModal}
+                                    >
+                                      {__('Delete')}
+                                    </Button>
+                                    )}
+
+                                  tooltipId="delete-manifest-button-tooltip"
+                                  tooltipText={this.disabledTooltipText()}
+                                  tooltipPlacement="top"
+
+                                />
+                              </React.Fragment>
+                              }
+                            </div>
+                            <ForemanModal title={__('Confirm delete manifest')} id={DELETE_MANIFEST_MODAL_ID}>
+                              <DeleteManifestModalText />
+                              <ForemanModal.Footer>
+                                <Button bsStyle="default" onClick={this.hideDeleteManifestModal}>
+                                  {__('Cancel')}
+                                </Button>
+                                <Button bsStyle="danger" onClick={this.deleteManifest}>
+                                  {__('Delete')}
+                                </Button>
+                              </ForemanModal.Footer>
+                            </ForemanModal>
+                          </Col>
+                        </Row>
+                      </Grid>
+                    </FormGroup>
+                  </React.Fragment>
+                }
+              </Form>
             </Tab>
-          </Tabs>
-        </Modal.Body>
-        <Modal.Footer>
+          }
+          <Tab eventKey={2} title={__('Manifest History')}>
+            <LoadingState loading={manifestHistory.loading} loadingText={__('Loading')}>
+              <Table
+                rows={manifestHistory.results}
+                columns={columns}
+                emptyState={emptyStateData()}
+              />
+            </LoadingState>
+          </Tab>
+        </Tabs>
+        <ForemanModal.Footer>
           <Button bsStyle="primary" onClick={this.hideModal}>
             {__('Close')}
           </Button>
-        </Modal.Footer>
-      </Modal>
+        </ForemanModal.Footer>
+      </ForemanModal>
     );
   }
 }
@@ -338,12 +349,14 @@ ManageManifestModal.propTypes = {
   loadOrganization: PropTypes.func.isRequired,
   saveOrganization: PropTypes.func.isRequired,
   taskInProgress: PropTypes.bool.isRequired,
+  simpleContentAccess: PropTypes.bool,
   manifestHistory: PropTypes.shape({
     loading: PropTypes.bool,
     results: PropTypes.array,
   }).isRequired,
-  showModal: PropTypes.bool.isRequired,
-  onClose: PropTypes.func,
+  setModalClosed: PropTypes.func.isRequired,
+  setModalOpen: PropTypes.func.isRequired,
+  deleteManifestModalIsOpen: PropTypes.bool,
 };
 
 ManageManifestModal.defaultProps = {
@@ -352,7 +365,8 @@ ManageManifestModal.defaultProps = {
   canImportManifest: false,
   canDeleteManifest: false,
   canEditOrganizations: false,
-  onClose() {},
+  deleteManifestModalIsOpen: false,
+  simpleContentAccess: false,
 };
 
 export default ManageManifestModal;