katello 3.1.0.1 → 3.2.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/ostree-branches-details.controller.js

@@ -0,0 +1,31 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.ostree-branches.controller:OstreeBranchesDetailsController
+ *
+ * @requires $scope
+ * @requires OstreeBranch
+ * @requires ApiErrorHandler
+ *
+ * @description
+ *   Provides the functionality for the Ostree Branch action pane.
+ */
+angular.module('Bastion.ostree-branches').controller('OstreeBranchesDetailsController', ['$scope', 'OstreeBranch', 'ApiErrorHandler',
+    function ($scope, OstreeBranch, ApiErrorHandler) {
+        $scope.panel = {
+            error: false,
+            loading: true
+        };
+
+        if ($scope.branch) {
+            $scope.panel.loading = false;
+        }
+
+        $scope.branch = OstreeBranch.get({id: $scope.$stateParams.branchId}, function (branch) {
+            $scope.$broadcast('branch.loaded', branch);
+            $scope.panel.loading = false;
+        }, function (response) {
+            $scope.panel.loading = false;
+            ApiErrorHandler.handleGETRequestErrors(response, $scope);
+        });
+    }
+]);

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

@@ -0,0 +1,23 @@
+<span page-title ng-model="branch">{{ 'OSTree Branch: ' | translate }} {{ branch.name }}</span>
+
+<section>
+
+  <div class="details">
+    <h4 translate>Branch Info</h4>
+
+    <div class="detail">
+      <span class="info-label" translate>Version</span>
+      <span class="info-value">{{ branch.version }}</span>
+    </div>
+
+    <div class="detail">
+      <span class="info-label" translate>Commit</span>
+      <span class="info-value">{{ branch.commit }}</span>
+    </div>
+
+    <div class="detail">
+      <span class="info-label" translate>Date</span>
+      <span class="info-value">{{ branch.version_date }}</span>
+    </div>
+  </div>
+</section>

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

@@ -0,0 +1,83 @@
+<span page-title ng-model="branch">{{ 'OSTree Branch: ' | translate }} {{ branch.name }}</span>
+
+<div data-extend-template="layouts/details-nutupane.html">
+
+  <div data-block="header">
+    <h3 translate>Repositories containing branch {{ branch.name }}</h3>
+  </div>
+
+  <div data-block="actions"></div>
+
+  <div data-block="filters">
+    <form class="form-horizontal">
+      <div class="form-group">
+        <div class="col-sm-2">
+          <select class="form-control"
+                  ng-disabled="!environments"
+                  ng-model="environmentFilter"
+                  ng-options="e.id as e.name for e in environments"
+                  ng-change="filterBranches()">
+          </select>
+        </div>
+
+        <div class="col-sm-2">
+          <select class="form-control"
+                  ng-disabled="!contentViews || filteredCVs.length === 0"
+                  ng-model="contentViewFilter"
+                  ng-options="cv as cv.name for cv in filteredCVs = (contentViews | filter:{environments: environmentFilter})"
+                  ng-change="filterBranches()">
+          </select>
+          <p class="help-block" translate ng-show="filteredCVs.length === 0">
+            There are no Content Views in this Environment.
+          </p>
+        </div>
+      </div>
+    </form>
+  </div>
+
+  <span data-block="no-rows-message" translate>
+    No Repositories contain this Branch.
+  </span>
+
+  <div data-block="table">
+    <table class="table table-striped table-bordered"
+           ng-class="{'table-mask': detailsTable.working}"
+           ng-show="detailsTable.rows.length > 0">
+      <thead>
+        <tr bst-table-head>
+          <th bst-table-column="name"><span translate>Name</span></th>
+          <th bst-table-column="product"><span translate>Product</span></th>
+          <th bst-table-column="lastSync"><span translate>Last Sync</span></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row
+            ng-repeat="repository in detailsTable.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})">
+              {{ repository.product.name }}
+            </a>
+          </td>
+          <td bst-table-cell>
+              <span ng-show="repository.url">
+              <span ng-show="repository.last_sync == null" translate>
+                Not Synced
+              </span>
+              <span ng-hide="repository.last_sync == null">
+                <a href="/foreman_tasks/tasks/{{repository.last_sync.id}}">{{ repository.last_sync.result | capitalize}}</a>
+                <span translate>{{ repository.last_sync_words }} ago</span>
+              </span>
+            </span>
+            <span ng-hide="repository.url" translate>N/A</span>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

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

@@ -0,0 +1,43 @@
+<span page-title ng-model="branch">{{ 'OSTree Branch: ' | translate }} {{ branch.name }}</span>
+
+<div class="loading-mask loading-mask-panel" ng-show="panel.loading">
+  <i class="fa fa-spinner fa-spin"></i>
+  {{ "Loading..." | translate }}
+</div>
+
+<section class="nutupane-details" ng-cloak bst-container-scroll>
+
+  <header class="details-header">
+    <h2 class="fl">{{ branch.name }}</h2>
+
+    <div class="details-actions fr">
+      <button class="btn btn-default" ui-sref="ostree-branches.index">
+        <i class="fa fa-remove"></i>
+        {{ "Close" | translate }}
+      </button>
+    </div>
+  </header>
+
+  <nav class="details-navigation">
+    <ul>
+      <li ng-class="{active: isState('ostree-branches.details.info')}">
+        <a ui-sref="ostree-branches.details.info">
+          <span translate>
+            Details
+          </span>
+        </a>
+      </li>
+      <li ng-class="{active: isState('ostree-branches.details.repositories')}">
+        <a ui-sref="ostree-branches.details.repositories">
+          <span translate>
+            Repositories
+          </span>
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+
+  <section ui-view></section>
+</section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branches.controller.js

@@ -0,0 +1,67 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.ostree-branches.controller:OstreeBranchesController
+ *
+ * @requires $scope
+ * @requires $location
+ * @requires translate
+ * @requires Nutupane
+ * @requires OstreeBranch
+ * @requires Repository
+ * @requires CurrentOrganization
+ *
+ * @description
+ *   Provides the functionality specific to ostree branches for use with the Nutupane UI pattern.
+ *   Defines the columns to display and the transform function for how to generate each row
+ *   within the table.
+ */
+
+angular.module('Bastion.ostree-branches').controller('OstreeBranchesController',
+    ['$scope', '$location', 'translate', 'Nutupane', 'OstreeBranch', 'Repository', 'CurrentOrganization',
+    function ($scope, $location, translate, Nutupane, OstreeBranch, Repository, CurrentOrganization) {
+        var nutupane, params = {
+            'organization_id': CurrentOrganization,
+            'search': $location.search().search || "",
+            'paged': true
+        };
+
+        nutupane = $scope.nutupane = new Nutupane(OstreeBranch, params);
+        $scope.table = nutupane.table;
+        $scope.removeRow = nutupane.removeRow;
+        $scope.controllerName = 'katello_ostree_branches';
+
+        $scope.table.closeItem = function () {
+            $scope.transitionTo('ostree-branches.index');
+        };
+
+        $scope.repository = {name: translate('All Repositories'), id: 'all'};
+
+        Repository.queryUnpaged({'organization_id': CurrentOrganization, 'content_type': 'ostree'}, function (response) {
+            $scope.repositories = [$scope.repository];
+            $scope.repositories = $scope.repositories.concat(response.results);
+
+            if ($location.search().repositoryId) {
+                $scope.repository = _.find($scope.repositories, function (repository) {
+                    return repository.id === parseInt($location.search().repositoryId, 10);
+                });
+            }
+        });
+
+        $scope.$watch('repository', function (repository) {
+            var nutupaneParams = nutupane.getParams();
+
+            if (repository.id === 'all') {
+                nutupaneParams['repository_id'] = null;
+                nutupane.setParams(nutupaneParams);
+            } else {
+                $location.search('repositoryId', repository.id);
+                nutupaneParams['repository_id'] = repository.id;
+                nutupane.setParams(nutupaneParams);
+            }
+
+            if (!nutupane.table.initialLoad) {
+                nutupane.refresh();
+            }
+        });
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branches.module.js

@@ -6,6 +6,10 @@
  *   Module for Ostree Branch related functionality.
  */
 angular.module('Bastion.ostree-branches', [
+    'ngResource',
+    'ui.router',
     'Bastion',
-    'Bastion.common'
+    'Bastion.i18n',
+    'Bastion.common',
+    'Bastion.components'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branches.routes.js

@@ -0,0 +1,53 @@
+/**
+ * @ngdoc object
+ * @name Bastion.ostree-branches.config
+ *
+ * @requires $stateProvider
+ *
+ * @description
+ *   State routes defined for the ostree branches module.
+ */
+angular.module('Bastion.ostree-branches').config(['$stateProvider', function ($stateProvider) {
+    $stateProvider.state('ostree-branches', {
+        abstract: true,
+        controller: 'OstreeBranchesController',
+        templateUrl: 'ostree-branches/views/ostree-branches.html'
+    })
+    .state('ostree-branches.index', {
+        url: '/ostree_branches?repositoryId',
+        permission: ['view_products', 'view_content_views'],
+        views: {
+            'table': {
+                templateUrl: 'ostree-branches/views/ostree-branches-table-full.html'
+            }
+        }
+    })
+    .state('ostree-branches.details', {
+        abstract: true,
+        url: '/ostree_branches/:branchId',
+        permission: ['view_products', 'view_content_views'],
+        collapsed: true,
+        views: {
+            'table': {
+                templateUrl: 'ostree-branches/views/ostree-branches-table-collapsed.html'
+            },
+            'action-panel': {
+                controller: 'OstreeBranchesDetailsController',
+                templateUrl: 'ostree-branches/details/views/ostree-branches-details.html'
+            }
+        }
+    })
+    .state('ostree-branches.details.info', {
+        url: '/ostree_branches/info',
+        collapsed: true,
+        permission: ['view_products', 'view_content_views'],
+        templateUrl: 'ostree-branches/details/views/ostree-branches-details-info.html'
+    })
+    .state('ostree-branches.details.repositories', {
+        url: '/ostree_branches/repositories',
+        collapsed: true,
+        permission: ['view_products', 'view_content_views'],
+        controller: 'OstreeBranchesDetailsRepositoriesController',
+        templateUrl: 'ostree-branches/details/views/ostree-branches-details-repositories.html'
+    });
+}]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/views/ostree-branches-table-collapsed.html

@@ -0,0 +1,19 @@
+<table class="table table-striped table-full" ng-class="{'table-mask': table.working}">
+  <thead>
+    <tr bst-table-head>
+      <th bst-table-column="name" sortable>{{ "Name" | translate }}</th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <tr bst-table-row
+        ng-repeat="branch in table.rows"
+        active-row="stateIncludes('ostree-branches.details', {branchId: branch.id})">
+      <td bst-table-cell clas="ellipsis-column">
+        <a ui-sref="ostree-branches.details.info({branchId: branch.id})">
+          {{ branch.name }}
+        </a>
+      </td>
+    </tr>
+  </tbody>
+</table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/views/ostree-branches-table-full.html

@@ -0,0 +1,21 @@
+<table class="table table-striped" ng-class="{'table-mask': table.working}">
+  <thead>
+    <tr bst-table-head>
+      <th bst-table-column="name">{{ "Name" | translate }}</th>
+      <th bst-table-column="version">{{ "Version" | translate }}</th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <tr bst-table-row ng-repeat="branch in table.rows">
+      <td bst-table-cell>
+        <a ui-sref="ostree-branches.details.info({branchId: branch.id})">
+          {{ branch.name }}
+        </a>
+      </td>
+      <td bst-table-cell>
+        {{ branch.version }}
+      </td>
+    </tr>
+  </tbody>
+</table>

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

@@ -0,0 +1,19 @@
+<span page-title>{{ 'OSTree Branches' | translate }}</span>
+
+<div data-extend-template="layouts/nutupane.html">
+
+  <div data-block="header">
+    {{ 'OSTree Branches' | translate }}
+  </div>
+
+  <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>
+
+  <span data-block="no-rows-message" translate>
+    You currently don't have any OSTree Branches.
+  </span>
+
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/package-groups/package-groups.module.js

@@ -9,6 +9,12 @@
      *   Module for Package Group related functionality.
      */
     angular
-        .module('Bastion.package-groups', ['Bastion']);
+        .module('Bastion.package-groups', [
+            'ui.router',
+            'ngResource',
+            'Bastion',
+            'Bastion.i18n',
+            'Bastion.components'
+        ]);
 
 })();

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

@@ -9,8 +9,9 @@
  * @description
  *   Provides the functionality for the errata details action pane.
  */
-angular.module('Bastion.packages').controller('PackageDetailsController', ['$scope', 'Package', 'ApiErrorHandler',
-    function ($scope, Package, ApiErrorHandler) {
+angular.module('Bastion.packages').controller('PackageDetailsController',
+    ['$scope', 'Package', 'Host', 'CurrentOrganization', 'ApiErrorHandler',
+    function ($scope, Package, Host, CurrentOrganization, ApiErrorHandler) {
         $scope.panel = {
             error: false,
             loading: true
@@ -20,8 +21,22 @@ angular.module('Bastion.packages').controller('PackageDetailsController', ['$sco
             $scope.panel.loading = false;
         }
 
+        $scope.installedPackageCount = undefined;
+
+        $scope.fetchHostCount = function() {
+            Host.get({'per_page': 0, 'search': $scope.createSearchString(), '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.package.arch;
+        };
+
         $scope.package = Package.get({id: $scope.$stateParams.packageId}, function () {
             $scope.panel.loading = false;
+            $scope.fetchHostCount();
         }, function(response) {
             $scope.panel.loading = false;
             ApiErrorHandler.handleGETRequestErrors(response, $scope);

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

@@ -5,6 +5,16 @@
   <div class="details">
     <h4 translate>Package Info</h4>
 
+    <div class="detail">
+      <span class="info-label" translate>Installed On</span>
+      <span class="info-value" ng-show="installedPackageCount === undefined"><i class="fa fa-spinner fa-spin" ></i></span>
+      <span class="info-value" ng-show="installedPackageCount !== undefined">
+        <a href="{{ '/content_hosts?search=' + createSearchString() }}">
+          {{ installedPackageCount }} Host(s)
+        </a>
+      </span>
+    </div>
+
     <div class="detail">
       <span class="info-label" translate>Description</span>
       <span class="info-value">{{ package.description }}</span>