katello 4.15.0 → 4.16.0.rc2

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

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

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/products-bulk-advanced-sync-modal.controller.js

@@ -25,7 +25,7 @@ angular.module('Bastion.products').controller('ProductsBulkAdvancedSyncModalCont
                 Notification.setSuccessMessage(message, {
                 link: {
                     children: translate("Click to view task"),
-                    href: translate("/foreman_tasks/tasks/%taskId").replace('%taskId', task.id)
+                    href: "/foreman_tasks/tasks/%taskId".replace('%taskId', task.id)
                 }});
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-sync-plan-modal.html

@@ -68,10 +68,10 @@
             <tr bst-table-row ng-repeat="syncPlan in table.rows" class="clickable-row"
                 ng-click="selectSyncPlan(syncPlan)" ng-class="{'selected-row': syncPlan === selectedSyncPlan }">
               <td bst-table-cell>{{ syncPlan.name }}</td>
-              <td bst-table-cell><long-date-time date="syncPlan.sync_date" /></td>
+              <td bst-table-cell><long-date-time date="syncPlan.sync_date"></long-date-time></td>
               <td bst-table-cell>{{ syncPlan.enabled }}</td>
               <td bst-table-cell>{{ syncPlan.interval | translate | capitalize }}</td>
-              <td bst-table-cell><long-date-time date="syncPlan.next_sync" /></td>
+              <td bst-table-cell><long-date-time date="syncPlan.next_sync"></long-date-time></td>
             </tr>
           </tbody>
         </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -54,7 +54,7 @@
           </dd>
 
           <dt ng-if="product.redhat != true" translate>Metadata Expiration (Seconds)</dt>
-          <dd bst-edit-number="repository.metadata_expire" on-save="save(repository)" 
+          <dd bst-edit-number="repository.metadata_expire" on-save="save(repository)"
               readonly="product.redhat || denied('edit_products', product) || !repository.allow_updates || repository.is_container_push"
               deletable="repository.metadata_expire !== null"
               on-delete="clearMetadataExpire()"
@@ -77,7 +77,7 @@
       </dd>
 
       <span ng-show="repository.generic_remote_options !== []">
-        <span ng-repeat="option in genericRemoteOptions"> 
+        <span ng-repeat="option in genericRemoteOptions">
           <dt>{{option.title}}</dt>
             <dd bst-edit-text="genericRemoteOptions[$index].value"
                 on-save="save(repository)"
@@ -144,6 +144,13 @@
             edit-trigger="uploadedFile">
         </dd>
 
+        <dt translate>Sync Dependencies</dt>
+        <dd bst-edit-checkbox="repository.sync_dependencies"
+            formatter="booleanToYesNo"
+            on-save="save(repository)"
+            readonly="denied('edit_products', product) || !repository.allow_updates || repository.is_container_push">
+        </dd>
+
         <dt translate>Ansible Collection Authorization</dt>
         <dd bst-edit-custom="repository.ansible_collection_auth_exists"
             readonly="denied('edit_products', product) || !repository.allow_updates || repository.is_container_push"
@@ -312,6 +319,12 @@
             on-save="save(repository)">
         </dd>
       </span>
+      <span ng-if="((repository.content_type === 'yum' && !product.redhat) || repository.content_type === 'deb') && repository.full_gpg_key_path ">
+        <dt translate>URL to GPG Key</dt>
+        <dd>
+          <a ng-href="{{ repository.full_gpg_key_path }}">{{ repository.full_gpg_key_path }}</a>
+        </dd>
+      </span>
       <dt translate>SSL CA Cert</dt>
       <dd bst-edit-select="repository.ssl_ca_cert.name"
           readonly="product.redhat ||denied('edit_products', product) || !repository.allow_updates || repository.is_container_push"
@@ -333,7 +346,7 @@
           options="certs()"
           on-save="save(repository)">
       </dd>
-      <span ng-if="repository.content_type == 'yum' || repository.content_type == 'deb' || repository.content_type == 'docker'">
+      <span ng-if="repository.content_type === 'deb' || repository.content_type === 'docker' || repository.content_type === 'file' || repository.content_type === 'yum'">
         <dt translate>Download Policy</dt>
         <dd bst-edit-select="downloadPolicyDisplay(repository.download_policy)"
             readonly="denied('edit_products', product) || !repository.allow_updates || repository.is_container_push"
@@ -383,17 +396,20 @@
       <span ng-include="'products/details/partials/sync-status.html'"></span>
 
       <dt translate>Last Sync</dt>
-      <dd ng-show="repository.last_sync == null" translate>
+      <dd ng-show="repository.last_sync == null && repository.last_sync_words == null" translate>
         Not Synced
       </dd>
+      <dd ng-show="repository.last_sync == null && repository.last_sync_words" translate>
+        Completed {{ repository.last_sync_words }} ago
+      </dd>
       <dd ng-hide="repository.last_sync == null || repository.last_sync.ended_at == null">
-        <relative-date date="repository.last_sync.ended_at" />
-        (<short-date-time date="repository.last_sync.ended_at" /> <translate>Local Time</translate>)
+        <relative-date date="repository.last_sync.ended_at" ></relative-date>
+        (<short-date-time date="repository.last_sync.ended_at" ></short-date-time> <translate>Local Time</translate>)
       </dd>
 
       <dt translate>Next Sync</dt>
       <dd ng-show="repository.product.sync_plan.next_sync">
-        <long-date-time date="repository.product.sync_plan.next_sync" /> (<translate>Server Time</translate>)
+        <long-date-time date="repository.product.sync_plan.next_sync" ></long-date-time> (<translate>Server Time</translate>)
       </dd>
       <dd ng-hide="repository.product.sync_plan.next_sync" translate>
         Synced manually, no interval set.
@@ -524,7 +540,7 @@
         </tbody>
       </table>
 
-      <div class="divider" ng-if="repository.content_type === 'ostree'"/>
+      <div class="divider" ng-if="repository.content_type === 'ostree'"></div>
     </section>
 
     <span ng-hide="(repository.content_type === 'deb' && repository.url)">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-tasks.html

@@ -1,4 +1,5 @@
 <div tasks-table  details-state="product.repository.tasks.details"
      known-context="repository,organization"
      resource-type="Katello::Repository"
-     resource-id="{{ repository.id }}"/>
+     resource-id="{{ repository.id }}">
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/new-repository.controller.js

@@ -132,7 +132,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             });
 
             $scope.save = function (repository) {
-                var fields = ['upstream_password', 'upstream_username', 'ansible_collection_auth_token', 'ansible_collection_auth_url', 'ansible_collection_requirements'];
+                var fields = ['upstream_password', 'upstream_username', 'ansible_collection_auth_token', 'ansible_collection_auth_url', 'ansible_collection_requirements', 'sync_repositories'];
                 if (repository.content_type === 'yum') {
                     repository.os_versions = $scope.osVersionsParam();
                     repository.ignorable_content = [];
@@ -143,7 +143,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
                         repository.ignorable_content.push("treeinfo");
                     }
                 }
-                if (repository.content_type !== 'yum' && repository.content_type !== 'deb' && repository.content_type !== 'docker') {
+                if (repository.content_type !== 'deb' && repository.content_type !== 'docker' && repository.content_type !== 'file' && repository.content_type !== 'yum') {
                     repository['download_policy'] = '';
                 }
                 if (repository.arch === 'No restriction') {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -26,8 +26,8 @@
       <div bst-form-group label="{{ 'Description' | translate }}">
         <textarea id="description"
                   name="description"
-                  ng-model="repository.description"
-                  type="text"/>
+                  ng-model="repository.description">
+        </textarea>
       </div>
 
       <div bst-form-group label="{{ 'Type' | translate }}">
@@ -107,8 +107,8 @@
                name="ansible_collection_requirements"
                ng-model="repository.ansible_collection_requirements"
                rows="10"
-               placeholder= "{{ 'You can upload a requirements.yml file below to auto-fill contents or paste contents of requirement.yml here' | translate }}"
-               type="text"/>
+               placeholder= "{{ 'You can upload a requirements.yml file below to auto-fill contents or paste contents of requirement.yml here' | translate }}">
+        </textarea>
       </div>
 
       <div class="form-group" ng-show="repository.content_type === 'ansible_collection'">
@@ -118,6 +118,19 @@
         </a></p>
       </div>
 
+      <div ng-show="repository.content_type === 'ansible_collection'">
+        <div class="checkbox">
+          <label>
+            <input id="sync_dependencies" name="sync_dependencies" ng-model="repository.sync_dependencies" ng-init="repository.sync_dependencies=true" type="checkbox"/>
+            <span translate>Sync Dependencies</span>
+          </label>
+
+          <p class="help-block" translate>
+            Include dependencies of Ansible collections in the repository.
+          </p>
+        </div>
+      </div>
+
       <div ng-show="repository.content_type === 'ansible_collection'" bst-form-group label="{{ 'Auth URL' | translate }}">
         <input id="ansible_collection_auth_url"
                name="ansible_collection_auth_url"
@@ -152,7 +165,7 @@
                 <br />
                 <div class="alert alert-danger" ><strong>Warning. </strong>Are you sure you want to add a comma in this whitespace separated list of distributions?</div>
        </div>
-     
+
       </div>
 
       <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Components' | translate }}">
@@ -277,8 +290,8 @@
 	  <textarea
               id="option-{{$index}}"
               name="option-{{$index}}"
-              ng-model="genericRemoteOptions[$index].value"
-              type="text"/>
+              ng-model="genericRemoteOptions[$index].value">
+      </textarea>
           <p class="help-block" translate>
             {{option.description}}
           </p>
@@ -296,7 +309,7 @@
         </div>
       </div>
 
-      <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'yum' || repository.content_type === 'deb' || repository.content_type === 'docker'">
+      <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'deb' || repository.content_type === 'docker' || repository.content_type === 'file' || repository.content_type === 'yum'">
         <select id="download_policy"
                 name="download_policy"
                 ng-model="repository.download_policy"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/os-versions.service.js

@@ -14,6 +14,7 @@ angular
         this.getOSVersionsOptions = function () {
             return [
                 { name: 'No restriction', id: '' },
+                { name: 'Red Hat Enterprise Linux 10 ', id: 'rhel-10' },
                 { name: 'Red Hat Enterprise Linux 9 ', id: 'rhel-9' },
                 { name: 'Red Hat Enterprise Linux 8 ', id: 'rhel-8' },
                 { name: 'Red Hat Enterprise Linux 7 ', id: 'rhel-7' },

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-info.html

@@ -88,13 +88,13 @@
 
       <dt translate>Last Sync</dt>
       <dd>
-        <relative-date date="product.last_sync" />
-        (<long-date-time date="product.last_sync" /> <translate>Local Time</translate>)
+        <relative-date date="product.last_sync" ></relative-date>
+        (<long-date-time date="product.last_sync" ></long-date-time> <translate>Local Time</translate>)
       </dd>
 
       <dt translate>Next Sync</dt>
       <dd ng-show="product.sync_plan.next_sync">
-        <long-date-time date="product.sync_plan.next_sync" /> (<translate>Server Time</translate>)
+        <long-date-time date="product.sync_plan.next_sync" ></long-date-time> (<translate>Server Time</translate>)
       </dd>
       <dd ng-hide="product.sync_plan.next_sync" translate>
         Synced manually, no interval set.

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/views/product-tasks.html

@@ -1,4 +1,5 @@
 <div tasks-table  details-state="product.tasks.details"
               known-context="product,organization"
               resource-type="Katello::Product"
-              resource-id="{{ product.id }}"/>
+              resource-id="{{ product.id }}">
+</div>

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

@@ -16,7 +16,8 @@
       <select class="form-control" ng-disabled="creating()"
               ng-model="createRepoChoices.existingProductId"
               ng-options="product.id as product.name for product in products"
-              ng-required="createRepoChoices.newProduct === 'false'"/>
+              ng-required="createRepoChoices.newProduct === 'false'">
+      </select>
     </div>
 
     <div bst-form-group ng-show="createRepoChoices.newProduct === 'true'"
@@ -45,7 +46,8 @@
     <div bst-form-group ng-show="createRepoChoices.newProduct === 'true' && contentCredentials.length !== 0"
          label="{{ 'GPG Key' | translate }}">
       <select class="form-control" ng-model="createRepoChoices.product.gpg_key_id"
-              ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials"/>
+              ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials">
+      </select>
     </div>
 
     <h4 translate>Repository Options</h4>

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

@@ -4,7 +4,8 @@
   <form ng-submit="discover()" name="discoveryForm" class="col-sm-5" role="form">
     <div bst-form-group label="{{ 'Repository Type' | translate }}">
       <select ng-model="discovery.contentType"
-              ng-options="contentType.id as contentType.name for contentType in contentTypes"/>
+              ng-options="contentType.id as contentType.name for contentType in contentTypes">
+      </select>
     </div>
 
     <div bst-form-group ng-if="discovery.contentType === 'yum'"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/products.controller.js

@@ -68,7 +68,7 @@ angular.module('Bastion.products').controller('ProductsController',
             Notification.setSuccessMessage(message, {
                 link: {
                     children: translate("Click to view task"),
-                    href: translate("/foreman_tasks/tasks/%taskId").replace('%taskId', taskId)
+                    href: "/foreman_tasks/tasks/%taskId".replace('%taskId', taskId)
                 }});
         });
 
@@ -98,7 +98,7 @@ angular.module('Bastion.products').controller('ProductsController',
                 Notification.setSuccessMessage(message, {
                     link: {
                         children: translate("Click to monitor task progress."),
-                        href: translate("/foreman_tasks/tasks/%taskId").replace('%taskId', task.id)
+                        href: "/foreman_tasks/tasks/%taskId".replace('%taskId', task.id)
                     }});
             };
 
@@ -113,7 +113,7 @@ angular.module('Bastion.products').controller('ProductsController',
                 Notification.setSuccessMessage(message, {
                     link: {
                         children: translate("Click to monitor task progress."),
-                        href: translate("/foreman_tasks/tasks/%taskId").replace('%taskId', task.id)
+                        href: "/foreman_tasks/tasks/%taskId".replace('%taskId', task.id)
                     }});
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/views/partials/product-table-sync-status.html

@@ -1,7 +1,7 @@
 <div class="list-unstyled" ng-show="product.last_sync">
   <div>
     <span translate>Last synced </span>
-    <relative-date date="product.last_sync" />.
+      <relative-date date="product.last_sync" ></relative-date>.
   </div>
   <div ng-show="mostImportantSyncState(product) == 'pending'"
         translate

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscription-start-date.html

@@ -1,2 +1,2 @@
 
-<date date="subscription.start_date" />{{ checkFutureDate(subscription.start_date) }}
+<date date="subscription.start_date" ></date>{{ checkFutureDate(subscription.start_date) }}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html

@@ -42,7 +42,7 @@
       </dd>
 
       <dt translate>Next Sync</dt>
-      <dd><long-date-time date="syncPlan.next_sync" /></dd>
+      <dd><long-date-time date="syncPlan.next_sync"></long-date-time></dd>
 
       <dt translate>Recurring Logic</dt>
       <dd>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/views/sync-plans.html

@@ -43,10 +43,10 @@
             </a>
           </td>
           <td bst-table-cell>{{ syncPlan.description }}</td>
-          <td bst-table-cell><long-date-time date="syncPlan.sync_date" /></td>
+          <td bst-table-cell><long-date-time date="syncPlan.sync_date"></long-date-time></td>
           <td bst-table-cell>{{ syncPlan.enabled }}</td>
           <td bst-table-cell>{{ syncPlan.interval | translate | capitalize }}</td>
-          <td bst-table-cell><long-date-time date="syncPlan.next_sync" /></td>
+          <td bst-table-cell><long-date-time date="syncPlan.next_sync"></long-date-time></td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/tasks-table.directive.js

@@ -26,7 +26,8 @@
         <div tasks-table  details-state="product.tasks.details"
                           known-context="product,organization"
                           resource-type="Katello::Product"
-                          resource-id="{{ product.id }}"/>
+                          resource-id="{{ product.id }}">
+        </dev>
      </pre>
  */
 angular.module('Bastion.tasks').directive('tasksTable',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/task-details.html

@@ -8,10 +8,10 @@
   <dd>{{ task.username }}</dd>
 
   <dt translate>Started At</dt>
-  <dd><short-date-time date="task.started_at" /></dd>
+  <dd><short-date-time date="task.started_at"></short-date-time></dd>
 
   <dt translate>Finished At</dt>
-  <dd><short-date-time date="task.ended_at" /></dd>
+  <dd><short-date-time date="task.ended_at"></short-date-time></dd>
 
   <dt translate>Parameters</dt>
   <dd ng-switch="isArray(task.humanized.input)">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-index.html

@@ -1 +1 @@
-<div tasks-table details-state="tasks.details" all/>
+<div tasks-table details-state="tasks.details" all></div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-table.html

@@ -32,7 +32,7 @@
             </a>
           </td>
           <td bst-table-cell>{{ task.username }}</td>
-          <td bst-table-cell><short-date-time date="task.started_at" /></td>
+          <td bst-table-cell><short-date-time date="task.started_at"></short-date-time></td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/user-tasks-table.html

@@ -22,7 +22,7 @@
               {{ task.humanized.input | taskInputShort | taskInputCompile }}
             </a>
           </td>
-          <td bst-table-cell><short-date-time date="task.started_at" /></td>
+          <td bst-table-cell><short-date-time date="task.started_at"></short-date-time></td>
         </tr>
       </tbody>
     </table>

data/lib/katello/engine.rb

@@ -156,9 +156,13 @@ module Katello
       ::HttpProxy.include Katello::Concerns::HttpProxyExtensions
       ForemanTasks::RecurringLogic.include Katello::Concerns::RecurringLogicExtensions
 
+      # Validator extensions
+      ::BookmarkControllerValidator.singleton_class.send :prepend, Katello::Concerns::BookmarkControllerValidatorExtensions
+
       #Controller extensions
       ::HostsController.include Katello::Concerns::HostsControllerExtensions
       ::SmartProxiesController.include Katello::Concerns::SmartProxiesControllerExtensions
+      ::HttpProxiesController.include Katello::Concerns::HttpProxiesControllerExtensions
       ::RegistrationCommandsController.prepend Katello::Concerns::RegistrationCommandsControllerExtensions
 
       #Helper Extensions
@@ -198,6 +202,8 @@ module Katello
       ::Api::V2::HostsBulkActionsController.include Katello::Concerns::Api::V2::HostsBulkActionsControllerExtensions
       ::Api::V2::HostgroupsController.include Katello::Concerns::Api::V2::HostgroupsControllerExtensions
       ::Api::V2::SmartProxiesController.include Katello::Concerns::Api::V2::SmartProxiesControllerExtensions
+      ::Api::V2::HttpProxiesController.include Katello::Concerns::HttpProxiesControllerExtensions
+      ::Api::V2::HttpProxiesController.include Katello::Concerns::Api::V2::HttpProxiesControllerExtensions
       ::Api::V2::RegistrationController.include ::Foreman::Controller::SmartProxyAuth
       ::Api::V2::RegistrationController.prepend Katello::Concerns::Api::V2::RegistrationControllerExtensions
       ::Api::V2::RegistrationCommandsController.include Katello::Concerns::Api::V2::RegistrationCommandsControllerExtensions

data/lib/katello/permission_creator.rb

@@ -16,6 +16,7 @@ module Katello
       subscription_permissions
       sync_plan_permissions
       alternate_content_source_permissions
+      flatpak_remote_permissions
       user_permissions
     end
 
@@ -305,6 +306,7 @@ module Katello
                            'katello/api/v2/content_uploads' => [:create, :update, :destroy],
                            'katello/api/v2/organizations' => [:repo_discover, :cancel_repo_discover],
                            'katello/api/v2/repository_sets' => [:enable, :disable],
+                           'katello/api/v2/flatpak_remote_repositories' => [:mirror],
                          },
                          :resource_type => 'Katello::Product',
                          :finder_scope => :editable
@@ -449,5 +451,40 @@ module Katello
                          },
                          :resource_type => 'Organization'
     end
+
+    def flatpak_remote_permissions
+      @plugin.permission :view_flatpak_remotes,
+                         {
+                           'katello/api/v2/flatpak_remotes' => [:index, :show, :auto_complete_search],
+                           'katello/api/v2/flatpak_remote_repositories' => [:index, :show, :auto_complete_search],
+                           'katello/api/v2/flatpak_remote_repository_manifests' => [:index, :show, :auto_complete_search],
+                         },
+                         :resource_type => 'Katello::FlatpakRemote',
+                         :finder_scope => :readable
+      @plugin.permission :create_flatpak_remotes,
+                         {
+                           'katello/api/v2/flatpak_remotes' => [:create],
+                           'katello/api/v2/flatpak_remote_repositories' => [:create],
+                           'katello/api/v2/flatpak_remote_repository_manifests' => [:create],
+                         },
+                         :resource_type => 'Katello::FlatpakRemote',
+                         :finder_scope => :creatable
+      @plugin.permission :edit_flatpak_remotes,
+                         {
+                           'katello/api/v2/flatpak_remotes' => [:update, :scan],
+                           'katello/api/v2/flatpak_remote_repositories' => [:update],
+                           'katello/api/v2/flatpak_remote_repository_manifests' => [:update],
+                         },
+                         :resource_type => 'Katello::FlatpakRemote',
+                         :finder_scope => :editable
+      @plugin.permission :destroy_flatpak_remotes,
+                         {
+                           'katello/api/v2/flatpak_remotes' => [:destroy],
+                           'katello/api/v2/flatpak_remote_repositories' => [:destroy],
+                           'katello/api/v2/flatpak_remote_repository_manifests' => [:destroy],
+                         },
+                         :resource_type => 'Katello::FlatpakRemote',
+                         :finder_scope => :deletable
+    end
   end
 end

data/lib/katello/permissions/host_permissions.rb

@@ -43,6 +43,8 @@ Foreman::AccessControl.permission(:edit_hosts).actions.concat [
 
 Foreman::AccessControl.permission(:view_hosts).actions.concat [
   'hosts/content_hosts',
+  'katello/api/v2/host_bootc_images/bootc_images',
+  'katello/api/v2/host_bootc_images/auto_complete_search',
   'katello/api/v2/host_autocomplete/auto_complete_search',
   'katello/api/v2/host_errata/index',
   'katello/api/v2/host_errata/show',

data/lib/katello/permissions/registry_permissions.rb

@@ -14,4 +14,5 @@ Foreman::AccessControl.permission(:create_personal_access_tokens).actions.concat
   'katello/api/registry/registry_proxies/start_upload_blob',
   'katello/api/registry/registry_proxies/upload_blob',
   'katello/api/registry/registry_proxies/finish_upload_blob',
+  'katello/api/registry/registry_proxies/static_index',
 ]

data/lib/katello/plugin.rb

@@ -70,6 +70,15 @@ Foreman::Plugin.register :katello do
          :engine => Katello::Engine,
          :turbolinks => false
 
+    menu :top_menu,
+         :booted_container_images,
+         :caption => N_('Booted Container Images'),
+         :url_hash => {:controller => 'katello/api/v2/host_bootc_images',
+                       :action => 'bootc_images'},
+         :url => '/booted_container_images',
+         :engine => Katello::Engine,
+         :turbolinks => false
+
     divider :top_menu, :caption => N_('Lifecycle'), :parent => :content_menu
 
     menu :top_menu,
@@ -226,7 +235,7 @@ Foreman::Plugin.register :katello do
     :content_facet_attributes => [:content_view_id, :lifecycle_environment_id, :content_source_id,
                                   :host, :kickstart_repository_id],
     :subscription_facet_attributes => [:release_version, :autoheal, :purpose_usage, :purpose_role, :service_level, :host,
-                                       {:installed_products => [:product_id, :product_name, :arch, :version]}, :facts, {:hypervisor_guest_uuids => []}, {:purpose_addon_ids => []}]
+                                       {:installed_products => [:product_id, :product_name, :arch, :version]}, :facts, {:hypervisor_guest_uuids => []}]
   parameter_filter ::Hostgroup, :content_view_id, :lifecycle_environment_id, :content_source_id,
     :kickstart_repository_id
   parameter_filter Organization, :label, :service_level
@@ -298,6 +307,9 @@ Foreman::Plugin.register :katello do
   extend_rabl_template 'api/v2/smart_proxies/main', 'katello/api/v2/smart_proxies/pulp_info'
   extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/host_collections'
   extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/show'
+  extend_rabl_template 'api/v2/hosts/show', 'katello/api/v2/hosts/os_attributes'
+  extend_rabl_template 'api/v2/hosts/index', 'katello/api/v2/hosts/os_attributes'
+  extend_rabl_template 'api/v2/http_proxies/show', 'katello/api/v2/http_proxies/show'
 
   # Katello variables for Host Registration
   extend_allowed_registration_vars :activation_keys
@@ -696,6 +708,11 @@ Foreman::Plugin.register :katello do
   RemoteExecutionFeature.register(:katello_module_stream_action, N_("Katello: Module Stream Actions"),
                                   :description => N_("Perform a module stream action via Katello interface"),
                                   :provided_inputs => ['action', 'module_spec', 'options'])
+  RemoteExecutionFeature.register(:katello_bootc_action, N_("Katello: Bootc Action"), :description => N_("Katello Bootc interface"))
+  RemoteExecutionFeature.register(:katello_bootc_upgrade, N_("Katello: Bootc Upgrade"), :description => N_("Bootc upgrade via Bootc interface"))
+  RemoteExecutionFeature.register(:katello_bootc_switch, N_("Katello: Bootc Switch"), :description => N_("Bootc switch via Bootc interface"))
+  RemoteExecutionFeature.register(:katello_bootc_rollback, N_("Katello: Bootc Rollback"), :description => N_("Bootc rollback via Bootc interface"))
+  RemoteExecutionFeature.register(:katello_bootc_status, N_("Katello: Bootc Status"), :description => N_("Bootc status via Bootc interface"))
   allowed_template_helpers :errata
 
   RemoteExecutionProvider.singleton_class.prepend(Katello::Concerns::RemoteExecutionProviderExtensions)

data/lib/katello/repository_types/docker.rb

@@ -27,7 +27,6 @@ Katello::RepositoryTypeManager.register(::Katello::Repository::DOCKER_TYPE) do
                :priority => 1,
                :pulp3_service_class => ::Katello::Pulp3::DockerManifest,
                :removable => true,
-               :uploadable => true,
                :primary_content => true
   content_type Katello::DockerManifestList,
                :priority => 2,

data/lib/katello/repository_types/python.rb

@@ -26,7 +26,7 @@ Katello::RepositoryTypeManager.register('python') do
                         description: N_("Python packages to exclude from the upstream URL, names separated by newline. You may also specify versions, for example: django~=2.0.")
 
   generic_remote_option :package_types, title: N_("Package Types"), type: Array, input_type: "text", delimiter: ",", default: [],
-                        description: N_("Package types to sync for Python content, separated by comma. Leave empty to get every package type. Package types are: bdist_dmg, bdist_dumb, bdist_egg, bdist_msi, bdist_rpm, bdist_wheel, bdist_wininst, sdist.")
+                        description: N_("Package types to sync for Python content, separated by comma. Leave empty to get every package type. Package types are: bdist_dmg,bdist_dumb,bdist_egg,bdist_msi,bdist_rpm,bdist_wheel,bdist_wininst,sdist.")
 
   generic_remote_option :keep_latest_packages, title: N_("Keep latest packages"), type: :number, input_type: "number", default: 0,
                         description: N_("The amount of latest versions of a package to keep on sync, includes pre-releases if synced. Default 0 keeps all versions.")

data/lib/katello/version.rb

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

data/lib/katello.rb

@@ -12,6 +12,8 @@ require "securerandom"
 
 require "deface"
 
+require "jquery-ui-rails"
+
 # to make Foreman#in_rake? helper available if Foreman's lib is available
 lib_foreman = File.expand_path('lib/foreman', Rails.root)
 require lib_foreman if Dir.exist?(lib_foreman)