katello 3.6.0.1.rc2 → 3.7.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/activation-key-subscriptions.controller.js

@@ -31,6 +31,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeySubscriptions
         $scope.contentNutupane.masterOnly = true;
         $scope.contentNutupane.setSearchKey('subscriptionSearch');
         $scope.isRemoving = false;
+        $scope.contextAdd = false;
 
         $scope.groupedSubscriptions = {};
         $scope.$watch('table.rows', function (rows) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-info.html

@@ -100,11 +100,13 @@
       </dt>
       <dd bst-feature-flag="lifecycle_environments">
         <div bst-edit-select="activationKey.content_view.name"
-             readonly="denied('edit_activation_keys', activationKey)"
+             readonly="denied('edit_activation_keys', activationKey) || activationKey.environment === undefined || activationKey.environment === null"
              selector="activationKey.content_view.id"
              options="contentViews()"
              on-cancel="cancelContentViewUpdate()"
              on-save="saveContentView(activationKey)"
+             deletable="activationKey.content_view"
+             on-delete="resetEnvironment(activationKey)"
              edit-trigger="editContentView">
         </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js

@@ -13,7 +13,7 @@ BASTION_MODULES.push(
     'Bastion.puppet-modules',
     'Bastion.ostree-branches',
     'Bastion.environments',
-    'Bastion.gpg-keys',
+    'Bastion.content-credentials',
     'Bastion.hosts',
     'Bastion.capsules',
     'Bastion.organizations',

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

@@ -76,8 +76,8 @@
 //= require "bastion_katello/tasks/tasks.module.js"
 //= require_tree "./tasks"
 
-//= require "bastion_katello/gpg-keys/gpg-keys.module.js"
-//= require_tree "./gpg-keys"
+//= require "bastion_katello/content-credentials/content-credentials.module.js"
+//= require_tree "./content-credentials"
 
 //= require "bastion_katello/tasks/tasks.module.js"
 //= require_tree "./tasks"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html

@@ -21,7 +21,7 @@
        </td>
      </tr>
      <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
-       <td bst-table-cell>
+       <td bst-table-cell ng-show="contextAdd">
          <span ng-hide="subscription.multi_entitlement">
            1
          </span>
@@ -32,7 +32,7 @@
            <option value="">{{ "Automatic" | translate }}</option>
          </select>
        </td>
-
+       <td bst-table-cell ng-hide="contextAdd">{{ subscription.quantity_consumed }}</td>
        <td bst-table-cell>
          <a ui-sref="subscription.info({subscriptionId: subscription.id})">
            {{ subscription | subscriptionConsumedFilter }}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/content-credential.factory.js

@@ -0,0 +1,83 @@
+/**
+ * @ngdoc service
+ * @name  Katello.content-credentials.factory:ContentCredential
+ *
+ * @requires BastionResource
+ *
+ * @description
+ *   Provides a BastionResource for Content Credentials.
+ */
+angular.module('Bastion.content-credentials').factory('ContentCredential',
+    ['BastionResource', 'CurrentOrganization',
+    function (BastionResource, CurrentOrganization) {
+
+        return BastionResource('katello/api/v2/content_credentials/:id/:action',
+            {id: '@id', 'organization_id': CurrentOrganization},
+            {
+                autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
+                update: {method: 'PUT'},
+                products: {method: 'GET', transformResponse:
+                    function (data) {
+                        var contentCredential = angular.fromJson(data);
+                        var allProducts = {};
+                        allProducts.length = 0;
+                        allProducts.products = {};
+
+                        function collectProducts(allP, thisP, usedAs) {
+                            var key;
+                            for (key in thisP) {
+                                if (thisP.hasOwnProperty(key)) {
+                                    thisP[key]["used_as"] = usedAs;
+                                    allP.products[allP.length] = thisP[key];
+                                    allP.length++;
+                                }
+                            }
+                        }
+
+                        collectProducts(allProducts, contentCredential.gpg_key_products, "GPG Key");
+                        collectProducts(allProducts, contentCredential.ssl_ca_products, "SSL CA Cert");
+                        collectProducts(allProducts, contentCredential.ssl_client_products, "SSL Client Cert");
+                        collectProducts(allProducts, contentCredential.ssl_key_products, "SSL Client Key");
+
+                        return {
+                            total: allProducts.length,
+                            subtotal: allProducts.length,
+                            results: allProducts.products
+                        };
+                    }
+                },
+                repositories: {method: 'GET', transformResponse:
+                    function (data) {
+                        var contentCredential = angular.fromJson(data);
+                        var allRepos = {};
+                        allRepos.length = 0;
+                        allRepos.repositories = {};
+
+                        function collectRepos(allR, thisR, usedAs) {
+                            var key;
+                            for (key in thisR) {
+                                if (thisR.hasOwnProperty(key)) {
+                                    thisR[key]["used_as"] = usedAs;
+                                    allR.repositories[allR.length] = thisR[key];
+                                    allR.length++;
+                                }
+                            }
+                        }
+
+                        collectRepos(allRepos, contentCredential.gpg_key_repos, "GPG Key");
+                        collectRepos(allRepos, contentCredential.ssl_ca_repos, "SSL CA Cert");
+                        collectRepos(allRepos, contentCredential.ssl_client_repos, "SSL Client Cert");
+                        collectRepos(allRepos, contentCredential.ssl_key_repos, "SSL Client Key");
+
+                        return {
+                            total: allRepos.length,
+                            subtotal: allRepos.length,
+                            results: allRepos.repositories
+                        };
+                    }
+                }
+            }
+        );
+
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/{gpg-keys/gpg-keys.controller.js → content-credentials/content-credentials.controller.js}

@@ -1,21 +1,21 @@
 /**
  * @ngdoc object
- * @name  Bastion.gpg-keys.controller:GPGKeysController
+ * @name  Bastion.content-credentials.controller:ContentCredentialsController
  *
  * @requires $scope
  * @requires $location
  * @requires Nutupane
- * @requires GPGKey
+ * @requires ContentCredential
  * @requires CurrentOrganization
  *
  * @description
- *   Provides the functionality specific to GPGKeys for use with the Nutupane UI pattern.
+ *   Provides the functionality specific to ContentCredentials 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.gpg-keys').controller('GPGKeysController',
-    ['$scope', '$location', 'Nutupane', 'GPGKey', 'CurrentOrganization',
-    function ($scope, $location, Nutupane, GPGKey, CurrentOrganization) {
+angular.module('Bastion.content-credentials').controller('ContentCredentialsController',
+    ['$scope', '$location', 'Nutupane', 'ContentCredential', 'CurrentOrganization',
+    function ($scope, $location, Nutupane, ContentCredential, CurrentOrganization) {
         var params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
@@ -24,8 +24,8 @@ angular.module('Bastion.gpg-keys').controller('GPGKeysController',
             'paged': true
         };
 
-        var nutupane = new Nutupane(GPGKey, params);
-        $scope.controllerName = 'katello_gpg_keys';
+        var nutupane = new Nutupane(ContentCredential, params);
+        $scope.controllerName = 'katello_content_credentials';
         $scope.table = nutupane.table;
         $scope.panel = {loading: false};
         $scope.removeRow = nutupane.removeRow;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/{gpg-keys/gpg-keys.module.js → content-credentials/content-credentials.module.js}

@@ -1,11 +1,11 @@
 /**
  * @ngdoc module
- * @name  Bastion.gpg-keys
+ * @name  Bastion.content-credentials
  *
  * @description
- *   Module for GPG key related functionality.
+ *   Module for Content Credential related functionality.
  */
-angular.module('Bastion.gpg-keys', [
+angular.module('Bastion.content-credentials', [
     'ngResource',
     'ui.router',
     'Bastion',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/content-credentials.routes.js

@@ -0,0 +1,76 @@
+/**
+ * @ngdoc object
+ * @name Bastion.content-credentials.config
+ *
+ * @requires $stateProvider
+ *
+ * @description
+ *   Used for systems level configuration such as setting up the ui state machine.
+ */
+angular.module('Bastion.content-credentials').config(['$stateProvider', function ($stateProvider) {
+    $stateProvider.state('content-credentials', {
+        url: '/content_credentials',
+        permission: 'view_content_credentials',
+        template: '<div ui-view></div>',
+        views: {
+            '@': {
+                controller: 'ContentCredentialsController',
+                templateUrl: 'content-credentials/views/content-credentials.html'
+            }
+        },
+        ncyBreadcrumb: {
+            label: "{{ 'Content Credential' | translate}}"
+        }
+    })
+    .state('content-credentials.new', {
+        url: '/new',
+        permission: 'create_content_credentials',
+        views: {
+            '@': {
+                controller: 'NewContentCredentialController',
+                templateUrl: 'content-credentials/new/views/new-content-credential.html'
+            }
+        },
+        ncyBreadcrumb: {
+            label: "{{'New Content Credential' | translate }}",
+            parent: 'content-credentials'
+        }
+    })
+    .state("content-credential", {
+        abstract: true,
+        url: '/content_credentials/:contentCredentialId',
+        permission: 'view_content_credentials',
+        controller: 'ContentCredentialDetailsController',
+        templateUrl: 'content-credentials/details/views/content-credential-details.html'
+    })
+    .state('content-credential.info', {
+        url: '',
+        permission: 'view_content_credentials',
+        controller: 'ContentCredentialDetailsInfoController',
+        templateUrl: 'content-credentials/details/views/content-credential-info.html',
+        ncyBreadcrumb: {
+            label: "{{ contentCredential.name }}",
+            parent: 'content-credentials'
+        }
+    })
+    .state('content-credential.products', {
+        url: '/products',
+        permission: 'view_content_credentials',
+        controller: 'ContentCredentialProductsController',
+        templateUrl: 'content-credentials/details/views/content-credential-products.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Products' | translate }}",
+            parent: 'content-credential.info'
+        }
+    })
+    .state('content-credential.repositories', {
+        url: '/repositories',
+        permission: 'view_content_credentials',
+        controller: 'ContentCredentialRepositoriesController',
+        templateUrl: 'content-credentials/details/views/content-credential-repositories.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Repositories' | translate }}",
+            parent: 'content-credential.info'
+        }
+    });
+}]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/content-type.filter.js

@@ -0,0 +1,25 @@
+/**
+ * @ngdoc object
+ * @name Bastion.content-credentials.filter:contentTypeFilter
+ *
+ * @requires translate
+ *
+ * @description
+ *   Provides filter functionality to replace cert with Certificates and gpg_key with GPG Key
+ */
+
+angular.module('Bastion.content-credentials').filter('contentTypeFilter',
+    ['$filter', 'translate',
+    function ($filter, translate) {
+        return function (contentType) {
+            var filtered = translate("Unsupported Type!");
+
+            if (contentType === "cert") {
+                filtered = translate("Certificate");
+            } else if (contentType === "gpg_key") {
+                filtered = translate("GPG Key");
+            }
+            return filtered;
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/{gpg-keys/details/gpg-key-details-info.controller.js → content-credentials/details/content-credential-details-info.controller.js}

@@ -1,35 +1,35 @@
 /**
  * @ngdoc object
- * @name  Bastion.gpgKeys.controller:GPGKeyDetailsInfoController
+ * @name  Bastion.contentCredentials.controller:ContentCredentialDetailsInfoController
  *
  * @requires $scope
- * @requires GPGKey
+ * @requires ContentCredential
  * @requires translate
  * @requires Notification
  *
  * @description
- *   Provides the functionality for the gpgKey details action pane.
+ *   Provides the functionality for the contentCredential details action pane.
  */
-angular.module('Bastion.gpg-keys').controller('GPGKeyDetailsInfoController',
-    ['$scope', 'GPGKey', 'translate', 'Notification', function ($scope, GPGKey, translate, Notification) {
+angular.module('Bastion.content-credentials').controller('ContentCredentialDetailsInfoController',
+    ['$scope', 'ContentCredential', 'translate', 'Notification', function ($scope, ContentCredential, translate, Notification) {
 
         $scope.panel = $scope.panel || {loading: false};
         $scope.progress = {uploading: false};
 
-        $scope.gpgKey = $scope.gpgKey || GPGKey.get({id: $scope.$stateParams.gpgKeyId}, function () {
+        $scope.contentCredential = $scope.contentCredential || ContentCredential.get({id: $scope.$stateParams.contentCredentialId}, function () {
             $scope.panel.loading = false;
         });
 
-        $scope.gpgKey.$promise.then(function () {
-            $scope.uploadURL = 'katello/api/v2/gpg_keys/' + $scope.gpgKey.id + '/content';
+        $scope.contentCredential.$promise.then(function () {
+            $scope.uploadURL = 'katello/api/v2/content_credentials/' + $scope.contentCredential.id + '/content';
         });
 
         $scope.uploadContent = function (content) {
             if (content && (content !== "Please wait...")) {
                 if (content.status === 'success') {
-                    Notification.setSuccessMessage(translate('GPG Key successfully uploaded'));
+                    Notification.setSuccessMessage(translate('Content Credential successfully uploaded'));
                     $scope.uploadStatus = 'success';
-                    $scope.gpgKey.$get();
+                    $scope.contentCredential.$get();
                 } else {
                     Notification.setErrorMessage(content.displayMessage);
                     $scope.uploadStatus = 'error';

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-details.controller.js

@@ -0,0 +1,48 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-credentials.controller:ContentCredentialDetailsController
+ *
+ * @requires $scope
+ * @requires ContentCredential
+ * @requires $q
+ * @requires translate
+ * @requires ApiErrorHandler
+ * @requires Notification
+ *
+ * @description
+ *   Provides the functionality for the contentCredential details action pane.
+ */
+angular.module('Bastion.content-credentials').controller('ContentCredentialDetailsController',
+    ['$scope', 'ContentCredential', '$q', 'translate', 'ApiErrorHandler', 'Notification', function ($scope, ContentCredential, $q, translate, ApiErrorHandler, Notification) {
+        $scope.panel = $scope.panel || {error: false, loading: false};
+
+        $scope.contentCredential = ContentCredential.get({id: $scope.$stateParams.contentCredentialId}, function () {
+            $scope.panel.error = false;
+            $scope.panel.loading = false;
+        }, function (response) {
+            $scope.panel.loading = false;
+            ApiErrorHandler.handleGETRequestErrors(response, $scope);
+        });
+
+        $scope.save = function (contentCredential) {
+            var deferred = $q.defer();
+
+            contentCredential.$update(function (response) {
+                deferred.resolve(response);
+                Notification.setSuccessMessage(translate('Content credential updated'));
+
+            }, function (response) {
+                deferred.reject(response);
+                Notification.setErrorMessage(response.data.displayMessage);
+            });
+
+            return deferred.promise;
+        };
+
+        $scope.removeContentCredential = function (contentCredential) {
+            contentCredential.$delete(function () {
+                $scope.transitionTo('content-credentials');
+            });
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-products.controller.js

@@ -0,0 +1,36 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-credentials.controller:ContentCredentialProductsController
+ *
+ * @requires $scope
+ * @requires Nutupane
+ * @requires ContentCredential
+ * @requires ApiErrorHandler
+ *
+ * @description
+ *   Page for Content Credential products
+ */
+(function () {
+    function ContentCredentialProductsController($scope, Nutupane, ContentCredential, ApiErrorHandler) {
+        var nutupane = new Nutupane(ContentCredential, {
+            id: $scope.$stateParams.contentCredentialId
+        }, 'products');
+        $scope.controllerName = 'katello_content_credentials';
+        nutupane.masterOnly = true;
+
+        $scope.panel = $scope.panel || {error: false, loading: false};
+
+        $scope.contentCredential = ContentCredential.get({id: $scope.$stateParams.contentCredentialId}, function () {
+            $scope.panel.error = false;
+            $scope.panel.loading = false;
+        }, function (response) {
+            $scope.panel.loading = false;
+            ApiErrorHandler.handleGETRequestErrors(response, $scope);
+        });
+
+        $scope.table = nutupane.table;
+    }
+
+    angular.module('Bastion.content-credentials').controller('ContentCredentialProductsController', ContentCredentialProductsController);
+    ContentCredentialProductsController.$inject = ['$scope', 'Nutupane', 'ContentCredential', 'ApiErrorHandler'];
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-credentials/details/content-credential-repositories.controller.js

@@ -0,0 +1,36 @@
+(function () {
+    function ContentCredentialRepositoriesController($scope, Nutupane, ContentCredential, ApiErrorHandler) {
+        /**
+         * @ngdoc object
+         * @name  Bastion.content-credentials.controller:ContentCredentialRepositoriesController
+         *
+         * @requires $scope
+         * @requires Nutupane
+         * @requires ContentCredential
+         * @requires ApiErrorHandler
+         *
+         * @description
+         *   Page for Content Credential repositories
+         */
+        var nutupane = new Nutupane(ContentCredential, {
+            id: $scope.$stateParams.contentCredentialId
+        }, 'repositories');
+        $scope.controllerName = 'katello_content_credentials';
+        nutupane.masterOnly = true;
+
+        $scope.panel = $scope.panel || {error: false, loading: false};
+
+        $scope.contentCredential = ContentCredential.get({id: $scope.$stateParams.contentCredentialId}, function () {
+            $scope.panel.error = false;
+            $scope.panel.loading = false;
+        }, function (response) {
+            $scope.panel.loading = false;
+            ApiErrorHandler.handleGETRequestErrors(response, $scope);
+        });
+
+        $scope.table = nutupane.table;
+    }
+
+    angular.module('Bastion.content-credentials').controller('ContentCredentialRepositoriesController', ContentCredentialRepositoriesController);
+    ContentCredentialRepositoriesController.$inject = ['$scope', 'Nutupane', 'ContentCredential', 'ApiErrorHandler'];
+})();