katello 3.2.1.1 → 3.3.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/views/packages.html

@@ -1,24 +1,69 @@
 <span page-title>{{ 'Packages' | translate }}</span>
 
-<div data-extend-template="layouts/nutupane.html">
+<div data-extend-template="layouts/table-with-header.html">
 
-  <div data-block="header">
-    {{ 'Packages' | translate }}
-  </div>
+  <header data-block="header">
+    <h2 translate>Packages</h2>
+  </header>
 
   <div data-block="search-filter">
     <div class="col-sm-3">
       <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
     </div>
+
+    <div class="col-sm-3">
+      <label class="checkbox-inline" title="{{ 'Only show Packages that are Applicable to one or more Content Hosts' | translate }}">
+        <input type="checkbox" ng-model="showApplicable" ng-disabled="showUpgradable" ng-change="toggleFilters()"/>
+        <span translate>Applicable</span>
+        <i class="fa fa-question-circle" ng-show="showUpgradable" title="{{ 'Packages are automatically Applicable if they are Upgradable' | translate }}"></i>
+      </label>
+
+      <label class="checkbox-inline" title="{{ 'Only show Packages that are Upgradable on one or more Content Hosts' | translate }}">
+        <input type="checkbox" ng-model="showUpgradable" ng-change="toggleFilters()"/>
+        <span translate>Upgradable</span>
+      </label>
+    </div>
   </div>
 
-  <span data-block="no-rows-message" translate>
-    There are no Packages in this organization.  Create one or more Products with Packages to view Packages on this page.
+  <span data-block="no-rows-message">
+    <span ng-hide="packageCount > 0" translate>
+      There are no Packages in this organization.  Create one or more Products with Packages to view Packages on this page.
+    </span>
+    <span ng-show="packageCount > 0" translate>
+      There are {{ packageCount }} total Packages in this organization but none match the above filters.
+    </span>
   </span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Packages.
   </span>
 
+  <div data-block="table">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
+      <thead>
+      <tr bst-table-head>
+        <th bst-table-column="name" sortable>{{ "RPM" | translate }}</th>
+        <th bst-table-column="version">{{ "Summary" | translate }}</th>
+        <th bst-table-column="numberOfContentHosts">{{ "Content Host Counts" | translate }}</th>
+      </tr>
+      </thead>
 
-</div>
+      <tbody>
+      <tr bst-table-row ng-repeat="package in table.rows">
+        <td bst-table-cell>
+          <a ui-sref="package.info({packageId: package.uuid})">
+            {{ package.nvra}}
+          </a>
+        </td>
+        <td bst-table-cell>
+          {{ package.summary }}
+        </td>
+        <td bst-table-cell>
+          <span translate>{{ package.hosts_applicable_count || 0 }} Applicable, </span>
+          <span translate>{{ package.hosts_available_count || 0 }} Upgradable</span>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/partials/sync-status.html

@@ -1,23 +1,21 @@
-<div class="detail">
-  <span class="info-label" translate>Sync Interval</span>
-  <span class="info-value" ng-if="product.sync_plan.interval == 'hourly'">
-    <span translate>
-      Hourly at {{ product.sync_plan.sync_date | date:'m' }} minutes and {{ product.sync_plan.sync_date | date:'s' }} seconds
-    </span>
+<dt translate>Sync Interval</dt>
+<dd ng-if="product.sync_plan.interval == 'hourly'">
+  <span translate>
+    Hourly at {{ product.sync_plan.sync_date | date:'m' }} minutes and {{ product.sync_plan.sync_date | date:'s' }} seconds
   </span>
-  <span class="info-value" ng-if="product.sync_plan.interval == 'daily'">
-    <span translate>
-      Daily at {{ product.sync_plan.sync_date | date:'mediumTime' }} (Server Time)
-    </span>
+</dd>
+<dd ng-if="product.sync_plan.interval == 'daily'">
+  <span translate>
+    Daily at {{ product.sync_plan.sync_date | date:'mediumTime' }} (Server Time)
   </span>
-  <span class="info-value" ng-if="product.sync_plan.interval == 'weekly'">
-    <span translate>
-      Weekly on {{ product.sync_plan.sync_date | date:'EEEE' }} at {{ product.sync_plan.sync_date | date:'mediumTime' }} (Server Time)
-    </span>
+</dd>
+<dd ng-if="product.sync_plan.interval == 'weekly'">
+  <span translate>
+    Weekly on {{ product.sync_plan.sync_date | date:'EEEE' }} at {{ product.sync_plan.sync_date | date:'mediumTime' }} (Server Time)
   </span>
-  <span class="info-value" ng-hide="product.sync_plan.next_sync">
-    <span translate>
-      Synced manually, no interval set.
-    </span>
+</dd>
+<dd ng-hide="product.sync_plan.next_sync">
+  <span translate>
+    Synced manually, no interval set.
   </span>
-</div>
+</dd>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details-info.controller.js

@@ -21,10 +21,10 @@ angular.module('Bastion.products').controller('ProductDetailsInfoController',
         $scope.errorMessages = [];
 
         $scope.menuExpander = MenuExpander;
-        $scope.panel = $scope.panel || {loading: false};
+        $scope.page = $scope.page || {loading: false};
 
         $scope.product = $scope.product || Product.get({id: $scope.$stateParams.productId}, function () {
-            $scope.panel.loading = false;
+            $scope.page.loading = false;
         });
 
         $scope.gpgKeys = function () {
@@ -61,18 +61,9 @@ angular.module('Bastion.products').controller('ProductDetailsInfoController',
         };
 
         $scope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState) {
-            if (fromState.name === 'products.details.info.new-sync-plan') {
+            if (fromState.name === 'product.info.new-sync-plan') {
                 $scope.product.$update();
             }
         });
-
-        $scope.syncProduct = function () {
-            Product.sync({id: $scope.product.id}, function (task) {
-                $state.go('products.details.tasks.details', {taskId: task.id});
-            },
-            function (response) {
-                $scope.errorMessages = response.data.errors;
-            });
-        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/product-details.controller.js

@@ -14,29 +14,35 @@ angular.module('Bastion.products').controller('ProductDetailsController',
     ['$scope', '$state', 'Product', 'ApiErrorHandler', function ($scope, $state, Product, ApiErrorHandler) {
         $scope.successMessages = [];
         $scope.errorMessages = [];
-        $scope.panel = {
+        $scope.page = {
             error: false,
             loading: true
         };
 
         if ($scope.product) {
-            $scope.panel.loading = false;
+            $scope.page.loading = false;
         }
 
         $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
-            $scope.panel.loading = false;
+            $scope.page.loading = false;
         }, function (response) {
-            $scope.panel.loading = false;
+            $scope.page.loading = false;
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
         });
 
         $scope.removeProduct = function (product) {
-            var id = product.id;
-
             product.$delete(function (data) {
-                $scope.removeRow(id);
                 $scope.$emit('productDelete', data.id);
-                $scope.transitionTo('products.index');
+                $scope.transitionTo('products');
+            });
+        };
+
+        $scope.syncProduct = function () {
+            Product.sync({id: $scope.product.id}, function (task) {
+                $state.go('product.tasks.details', {taskId: task.id});
+            },
+            function (response) {
+                $scope.errorMessages = response.data.errors;
             });
         };
 

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

@@ -3,25 +3,28 @@
  * @name  Bastion.products.controller:ProductRepositoriesController
  *
  * @requires $scope
+ * @requires $location
+ * @requires ApiErrorHandler
+ * @requires Product
  * @requires Repository
  * @requires RepositoryBulkAction
  * @requires CurrentOrganization
  * @requires Nutupane
- * @requires DownloadPolicy
  *
  *
  * @description
  *   Provides the functionality for manipulating repositories attached to a product.
  */
 angular.module('Bastion.products').controller('ProductRepositoriesController',
-    ['$scope', '$state', 'Repository', 'RepositoryBulkAction', 'CurrentOrganization', 'Nutupane', 'DownloadPolicy', 'translate',
-    function ($scope, $state, Repository, RepositoryBulkAction, CurrentOrganization, Nutupane, DownloadPolicy, translate) {
+    ['$scope', '$state', '$location', 'ApiErrorHandler', 'Product', 'Repository', 'RepositoryBulkAction', 'CurrentOrganization', 'Nutupane', 'translate',
+    function ($scope, $state, $location, ApiErrorHandler, Product, Repository, RepositoryBulkAction, CurrentOrganization, Nutupane, translate) {
         var repositoriesNutupane = new Nutupane(Repository, {
             'product_id': $scope.$stateParams.productId,
+            'search': $location.search().search || "",
             'library': true,
             'organization_id': CurrentOrganization,
             'enabled': true,
-            'full_result': true
+            'paged': true
         });
         repositoriesNutupane.masterOnly = true;
 
@@ -31,36 +34,32 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
             };
         }
 
+        $scope.successMessages = [];
+        $scope.errorMessages = [];
+        $scope.page = $scope.page || {loading: false};
+
+        $scope.product = Product.get({id: $scope.$stateParams.productId}, function () {
+            $scope.page.loading = false;
+        }, function (response) {
+            $scope.page.loading = false;
+            ApiErrorHandler.handleGETRequestErrors(response, $scope);
+        });
+
         $scope.close = function(index) {
             $scope.removingTasks.splice(index, 1);
         };
 
-        function success(response) {
-            angular.forEach(response.task.input.target_ids, function (row) {
-                $scope.detailsTable.removeRow(row);
-            });
-            $scope.removingTasks.push(response.task.id);
-        }
-
-        function error(response) {
-            $scope.errorMessages = response.data.errors;
-        }
 
         $scope.removingTasks = [];
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
 
-        $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
         $scope.checksums = [{name: translate('Default'), id: null}, {id: 'sha256', name: 'sha256'}, {id: 'sha1', name: 'sha1'}];
-        $scope.detailsTable = repositoriesNutupane.table;
-        $scope.detailsTable.removeRow = repositoriesNutupane.removeRow;
-        repositoriesNutupane.query();
+        $scope.table = repositoriesNutupane.table;
 
         $scope.syncSelectedRepositories = function () {
             var params = getParams();
 
             RepositoryBulkAction.syncRepositories(params, function (task) {
-                $state.go('products.details.tasks.details', {taskId: task.id});
+                $state.go('product.tasks.details', {taskId: task.id});
             },
             function (response) {
                 $scope.errorMessages = response.data.errors;
@@ -68,7 +67,15 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
         };
 
         $scope.removeSelectedRepositories = function () {
-            var params = getParams(), removalPromise;
+            var success, error, params = getParams(), removalPromise;
+
+            success = function (response) {
+                $scope.removingTasks.push(response.task.id);
+            };
+
+            error = function (response) {
+                $scope.errorMessages = response.data.errors;
+            };
 
             $scope.removingRepositories = true;
             removalPromise = RepositoryBulkAction.removeRepositories(params, success, error).$promise;
@@ -79,9 +86,8 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
         };
 
         $scope.removeRepository = function (repository) {
-            repositoriesNutupane.removeRow(repository.id);
             repository.$delete(function () {
-                $scope.transitionTo('products.details.repositories.index', {productId: $scope.$stateParams.productId});
+                $scope.transitionTo('product.repositories', {productId: $scope.$stateParams.productId});
             });
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/{repositories → products/details/repositories}/details/repository-details-info.controller.js

@@ -3,49 +3,26 @@
  * @name  Bastion.repositories.controller:RepositoryDetailsInfoController
  *
  * @requires $scope
- * @requires $state
  * @requires $q
  * @requires translate
- * @requires Repository
  * @requires GPGKey
  * @requires CurrentOrganization
  * @requires DownloadPolicy
- * @requires ApiErrorHandler
  *
  * @description
- *   Provides the functionality for the repository details pane.
+ *   Provides the functionality for the repository details info page.
  */
 angular.module('Bastion.repositories').controller('RepositoryDetailsInfoController',
-    ['$scope', '$state', '$q', 'translate', 'Repository', 'GPGKey', 'CurrentOrganization', 'DownloadPolicy', 'ApiErrorHandler',
-    function ($scope, $state, $q, translate, Repository, GPGKey, CurrentOrganization, DownloadPolicy, ApiErrorHandler) {
-        var updateRepositoriesTable;
-
+    ['$scope', '$q', 'translate', 'GPGKey', 'CurrentOrganization', 'DownloadPolicy',
+    function ($scope, $q, translate, GPGKey, CurrentOrganization, DownloadPolicy) {
         $scope.successMessages = [];
         $scope.errorMessages = [];
         $scope.uploadSuccessMessages = [];
         $scope.uploadErrorMessages = [];
         $scope.organization = CurrentOrganization;
-        $scope.panel = {
-            error: false,
-            loading: true
-        };
-
-        if ($scope.repository) {
-            $scope.panel.loading = false;
-        }
 
         $scope.progress = {uploading: false};
 
-        $scope.repository = Repository.get({
-            'product_id': $scope.$stateParams.productId,
-            'id': $scope.$stateParams.repositoryId
-        }, function () {
-            $scope.panel.loading = false;
-        }, function (response) {
-            $scope.panel.loading = false;
-            ApiErrorHandler.handleGETRequestErrors(response, $scope);
-        });
-
         $scope.repository.$promise.then(function () {
             $scope.uploadURL = '/katello/api/v2/repositories/' + $scope.repository.id + '/upload_content';
         });
@@ -69,7 +46,6 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
             repository.$update(function (response) {
                 deferred.resolve(response);
                 $scope.successMessages = [translate('Repository Saved.')];
-                updateRepositoriesTable();
             }, function (response) {
                 deferred.reject(response);
                 _.each(response.data.errors, function (errorMessage) {
@@ -98,7 +74,6 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
                     uploaded = returnData.filenames.join(', ');
                     $scope.uploadSuccessMessages = [translate('Successfully uploaded content: ') + uploaded];
                     $scope.repository.$get();
-                    updateRepositoriesTable();
                 } else {
                     error = returnData.displayMessage;
                     $scope.uploadErrorMessages = [translate('Error during upload: ') + error];
@@ -118,70 +93,17 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
             $scope.progress.uploading = false;
         };
 
-        $scope.syncInProgress = function (task) {
-            var inProgress = false;
-            if (task && (task.state === 'pending' || task.state === 'running')) {
-                inProgress = true;
-            }
-            return inProgress;
-        };
-
-        $scope.syncRepository = function (repository) {
-            Repository.sync({id: repository.id}, function (task) {
-                $state.go('products.details.tasks.details', {taskId: task.id});
-            });
-            updateRepositoriesTable();
-        };
-
-        $scope.getRepoNonDeletableReason = function (repo, product) {
-            var readOnlyReason = null;
-
-            if (repo.$resolved && product.$resolved) {
-                if ($scope.denied('destroy_products', product)) {
-                    readOnlyReason = 'permissions';
-                } else if (repo.promoted) {
-                    readOnlyReason = 'published';
-                } else if (repo['product_type'] === "redhat") {
-                    readOnlyReason = 'redhat';
-                }
-            }
-
-            return readOnlyReason;
-        };
-
-        $scope.canRemove = function (repo, product) {
-            return $scope.getRepoNonDeletableReason(repo, product) === null;
-        };
-
-        $scope.removeRepository = function (repository) {
-            var success, error, repositoryName = repository.name;
-
-            success = function () {
-                $scope.transitionTo('products.details.repositories.index', {productId: $scope.$stateParams.productId});
-                $scope.$parent.successMessages = [translate('Repository "%s" successfully deleted').replace('%s', repositoryName)];
-            };
-
-            error = function error(response) {
-                $scope.errorMessages = response.data.errors;
-            };
-
-            $scope.detailsTable.removeRow(repository.id);
-            repository.$delete(success, error);
-        };
-
         $scope.checksumTypeDisplay = function (checksum) {
             if (checksum === null) {
                 checksum = translate('Default');
             }
             return checksum;
         };
+        $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
 
         $scope.downloadPolicyDisplay = function (downloadPolicy) {
             return DownloadPolicy.downloadPolicyName(downloadPolicy);
         };
 
-        updateRepositoriesTable = function () {
-            $scope.detailsTable.replaceRow($scope.repository);
-        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/{repositories → products/details/repositories}/details/repository-details-manage-content.controller.js

@@ -25,7 +25,7 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
             var message;
 
             $scope.contentNutupane.refresh();
-            $scope.detailsTable.working = true;
+            $scope.table.working = true;
 
             if (selected.length === 1) {
                 message = translate("Successfully removed 1 item.");
@@ -37,11 +37,13 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
         }
 
         function error(data) {
-            $scope.detailsTable.working = true;
+            $scope.table.working = true;
             $scope.errorMessages = [data.response.displayMessage];
         }
 
-        $scope.repository = Repository.get({id: $scope.$stateParams.repositoryId});
+        $scope.repository = Repository.get({id: $scope.$stateParams.repositoryId}, function (repository) {
+            $scope.product = repository.product;
+        });
 
         currentState = $state.current.name.split('.').pop();
 
@@ -56,20 +58,20 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
         $scope.contentNutupane = new Nutupane(contentTypes[currentState].type, {
             'repository_id': $scope.$stateParams.repositoryId
         });
-        $scope.detailsTable = $scope.contentNutupane.table;
-        $scope.detailsTable.closeItem = function () {};
+        $scope.table = $scope.contentNutupane.table;
+        $scope.table.closeItem = function () {};
 
         $scope.removeContent = function () {
-            var selected = $scope.detailsTable.getSelected();
-            $scope.detailsTable.working = true;
-            Repository.removeContent({id: $scope.repository.id, ids: _.pluck(selected, 'id')},
+            var selected = $scope.table.getSelected();
+            $scope.table.working = true;
+            Repository.removeContent({id: $scope.repository.id, ids: _.map(selected, 'id')},
                 function (response) {
                     success(response, selected);
                 }, error);
         };
 
         $scope.taskUrl = function () {
-            return $scope.$state.href('products.details.tasks.details', {productId: $scope.product.id,
+            return $scope.$state.href('product.tasks.details', {productId: $scope.product.id,
                 taskId: $scope.generationTaskId});
         };
 
@@ -77,5 +79,11 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
             $scope.generationTaskId = undefined;
         };
 
+        $scope.tagsForManifest = function(manifest) {
+            return _.filter(manifest.tags, function(tag) {
+                return tag.repository_id + '' === $scope.$stateParams.repositoryId;
+            });
+        };
+
     }]
 );