katello 4.3.0.rc1 → 4.3.0.rc4

data/app/services/katello/pulp3/repository.rb

@@ -183,10 +183,6 @@ module Katello
         RepositoryMirror.new(self).refresh_entities
       end
 
-      def mirror_needs_updates?
-        RepositoryMirror.new(self).needs_updates?
-      end
-
       def refresh_if_needed
         tasks = []
         tasks << update_remote #always update remote
@@ -478,6 +474,15 @@ module Katello
         end
       end
 
+      def repository_import_content(artifact_href, options = {})
+        ostree_import = PulpOstreeClient::OstreeRepoImport.new
+        ostree_import.artifact = artifact_href
+        ostree_import.repository_name = options[:ostree_repository_name]
+        ostree_import.ref = options[:ostree_ref]
+        ostree_import.parent_commit = options[:ostree_parent_commit]
+        api.repositories_api.import_commits(repository_reference.repository_href, ostree_import)
+      end
+
       def add_content(content_unit_href, remove_all_units = false)
         content_unit_href = [content_unit_href] unless content_unit_href.is_a?(Array)
         if remove_all_units

data/app/services/katello/pulp3/repository_mirror.rb

@@ -79,7 +79,7 @@ module Katello
       end
 
       def publication_href
-        api.publications_api.list(:repository_version => version_href).results.first.pulp_href
+        api.publications_api.list(:repository_version => version_href).results.first&.pulp_href
       end
 
       def create_version(options = {})

data/app/services/katello/repository_type.rb

@@ -145,7 +145,7 @@ module Katello
 
     class ContentType
       attr_accessor :model_class, :priority, :pulp2_service_class, :pulp3_service_class, :index, :uploadable, :removable,
-                    :primary_content, :index_on_pulp3, :generic_browser, :content_type
+                    :primary_content, :index_on_pulp3, :generic_browser, :content_type, :repository_import_on_upload
 
       def initialize(options)
         self.model_class = options[:model_class]
@@ -159,6 +159,7 @@ module Katello
         self.removable = options[:removable] || false
         self.primary_content = options[:primary_content] || false
         self.generic_browser = options[:generic_browser]
+        self.repository_import_on_upload = options[:repository_import_on_upload]
       end
 
       def label

data/app/services/katello/smart_proxy_helper.rb

@@ -39,11 +39,20 @@ module Katello
       end
     end
 
-    def repositories_available_to_capsule(environments, content_view)
+    def repositories_available_to_capsule(environments = nil, content_view = nil)
       environments = @smart_proxy.lifecycle_environments if environments.nil?
       yum_repos = Katello::Repository.in_environment(environments)
       yum_repos = yum_repos.in_content_views([content_view]) if content_view
       yum_repos.smart_proxy_syncable
     end
+
+    def unsyncable_content_types
+      unsyncable_content_types = ::Katello::RepositoryTypeManager.defined_repository_types.keys.collect do |type_name|
+        unless @smart_proxy.capabilities(::SmartProxy::PULP3_FEATURE).include?(::Katello::RepositoryTypeManager.defined_repository_types[type_name].pulp3_plugin)
+          type_name
+        end
+      end
+      unsyncable_content_types.compact & repositories_available_to_capsule.map(&:content_type)
+    end
   end
 end

data/app/views/foreman/job_templates/change_content_source.erb

@@ -0,0 +1,42 @@
+<%#
+kind: job_template
+name: Change content source
+job_category: Katello
+model: JobTemplate
+provider_type: SSH
+description_format: Configure subscription manager to new content source
+feature: katello_change_content_source
+%>
+#!/bin/sh
+<%
+    content_source = @host.content_source
+-%>
+
+<% if content_source -%>
+SSL_CA_CERT=$(mktemp)
+cat << EOF > $SSL_CA_CERT
+<%= foreman_server_ca_cert %>
+EOF
+
+KATELLO_SERVER_CA_CERT=/etc/rhsm/ca/katello-server-ca.pem
+RHSM_CFG=/etc/rhsm/rhsm.conf
+
+# Prepare SSL certificate
+mkdir -p /etc/rhsm/ca
+cp -f $SSL_CA_CERT $KATELLO_SERVER_CA_CERT
+chmod 644 $KATELLO_SERVER_CA_CERT
+
+# Configure subscription-manager
+test -f $RHSM_CFG.bak || cp $RHSM_CFG $RHSM_CFG.bak
+
+subscription-manager config \
+  --server.hostname="<%= content_source.rhsm_url.host %>" \
+  --server.port="<%= content_source.rhsm_url.port %>" \
+  --server.prefix="<%= content_source.rhsm_url.path %>" \
+  --rhsm.repo_ca_cert="$KATELLO_SERVER_CA_CERT" \
+  --rhsm.baseurl="<%= content_source.pulp_content_url %>"
+
+<% else -%>
+echo "Host [<%= @host.name %>] doesn't have assigned content source!"
+exit 1
+<% end -%>

data/app/views/foreman/job_templates/install_errata.erb

@@ -2,14 +2,14 @@
 kind: job_template
 name: Install Errata - Katello SSH Default
 job_category: Katello
-description_format: 'Install errata %{errata}'
+description_format: 'Install errata %{Errata search query}'
 feature: katello_errata_install
 provider_type: SSH
 template_inputs:
-- name: errata
-  description: A comma separated list of errata to install
+- name: Errata search query
+  description: Filter criteria for errata to be installed.
   input_type: user
-  required: true
+  required: false
 foreign_input_sets:
 - template: Package Action - SSH Default
   exclude: action,package
@@ -19,6 +19,8 @@ foreign_input_sets:
     <% advisories = input(:errata).split(',').join(' ') %>
     <%= render_template('Package Action - SSH Default', :action => 'install -n -t patch', :package => advisories) %>
 <% else %>
-    <% advisories = input(:errata).split(',').map { |e| "--advisory=#{e}" }.join(' ') %>
+    <% advisory_ids = @host.advisory_ids(search: input("Errata search query")) %>
+
+    <% advisories = advisory_ids.map { |e| "--advisory=#{e}" }.join(' ') %>
     <%= render_template('Package Action - SSH Default', :action => 'update-minimal', :package => advisories) %>
-<% end %>
+<% end %>

data/app/views/foreman/job_templates/resolve_traces.erb

@@ -6,15 +6,14 @@ description_format: 'Resolve Traces'
 feature: katello_host_tracer_resolve
 provider_type: SSH
 template_inputs:
-- name: ids
-  description: A comma-separated list of trace IDs to resolve
+- name: Traces search query
+  description: Search query to provide traces to resolve
   input_type: user
-  required: true
+  required: false
 %>
 
 <%
-ids = input(:ids).split(',').map { |split| split.strip.to_i }
-commands = @host.traces_helpers(ids)
+commands = @host.traces_helpers(search: input('Traces search query'))
 reboot = commands.delete('reboot')
 -%>
 <% if reboot -%>

data/app/views/foreman/job_templates/resolve_traces_-_katello_ansible_default.erb

@@ -5,18 +5,16 @@ model: JobTemplate
 job_category: Katello via Ansible
 description_format: Resolve Traces
 template_inputs:
-- name: ids
-  description: A comma-separated list of trace IDs to resolve
+- name: Traces search query
+  description: Search query to provide traces to resolve
   input_type: user
   required: true
-  advanced: false
 provider_type: Ansible
 kind: job_template
 %>
 
 <%
-ids = input(:ids).split(',').map { |split| split.strip.to_i }
-commands = @host.traces_helpers(ids)
+commands = @host.traces_helpers(search: input('Traces search query'))
 reboot = commands.delete('reboot')
 -%>
 <%= render_template(

data/app/views/foreman/smart_proxies/_content_sync.html.erb

@@ -2,7 +2,7 @@
   <h3><%= _('Content Sync') %></h3>
 
   {{ syncStatusText(syncState, syncStatus) }}
-  <div ng-show="syncState.is(syncState.SYNCING, syncState.SYNC_TRIGGERED, syncState.CANCEL_TRIGGERED, syncState.FAILURE)">
+  <div ng-show="syncState.is(syncState.SYNCING, syncState.SYNC_TRIGGERED, syncState.CANCEL_TRIGGERED, syncState.RECLAIMING_SPACE, syncState.RECLAIM_SPACE_TRIGGERED, syncState.FAILURE)">
     {{ syncTask.progressbar.value || 0 | number: 0 }}%
     <a href="<%= @task_search_url %>" target="_self">
       <div ng-class="{ active: isTaskInProgress(syncTask) }" class="progress progress-striped">
@@ -19,12 +19,19 @@
   </div>
 
   <br>
-  <div ng-show="syncState.is(syncState.SYNCING, syncState.SYNC_TRIGGERED, syncState.CANCEL_TRIGGERED)">
-    <a ng-click="cancelSync()" class="btn btn-default" ng-disabled="!syncState.is(syncState.SYNCING)">
+  <div ng-hide="syncStatus.unsyncable_content_types.length == 0">
+    <span translate>
+      Pulp plugin missing for synchronizable content types: <b>{{ syncStatus.unsyncable_content_types.join(", ") }}.</b><br />
+      Repositories containing these content types will not be synced.
+    </span>
+  </div>
+
+  <div ng-show="syncState.is(syncState.SYNCING, syncState.SYNC_TRIGGERED, syncState.CANCEL_TRIGGERED, syncState.RECLAIMING_SPACE, syncState.RECLAIM_SPACE_TRIGGERED)">
+    <a ng-click="cancelSync()" class="btn btn-default" ng-disabled="!syncState.is(syncState.SYNCING, syncState.RECLAIMING_SPACE)">
       <span translate>Cancel Sync</span>
     </a>
   </div>
-  <div class="dropdown" ng-hide="syncState.is(syncState.SYNCING, syncState.SYNC_TRIGGERED, syncState.CANCEL_TRIGGERED)">
+  <div class="dropdown" ng-hide="syncState.is(syncState.SYNCING, syncState.SYNC_TRIGGERED, syncState.CANCEL_TRIGGERED, syncState.RECLAIMING_SPACE, syncState.RECLAIM_SPACE_TRIGGERED)">
     <button class="btn btn-default dropdown-toggle" type="button" id="syncDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
       Synchronize
       <span class="caret"></span>
@@ -45,6 +52,12 @@
               Complete Sync is only relevant for yum/deb repositories and will take longer than an optimized sync.</p>
         </a>
       </li>
+      <li>
+        <a ng-click="reclaimSpace()" ng-hide="syncStatus.download_policy != 'on_demand'">
+          <span translate><strong>Reclaim Space</strong></span>
+          <p translate> Delete cached content units from an "On Demand" Smart Proxy.</p>
+        </a>
+      </li>
     </ul>
   </div>
 </div>

data/app/views/foreman/smart_proxies/_reclaim_space.html.erb

@@ -0,0 +1,12 @@
+<div>
+  <h3><%= _('Reclaim Space') %></h3>
+  <p translate>
+    <strong>Warning</strong>: reclaiming space will delete all cached content units in "On Demand" repositories on this Smart Proxy.<br>
+    Take precaution when cleaning custom repositories whose upstream parents don't keep old package versions.
+  </p>
+  <div class="button">
+    <button class="btn btn-default" type="button" id="reclaimSpaceButton" ng-click="reclaimSpace()" translate>
+      Reclaim Space
+    </button>
+  </div>
+</div>

data/app/views/foreman/smart_proxies/show.html.erb

@@ -2,6 +2,8 @@
   <div ng-controller="CapsuleContentController">
     <%= render :file => 'smart_proxies/show' %>
   </div>
-<% else -%>
-  <%= render :file => 'smart_proxies/show' %>
+<% elsif @smart_proxy.pulp_primary? -%>
+  <div ng-controller="PulpPrimaryController">
+    <%= render :file => 'smart_proxies/show' %>
+  </div>
 <% end -%>

data/app/views/katello/api/v2/capsule_content/sync_status.json.rabl

@@ -2,6 +2,12 @@ object @capsule
 
 attribute :last_sync_time
 
+attribute :download_policy
+
+node :unsyncable_content_types do
+  ::Katello::SmartProxyHelper.new(@capsule).unsyncable_content_types
+end
+
 child :active_sync_tasks => :active_sync_tasks do
   extends 'foreman_tasks/api/tasks/show'
 end

data/app/views/katello/api/v2/{organizations/cdn_configuration.rabl → cdn_configurations/show.json.rabl}

@@ -1 +1,5 @@
 attributes :url, :username, :upstream_organization_label, :ssl_ca_credential_id
+
+node :password_exists do |config|
+  config.password.present?
+end

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

@@ -25,6 +25,14 @@ child :content_facet => :content_facet_attributes do
   node :katello_tracer_installed do |content_facet|
     content_facet.tracer_installed?
   end
+
+  node :katello_agent_enabled do
+    Katello.with_katello_agent?
+  end
+
+  node :remote_execution_by_default do
+    Katello.remote_execution_by_default?
+  end
 end
 
 attributes :description, :facts

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

@@ -14,7 +14,6 @@ child :content_view => :content_view do
 
     node :content_counts do |repo|
       {
-        :ostree_branch => repo.ostree_branches.count,
         :docker_manifest => repo.docker_manifests.count,
         :docker_tag => repo.docker_tags.count,
         :rpm => repo.rpms.count,

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

@@ -17,7 +17,7 @@ node :next_version do |content_view|
 end
 
 child :last_task => :last_task do |_task|
-  attributes :id
+  attributes :id, :started_at
   attributes :result => :result
   node :last_sync_words do |object|
     if object.try(:started_at)

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

@@ -2,3 +2,5 @@ object @resource
 
 attributes :id, :name
 attributes :nvrea, :nvra
+attributes :upgradable_version
+attributes :rpm_id

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

@@ -16,7 +16,7 @@ node :owner_details do |org|
 end
 
 node :cdn_configuration do |org|
-  partial('katello/api/v2/organizations/cdn_configuration', object: org.cdn_configuration)
+  partial('katello/api/v2/cdn_configurations/show', object: org.cdn_configuration)
 end
 
 node :default_content_view_id do |org|

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

@@ -21,8 +21,6 @@ glue(@resource.root) do
 
   attributes :product_type
   attributes :upstream_username
-  attributes :ostree_upstream_sync_policy, :ostree_upstream_sync_depth
-  attributes :compute_ostree_upstream_sync_depth => :computed_ostree_upstream_sync_depth
   attributes :deb_releases, :deb_components, :deb_architectures
   attributes :http_proxy_policy
   attributes :http_proxy_id
@@ -53,7 +51,6 @@ glue(@resource.root) do
   end
 end
 
-attributes :ostree_branch_names => :ostree_branches
 attributes :relative_path
 attributes :promoted? => :promoted
 attributes :content_view_version_id, :library_instance_id

data/config/routes/api/v2.rb

@@ -14,8 +14,6 @@ Katello::Engine.routes.draw do
         # re-routes alphabetical
         ##############################
 
-        root :to => 'root#resource_list'
-
         api_resources :capsules, :only => [:index, :show] do
           member do
             resource :content, :only => [], :controller => 'capsule_content' do
@@ -24,6 +22,7 @@ Katello::Engine.routes.draw do
               post :sync
               get :sync, :action => :sync_status
               delete :sync, :action => :cancel_sync
+              post :reclaim_space
               post '/lifecycle_environments' => 'capsule_content#add_lifecycle_environment'
               delete '/lifecycle_environments/:environment_id' => 'capsule_content#remove_lifecycle_environment'
             end
@@ -162,13 +161,6 @@ Katello::Engine.routes.draw do
           end
         end
 
-        api_resources :ostree_branches, :only => [:index, :show] do
-          collection do
-            get :auto_complete_search
-            get :compare
-          end
-        end
-
         api_resources :debs, :only => [:index, :show] do
           collection do
             get :auto_complete_search
@@ -295,6 +287,7 @@ Katello::Engine.routes.draw do
             end
           end
         end
+        api_resources :content_units, :only => [:index, :show], :controller => 'generic_content_units'
 
         match "/ping" => "katello_ping#index", :via => :get
         match "/status" => "katello_ping#server_status", :via => :get
@@ -400,6 +393,7 @@ Katello::Engine.routes.draw do
           collection do
             match '/bulk/destroy' => 'repositories_bulk_actions#destroy_repositories', :via => :put
             match '/bulk/sync' => 'repositories_bulk_actions#sync_repositories', :via => :post
+            match '/bulk/reclaim_space' => 'repositories_bulk_actions#reclaim_space_from_repositories', :via => :post
             get :auto_complete_search
           end
           api_resources :sync, :only => [:index]
@@ -417,7 +411,7 @@ Katello::Engine.routes.draw do
           Katello::RepositoryTypeManager.generic_content_types(false).each do |type|
             api_resources type.pluralize.to_sym, :only => [:index, :show], :controller => 'generic_content_units', :content_type => type
           end
-          api_resources :ostree_branches, :only => [:index, :show]
+          api_resources :content_units, :only => [:index, :show], :controller => 'generic_content_units'
 
           api_resources :content_uploads, :controller => :content_uploads, :only => [:create, :destroy, :update]
 
@@ -428,6 +422,7 @@ Katello::Engine.routes.draw do
             put :remove_content
             post :sync
             post :verify_checksum
+            post :reclaim_space
             post :upload_content
             put :import_uploads
           end

data/db/migrate/20210331180353_katello_pool_organization_id_not_nullable.rb

@@ -1,6 +1,8 @@
 class KatelloPoolOrganizationIdNotNullable < ActiveRecord::Migration[6.0]
   def up
     ::Katello::Pool.where(organization_id: nil).destroy_all
+    ::Katello::Pool.where(subscription_id: nil).destroy_all
+
     change_column :katello_pools, :organization_id, :integer, null: false
     change_column :katello_pools, :subscription_id, :integer, null: false
 

data/db/migrate/20211115215210_drop_ostree_branches.rb

@@ -0,0 +1,13 @@
+class DropOstreeBranches < ActiveRecord::Migration[6.0]
+  def up
+    drop_table :katello_repository_ostree_branches
+    drop_table :katello_ostree_branches
+
+    remove_column :katello_root_repositories, :ostree_upstream_sync_policy
+    remove_column :katello_root_repositories, :ostree_upstream_sync_depth
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end

data/db/migrate/20211129200124_remove_dependency_solving_algorithm_setting.rb

@@ -0,0 +1,5 @@
+class RemoveDependencySolvingAlgorithmSetting < ActiveRecord::Migration[6.0]
+  def change
+    Setting.where(:name => 'dependency_solving_algorithm', :category => 'Setting::Content').delete_all
+  end
+end

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js

@@ -1,5 +1,6 @@
 BASTION_MODULES.push(
     'Bastion.capsule-content',
+    'Bastion.pulp-primary',
     'Bastion.activation-keys',
     'Bastion.architectures' ,
     'Bastion.common',
@@ -9,9 +10,7 @@ BASTION_MODULES.push(
     'Bastion.docker-tags',
     'Bastion.files',
     'Bastion.ansible-collections',
-    'Bastion.ostree-branches',
     'Bastion.hosts',
-    'Bastion.ostree-branches',
     'Bastion.module-streams',
     'Bastion.environments',
     'Bastion.content-credentials',

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

@@ -40,9 +40,6 @@
 //= require "bastion_katello/ansible-collections/ansible-collections.module.js"
 //= require_tree "./ansible-collections"
 
-//= require "bastion_katello/ostree-branches/ostree-branches.module.js"
-//= require_tree "./ostree-branches"
-
 //= require "bastion_katello/debs/debs.module.js"
 //= require_tree "./debs"
 
@@ -60,6 +57,9 @@
 
 //= require "bastion_katello/capsule-content/capsule-content.module.js"
 //= require_tree "./capsule-content"
+//
+//= require "bastion_katello/pulp-primary/pulp-primary.module.js"
+//= require_tree "./pulp-primary"
 
 //= require "bastion_katello/organizations/organizations.module.js"
 //= require_tree "./organizations"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js

@@ -131,8 +131,24 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
 
         $scope.isTaskInProgress = isTaskInProgress;
 
+        $scope.reclaimSpace = function () {
+            if (!$scope.syncState.is(syncState.SYNCING) && !$scope.syncState.is(syncState.RECLAIMING_SPACE)) {
+
+                $scope.syncState.set(syncState.RECLAIM_SPACE_TRIGGERED);
+
+                CapsuleContent.reclaimSpace({id: capsuleId}).$promise.then(function (task) {
+                    $scope.syncStatus['active_sync_tasks'].push(task);
+                    $scope.syncTask = aggregateTasks($scope.syncStatus['active_sync_tasks']);
+                    $scope.syncState.set(syncState.RECLAIMING_SPACE);
+                }, function (response) {
+                    processError(response);
+                    $scope.syncState.set(syncState.DEFAULT);
+                });
+            }
+        };
+
         $scope.syncCapsule = function (skipMetadataCheck) {
-            if (!$scope.syncState.is(syncState.SYNCING)) {
+            if (!$scope.syncState.is(syncState.SYNCING) && !$scope.syncState.is(syncState.RECLAIMING_SPACE)) {
 
                 $scope.syncState.set(syncState.SYNC_TRIGGERED);
 
@@ -164,10 +180,14 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
 
             if (currentSyncState.is(currentSyncState.SYNCING)) {
                 message = translate("Smart proxy currently syncing to your locations...");
+            } else if (currentSyncState.is(currentSyncState.RECLAIMING_SPACE)) {
+                message = translate("Smart proxy currently reclaiming space...");
             } else if (currentSyncState.is(currentSyncState.SYNC_TRIGGERED)) {
                 message = translate("Synchronization is about to start...");
             } else if (currentSyncState.is(currentSyncState.CANCEL_TRIGGERED)) {
                 message = translate("Synchronization is being cancelled...");
+            } else if (currentSyncState.is(currentSyncState.RECLAIM_SPACE_TRIGGERED)) {
+                message = translate("Space reclamation is about to start...");
             } else {
                 syncableEnvs = _.filter(syncStatus['lifecycle_environments'], {syncable: true});
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.factory.js

@@ -13,7 +13,8 @@ angular.module('Bastion.capsule-content').factory('CapsuleContent',
         return BastionResource('katello/api/capsules/:id/content/:action', {id: '@id'}, {
           syncStatus: {method: 'GET', isArray: false, params: {action: 'sync'}},
           sync: {method: 'post', isArray: false, params: {action: 'sync'}},
-          cancelSync: {method: 'delete', isArray: false, params: {action: 'sync'}}
+          cancelSync: {method: 'delete', isArray: false, params: {action: 'sync'}},
+          reclaimSpace: {method: 'post', isArray: false, params: {action: 'reclaim_space'}}
         });
 
     }]

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/sync-state.service.js

@@ -9,6 +9,8 @@ angular.module('Bastion.capsule-content').service('syncState', function () {
 
     this.DEFAULT = 'DEFAULT';
     this.SYNCING = 'SYNCING';
+    this.RECLAIMING_SPACE = 'RECLAIMING_SPACE';
+    this.RECLAIM_SPACE_TRIGGERED = 'RECLAIM_SPACE_TRIGGERED';
     this.SYNC_TRIGGERED = 'SYNC_TRIGGERED';
     this.CANCEL_TRIGGERED = 'CANCEL_TRIGGERED';
     this.FAILURE = 'FAILURE';

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.routes.js

@@ -130,16 +130,6 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
             parent: 'content-view.version.details'
         }
     })
-    .state('content-view.version.ostree-branches', {
-        url: '/ostree_branches',
-        permission: 'view_content_views',
-        controller: 'ContentViewVersionContentController',
-        templateUrl: 'content-views/versions/views/content-view-version-ostree-branches.html',
-        ncyBreadcrumb: {
-            label: '{{ "OSTree Branches" | translate }}',
-            parent: 'content-view.version.details'
-        }
-    })
     .state('content-view.version.module-streams', {
         url: '/module_streams',
         permission: 'view_content_views',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-versions.html

@@ -74,9 +74,6 @@
             <div translate ng-if="version.docker_tag_count && version.docker_tag_count > 0">
               {{ version.docker_tag_count }} Container Image Tags
             </div>
-            <div translate ng-if="version.ostree_branch_count && version.ostree_branch_count > 0">
-              {{ version.ostree_branch_count }} OSTree Branches
-            </div>
             <div translate ng-if="version.file_count && version.file_count > 0">
               {{ version.file_count }} Files
             </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version-content.controller.js

@@ -52,16 +52,6 @@
                 type: Erratum,
                 repositoryType: 'yum'
             },
-            'ostree-branches': {
-                type: OstreeBranch,
-                repositoryType: 'ostree',
-                params: {
-                    'content_type': "ostree",
-                    'content_view_version_id': $scope.$stateParams.versionId,
-                    'sort_by': 'version',
-                    'sort_order': 'DESC'
-                }
-            },
             'module-streams': {
                 type: ModuleStream,
                 repositoryType: 'yum',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-versions.module.js

@@ -15,7 +15,6 @@ angular.module('Bastion.content-views.versions', [
     'Bastion.packages',
     'Bastion.errata',
     'Bastion.package-groups',
-    'Bastion.ostree-branches',
     'Bastion.module-streams',
     'Bastion.files',
     'Bastion.debs'

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version.html

@@ -71,13 +71,6 @@
       </a>
     </li>
 
-    <li ng-class="{active: isState('content-view.version.ostree-branches')}"
-        ng-show="version.ostree_branch_count !== 0">
-      <a ui-sref="content-view.version.ostree-branches({versionId: version.id})">
-        <span translate>OSTree Branches</span>
-      </a>
-    </li>
-
     <li ng-class="{active: isState('content-view.version.details')}">
       <a ui-sref="content-view.version.details({versionId: version.id})">
         <span translate>Details</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js

@@ -50,11 +50,6 @@
                 resource: 'DockerTag',
                 display: translate('Container Image Tags'),
                 repositoryType: 'docker'
-            }, {
-                state: 'ostree',
-                resource: 'OstreeBranch',
-                display: translate('OSTree Branches'),
-                repositoryType: 'ostree'
             }, {
                 state: 'module-streams',
                 resource: 'ModuleStream',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.module.js

@@ -14,7 +14,6 @@ angular.module('Bastion.environments', [
     'Bastion.components',
     'Bastion.errata',
     'Bastion.packages',
-    'Bastion.ostree-branches',
     'Bastion.repositories',
     'Bastion.content-views',
     'Bastion.dates'