katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery.html

@@ -1,86 +1,113 @@
-<span page-title>{{ 'Repository Discovery' | translate }}</span>
+<span page-title>{{ "Repository Discovery" | translate }}</span>
 
-<div>
-  <form ng-submit="discover()" name="discoveryForm" class="col-sm-6">
-    <div class="input-group">
+<div class="row">
+  <form ng-submit="discover()" name="discoveryForm" class="col-sm-5" role="form">
+    <div bst-form-group label="{{ 'Repository Type' | translate }}">
+      <select ng-model="discovery.contentType"
+              ng-options="contentType.id as contentType.name for contentType in contentTypes"/>
+    </div>
 
-      <input type="text"
+    <div bst-form-group ng-show="discovery.contentType === 'yum'"
+         label="{{ 'URL to Discover' | translate }}">
+      <input type="text" id="urlToDiscover"
+             class="form-control"
              ng-pattern="/^(file:\/\/|http:\/\/|https:\/\/).+/"
-             class="form-control input-lg"
-             placeholder="{{ 'URL to discover' | translate }}"
              ng-model="discovery.url"
-             ng-disabled="discovery.pending"
+             ng-disabled="discovery.working"
              name="discoveryUrl"
              required/>
+    </div>
 
-      <span class="input-group-btn input-group-lg">
-        <button ng-show="!discovery.pending && permitted('edit_products')"
-               ng-disabled="discoveryForm.discoveryUrl.$invalid"
-               translate
-               type="submit"
-               class="btn btn-primary btn-lg">
-          Discover
-        </button>
+    <div bst-form-group ng-show="discovery.contentType === 'docker'"
+         label="{{ 'Registry to Discover' | translate }}">
+      <input type="text" id="registryToDiscover"
+             class="form-control"
+             ng-model="discovery.url"
+             ng-disabled="discovery.working"
+             placeholder="Example: registry.access.redhat.com or https://registry.access.redhat.com"
+             name="discoveryUrl"
+             required/>
+    </div>
 
-        <button type="button"
-                ng-disabled="discovery.working"
-                ng-show="discovery.pending && permitted('edit_products')"
-                ng-click="cancelDiscovery()"
-                class="btn btn-primary btn-lg">
-          <i class="fa fa-spinner fa-spin" ng-show="discovery.pending"></i>
-          {{ 'Cancel' | translate }}
-        </button>
-      </span>
+    <div bst-form-group ng-show="discovery.contentType === 'docker'"
+         label="{{ 'Registry Username' | translate }}">
+      <input type="text" id="upstreamUsername"
+             class="form-control"
+             ng-model="discovery.upstreamUsername"
+             ng-disabled="discovery.working"
+             name="upstreamUsername"/>
+    </div>
 
+    <div bst-form-group ng-show="discovery.contentType === 'docker'"
+         label="{{ 'Registry Password' | translate }}">
+      <input id="upstreamPassword"
+             type="password"
+             class="form-control"
+             ng-model="discovery.upstreamPassword"
+             ng-disabled="discovery.working"
+             name="upstreamPassword"/>
     </div>
+
+    <span class="input-group-btn">
+      <button ng-show="!discovery.working && permitted('edit_products')"
+              ng-disabled="discoveryForm.discoveryUrl.$invalid"
+              type="submit"
+              class="btn btn-default">
+        <span translate>Discover</span>
+      </button>
+
+      <button type="button"
+              ng-show="discovery.working && permitted('edit_products')"
+              ng-click="cancelDiscovery()"
+              class="btn">
+        <i class="fa fa-spinner fa-spin" ng-show="discovery.working"></i>
+        <span translate>Cancel</span>
+      </button>
+    </span>
   </form>
 </div>
 
-<section>
-  <div class="row">
-    <h3 class="col-sm-12" translate>Results</h3>
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search">
+    <input type="text" class="form-control" stop-event="click"
+           placeholder="{{ 'Filter' | translate }}"
+           ng-model="tableFilter"/>
+  </div>
 
-    <div class="col-sm-4">
-      <input type="text"
-             class="form-control"
-             placeholder="{{ 'Filter' | translate }}"
-             ng-model="discoveryTable.filterTerm"/>
-    </div>
+  <div data-block="list-actions">
+    <button class="btn btn-primary"
+            translate
+            ng-click="setupSelected()"
+            ng-hide="denied('edit_products')"
+            ng-disabled="discovery.working || table.numSelected === 0">
+      Create Selected
+    </button>
+  </div>
 
-    <div class="fr">
-      <div class="fl nutupane-info">
-        <span translate>{{ discoveryTable.numSelected }} Selected</span>
-      </div>   
+  <span data-block="no-rows-message" translate>
+    No discovered repositories.
+  </span>
 
-      <div ng-hide="system.readonly" class="nutupane-actions fr">
-        <button class="btn btn-primary"
-                translate
-                ng-hide="denied('create_products')"
-                ng-disabled="discoveryTable.getSelected().length == 0"
-                ng-click="setupSelected()">
-            Create Selected
-        </button>
-      </div>      
-    </div>
-  </div>
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero results.
+  </span>
 
-  <div class="row">
-    <div class="col-sm-12">
-      <table bst-table="discoveryTable" class="table table-striped table-bordered">
-        <thead>
-          <tr bst-table-head row-select>
-            <th bst-table-column translate>Discovered URLs</th>
-          </tr>
-        </thead>
+  <div data-block="table">
+    <table bst-table="table"
+           class="table table-full table-bordered"
+           ng-class="{'table-mask': discovery.working}"
+           ng-show="table.rows.length > 0">
+      <thead>
+        <tr bst-table-head row-select>
+          <th bst-table-column="path" translate>Discovered Repository</th>
+        </tr>
+      </thead>
 
-        <tbody>
-          <tr bst-table-row
-              row-select="urlRow"
-              ng-repeat="urlRow in discoveryTable.rows | filter:discoveryTable.filterTerm">
-            <td bst-table-cell>{{ urlRow.path }}</td>
-          </tr>
-        </tbody>
-      </table>
-    </div>
+      <tbody>
+        <tr bst-table-row ng-repeat="urlRow in table.rows | filter:tableFilter" row-select="urlRow">
+          <td bst-table-cell style="white-space:nowrap">{{ urlRow.path }}</td>
+        </tr>
+      </tbody>
+    </table>
   </div>
-</section>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/views/product-new-form.html

@@ -33,7 +33,10 @@
             ng-options="syncPlan.id as syncPlan.name for syncPlan in syncPlans">
       <option value=""></option>
     </select>
-    <a ui-sref="products.new.sync-plan" translate>+ New Sync Plan</a>
+    <a ui-sref="products.new.sync-plan" translate>
+      <i class="pficon pficon-add-circle-o"></i>
+      Create Sync Plan
+    </a>
   </div>
 
   <div bst-form-group label="{{ 'Description' | translate }}">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/views/product-new.html

@@ -1,9 +1,9 @@
-<span page-title>{{ 'New Product' | translate }}</span>
+<span page-title>{{ 'Create Product' | translate }}</span>
 
 <div data-extend-template="layouts/details-page-with-breadcrumbs.html">
   <header data-block="header">
-    <h2 translate>New Product</h2>
+    <h2 translate>Create Product</h2>
   </header>
 
   <div ui-view data-block="content"></div>
-</div>
+</div>

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

@@ -6,8 +6,11 @@
  * @requires $state
  * @requires $sce
  * @requires $location
+ * @requires $uibModal
+ * @requires translate
  * @requires Nutupane
  * @requires Product
+ * @requires ProductBulkAction
  * @requires CurrentOrganization
  *
  * @description
@@ -16,11 +19,26 @@
  *   within the table.
  */
 angular.module('Bastion.products').controller('ProductsController',
-    ['$scope', '$state', '$sce', '$location', 'Nutupane', 'Product', 'CurrentOrganization', 'GlobalNotification',
-    function ($scope, $state, $sce, $location, Nutupane, Product, CurrentOrganization, GlobalNotification) {
-        var taskUrl, taskLink;
+    ['$scope', '$state', '$sce', '$location', '$uibModal', 'translate', 'Nutupane', 'Product', 'ProductBulkAction', 'CurrentOrganization', 'GlobalNotification',
+    function ($scope, $state, $sce, $location, $uibModal, translate, Nutupane, Product, ProductBulkAction, CurrentOrganization, GlobalNotification) {
+        var nutupane, taskUrl, taskLink, getBulkParams, bulkError, params;
 
-        var params = {
+        getBulkParams = function () {
+            return {
+                ids: _.map($scope.table.getSelected(), 'id'),
+                'organization_id': CurrentOrganization
+            };
+        };
+
+        bulkError = function (response) {
+            angular.forEach(response.data.errors, function(message) {
+                GlobalNotification.setErrorMessage(translate("An error occurred updating the sync plan: ") + message);
+            });
+
+            nutupane.refresh();
+        };
+
+        params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
             'sort_by': 'name',
@@ -29,24 +47,24 @@ angular.module('Bastion.products').controller('ProductsController',
             'paged': true
         };
 
-        $scope.productsNutupane = new Nutupane(Product, params);
-        $scope.productsNutupane.masterOnly = true;
-
-        $scope.table = $scope.productsNutupane.table;
+        nutupane = new Nutupane(Product, params);
         $scope.controllerName = 'katello_products';
+        nutupane.masterOnly = true;
+
+        $scope.table = nutupane.table;
 
         $scope.$on('productDelete', function (event, taskId) {
+            var message;
             taskUrl = $scope.taskUrl(taskId);
             taskLink = $sce.trustAsHtml("<a href=" + taskUrl + ">here</a>");
-            GlobalNotification.setRenderedSuccessMessage("Product delete operation has been initiated in the background. Click " + taskLink + " click to monitor the progress.");
+            message = translate("Product delete operation has been initiated in the background. Click %s to monitor the progress.");
+            GlobalNotification.setRenderedSuccessMessage(message.replace("%", taskLink));
         });
 
         $scope.unsetProductDeletionTaskId = function () {
             $scope.productDeletionTaskId = undefined;
         };
 
-        $scope.table.refresh = $scope.productsNutupane.refresh;
-
         $scope.mostImportantSyncState = function (product) {
             var state = 'none';
             if (product['sync_summary'].pending > 0) {
@@ -60,5 +78,69 @@ angular.module('Bastion.products').controller('ProductsController',
             }
             return state;
         };
+
+        $scope.syncProducts = function () {
+            var success;
+
+            success = function (task) {
+                var url = $state.href('task', {taskId: task.id}), message;
+
+                taskLink = $sce.trustAsHtml("<a href=" + url + ">here</a>");
+                message = translate("Product sync has been initiated in the background. " +
+                    "Click %s to monitor the progress.");
+
+                GlobalNotification.setRenderedSuccessMessage(message.replace('%s', taskLink));
+            };
+
+            ProductBulkAction.syncProducts(getBulkParams(), success, bulkError);
+        };
+
+        $scope.openSyncPlanModal = function () {
+            nutupane.invalidate();
+            $uibModal.open({
+                templateUrl: 'products/bulk/views/products-bulk-sync-plan-modal.html',
+                controller: 'ProductsBulkSyncPlanModalController',
+                size: 'lg',
+                resolve: {
+                    bulkParams: function () {
+                        return getBulkParams();
+                    }
+                }
+            }).closed.then(function () {
+                nutupane.refresh();
+            });
+        };
+
+        $scope.openAdvancedSyncModal = function () {
+            nutupane.invalidate();
+            $uibModal.open({
+                templateUrl: 'products/bulk/views/products-bulk-advanced-sync-modal.html',
+                controller: 'ProductsBulkAdvancedSyncModalController',
+                size: 'lg',
+                resolve: {
+                    bulkParams: function () {
+                        return getBulkParams();
+                    }
+                }
+            });
+        };
+
+        $scope.removeProducts = function () {
+            var success;
+
+            success = function (response) {
+                angular.forEach(response.displayMessages.success, function(message) {
+                    GlobalNotification.setSuccessMessage(message);
+                });
+
+                angular.forEach(response.displayMessages.error, function(message) {
+                    GlobalNotification.setErrorMessage(message);
+                });
+
+                nutupane.refresh();
+            };
+
+            ProductBulkAction.removeProducts(getBulkParams(), success, bulkError);
+        };
     }]
 );

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

@@ -62,18 +62,17 @@ angular.module('Bastion.products').config(['$stateProvider', function ($statePro
         permission: 'edit_products',
         templateUrl: 'products/discovery/views/discovery.html',
         ncyBreadcrumb: {
-            label: "{{ 'Repository Discovery' | translate }}",
+            label: "{{ 'Discover Repositories' | translate }}",
             parent: 'products'
         }
-
     })
     .state("product-discovery.create", {
         url: '/scan/create',
         permission: 'edit_products',
         templateUrl: 'products/discovery/views/discovery-create.html',
-        controller: 'DiscoveryFormController',
+        controller: 'DiscoveryCreateController',
         ncyBreadcrumb: {
-            label: "{{ 'Create Products' | translate }}",
+            label: "{{ 'Create Repositories' | translate }}",
             parent: 'product-discovery.scan'
         }
     });

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

@@ -6,72 +6,71 @@
     <h2 translate>Products</h2>
   </div>
 
-  <div data-block="list-actions" ng-controller="ProductsBulkActionController">
-    <button class="btn btn-default"
+  <div data-block="list-actions">
+    <button type="button" class="btn btn-primary"
             ui-sref="products.new.form"
             bst-feature-flag="custom_products"
             ng-show="permitted('create_products')">
-      <span translate>New Product</span>
+      <span translate>Create Product</span>
     </button>
 
-    <button class="btn btn-default"
+    <button type="button" class="btn btn-default"
             ui-sref="product-discovery.scan"
             bst-feature-flag="custom_products"
             ng-show="permitted('edit_products')">
       <span translate>Repo Discovery</span>
     </button>
 
-    <button class="btn btn-default"
-            ng-show="permitted('sync_products')"
-            ng-disabled="table.numSelected == 0"
-            ng-click="syncProducts()">
-      <span translate>Sync</span>
-    </button>
-
     <div class="btn-group" uib-dropdown keyboard-nav>
-      <button uib-dropdown-toggle class="btn btn-default"
-              ng-show="permitted('edit_products')"
-              ng-disabled="table.numSelected == 0">
-        <span translate>Change Sync Plan</span>
+      <button type="button" class="btn btn-default" uib-dropdown-toggle>
+        <span translate>Select Action</span>
+      </button>
+
+      <button type="button" class="btn btn-default" uib-dropdown-toggle>
         <span class="caret"></span>
+        <span class="sr-only" translate>Toggle Dropdown</span>
       </button>
 
-      <ul class="dropdown-menu-right" uib-dropdown-menu role="menu" aria-labelledby="simple-btn-keyboard-nav">
-        <li role="menuitem" ng-repeat="syncPlan in syncPlans.results" ng-show="syncPlans.results.length > 0">
-          <a ng-click="updateSyncPlan(syncPlan)">{{ syncPlan.name }}</a>
+      <ul class="dropdown-menu-right" uib-dropdown-menu role="menu" aria-labelledby="split-button">
+        <li role="menuitem" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="syncProducts()" ng-show="permitted('sync_products')" disable-link="table.numSelected === 0" translate>
+            Sync Selected
+          </a>
         </li>
 
-        <li role="menuitem" ng-hide="syncPlans.results.length > 0">
-          <a ui-sref="sync-plans.new" translate>New Sync Plan</a>
+        <li role="menuitem" ng-show="permitted('edit_products')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openAdvancedSyncModal()" disable-link="table.numSelected === 0" translate>
+            Advanced Sync
+          </a>
         </li>
 
-        <li class="divider"></li>
-        <li role="menuitem">
-          <a ng-click="removeSyncPlan()" translate>Remove Sync Plan</a>
+        <li role="menuitem" ng-show="permitted('edit_products')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openSyncPlanModal()" disable-link="table.numSelected === 0" translate>
+            Manage Sync Plan
+          </a>
         </li>
-      </ul>
-    </div>
 
-    <button class="btn btn-default"
-            ng-show="permitted('destroy_products')"
-            ng-disabled="table.numSelected == 0"
-            ng-click="openModal()">
-      <span translate>Remove</span>
-    </button>
+        <li class="divider"></li>
 
-    <div bst-modal="removeProducts()" model="table">
-      <div data-block="modal-header"
-           translate
-           translate-n="table.getSelected().length"
-           translate-plural="Remove {{ table.getSelected().length }} products?">
-        Remove product?
-      </div>
-      <div data-block="modal-body"
-           translate
-           translate-n="table.getSelected().length"
-           translate-plural="Are you sure you want to remove {{ table.getSelected().length }} products selected?">
-        Are you sure you want to remove {{ table.getSelected()[0].name }}?
-      </div>
+        <li role="menuitem" ng-show="permitted('destroy_products')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openModal()" disable-link="table.numSelected === 0" translate>Remove</a>
+
+          <div bst-modal="removeProducts()" model="table">
+            <div data-block="modal-header"
+                 translate
+                 translate-n="table.getSelected().length"
+                 translate-plural="Remove {{ table.getSelected().length }} products?">
+              Remove product?
+            </div>
+            <div data-block="modal-body"
+                 translate
+                 translate-n="table.getSelected().length"
+                 translate-plural="Are you sure you want to remove {{ table.getSelected().length }} products selected?">
+              Are you sure you want to remove {{ table.getSelected()[0].name }}?
+            </div>
+          </div>
+        </li>
+      </ul>
     </div>
   </div>