katello 3.3.2 → 3.4.0.rc1

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

@@ -19,6 +19,34 @@ angular.module('Bastion.content-views').factory('Filter',
                     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'}

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

@@ -13,7 +13,7 @@
  */
 angular.module('Bastion.content-views').controller('FiltersController',
     ['$scope', 'translate', 'Filter', 'Nutupane', 'GlobalNotification', function ($scope, translate, Filter, Nutupane, GlobalNotification) {
-        var nutupane;
+        var nutupane, filterTypes;
 
         function removeFilter(id) {
             var success, failure;
@@ -30,9 +30,14 @@ angular.module('Bastion.content-views').controller('FiltersController',
             Filter.delete({filterId: id}, success, failure);
         }
 
+        if ($scope.stateIncludes('content-view.yum')) {
+            filterTypes = ['rpm', 'package_group', 'erratum'];
+        } else {
+            filterTypes = ['docker'];
+        }
         nutupane = new Nutupane(Filter, {
             'content_view_id': $scope.$stateParams.contentViewId,
-            'types[]': ["rpm", "package_group", "erratum"]
+            'types[]': filterTypes
         });
 
         $scope.table = nutupane.table;
@@ -58,21 +63,20 @@ angular.module('Bastion.content-views').controller('FiltersController',
 
             switch (filter.type) {
             case "erratum":
-                state = "content-view.filter.erratum.list({filterId: filter.id})";
+                state = "content-view.yum.filter.erratum.list({filterId: filter.id})";
                 if (filter.rules[0].types) {
-                    state = "content-view.filter.erratum.dateType({filterId: filter.id})";
+                    state = "content-view.yum.filter.erratum.dateType({filterId: filter.id})";
                 }
                 break;
             case "rpm":
-                state = "content-view.filter.rpm({filterId: filter.id})";
+                state = "content-view.yum.filter.rpm({filterId: filter.id})";
                 break;
             case "package_group":
-                state = "content-view.filter.package_group.list({filterId: filter.id})";
+                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/new-filter.controller.js

@@ -3,6 +3,7 @@
  * @name  Bastion.content-views.controller:NewFilterController
  *
  * @requires $scope
+ * @requires translate
  * @requires Filter
  * @requires Rule
  * @requires GlobalNotification
@@ -10,20 +11,22 @@
  * @description
  */
 angular.module('Bastion.content-views').controller('NewFilterController',
-    ['$scope', 'Filter', 'Rule', 'GlobalNotification', function ($scope, Filter, Rule, GlobalNotification) {
+    ['$scope', 'translate', 'Filter', 'Rule', 'GlobalNotification', function ($scope, translate, Filter, Rule, GlobalNotification) {
         var filterType;
 
         function transitionToDetails(filter) {
             var state = '';
 
             if (filterType === 'erratumId') {
-                state = 'content-view.filter.erratum.available';
+                state = 'content-view.yum.filter.erratum.available';
             } else if (filterType === 'erratumDateType') {
-                state = 'content-view.filter.erratum.dateType';
+                state = 'content-view.yum.filter.erratum.dateType';
             } else if (filterType === 'rpm') {
-                state = 'content-view.filter.rpm.details';
+                state = 'content-view.yum.filter.rpm.details';
             } else if (filterType === 'package_group') {
-                state = 'content-view.filter.package_group.available';
+                state = 'content-view.yum.filter.package_group.available';
+            } else if (filterType === 'docker') {
+                state = 'content-view.docker.filter.tag.details';
             }
 
             $scope.$emit('filter.created');
@@ -66,6 +69,20 @@ angular.module('Bastion.content-views').controller('NewFilterController',
         $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')}
+            ];
+        } else {
+            $scope.filter.type = "docker";
+            $scope.filterChoices = [
+                {id: 'docker', name: translate('Docker Tag')}
+            ];
+        }
+
         $scope.save = function (filter, contentView) {
             filterType = filter.type;
 

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

@@ -3,92 +3,44 @@
  * @name  Bastion.content-views.controller:PackageFilterController
  *
  * @requires $scope
+ * @requires $location
  * @requires translate
+ * @requires Nutupane
+ * @requires CurrentOrganization
+ * @requires Filter
  * @requires Rule
  * @requires Package
  * @requires GlobalNotification
  *
  * @description
+ *   Handles package filter rules for a content view.
  */
 angular.module('Bastion.content-views').controller('PackageFilterController',
-    ['$scope', 'translate', 'Rule', 'Package', 'GlobalNotification', function ($scope, translate, Rule, Package, GlobalNotification) {
-
-        function type(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;
-        }
+    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Filter', 'Rule', 'Package', 'GlobalNotification', function ($scope, $location, translate, Nutupane, CurrentOrganization, Filter, Rule, Package, GlobalNotification) {
+        var nutupane, params;
 
         function failure(response) {
             GlobalNotification.setErrorMessage(response.data.displayMessage);
         }
 
-        function addType(rules) {
-            angular.forEach(rules, function (rule) {
-                rule.type = type(rule);
-            });
-        }
-
-        function removeRule(rule) {
-            var success,
-                rulesCopy = angular.copy($scope.filter.rules),
-                ruleId = rule.id;
-
-            success = function () {
-                angular.forEach(rulesCopy, function (ruleCopy, index) {
-                    if (ruleCopy.id === ruleId) {
-                        $scope.filter.rules.splice(index, 1);
-                    }
-                });
-                GlobalNotification.setSuccessMessage(translate('Package successfully removed.'));
-            };
+        function createRule(rule) {
+            var success;
 
-            Rule.delete({filterId: rule['content_view_filter_id'], ruleId: ruleId}, success, failure);
-        }
+            success = function (result) {
+                rule.id = result.id;
+                rule.editMode = false;
+                rule.working = false;
 
-        function addSuccess(rule) {
-            $scope.rule = {
-                type: 'all'
+                GlobalNotification.setSuccessMessage(translate('Package successfully added.'));
             };
-            $scope.rule.editMode = false;
-            $scope.rule.working = false;
-            addType([rule]);
-            $scope.filter.rules.push(rule);
 
-            GlobalNotification.setSuccessMessage(translate('Package successfully added.'));
-        }
-
-        $scope.rule = {
-            type: 'all',
-            editMode: false,
-            working: false
-        };
-
-        $scope.filter.$promise.then(function (filter) {
-            addType(filter.rules);
-            $scope.table = {rows: filter.rules};
-        });
-
-        $scope.addRule = function (rule, filter) {
             if ($scope.valid(rule)) {
-                Rule.save({filterId: filter.id}, rule, addSuccess, failure);
+                Rule.save({filterId: $scope.filter.id}, rule, success, failure);
             }
-        };
+        }
 
-        $scope.updateRule = function (rule, filter) {
-            var params = {filterId: filter.id, ruleId: rule.id},
+        function updateRule(rule) {
+            var updateParams = {filterId: $scope.filter.id, ruleId: rule.id},
                 success, error;
 
             // Need access to the original rule
@@ -103,7 +55,44 @@ angular.module('Bastion.content-views').controller('PackageFilterController',
                 rule.working = false;
             };
 
-            Rule.update(params, rule, success, error);
+            Rule.update(updateParams, rule, success, error);
+        }
+
+        function removeRule(rule) {
+            var success, ruleId = rule.id;
+
+            success = function () {
+                nutupane.removeRow(ruleId);
+                GlobalNotification.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) {
@@ -134,22 +123,16 @@ angular.module('Bastion.content-views').controller('PackageFilterController',
         };
 
         $scope.restorePrevious = function (rule) {
-            angular.copy(rule.previous, rule);
+            if (rule.id) {
+                angular.copy(rule.previous, rule);
+            } else {
+                $scope.table.rows.shift();
+            }
             rule.previous = {};
         };
 
-        $scope.getSelectedRules = function (filter) {
-            var rules = [];
-            angular.forEach(filter.rules, function (rule) {
-                if (rule.selected) {
-                    rules.push(rule);
-                }
-            });
-            return rules;
-        };
-
-        $scope.removeRules = function (filter) {
-            angular.forEach($scope.getSelectedRules(filter), function (rule) {
+        $scope.removeRules = function () {
+            angular.forEach($scope.table.getSelected(), function (rule) {
                 removeRule(rule);
             });
         };
@@ -176,5 +159,8 @@ angular.module('Bastion.content-views').controller('PackageFilterController',
             });
         };
 
+        $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

@@ -55,6 +55,7 @@ angular.module('Bastion.content-views').controller('PackageGroupFilterListContro
             },
             'queryUnpaged'
         );
+        $scope.controllerName = 'katello_package_groups';
 
         $scope.table = nutupane.table;
         nutupane.table.closeItem = function () {};

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

@@ -2,7 +2,7 @@
   <div ng-include="'content-views/details/filters/views/date-type-errata.html'"></div>
 
   <div bst-form-buttons
-       on-cancel="transitionTo('content-view.filters', {contentViewId: contentView.id})"
+       on-cancel="transitionTo('content-view.yum.filters', {contentViewId: contentView.id})"
        on-save="save(rule, filter)"
        working="rule.working">
   </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/docker-filter.html

@@ -0,0 +1,28 @@
+<span page-title ng-model="filter">{{ 'Docker Tag Filter:' | translate }} {{ filter.name }}</span>
+
+<nav>
+  <ul class="nav nav-tabs nav-tabs-pf">
+
+    <li ng-class="{active: isState('content-view.docker.filter.tag.edit')}">
+      <a ui-sref="content-view.docker.filter.tag.edit" translate>
+        Details
+      </a>
+    </li>
+
+    <li ng-class="{active: isState('content-view.docker.filter.tag.details')}">
+      <a ui-sref="content-view.docker.filter.tag.details" translate>
+        Tags
+      </a>
+    </li>
+
+    <li ng-class="{active: isState('content-view.docker.filter.tag.repositories')}"
+        ng-show="!contentView.permissions.editable">
+      <a ui-sref="content-view.docker.filter.tag.repositories({filterId: filter.id})"
+         ng-include="'content-views/details/filters/views/partials/filter-repositories-count.html'">
+      </a>
+    </li>
+
+  </ul>
+</nav>
+
+<div ui-view></div>

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

@@ -0,0 +1,65 @@
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search">
+    <input type="text"
+           class="form-control"
+           placeholder="{{ 'Filter' | translate }}"
+           ng-model="dockerTagFilter"/>
+  </div>
+
+  <div data-block="list-actions">
+    <button type="button" class="btn btn-default"
+            ng-click="addRule()"
+            ng-hide="denied('edit_content_views', contentView)">
+      <span translate>Add Rule</span>
+    </button>
+
+    <button type="button" class="btn btn-default"
+            ng-disabled="table.numSelected === 0"
+            ng-hide="denied('edit_content_views', contentView)"
+            ng-click="removeRules(filter)">
+      <span translate>Remove Tags</span>
+    </button>
+  </div>
+
+  <span data-block="no-rows-message" translate>
+     Create a rule using the add button above.
+  </span>
+
+  <div data-block="table">
+    <table class="table table-bordered table-striped">
+      <thead>
+        <tr bst-table-head row-select>
+          <th translate>{{ filter.inclusion | filterType }} Tag</th>
+          <th></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="rule in table.rows | filter:dockerTagFilter" row-select="rule">
+          <td bst-table-cell>
+            <input class="form-control"
+                   ng-hide="denied('edit_content_views', contentView)"
+                   ng-model="rule.name"
+                   uib-typeahead="name for name in fetchAutocompleteName($viewValue)"
+                   ng-readonly="!rule.editMode"/>
+          </td>
+
+          <td bst-table-cell class="action-cell">
+            <button type="button" class="btn btn-default" ng-click="rule.editMode = true; backupPrevious(rule)" ng-hide="rule.editMode">
+              <span translate>Edit</span>
+            </button>
+
+            <button bst-save-control
+                    on-cancel="restorePrevious(rule); rule.editMode = false"
+                    on-save="saveRule(rule)"
+                    working="rule.working"
+                    invalid="!valid(rule)"
+                    ng-show="rule.editMode">
+            </button>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+