katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/deletion/views/version-deletion-environments.html

@@ -59,12 +59,12 @@
     <br/>
     <div class="fr">
       <a ui-sref="content-view.versions({contentViewId: contentView.id})" >
-        <button class="btn btn-default" translate>
+        <button type="button" class="btn btn-default" translate>
           Cancel
         </button>
       </a>
 
-      <button class="btn btn-primary" ng-click="processSelection()" ng-disabled="!anySelectable() || selectionEmpty()" translate>
+      <button type="button" class="btn btn-primary" ng-click="processSelection()" ng-disabled="!anySelectable() || selectionEmpty()" translate>
         Next
       </button>
     </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-composite-available-content-views.controller.js

@@ -24,6 +24,7 @@ angular.module('Bastion.content-views').controller('ContentViewCompositeAvailabl
             };
 
             nutupane = new Nutupane(ContentView, params);
+            $scope.controllerName = 'katello_content_views';
             nutupane.masterOnly = true;
             nutupane.table.initialLoad = false;
             $scope.table = nutupane.table;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/content-view-composite-content-views-list.controller.js

@@ -20,6 +20,7 @@ angular.module('Bastion.content-views').controller('ContentViewCompositeContentV
             'id': $scope.$stateParams.contentViewId,
             'full_result': true
         }, 'contentViewComponents');
+        $scope.controllerName = 'katello_content_views';
 
         nutupane.masterOnly = true;
         $scope.table = nutupane.table;

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

@@ -1,10 +1,8 @@
 <span page-title ng-model="contentView">{{ 'Available Content Views for Composite Content View:' | translate }} {{ contentView.name }}</span>
 
-<header data-block="sub-header">
-  <h3 translate>
-    Add Content Views to {{ contentView.name }}
-  </h3>
-</header>
+<h3 translate>
+  Add Content Views to {{ contentView.name }}
+</h3>
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="messages">
@@ -16,7 +14,7 @@
   </div>
 
   <div data-block="list-actions">
-    <button class="btn btn-primary"
+    <button type="button" class="btn btn-primary"
             ng-disabled="table.numSelected === 0"
             ng-click="addContentViews()">
       <span translate>Add Content Views</span>

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

@@ -1,14 +1,12 @@
 <span page-title ng-model="contentView">{{ 'Content Views for Composite Content View:' | translate }} {{ contentView.name }}</span>
 
-<header data-block="sub-header">
-  <h3 translate>
-    Content Views for {{ contentView.name }}
-  </h3>
-</header>
+<h3 translate>
+  Content Views for {{ contentView.name }}
+</h3>
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
-    <button class="btn btn-default fr"
+    <button type="button" class="btn btn-default fr"
             ng-hide="denied('edit_content_views', contentView)"
             ng-disabled="table.numSelected === 0"
             ng-click="removeContentViewComponents()">

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

@@ -1,7 +1,7 @@
 <div class="details details-full">
 
   <nav>
-    <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
+    <ul class="nav nav-tabs nav-tabs-pf" ng-show="permitted('edit_content_views', contentView)">
       <li ng-class="{active: isState('content-view.components.composite-content-views.list')}">
         <a ui-sref="content-view.components.composite-content-views.list">
           <span translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-docker-repositories.controller.js

@@ -27,6 +27,7 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableDockerRe
             'available_for': 'content_view'
         },
         'queryUnpaged');
+        $scope.controllerName = 'katello_repositories';
 
         nutupane.masterOnly = true;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-file-repositories.controller.js

@@ -26,6 +26,7 @@
             'available_for': 'content_view'
         },
         'queryUnpaged');
+        $scope.controllerName = 'katello_repositories';
 
         nutupane.load();
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-ostree-repositories.controller.js

@@ -27,6 +27,7 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableOstreeRe
             'available_for': 'content_view'
         },
         'queryUnpaged');
+        $scope.controllerName = 'katello_repositories';
 
         nutupane.masterOnly = true;
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-repositories.controller.js

@@ -29,6 +29,7 @@ angular.module('Bastion.content-views').controller('ContentViewAvailableReposito
             'available_for': 'content_view'
         },
         'queryUnpaged');
+        $scope.controllerName = 'katello_repositories';
 
         nutupane.load();
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-docker-repositories-list.controller.js

@@ -24,6 +24,7 @@
             'content_type': 'docker'
         },
         'queryUnpaged');
+        $scope.controllerName = 'katello_repositories';
 
         nutupane.masterOnly = true;
         nutupane.load();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-file-repositories-list.controller.js

@@ -24,6 +24,7 @@
             'content_type': 'file'
         },
         'queryUnpaged');
+        $scope.controllerName = 'katello_repositories';
 
         nutupane.load();
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-ostree-repositories-list.controller.js

@@ -24,6 +24,7 @@
             'content_type': 'ostree'
         },
         'queryUnpaged');
+        $scope.controllerName = 'katello_repositories';
 
         nutupane.masterOnly = true;
         nutupane.load();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-promotion.controller.js

@@ -49,7 +49,7 @@ angular.module('Bastion.content-views').controller('ContentViewPromotionControll
                 angular.forEach(path.environments, function (environment) {
                     environment.disabled = $scope.checkDisabled(environment, version.environments);
                     if ($scope.checkSuggested(environment, version.environments)) {
-                        environment.customClass = 'fa fa-star';
+                        environment.iconClass = 'fa fa-star';
                     }
                 });
             });
@@ -99,6 +99,7 @@ angular.module('Bastion.content-views').controller('ContentViewPromotionControll
             ContentViewVersion.promote({id: $scope.version.id,
                                         'environment_id': $scope.selectedEnvironment.id,
                                         'description': $scope.description,
+                                        'force_yum_metadata_regeneration': $scope.forceMetadataRegeneration,
                                         force: true},
                 success, failure);
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-publish.controller.js

@@ -34,7 +34,8 @@ angular.module('Bastion.content-views').controller('ContentViewPublishController
 
         $scope.publish = function (contentView) {
             var description = $scope.version.description,
-                data = {'id': contentView.id, 'description': description};
+                forceMetadataRegeneration = $scope.version.forceMetadataRegeneration,
+                data = {'id': contentView.id, 'description': description, 'force_yum_metadata_regeneration': forceMetadataRegeneration};
             $scope.working = true;
             ContentView.publish(data, success, failure);
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-repositories-list.controller.js

@@ -26,6 +26,7 @@ angular.module('Bastion.content-views').controller('ContentViewRepositoriesListC
             'content_type': 'yum'
         },
         'queryUnpaged');
+        $scope.controllerName = 'katello_repositories';
 
         nutupane.load();
 

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

@@ -134,6 +134,12 @@ angular.module('Bastion.content-views').controller('ContentViewVersionsControlle
             });
         }
 
+        $scope.regenerateRepositories = function(version) {
+            ContentViewVersion.republishRepositories({id: version.id}, function(task) {
+                $scope.transitionTo('content-view.task', {taskId: task.id, contentViewId: version.content_view_id});
+            });
+        };
+
         $scope.hideProgress = function (version) {
             return version['active_history'].length === 0 || (version.task.state === 'stopped' &&
                 version.task.progressbar.type === 'success');
@@ -219,6 +225,7 @@ angular.module('Bastion.content-views').controller('ContentViewVersionsControlle
         };
 
         nutupane = new Nutupane(ContentViewVersion, {'content_view_id': $scope.$stateParams.contentViewId});
+        $scope.controllerName = 'katello_content_views';
         nutupane.setSearchKey('contentViewVersionSearch');
         nutupane.masterOnly = true;
         $scope.table = nutupane.table;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-errata-filter.controller.js

@@ -20,7 +20,15 @@ angular.module('Bastion.content-views').controller('AvailableErrataFilterControl
         var nutupane, filterByDate;
 
         function success(data) {
-            $scope.filter.rules = _.union($scope.filter.rules, data.results);
+            var rules;
+
+            if (data.results) {
+                rules = data.results;
+            } else {
+                rules = [data];
+            }
+
+            $scope.filter.rules = _.union($scope.filter.rules, rules);
             GlobalNotification.setSuccessMessage(translate('Errata successfully added.'));
             nutupane.table.selectAllResults(false);
             nutupane.refresh();
@@ -91,6 +99,7 @@ angular.module('Bastion.content-views').controller('AvailableErrataFilterControl
             },
             'queryUnpaged'
         );
+        $scope.controllerName = 'katello_erratum_packages';
         nutupane.masterOnly = true;
 
         filterByDate = function (date, type) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-package-group-filter.controller.js

@@ -29,6 +29,7 @@ angular.module('Bastion.content-views').controller('AvailablePackageGroupFilterC
             },
             'queryUnpaged'
         );
+        $scope.controllerName = 'katello_package_groups';
 
         function success(rule) {
             nutupane.removeRow(rule.uuid, 'uuid');

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/date-type-errata-filter.controller.js

@@ -14,13 +14,19 @@
 angular.module('Bastion.content-views').controller('DateTypeErrataFilterController',
     ['$scope', 'translate', 'Rule', 'GlobalNotification', function ($scope, translate, Rule, GlobalNotification) {
 
+        function convertRuleStringsToDates() {
+            $scope.rule['start_date'] = new Date($scope.rule['start_date']);
+            $scope.rule['end_date'] = new Date($scope.rule['end_date']);
+        }
+
         function success() {
+            convertRuleStringsToDates();
             GlobalNotification.setSuccessMessage(translate('Updated errata filter - ' + $scope.filter.name));
         }
 
         function failure(response) {
             $scope.rule.working = false;
-            angular.forEach(response.data.displayMessage, function (error) {
+            angular.forEach(response.data.errors, function (error) {
                 GlobalNotification.setErrorMessage(error);
             });
         }
@@ -33,6 +39,8 @@ angular.module('Bastion.content-views').controller('DateTypeErrataFilterControll
             };
             $scope.rule = new Rule(filter.rules[0]);
 
+            convertRuleStringsToDates();
+
             angular.forEach($scope.types, function (value, type) {
                 if ($scope.rule.types.indexOf(type) > -1) {
                     $scope.types[type] = true;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/docker-tag-filter.controller.js

@@ -0,0 +1,137 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-views.controller:DockerTagFilterController
+ *
+ * @requires $scope
+ * @requires $location
+ * @requires translate
+ * @requires Nutupane
+ * @requires CurrentOrganization
+ * @requires Filter
+ * @requires Rule
+ * @requires DockerTag
+ * @requires GlobalNotification
+ *
+ * @description
+ *   Handles docker tag filter rules for a content view.
+ */
+angular.module('Bastion.content-views').controller('DockerTagFilterController',
+    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Filter', 'Rule', 'DockerTag', 'GlobalNotification', function ($scope, $location, translate, Nutupane, CurrentOrganization, Filter, Rule, DockerTag, GlobalNotification) {
+        var nutupane, params;
+
+        function failure(response) {
+            GlobalNotification.setErrorMessage(response.data.displayMessage);
+        }
+
+        function createRule(rule) {
+            var success;
+
+            success = function (result) {
+                rule.id = result.id;
+                rule.editMode = false;
+                rule.working = false;
+
+                GlobalNotification.setSuccessMessage(translate('Package successfully added.'));
+            };
+
+            if ($scope.valid(rule)) {
+                Rule.save({filterId: $scope.filter.id}, rule, success, failure);
+            }
+        }
+
+        function updateRule(rule) {
+            var updateParams = {filterId: $scope.filter.id, ruleId: rule.id},
+                success, error;
+
+            // Need access to the original rule
+            success = function () {
+                rule.previous = {};
+                rule.editMode = false;
+                rule.working = false;
+                GlobalNotification.setSuccessMessage(translate('Filter rule successfully updated.'));
+            };
+
+            error = function () {
+                rule.working = false;
+            };
+
+            Rule.update(updateParams, rule, success, error);
+        }
+
+        function removeRule(rule) {
+            var success, ruleId = rule.id;
+
+            success = function () {
+                nutupane.removeRow(ruleId);
+                GlobalNotification.setSuccessMessage(translate('Filter rule successfully removed.'));
+            };
+
+            Rule.delete({filterId: $scope.$stateParams.filterId, ruleId: ruleId}, success, failure);
+        }
+
+        params = {
+            filterId: $scope.$stateParams.filterId,
+            'organization_id': CurrentOrganization,
+            'search': $location.search().search || "",
+            'sort_by': 'name',
+            'sort_order': 'ASC',
+            'paged': true
+        };
+
+        nutupane = new Nutupane(Filter, params, 'rules');
+        $scope.table = nutupane.table;
+
+        $scope.addRule = function () {
+            var rule = new Rule();
+            rule.editMode = true;
+            $scope.table.addRow(rule);
+        };
+
+        $scope.saveRule = function (rule) {
+            if (rule.id) {
+                updateRule(rule);
+            } else {
+                createRule(rule);
+            }
+        };
+
+        $scope.valid = function (rule) {
+            return rule.name ? true : false;
+        };
+
+        $scope.backupPrevious = function (rule) {
+            rule.previous = {};
+            angular.copy(rule, rule.previous);
+        };
+
+        $scope.restorePrevious = function (rule) {
+            if (rule.id) {
+                angular.copy(rule.previous, rule);
+            } else {
+                $scope.table.rows.shift();
+            }
+            rule.previous = {};
+        };
+
+        $scope.removeRules = function () {
+            angular.forEach($scope.table.getSelected(), function (rule) {
+                removeRule(rule);
+            });
+        };
+
+        $scope.fetchAutocompleteName = function (term) {
+            var repositoryIds = $scope.contentView['repository_ids'],
+                promise;
+
+            promise = DockerTag.autocompleteName({'repoids[]': repositoryIds, term: term}).$promise;
+
+            return promise.then(function (data) {
+                return data.results;
+            });
+        };
+
+        $scope.filterRepositoriesByType = function () {
+            return (_.filter($scope.filter.repositories, ["content_type", "docker"]));
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/errata-filter-list.controller.js

@@ -55,6 +55,7 @@ angular.module('Bastion.content-views').controller('ErrataFilterListController',
             },
             'queryUnpaged'
         );
+        $scope.controllerName = 'katello_errata';
 
         $scope.table = nutupane.table;
 
@@ -62,7 +63,6 @@ angular.module('Bastion.content-views').controller('ErrataFilterListController',
             var errataIds = nutupane.getAllSelectedResults('errata_id').included.ids,
                 rules;
 
-            nutupane.table.working = true;
             rules = findRules(errataIds);
 
             angular.forEach(rules, function (rule) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-helper.service.js

@@ -13,7 +13,8 @@ angular.module('Bastion.content-views').service('FilterHelper',
         this.contentTypes = {
             'rpm': translate('RPM'),
             'erratum': translate('Errata'),
-            'package_group': translate('Package Groups')
+            'package_group': translate('Package Groups'),
+            'docker': translate('Docker Tags')
         };
 
         this.contentType = function (type) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-repositories.controller.js

@@ -20,8 +20,17 @@ angular.module('Bastion.content-views').controller('FilterRepositoriesController
 
         refreshTable = function (filter) {
             var displayedRepositories = filter['content_view'].repositories,
+                repositoryType,
                 filterRepositories = filter.repositories;
 
+            if ($scope.stateIncludes('content-view.yum')) {
+                repositoryType = 'yum';
+            } else {
+                repositoryType = 'docker';
+            }
+            $scope.repositoryType = repositoryType;
+            displayedRepositories = _.filter(displayedRepositories, ["content_type", repositoryType]);
+
             $scope.$parent.filter = filter;
 
             if (filterRepositories.length === 0) {