katello 3.3.2 → 3.4.0.rc1

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

@@ -23,6 +23,7 @@ angular.module('Bastion.packages').controller('PackageRepositoriesController',
         };
 
         repositoriesNutupane = new Nutupane(Repository, params);
+        $scope.controllerName = 'katello_repositories';
         $scope.table = repositoriesNutupane.table;
         $scope.table.initialLoad = false;
         repositoriesNutupane.masterOnly = true;

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

@@ -1,8 +1,6 @@
 <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>
+<h3 translate>Files in package {{ package.nvrea }}</h3>
 
 <ul class="list-unstyled">
   <li ng-repeat="item in package.files | orderBy:'toString()'">

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

@@ -1,36 +1,26 @@
 <span page-title ng-model="package">{{ 'Repositories for Package: ' | translate }} {{ package.nvrea }}</span>
 
-<div data-block="sub-header">
-  <h3 translate>Repositories containing package {{ package.nvrea }}</h3>
-</div>
+<h3 translate>Repositories containing package {{ package.nvrea }}</h3>
 
 <div data-extend-template="layouts/partials/table.html">
 
-  <div data-block="filters">
-    <form>
-      <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="filterPackages()">
-          </select>
-        </div>
+  <div data-block="search-filter">
+    <select class="form-control"
+            ng-disabled="!environments"
+            ng-model="environmentFilter"
+            ng-options="e.id as e.name for e in environments"
+            ng-change="filterPackages()">
+    </select>
 
-        <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="filterPackages()">
-          </select>
-          <p class="help-block" translate ng-show="filteredCVs.length === 0">
-            There are no Content Views in this Environment.
-          </p>
-        </div>
-      </div>
-    </form>
+    <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="filterPackages()">
+    </select>
+    <p class="help-block" translate ng-show="filteredCVs.length === 0">
+      There are no Content Views in this Environment.
+    </p>
   </div>
 
   <span data-block="no-rows-message" translate>

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

@@ -25,10 +25,10 @@ angular.module('Bastion.packages').controller('PackagesController',
         };
 
         nutupane = $scope.nutupane = new Nutupane(Package, params);
+        $scope.controllerName = 'katello_erratum_packages';
         nutupane.masterOnly = true;
         $scope.table = nutupane.table;
         $scope.removeRow = nutupane.removeRow;
-        $scope.controllerName = 'katello_erratum_packages';
 
         $scope.repository = {name: translate('All Repositories'), id: 'all'};
 

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

@@ -7,22 +7,20 @@
   </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>
+    <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>
+  <div data-block="filters">
+    <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>
+    <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>
 
   <span data-block="no-rows-message">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/{product-bulk-action.factory.js → bulk/product-bulk-action.factory.js}

@@ -10,7 +10,7 @@
 angular.module('Bastion.products').factory('ProductBulkAction',
     ['BastionResource', function (BastionResource) {
 
-        return BastionResource('/katello/api/products/bulk/:action', {}, {
+        return BastionResource('/katello/api/v2/products/bulk/:action', {}, {
             removeProducts: {method: 'PUT', params: {action: 'destroy'}},
             syncProducts: {method: 'PUT', params: {action: 'sync'}},
             updateProductSyncPlan: {method: 'PUT', params: {action: 'sync_plan'}}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/products-bulk-advanced-sync-modal.controller.js

@@ -0,0 +1,54 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.products.controller:ProductsBulkAdvancedSyncModalController
+ *
+ * @requires $scope
+ * @requires $state
+ * @requires $sce
+ * @requires translate
+ * @requires ProductBulkAction
+ * @requires CurrentOrganization
+ * @requires GlobalNotification
+ * @requires $uibModalInstance
+ * @requires bulkParams
+ *
+ * @description
+ *   A controller for providing bulk action functionality to the products page.
+ */
+angular.module('Bastion.products').controller('ProductsBulkAdvancedSyncModalController',
+    ['$scope', '$state', '$sce', 'translate', 'ProductBulkAction', 'CurrentOrganization', 'GlobalNotification', '$uibModalInstance', 'bulkParams',
+        function ($scope, $state, $sce, translate, ProductBulkAction, CurrentOrganization, GlobalNotification, $uibModalInstance, bulkParams) {
+            var success, error;
+
+            success = function (task) {
+                var url, message, taskLink;
+                url = $state.href('task', {taskId: task.id});
+                taskLink = $sce.trustAsHtml("<a href=" + url + ">here</a>");
+                message = translate("Product syncs has been initiated in the background. " +
+                    "Click %s to monitor the progress.");
+
+                GlobalNotification.setRenderedSuccessMessage(message.replace('%s', taskLink));
+            };
+
+            error = function (response) {
+                angular.forEach(response.data.errors, function(message) {
+                    GlobalNotification.setErrorMessage(translate("An error occurred initiating the sync: " ) + message);
+                });
+            };
+
+            $scope.ok = function () {
+                var params = bulkParams;
+                if ($scope.syncType === "skipMetadataCheck") {
+                    params['skip_metadata_check'] = true;
+                } else if ($scope.syncType === "validateContents") {
+                    params['validate_contents'] = true;
+                }
+                ProductBulkAction.syncProducts(params, success, error);
+                $uibModalInstance.close();
+            };
+
+            $scope.cancel = function () {
+                $uibModalInstance.dismiss('cancel');
+            };
+        }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/products-bulk-sync-plan-modal.controller.js

@@ -0,0 +1,80 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.products.controller:ProductsBulkSyncPlanModalController
+ *
+ * @requires $scope
+ * @requires $state
+ * @requires translate
+ * @requires Nutupane
+ * @requires ProductBulkAction
+ * @requires SyncPlan
+ * @requires CurrentOrganization
+ * @requires GlobalNotification
+ * @requires $uibModalInstance
+ * @requires bulkParams
+ *
+ * @description
+ *   A controller for providing bulk action functionality to the products page.
+ */
+angular.module('Bastion.products').controller('ProductsBulkSyncPlanModalController',
+    ['$scope', '$state', 'translate', 'Nutupane', 'ProductBulkAction', 'SyncPlan', 'CurrentOrganization', 'GlobalNotification', '$uibModalInstance', 'bulkParams',
+        function ($scope, $state, translate, Nutupane, ProductBulkAction, SyncPlan, CurrentOrganization, GlobalNotification, $uibModalInstance, bulkParams) {
+            var success, error, nutupane, params;
+
+            params = {
+                'organization_id': CurrentOrganization,
+                'offset': 0,
+                'sort_by': 'name',
+                'sort_order': 'ASC',
+                'paged': true
+            };
+
+            nutupane = new Nutupane(SyncPlan, params, 'queryPaged');
+            $scope.controllerName = 'katello_sync_plans';
+            nutupane.masterOnly = true;
+
+            $scope.table = nutupane.table;
+
+            success = function (response) {
+                angular.forEach(response.displayMessages.success, function(message) {
+                    GlobalNotification.setSuccessMessage(message);
+                });
+
+                angular.forEach(response.displayMessages.error, function(message) {
+                    GlobalNotification.setErrorMessage(message);
+                });
+
+                nutupane.invalidate();
+            };
+
+            error = function (response) {
+                angular.forEach(response.data.errors, function(message) {
+                    GlobalNotification.setErrorMessage(translate("An error occurred updating the sync plan: " ) + message);
+                });
+            };
+
+            $scope.selectSyncPlan = function (syncPlan) {
+                $scope.selectedSyncPlan = syncPlan;
+            };
+
+            $scope.updateSyncPlan = function () {
+                var updateParams = bulkParams;
+                updateParams['plan_id'] = $scope.selectedSyncPlan.id;
+                ProductBulkAction.updateProductSyncPlan(updateParams, success, error);
+            };
+
+            $scope.removeSyncPlan = function () {
+                var removeParams = bulkParams;
+                removeParams['plan_id'] = null;
+                ProductBulkAction.updateProductSyncPlan(removeParams, success, error);
+            };
+
+            $scope.ok = function () {
+                $uibModalInstance.close();
+            };
+
+            $scope.cancel = function () {
+                $uibModalInstance.dismiss('cancel');
+            };
+        }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-advanced-sync-modal.html

@@ -0,0 +1,26 @@
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header">Advanced Sync</h4>
+
+  <div data-block="modal-body">
+    <div class="row">
+      <div class="col-sm-12">
+        <div bst-global-notification></div>
+      </div>
+    </div>
+
+    <div data-extend-template="products/details/repositories/details/views/repository-advanced-sync-options.html"></div>
+
+    <div class="help-block">
+      <span translate>
+        Selecting "Complete Sync" will cause only Yum repositories of the selected product to be synced. Selecting "Validate Content" will cause only Yum repositories using the "Immediate" or "Background" download policies will be synced.
+      </span>
+    </div>
+
+
+  </div>
+  <span data-block="modal-confirm-button">
+    <button class="btn btn-primary" ng-click="ok()">
+      <span translate>Sync</span>
+    </button>
+  </span>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-sync-plan-modal.html

@@ -0,0 +1,87 @@
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header">Sync Plan Management</h4>
+
+  <div data-block="modal-body">
+    <div class="row">
+      <div class="col-sm-12">
+        <div bst-global-notification></div>
+      </div>
+    </div>
+
+    <div bst-alert="info" ng-show="syncPlan.action == 'add'">
+      <span translate>
+        Are you sure you want to add the sync plan to the selected products(s)?
+      </span>
+      <div>
+        <button type="button" class="btn btn-default" ng-click="updateSyncPlan()" translate>Yes</button>
+        <button type="button" class="btn btn-default" ng-click="syncPlan.action = null; syncPlan.working = false" translate>No</button>
+      </div>
+    </div>
+
+    <div bst-alert="info" ng-show="syncPlan.action == 'remove'">
+      <span translate>
+        Are you sure you want to remove the sync plan from the selected product(s)?
+      </span>
+      <div>
+        <button type="button" class="btn btn-default" ng-click="removeSyncPlan()" translate>Yes</button>
+        <button type="button" class="btn btn-default" ng-click="syncPlan.action = null; syncPlan.working = false" translate>No</button>
+      </div>
+    </div>
+
+    <div data-extend-template="layouts/partials/table.html">
+      <div data-block="list-actions">
+        <button type="button" class="btn btn-default"
+                ng-hide="denied('edit_hosts')"
+                ng-disabled="!selectedSyncPlan"
+                ng-click="syncPlan.action = 'add'; syncPlan.working = true">
+          <span translate>Update Sync Plan</span>
+        </button>
+
+        <button type="button" class="btn btn-default"
+                ng-hide="denied('edit_hosts')"
+                ng-click="syncPlan.action = 'remove'; syncPlan.working = true">
+          <span translate>Remove Sync Plan</span>
+        </button>
+      </div>
+
+      <span data-block="no-rows-message" translate>
+        There are no Sync Plans available. You can create new Sync Plans after selecting 'Sync Plans' under 'Hosts' in main menu.
+      </span>
+
+      <span data-block="no-search-results-message" translate>
+        Your search returned zero Sync Plans.
+      </span>
+
+      <div data-block="table">
+        <table class="table table-striped table-bordered" ng-class="{'table-mask': state.working}">
+          <thead>
+            <tr bst-table-head>
+              <th bst-table-column="name"><span translate>Name</span></th>
+              <th bst-table-column="syncDate"><span translate>Original Sync Date</span></th>
+              <th bst-table-column="enabled"><span translate>Sync Enabled</span></th>
+              <th bst-table-column="interval"><span translate>Interval</span></th>
+              <th bst-table-column="nextSync"><span translate>Next Sync</span></th>
+            </tr>
+          </thead>
+
+          <tbody>
+            <tr bst-table-row ng-repeat="syncPlan in table.rows" class="clickable-row"
+                ng-click="selectSyncPlan(syncPlan)" ng-class="{'selected-row': syncPlan === selectedSyncPlan }">
+              <td bst-table-cell>{{ syncPlan.name }}</td>
+              <td bst-table-cell>{{ syncPlan.sync_date | date:'medium' }}</td>
+              <td bst-table-cell>{{ syncPlan.enabled }}</td>
+              <td bst-table-cell>{{ syncPlan.interval | translate | capitalize }}</td>
+              <td bst-table-cell>{{ syncPlan.next_sync | date:'medium' }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+
+  <div data-block="modal-footer">
+    <button type="button" class="btn btn-primary" ng-click="ok()" translate>
+      Done
+    </button>
+  </div>
+</div>

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

@@ -26,6 +26,7 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
             'enabled': true,
             'paged': true
         });
+        $scope.controllerName = 'katello_repositories';
         repositoriesNutupane.masterOnly = true;
 
         function getParams() {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-advanced-sync.controller.js

@@ -0,0 +1,33 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.repositories.controller:RepositoryAdvancedSyncController
+ *
+ * @requires $scope
+ * @requires $state
+ * @requires Repository
+ *
+ * @description
+ *   Provides the functionality for advanced repository syncing
+ */
+angular.module('Bastion.repositories').controller('RepositoryAdvancedSyncController',
+    ['$scope', '$state', 'Repository',
+    function ($scope, $state, Repository) {
+        var errorHandler = function errorHandler(response) {
+            $scope.errorMessages = response.data.errors;
+            $scope.working = false;
+        };
+
+        $scope.advancedSync = function (syncType) {
+            var params = {id: $scope.repository.id};
+            if (syncType === "skipMetadataCheck") {
+                params['skip_metadata_check'] = true;
+            } else if (syncType === "validateContents") {
+                params['validate_contents'] = true;
+            }
+
+            Repository.sync(params, function (task) {
+                $state.go('product.repository.tasks.details', {taskId: task.id});
+            }, errorHandler);
+        };
+    }]
+);

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

@@ -8,13 +8,14 @@
  * @requires GPGKey
  * @requires CurrentOrganization
  * @requires DownloadPolicy
+ * @requires OstreeUpstreamSyncPolicy
  *
  * @description
  *   Provides the functionality for the repository details info page.
  */
 angular.module('Bastion.repositories').controller('RepositoryDetailsInfoController',
-    ['$scope', '$q', 'translate', 'GPGKey', 'CurrentOrganization', 'DownloadPolicy',
-    function ($scope, $q, translate, GPGKey, CurrentOrganization, DownloadPolicy) {
+    ['$scope', '$q', 'translate', 'GPGKey', 'CurrentOrganization', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy',
+    function ($scope, $q, translate, GPGKey, CurrentOrganization, DownloadPolicy, OstreeUpstreamSyncPolicy) {
         $scope.successMessages = [];
         $scope.errorMessages = [];
         $scope.uploadSuccessMessages = [];
@@ -100,10 +101,24 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
             return checksum;
         };
         $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
+        $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
 
         $scope.downloadPolicyDisplay = function (downloadPolicy) {
             return DownloadPolicy.downloadPolicyName(downloadPolicy);
         };
 
+        $scope.ostreeUpstreamSyncPolicyDisplay = function (repository) {
+            var policy = repository["ostree_upstream_sync_policy"];
+            if ( policy === "custom") {
+                return OstreeUpstreamSyncPolicy.syncPolicyName(policy, repository["ostree_upstream_sync_depth"]);
+            }
+            return OstreeUpstreamSyncPolicy.syncPolicyName(policy);
+        };
+
+        $scope.clearUpstreamPassword = function () {
+            $scope.repository['upstream_password'] = null;
+            $scope.repository['upstream_password_exists'] = false;
+            $scope.save($scope.repository);
+        };
     }]
 );