katello 4.1.4 → 4.2.0.rc1

data/db/functions/deb_version_cmp_v01.sql

@@ -0,0 +1,200 @@
+-- function for debian version comparison
+
+--compare two numbers
+CREATE OR REPLACE FUNCTION deb_version_cmp_num(_left text, _right text) 
+RETURNS integer 
+--return -1 if left > right
+--return 0 if left = right
+--return 1 if left < right
+AS $$
+DECLARE
+  lint numeric;
+  rint numeric;
+BEGIN
+  --'0' and '' are compared as equal in the dpkg implementation
+  IF _left = '' THEN
+    _left = '0';
+  END IF;
+  IF _right = '' THEN
+    _right = '0';
+  END IF;
+  lint := CAST (_left AS numeric);
+  rint := CAST (_right AS numeric);
+  IF lint < rint THEN
+    RETURN -1;
+  ELSIF lint > rint THEN
+    RETURN 1;
+  ELSE 
+    RETURN 0;
+  END IF;
+END;
+$$ IMMUTABLE STRICT LANGUAGE plpgsql;
+
+--compare two strings without digits
+CREATE OR REPLACE FUNCTION deb_version_cmp_al(_left text, _right text)
+RETURNS integer
+--return -1 if left > right
+--return 0 if left = right
+--return 1 if left < right
+AS $$
+DECLARE
+  lpair text ARRAY[2];
+  rpair text ARRAY[2];
+BEGIN
+  --go through the string character by character and compare
+  lpair := ARRAY['', _left];
+  rpair := ARRAY['', _right];
+
+  LOOP
+  --for each character do:
+    IF lpair[2] = '' AND rpair[2] = '' THEN
+      --both strings are equal and remaining characters are empty
+      return 0;
+    END IF;
+    
+    --get the next character into l/rpair[1]
+    lpair := regexp_matches(lpair[2], '(.?)(.*)');
+    rpair := regexp_matches(rpair[2], '(.?)(.*)');
+
+    IF lpair[1] = rpair[1] THEN
+      --characters are equal, continue with next character
+      CONTINUE;
+    END IF;
+    --tilde comes before any other character and befor the empty string
+    IF lpair[1] = '~' THEN
+      RETURN -1;
+    END IF;
+    IF rpair[1] = '~' THEN
+      RETURN 1;
+    END IF;
+    --next check for empty string
+    IF lpair[1] = '' THEN
+      RETURN -1;
+    END IF;
+    IF rpair[1] = '' THEN
+      RETURN 1;
+    END IF;
+    --else order by ascii value of character
+    IF lpair[1] SIMILAR TO '[a-zA-Z]' THEN
+      IF rpair[1] SIMILAR TO '[a-zA-Z]' AND ascii(lpair[1]) > ascii(rpair[1]) THEN
+        RETURN 1;
+      END IF;
+      RETURN -1;
+    END IF;
+    IF rpair[1] SIMILAR TO '[a-zA-Z]' THEN
+      RETURN 1;
+    END IF;
+    IF ascii(lpair[1]) < ascii(rpair[1]) THEN
+      RETURN -1;
+    END IF;
+    RETURN 1;
+  END LOOP;
+END;
+$$ IMMUTABLE STRICT LANGUAGE plpgsql;
+
+CREATE OR REPLACE FUNCTION deb_version_cmp_string(lstring text, rstring text, _left text, _right text, version boolean)
+RETURNS integer
+--return -1 if left > right
+--return 0 if left = right
+--return 1 if left < right
+AS $$
+DECLARE
+  lpair text ARRAY[2];
+  rpair text ARRAY[2];
+  res integer;
+BEGIN
+  --split of digits and non-digits part
+  lpair[1] := LEFT (lstring, 1);
+  rpair[1] := LEFT (rstring, 1);
+  lpair[2] := lstring;
+  rpair[2] := rstring;
+
+  
+  --if first characters are digit and non-digit (this is faulty for version)
+  IF lpair[1] SIMILAR TO '[a-zA-Z\.\:\+\~\-]' THEN
+    IF version THEN
+      RAISE WARNING 'version % has bad syntax: version number does not start with digit', _left;
+    END IF;
+    IF rpair[1] SIMILAR TO '[0-9]' THEN
+      RETURN 1;
+    END IF;
+  ELSIF rpair[1] SIMILAR TO '[a-zA-Z\.\:\+\~\-]' THEN
+    IF version THEN
+      RAISE WARNING 'version % has bad syntax: version number does not start with digit', _right;
+    END IF;
+    RETURN -1;
+  END IF;
+
+  --compare versions
+  LOOP
+    --if no more characters to compare, strings are equal
+    IF lpair[2] = '' AND rpair[2] = '' THEN
+      return 0;
+    END IF;
+
+    --cut off digit part starting from beginning and rest
+    lpair := regexp_matches(lpair[2], '([0-9]*)(.*)');
+    rpair := regexp_matches(rpair[2], '([0-9]*)(.*)');
+    
+    --compare digit part
+    res := deb_version_cmp_num(lpair[1], rpair[1]);
+    IF res != 0 THEN
+      RETURN res;
+    END IF;
+
+    --cut off into largest non-digit part starting from beginning and rest
+    lpair := regexp_matches(lpair[2], '([^0-9]*)(.*)');
+    rpair := regexp_matches(rpair[2], '([^0-9]*)(.*)');
+
+    --compare non-digit part
+    res := deb_version_cmp_al(lpair[1], rpair[1]);
+    IF res != 0 THEN
+      RETURN res;
+    END IF;
+  END LOOP;
+END
+$$ IMMUTABLE STRICT LANGUAGE plpgsql;
+
+
+CREATE OR REPLACE FUNCTION deb_version_cmp(_left text, _right text)
+RETURNS integer
+--return -1 if left > right
+--return 0 if left = right
+--return 1 if left < right
+AS $$
+DECLARE
+  lepochver text ARRAY[2];
+  repochver text ARRAY[2];
+  lverrev text ARRAY[2];
+  rverrev text ARRAY[2];
+  res integer;
+BEGIN
+  --split in epoch and version+revision
+  lepochver := regexp_matches(_left, '(?:([0-9]*):)?(.*)');
+  lepochver[1] := coalesce(lepochver[1], '0');
+  repochver := regexp_matches(_right, '(?:([0-9]*):)?(.*)');
+  repochver[1] := coalesce(repochver[1], '0');
+  
+  --compare epoch
+  res := deb_version_cmp_num(lepochver[1], repochver[1]);
+  IF res != 0 THEN
+    RETURN res;
+  END IF;
+  
+  --split in version and revision
+  lverrev := regexp_matches(lepochver[2], '(.*?)(?:-([a-zA-Z0-9\+\.~]*))?$');
+  lverrev[2] := coalesce(lverrev[2], '');
+  rverrev := regexp_matches(repochver[2], '(.*?)(?:-([a-zA-Z0-9\+\.~]*))?$');
+  rverrev[2] := coalesce(rverrev[2], '');
+  
+  --compare version
+  res := deb_version_cmp_string(lverrev[1], rverrev[1], _left, _right, TRUE);
+  IF res != 0 THEN
+    RETURN res;
+  END IF;
+  
+  --compare revision
+  res := deb_version_cmp_string(lverrev[2], rverrev[2], _left, _right, FALSE);
+  RETURN res;
+END
+$$ IMMUTABLE STRICT LANGUAGE plpgsql;

data/db/migrate/20171110082124_add_ssl_certs_to_products_and_repos.rb

@@ -1,4 +1,8 @@
 class AddSslCertsToProductsAndRepos < ActiveRecord::Migration[4.2]
+  class FakeGpgKey < ApplicationRecord
+    self.table_name = 'katello_gpg_keys'
+  end
+
   def up
     add_column :katello_products, :ssl_ca_cert_id, :integer, :null => true
     add_index :katello_products, :ssl_ca_cert_id
@@ -25,7 +29,7 @@ class AddSslCertsToProductsAndRepos < ActiveRecord::Migration[4.2]
     add_foreign_key :katello_repositories, :katello_gpg_keys, :name => "katello_repositories_ssl_client_key_id_fk", :column => :ssl_client_key_id, :primary_key => :id
 
     add_column :katello_gpg_keys, :content_type, :string, :null => false, :default => "gpg_key", :limit => 255
-    Katello::GpgKey.update_all(:content_type => "gpg_key")
+    FakeGpgKey.update_all(:content_type => "gpg_key")
   end
 
   def down

data/db/migrate/20200402130013_add_repsoitory_docker_meta_tag_f_key.rb

@@ -17,7 +17,9 @@ class AddRepsoitoryDockerMetaTagFKey < ActiveRecord::Migration[5.2]
     add_index :katello_repository_docker_meta_tags, [:repository_id, :docker_meta_tag_id], :unique => true, :name => 'repository_docker_meta_tags_rid_dmtid'
 
     Katello::RepositoryDockerTag.where.not(:repository_id => Katello::Repository.select(:id)).delete_all
-    Katello::RepositoryDockerTag.where.not(:docker_tag_id => Katello::DockerTag.select(:id)).delete_all
+    # rubocop:disable Layout/LineLength
+    Katello::RepositoryDockerTag.delete_by('katello_repository_docker_tags.id IN (SELECT katello_repository_docker_tags.id FROM katello_repository_docker_tags LEFT JOIN katello_docker_tags d ON katello_repository_docker_tags.docker_tag_id = d.id GROUP BY katello_repository_docker_tags.id HAVING (count(d.id) = 0))')
+    # rubocop:enable Layout/LineLength
 
     add_foreign_key :katello_repository_docker_tags, :katello_repositories, :column => :repository_id
     add_foreign_key :katello_repository_docker_tags, :katello_docker_tags, :column => :docker_tag_id

data/db/migrate/20210624221630_katello_generic_content.rb

@@ -0,0 +1,22 @@
+class KatelloGenericContent < ActiveRecord::Migration[6.0]
+  def change
+    create_table "katello_generic_content_units" do |t|
+      t.string 'name'
+      t.string 'version'
+      t.string 'pulp_id'
+      t.string 'content_type'
+      t.timestamps
+    end
+
+    create_table "katello_repository_generic_content_units" do |t|
+      t.references :generic_content_unit, :null => false, index: { :name => 'index_katello_repo_generic_content_unit' }
+      t.references :repository, index: false
+      t.timestamps
+    end
+
+    add_index :katello_repository_generic_content_units, [:generic_content_unit_id, :repository_id], :unique => true, :name => 'repository_generic_content_unit_ids'
+
+    add_foreign_key "katello_repository_generic_content_units", "katello_generic_content_units", :column => "generic_content_unit_id"
+    add_foreign_key "katello_repository_generic_content_units", "katello_repositories", :column => "repository_id"
+  end
+end

data/db/migrate/20210625095042_add_retain_package_versions_count.rb

@@ -0,0 +1,9 @@
+class AddRetainPackageVersionsCount < ActiveRecord::Migration[5.2]
+  def up
+    add_column :katello_root_repositories, :retain_package_versions_count, :integer
+  end
+
+  def down
+    remove_column :katello_root_repositories, :retain_package_versions_count
+  end
+end

data/db/migrate/20210628182553_add_generic_remote_options_to_root_repository.rb

@@ -0,0 +1,5 @@
+class AddGenericRemoteOptionsToRootRepository < ActiveRecord::Migration[6.0]
+  def change
+    add_column :katello_root_repositories, :generic_remote_options, :text
+  end
+end

data/db/migrate/20210714140440_remove_repo_export_permission.rb

@@ -0,0 +1,5 @@
+class RemoveRepoExportPermission < ActiveRecord::Migration[6.0]
+  def change
+    Permission.where(:name => 'export_products').destroy_all
+  end
+end

data/db/migrate/20210721163730_change_gpg_keys_to_content_credentials.rb

@@ -0,0 +1,8 @@
+class ChangeGpgKeysToContentCredentials < ActiveRecord::Migration[6.0]
+  def change
+    rename_table :katello_gpg_keys, :katello_content_credentials
+
+    permissions = Permission.where(:resource_type => 'Katello::GpgKey')
+    permissions.update_all(:resource_type => 'Katello::ContentCredential')
+  end
+end

data/db/migrate/20210728130748_create_function_deb_version_cmp.rb

@@ -0,0 +1,12 @@
+class CreateFunctionDebVersionCmp < ActiveRecord::Migration[6.0]
+  def up
+    create_function :deb_version_cmp
+  end
+
+  def down
+    drop_function :deb_version_cmp
+    drop_function :deb_version_cmp_al
+    drop_function :deb_version_cmp_num
+    drop_function :deb_version_cmp_string
+  end
+end

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

@@ -4,7 +4,6 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:clean_backend_objects', :long_running => true, :skip_failure => true, :always_run => true},
     {:name => 'katello:upgrades:4.0:remove_ostree_puppet_content'},
     {:name => 'katello:upgrades:4.1:sync_noarch_content'},
-    {:name => 'katello:upgrades:4.1:fix_invalid_pools'},
-    {:name => 'katello:upgrades:4.1:update_content_import_export_perms'}
+    {:name => 'katello:upgrades:4.1:fix_invalid_pools'}
   ]
 end

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

@@ -20,7 +20,7 @@
     angular.module('Bastion').value('CurrentOrganization', "<%= Organization.current.id 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('repositoryTypes', angular.fromJson('<%= Katello::RepositoryTypeManager.enabled_repository_types.values.to_json.html_safe %>'));
     angular.module('Bastion').value('deleteHostOnUnregister', angular.fromJson('<%= Setting[:unregister_delete_host] %>'));
     angular.module('Bastion').value('contentDisconnected', angular.fromJson('<%= Setting[:content_disconnected] %>'));
     angular.module('Bastion').value('globalContentProxy', angular.fromJson('<%= Setting[:content_default_http_proxy].empty? ? nil.to_json : Setting[:content_default_http_proxy].to_json.html_safe %>'));

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

@@ -47,8 +47,7 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
 
             if (isTaskInProgress(syncTask)) {
                 state = syncState.SYNCING;
-            }
-            if (syncTask && syncTask.result !== 'success') {
+            } else if (syncTask && syncTask.result !== 'success') {
                 state = syncState.FAILURE;
             } else {
                 state = syncState.DEFAULT;
@@ -83,7 +82,7 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
             }
 
             CapsuleContent.syncStatus(params).$promise.then(function (syncStatus) {
-                var errorCount, errorMessage;
+                var errorCount, errorMessage, activeOrFailedTask;
                 $scope.syncStatus = syncStatus;
                 if (syncStatus['last_sync_time'] === null) {
                     $scope.syncStatus['last_sync_time'] = translate('Never');
@@ -91,10 +90,13 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
 
                 if (syncStatus['active_sync_tasks'].length > 0) {
                     $scope.syncTask = aggregateTasks(syncStatus['active_sync_tasks']);
+                    activeOrFailedTask = pickLastTask(syncStatus['active_sync_tasks']);
 
                 } else if (syncStatus['last_failed_sync_tasks'].length > 0) {
+                    activeOrFailedTask = pickLastTask(syncStatus['last_failed_sync_tasks']);
+                    $scope.syncTask = activeOrFailedTask;
                     errorCount = $scope.syncTask.humanized.errors.length;
-                    $scope.syncTask = pickLastTask(syncStatus['last_failed_sync_tasks']);
+
                     if (errorCount > 0) {
                         errorMessage = $scope.syncTask.humanized.errors[0];
                         if (errorCount > 2) {
@@ -105,7 +107,7 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
                         Notification.setErrorMessage(errorMessage);
                     }
                 }
-                $scope.syncState.set(stateFromTask($scope.syncTask));
+                $scope.syncState.set(stateFromTask(activeOrFailedTask));
             }, function (response) {
                 $scope.syncStatus = {
                     'active_sync_tasks': [],

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

@@ -101,7 +101,10 @@
              <td bst-table-cell>{{ erratum.title }}</td>
              <td class="small" bst-table-cell>{{ erratum.issued }}</td>
              <td class="small" bst-table-cell class="number-cell">
-               <span> {{ erratum.affected_hosts_count }} </span>
+               <a href="{{ '/content_hosts?search=installable_errata%3D' + erratum.errata_id }}">
+                <span> {{ erratum.affected_hosts_count }} </span>
+                 <span class="fa fa-external-link"/>
+               </a>
              </td>
            </tr>
          </tbody>

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

@@ -13,7 +13,7 @@
   </div>
 
   <nav data-block="item-actions">
-    <button type="button" class="btn btn-primary" ng-hide="denied('publish_content_views', contentView) || contentView.import_only" 
+    <button type="button" class="btn btn-primary" ng-hide="denied('publish_content_views', contentView) || contentView.import_only"
             ui-sref="content-view.publish">
       <span translate>Publish New Version</span>
     </button>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/apply-errata.controller.js

@@ -37,7 +37,7 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
             $scope.errataActionFormValues = {
                 authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),
                 errata: IncrementalUpdate.getErrataIds().join(','),
-                bulkHostIds: angular.toJson({ included: { ids: IncrementalUpdate.getBulkContentHosts().included.ids }}),
+                hostIds: IncrementalUpdate.getBulkContentHosts().included.ids.join(','),
                 customize: false
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/apply-errata-confirm.html

@@ -18,7 +18,7 @@
   <form id="errataActionForm" method="post" action="/katello/remote_execution">
     <input type="hidden" name="remote_action" value="errata_install"/>
     <input type="hidden" name="name" ng-value="errataActionFormValues.errata"/>
-    <input type="hidden" name="bulk_host_ids" ng-value="errataActionFormValues.bulkHostIds"/>
+    <input type="hidden" name="host_ids" ng-value="errataActionFormValues.hostIds"/>
     <input type="hidden" name="customize" ng-value="errataActionFormValues.customize"/>
     <input type="hidden" name="authenticity_token" ng-value="errataActionFormValues.authenticityToken"/>
     <input type="hidden" name="install_all" ng-value="table.allResultsSelected" />
@@ -132,3 +132,4 @@
     </button>
   </form>
 </section>
+

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/i18n/bastion_katello.pot

@@ -725,6 +725,10 @@ msgstr ""
 msgid "An error occurred:"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+msgid "Ansible Collection Authorization"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 msgid "Ansible Collections"
 msgstr ""
@@ -1286,7 +1290,6 @@ msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/bulk/products-bulk-advanced-sync-modal.controller.js
 #: app/assets/javascripts/bastion_katello/products/bulk/products-bulk-http-proxy-modal.controller.js
-#: app/assets/javascripts/bastion_katello/products/details/product-repositories.controller.js
 #: app/assets/javascripts/bastion_katello/products/products.controller.js
 msgid "Click to view task"
 msgstr ""
@@ -2378,11 +2381,16 @@ msgid "Group"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html
-msgid "Group Install"
+msgid "Group Install (Deprecated)"
+msgstr ""
+
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html
+#: app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html
+msgid "Group package actions are being deprecated, and will be removed in a future version."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/content-hosts/content/views/content-host-packages-actions.html
-msgid "Group Remove"
+msgid "Group Remove (Deprecated)"
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/subscriptions/views/subscription-type.html
@@ -3568,11 +3576,14 @@ msgstr ""
 msgid "Package Filter:"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html
 #: app/assets/javascripts/bastion_katello/content-views/details/filters/new-filter.controller.js
 msgid "Package Group"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html
+msgid "Package Group (Deprecated)"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-group-filter.html
 msgid "Package Group Filter:"
 msgstr ""
@@ -3663,10 +3674,6 @@ msgstr ""
 msgid "Packages are automatically Applicable if they are Upgradable"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html
-msgid "Packages are corrupt, often leading to an error \"Package does not match intended download\" or \"Hash Sum mismatch\"."
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/errata/details/views/erratum-packages.html
 msgid "Packages for Errata:"
 msgstr ""
@@ -3720,10 +3727,6 @@ msgstr ""
 msgid "Performing host package actions is disabled because Katello is not configured for Remote Execution or Katello Agent."
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html
-msgid "Performs a complete sync, verifying the checksum of all packages afterwards. Any missing or corrupt package will be re-downloaded. This option will take the longest amount of time. Choose this option if:"
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/subscriptions/views/subscription-type.html
 msgid "Physical"
 msgstr ""
@@ -4077,10 +4080,6 @@ msgstr ""
 msgid "Remote execution plugin is required to be able to run any helpers."
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/product-repositories.controller.js
-msgid "Removal of selected repositories initiated successfully."
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html
 #: app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-packages-modal.html
 #: app/assets/javascripts/bastion_katello/content-views/deletion/views/content-view-deletion.html
@@ -4494,6 +4493,11 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+msgid "Retain package versions"
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-info.html
 #: app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-info.html
 msgid "Role"
@@ -4605,7 +4609,7 @@ msgid "Select the Lifecycle Environments you would like to remove Version {{ ver
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-advanced-sync-modal.html
-msgid "Selecting \"Complete Sync\" will cause only Yum repositories of the selected product to be synced. Selecting \"Validate Content\" will cause only Yum repositories using the \"Immediate\" download policy to be synced."
+msgid "Selecting \"Complete Sync\" will cause only Yum repositories of the selected product to be synced."
 msgstr ""
 
 #: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
@@ -4725,10 +4729,6 @@ msgstr ""
 msgid "Source RPMs"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html
-msgid "Specific packages are throwing a 404 from the package-manager."
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 #: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
 #: app/assets/javascripts/bastion_katello/products/details/views/product-info.html
@@ -5136,6 +5136,10 @@ msgid ""
 "              See the <a href=\"/content_views\">content views page</a> to manage and promote a content view."
 msgstr ""
 
+#: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
+msgid "The maximum number of versions of each package to keep."
+msgstr ""
+
 #: app/assets/javascripts/bastion_katello/organizations/views/organization-selector.html
 msgid "The page you are attempting to access requires selecting a specific organization."
 msgstr ""
@@ -5632,10 +5636,6 @@ msgstr ""
 msgid "Username of the upstream repository user for authentication. Leave empty if repository does not require authentication."
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html
-msgid "Validate Content Sync"
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html
 msgid "Variant"
 msgstr ""
@@ -5776,10 +5776,6 @@ msgstr ""
 msgid "When Auto Attach is disabled, registering systems will be attached to all associated subscriptions."
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html
-msgid "When validating content, repositories using the \"On Demand\" download policy will download all packages within the repository."
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html
 msgid "Whitespace-separated list of components to sync from (leave clear to sync all). Example: main"
 msgstr ""
@@ -5824,10 +5820,6 @@ msgstr ""
 msgid "You can upload a requirements.yml file below to auto-fill contents or paste contents of requirement.yml here"
 msgstr ""
 
-#: app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html
-msgid "You cannot remove these repositories because they belong to a Red Hat product."
-msgstr ""
-
 #: app/assets/javascripts/bastion_katello/products/details/repositories/views/product-repositories.html
 msgid "You cannot remove these repositories because you do not have permission."
 msgstr ""

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

@@ -12,7 +12,7 @@
 
     <div class="help-block">
       <span translate>
-        Selecting "Complete Sync" will cause only Yum repositories of the selected product to be synced. Selecting "Validate Content" will cause only Yum repositories using the "Immediate" download policy to be synced.
+        Selecting "Complete Sync" will cause only Yum repositories of the selected product to be synced.
       </span>
     </div>
 

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

@@ -65,10 +65,7 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
             var success, error, params = getParams(), removalPromise;
 
             success = function (response) {
-                var message = translate('Removal of selected repositories initiated successfully.');
-                var link = ("/foreman_tasks/tasks/%taskId").replace('%taskId', response.task.id);
-                var alertBody = { children: translate("Click to view task"), href: link };
-                Notification.setSuccessMessage(message, {link: alertBody});
+                $state.go('product.tasks.details', {taskId: response.task.id});
             };
 
             error = function (response) {
@@ -97,8 +94,6 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
             if (product.$resolved) {
                 if ($scope.denied('destroy_products', product)) {
                     readOnlyReason = 'permissions';
-                } else if (product.redhat) {
-                    readOnlyReason = 'redhat';
                 }
             }
 

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

@@ -27,7 +27,8 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
             $scope.repository.$promise.then(function () {
                 $scope.uploadURL = 'katello/api/v2/repositories/' + $scope.repository.id + '/upload_content';
-                $scope.repository['ignore_srpms'] = $scope.repository['ignorable_content'].includes("srpm");
+                $scope.repository['ignore_srpms'] = $scope.repository['ignorable_content'] && $scope.repository['ignorable_content'].includes("srpm");
+                $scope.repository['ansible_collection_auth_exists'] = $scope.repository['ansible_collection_auth_url'] && $scope.repository['ansible_collection_auth_token'];
             });
 
             $scope.gpgKeys = function () {
@@ -113,7 +114,7 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 repository.os_versions = $scope.osVersionsParam();
                 repository.$update(function (response) {
                     deferred.resolve(response);
-                    $scope.repository.ignore_srpms = $scope.repository.ignorable_content.includes("srpm");
+                    $scope.repository.ignore_srpms = $scope.repository.ignorable_content && $scope.repository.ignorable_content.includes("srpm");
                     if (!_.isEmpty(response["docker_tags_whitelist"])) {
                         repository.commaTagsWhitelist = repository["docker_tags_whitelist"].join(", ");
                     } else {
@@ -195,6 +196,13 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                 $scope.save($scope.repository);
             };
 
+            $scope.clearAnsibleCollectionAuth = function () {
+                $scope.repository['ansible_collection_auth_url'] = null;
+                $scope.repository['ansible_collection_auth_token'] = null;
+                $scope.repository['ansible_collection_auth_exists'] = false;
+                $scope.save($scope.repository);
+            };
+
             $scope.policies = HttpProxyPolicy.policies;
             $scope.proxies = [];
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.filter.js

@@ -29,6 +29,15 @@ angular.module('Bastion.components.formatters').filter('upstreamPasswordFilter',
     };
 }]);
 
+angular.module('Bastion.components.formatters').filter('ansibleAuthFilter', [function () {
+    return function (displayValue, repository) {
+        if (repository["ansible_collection_auth_url"] && repository["ansible_collection_auth_token"]) {
+            return '%(auth_url) / ********'.replace('%(auth_url)', repository["ansible_collection_auth_url"]);
+        }
+        return null;
+    };
+}]);
+
 angular.module('Bastion.components.formatters').filter('httpProxyDetailsFilter', ['HttpProxyPolicy', function (HttpProxyPolicy) {
     return function (displayValue, repository) {
         var message = '%(proxyPolicy)'.replace('%(proxyPolicy)', HttpProxyPolicy.displayHttpProxyPolicyName(repository["http_proxy_policy"]));