katello 3.6.0.1.rc2 → 3.7.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-debs.html

@@ -17,14 +17,14 @@
       <div data-block="modal-header"
            translate
            translate-n="table.numSelected"
-           translate-plural="Remove {{ table.numSelected }} debs?">
+           translate-plural="Remove {{ table.numSelected }} packages?">
         Remove Package?
       </div>
       <div data-block="modal-body"
            translate
            translate-n="table.numSelected"
            translate-plural="Are you sure you want to remove the {{ table.numSelected }} packages selected?">
-        Are you sure you want to remove the {{ table.getSelected()[0].name }}?
+        Are you sure you want to remove the {{ table.getSelected()[0].name }} package?
       </div>
     </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifest-lists.html

@@ -1,10 +1,10 @@
-<span page-title ng-model="repository">{{ 'View Docker Manifest Lists for Repository:' | translate }} {{ repository.name }}</span>
+<span page-title ng-model="repository">{{ 'View Container Image Manifest Lists for Repository:' | translate }} {{ repository.name }}</span>
 
 <div data-block="messages">
   <div bst-alert="success" ng-hide="generationTaskId === undefined">
     <button type="button" class="close" ng-click="clearTaskId()">&times;</button>
     <p translate>
-      Docker metadata generation has been initiated in the background.  Click
+      Container Image metadata generation has been initiated in the background.  Click
       <a ng-href="{{ taskUrl() }}">Here</a> to monitor the progress.
     </p>
   </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifests.html

@@ -1,10 +1,10 @@
-<span page-title ng-model="repository">{{ 'Manage Docker Manifests for Repository:' | translate }} {{ repository.name }}</span>
+<span page-title ng-model="repository">{{ 'Manage Container Image Manifests for Repository:' | translate }} {{ repository.name }}</span>
 
 <div data-block="messages">
   <div bst-alert="success" ng-hide="generationTaskId === undefined">
     <button type="button" class="close" ng-click="clearTaskId()">&times;</button>
     <p translate>
-      Docker metadata generation has been initiated in the background.  Click
+      Container Image metadata generation has been initiated in the background.  Click
       <a ng-href="{{ taskUrl() }}">Here</a> to monitor the progress.
     </p>
   </div>
@@ -16,14 +16,14 @@
       <div data-block="modal-header"
            translate
            translate-n="table.numSelected"
-           translate-plural="Remove {{ table.numSelected  }} Docker Manifests?">
-        Remove {{ table.numSelected  }} Docker Manifest?
+           translate-plural="Remove {{ table.numSelected  }} Container Image manifests?">
+        Remove {{ table.numSelected  }} Container Image manifest?
       </div>
       <div data-block="modal-body"
            translate
            translate-n="table.numSelected"
-           translate-plural="Are you sure you want to remove the {{ table.numSelected }} Docker manifests selected?">
-        Are you sure you want to remove the {{ table.numSelected }} Docker manifest selected?
+           translate-plural="Are you sure you want to remove the {{ table.numSelected }} Container Image manifests selected?">
+        Are you sure you want to remove the {{ table.numSelected }} Container Image manifest selected?
       </div>
     </div>
 
@@ -32,7 +32,7 @@
             ng-hide="denied('edit_products')"
             ng-disabled="table.working || table.numSelected === 0">
       <i class="fa fa-trash-o" ng-hide="table.working"></i>
-      <span translate>Remove Docker Manifests</span>
+      <span translate>Remove Container Image Manifests</span>
     </button>
   </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-tags.html

@@ -0,0 +1,47 @@
+<span page-title ng-model="repository">{{ 'View Docker Tags for Repository:' | translate }} {{ repository.name }}</span>
+
+<div data-block="messages">
+    <div bst-alert="success" ng-hide="generationTaskId === undefined">
+        <button type="button" class="close" ng-click="clearTaskId()">&times;</button>
+        <p translate>
+            Docker metadata generation has been initiated in the background.  Click
+            <a ng-href="{{ taskUrl() }}">Here</a> to monitor the progress.
+        </p>
+    </div>
+</div>
+
+<div data-extend-template="layouts/partials/table.html">
+
+    <div data-block="table">
+        <table class="table table-striped table-bordered" >
+
+            <thead>
+            <tr bst-table-head>
+                <th bst-table-column="name">{{ "Name" | translate }}</th>
+                <th bst-table-column="schema_version">{{ "Available Schema Versions" | translate }}</th>
+                <th bst-table-column="product">{{ "Product Name" | translate }}</th>
+                <th bst-table-column="repository">{{ "Repository Name" | translate }}</th>
+            </tr>
+            </thead>
+
+            <tbody>
+            <tr bst-table-row ng-repeat="tag in table.rows">
+                <td bst-table-cell>
+                    <a ui-sref="docker-tag.info({tagId: tag.id})">
+                        {{ tag.name }}
+                    </a>
+                </td>
+                <td bst-table-cell>
+                    {{ availableSchemaVersions(tag) }}
+                </td>
+                <td bst-table-cell>
+                    {{ tag.product.name }}
+                </td>
+                <td bst-table-cell>
+                    {{ tag.repository.name }}
+                </td>
+            </tr>
+            </tbody>
+        </table>
+    </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-files.html

@@ -22,7 +22,7 @@
            translate
            translate-n="table.numSelected"
            translate-plural="Are you sure you want to remove the {{ table.numSelected }} files selected?">
-        Are you sure you want to remove the {{ table.getSelected()[0].name }}?
+        Are you sure you want to remove the {{ table.getSelected()[0].name }} file?
       </div>
     </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-packages.html

@@ -21,7 +21,7 @@
       <div data-block="modal-body"
            translate
            translate-n="table.numSelected"
-           translate-plural="Are you sure you want to remove the {{ table.numSelected }} packages?">
+           translate-plural="Are you sure you want to remove the {{ table.numSelected }} packages selected?">
         Are you sure you want to remove the {{ table.getSelected()[0].name }} package?
       </div>
     </div>

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

@@ -5,7 +5,7 @@
  * @requires $scope
  * @requires Repository
  * @requires Product
- * @requires GPGKey
+ * @requires ContentCredential
  * @requires FormUtils
  * @requires translate
  * @requires Notification
@@ -15,13 +15,15 @@
  * @requires DownloadPolicy
  * @requires OstreeUpstreamSyncPolicy
  * @requires Architecture
+ * @requires RepositoryTypesService
+ * @requires YumContentUnits
  *
  * @description
  *   Controls the creation of an empty Repository object for use by sub-controllers.
  */
 angular.module('Bastion.repositories').controller('NewRepositoryController',
-    ['$scope', 'Repository', 'Product', 'GPGKey', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture',
-    function ($scope, Repository, Product, GPGKey, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture) {
+    ['$scope', 'Repository', 'Product', 'ContentCredential', 'FormUtils', 'translate', 'Notification', 'ApiErrorHandler', 'BastionConfig', 'Checksum', 'YumContentUnits', 'DownloadPolicy', 'OstreeUpstreamSyncPolicy', 'Architecture', 'RepositoryTypesService',
+    function ($scope, Repository, Product, ContentCredential, FormUtils, translate, Notification, ApiErrorHandler, BastionConfig, Checksum, YumContentUnits, DownloadPolicy, OstreeUpstreamSyncPolicy, Architecture, RepositoryTypesService) {
 
         function success() {
             Notification.setSuccessMessage(translate('Repository %s successfully created.').replace('%s', $scope.repository.name));
@@ -69,13 +71,13 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
         });
 
-        Repository.repositoryTypes({'creatable': true}, function (data) {
-            $scope.repositoryTypes = data;
-        });
+        $scope.repositoryTypes = RepositoryTypesService.creatable();
+        $scope.repositoryTypes = _.sortBy($scope.repositoryTypes, 'name');
 
         $scope.checksums = Checksum.checksums;
         $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
         $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
+        $scope.ignorableYumContentUnits = YumContentUnits.units;
 
         $scope.$watch('repository.name', function () {
             if ($scope.repositoryForm && $scope.repositoryForm.name) {
@@ -84,8 +86,8 @@ angular.module('Bastion.repositories').controller('NewRepositoryController',
             }
         });
 
-        GPGKey.queryUnpaged(function (gpgKeys) {
-            $scope.gpgKeys = gpgKeys.results;
+        ContentCredential.queryUnpaged(function (contentCredentials) {
+            $scope.contentCredentials = contentCredentials.results;
         });
 
         Architecture.queryUnpaged(function (architecture) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -48,8 +48,7 @@
         <input id="url"
                name="url"
                ng-model="repository.url"
-               type="text"
-               ng-required="repository.content_type === 'docker'"/>
+               type="text"/>
         <p class="help-block" ng-show="repository.content_type === 'docker'" translate>
           URL of the registry you want to sync. Example: https://registry-1.docker.io/
         </p>
@@ -107,14 +106,26 @@
         <input id="docker_upstream_name"
                name="docker_upstream_name"
                ng-model="repository.docker_upstream_name"
-               type="text"
-               ng-required="repository.content_type === 'docker'"/>
+               type="text"/>
         <p class="help-block" translate>
           Name of the upstream repository you want to sync. Example: 'busybox' or 'fedora/ssh'.
         </p>
 
       </div>
 
+      <div bst-form-group label="{{ 'Ignorable Content' | translate }}"  ng-show="repository.content_type === 'yum'">
+        <select id="ignorable_content"
+                name="ignorable_content"
+                multiple="true"
+                ng-model="repository.ignorable_content"
+                ng-options="id as name for (id, name) in ignorableYumContentUnits">
+        </select>
+
+        <h6 translate>
+          Select content units to ignore while synchronizing this repository.
+        </h6>
+      </div>
+
       <div class="checkbox">
         <label>
           <input id="verify_ssl_on_sync" name="verify_ssl_on_sync" ng-model="repository.verify_ssl_on_sync" type="checkbox"/>
@@ -209,7 +220,34 @@
         <select id="gpg_key_id"
                 name="gpg_key_id"
                 ng-model="repository.gpg_key_id"
-                ng-options="gpg_key.id as gpg_key.name for gpg_key in gpgKeys">
+                ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials | filter: { 'content_type': 'gpg_key' }">
+          <option value=""></option>
+        </select>
+      </div>
+
+      <div bst-form-group label="{{ 'SSL CA Cert' | translate }}" ng-show="repository.content_type === 'yum'">
+        <select id="ssl_ca_cert_id"
+                name="ssl_ca_cert_id"
+                ng-model="repository.ssl_ca_cert_id"
+                ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials | filter: { 'content_type': 'cert' }">
+          <option value=""></option>
+        </select>
+      </div>
+
+      <div bst-form-group label="{{ 'SSL Client Cert' | translate }}" ng-show="repository.content_type === 'yum'">
+        <select id="ssl_client_cert_id"
+                name="ssl_client_cert_id"
+                ng-model="repository.ssl_client_cert_id"
+                ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials | filter: { 'content_type': 'cert' }">
+          <option value=""></option>
+        </select>
+      </div>
+
+      <div bst-form-group label="{{ 'SSL Client Key' | translate }}" ng-show="repository.content_type === 'yum'">
+        <select id="ssl_client_key_id"
+                name="ssl_client_key_id"
+                ng-model="repository.ssl_client_key_id"
+                ng-options="content_credential.id as content_credential.name for content_credential in contentCredentials | filter: { 'content_type': 'cert' }">
           <option value=""></option>
         </select>
       </div>

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

@@ -104,7 +104,16 @@
             permission: 'view_products',
             templateUrl: 'products/details/repositories/details/views/repository-manage-docker-manifests.html',
             ncyBreadcrumb: {
-                label: "{{'Docker Manifests' | translate }}",
+                label: "{{'Container Image Manifests' | translate }}",
+                parent: 'product.repository.info'
+            }
+        })
+        .state('product.repository.manage-content.docker-tags', {
+            url: '/content/docker_tags',
+            permission: 'view_products',
+            templateUrl: 'products/details/repositories/details/views/repository-manage-docker-tags.html',
+            ncyBreadcrumb: {
+                label: "{{'Docker Tags' | translate }}",
                 parent: 'product.repository.info'
             }
         })
@@ -113,7 +122,7 @@
             permission: 'view_products',
             templateUrl: 'products/details/repositories/details/views/repository-manage-docker-manifest-lists.html',
             ncyBreadcrumb: {
-                label: "{{'Docker Manifest Lists' | translate }}",
+                label: "{{'Container Image Manifest Lists' | translate }}",
                 parent: 'product.repository.info'
             }
         })

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repository-types.service.js

@@ -0,0 +1,39 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc service
+     * @name  Bastion.products.details.repositories.service:RepositoryTypes
+     *
+     * @description
+     *   Provides common functions for managing content types and can build a Nutupane
+     *   pre-configured for the content type based on params that are passed in and the
+     *   current state of the application.
+     */
+    function RepositoryTypesService(repositoryTypes) {
+
+        this.repositoryTypes = function () {
+            return repositoryTypes;
+        };
+
+        this.creatable = function() {
+            return _.filter(repositoryTypes, function (type) {
+                return type.creatable;
+            });
+        };
+
+        this.repositoryTypeEnabled = function (desiredType) {
+            var found = _.find(repositoryTypes, function(type) {
+                return type.id === desiredType;
+            });
+            return angular.isDefined(found);
+        };
+    }
+
+    angular
+        .module('Bastion.environments')
+        .service('RepositoryTypesService', RepositoryTypesService);
+
+    RepositoryTypesService.$inject = ['repositoryTypes'];
+
+})();

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

@@ -4,7 +4,7 @@
   <div data-block="list-actions">
     <button type="button" class="btn btn-default"
             ui-sref="product.repositories.new({productId: product.id})"
-            ng-hide="denied('edit_products', product) || product.redhat">
+            ng-hide="!product.$resolved || denied('edit_products', product) || product.redhat">
       <span translate>New Repository</span>
     </button>
 
@@ -17,7 +17,7 @@
 
     <button type="button" class="btn btn-default"
             ng-click="openModal()"
-            ng-show="canRemoveRepositories(product)"
+            ng-show="product.$resolved && canRemoveRepositories(product)"
             ng-disabled="removingRepositories || table.numSelected == 0">
       <span ng-show="removingRepositories">
         <i class="fa fa-spinner inline-icon fa-spin"></i>
@@ -137,17 +137,17 @@
             <span ng-show="repository.content_type == 'docker'">
               <div>
                 <a ui-sref="product.repository.manage-content.docker-manifests({productId: product.id, repositoryId: repository.id})" translate>
-                  {{ repository.content_counts.docker_manifest || 0 }} Docker Manifests
+                  {{ repository.content_counts.docker_manifest || 0 }} Container Image Manifests
                 </a>
               </div>
               <div>
                 <a ui-sref="product.repository.manage-content.docker-manifest-lists({productId: product.id, repositoryId: repository.id})" translate>
-                  {{ repository.content_counts.docker_manifest_list || 0 }} Docker Manifest Lists
+                  {{ repository.content_counts.docker_manifest_list || 0 }} Container Image Manifest Lists
                 </a>
               </div>
               <div>
-                <a ui-sref="product.repository.manage-content.docker-manifests({productId: product.id, repositoryId: repository.id})" translate>
-                  {{ repository.content_counts.docker_tag || 0 }} Docker Tags
+                <a ui-sref="product.repository.manage-content.docker-tags({productId: product.id, repositoryId: repository.id})" translate>
+                  {{ repository.content_counts.docker_tag || 0 }} Container Image Tags
                 </a>
               </div>
             </span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/yum-content-units.service.js

@@ -0,0 +1,24 @@
+/**
+ * @ngdoc service
+ * @name  Bastion.repository.service:YumContentUnits
+ *
+ * @requires translate
+ *
+ * @description
+ *   Provides content type units for yum
+ */
+angular.module('Bastion.repositories').service('YumContentUnits',
+    ['translate', function (translate) {
+        this.units = {
+            'rpm': translate('RPM'),
+            'drpm': translate('Delta RPM'),
+            'srpm': translate('Source RPM'),
+            'erratum': translate('Errata'),
+            'distribution': translate('Distribution')
+        };
+
+        this.unitName = function (unit) {
+            return this.units[unit];
+        };
+    }]
+);

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

@@ -22,6 +22,30 @@
           on-save="save(product)">
       </dd>
 
+      <dt translate>SSL CA Cert</dt>
+      <dd bst-edit-select="product.ssl_ca_cert.name"
+          readonly="product.redhat || denied('edit_products', product)"
+          selector="product.ssl_ca_cert_id"
+          options="certs()"
+          on-save="save(product)">
+      </dd>
+
+      <dt translate>SSL Client Cert</dt>
+      <dd bst-edit-select="product.ssl_client_cert.name"
+          readonly="product.redhat || denied('edit_products', product)"
+          selector="product.ssl_client_cert_id"
+          options="certs()"
+          on-save="save(product)">
+      </dd>
+
+      <dt translate>SSL Client Key</dt>
+      <dd bst-edit-select="product.ssl_client_key.name"
+          readonly="product.redhat || denied('edit_products', product)"
+          selector="product.ssl_client_key_id"
+          options="certs()"
+          on-save="save(product)">
+      </dd>
+
       <dt translate>Description</dt>
       <dd bst-edit-textarea="product.description"
           on-save="save(product)"

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

@@ -8,7 +8,7 @@
  * @requires CurrentOrganization
  * @requires Product
  * @requires Repository
- * @requires GPGKey
+ * @requires ContentCredential
  * @requires FormUtils
  * @requires DiscoveryRepositories
  * @requires translate
@@ -18,8 +18,8 @@
  *      repository discovery.
  */
 angular.module('Bastion.products').controller('DiscoveryCreateController',
-    ['$scope', '$q', 'Notification', 'CurrentOrganization', 'Product', 'Repository', 'GPGKey', 'FormUtils', 'DiscoveryRepositories', 'translate', 'ApiErrorHandler',
-    function ($scope, $q, Notification, CurrentOrganization, Product, Repository, GPGKey, FormUtils, DiscoveryRepositories, translate, ApiErrorHandler) {
+    ['$scope', '$q', 'Notification', 'CurrentOrganization', 'Product', 'Repository', 'ContentCredential', 'FormUtils', 'DiscoveryRepositories', 'translate', 'ApiErrorHandler',
+    function ($scope, $q, Notification, CurrentOrganization, Product, Repository, ContentCredential, FormUtils, DiscoveryRepositories, translate, ApiErrorHandler) {
 
         $scope.table = {
             rows: DiscoveryRepositories.getRows(),
@@ -170,11 +170,11 @@ angular.module('Bastion.products').controller('DiscoveryCreateController',
             return fieldsEnabled;
         };
 
-        $scope.gpgKeys = [];
-        GPGKey.queryUnpaged(function (gpgKeys) {
-            $scope.gpgKeys = gpgKeys.results;
+        $scope.contentCredentials = [];
+        ContentCredential.queryUnpaged(function (contentCredentials) {
+            $scope.contentCredentials = contentCredentials.results;
         }, function (response) {
-            $scope.gpgKeys = [];
+            $scope.contentCredentials = [];
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
         });