katello 4.5.0.rc2 → 4.6.0.rc2

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

@@ -1,66 +0,0 @@
-/**
- * @ngdoc service
- * @name  Bastion.content-views.factory:Filter
- *
- * @requires BastionResource
- *
- * @description
- *   Provides a BastionResource for interacting with content view filters.
- */
-angular.module('Bastion.content-views').factory('Filter',
-    ['BastionResource', function (BastionResource) {
-
-        return BastionResource('katello/api/v2/content_view_filters/:filterId/:action',
-            {filterId: '@id', 'content_view_id': '@content_view.id'},
-            {
-                autocomplete: {method: 'GET', isArray: true, params: {filterId: 'auto_complete_search'}},
-                update: {method: 'PUT'},
-                availableErrata: {
-                    method: 'GET',
-                    params: {action: 'errata', 'available_for': 'content_view_filter'}
-                },
-                rules: {method: 'GET', transformResponse: function (data) {
-                    var response = angular.fromJson(data),
-                        rules = response.rules || [];
-
-                    function getType(rule) {
-                        var typeId;
-
-                        if (rule.version) {
-                            typeId = 'equal';
-                        } else if (rule['min_version'] && !rule['max_version']) {
-                            typeId = 'greater';
-                        } else if (!rule['min_version'] && rule['max_version']) {
-                            typeId = 'less';
-                        } else if (rule['min_version'] && rule['max_version']) {
-                            typeId = 'range';
-                        } else {
-                            typeId = 'all';
-                        }
-
-                        return typeId;
-                    }
-
-                    angular.forEach(rules, function (rule) {
-                        rule.type = getType(rule);
-                    });
-
-                    return {results: rules, subtotal: rules.length, total: rules.length};
-                }},
-                errata: {
-                    method: 'GET',
-                    params: {action: 'errata'}
-                },
-                availablePackageGroups: {
-                    method: 'GET',
-                    params: {action: 'package_groups', 'available_for': 'content_view_filter'}
-                },
-                packageGroups: {
-                    method: 'GET',
-                    params: {action: 'package_groups'}
-                }
-            }
-        );
-
-    }]
-);

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

@@ -1,85 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.content-views.controller:FiltersController
- *
- * @requires $scope
- * @requires translate
- * @requires Filter
- * @requires Nutupane
- * @requires Notification
- *
- * @description
- *   Handles loading all filters for a content view.
- */
-angular.module('Bastion.content-views').controller('FiltersController',
-    ['$scope', 'translate', 'Filter', 'Nutupane', 'Notification', function ($scope, translate, Filter, Nutupane, Notification) {
-        var nutupane, filterTypes;
-
-        function removeFilter(id) {
-            var success, failure;
-
-            success = function () {
-                nutupane.removeRow(id);
-                Notification.setSuccessMessage(translate('Filters successfully removed.'));
-            };
-
-            failure = function (response) {
-                Notification.setErrorMessage(response.data.displayMessage);
-            };
-
-            Filter.delete({filterId: id}, success, failure);
-        }
-
-        if ($scope.stateIncludes('content-view.yum')) {
-            filterTypes = ['rpm', 'package_group', 'erratum', 'modulemd'];
-        } else {
-            filterTypes = ['docker'];
-        }
-        nutupane = new Nutupane(Filter, {
-            'content_view_id': $scope.$stateParams.contentViewId,
-            'types[]': filterTypes
-        });
-
-        $scope.table = nutupane.table;
-
-        $scope.$on('filter.created', function () {
-            nutupane.refresh();
-        });
-
-        $scope.$on('filter.updated', function () {
-            nutupane.refresh();
-        });
-
-        $scope.removeFilters = function () {
-            var filterIds = nutupane.getAllSelectedResults().included.ids;
-
-            angular.forEach(filterIds, removeFilter);
-        };
-
-        nutupane.table.closeItem = function () {};
-
-        $scope.getFilterState = function (filter) {
-            var state;
-
-            switch (filter.type) {
-            case "erratum":
-                state = "content-view.yum.filter.erratum.list({filterId: filter.id})";
-                if (filter.rules[0].types) {
-                    state = "content-view.yum.filter.erratum.dateType({filterId: filter.id})";
-                }
-                break;
-            case "rpm":
-                state = "content-view.yum.filter.rpm({filterId: filter.id})";
-                break;
-            case "modulemd":
-                state = "content-view.yum.filter.module-stream.list({filterId: filter.id})";
-                break;
-            case "package_group":
-                state = "content-view.yum.filter.package_group.list({filterId: filter.id})";
-                break;
-            }
-
-            return state;
-        };
-    }]
-);

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

@@ -1,73 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.content-views.controller:PackageFilterListController
- *
- * @requires $scope
- * @requires translate
- * @requires ModuleStream
- * @requires Rule
- * @requires Nutupane
- * @requires Notification
- *
- * @description
- *   Handles loading module streams that have been added to the filter via filter rules
- *   and provides a method to remove them.
- */
-angular.module('Bastion.content-views').controller('ModuleStreamFilterListController',
-    ['$scope', 'translate', 'ModuleStream', 'Rule', 'Nutupane', 'Notification',
-    function ($scope, translate, ModuleStream, Rule, Nutupane, Notification) {
-        var nutupane;
-
-        function success(rule) {
-            nutupane.removeRow(rule['module_stream_id'], 'id');
-            $scope.filter.rules = _.reject($scope.filter.rules, function (filterRule) {
-                return rule.id === filterRule.id;
-            });
-            Notification.setSuccessMessage(translate('Module Stream successfully removed.'));
-        }
-
-        function failure(response) {
-            Notification.setErrorMessage(response.data.displayMessage);
-        }
-
-        function findRules(moduleStreamIds) {
-            var rules = [];
-
-            angular.forEach(moduleStreamIds, function (id) {
-                var found;
-
-                found = _.find($scope.filter.rules, function (rule) {
-                    return (rule['module_stream_id'] === id);
-                });
-
-                if (found) {
-                    rules.push(new Rule(found));
-                }
-            });
-
-            return rules;
-        }
-
-        nutupane = new Nutupane(ModuleStream, {
-            filterId: $scope.$stateParams.filterId,
-            'sort_order': 'ASC',
-            'sort_by': 'name'
-            },
-            'queryPaged'
-        );
-
-        $scope.table = nutupane.table;
-        nutupane.table.closeItem = function () {};
-
-        $scope.removeModuleStreams = function () {
-            var moduleStreamIds = nutupane.getAllSelectedResults().included.ids,
-                rules;
-
-            rules = findRules(moduleStreamIds);
-
-            angular.forEach(rules, function (rule) {
-                rule.$delete(success, failure);
-            });
-        };
-    }]
-);

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

@@ -1,100 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.content-views.controller:NewFilterController
- *
- * @requires $scope
- * @requires translate
- * @requires Filter
- * @requires Rule
- * @requires Notification
- *
- * @description
- */
-angular.module('Bastion.content-views').controller('NewFilterController',
-    ['$scope', 'translate', 'Filter', 'Rule', 'Notification', function ($scope, translate, Filter, Rule, Notification) {
-        var filterType;
-
-        function transitionToDetails(filter) {
-            var state = '';
-
-            if (filterType === 'erratumId') {
-                state = 'content-view.yum.filter.erratum.available';
-            } else if (filterType === 'erratumDateType') {
-                state = 'content-view.yum.filter.erratum.dateType';
-            } else if (filterType === 'rpm') {
-                state = 'content-view.yum.filter.rpm.details';
-            } else if (filterType === 'package_group') {
-                state = 'content-view.yum.filter.package_group.available';
-            } else if (filterType === 'modulemd') {
-                state = 'content-view.yum.filter.module-stream.available';
-            } else if (filterType === 'docker') {
-                state = 'content-view.docker.filter.tag.details';
-            }
-
-            $scope.$emit('filter.created');
-            $scope.transitionTo(state, {filterId: filter.id, contentViewId: filter['content_view'].id});
-        }
-
-        function addErrataDateTypeRule(filter) {
-            var rule = new Rule({
-                    types: ['security', 'enhancement', 'bugfix']
-                }),
-                addSuccess, error;
-
-            addSuccess = function () {
-                transitionToDetails(filter);
-            };
-
-            error = function (response) {
-                Notification.setErrorMessage(response.data.displayMessage);
-            };
-
-            rule.$save({filterId: filter.id}, addSuccess, error);
-        }
-
-        function success(filter) {
-            if (filterType === 'erratumDateType') {
-                addErrataDateTypeRule(filter);
-            } else {
-                transitionToDetails(filter);
-            }
-        }
-
-        function failure(response) {
-            $scope.working = false;
-            angular.forEach(response.data.errors, function (errors, field) {
-                $scope.filterForm[field].$setValidity('server', false);
-                $scope.filterForm[field].$error.messages = errors;
-            });
-        }
-
-        $scope.filter = new Filter();
-        $scope.working = false;
-
-        if ($scope.stateIncludes('content-view.yum')) {
-            $scope.filterChoices = [
-                {id: 'rpm', name: translate('Package')},
-                {id: 'package_group', name: translate('Package Group')},
-                {id: 'erratumId', name: translate('Erratum - by ID')},
-                {id: 'erratumDateType', name: translate('Erratum - Date and Type')},
-                {id: 'modulemd', name: translate('Module Stream')}
-            ];
-        } else {
-            $scope.filter.type = "docker";
-            $scope.filterChoices = [
-                {id: 'docker', name: translate('Container Image Tag')}
-            ];
-        }
-
-        $scope.save = function (filter, contentView) {
-            filterType = filter.type;
-
-            if (filter.type === 'erratumId' || filter.type === 'erratumDateType') {
-                filter.type = 'erratum';
-            }
-
-            filter.$save({'content_view_id': contentView.id}, success, failure);
-        };
-
-    }]
-);

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

@@ -1,179 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.content-views.controller:PackageFilterController
- *
- * @requires $scope
- * @requires $location
- * @requires translate
- * @requires Nutupane
- * @requires CurrentOrganization
- * @requires Filter
- * @requires Rule
- * @requires Package
- * @requires Notification
- * @requires $uibModal
- *
- * @description
- *   Handles package filter rules for a content view.
- */
-angular.module('Bastion.content-views').controller('PackageFilterController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Filter', 'Rule', 'Package', 'Notification', '$uibModal',
-     function ($scope, $location, translate, Nutupane, CurrentOrganization, Filter, Rule, Package, Notification, $uibModal) {
-        var nutupane, params;
-
-        function failure(response) {
-            Notification.setErrorMessage(response.data.displayMessage);
-        }
-
-        function createRule(rule) {
-            var success;
-
-            success = function (result) {
-                rule.id = result.id;
-                rule.editMode = false;
-                rule.working = false;
-
-                Notification.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;
-                Notification.setSuccessMessage(translate('Package 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);
-                Notification.setSuccessMessage(translate('Package 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) {
-            var valid = rule.name ? true : false;
-
-            if (rule.type === 'equal') {
-                valid = valid && rule.version;
-            } else if (rule.type === 'less') {
-                valid = valid && rule['max_version'];
-            } else if (rule.type === 'greater') {
-                valid = valid && rule['min_version'];
-            } else if (rule.type === 'range') {
-                valid = valid && rule['min_version'] && rule['max_version'];
-            }
-
-            return valid;
-        };
-
-        $scope.clearValues = function (rule) {
-            rule.version = undefined;
-            rule['min_version'] = undefined;
-            rule['max_version'] = undefined;
-        };
-
-        $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.getMatchingContent = function (rule) {
-            $uibModal.open({
-                templateUrl: 'content-views/details/filters/views/filter-rule-matching-package-modal.html',
-                controller: 'FilterRuleMatchingPackageModal',
-                size: 'lg',
-                resolve: {
-                    filterRuleId: rule.id
-                }
-            }).closed.then(function () {});
-        };
-
-        $scope.fetchAutocompleteName = function (term) {
-            var repositoryIds = $scope.contentView['repository_ids'],
-                promise;
-
-            promise = Package.autocompleteName({'repoids[]': repositoryIds, term: term, 'non_modular_only': true}).$promise;
-
-            return promise.then(function (data) {
-                return data.results;
-            });
-        };
-
-        $scope.fetchAutocompleteArch = function (term) {
-            var repositoryIds = $scope.contentView['repository_ids'],
-                promise;
-
-            promise = Package.autocompleteArch({'repoids[]': repositoryIds, term: term, 'non_modular_only': true}).$promise;
-
-            return promise.then(function (data) {
-                return data.results;
-            });
-        };
-
-        $scope.filterRepositoriesByType = function () {
-            return (_.filter($scope.filter.repositories, ["content_type", "yum"]));
-        };
-    }]
-);

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

@@ -1,75 +0,0 @@
-/**
- * @ngdoc object
- * @name  Bastion.content-views.controller:PackageFilterListController
- *
- * @requires $scope
- * @requires translate
- * @requires Filter
- * @requires Rule
- * @requires Nutupane
- * @requires Notification
- *
- * @description
- *   Handles loading package groups that have been added to the filter via filter rules
- *   and provides a method to remove them.
- */
-angular.module('Bastion.content-views').controller('PackageGroupFilterListController',
-    ['$scope', 'translate', 'PackageGroup', 'Rule', 'Nutupane', 'Notification',
-    function ($scope, translate, PackageGroup, Rule, Nutupane, Notification) {
-        var nutupane;
-
-        function success(rule) {
-            nutupane.removeRow(rule.uuid, 'uuid');
-            $scope.filter.rules = _.reject($scope.filter.rules, function (filterRule) {
-                return rule.id === filterRule.id;
-            });
-            Notification.setSuccessMessage(translate('Package Group successfully removed.'));
-        }
-
-        function failure(response) {
-            Notification.setErrorMessage(response.data.displayMessage);
-        }
-
-        function findRules(packageGroupIds) {
-            var rules = [];
-
-            angular.forEach(packageGroupIds, function (id) {
-                var found;
-
-                found = _.find($scope.filter.rules, function (rule) {
-                    return (rule.uuid === id);
-                });
-
-                if (found) {
-                    rules.push(new Rule(found));
-                }
-            });
-
-            return rules;
-        }
-
-        nutupane = new Nutupane(PackageGroup, {
-            filterId: $scope.$stateParams.filterId,
-            'sort_order': 'ASC',
-            'sort_by': 'name'
-            },
-            'queryUnpaged'
-        );
-        $scope.controllerName = 'katello_package_groups';
-
-        $scope.table = nutupane.table;
-        nutupane.table.closeItem = function () {};
-
-        $scope.removePackageGroups = function () {
-            var packageGroupIds = nutupane.getAllSelectedResults('uuid').included.ids,
-                rules;
-
-            rules = findRules(packageGroupIds);
-
-            angular.forEach(rules, function (rule) {
-                rule.$delete(success, failure);
-            });
-        };
-
-    }]
-);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/rule.factory.js

@@ -1,21 +0,0 @@
-/**
- * @ngdoc service
- * @name  Bastion.content-views.filters.factory:Filter
- *
- * @requires BastionResource
- *
- * @description
- *   Provides a BastionResource for interacting with content view filter rules.
- */
-angular.module('Bastion.content-views').factory('Rule',
-    ['BastionResource', function (BastionResource) {
-
-        return BastionResource('katello/api/v2/content_view_filters/:filterId/rules/:ruleId',
-            {ruleId: '@id', filterId: '@content_view_filter_id'},
-            {
-                update: {method: 'PUT'}
-            }
-        );
-
-    }]
-);

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

@@ -1,9 +0,0 @@
-<form name="errataForm" class="col-sm-5">
-  <div ng-include="'content-views/details/filters/views/date-type-errata.html'"></div>
-
-  <div bst-form-buttons
-       on-cancel="transitionTo('content-view.yum.filters', {contentViewId: contentView.id})"
-       on-save="save(rule, filter)"
-       working="rule.working">
-  </div>
-</form>

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

@@ -1,75 +0,0 @@
-<div bst-form-group label="{{ 'Errata Type' | translate }}">
-
-  <label class="checkbox-inline">
-    <input type="checkbox"
-           name="types"
-           value="{{ types.security }}"
-           ng-model="types.security"
-           ng-change="updateTypes(types)"
-           ng-disabled="onlySelected(types, 'security')"/>
-    <span translate>Security</span>
-  </label>
-
-  <label class="checkbox-inline">
-    <input type="checkbox"
-           name="types"
-           value="{{ types.enhancement }}"
-           ng-model="types.enhancement"
-           ng-change="updateTypes(types)"
-           ng-disabled="onlySelected(types, 'enhancement')"/>
-    <span translate>Enhancement</span>
-  </label>
-
-  <label class="checkbox-inline">
-    <input type="checkbox"
-           name="types"
-           value="{{ types.bugfix }}"
-           ng-model="types.bugfix"
-           ng-change="updateTypes(types)"
-           ng-disabled="onlySelected(types, 'bugfix')"/>
-    <span translate>Bugfix</span>
-  </label>
-
-</div>
-<div bst-form-group label="{{ 'Date Type' | translate }}">
-  <label class="radio-inline">
-    <input type="radio"
-           ng-model="rule.date_type"
-           ng-change="updateDateType()"
-           value="updated"/>
-    <span translate>Updated On</span>
-  </label>
-  <label class="radio-inline">
-    <input type="radio"
-           ng-model="rule.date_type"
-           ng-change="updateDateType()"
-           value="issued"/>
-    <span translate>Issued On</span>
-  </label>
-</div>
-
-<div bst-form-group label="{{ 'Start Date' | translate }}">
-  <div class="input-group">
-    <input type="date" class="form-control" uib-datepicker-popup
-           ng-model="rule.start_date" ng-model-options="{timezone: 'UTC'}"
-           is-open="date.startOpen" ng-click="openStartDate($event)"/>
-    <span class="input-group-btn">
-      <button class="btn btn-default" type="button" ng-click="openStartDate($event)">
-        <i class="fa fa-calendar inline-icon"></i>
-      </button>
-    </span>
-  </div>
-</div>
-
-<div bst-form-group label="{{ 'End Date' | translate }}">
-  <div class="input-group">
-    <input type="date" class="form-control" uib-datepicker-popup
-           ng-model="rule.end_date" ng-model-options="{timezone: 'UTC'}"
-           is-open="date.endOpen" ng-click="openEndDate($event)"/>
-    <span class="input-group-btn">
-      <button class="btn btn-default" type="button" ng-click="openEndDate($event)">
-        <i class="fa fa-calendar inline-icon"></i>
-      </button>
-    </span>
-  </div>
-</div>