katello 3.8.1 → 3.9.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-repositories.html

@@ -9,13 +9,15 @@
             ng-model="environmentFilter"
             ng-options="e.id as e.name for e in environments"
             ng-change="filterErrata()">
+      <option value="">{{ "All Lifecycle Environments" | translate }}</option>
     </select>
 
     <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:{environment_ids: environmentFilter})"
+            ng-options="cv as cv.name for cv in filteredCVs = (contentViews | filter: (environmentFilter ? {environment_ids: environmentFilter} : ''))"
             ng-change="filterErrata()">
+      <option value="">{{ "All Content Views" | translate }}</option>
     </select>
     <p class="help-block" translate ng-show="filteredCVs.length === 0">
       There are no Content Views in this Environment.
@@ -36,6 +38,7 @@
         <tr bst-table-head>
           <th bst-table-column="name"><span translate>Name</span></th>
           <th bst-table-column="product"><span translate>Product</span></th>
+          <th bst-table-column="contentView"><span translate>Content View</span></th>
           <th bst-table-column="lastSync"><span translate>Last Sync</span></th>
         </tr>
       </thead>
@@ -52,6 +55,9 @@
             <a ui-sref="product.info({productId: repository.product.id})">
               {{ repository.product.name }}
             </a>
+          </td>
+           <td bst-table-cell>
+            {{ repository.content_view.name }}
           </td>
           <td bst-table-cell>
               <span ng-show="repository.url">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/host-collection-details.controller.js

@@ -73,6 +73,10 @@ angular.module('Bastion.host-collections').controller('HostCollectionDetailsCont
             ContentHostsModalHelper.openSubscriptionsModal();
         };
 
+        $scope.openModuleStreamsModal = function () {
+            ContentHostsModalHelper.openModuleStreamsModal();
+        };
+
         $scope.save = function (hostCollection) {
             var deferred = $q.defer();
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/host-collections/details/views/host-collection-info.html

@@ -86,6 +86,12 @@
         </a>
       </li>
 
+      <li>
+        <a translate ng-click = "openModuleStreamsModal()">
+          Module Stream Management
+        </a>
+      </li>
+
       <li bst-feature-flag="lifecycle_environments">
         <a translate ng-click="openEnvironmentModal()">
           Change assigned Lifecycle Environment or Content View

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/hosts/host-bulk-action.factory.js

@@ -24,7 +24,8 @@ angular.module('Bastion.hosts').factory('HostBulkAction',
             destroyHosts: {method: 'PUT', params: {action: 'destroy'}},
             environmentContentView: {method: 'PUT', params: {action: 'environment_content_view'}},
             releaseVersion: {method: 'PUT', params: {action: 'release_version'}},
-            availableIncrementalUpdates: {method: 'POST', isArray: true, params: {action: 'available_incremental_updates'}}
+            availableIncrementalUpdates: {method: 'POST', isArray: true, params: {action: 'available_incremental_updates'}},
+            moduleStreams: {method: 'POST', params: {action: 'module_streams'}}
         });
 
     }]

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/module-streams/module-stream.factory.js

@@ -0,0 +1,27 @@
+(function () {
+    'use strict';
+
+    /**
+     * @ngdoc factory
+     * @name  Bastion.module-streams.factory:ModuleStream
+     *
+     * @description
+     *   Provides a BastionResource for interacting with Ostree Branches
+     */
+    function ModuleStream(BastionResource) {
+        return BastionResource('katello/api/v2/module_streams/:id',
+            {'id': '@id'},
+            {
+                autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
+            }
+
+        );
+    }
+
+    angular
+        .module('Bastion.module-streams')
+        .factory('ModuleStream', ModuleStream);
+
+    ModuleStream.$inject = ['BastionResource'];
+
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/module-streams/module-streams.module.js

@@ -0,0 +1,15 @@
+/**
+ * @ngdoc module
+ * @name  Bastion.module-streams
+ *
+ * @description
+ *   Module for Module Stream related functionality.
+ */
+angular.module('Bastion.module-streams', [
+    'ngResource',
+    'ui.router',
+    'Bastion',
+    'Bastion.i18n',
+    'Bastion.common',
+    'Bastion.components'
+]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/module-streams/views/partials/module-streams-table.html

@@ -0,0 +1,25 @@
+<table data-block="table" class="table table-striped table-bordered">
+  <thead>
+    <tr bst-table-head>
+      <th bst-table-column translate>Name</th>
+      <th bst-table-column translate>Stream</th>
+      <th bst-table-column translate>Version</th>
+      <th bst-table-column translate>Context</th>
+      <th bst-table-column translate>Arch</th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <tr bst-table-row ng-repeat="module in table.rows">
+      <td bst-table-cell>
+        <a href="module_streams/{{ module.id }}">
+          {{ module.name }}
+        </a>
+      </td>
+      <td bst-table-cell>{{ module.stream }}</td>
+      <td bst-table-cell>{{ module.version }}</td>
+      <td bst-table-cell>{{ module.context }}</td>
+      <td bst-table-cell>{{ module.arch }}</td>
+    </tr>
+  </tbody>
+</table>

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

@@ -9,13 +9,14 @@
  * @requires Environment
  * @requires ContentView
  * @requires CurrentOrganization
+ * @requires RepositoriesFilters
  *
  * @description
  *   Provides the functionality for the package repositories page.
  */
 angular.module('Bastion.packages').controller('PackageRepositoriesController',
-    ['$scope', '$q', 'Nutupane', 'Repository', 'Environment', 'ContentView', 'CurrentOrganization',
-    function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrganization) {
+    ['$scope', '$q', 'Nutupane', 'Repository', 'Environment', 'ContentView', 'CurrentOrganization', 'RepositoriesFilters',
+    function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrganization, RepositoriesFilters) {
         var repositoriesNutupane, environment, contentView;
         var params = {
             'rpm_id': $scope.$stateParams.packageId,
@@ -49,26 +50,9 @@ angular.module('Bastion.packages').controller('PackageRepositoriesController',
         });
 
         $scope.filterPackages = function () {
-            var foundVersion, env;
-            params['environment_id'] = $scope.environmentFilter;
-
-            if ($scope.contentViewFilter) {
-                foundVersion = _.find($scope.contentViewFilter.versions, function(version) {
-                    // Find the version belonging to the environment specified by the enviroment filter
-                    env = _.find(version.environment_ids, function(envId) {
-                        return envId === $scope.environmentFilter;
-                    });
-
-                    return !angular.isUndefined(env);
-                });
-
-                if (!angular.isUndefined(foundVersion)) {
-                    params['content_view_version_id'] = foundVersion.id;
-                } else {
-                    delete params['content_view_version_id'];
-                }
-            }
-
+            params = RepositoriesFilters.modifyParamsUsingFilters(
+                params, $scope.contentViewFilter, $scope.environmentFilter
+            );
             repositoriesNutupane.setParams = (params);
             repositoriesNutupane.refresh();
         };

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

@@ -10,13 +10,15 @@
             ng-model="environmentFilter"
             ng-options="e.id as e.name for e in environments"
             ng-change="filterPackages()">
+      <option value="">{{ "All Lifecycle Environments" | translate }}</option>
     </select>
 
     <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:{environment_ids: environmentFilter})"
+            ng-options="cv as cv.name for cv in filteredCVs = (contentViews | filter: (environmentFilter ? {environment_ids: environmentFilter} : ''))"
             ng-change="filterPackages()">
+      <option value="">{{ "All Content Views" | translate }}</option>
     </select>
     <p class="help-block" translate ng-show="filteredCVs.length === 0">
       There are no Content Views in this Environment.
@@ -37,6 +39,7 @@
         <tr bst-table-head>
           <th bst-table-column="name"><span translate>Name</span></th>
           <th bst-table-column="product"><span translate>Product</span></th>
+          <th bst-table-column="contentView"><span translate>Content View</span></th>
           <th bst-table-column="lastSync"><span translate>Last Sync</span></th>
         </tr>
       </thead>
@@ -54,6 +57,9 @@
               {{ repository.product.name }}
             </a>
           </td>
+          <td bst-table-cell>
+            {{ repository.content_view.name }}
+          </td>
           <td bst-table-cell>
               <span ng-show="repository.url">
               <span ng-show="repository.last_sync == null" translate>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/packages/repositories-filters.service.js

@@ -0,0 +1,89 @@
+(function () {
+
+    /**
+     * @ngdoc service
+     * @name Bastion.packages.details.service:RepositoriesFilters
+     *
+     * @description
+     *   Provides a helper service for RepositoriesFilters.
+     *
+     */
+    function RepositoriesFilters() {
+
+        /**
+         * modify params depending upon environment and content-view filters
+         *
+         * Return params
+         */
+
+        this.modifyParamsUsingFilters = function(params, contentViewFilter, environmentFilter) {
+            var foundVersion, env;
+            if (contentViewFilter) {
+                if (environmentFilter) {
+                    foundVersion = _.find(contentViewFilter.versions, function(version) {
+                        // Find the version belonging to the environment specified by the enviroment filter
+                        env = _.find(version.environment_ids, function(envId) {
+                            return envId === environmentFilter;
+                        });
+
+                        return !angular.isUndefined(env);
+                    });
+                    if (!angular.isUndefined(foundVersion)) {
+                        params = this.setContentViewFilter(params, foundVersion.id);
+                    }
+
+                } else {
+                    params = this.setContentViewFilter(params, contentViewFilter.id, 'content_view_version');
+                }
+            } else {
+                params = this.clearContentViewFilter(params);
+            }
+
+            if (environmentFilter) {
+                params['environment_id'] = environmentFilter;
+            } else {
+                delete params['environment_id'];
+                params['available_for'] = 'content_view_version';
+            }
+            return params;
+        };
+
+        /**
+         * settings content_view_id or content_view_version_id depending upon environment selection i.e keyName passed
+         *
+         * Return params
+         */
+
+        this.setContentViewFilter = function(params, selectedId, keyName) {
+            if (keyName && keyName === 'content_view_version') {
+                params['content_view_id'] = selectedId;
+                params['available_for'] = keyName;
+                delete params['content_view_version_id'];
+            } else {
+                params['content_view_version_id'] = selectedId;
+                delete params['content_view_id'];
+                delete params['available_for'];
+            }
+            return params;
+        };
+
+        /**
+         * delete content_view filter params
+         *
+         * Return params
+         */
+        this.clearContentViewFilter = function(params) {
+            delete params['content_view_version_id'];
+            delete params['content_view_id'];
+            delete params['available_for'];
+
+            return params;
+        };
+
+    }
+
+    angular.module('Bastion.packages').service('RepositoriesFilters', RepositoriesFilters);
+
+    // RepositoriesFilters.$inject = [];
+
+})();

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

@@ -65,11 +65,10 @@ angular.module('Bastion.products').controller('ProductRepositoriesController',
             var success, error, params = getParams(), removalPromise;
 
             success = function (response) {
-                var message = translate('Removal of selected repositories initiated successfully. ');
-
-                message += translate('<a href="/foreman_tasks/tasks/%taskId">Click here to check the status of the task.</a>').
-                    replace('%taskId', response.task.id);
-                Notification.setSuccessMessage(message);
+                var message = translate('Removal of selected repositories initiated successfully.');
+                var link = ("/foreman_tasks/tasks/%taskId").replace('%taskId', response.task.id);
+                var alertBody = { children: translate("Click to view task"), href: link };
+                Notification.setSuccessMessage(message, {link: alertBody});
             };
 
             error = function (response) {

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

@@ -87,9 +87,21 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
 
         $scope.save = function (repository) {
             var deferred = $q.defer();
+            if (!_.isEmpty(repository.commaTagsWhitelist)) {
+                repository["docker_tags_whitelist"] = repository.commaTagsWhitelist.split(",").map(function(tag) {
+                    return tag.trim();
+                });
+            } else {
+                repository["docker_tags_whitelist"] = [];
+            }
 
             repository.$update(function (response) {
                 deferred.resolve(response);
+                if (!_.isEmpty(response["docker_tags_whitelist"])) {
+                    repository.commaTagsWhitelist = repository["docker_tags_whitelist"].join(", ");
+                } else {
+                    repository.commaTagsWhitelist = null;
+                }
                 Notification.setSuccessMessage(translate('Repository Saved.'));
             }, function (response) {
                 deferred.reject(response);
@@ -151,9 +163,10 @@ angular.module('Bastion.repositories').controller('RepositoryDetailsInfoControll
             return DownloadPolicy.downloadPolicyName(downloadPolicy);
         };
 
-        $scope.clearUpstreamPassword = function () {
+        $scope.clearUpstreamAuth = function () {
             $scope.repository['upstream_password'] = null;
-            $scope.repository['upstream_password_exists'] = false;
+            $scope.repository['upstream_auth_exists'] = false;
+            $scope.repository['upstream_username'] = null;
             $scope.save($scope.repository);
         };
     }]

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

@@ -22,8 +22,8 @@ angular.module('Bastion.components.formatters').filter('ostreeUpstreamSyncPolicy
 
 angular.module('Bastion.components.formatters').filter('upstreamPasswordFilter', [function () {
     return function (displayValue, repository) {
-        if (repository["upstream_password_exists"]) {
-            return "******";
+        if (repository["upstream_auth_exists"]) {
+            return '%(username) / ********'.replace('%(username)', repository["upstream_username"]);
         }
         return null;
     };

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

@@ -17,13 +17,14 @@
  * @requires OstreeBranch
  * @requires File
  * @requires Deb
+ * @requires ModuleStream
  *
  * @description
  *   Provides the functionality for the repository details pane.
  */
 angular.module('Bastion.repositories').controller('RepositoryManageContentController',
-    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'PuppetModule', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'OstreeBranch', 'File', 'Deb',
-    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, PuppetModule, DockerManifest, DockerManifestList, DockerTag, OstreeBranch, File, Deb) {
+    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'PuppetModule', 'DockerManifest', 'DockerManifestList', 'DockerTag', 'OstreeBranch', 'File', 'Deb', 'ModuleStream',
+    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, PuppetModule, DockerManifest, DockerManifestList, DockerTag, OstreeBranch, File, Deb, ModuleStream) {
         var contentTypes;
 
         function success(response, selected) {
@@ -53,15 +54,16 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
         $scope.currentState = $state.current.name.split('.').pop();
 
         contentTypes = {
-            'packages': { type: Package },
-            'package-groups': { type: PackageGroup },
-            'puppet-modules': { type: PuppetModule },
-            'docker-manifests': { type: DockerManifest },
-            'docker-manifest-lists': { type: DockerManifestList },
-            'docker-tags': {type: DockerTag},
-            'ostree-branches': { type: OstreeBranch },
-            'files': { type: File },
-            'debs': { type: Deb }
+            'packages': { type: Package, controllerName: 'katello_rpms' },
+            'package-groups': { type: PackageGroup, controllerName: 'katello_package_groups' },
+            'puppet-modules': { type: PuppetModule, controllerName: 'katello_puppet_modules' },
+            'docker-manifests': { type: DockerManifest, controllerName: 'katello_docker_manifests' },
+            'docker-manifest-lists': { type: DockerManifestList, controllerName: 'katello_docker_manifest_lists' },
+            'docker-tags': {type: DockerTag, controllerName: 'katello_docker_tags'},
+            'ostree-branches': { type: OstreeBranch, controllerName: 'katello_ostree_branches' },
+            'files': { type: File, controllerName: 'katello_files' },
+            'debs': { type: Deb, controllerName: 'katello_debs' },
+            'module-streams': { type: ModuleStream, controllerName: 'katello_module_streams' }
         };
 
         $scope.contentNutupane = new Nutupane(contentTypes[$scope.currentState].type, {
@@ -70,6 +72,8 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
         $scope.table = $scope.contentNutupane.table;
         $scope.contentNutupane.masterOnly = true;
 
+        $scope.controllerName = contentTypes[$scope.currentState].controllerName;
+
         $scope.removeContent = function () {
             var selected = $scope.table.getSelected();
             $scope.table.working = true;

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

@@ -41,6 +41,11 @@
             'product_id': $scope.$stateParams.productId,
             'id': $scope.$stateParams.repositoryId
         }, function () {
+            if (!_.isEmpty($scope.repository["docker_tags_whitelist"])) {
+                $scope.repository.commaTagsWhitelist = $scope.repository["docker_tags_whitelist"].join(", ");
+            } else {
+                $scope.repository.commaTagsWhitelist = "";
+            }
             $scope.page.loading = false;
         }, function (response) {
             $scope.page.loading = false;