katello 3.8.1 → 3.9.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-provisioning-info.html

@@ -14,7 +14,7 @@
 
       <dt translate>Status</dt>
       <dd>
-        <i ng-class="table.getHostStatusIcon(host.global_status)"></i>
+        <i ng-class="getHostStatusIcon(host.global_status)"></i>
         {{ host.global_status_label | translate }}
       </dd>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/details/views/content-host-subscriptions.html

@@ -12,7 +12,7 @@
       <dl class="dl-horizontal dl-horizontal-left">
         <dt translate>Status</dt>
         <dd>
-          <i ng-class="table.getHostStatusIcon(host.subscription_global_status)"></i>
+          <i ng-class="getHostStatusIcon(host.subscription_global_status)"></i>
           {{ host.subscription_status_label | translate }}
         </dd>
 
@@ -78,4 +78,4 @@
 
   <div ui-view></div>
 
-</div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/views/content-hosts.html

@@ -47,6 +47,10 @@
           <a ng-click="openRepositorySetsModal()" disable-link="table.numSelected === 0" translate>Manage Repository Sets</a>
         </li>
 
+        <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openModuleStreamsModal()" disable-link="table.numSelected === 0" translate>Manage Module Streams</a>
+        </li>
+
         <li class="divider"></li>
 
         <li role="menuitem" ng-show="permitted('destroy_hosts')" ng-class="{disabled: table.numSelected === 0}">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/content-views.routes.js

@@ -150,6 +150,16 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
             parent: 'content-view.version.details'
         }
     })
+    .state('content-view.version.module-streams', {
+        url: '/module_streams',
+        permission: 'view_content_views',
+        controller: 'ContentViewVersionContentController',
+        templateUrl: 'content-views/versions/views/content-view-version-module-streams.html',
+        ncyBreadcrumb: {
+            label: '{{ "Module Streams" | translate }}',
+            parent: 'content-view.version.details'
+        }
+    })
     .state('content-view.version.file', {
         url: '/file',
         permission: 'view_content_views',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-repositories.service.js

@@ -85,7 +85,6 @@ angular.module('Bastion.content-views').service('ContentViewRepositoriesUtil',
                     nutupane.refresh();
                 });
             };
-
         };
 
     }]

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-repositories.html

@@ -104,6 +104,11 @@
               {{ repository.content_counts.erratum }} Errata
             </a>
           </div>
+          <div>
+            <a ui-sref="product.repository.manage-content.module-streams({productId: repository.product.id, repositoryId: repository.id})">
+              {{ repository.content_counts.module_stream || 0 }} Module Streams
+            </a>
+          </div>
         </td>
       </tr>
     </tbody>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/views/content-view-versions.html

@@ -62,6 +62,9 @@
               <span translate>{{ version.errata_counts.total }} Errata</span>
               (<span errata-counts="version.errata_counts"></span>)
             </div>
+            <div translate ng-if="version.module_stream_count && version.module_stream_count > 0">
+              {{ version.module_stream_count }} Module Streams
+            </div>
             <div translate ng-if="version.puppet_module_count && version.puppet_module_count > 0">
               {{ version.puppet_module_count }} Puppet Modules
             </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/new/content-view-new.controller.js

@@ -46,5 +46,12 @@ angular.module('Bastion.content-views').controller('NewContentViewController',
             }
         });
 
+        $scope.$watch('contentView.composite', function () {
+            if (!$scope.contentView.composite) {
+                /* eslint-disable camelcase */
+                $scope.contentView.auto_publish = false;
+                /* eslint-enable camelcase */
+            }
+        });
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/new/views/content-view-new.html

@@ -78,8 +78,7 @@
                    ng-model="contentView.auto_publish"
                    type="checkbox"
                    tabindex="5"
-                   ng-disabled="!contentView.composite"
-                   ng-checked="contentView.composite && 0"/>
+                   ng-disabled="!contentView.composite"/>
             <span translate>Auto Publish</span>
           </label>
         </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version-content.controller.js

@@ -10,7 +10,7 @@
      *   ui-router state.
      */
     function ContentViewVersionContentController($scope, translate, Nutupane, Package, Erratum,
-                                                 PackageGroup, PuppetModule, OstreeBranch, Deb, Repository,
+                                                 PackageGroup, PuppetModule, OstreeBranch, ModuleStream, Deb, Repository,
                                                  ContentViewVersion) {
         var nutupane, contentTypes, currentState, params;
 
@@ -19,6 +19,7 @@
         contentTypes = {
             'docker': {
                 type: Repository,
+                repositoryType: 'docker',
                 params: {
                     'content_type': "docker",
                     'content_view_version_id': $scope.$stateParams.versionId
@@ -27,6 +28,7 @@
             },
             'yum': {
                 type: Repository,
+                repositoryType: 'yum',
                 params: {
                     'content_type': "yum",
                     'content_view_version_id': $scope.$stateParams.versionId,
@@ -34,10 +36,12 @@
                 }
             },
             'packages': {
-                type: Package
+                type: Package,
+                repositoryType: 'yum'
             },
             'package-groups': {
                 type: PackageGroup,
+                repositoryType: 'yum',
                 params: {
                     'sort_by': 'name',
                     'sort_order': 'ASC',
@@ -45,20 +49,32 @@
                 }
             },
             'errata': {
-                type: Erratum
+                type: Erratum,
+                repositoryType: 'yum'
             },
             'puppet-modules': {
-                type: PuppetModule
+                type: PuppetModule,
+                repositoryType: 'puppet'
             },
             'ostree-branches': {
                 type: OstreeBranch,
+                repositoryType: 'ostree',
                 params: {
                     'content_type': "ostree",
                     'content_view_version_id': $scope.$stateParams.versionId,
-                    'sort_by': 'version_date',
+                    'sort_by': 'created',
                     'sort_order': 'DESC'
                 }
             },
+            'module-streams': {
+                type: ModuleStream,
+                repositoryType: 'yum',
+                params: {
+                    'content_view_version_id': $scope.$stateParams.versionId,
+                    'sort_by': 'name',
+                    'sort_order': 'ASC'
+                }
+            },
             'components': {
                 type: ContentViewVersion,
                 params: {
@@ -67,6 +83,7 @@
             },
             'file': {
                 type: Repository,
+                repositoryType: 'file',
                 params: {
                     'content_type': 'file',
                     'content_view_version_id': $scope.$stateParams.versionId,
@@ -75,6 +92,7 @@
             },
             'apt': {
                 type: Repository,
+                repositoryType: 'deb',
                 params: {
                     'content_type': 'deb',
                     'content_view_version_id': $scope.$stateParams.versionId,
@@ -82,7 +100,8 @@
                 }
             },
             'deb': {
-                type: Deb
+                type: Deb,
+                repositoryType: 'deb'
             }
         };
 
@@ -93,23 +112,29 @@
 
         $scope.nutupane = nutupane;
         $scope.table = nutupane.table;
+        $scope.contentTypeInfo = contentTypes[currentState];
 
-        $scope.repository = {name: translate('All Repositories'), id: 'all'};
+        $scope.repositoryId = "all";
         $scope.repositories = [];
 
         $scope.version.$promise.then(function (version) {
-            $scope.repositories = version.repositories;
-            $scope.repositories.unshift($scope.repository);
+            $scope.repositories = _.filter(version.repositories, function(repo) {
+                return $scope.contentTypeInfo.repositoryType === repo["content_type"];
+            });
+
+            if ($scope.repositories.length === 0 || $scope.repositories[0].id !== "all") {
+                $scope.repositories.unshift({name: translate('All Repositories'), id: 'all'});
+            }
         });
 
-        $scope.$watch('repository', function (repository) {
+        $scope.$watch('repositoryId', function (repositoryId) {
             var nutupaneParams = nutupane.getParams();
 
-            if (repository.id === 'all') {
+            if (repositoryId === 'all') {
                 nutupaneParams['repository_id'] = null;
                 nutupane.setParams(nutupaneParams);
             } else {
-                nutupaneParams['repository_id'] = repository.id;
+                nutupaneParams['repository_id'] = repositoryId;
                 nutupane.setParams(nutupaneParams);
             }
 
@@ -122,6 +147,6 @@
         .controller('ContentViewVersionContentController', ContentViewVersionContentController);
 
     ContentViewVersionContentController.$inject = ['$scope', 'translate', 'Nutupane', 'Package', 'Erratum',
-                                                   'PackageGroup', 'PuppetModule', 'OstreeBranch', 'Deb', 'Repository', 'ContentViewVersion'];
+                                                   'PackageGroup', 'PuppetModule', 'OstreeBranch', 'ModuleStream', 'Deb', 'Repository', 'ContentViewVersion'];
 
 })();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-versions.module.js

@@ -17,6 +17,7 @@ angular.module('Bastion.content-views.versions', [
     'Bastion.package-groups',
     'Bastion.puppet-modules',
     'Bastion.ostree-branches',
+    'Bastion.module-streams',
     'Bastion.files',
     'Bastion.debs'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-module-streams.html

@@ -0,0 +1,8 @@
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="repositoryId" ng-options="repo.id as repo.name for repo in repositories"></select>
+  </div>
+  <div data-block="table">
+    <ng-include src="'module-streams/views/partials/module-streams-table.html'"> </ng-include>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-ostree-branches.html

@@ -1,6 +1,6 @@
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="search-filter">
-    <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
+    <select class="form-control" ng-model="repositoryId" ng-options="repo.id as repo.name for repo in repositories"></select>
   </div>
 
   <table data-block="table" class="table table-striped table-bordered">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-package-groups.html

@@ -1,6 +1,6 @@
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="search-filter">
-    <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
+    <select class="form-control" ng-model="repositoryId" ng-options="repo.id as repo.name for repo in repositories"></select>
   </div>
 
   <table data-block="table" class="table table-striped table-bordered">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-packages.html

@@ -1,6 +1,6 @@
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="search-filter">
-    <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
+    <select class="form-control" ng-model="repositoryId" ng-options="repo.id as repo.name for repo in repositories"></select>
   </div>
 
   <table data-block="table" class="table table-striped table-bordered">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-yum.html

@@ -26,6 +26,11 @@
               {{ repository.content_counts.erratum }} Errata
             </a>
           </div>
+          <div>
+            <a ui-sref="product.repository.manage-content.module-streams({productId: repository.product.id, repositoryId: repository.id})">
+              {{ repository.content_counts.module_stream || 0 }} Module Streams
+            </a>
+          </div>
         </td>
       </tr>
     </tbody>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version.html

@@ -29,6 +29,13 @@
       </a>
     </li>
 
+    <li ng-class="{active: isState('content-view.version.module-streams')}"
+        ng-show="version.module_stream_count !== 0">
+      <a ui-sref="content-view.version.module-streams({versionId: version.id})">
+        <span translate>Module Streams</span>
+      </a>
+    </li>
+
     <li ng-class="{active: isState('content-view.version.errata')}"
         ng-show="hasErrata(version)">
       <a ui-sref="content-view.version.errata({versionId: version.id})">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.controller.js

@@ -27,6 +27,7 @@ angular.module('Bastion.docker-tags').controller('DockerTagsController',
         var nutupane = new Nutupane(DockerTag, params);
         $scope.controllerName = 'katello_docker_tags';
         $scope.table = nutupane.table;
+        $scope.controllerName = 'katello_docker_tags';
 
         $scope.table.closeItem = function () {
             $scope.transitionTo('docker-tags');

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/content.service.js

@@ -59,6 +59,11 @@
                 resource: 'OstreeBranch',
                 display: translate('OSTree Branches'),
                 repositoryType: 'ostree'
+            }, {
+                state: 'module-streams',
+                resource: 'ModuleStream',
+                display: translate('Module Streams'),
+                repositoryType: 'yum'
             }
         ];
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-module-streams.html

@@ -0,0 +1,38 @@
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="contentView" ng-change="contentViewSelected(contentView)" ng-options="contentView.name for (id, contentView) in contentViews"></select>
+    <select class="form-control" ng-model="repository" ng-change="repositorySelected(repository)" ng-options="repository.name for (id, repository) in repositories"></select>
+  </div>
+
+  <span data-block="no-rows-message" translate>
+    There are no module streams that match the criteria.
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero module streams.
+  </span>
+
+  <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>Version</th>
+        <th bst-table-column translate>Release</th>
+        <th bst-table-column translate>Arch</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <tr bst-table-row ng-repeat="module_stream in table.rows">
+        <td bst-table-cell>
+          <a href="module_streams/{{ module_stream.id }}">
+            {{ module_stream.name }}
+          </a>
+        </td>
+        <td bst-table-cell>{{ module_stream.version }}</td>
+        <td bst-table-cell>{{ module_stream.stream }}</td>
+        <td bst-table-cell>{{ module_stream.arch }}</td>
+      </tr>
+    </tbody>
+  </table>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment.html

@@ -6,7 +6,7 @@
   </header>
 
   <div data-block="item-actions">
-    <button ng-show="!environment.library && !environment.successor"
+    <button ng-show="!environment.library"
             ng-click="remove(environment)"
             type="button"
             class="btn btn-default">

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

@@ -87,6 +87,17 @@ angular.module('Bastion.environments').config(['$stateProvider', function ($stat
             parent: 'environment.details'
         }
     })
+    .state('environment.module-streams', {
+        url: '/module-streams?repositoryId&contentViewId',
+        reloadOnSearch: false,
+        permission: 'view_lifecycle_environments',
+        controller: 'EnvironmentContentController',
+        templateUrl: 'environments/details/views/environment-module-streams.html',
+        ncyBreadcrumb: {
+            label: '{{ "Module Streams" | translate }}',
+            parent: 'environment.details'
+        }
+    })
     .state('environment.puppet-modules', {
         url: '/puppet-modules?contentViewId',
         reloadOnSearch: false,

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

@@ -44,6 +44,9 @@
               <td class="info-block" ng-hide="library.counts.puppet_modules == 0"  translate>
                 Puppet Modules <div>{{ library.counts.puppet_modules || 0 }}</div>
               </td>
+              <td class="info-block" ng-hide="library.counts.module_streams == 0"  translate>
+                Module Streams <div>{{ library.counts.module_streams || 0 }}</div>
+              </td>
             </tr>
           </tbody>
         </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/erratum-repositories.controller.js

@@ -9,13 +9,14 @@
  * @requires Environment
  * @requires ContentView
  * @requires CurrentOrganization
+ * @requires RepositoriesFilters
  *
  * @description
  *   Provides the functionality for the errata details repositories page.
  */
 angular.module('Bastion.errata').controller('ErratumRepositoriesController',
-['$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, params = {
         'erratum_id': $scope.$stateParams.errataId,
         'organization_id': CurrentOrganization
@@ -48,26 +49,9 @@ function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrg
     });
 
     $scope.filterErrata = 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();
     };