katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery-repositories.service.js

@@ -0,0 +1,94 @@
+(function () {
+
+    /**
+     * @ngdoc service
+     * @name Bastion.products.service:DiscoveryRepositories
+     *
+     * @description
+     *   Provides a helper service for discovery repositories.
+     *
+     */
+    function DiscoveryRepositories() {
+        this.rows = [];
+        this.repositoryUrl = '';
+        this.upstreamUsername = '';
+        this.upstreamPassword = '';
+
+        /**
+         * Allows setting the rows.
+         *
+         * @param {Array} selected rows
+         **/
+        this.setRows = function (rows) {
+            this.rows = rows;
+        };
+
+        /**
+         * Return the list of rows.
+         *
+         * @returns {Array} array of rows
+         */
+        this.getRows = function () {
+            return this.rows;
+        };
+
+        /**
+         * Allows setting the repository URL.
+         *
+         * @param {Array} selected repositoryUrl
+         **/
+        this.setRepositoryUrl = function (repositoryUrl) {
+            this.repositoryUrl = repositoryUrl;
+        };
+
+        /**
+         * Return the list of repository URL.
+         *
+         * @returns {Array} array of repositoryUrl
+         */
+        this.getRepositoryUrl = function () {
+            return this.repositoryUrl;
+        };
+
+        /**
+         * Allows setting the upstream username.
+         *
+         * @param {Array} selected upstreamUsername
+         **/
+        this.setUpstreamUsername = function (upstreamUsername) {
+            this.upstreamUsername = upstreamUsername;
+        };
+
+        /**
+         * Return the list of upstream username.
+         *
+         * @returns {Array} array of upstreamUsername
+         */
+        this.getUpstreamUsername = function () {
+            return this.upstreamUsername;
+        };
+
+        /**
+         * Allows setting the upstream password.
+         *
+         * @param {Array} selected upstreamPassword
+         **/
+        this.setUpstreamPassword = function (upstreamPassword) {
+            this.upstreamPassword = upstreamPassword;
+        };
+
+        /**
+         * Return the list of upstream password.
+         *
+         * @returns {Array} array of upstreamPassword
+         */
+        this.getUpstreamPassword = function () {
+            return this.upstreamPassword;
+        };
+    }
+
+    angular.module('Bastion.products').service('DiscoveryRepositories', DiscoveryRepositories);
+
+    DiscoveryRepositories.$inject = [];
+
+})();

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

@@ -1,6 +1,6 @@
 /**
  * @ngdoc object
- * @name  Bastion.products.controller:DisocveryController
+ * @name  Bastion.products.controller:DiscoveryController
  *
  * @requires $scope
  * @requires $q
@@ -9,36 +9,65 @@
  * @requires Task
  * @requires Organization
  * @requires CurrentOrganization
+ * @requires DiscoveryRepositories
+ * @requires translate
  *
  * @description
  *   Provides the functionality for the repo discovery action pane.
  */
 angular.module('Bastion.products').controller('DiscoveryController',
-    ['$scope', '$q', '$timeout', '$http', 'Task', 'Organization', 'CurrentOrganization',
-    function ($scope, $q, $timeout, $http, Task, Organization, CurrentOrganization) {
+    ['$scope', '$q', '$timeout', '$http', 'Task', 'Organization', 'CurrentOrganization', 'DiscoveryRepositories', 'translate',
+    function ($scope, $q, $timeout, $http, Task, Organization, CurrentOrganization, DiscoveryRepositories, translate) {
         var transformRows, setDiscoveryDetails;
 
-        $scope.discovery = {url: ''};
+        $scope.successMessages = [];
+        $scope.errorMessages = [];
+
+        $scope.discovery = {
+            url: '',
+            contentType: 'yum'
+        };
+
         $scope.page = {loading: false};
 
-        if (!$scope.discoveryTable) {
-            $scope.discoveryTable = {rows: []};
+        $scope.contentTypes = [
+            {id: "yum", name: "Yum Repositories"},
+            {id: "docker", name: "Docker Images"}
+        ];
+
+        if (!$scope.table) {
+            $scope.table = {
+                rows: [],
+                resource: {
+                    total: 0,
+                    subtotal: 0
+                },
+                numSelected: 0
+            };
         }
 
         setDiscoveryDetails = function (task) {
-            $scope.discovery.pending = task.pending;
-
-            if (!task.pending) {
-                $scope.discovery.working = false;
-            }
-
-            $scope.discovery.url = task.input;
-            $scope.discoveryTable.rows = transformRows(task.output);
+            $scope.table.rows = transformRows(task.output);
+            $scope.table.resource.total = $scope.table.rows.length;
+            $scope.table.resource.subtotal = $scope.table.resource.total;
         };
 
         $scope.setupSelected = function () {
+            var url;
+
+            if (!_.startsWith($scope.discovery.url, 'http')) {
+                url = 'http://' + $scope.discovery.url;
+            } else {
+                url = $scope.discovery.url;
+            }
             $scope.page.loading = true;
-            $scope.discovery.selected = $scope.discoveryTable.getSelected();
+            $scope.discovery.selected = $scope.table.getSelected();
+
+            DiscoveryRepositories.setRows($scope.table.getSelected());
+            DiscoveryRepositories.setRepositoryUrl(url);
+            DiscoveryRepositories.setUpstreamUsername($scope.discovery.upstreamUsername);
+            DiscoveryRepositories.setUpstreamPassword($scope.discovery.upstreamPassword);
+
             $scope.transitionTo('product-discovery.create').then(function () {
                 $scope.page.loading = false;
             });
@@ -50,7 +79,8 @@ angular.module('Bastion.products').controller('DiscoveryController',
         };
 
         $scope.cancelDiscovery = function () {
-            $scope.discovery.working = true;
+            $scope.discovery.working = false;
+            Task.unregisterSearch($scope.taskSearchId);
             Organization.cancelRepoDiscover({id: CurrentOrganization});
         };
 
@@ -59,13 +89,22 @@ angular.module('Bastion.products').controller('DiscoveryController',
             baseUrl = $scope.discovery.url;
 
             toRet = _.map(urls, function (url) {
-                var path = url.replace(baseUrl, "");
-                return {
-                    url: url,
-                    path: path,
-                    name: $scope.defaultName(path),
-                    label: ''
+                var params;
+
+                params = {
+                    url: $scope.discovery.url,
+                    label: '',
+                    contentType: $scope.discovery.contentType
                 };
+                if ($scope.discovery.contentType === 'yum') {
+                    params.path = url.replace(baseUrl, "");
+                    params.name = $scope.defaultName(params.path);
+                } else {
+                    params.dockerUpstreamName = url;
+                    params.path = url;
+                    params.name = url;
+                }
+                return params;
             });
 
             return _.sortBy(toRet, function (item) {
@@ -74,20 +113,35 @@ angular.module('Bastion.products').controller('DiscoveryController',
         };
 
         $scope.updateTask = function (task) {
-            setDiscoveryDetails(task);
-            if (!task.pending) {
-                Task.unregisterSearch($scope.taskSearchId);
+            if ($scope.discovery.working) {
+                setDiscoveryDetails(task);
+                if (task.state !== "running" && task.state !== "planned") {
+                    $scope.discovery.working = false;
+                    Task.unregisterSearch($scope.taskSearchId);
+                    if (task.result === "error") {
+                        $scope.errorMessages = [translate("Discovery failed. Error: %s").replace('%s', task.humanized.errors[0])];
+                    }
+                }
             }
         };
 
         $scope.discover = function () {
-            $scope.discovery.pending = true;
-            $scope.discoveryTable.rows = [];
-            $scope.discoveryTable.selectAll(false);
-            Organization.repoDiscover({id: CurrentOrganization, url: $scope.discovery.url}, function (task) {
+            var params;
+
+            $scope.discovery.working = true;
+            $scope.table.rows = [];
+            $scope.table.selectAll(false);
+            params = {
+                id: CurrentOrganization, url: $scope.discovery.url,
+                'content_type': $scope.discovery.contentType,
+                'upstream_username': $scope.discovery.upstreamUsername,
+                'upstream_password': $scope.discovery.upstreamPassword
+            };
+            $scope.successMessages = [];
+            $scope.errorMessages = [];
+            Organization.repoDiscover(params, function (task) {
                 $scope.taskSearchId = Task.registerSearch({ 'type': 'task', 'task_id': task.id }, $scope.updateTask);
             });
         };
-
     }]
 );

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

@@ -2,7 +2,7 @@
   <div ng-show="page.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
   <header data-block="header">
-    <h2 translate>Yum Repo Discovery</h2>
+    <h2 translate>Repository Discovery</h2>
   </header>
 
   <div data-block="content">

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

@@ -0,0 +1,3 @@
+<span ng-class="createStatusIcon()"></span>
+<span ng-if="!repo.created">{{ createStatusMessages() }}</span>
+<span ng-if="repo.created"><a ui-sref="product.repository.info({productId: repo.productId, repositoryId: repo.repositoryId})">{{ "Repository created" | translate }}</a></span>

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

@@ -1,142 +1,173 @@
-<span page-title>{{ 'Create Repositories' | translate }}</span>
+<span page-title>{{ "Create Discovered Repositories" | translate }}</span>
 
-<form name="productForm" class="col-sm-5" ng-disabled="creating()" novalidate role="form">
+<div class="row">
+  <form name="productForm" ng-disabled="creating()" novalidate class="col-sm-5" role="form">
+    <h4 translate>Product Options</h4>
 
-  <section>
-    <h4 translate>Create Repositories Within:</h4>
+    <div bst-form-group label="{{ 'Product' | translate }}">
+      <select ng-model="createRepoChoices.newProduct">
+        <option value="true" translate>New Product</option>
+        <option value="false" translate>Existing Product</option>
+      </select>
+    </div>
 
-    <div class="form-group">
-      <label class="checkbox-inline">
-        <input type="radio"
-               name="newProduct"
-               value="false"
-               ng-model="createRepoChoices.newProduct"
-               ng-disabled="creating()"/>
-        <span translate>Existing Product</span>
-      </label>
+    <div bst-form-group ng-show="createRepoChoices.newProduct === 'false'"
+         label="{{ 'Name' | translate }}">
+      <select class="form-control" ng-disabled="creating()"
+              ng-model="createRepoChoices.existingProductId"
+              ng-options="product.id as product.name for product in products"
+              ng-required="createRepoChoices.newProduct === 'false'"/>
+    </div>
 
-      <label class="checkbox-inline">
-        <input type="radio"
-               name="newProduct"
-               value="true"
-               ng-model="createRepoChoices.newProduct"
-               ng-disabled="creating()"/>
-        <span translate>New Product</span>
-      </label>
+    <div bst-form-group ng-show="createRepoChoices.newProduct === 'true'"
+         label="{{ 'Name' | translate }}">
+      <input id="productName"
+             type="text"
+             class="form-control"
+             ng-model="createRepoChoices.product.name"
+             ng-disabled="creating()"
+             name="name"
+             ng-required="createRepoChoices.newProduct === 'true'"/>
     </div>
 
-    <div class="form-group">
-      <div class="col-md-5" ng-hide="createRepoChoices.newProduct">
-        <select class="form-control" ng-disabled="creating()"
-                ng-model="createRepoChoices.existingProductId"
-                ng-options="product.id as product.name for product in products">
-        </select>
-      </div>
+    <div bst-form-group ng-show="createRepoChoices.newProduct === 'true'"
+         label="{{ 'Label' | translate }}">
+      <input id="productLabel"
+             type="text"
+             class="form-control"
+             ng-model="createRepoChoices.product.label"
+             ng-disabled="creating()"
+             name="label"
+             ng-required="createRepoChoices.newProduct === 'true'"/>
     </div>
 
-    <div ng-show="createRepoChoices.newProduct">
-
-      <div bst-alerts error-messages="productErrorMessages"></div>
-
-      <div class="form-group required">
-        <label class="control-label col-sm-1 text-left" translate>Name</label>
-        <div class="col-sm-5 input">
-          <input ng-model="createRepoChoices.product.name"
-                 id="name"
-                 name="name"
-                 type="text"
-                 class="form-control"
-                 tabindex=1
-                 ng-required="createRepoChoices.newProduct === 'true'"/>
-        </div>
-      </div>
-
-      <div class="form-group required">
-        <label class="control-label col-sm-1" translate>Label</label>
-        <div class="col-sm-5 input">
-          <input ng-model="createRepoChoices.product.label"
-                 id="label"
-                 name="label"
-                 type="text"
-                 class="form-control"
-                 tabindex=2
-                 ng-required="createRepoChoices.newProduct === 'true'"/>
-        </div>
-      </div>
-
-      <div class="form-group">
-        <label class="control-label col-sm-1" translate>GPG Key</label>
-        <div class="col-sm-5 input">
-          <select class="form-control" ng-model="createRepoChoices.product.gpg_key_id"
-                  ng-options="gpg_key.id as gpg_key.name for gpg_key in gpgKeys">
-          </select>
-        </div>
-      </div>
-
-     </div>
-  </section>
-
-  <section>
-    <h4 translate>Options:</h4>
-    <div class="checkbox">
+
+    <div bst-form-group ng-show="createRepoChoices.newProduct === 'true' && gpgKeys.length !== 0"
+         label="{{ 'GPG Key' | translate }}">
+      <select class="form-control" ng-model="createRepoChoices.product.gpg_key_id"
+              ng-options="gpg_key.id as gpg_key.name for gpg_key in gpgKeys"/>
+    </div>
+
+    <h4 translate>Repository Options</h4>
+
+    <div class="checkbox" ng-show="discovery.contentType === 'yum'">
       <label>
-        <input type="checkbox"
-               id="unprotected"
-               ng-model="createRepoChoices.unprotected"
-               ng-disabled="creating()"/>
-        <span translate>Serve via HTTP.</span>
+        <input type="checkbox" id="unprotected" ng-model="createRepoChoices.unprotected" ng-disabled="creating()"/>
+        <span translate>Serve via HTTP</span>
       </label>
     </div>
-  </section>
 
-  <section>
-    <h4 ng-show="discovery.selected.length > 0" translate>Selected URLs:</h4>
+    <div bst-form-group ng-show="discovery.contentType === 'docker'"
+         label="{{ 'Registry URL' | translate }}">
+      <input type="text"
+             id="registryUrl"
+             class="form-control"
+             ng-model="createRepoChoices.repositoryUrl"
+             ng-disabled="creating()"/>
+    </div>
 
-    <div ng-repeat="repo in discovery.selected">
+    <div class="checkbox">
+      <label>
+        <input type="checkbox" id="verify_ssl" ng-model="createRepoChoices.verifySsl" ng-disabled="creating()"/>
+        <span translate>Verify SSL</span>
+      </label>
+    </div>
 
-      <div class="col-sm-offset-0 bottom-padding">
-        <i class="fa fa-circle"></i>
-        <span>{{  repo.url }}</span>
-        <i class="fa fa-check" ng-show="repo.created"></i>
-      </div>
+    <div bst-form-group ng-show="discovery.contentType === 'docker'"
+         label="{{ 'Registry username' | translate }}">
+      <input id="registryUsername"
+             type="text"
+             class="form-control"
+             ng-model="createRepoChoices.upstreamUsername"
+             ng-disabled="creating()"
+             name="upstreamUsername"/>
+    </div>
 
-      <div class="form-group required">
-        <label class="control-label col-sm-1" translate>Name</label>
-        <div class="col-sm-4 input">
-          <input ng-model="repo.name"
-                 ng-disabled="creating() || repo.created"
+    <div bst-form-group ng-show="discovery.contentType === 'docker'"
+         label="{{ 'Registry Password' | translate }}">
+      <input id="registryPassword"
+             type="password"
+             class="form-control"
+             ng-model="createRepoChoices.upstreamPassword"
+             ng-disabled="creating()"
+             name="upstreamPassword"/>
+    </div>
+  </form>
+</div>
+
+  <h4 translate>Repositories to Create</h4>
+
+<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 data-block="list-actions">
+    <button class="btn btn-primary"
+            translate
+            ng-click="createRepos()"
+            ng-disabled="creating() || !requiredFieldsEnabled()">
+      Run Repository Creation
+      <i class="fa fa-spinner fa-spin" ng-show="creating()"></i>
+    </button>
+  </div>
+
+  <span data-block="no-rows-message" translate>
+    No matching results.
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero results.
+  </span>
+
+  <div data-block="table">
+    <table bst-table="table"
+           class="table table-full table-bordered"
+           ng-show="table.rows.length > 0">
+      <thead>
+        <tr bst-table-head>
+          <th bst-table-column="task" translate>Create Status</th>
+          <th bst-table-column="name" translate ng-show="discovery.contentType === 'docker'">Upstream Image Name</th>
+          <th bst-table-column="name" translate>Repository Name</th>
+          <th bst-table-column="label" translate>Repository Label</th>
+          <th bst-table-column="url" translate ng-show="discovery.contentType === 'yum'">Repository URL</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="repo in table.rows | filter:tableFilter">
+          <td bst-table-cell>
+            <span ng-class="createStatusIcon(repo)"></span>
+            <span ng-if="!repo.created">{{ createStatusMessages(repo) }}</span>
+            <span ng-if="repo.created"><a ui-sref="product.repository.info({productId: repo.productId, repositoryId: repo.repositoryId})" translate>Repository created</a></span>
+
+          </td>
+          <td bst-table-cell ng-show="discovery.contentType === 'docker'">
+            {{ repo.dockerUpstreamName }}
+          </td>
+          <td bst-table-cell>
+            <input class="form-control"
+                 ng-model="repo.name"
                  name="repo_name"
-                 type="text"
-                 class="form-control"
+                 ng-hide="creating() || repo.created"
                  required/>
-        </div>
-      </div>
-
-      <div class="form-group required">
-        <label class="control-label col-sm-1" translate>Label</label>
-        <div class="col-sm-4 input">
-          <input ng-model="repo.label"
-                 ng-disabled="creating() || repo.created"
+            <span ng-show="creating() || repo.created">{{ repo.name }}</span>
+          </td>
+          <td bst-table-cell ng-disabled="creating()">
+            <input class="form-control"
+                 ng-model="repo.label"
                  name="repo_label"
-                 type="text"
-                 class="form-control"
+                 ng-hide="creating() || repo.created"
                  required/>
-        </div>
-      </div>
-    </div>
-
-    <div class="form">
-      <div class="control-group buttons">
-        <div class="input">
-          <button ng-click="createRepos()"
-                  ng-disabled="creating() || !requiredFieldsEnabled()"
-                  translate
-                  class="btn btn-primary btn-large">
-            <i class="fa fa-spinner fa-spin" ng-show="creating()"></i>
-            Create
-          </button>
-        </div>
-      </div>
-    </div>
-  </section>
-</form>
+            <span ng-show="creating() || repo.created">{{ repo.label }}</span>
+          </td>
+          <td bst-table-cell ng-show="discovery.contentType === 'yum'">
+            {{ repo.url }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>