katello 3.13.4 → 3.14.0.rc1

data/config/routes/api/v2.rb

@@ -257,8 +257,8 @@ Katello::Engine.routes.draw do
           end
         end
 
-        api_resources :ping, :only => [:index]
-        match "/status" => "ping#server_status", :via => :get
+        match "/ping" => "katello_ping#index", :via => :get
+        match "/status" => "katello_ping#server_status", :via => :get
 
         api_resources :products, :only => [:index, :show, :create, :update, :destroy] do
           member do

data/db/migrate/20180920214134_create_repository_root.rb

@@ -5,7 +5,7 @@ class CreateRepositoryRoot < ActiveRecord::Migration[5.1]
                      deb_releases deb_components deb_architectures ignore_global_proxy ssl_ca_cert_id
                      ssl_client_cert_id ssl_client_key_id ignorable_content description docker_tags_whitelist).freeze
 
-  REPO_ASSOCIATIONS = %w(RepositoryErratum ContentViewRepository RepositoryRpm RepositorySrpm RepositoryFile RepositoryPuppetModule
+  REPO_ASSOCIATIONS = %w(RepositoryErratum ContentViewRepository RepositoryRpm RepositorySrpm RepositoryFileUnit RepositoryPuppetModule
                          RepositoryDockerManifest RepositoryDockerManifestList DockerTag DockerMetaTag RepositoryOstreeBranch RepositoryDeb
                          ContentFacetRepository RepositoryPackageGroup RepositoryModuleStream).freeze
 

data/db/migrate/20190730183518_add_docker_tag_join_table.rb

@@ -0,0 +1,25 @@
+class AddDockerTagJoinTable < ActiveRecord::Migration[5.2]
+  def up
+    create_table :katello_repository_docker_tags do |t|
+      t.integer :docker_tag_id, null: false
+      t.integer :repository_id
+      t.timestamps null: true
+    end
+
+    ::Katello::Repository.all.each do |repository|
+      repository.docker_tags = ::Katello::DockerTag.where(:repository_id => repository.id)
+    end
+
+    remove_column :katello_docker_tags, :repository_id
+  end
+
+  def down
+    add_column :katello_docker_tags, :repository_id, :integer
+
+    ::Katello::DockerTag.all.each do |tag|
+      tag.update_attributes(repository_id: tag.repositories.first.id)
+    end
+
+    drop_table :katello_repository_docker_tags
+  end
+end

data/db/migrate/20190730203334_add_docker_meta_tag_join_table.rb

@@ -0,0 +1,25 @@
+class AddDockerMetaTagJoinTable < ActiveRecord::Migration[5.2]
+  def up
+    create_table :katello_repository_docker_meta_tags do |t|
+      t.integer :docker_meta_tag_id, null: false
+      t.integer :repository_id
+      t.timestamps null: true
+    end
+
+    ::Katello::Repository.all.each do |repository|
+      repository.docker_meta_tags = ::Katello::DockerMetaTag.where(:repository_id => repository.id)
+    end
+
+    remove_column :katello_docker_meta_tags, :repository_id
+  end
+
+  def down
+    add_column :katello_docker_meta_tags, :repository_id, :integer
+
+    ::Katello::DockerMetaTag.all.each do |meta_tag|
+      meta_tag.update_attributes(repository_id: meta_tag.repositories.first.id)
+    end
+
+    drop_table :katello_repository_docker_meta_tags
+  end
+end

data/db/migrate/20190814025338_create_content_view_module_stream_filter_rules.rb

@@ -0,0 +1,13 @@
+class CreateContentViewModuleStreamFilterRules < ActiveRecord::Migration[5.2]
+  def change
+    create_table :katello_content_view_module_stream_filter_rules do |t|
+      t.references :content_view_filter, index: { name: :index_cvmsfr_cv_filter_id }
+      t.foreign_key 'katello_content_view_filters', :column => 'content_view_filter_id'
+
+      t.references :module_stream, index: { name: :index_cvmsfr_module_stream_id }
+      t.foreign_key 'katello_module_streams', :column => 'module_stream_id'
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20190816162733_rename_ansible_collection_whitelist_to_requirements.rb

@@ -0,0 +1,5 @@
+class RenameAnsibleCollectionWhitelistToRequirements < ActiveRecord::Migration[5.2]
+  def change
+    rename_column :katello_root_repositories, :ansible_collection_whitelist, :ansible_collection_requirements
+  end
+end

data/db/migrate/20190822144300_add_ansible_fields.rb

@@ -0,0 +1,18 @@
+class AddAnsibleFields < ActiveRecord::Migration[5.2]
+  def change
+    add_column :katello_ansible_collections, :description, :text
+
+    create_table :katello_ansible_tags do |t|
+      t.text :name, :null => false
+    end
+
+    create_table :katello_ansible_collection_tags do |t|
+      t.references :ansible_tag
+      t.references :ansible_collection
+      t.index [:ansible_tag_id, :ansible_collection_id], :name => :index_katello_ans_coll_tags_on_ans_tag_id_and_ans_coll_id
+    end
+
+    add_foreign_key :katello_ansible_collection_tags, :katello_ansible_tags, column: :ansible_tag_id
+    add_foreign_key :katello_ansible_collection_tags, :katello_ansible_collections, column: :ansible_collection_id
+  end
+end

data/db/migrate/20190912210927_rename_repository_file_unit.rb

@@ -0,0 +1,12 @@
+class RenameRepositoryFileUnit < ActiveRecord::Migration[5.2]
+  def change
+    original_name = 'index_katello_repository_files_on_file_id_and_repository_id'
+    shorter_name = 'index_katello_repo_files_file_and_repo'
+
+    if index_exists?(:katello_repository_files, [:file_id, :repository_id], :name => original_name)
+      rename_index :katello_repository_files, original_name, shorter_name
+    end
+    rename_column :katello_repository_files, :file_id, :file_unit_id
+    rename_table :katello_repository_files, :katello_repository_file_units
+  end
+end

data/engines/bastion/README.md

@@ -262,7 +262,7 @@ npm WARN unmet dependency /usr/lib/node_modules/block-stream requires inherits@'
 npm WARN unmet dependency undefined
 ```
 
-Running `sudo npm update -g bower grunt-cli` should fix the issue.
+Running `sudo npm update -g phantomjs bower grunt-cli` should fix the issue.
 
 #### Fixing Dependency Errors ####
 
@@ -277,7 +277,7 @@ version of a component has been bumped.
 [See also *Installing a New Dependency*](#installing-a-new-dependency) as well as the related section
 [*Updating a New Dependency*](#updating-a-new-dependency)
 
-- `sudo npm update -g bower grunt-cli`
+- `sudo npm update -g phantomjs bower grunt-cli`
 - `npm install`
 - `grunt bower:dev`
 

data/engines/bastion/app/assets/javascripts/bastion/components/bst-edit.directive.js

@@ -189,7 +189,8 @@ angular.module('Bastion.components')
                 model: '=bstEditTextarea',
                 readonly: '=',
                 handleSave: '&onSave',
-                handleCancel: '&onCancel'
+                handleCancel: '&onCancel',
+                editTrigger: '='
             },
             templateUrl: 'components/views/bst-edit-textarea.html'
         };

data/engines/bastion/app/assets/javascripts/bastion/components/nutupane.factory.js

@@ -32,10 +32,10 @@
 angular.module('Bastion.components').factory('Nutupane',
     ['$location', '$q', '$stateParams', 'entriesPerPage', 'TableCache', 'Notification', function ($location, $q, $stateParams, entriesPerPage, TableCache, Notification) {
         var Nutupane = function (resource, params, action, nutupaneParams) {
-            var self = this;
+            var locationPage, self = this;
 
             function getTableName() {
-                return $location.path().split('/').join('-').slice(1);
+                return self.tableName || $location.path().split('/').join('-').slice(1);
             }
 
             function setQueryStrings() {
@@ -64,7 +64,14 @@ angular.module('Bastion.components').factory('Nutupane',
 
             params = params || {};
             params.paged = true;
-            params.page = $location.search().page || 1;
+
+            locationPage = $location.search().page;
+            // the $location page can return NaN as a String, explicitly checking for that here
+            if (!locationPage || isNaN(locationPage)) {
+                params.page = 1;
+            } else {
+                params.page = locationPage;
+            }
             params['per_page'] = $location.search()['per_page'] || entriesPerPage;
 
             nutupaneParams = nutupaneParams || {};
@@ -89,6 +96,7 @@ angular.module('Bastion.components').factory('Nutupane',
 
             self.load = function () {
                 var deferred = $q.defer(),
+                    responsePage,
                     resourceCall,
                     table = self.table,
                     existingTable = TableCache.getTable(getTableName());
@@ -118,8 +126,9 @@ angular.module('Bastion.components').factory('Nutupane',
 
                     table.rows = response.results;
 
-                    table.resource.page = parseInt(response.page, 10);
-                    params.page = table.params.page = parseInt(response.page, 10);
+                    responsePage = response.page || 1;
+                    table.resource.page = parseInt(responsePage, 10);
+                    params.page = table.params.page = parseInt(responsePage, 10);
 
                     if (table.initialSelectAll) {
                         table.selectAll(true);
@@ -128,7 +137,7 @@ angular.module('Bastion.components').factory('Nutupane',
 
                     deferred.resolve(response);
                     table.resource = response;
-                    table.resource.page = parseInt(response.page, 10);
+                    table.resource.page = parseInt(responsePage, 10);
 
                     if (self.selectAllMode) {
                         table.selectAll(true);
@@ -484,6 +493,11 @@ angular.module('Bastion.components').factory('Nutupane',
                 self.table.searchTerm = $location.search()[self.searchKey];
             };
 
+            // Useful when there are multiple tables in one location
+            self.setTableName = function(name) {
+                self.tableName = name;
+            };
+
             if (!self.disableAutoLoad) {
                 self.load();
             }

data/engines/bastion/app/assets/javascripts/bastion/components/views/bst-modal.html

@@ -12,7 +12,7 @@
   <div data-block="modal-footer">
     <span data-block="modal-confirm-button">
       <button class="btn btn-danger" ng-click="ok()">
-        <span translate>Remove</span>
+        <span translate>Delete</span>
       </button>
     </span>
     <button class="btn btn-default" ng-click="cancel()" translate>Cancel</button>

data/engines/bastion/app/assets/javascripts/bastion/layouts/partials/table.html

@@ -16,6 +16,7 @@
                    ng-trim="false"
                    stop-event="click"
                    uib-typeahead="item.label for item in table.autocomplete($viewValue)"
+                   typeahead-focus-first="false"
                    typeahead-template-url="components/views/autocomplete-scoped-search.html"
                    typeahead-min-length="0"/>
 
@@ -124,4 +125,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

data/engines/bastion/app/assets/stylesheets/bastion/overrides.scss

@@ -77,6 +77,7 @@ html .toolbar-pf.table-view-pf-toolbar-external .toolbar-pf-filter {
 .modal-body {
   overflow-x: hidden;
   overflow-y: scroll;
+  max-height: 75vh; // prevent modal from going below current view causing two scrollbars
 }
 
 // Add some margin to the bottom of the table footer

data/engines/bastion/lib/bastion.rb

@@ -24,6 +24,7 @@ module Bastion
     }
 
     Bastion.plugins.each do |_name, plugin|
+      base_config.merge!(plugin[:config_generator].call) if plugin[:config_generator]
       base_config.merge!(plugin[:config]) if plugin[:config]
     end
 

data/engines/bastion_katello/README.md

@@ -8,9 +8,8 @@ The only real difference, as far as the user is concerned, is that the applicati
 
 ```
 cd ./engines/bastion_katello
-sudo npm update -g grunt-cli
+sudo npm install -g grunt-cli
 npm install
-npm install ../bastion/
 ```
 
 ```

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-repository-sets.controller.js

@@ -20,10 +20,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyRepositorySet
 
         params = {
             id: $scope.$stateParams.activationKeyId,
-            'organization_id': CurrentOrganization,
-            enabled: true,
-            'full_result': true,
-            'include_available_content': true
+            'organization_id': CurrentOrganization
         };
 
         $scope.controllerName = 'katello_products';

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ansible-collections/ansible-collections.factory.js

@@ -0,0 +1,28 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc factory
+     * @name  Bastion.ansible-collections.factory:AnsibleCollection
+     *
+     * @description
+     *   Provides a BastionResource for interacting with Ansible Collections
+     */
+    function AnsibleCollection(BastionResource) {
+
+        return BastionResource('katello/api/v2/ansible_collections/:id',
+            {'id': '@id'},
+            {
+                autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
+            }
+        );
+
+    }
+
+    angular
+        .module('Bastion.ansible-collections')
+        .factory('AnsibleCollection', AnsibleCollection);
+
+    AnsibleCollection.$inject = ['BastionResource'];
+
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ansible-collections/ansible-collections.module.js

@@ -0,0 +1,15 @@
+/**
+ * @ngdoc module
+ * @name  Bastion.ansible-collections
+ *
+ * @description
+ *   Module for Ansible Collection related functionality.
+ */
+angular.module('Bastion.ansible-collections', [
+  'ngResource',
+  'ui.router',
+  'Bastion',
+  'Bastion.i18n',
+  'Bastion.common',
+  'Bastion.components'
+]);

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

@@ -8,6 +8,7 @@ BASTION_MODULES.push(
     'Bastion.debs',
     'Bastion.docker-tags',
     'Bastion.files',
+    'Bastion.ansible-collections',
     'Bastion.ostree-branches',
     'Bastion.hosts',
     'Bastion.puppet-modules',

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

@@ -34,6 +34,9 @@
 //= require "bastion_katello/files/files.module"
 //= require_tree "./files"
 
+//= 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"
 

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

@@ -63,6 +63,10 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
             }
         }
 
+        $scope.productsOrVersionUrl = function (cvIsDefault, cvId) {
+            return cvIsDefault ? '/products' : '/content_views/' + cvId + '/versions';
+        };
+
         function aggregateTasks(tasks) {
             var taskIds = _.map(tasks, function (task) {
                                 return task.id;

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

@@ -81,12 +81,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkErrataModalC
             $scope.showErrata = true;
         };
 
-        $scope.transitionToErrataContentHosts = function (erratum) {
-            $scope.erratum = erratum;
-            $scope.showHosts = true;
-        };
-
-
         $scope.installErrata = function () {
             if ($scope.remoteExecutionByDefault) {
                 $scope.installErrataViaRemoteExecution();

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

@@ -1,4 +1,4 @@
 <div data-extend-template="components/views/bst-modal.html">
-  <h4 data-block="modal-header" translate>Remove {{ table.numSelected  }} Hosts?</h4>
-  <div data-block="modal-body" translate>Are you sure you want to remove the {{ table.numSelected }} host(s) selected?</div>
-</div>
+  <h4 data-block="modal-header" translate>Delete {{ table.numSelected  }} Hosts?</h4>
+  <div data-block="modal-body" translate>Are you sure you want to delete the {{ table.numSelected }} host(s) selected?</div>
+</div>

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

@@ -89,9 +89,7 @@
              <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">
-               <a ng-click="transitionToErrataContentHosts(erratum)">
-                {{ erratum.applicable_hosts.length }}
-               </a>
+               <span> {{ erratum.affected_hosts_count }} </span>
              </td>
            </tr>
          </tbody>
@@ -179,37 +177,7 @@
           </div>
         </section>
       </div>
-  </div>
-
-    <div name="errataHostsDetails" ng-show="showHosts">
-      <a ng-click="showHosts = false">
-        <i class="fa fa-double-angle-left"></i>
-        {{ "Back To Errata List" | translate }}
-      </a>
-
-      <h3 translate>Applicable hosts for {{ erratum.errata_id }} </h3>
-
-      <div class="details details-full">
-        <section>
-          <table class="table">
-            <thead>
-            <tr>
-              <th translate>
-                Name
-              </th>
-            </tr>
-            </thead>
-
-            <tbody>
-            <tr ng-repeat="host in erratum.applicable_hosts">
-              <td>{{ host.name }}</td>
-            </tr>
-            </tbody>
-          </table>
-        </section>
-      </div>
-    </div>
-
+	</div>
   </div>
 
   <div data-block="modal-footer">