katello 3.17.3 → 3.18.0.rc1

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

@@ -14,194 +14,207 @@
  * @requires Architecture
  * @requires YumContentUnits
  * @requires HttpProxyPolicy
+ * @requires OSVersions
  *
  * @description
  *   Provides the functionality for the repository details info page.
  */
 angular.module('Bastion.repositories').controller('RepositoryDetailsInfoController',
-    ['$scope', '$q', 'translate', 'Notification', 'ContentCredential', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'YumContentUnits', 'OstreeUpstreamSyncPolicy', 'Architecture', 'HttpProxy', 'HttpProxyPolicy',
-    function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, YumContentUnits, OstreeUpstreamSyncPolicy, Architecture, HttpProxy, HttpProxyPolicy) {
-        $scope.organization = CurrentOrganization;
+    ['$scope', '$q', 'translate', 'Notification', 'ContentCredential', 'CurrentOrganization', 'Checksum', 'DownloadPolicy', 'YumContentUnits', 'OstreeUpstreamSyncPolicy', 'Architecture', 'HttpProxy', 'HttpProxyPolicy', 'OSVersions',
+        function ($scope, $q, translate, Notification, ContentCredential, CurrentOrganization, Checksum, DownloadPolicy, YumContentUnits, OstreeUpstreamSyncPolicy, Architecture, HttpProxy, HttpProxyPolicy, OSVersions) {
+            $scope.organization = CurrentOrganization;
 
-        $scope.progress = {uploading: false};
+            $scope.progress = {uploading: false};
 
-        $scope.repository.$promise.then(function () {
-            $scope.uploadURL = 'katello/api/v2/repositories/' + $scope.repository.id + '/upload_content';
-        });
+            $scope.repository.$promise.then(function () {
+                $scope.uploadURL = 'katello/api/v2/repositories/' + $scope.repository.id + '/upload_content';
+            });
 
-        $scope.gpgKeys = function () {
-            var deferred = $q.defer();
+            $scope.gpgKeys = function () {
+                var deferred = $q.defer();
 
-            ContentCredential.queryUnpaged(function (contentCredentials) {
-                var results = contentCredentials.results;
+                ContentCredential.queryUnpaged(function (contentCredentials) {
+                    var results = contentCredentials.results;
 
-                results = results.filter(function(obj) {
-                    if (obj.content_type === "gpg_key") {
-                        return true;
-                    }
-                    return false;
+                    results = results.filter(function(obj) {
+                        if (obj.content_type === "gpg_key") {
+                            return true;
+                        }
+                        return false;
+                    });
+
+                    results.unshift({id: null, name: ''});
+                    deferred.resolve(results);
                 });
 
-                results.unshift({id: null, name: ''});
-                deferred.resolve(results);
-            });
+                return deferred.promise;
+            };
 
-            return deferred.promise;
-        };
+            $scope.certs = function () {
+                var deferred = $q.defer();
 
-        $scope.certs = function () {
-            var deferred = $q.defer();
+                ContentCredential.queryUnpaged(function (contentCredentials) {
+                    var results = contentCredentials.results;
 
-            ContentCredential.queryUnpaged(function (contentCredentials) {
-                var results = contentCredentials.results;
+                    results = results.filter(function(obj) {
+                        if (obj.content_type === "cert") {
+                            return true;
+                        }
+                        return false;
+                    });
 
-                results = results.filter(function(obj) {
-                    if (obj.content_type === "cert") {
-                        return true;
-                    }
-                    return false;
+                    results.unshift({id: null, name: ''});
+                    deferred.resolve(results);
                 });
 
-                results.unshift({id: null, name: ''});
-                deferred.resolve(results);
-            });
-
-            return deferred.promise;
-        };
-
-        $scope.architectures = function () {
-            var deferred = $q.defer();
-            Architecture.queryUnpaged(function (architectures) {
-                var results = architectures.results;
-                results.map(function(i) {
-                    i.id = i.name;
-                });
-                results.unshift({
-                    id: 'noarch',
-                    name: translate('Default'),
-                    value: null
+                return deferred.promise;
+            };
+
+            $scope.architectures = function () {
+                var deferred = $q.defer();
+                Architecture.queryUnpaged(function (architectures) {
+                    var results = architectures.results;
+                    results.map(function(i) {
+                        i.id = i.name;
+                    });
+                    results.unshift({
+                        id: 'noarch',
+                        name: translate('No restriction'),
+                        value: null
+                    });
+                    deferred.resolve(results);
                 });
-                deferred.resolve(results);
-            });
-            return deferred.promise;
-        };
+                return deferred.promise;
+            };
 
-        $scope.save = function (repository, saveUpstreamAuth) {
-            var deferred = $q.defer();
+            $scope.save = function (repository, saveUpstreamAuth) {
+                var deferred = $q.defer();
 
-            if (!saveUpstreamAuth) {
-                delete repository.upstream_username;
-                delete repository.upstream_password;
-            }
+                if (!saveUpstreamAuth) {
+                    delete repository.upstream_username;
+                    delete repository.upstream_password;
+                }
 
-            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(", ");
+                if (!_.isEmpty(repository.commaTagsWhitelist)) {
+                    repository["docker_tags_whitelist"] = repository.commaTagsWhitelist.split(",").map(function(tag) {
+                        return tag.trim();
+                    });
                 } else {
-                    repository.commaTagsWhitelist = null;
+                    repository["docker_tags_whitelist"] = [];
                 }
-                Notification.setSuccessMessage(translate('Repository Saved.'));
-            }, function (response) {
-                deferred.reject(response);
-                _.each(response.data.errors, function (errorMessage) {
-                    Notification.setErrorMessage(translate("An error occurred saving the Repository: ") + errorMessage);
+                /* eslint-disable camelcase */
+                repository.os_versions = $scope.osVersionsParam();
+                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);
+                    Notification.setErrorMessage(translate("An error occurred saving the Repository: ") + response.data.displayMessage);
                 });
-            });
 
-            return deferred.promise;
-        };
+                return deferred.promise;
+            };
 
-        $scope.uploadContent = function (content) {
-            var returnData, error, uploaded;
+            $scope.uploadContent = function (content) {
+                var returnData, error, uploaded;
 
-            if (content) {
-                try {
-                    returnData = angular.fromJson(angular.element(content).html());
-                } catch (err) {
-                    returnData = content;
-                }
+                if (content) {
+                    try {
+                        returnData = angular.fromJson(angular.element(content).html());
+                    } catch (err) {
+                        returnData = content;
+                    }
+
+                    if (!returnData) {
+                        returnData = content;
+                    }
 
-                if (!returnData) {
-                    returnData = content;
+                    if (returnData !== null && returnData.status === 'success') {
+                        uploaded = returnData.filenames.join(', ');
+                        Notification.setSuccessMessage(translate('Successfully uploaded content: ') + uploaded);
+                        $scope.repository.$get();
+                    } else {
+                        error = returnData.displayMessage;
+                        Notification.setErrorMessage(translate('Error during upload: ') + error);
+                    }
+
+                    $scope.progress.uploading = false;
                 }
+            };
 
-                if (returnData !== null && returnData.status === 'success') {
-                    uploaded = returnData.filenames.join(', ');
-                    Notification.setSuccessMessage(translate('Successfully uploaded content: ') + uploaded);
-                    $scope.repository.$get();
+            $scope.uploadError = function (error, content) {
+                if (angular.isString(content) && content.indexOf("Request Entity Too Large")) {
+                    error = translate('File too large. Please use the CLI instead.');
                 } else {
-                    error = returnData.displayMessage;
-                    Notification.setErrorMessage(translate('Error during upload: ') + error);
+                    error = content;
                 }
-
+                Notification.setErrorMessage(translate('Error during upload: ') + error);
                 $scope.progress.uploading = false;
-            }
-        };
-
-        $scope.uploadError = function (error, content) {
-            if (angular.isString(content) && content.indexOf("Request Entity Too Large")) {
-                error = translate('File too large. Please use the CLI instead.');
-            } else {
-                error = content;
-            }
-            Notification.setErrorMessage(translate('Error during upload: ') + error);
-            $scope.progress.uploading = false;
-        };
-
-        $scope.handleFiles = function (element) {
-            var reader = new FileReader();
-            $scope.uploadedFile = true;
-            reader.addEventListener("loadend", function() {
-                var data = reader.result;
-                /* eslint-disable camelcase */
-                $scope.repository.ansible_collection_requirements = data;
-                $scope.$apply();
+            };
+
+            $scope.handleFiles = function (element) {
+                var reader = new FileReader();
+                $scope.uploadedFile = true;
+                reader.addEventListener("loadend", function() {
+                    var data = reader.result;
+                    $scope.repository.ansible_collection_requirements = data;
+                    $scope.$apply();
+                });
+                reader.readAsText(element.files[0]);
+            };
+
+            $scope.checksums = Checksum.checksums;
+            $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
+            $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
+            $scope.ignorableYumContentUnits = YumContentUnits.units;
+
+            $scope.checksumTypeDisplay = function (checksum) {
+                return Checksum.checksumType(checksum);
+            };
+
+            $scope.downloadPolicyDisplay = function (downloadPolicy) {
+                return DownloadPolicy.downloadPolicyName(downloadPolicy);
+            };
+
+            $scope.clearUpstreamAuth = function () {
+                $scope.repository['upstream_password'] = null;
+                $scope.repository['upstream_auth_exists'] = false;
+                $scope.repository['upstream_username'] = null;
+                $scope.save($scope.repository);
+            };
+
+            $scope.policies = HttpProxyPolicy.policies;
+            $scope.proxies = [];
+
+            $scope.displayHttpProxyPolicyName = function (policy) {
+                return HttpProxyPolicy.displayHttpProxyPolicyName(policy);
+            };
+
+            $scope.displayHttpProxyName = function (proxyId) {
+                return HttpProxyPolicy.displayHttpProxyName($scope.proxies, proxyId);
+            };
+
+            $scope.osVersionsOptions = function () {
+                $scope.selectedOSVersion = $scope.formatOSVersions();
+                return OSVersions.getOSVersionsOptions();
+            };
+
+            $scope.formatOSVersions = function () {
+                return OSVersions.formatOSVersions($scope.repository.os_versions);
+            };
+
+            $scope.osVersionsParam = function () {
+                return OSVersions.osVersionsParam($scope.selectedOSVersion);
+            };
+
+            HttpProxy.queryUnpaged(function (proxies) {
+                $scope.proxies = proxies.results;
             });
-            reader.readAsText(element.files[0]);
-        };
-
-        $scope.checksums = Checksum.checksums;
-        $scope.downloadPolicies = DownloadPolicy.downloadPolicies;
-        $scope.ostreeUpstreamSyncPolicies = OstreeUpstreamSyncPolicy.syncPolicies;
-        $scope.ignorableYumContentUnits = YumContentUnits.units;
-
-        $scope.checksumTypeDisplay = function (checksum) {
-            return Checksum.checksumType(checksum);
-        };
-
-        $scope.downloadPolicyDisplay = function (downloadPolicy) {
-            return DownloadPolicy.downloadPolicyName(downloadPolicy);
-        };
-
-        $scope.clearUpstreamAuth = function () {
-            $scope.repository['upstream_password'] = null;
-            $scope.repository['upstream_auth_exists'] = false;
-            $scope.repository['upstream_username'] = null;
-            $scope.save($scope.repository);
-        };
-
-        $scope.policies = HttpProxyPolicy.policies;
-        $scope.proxies = [];
-
-        $scope.displayHttpProxyPolicyName = function (policy) {
-            return HttpProxyPolicy.displayHttpProxyPolicyName(policy);
-        };
-
-        $scope.displayHttpProxyName = function (proxyId) {
-            return HttpProxyPolicy.displayHttpProxyName($scope.proxies, proxyId);
-        };
-
-        HttpProxy.queryUnpaged(function (proxies) {
-            $scope.proxies = proxies.results;
-        });
-    }]
+
+        }]
 );

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

@@ -36,14 +36,29 @@
     <h4 translate>Sync Settings</h4>
     <dl class="dl-horizontal dl-horizontal-left">
       <span ng-show="repository.content_type === 'yum'" >
-        <dt translate>Restrict to architecture</dt>
-        <dd bst-edit-select="repository.arch==='noarch'?'Default':repository.arch"
+        <dt>
+          <span translate>Restrict to architecture</span>
+          <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected architecture.' | translate }}"></i>
+        </dt>
+        <dd bst-edit-select="repository.arch==='noarch'?'No restriction':repository.arch"
             selector="repository.arch"
             options="architectures()"
             on-save="save(repository)">
         </dd>
       </span>
 
+      <span ng-show="repository.content_type === 'yum'" >
+        <dt>
+          <span translate>Restrict to <br />OS version</span>
+          <i class="pficon-info" title="{{ 'The repository will be enabled by default on content hosts with the selected OS version.' | translate }}"></i>
+        </dt>
+        <dd bst-edit-select="repository.os_versions.length ? formatOSVersions() : 'No restriction'"
+            selector="selectedOSVersion"
+            options="osVersionsOptions()"
+            on-save="save(repository)">
+        </dd>
+      </span>
+
       <dt ng-show="repository.content_type !== 'docker'" translate>Upstream URL</dt>
       <dt ng-show="repository.content_type === 'docker'" translate>Registry URL</dt>
       <dd bst-edit-text="repository.url"