katello 3.2.1.1 → 3.3.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branches-details-repositories.html

@@ -9,7 +9,7 @@
   <div data-block="actions"></div>
 
   <div data-block="filters">
-    <form class="form-horizontal">
+    <form>
       <div class="form-group">
         <div class="col-sm-2">
           <select class="form-control"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/{package-details-repositories.controller.js → package-repositories.controller.js}

@@ -1,6 +1,6 @@
 /**
  * @ngdoc object
- * @name  Bastion.errata.controller:ErrataDetailsRepositoriesController
+ * @name  Bastion.packages.controller:PackageRepositoriesController
  *
  * @requires $scope
  * @requires $q
@@ -11,9 +11,9 @@
  * @requires CurrentOrganization
  *
  * @description
- *   Provides the functionality for the errata details repositories page.
+ *   Provides the functionality for the package repositories page.
  */
-angular.module('Bastion.packages').controller('PackageDetailsRepositoriesController',
+angular.module('Bastion.packages').controller('PackageRepositoriesController',
     ['$scope', '$q', 'Nutupane', 'Repository', 'Environment', 'ContentView', 'CurrentOrganization',
     function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrganization) {
         var repositoriesNutupane, environment, contentView;
@@ -23,25 +23,25 @@ angular.module('Bastion.packages').controller('PackageDetailsRepositoriesControl
         };
 
         repositoriesNutupane = new Nutupane(Repository, params);
-        $scope.detailsTable = repositoriesNutupane.table;
-        $scope.detailsTable.initialLoad = false;
+        $scope.table = repositoriesNutupane.table;
+        $scope.table.initialLoad = false;
         repositoriesNutupane.masterOnly = true;
         repositoriesNutupane.setSearchKey('repositoriesSearch');
 
         environment = Environment.queryUnpaged(function (response) {
             $scope.environments = response.results;
-            $scope.environmentFilter = _.findWhere($scope.environments, {library: true}).id;
+            $scope.environmentFilter = _.find($scope.environments, {library: true}).id;
         });
 
         contentView = ContentView.queryUnpaged(function (response) {
             $scope.contentViews = response.results;
-            $scope.contentViewFilter = _.findWhere($scope.contentViews, {'default': true});
+            $scope.contentViewFilter = _.find($scope.contentViews, {'default': true});
         });
 
-        $scope.detailsTable.working = true;
+        $scope.table.working = true;
         $q.all([contentView.$promise, environment.$promise]).then(function () {
             $scope.filterPackages();
-            $scope.detailsTable.working = false;
+            $scope.table.working = false;
         });
 
         $scope.filterPackages = function () {
@@ -49,7 +49,7 @@ angular.module('Bastion.packages').controller('PackageDetailsRepositoriesControl
             params['content_view_version_id'] = $scope.contentViewFilter;
 
             if ($scope.contentViewFilter) {
-                params['content_view_version_id'] = _.pluck($scope.contentViewFilter.versions, 'id');
+                params['content_view_version_id'] = _.map($scope.contentViewFilter.versions, 'id');
             }
 
             repositoriesNutupane.setParams = (params);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/{package-details.controller.js → package.controller.js}

@@ -1,15 +1,17 @@
 /**
  * @ngdoc object
- * @name  Bastion.errata.controller:ErrataDetailsController
+ * @name  Bastion.packages.controller:PackageController
  *
  * @requires $scope
- * @requires Errata
+ * @requires Package
+ * @requires Host
+ * @requires CurrentOrganization
  * @requires ApiErrorHandler
  *
  * @description
- *   Provides the functionality for the errata details action pane.
+ *   Provides the functionality for the package page.
  */
-angular.module('Bastion.packages').controller('PackageDetailsController',
+angular.module('Bastion.packages').controller('PackageController',
     ['$scope', 'Package', 'Host', 'CurrentOrganization', 'ApiErrorHandler',
     function ($scope, Package, Host, CurrentOrganization, ApiErrorHandler) {
         $scope.panel = {
@@ -24,13 +26,13 @@ angular.module('Bastion.packages').controller('PackageDetailsController',
         $scope.installedPackageCount = undefined;
 
         $scope.fetchHostCount = function() {
-            Host.get({'per_page': 0, 'search': $scope.createSearchString(), 'organization_id': CurrentOrganization}, function (data) {
+            Host.get({'per_page': 0, 'search': $scope.createSearchString('installed_package'), 'organization_id': CurrentOrganization}, function (data) {
                 $scope.installedPackageCount = data.subtotal;
             });
         };
 
-        $scope.createSearchString = function() {
-            return 'installed_package=' + $scope.package.name + '-' + $scope.package.version + '-' + $scope.package.release + '.' +
+        $scope.createSearchString = function(field) {
+            return field + '=' + $scope.package.name + '-' + $scope.package.version + '-' + $scope.package.release + '.' +
                             $scope.package.arch;
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/views/package-files.html

@@ -0,0 +1,11 @@
+<span page-title ng-model="package">{{ 'Package: ' | translate }} {{ package.nvrea }}</span>
+
+<header data-block="sub-header">
+  <h3 translate>Files in package {{ package.nvrea }}</h3>
+</header>
+
+<ul class="list-unstyled">
+  <li ng-repeat="item in package.files | orderBy:'toString()'">
+    {{ item }}
+  </li>
+</ul>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/views/package-info.html

@@ -0,0 +1,81 @@
+<span page-title ng-model="package">{{ 'Package: ' | translate }} {{ package.nvrea }}</span>
+
+<div data-extend-template="layouts/two-column-details.html">
+  <div data-block="left-column">
+    <h4 translate>Package Information</h4>
+
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Installed On</dt>
+      <dd>
+        <i class="fa fa-spinner fa-spin" ng-show="installedPackageCount === undefined"></i>
+        <span ng-show="installedPackageCount !== undefined">
+          <a href="{{ '/content_hosts?search=' + createSearchString('installed_package') }}" translate>
+            {{ installedPackageCount }} Host(s)
+          </a>
+        </span>
+      </dd>
+
+      <dt translate>Applicable To</dt>
+      <dd>
+        <a href="{{ '/content_hosts?search=' + createSearchString('applicable_rpms') }}" translate>
+          {{ package.hosts_available_count }} Host(s)
+        </a>
+      </dd>
+
+      <dt translate>Upgradable For</dt>
+      <dd>
+        <a href="{{ '/content_hosts?search=' + createSearchString('upgradable_rpms') }}" translate>
+          {{ package.hosts_applicable_count }} Host(s)
+        </a>
+      </dd>
+
+      <dt translate>Description</dt>
+      <dd>{{ package.description }}</dd>
+
+      <dt translate>Summary</dt>
+      <dd>{{ package.summary }}</dd>
+
+      <dt translate>Group</dt>
+      <dd>{{ package.group }}</dd>
+
+      <dt translate>License</dt>
+      <dd>{{ package.license }}</dd>
+
+      <dt translate>Url</dt>
+      <dd>{{ package.url }}</dd>
+    </dl>
+
+    <div class="divider"></div>
+
+    <h4 translate>File Information</h4>
+
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Size</dt>
+      <dd translate>{{ package.human_readable_size }} ({{ package.size }} Bytes)</dd>
+
+      <dt translate>Filename</dt>
+      <dd>{{ package.filename}}</dd>
+
+      <dt translate>Checksum</dt>
+      <dd>{{ package.checksum }}</dd>
+
+      <dt translate>Checksum Type</dt>
+      <dd>{{ package.checksumtype }}</dd>
+    </dl>
+  </div>
+
+  <div data-block="right-column">
+    <h4 translate>Build Information</h4>
+
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Source RPM</dt>
+      <dd>{{ package.sourcerpm }}</dd>
+
+      <dt translate>Build Host</dt>
+      <dd>{{ package.buildhost }}</dd>
+
+      <dt translate>Build Time</dt>
+      <dd>{{ package.build_time }}</dd>
+    </dl>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/details/views/{packages-details-repositories.html → package-repositories.html}

@@ -1,15 +1,13 @@
 <span page-title ng-model="package">{{ 'Repositories for Package: ' | translate }} {{ package.nvrea }}</span>
 
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header">
-    <h3 translate>Repositories containing package {{ package.nvrea }}</h3>
-  </div>
+<div data-block="sub-header">
+  <h3 translate>Repositories containing package {{ package.nvrea }}</h3>
+</div>
 
-  <div data-block="actions"></div>
+<div data-extend-template="layouts/partials/table.html">
 
   <div data-block="filters">
-    <form class="form-horizontal">
+    <form>
       <div class="form-group">
         <div class="col-sm-2">
           <select class="form-control"
@@ -39,14 +37,14 @@
     No Repositories contain this Package.
   </span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Repositories.
   </span>
 
   <div data-block="table">
     <table class="table table-striped table-bordered"
-           ng-class="{'table-mask': detailsTable.working}"
-           ng-show="detailsTable.rows.length > 0">
+           ng-class="{'table-mask': table.working}"
+           ng-show="table.rows.length > 0">
       <thead>
         <tr bst-table-head>
           <th bst-table-column="name"><span translate>Name</span></th>
@@ -57,14 +55,14 @@
 
       <tbody>
         <tr bst-table-row
-            ng-repeat="repository in detailsTable.rows">
+            ng-repeat="repository in table.rows">
           <td bst-table-cell>
             <a ng-href="/products/{{ repository.product.id }}/repositories/{{ repository.library_instance_id || repository.id }}">
               {{ repository.name }}
             </a>
           </td>
           <td bst-table-cell>
-            <a ui-sref="products.details.repositories.index({productId: repository.product.id})">
+            <a ui-sref="repositories({productId: repository.product.id})">
               {{ repository.product.name }}
             </a>
           </td>

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

@@ -0,0 +1,44 @@
+<span page-title ng-model="package">{{ 'Package: ' | translate }} {{ package.nvra}}</span>
+
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header">
+    <h2>{{ package.nvra }}</h2>
+  </header>
+
+  <nav data-block="navigation">
+    <ul class="nav nav-tabs">
+      <li ng-class="{active: isState('package.info')}">
+        <a ui-sref="package.info">
+          <span translate>
+            Details
+          </span>
+        </a>
+      </li>
+      <li ng-class="{active: isState('package.files')}">
+        <a ui-sref="package.files">
+          <span translate>
+            Files
+          </span>
+        </a>
+      </li>
+      <li ng-class="{active: isState('package.dependencies')}">
+        <a ui-sref="package.dependencies">
+          <span translate>
+            Dependencies
+          </span>
+        </a>
+      </li>
+      <li ng-class="{active: isState('package.repositories')}">
+        <a ui-sref="package.repositories">
+          <span translate>
+            Repositories
+          </span>
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <div data-block="content">
+    <section ui-view></section>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/package.factory.js

@@ -19,6 +19,12 @@ angular.module('Bastion.packages').factory('Package',
                         data = angular.fromJson(data);
                         return {results: data};
                     }
+                },
+                'autocompleteArch': {method: 'GET', isArray: false, params: {id: 'auto_complete_arch'},
+                    transformResponse: function (data) {
+                        data = angular.fromJson(data);
+                        return {results: data};
+                    }
                 }
             });
     }]

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/packages.controller.js

@@ -25,14 +25,11 @@ angular.module('Bastion.packages').controller('PackagesController',
         };
 
         nutupane = $scope.nutupane = new Nutupane(Package, params);
+        nutupane.masterOnly = true;
         $scope.table = nutupane.table;
         $scope.removeRow = nutupane.removeRow;
         $scope.controllerName = 'katello_erratum_packages';
 
-        $scope.table.closeItem = function () {
-            $scope.transitionTo('packages.index');
-        };
-
         $scope.repository = {name: translate('All Repositories'), id: 'all'};
 
         Repository.queryUnpaged({'organization_id': CurrentOrganization, 'content_type': 'yum'}, function (response) {
@@ -46,6 +43,23 @@ angular.module('Bastion.packages').controller('PackagesController',
             }
         });
 
+        Package.queryPaged({'organization_id': CurrentOrganization}, function (result) {
+            $scope.packageCount = result.total;
+        });
+
+        $scope.showApplicable = false;
+        $scope.showUpgradable = false;
+
+        $scope.toggleFilters = function () {
+            if ($scope.showUpgradable === true) {
+                $scope.showApplicable = true;
+            }
+
+            nutupane.table.params['packages_restrict_applicable'] = $scope.showApplicable;
+            nutupane.table.params['packages_restrict_upgradable'] = $scope.showUpgradable;
+            nutupane.refresh();
+        };
+
         $scope.$watch('repository', function (repository) {
             var nutupaneParams = nutupane.getParams();
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/packages.routes.js

@@ -9,58 +9,60 @@
  */
 angular.module('Bastion.packages').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('packages', {
-        url: '/packages',
-        abstract: true,
-        controller: 'PackagesController',
-        templateUrl: 'packages/views/packages.html'
-    })
-    .state('packages.index', {
-        url: '?repositoryId',
+        url: '/packages?repositoryId',
         permission: ['view_products', 'view_content_views'],
         views: {
-            'table': {
-                templateUrl: 'packages/views/packages-table-full.html'
+            '@': {
+                controller: 'PackagesController',
+                templateUrl: 'packages/views/packages.html'
             }
+        },
+        ncyBreadcrumb: {
+            label: "{{ 'Packages' | translate }}"
         }
     })
-    .state('packages.details', {
+    .state('package', {
         abstract: true,
-        url: '/:packageId',
+        url: '/packages/:packageId',
         permission: ['view_products', 'view_content_views'],
-        collapsed: true,
-        views: {
-            'table': {
-                templateUrl: 'packages/views/packages-table-collapsed.html'
-            },
-            'action-panel': {
-                controller: 'PackageDetailsController',
-                templateUrl: 'packages/details/views/packages-details.html'
-            }
-        }
+        controller: 'PackageController',
+        templateUrl: 'packages/details/views/package.html'
     })
-    .state('packages.details.info', {
-        url: '/info',
-        collapsed: true,
+    .state('package.info', {
+        url: '',
         permission: ['view_products', 'view_content_views'],
-        templateUrl: 'packages/details/views/packages-details-info.html'
+        templateUrl: 'packages/details/views/package-info.html',
+        ncyBreadcrumb: {
+            label: "{{ package.nvra }}",
+            parent: 'packages'
+        }
     })
-    .state('packages.details.dependencies', {
+    .state('package.dependencies', {
         url: '/dependencies',
-        collapsed: true,
         permission: ['view_products', 'view_content_views'],
-        templateUrl: 'packages/details/views/packages-details-dependencies.html'
+        templateUrl: 'packages/details/views/package-dependencies.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Dependencies' | translate }}",
+            parent: 'package.info'
+        }
     })
-    .state('packages.details.files', {
+    .state('package.files', {
         url: '/files',
-        collapsed: true,
         permission: ['view_products', 'view_content_views'],
-        templateUrl: 'packages/details/views/packages-details-files.html'
+        templateUrl: 'packages/details/views/package-files.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Files' | translate }}",
+            parent: 'package.info'
+        }
     })
-    .state('packages.details.repositories', {
+    .state('package.repositories', {
         url: '/repositories',
-        collapsed: true,
         permission: ['view_products', 'view_content_views'],
-        controller: 'PackageDetailsRepositoriesController',
-        templateUrl: 'packages/details/views/packages-details-repositories.html'
+        controller: 'PackageRepositoriesController',
+        templateUrl: 'packages/details/views/package-repositories.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Repositories' | translate }}",
+            parent: 'package.info'
+        }
     });
 }]);