katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-puppet-modules.html

@@ -1,5 +1,7 @@
 <span page-title ng-model="repository">{{ 'Manage Puppet Modules for Repository:' | translate }} {{ repository.name }}</span>
 
+<h3 translate>Manage Puppet Modules for {{ repository.name }}</h3>
+
 <div data-block="messages">
   <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
@@ -29,18 +31,16 @@
       </div>
     </div>
 
-    <button class="btn btn-default"
+    <button type="button" class="btn btn-default"
             ng-hide="denied('edit_products')"
             ng-click="openModal()"
-            ng-disabled="table.working || table.numSelected === 0">
-      <i class="fa fa-trash-o" ng-hide="table.working"></i>
-      <i class="fa fa-spinner fa-spin" ng-show="table.working"></i>
+            ng-disabled="table.numSelected === 0">
       <span translate>Remove Puppet Modules</span>
     </button>
   </div>
 
   <div data-block="table">
-    <table class="table table-striped table-bordered" >
+    <table class="table table-striped table-bordered">
 
       <thead>
         <tr bst-table-head row-select>

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

@@ -12,13 +12,14 @@
  * @requires ApiErrorHandler
  * @requires BastionConfig
  * @requires DownloadPolicy
+ * @requires OstreeUpstreamSyncPolicy
  *
  * @description
  *   Controls the creation of an empty Repository object for use by sub-controllers.
  */
 angular.module('Bastion.repositories').controller('NewRepositoryController',
-    ['$scope', 'Repository', 'Product', 'GPGKey', 'FormUtils', 'translate', 'GlobalNotification', 'ApiErrorHandler', 'BastionConfig', 'DownloadPolicy',
-    function ($scope, Repository, Product, GPGKey, FormUtils, translate, GlobalNotification, ApiErrorHandler, BastionConfig, DownloadPolicy) {
+    ['$scope', 'Repository', 'Product', 'GPGKey', 'FormUtils', 'translate', 'GlobalNotification', 'ApiErrorHandler', 'BastionConfig', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy',
+    function ($scope, Repository, Product, GPGKey, FormUtils, translate, GlobalNotification, ApiErrorHandler, BastionConfig, DownloadPolicy, OstreeUpstreamSyncPolicy) {
 
         function success() {
             GlobalNotification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
@@ -59,7 +60,8 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
 
         $scope.repository = new Repository({'product_id': $scope.$stateParams.productId, unprotected: true,
             'checksum_type': null, 'mirror_on_sync': true, 'verify_ssl_on_sync': true,
-            'download_policy': BastionConfig.defaultDownloadPolicy});
+            'download_policy': BastionConfig.defaultDownloadPolicy,
+            'ostree_upstream_sync_policy': 'latest'});
 
         $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
             $scope.page.loading = false;
@@ -73,6 +75,7 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
         });
 
         $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
+        $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
 
         $scope.$watch('repository.name', function () {
             if ($scope.repositoryForm && $scope.repositoryForm.name) {

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

@@ -1,8 +1,6 @@
 <span page-title>{{ 'New Repository' | translate }}</span>
 
-<header data-block="sub-header">
-  <h2 translate>New Repository</h2>
-</header>
+<h3 translate>New Repository</h3>
 
 <div bst-alerts error-messages="errorMessages" success-messages="successMessages"></div>
 
@@ -43,42 +41,64 @@
                ng-model="repository.url"
                type="text"
                ng-required="repository.content_type === 'docker'"/>
-        <h6 ng-show="repository.content_type === 'docker'" translate>
+        <p class="help-block" ng-show="repository.content_type === 'docker'" translate>
           URL of the registry you want to sync. Example: https://registry-1.docker.io/
+        </p>
+
+      </div>
+
+      <div bst-form-group label="{{ 'Upstream Sync Policy' | translate }}"  ng-show="repository.content_type === 'ostree'">
+        <select required
+                id="ostree_upstream_sync_policy"
+                name="ostree_upstream_sync_policy"
+                ng-model="repository.ostree_upstream_sync_policy"
+                ng-options="id as name for (id, name) in ostreeUpstreamSyncPolicies">
+        </select>
+
+        <input id="ostree_upstream_sync_depth"
+               name="ostree_upstream_sync_depth"
+               ng-model="repository.ostree_upstream_sync_depth"
+               type="number"
+               ng-disabled="repository.ostree_upstream_sync_policy !== 'custom'"/>
+        <h6 translate>
+          Choose one of the policy selections for downloading ostree content from upstream url during synchronization. Choose "Latest" for downloading the latest version of the upstream branch. Choose "All History" to download all available versions of the upstream repository (this may take a large amount of space). Choose "Custom Depth" and provide an number to indicate the number of prior versions of the upstream branch to download.
         </h6>
 
       </div>
 
+
       <div bst-form-group label="{{ 'Upstream Repository Name' | translate }}"  ng-show="repository.content_type === 'docker'">
         <input id="docker_upstream_name"
                name="docker_upstream_name"
                ng-model="repository.docker_upstream_name"
                type="text"
                ng-required="repository.content_type === 'docker'"/>
-        <h6 translate>
+        <p class="help-block" translate>
           Name of the upstream repository you want to sync. Example: 'busybox' or 'fedora/ssh'.
-        </h6>
+        </p>
 
       </div>
 
-      <div bst-form-group label="{{ 'Verify SSL' | translate }}">
-        <input id="verify_ssl_on_sync"
-               name="verify_ssl_on_sync"
-               ng-model="repository.verify_ssl_on_sync"
-               type="checkbox"/>
-        <h6 translate>
+      <div class="checkbox">
+        <label>
+          <input id="verify_ssl_on_sync" name="verify_ssl_on_sync" ng-model="repository.verify_ssl_on_sync" type="checkbox"/>
+          <span translate>Verify SSL</span>
+        </label>
+
+        <p class="help-block" translate>
           Selecting this option will result in Katello verifying that the upstream url's SSL certificates are signed by a trusted CA. Unselect if you do not want this verification.
-        </h6>
+        </p>
       </div>
 
+
       <div bst-form-group label="{{ 'Upstream Username' | translate }}" >
         <input id="upstream_username"
                name="upstream_username"
                ng-model="repository.upstream_username"
                type="text"/>
-        <h6 translate>
+        <p class="help-block" translate>
           Username of the upstream repository user for authentication. Leave empty if repository does not require authentication.
-        </h6>
+        </p>
       </div>
 
       <div bst-form-group label="{{ 'Upstream Password' | translate }}" >
@@ -86,9 +106,9 @@
                name="upstream_password"
                ng-model="repository.upstream_password"
                type="password"/>
-        <h6 translate>
+        <p class="help-block" translate>
           Password of the upstream repository user for authentication. Leave empty if repository does not require authentication.
-        </h6>
+        </p>
       </div>
 
 
@@ -100,14 +120,15 @@
         </select>
       </div>
 
-      <div bst-form-group label="{{ 'Mirror On Sync' | translate }}" ng-show="repository.content_type === 'yum'">
-        <input id="mirror_on_sync"
-               name="mirror_on_sync"
-               ng-model="repository.mirror_on_sync"
-               type="checkbox"/>
-        <h6 translate>
+      <div class="checkbox" ng-show="repository.content_type === 'yum'">
+        <label>
+          <input id="mirror_on_sync" name="mirror_on_sync" ng-model="repository.mirror_on_sync" type="checkbox"/>
+          <span translate>Mirror on Sync</span>
+        </label>
+
+        <p class="help-block" translate>
           Selecting this option will result in contents that are no longer part of the upstream repository being removed during synchronization.
-        </h6>
+        </p>
       </div>
     </div>
 
@@ -120,16 +141,16 @@
                 ng-model="repository.checksum_type"
                 ng-options="type.id as type.name for type in checksums">
         </select>
-        <h6 translate>
+        <p class="help-block" translate>
           For older operating systems such as Red Hat Enterprise Linux 5 or CentOS 5 it is recommended to use sha1.
-        </h6>
+        </p>
       </div>
 
-      <div bst-form-group label="{{ 'Publish via HTTP' | translate }}">
-        <input id="unprotected"
-               name="unprotected"
-               ng-model="repository.unprotected"
-               type="checkbox"/>
+      <div class="checkbox">
+        <label>
+          <input id="unprotected" name="unprotected" ng-model="repository.unprotected" type="checkbox"/>
+          <span translate>Publish via HTTP</span>
+        </label>
       </div>
 
       <div bst-form-group label="{{ 'GPG Key' | translate }}" ng-show="repository.content_type === 'yum'">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/ostree-upstream-sync-policy.service.js

@@ -0,0 +1,26 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.repository.service:ostreeUpstreamSyncPolicy
+ *
+ * @requires translate
+ *
+ * @description
+ *   Provides a ostree upstream syncPolicies for repositories
+ */
+angular.module('Bastion.repositories').service('OstreeUpstreamSyncPolicy',
+    ['translate', function (translate) {
+
+        this.syncPolicies = {
+            'latest': translate('Latest Only'),
+            'all': translate('All History'),
+            'custom': translate('Custom Depth')
+        };
+
+        this.syncPolicyName = function (policy, depth) {
+            if (policy === "custom") {
+                return translate('Custom Depth (Currently %s)').replace('%s', depth.toString());
+            }
+            return this.syncPolicies[policy];
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.module.js

@@ -17,7 +17,8 @@ angular.module('Bastion.repositories', [
     'Bastion.components.formatters',
     'Bastion.packages',
     'Bastion.products',
-    'Bastion.docker-manifests'
+    'Bastion.docker-manifests',
+    'Bastion.files'
 ]);
 
 angular.module('Bastion.repositories').run(['$rootScope', '$state', '$stateParams',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.routes.js

@@ -56,6 +56,16 @@
                 parent: 'product.repositories'
             }
         })
+        .state('product.repository.advanced_sync', {
+            url: '/advanced_sync',
+            permission: 'view_products',
+            controller: 'RepositoryAdvancedSyncController',
+            templateUrl: 'products/details/repositories/details/views/repository-advanced-sync.html',
+            ncyBreadcrumb: {
+                label: "{{ 'Advanced Sync' | translate }}",
+                parent: 'product.repository.info'
+            }
+        })
         .state('product.repository.manage-content', {
             abstract: true,
             url: '/content',
@@ -98,6 +108,15 @@
                 parent: 'product.repository.info'
             }
         })
+        .state('product.repository.manage-content.files', {
+            url: '/content/files',
+            permission: 'view_products',
+            templateUrl: 'products/details/repositories/details/views/repository-manage-files.html',
+            ncyBreadcrumb: {
+                label: "{{'Files' | translate }}",
+                parent: 'product.repository.info'
+            }
+        })
         .state('product.repository.manage-content.ostree-branches', {
             url: '/content/ostree_branches',
             permission: 'view_products',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repository.factory.js

@@ -20,7 +20,8 @@ angular.module('Bastion.repositories').factory('Repository',
                 removePackages: { method: 'PUT', params: { action: 'remove_packages'}},
                 removeContent: { method: 'PUT', params: { action: 'remove_content'}},
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
-                repositoryTypes: {method: 'GET', isArray: true, params: {id: 'repository_types'}}
+                repositoryTypes: {method: 'GET', isArray: true, params: {id: 'repository_types'}},
+                republish: {method: 'PUT', params: { action: 'republish' }}
             }
         );
 

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

@@ -22,20 +22,20 @@
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
-    <button class="btn btn-default"
+    <button type="button" class="btn btn-default"
             ui-sref="product.repositories.new({productId: product.id})"
             ng-hide="denied('edit_products', product) || product.redhat">
       <span translate>New Repository</span>
     </button>
 
-    <button class="btn btn-default"
+    <button type="button" class="btn btn-default"
             ng-click="syncSelectedRepositories()"
             ng-hide="denied('sync_products', product)"
             ng-disabled="syncInProgress || table.numSelected == 0">
       <span translate>Sync Now</span>
     </button>
 
-    <button class="btn btn-default"
+    <button type="button" class="btn btn-default"
             ng-click="openModal()"
             ng-show="canRemoveRepositories(product)"
             ng-disabled="removingRepositories || table.numSelected == 0">
@@ -88,9 +88,8 @@
   </span>
 
   <div data-block="table">
-    <table bst-table="table"
-           class="table table-striped table-bordered"
-           ng-show="table.rows.length > 0 && !table.working">
+    <table class="table table-striped table-bordered"
+           ng-show="table.rows.length > 0">
       <thead>
         <tr bst-table-head row-select>
           <th bst-table-column="name" translate>Name</th>
@@ -138,10 +137,16 @@
               </div>
 
               <div>
-                <a ui-sref="errata.index({repositoryId: repository.id})" translate>
+                <a ui-sref="errata({repositoryId: repository.id})" translate>
                   {{ repository.content_counts.erratum || 0 }} Errata
                 </a>
               </div>
+
+              <div>
+                <a ui-sref="product.repository.manage-content.package-groups({productId: product.id, repositoryId: repository.id})">
+                  {{ repository.content_counts.package_group || 0 }} Package Groups
+                </a>
+              </div>
             </span>
 
             <span ng-show="repository.content_type == 'docker'">

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

@@ -7,8 +7,8 @@
 
   <nav data-block="item-actions">
     <div class="btn-group" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
-      <button type="button" class="btn btn-default" ng-disabled="denied('sync_products')" ng-click="syncProduct()">
-        <span translate>Sync Now</span>
+      <button type="button" class="btn btn-default" uib-dropdown-toggle>
+        <span translate>Select Action</span>
       </button>
       <button type="button" class="btn btn-default" uib-dropdown-toggle>
         <span class="caret"></span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/{discovery-form.controller.js → discovery-create.controller.js}

@@ -1,80 +1,112 @@
 /**
  * @ngdoc object
- * @name  Bastion.products.controller:DiscoveryFormController
+ * @name  Bastion.products.controller:DiscoveryCreateController
  *
  * @requires $scope
  * @requires $q
  * @requires CurrentOrganization
  * @requires Product
  * @requires Repository
+ * @requires GPGKey
  * @requires FormUtils
+ * @requires DiscoveryRepositories
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the repo creation as part of
  *      repository discovery.
  */
-angular.module('Bastion.products').controller('DiscoveryFormController',
-    ['$scope', '$q', 'CurrentOrganization', 'Product', 'Repository', 'GPGKey', 'FormUtils',
-    function ($scope, $q, CurrentOrganization, Product, Repository, GPGKey, FormUtils) {
-
-        function productCreateError(response) {
-            $scope.working = false;
-            $scope.createRepoChoices.creating = false;
-            angular.forEach(response.data.errors, function (errors, field) {
-                $scope.productForm[field].$setValidity('server', false);
-                $scope.productForm[field].$error.messages = errors;
-            });
-        }
-
-        function repoCreateError(response) {
-            var currentlyCreating = $scope.currentlyCreating;
-            $scope.currentlyCreating = undefined;
-            $scope.createRepoChoices.creating = false;
-            currentlyCreating.form.$invalid = true;
-            currentlyCreating.form.messages = response.data.errors;
-        }
+angular.module('Bastion.products').controller('DiscoveryCreateController',
+    ['$scope', '$q', 'CurrentOrganization', 'Product', 'Repository', 'GPGKey', 'FormUtils', 'DiscoveryRepositories', 'translate',
+    function ($scope, $q, CurrentOrganization, Product, Repository, GPGKey, FormUtils, DiscoveryRepositories, translate) {
+
+        $scope.errorMessages = [];
+        $scope.successMessages = [];
+
+        $scope.table = {
+            rows: DiscoveryRepositories.getRows(),
+            resource: {
+                total: DiscoveryRepositories.getRows().length,
+                subtotal: DiscoveryRepositories.getRows().length
+            }
+        };
 
         function convertToResource(repo) {
-            return new Repository({
+            var repoParams = {
+                'docker_upstream_name': repo.dockerUpstreamName,
                 name: repo.name,
                 label: repo.label,
-                'content_type': 'yum',
+                'content_type': repo.contentType,
                 url: repo.url,
                 'product_id': $scope.createRepoChoices.existingProductId,
-                unprotected: $scope.createRepoChoices.unprotected
-            });
+                unprotected: $scope.createRepoChoices.unprotected,
+                'verify_ssl': $scope.createRepoChoices.verifySsl,
+                'upstream_username': $scope.createRepoChoices.upstreamUsername,
+                'upstream_password': $scope.createRepoChoices.upstreamPassword
+            };
+
+            if (repo.contentType === 'docker') {
+                repoParams.url = $scope.createRepoChoices.repositoryUrl;
+            }
+
+            return new Repository(repoParams);
         }
 
         function getNextRepoToCreate() {
             var found;
-            angular.forEach($scope.discovery.selected, function (repo) {
-                if (repo.created !== true && angular.isUndefined(found)) {
+            angular.forEach($scope.table.rows, function (repo) {
+                if (angular.isUndefined(found) && repo.created !== true && repo.form.$invalid !== true) {
                     found = repo;
                 }
             });
             return found;
         }
 
+        function repoCreateError(response) {
+            var currentlyCreating = $scope.currentlyCreating;
+            $scope.currentlyCreating = undefined;
+            currentlyCreating.messages = response.data.displayMessage;
+            currentlyCreating.creating = false;
+            currentlyCreating.form.$invalid = true;
+        }
+
         function createNextRepo() {
             var toCreate, repoObject;
             toCreate = getNextRepoToCreate();
 
             if (toCreate) {
+                toCreate.messages = translate("Creating repository...");
                 $scope.currentlyCreating = toCreate;
                 repoObject = convertToResource(toCreate);
                 toCreate.creating = true;
                 toCreate.form.$invalid = false;
 
-                repoObject.$save(function () {
+                repoObject.$save(function (task) {
                     toCreate.creating = false;
                     toCreate.created = true;
+                    toCreate.messages = translate("Success!");
+                    toCreate.repositoryId = task.id;
+                    toCreate.productId = task.product.id;
                     createNextRepo();
-                }, repoCreateError);
+                }, function(response) {
+                    repoCreateError(response);
+                    createNextRepo();
+                });
             } else {
-                $scope.transitionTo('product.repositories', {productId: $scope.createRepoChoices.existingProductId});
+                $scope.createRepoChoices.creating = false;
             }
         }
 
+        function productCreateError(response) {
+            $scope.createRepoChoices.creating = false;
+            angular.forEach(response.data.errors, function (errors, field) {
+                $scope.errorMessages.push(translate('An error occurred while creating the Product: %s').replace('%s', field + ' ' + errors));
+                if (!angular.isUndefined($scope.productForm[field])) {
+                    $scope.productForm[field].$error.messages = errors;
+                }
+            });
+        }
+
         function productCreateSuccess(response) {
             $scope.createRepoChoices.existingProductId = response.id;
             $scope.createRepoChoices.newProduct = 'false';
@@ -82,7 +114,6 @@ angular.module('Bastion.products').controller('DiscoveryFormController',
             createNextRepo();
         }
 
-        $scope.discovery = $scope.discovery || {selected: []};
         $scope.page = {loading: true};
         $scope.$watch('createRepoChoices.product.name', function () {
             FormUtils.labelize($scope.createRepoChoices.product);
@@ -93,12 +124,16 @@ angular.module('Bastion.products').controller('DiscoveryFormController',
             newProduct: 'false',
             product: new Product(),
             unprotected: true,
-            creating: false
+            creating: false,
+            verifySsl: true,
+            repositoryUrl: DiscoveryRepositories.getRepositoryUrl(),
+            upstreamUsername: DiscoveryRepositories.getUpstreamUsername(),
+            upstreamPassword: DiscoveryRepositories.getUpstreamPassword()
         };
 
         $scope.createRepoChoices.product['organization_id'] = CurrentOrganization;
 
-        angular.forEach($scope.discovery.selected, function (repo) {
+        angular.forEach($scope.table.rows, function (repo) {
             //Add a fake form to keep track of validations
             repo.form = {
                     messages: '',
@@ -137,9 +172,17 @@ angular.module('Bastion.products').controller('DiscoveryFormController',
             return fieldsEnabled;
         };
 
-        $scope.gpgKeys = GPGKey.queryUnpaged();
+        $scope.gpgKeys = function () {
+            var deferred = $q.defer();
+
+            GPGKey.queryUnpaged(function (response) {
+                deferred.resolve(response.results);
+            });
+
+            return deferred.promise;
+        };
 
-        $scope.$watch('discovery.selected', function (newList, oldList) {
+        $scope.$watch('table.rows', function (newList, oldList) {
             if (newList) {
                 angular.forEach(newList, function (newItem, position) {
                     if (angular.isUndefined(oldList) || newItem.name !== oldList[position].name) {
@@ -157,8 +200,15 @@ angular.module('Bastion.products').controller('DiscoveryFormController',
             return isEqual;
         });
 
+        $scope.clearInvalidRepos = function () {
+            angular.forEach($scope.table.rows, function (repo) {
+                repo.form.$invalid = false;
+            });
+        };
+
         $scope.createRepos = function () {
             $scope.createRepoChoices.creating = true;
+            $scope.clearInvalidRepos();
 
             if ($scope.createRepoChoices.newProduct === "true") {
                 Product.save($scope.createRepoChoices.product, productCreateSuccess, productCreateError);
@@ -167,5 +217,29 @@ angular.module('Bastion.products').controller('DiscoveryFormController',
             }
         };
 
+        $scope.createStatusIcon = function (repo) {
+            var icon;
+            if (repo.created === true) {
+                icon = 'pficon pficon-ok';
+            } else if (repo.creating === true) {
+                icon = 'fa fa-spinner fa-spin';
+            } else if (angular.isUndefined(repo.messages)) {
+                icon = '';
+            } else {
+                icon = 'pficon pficon-error-circle-o';
+            }
+
+            return icon;
+        };
+
+        $scope.createStatusMessages = function (repo) {
+            var message;
+            if (angular.isUndefined(repo.messages)) {
+                message = translate("Not started");
+            } else {
+                message = repo.messages;
+            }
+            return message;
+        };
     }]
 );