katello 3.13.4 → 3.14.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-repository-sets-modal.html

@@ -78,7 +78,7 @@
               <th bst-table-column="repository_name" translate>Repository Name</th>
               <th bst-table-column="product_name" translate>Product Name</th>
               <th bst-table-column="repository_path" translate>Repository Path</th>
-              <th bst-table-column="enabled" translate>Status</th>
+              <th bst-table-column="enabled" translate>Default Status</th>
             </tr>
           </thead>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content-host-register-client.directive.js

@@ -0,0 +1,6 @@
+angular.module('Bastion.content-hosts').directive('registerClient', function () {
+    return {
+        restrict: 'E',
+        templateUrl: 'content-hosts/views/register-client.html'
+    };
+});

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

@@ -89,17 +89,6 @@ angular.module('Bastion.content-hosts').config(['$stateProvider', function ($sta
         }
     });
 
-    $stateProvider.state('content-host.events', {
-        url: '/events',
-        permission: 'view_hosts',
-        controller: 'ContentHostEventsController',
-        templateUrl: 'content-hosts/details/views/content-host-events.html',
-        ncyBreadcrumb: {
-            label: "{{ 'Events' | translate }}",
-            parent: 'content-host.info'
-        }
-    });
-
     $stateProvider.state('content-host.tasks', {
         abstract: true,
         template: '<div ui-view></div>'

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages-installed.controller.js

@@ -22,10 +22,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesInstalled
 
             if (!$scope.working) {
                 $scope.working = true;
-                HostPackage.remove({
-                    id: $scope.host.id,
-                    packages: selected
-                }, $scope.openEventInfo, $scope.errorHandler);
+                $scope.performPackageAction("packageRemove", selected.join(","));
             }
         };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/content/content-host-packages.controller.js

@@ -63,7 +63,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostPackagesControlle
         };
 
         $scope.performViaRemoteExecution = function(actionType, term, customize) {
-            $scope.packageActionFormValues.package = term;
+            var terms = term.split(/ *, */);
+            $scope.working = true;
+            $scope.packageActionFormValues.package = terms.join(' ');
             $scope.packageActionFormValues.remoteAction = actionType;
             $scope.packageActionFormValues.hostIds = $scope.host.id;
             $scope.packageActionFormValues.customize = customize;

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

@@ -24,9 +24,7 @@
   <div bst-feature-flag="remote_actions">
     <p bst-alert="info" ng-hide="host.content_facet_attributes.katello_agent_installed">
       <span translate>
-        The katello-agent package is required to manage errata on this Host.
-        Please install the katello-agent package to manage errata on
-        {{ host.name }}.
+        If you are not using Remote Execution to manage content on this host, ensure that it has the katello-agent package installed.
       </span>
     </p>
   </div>

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

@@ -4,10 +4,7 @@
   <h4 translate>Package Actions</h4>
   <p bst-alert="info" ng-hide="host.content_facet_attributes.katello_agent_installed">
     <span translate>
-      The katello-agent package is required to manage packages on this Host.
-      Please install the katello-agent package to manage packages on
-      {{ host.name }}. To install the package, connect directly to the
-      host from a terminal and use yum.
+      If you are not using Remote Execution to manage content on this host, ensure that it has the katello-agent package installed.
     </span>
   </p>
   <section>
@@ -65,4 +62,4 @@
       </form>
     </div>
   </section>
-</section>
+</section>

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

@@ -3,10 +3,7 @@
 <section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
   <p bst-alert="info" ng-hide="host.content_facet_attributes.katello_agent_installed">
     <span translate>
-      The katello-agent package is required to manage packages on this Host.
-      Please install the katello-agent package to manage packages on
-      {{ host.name }}. To install the package, connect directly to the
-      host from a terminal and use yum.
+      If you are not using Remote Execution to manage content on this host, ensure that it has the katello-agent package installed.
     </span>
   </p>
 </section>

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

@@ -69,23 +69,11 @@
         </a>
       </li>
       <li uib-dropdown
-          ng-class="{active: stateIncludes('content-host.subscriptions.list') || stateIncludes('content-host.subscriptions.add') || stateIncludes('content-host.events')}">
-        <a uib-dropdown-toggle>
-          <span translate>Subscriptions</span>
-          <i class="fa fa-chevron-down"></i>
+          ng-class="{active: stateIncludes('content-host.subscriptions.list') || stateIncludes('content-host.subscriptions.add')}">
+        <a translate
+           ui-sref="content-host.subscriptions.list">
+          Subscriptions
         </a>
-        <ul uib-dropdown-menu>
-          <li>
-            <a ui-sref="content-host.subscriptions.list" translate>
-              Subscriptions
-            </a>
-          </li>
-          <li>
-            <a ui-sref="content-host.events" translate>
-              Events
-            </a>
-          </li>
-        </ul>
       </li>
       <li ng-class="{active: $state.includes('content-host.host-collections')}">
         <a translate

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

@@ -54,8 +54,8 @@
           </a>
         </dd>
 
-        <dt translate>Registered Through</dt>
-        <dd>{{ host.subscription_facet_attributes.registered_through || "Unknown" | translate}}</dd>
+        <dt ng-show="!host.subscription_facet_attributes.hypervisor || host.subscription_facet_attributes.registered_through" translate>Registered Through</dt>
+        <dd ng-show="!host.subscription_facet_attributes.hypervisor || host.subscription_facet_attributes.registered_through">{{ host.subscription_facet_attributes.registered_through | translate}}</dd>
 
         <dt ng-show="host.subscription_facet_attributes.virtual_host" translate>Virtual Host</dt>
         <dd ng-show="host.subscription_facet_attributes.virtual_host">

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

@@ -54,7 +54,7 @@
         <li class="divider"></li>
 
         <li role="menuitem" ng-show="permitted('destroy_hosts')" ng-class="{disabled: table.numSelected === 0}">
-          <a ng-click="openModal()" disable-link="table.numSelected === 0" translate>Remove Hosts</a>
+          <a ng-click="openModal()" disable-link="table.numSelected === 0" translate>Delete Hosts</a>
           <span bst-modal="performDestroyHosts()" template-url="content-hosts/bulk/views/content-hosts-bulk-destroy-modal.html"></span>
         </li>
       </ul>

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

@@ -0,0 +1,13 @@
+<li>
+  <p translate>Install client package:</p>
+
+  <p translate>To report package & errata information:</p>
+  <pre><code>yum -y install katello-host-tools</code></pre>
+
+  <p translate>To optionally report tracer information:</p>
+  <pre><code>yum -y install katello-host-tools-tracer</code></pre>
+
+  <p translate>For remote actions and reporting package & errata information:</p>
+  <pre><code>yum -y install katello-agent</code></pre>
+  <p translate>Learn more about these packages in the <a href="https://theforeman.org/plugins/katello/">Documentation</a> </p>
+</li>

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

@@ -24,19 +24,7 @@
         <p translate>Using a username and password:</p>
         <pre><code>subscription-manager register --org="{{ organization.label }}" --environment="Library"</code></pre>
       </li>
-      <li>
-        <p translate>Install client package:</p>
-
-        <p translate>To report package & errata information:</p>
-        <pre><code>yum -y install katello-host-tools</code></pre>
-
-        <p translate>To optionally report tracer information:</p>
-        <pre><code>yum -y install katello-host-tools-tracer</code></pre>
-
-        <p translate>For remote actions and reporting package & errata information:</p>
-        <pre><code>yum -y install katello-agent</code></pre>
-        <p translate>Learn more about these packages in the <a href="https://theforeman.org/plugins/katello/">Documentation</a> </p>
-      </li>
+      <register-client />
     </ol>
   </div>
 </section>

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

@@ -318,7 +318,7 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
         controller: 'ContentViewDebRepositoriesListController',
         templateUrl: 'content-views/details/views/content-view-deb-repositories.html',
         ncyBreadcrumb: {
-            label: '{{ "Deb Repositories" | translate }}',
+            label: '{{ "Apt Repositories" | translate }}',
             parent: 'content-view.info'
         }
     })
@@ -328,7 +328,7 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
         controller: 'ContentViewAvailableDebRepositoriesController',
         templateUrl: 'content-views/details/views/content-view-deb-repositories.html',
         ncyBreadcrumb: {
-            label: '{{ "Add Deb Repositories" | translate }}',
+            label: '{{ "Add Apt Repositories" | translate }}',
             parent: 'content-view.info'
         }
     })
@@ -614,7 +614,6 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
             parent: 'content-view.yum.filter.package_group.edit'
         }
     })
-
     .state('content-view.yum.filter.erratum', {
         abstract: true,
         url: '/filters/:filterId/errata',
@@ -660,7 +659,6 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
             label: '{{ filter.name }}',
             parent: 'content-view.yum.filters'
         }
-
     })
     .state('content-view.yum.filter.erratum.repositories', {
         url: '/repositories',
@@ -672,7 +670,51 @@ angular.module('Bastion.content-views').config(['$stateProvider', function ($sta
             parent: 'content-view.yum.filter.erratum.edit'
         }
     })
-
+    .state('content-view.yum.filter.module-stream', {
+        abstract: true,
+        url: '/filters/:filterId/module-stream',
+        templateUrl: 'content-views/details/filters/views/module-stream-filter.html'
+    })
+    .state('content-view.yum.filter.module-stream.edit', {
+        url: '/edit',
+        controller: 'FilterEditController',
+        permission: 'edit_content_views',
+        templateUrl: 'content-views/details/filters/views/edit-filter.html',
+        ncyBreadcrumb: {
+            label: '{{ "Edit" | translate }} {{ filter.name }}',
+            parent: 'content-view.yum.filters'
+        }
+    })
+    .state('content-view.yum.filter.module-stream.list', {
+        url: '/list',
+        permission: 'view_content_views',
+        controller: 'ModuleStreamFilterListController',
+        templateUrl: 'content-views/details/filters/views/module-stream-filter-details.html',
+        ncyBreadcrumb: {
+            label: '{{ "Module Streams" | translate }}',
+            parent: 'content-view.yum.filter.module-stream.edit'
+        }
+    })
+    .state('content-view.yum.filter.module-stream.available', {
+        url: '/available',
+        permission: 'edit_content_views',
+        controller: 'AvailableModuleStreamFilterController',
+        templateUrl: 'content-views/details/filters/views/module-stream-filter-details.html',
+        ncyBreadcrumb: {
+            label: '{{ "Add Module Streams" | translate }}',
+            parent: 'content-view.yum.filter.module-stream.edit'
+        }
+    })
+    .state('content-view.yum.filter.module-stream.repositories', {
+        url: '/repositories',
+        permission: 'view_content_views',
+        controller: 'FilterRepositoriesController',
+        templateUrl: 'content-views/details/filters/views/filter-repositories.html',
+        ncyBreadcrumb: {
+            label: '{{ "Repositories | translate }}',
+            parent: 'content-view.yum.filter.module-stream.edit'
+        }
+    })
     .state('content-view.docker', {
         url: '/repositories/docker',
         abstract: true,

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-available-content-views.html

@@ -52,7 +52,7 @@
                   ng-if="componentContentView.versions.length > 0"
                   ng-model="componentContentView.versionId"
                   ng-selected="latest"
-                  ng-options="cvv.id as cvv.version for cvv in availableVersions">
+                  ng-options="cvv.id as cvv.version for cvv in availableVersions | orderBy: '-version'">
           </select>
           <span ng-if="componentContentView.versions.length === 0" ng-model="componentContentView.version" translate>Always Use Latest (Currently no versions)</span>
         </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/components/views/content-view-composite-content-views-list.html

@@ -44,7 +44,7 @@
                   readonly="denied('edit_content_views', contentView)"
                   selector="contentViewComponent.versionId"
                   options="getAvailableVersions(contentViewComponent.content_view)"
-                  options-format="option.id as option.version for option in options"
+                  options-format="option.id as option.version for option in options | orderBy: '-version'"
                   on-save="saveContentViewComponent(contentViewComponent)"
                   ng-if="contentViewComponent.content_view.version_count > 0">
             </span>

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

@@ -35,7 +35,7 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
         $scope.taskTypes = {
             publish: "Actions::Katello::ContentView::Publish",
             promotion: "Actions::Katello::ContentView::Promote",
-            deletion: "Actions::Katello::ContentView::Remove",
+            removal: "Actions::Katello::ContentView::Remove",
             incrementalUpdate: "Actions::Katello::ContentView::IncrementalUpdates",
             export: "Actions::Katello::ContentViewVersion::Export"
         };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/available-module-stream-filter.controller.js

@@ -0,0 +1,68 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-views.controller:AvailableModuleStreamFilterController
+ *
+ * @requires $scope
+ * @requires translate
+ * @requires ModuleStream
+ * @requires Rule
+ * @requires Nutupane
+ * @requires Notification
+ *
+ * @description
+ *   Handles fetching module streams that are available to add to a filter and saving
+ *   each selected module stream as a filter rule.
+ */
+angular.module('Bastion.content-views').controller('AvailableModuleStreamFilterController',
+    ['$scope', 'translate', 'ModuleStream', 'Rule', 'Nutupane', 'Notification',
+    function ($scope, translate, ModuleStream, Rule, Nutupane, Notification) {
+        var nutupane;
+
+        $scope.nutupane = nutupane = new Nutupane(
+            ModuleStream,
+            {
+              filterId: $scope.$stateParams.filterId,
+              'available_for': 'content_view_filter',
+              'sort_order': 'ASC',
+              'sort_by': 'name'
+            },
+            'queryPaged'
+        );
+
+        function success(data) {
+            var rules;
+
+            if (data.results) {
+                rules = data.results;
+            } else {
+                rules = [data];
+            }
+
+            $scope.filter.rules = _.union($scope.filter.rules, rules);
+            Notification.setSuccessMessage(translate('Module Stream successfully added.'));
+            nutupane.table.selectAllResults(false);
+            nutupane.refresh();
+        }
+
+        function failure(response) {
+            Notification.setErrorMessage(response.data.displayMessage);
+        }
+
+        $scope.table = nutupane.table;
+        nutupane.table.closeItem = function () {};
+
+        function saveRules(rules, filter) {
+            var params = {filterId: filter.id};
+
+            return rules.$save(params, success, failure);
+        }
+
+        $scope.addModuleStreams = function (filter) {
+            var moduleStreams = nutupane.getAllSelectedResults().included.ids,
+                rules;
+            rules = new Rule({"module_stream_ids": moduleStreams});
+            nutupane.table.working = true;
+            saveRules(rules, filter);
+        };
+    }]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-helper.service.js

@@ -14,7 +14,8 @@ angular.module('Bastion.content-views').service('FilterHelper',
             'rpm': translate('RPM'),
             'erratum': translate('Errata'),
             'package_group': translate('Package Groups'),
-            'docker': translate('Container Image Tags')
+            'docker': translate('Container Image Tags'),
+            'modulemd': translate('Module Streams')
         };
 
         this.contentType = function (type) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-rule-matching-package-modal.controller.js

@@ -0,0 +1,37 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-views.controller:FilterRuleMatchingPackageModal
+ *
+ * @requires $scope
+ * @requires $location
+ * @requires $uibModalInstance
+ * @requires filterRuleId
+ * @requires Package
+ * @requires Nutupane
+ * @requires CurrentOrganization
+ *
+ * @description
+ *   A controller for providing matching filter rule modal
+ */
+angular.module('Bastion.content-views').controller('FilterRuleMatchingPackageModal',
+    ['$scope', '$location', '$uibModalInstance', 'filterRuleId', 'Package', 'Nutupane', 'CurrentOrganization',
+        function ($scope, $location, $uibModalInstance, filterRuleId, Package, Nutupane, CurrentOrganization) {
+
+            var nutupane, params = {
+              'organization_id': CurrentOrganization,
+              'content_view_filter_rule_id': filterRuleId,
+              'search': $location.search().search || "",
+              'paged': true
+            };
+
+            nutupane = $scope.nutupane = new Nutupane(Package, params);
+            $scope.nutupane.setSearchKey('filterRule' + filterRuleId + "Packages");
+            $scope.nutupane.setTableName('filterRule' + filterRuleId + "PackagesTable");
+            $scope.table = nutupane.table;
+
+            $scope.cancel = function () {
+                $uibModalInstance.close();
+            };
+        }
+    ]
+);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filters.controller.js

@@ -31,7 +31,7 @@ angular.module('Bastion.content-views').controller('FiltersController',
         }
 
         if ($scope.stateIncludes('content-view.yum')) {
-            filterTypes = ['rpm', 'package_group', 'erratum'];
+            filterTypes = ['rpm', 'package_group', 'erratum', 'modulemd'];
         } else {
             filterTypes = ['docker'];
         }
@@ -71,6 +71,9 @@ angular.module('Bastion.content-views').controller('FiltersController',
             case "rpm":
                 state = "content-view.yum.filter.rpm({filterId: filter.id})";
                 break;
+            case "modulemd":
+                state = "content-view.yum.filter.module-stream.list({filterId: filter.id})";
+                break;
             case "package_group":
                 state = "content-view.yum.filter.package_group.list({filterId: filter.id})";
                 break;