katello 3.13.4 → 3.14.0.rc1

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

@@ -0,0 +1,73 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-views.controller:PackageFilterListController
+ *
+ * @requires $scope
+ * @requires translate
+ * @requires ModuleStream
+ * @requires Rule
+ * @requires Nutupane
+ * @requires Notification
+ *
+ * @description
+ *   Handles loading module streams that have been added to the filter via filter rules
+ *   and provides a method to remove them.
+ */
+angular.module('Bastion.content-views').controller('ModuleStreamFilterListController',
+    ['$scope', 'translate', 'ModuleStream', 'Rule', 'Nutupane', 'Notification',
+    function ($scope, translate, ModuleStream, Rule, Nutupane, Notification) {
+        var nutupane;
+
+        function success(rule) {
+            nutupane.removeRow(rule['module_stream_id'], 'id');
+            $scope.filter.rules = _.reject($scope.filter.rules, function (filterRule) {
+                return rule.id === filterRule.id;
+            });
+            Notification.setSuccessMessage(translate('Module Stream successfully removed.'));
+        }
+
+        function failure(response) {
+            Notification.setErrorMessage(response.data.displayMessage);
+        }
+
+        function findRules(moduleStreamIds) {
+            var rules = [];
+
+            angular.forEach(moduleStreamIds, function (id) {
+                var found;
+
+                found = _.find($scope.filter.rules, function (rule) {
+                    return (rule['module_stream_id'] === id);
+                });
+
+                if (found) {
+                    rules.push(new Rule(found));
+                }
+            });
+
+            return rules;
+        }
+
+        nutupane = new Nutupane(ModuleStream, {
+            filterId: $scope.$stateParams.filterId,
+            'sort_order': 'ASC',
+            'sort_by': 'name'
+            },
+            'queryPaged'
+        );
+
+        $scope.table = nutupane.table;
+        nutupane.table.closeItem = function () {};
+
+        $scope.removeModuleStreams = function () {
+            var moduleStreamIds = nutupane.getAllSelectedResults().included.ids,
+                rules;
+
+            rules = findRules(moduleStreamIds);
+
+            angular.forEach(rules, function (rule) {
+                rule.$delete(success, failure);
+            });
+        };
+    }]
+);

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

@@ -25,6 +25,8 @@ angular.module('Bastion.content-views').controller('NewFilterController',
                 state = 'content-view.yum.filter.rpm.details';
             } else if (filterType === 'package_group') {
                 state = 'content-view.yum.filter.package_group.available';
+            } else if (filterType === 'modulemd') {
+                state = 'content-view.yum.filter.module-stream.available';
             } else if (filterType === 'docker') {
                 state = 'content-view.docker.filter.tag.details';
             }
@@ -74,7 +76,8 @@ angular.module('Bastion.content-views').controller('NewFilterController',
                 {id: 'rpm', name: translate('Package')},
                 {id: 'package_group', name: translate('Package Group')},
                 {id: 'erratumId', name: translate('Erratum - by ID')},
-                {id: 'erratumDateType', name: translate('Erratum - Date and Type')}
+                {id: 'erratumDateType', name: translate('Erratum - Date and Type')},
+                {id: 'modulemd', name: translate('Module Stream')}
             ];
         } else {
             $scope.filter.type = "docker";

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

@@ -11,12 +11,14 @@
  * @requires Rule
  * @requires Package
  * @requires Notification
+ * @requires $uibModal
  *
  * @description
  *   Handles package filter rules for a content view.
  */
 angular.module('Bastion.content-views').controller('PackageFilterController',
-    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Filter', 'Rule', 'Package', 'Notification', function ($scope, $location, translate, Nutupane, CurrentOrganization, Filter, Rule, Package, Notification) {
+    ['$scope', '$location', 'translate', 'Nutupane', 'CurrentOrganization', 'Filter', 'Rule', 'Package', 'Notification', '$uibModal',
+     function ($scope, $location, translate, Nutupane, CurrentOrganization, Filter, Rule, Package, Notification, $uibModal) {
         var nutupane, params;
 
         function failure(response) {
@@ -137,6 +139,17 @@ angular.module('Bastion.content-views').controller('PackageFilterController',
             });
         };
 
+        $scope.getMatchingContent = function (rule) {
+            $uibModal.open({
+                templateUrl: 'content-views/details/filters/views/filter-rule-matching-package-modal.html',
+                controller: 'FilterRuleMatchingPackageModal',
+                size: 'lg',
+                resolve: {
+                    filterRuleId: rule.id
+                }
+            }).closed.then(function () {});
+        };
+
         $scope.fetchAutocompleteName = function (term) {
             var repositoryIds = $scope.contentView['repository_ids'],
                 promise;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/errata-filter-details.html

@@ -38,6 +38,7 @@
         <th bst-table-column translate>Issued</th>
         <th bst-table-column translate>Updated</th>
         <th bst-table-column translate>Title</th>
+        <th bst-table-column translate>Modular</th>
       </tr>
     </thead>
 
@@ -54,6 +55,8 @@
           <date date="errata.updated" />
         </td>
         <td bst-table-cell>{{ errata.title }}</td>
+        <td bst-table-cell ng-if="errata.module_streams.length > 0" translate> Yes </td>
+        <td bst-table-cell ng-if="errata.module_streams.length == 0" translate> No </td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/filter-details.html

@@ -4,8 +4,6 @@
   <h3>{{ filter.name }}</h3>
   <small translate>Type: {{ filter.inclusion | filterType }} {{ filter.type | filterContentType }}</small>
   <br/>
-  <i class="fa fa-warning inline-icon" ng-if="filter.type === 'rpm' || filter.type === 'errata'">&nbsp;<span translate>
-RPMs belonging to Module Streams will not be affected by filters. These RPMs will automatically be included in a Content View Version along with the associated Module Streams.</span></i>
 </header>
 
 <div ui-view></div>

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

@@ -107,6 +107,11 @@
                   {{ repository.content_counts.erratum }} Errata
                 </a>
               </div>
+              <div ng-if="repository.content_counts.module_stream && repository.content_counts.module_stream > 0">
+                <a ui-sref="product.repository.manage-content.module-streams({productId: repository.product.id, repositoryId: repository.id})" translate>
+                  {{ 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/filters/views/filter-rule-matching-package-modal.html

@@ -0,0 +1,43 @@
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header">Matching Content</h4>
+
+  <div data-block="modal-body">
+    <div data-extend-template="layouts/table-with-header.html">
+      <span data-block="no-rows-message" translate>
+        No RPMs were matched
+      </span>
+
+      <span data-block="no-search-results-message" translate>
+        Your search returned zero RPMs
+      </span>
+
+      <div data-block="table">
+        <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
+          <thead>
+          <tr bst-table-head>
+            <th bst-table-column="name" sortable>{{ "RPM" | translate }}</th>
+            <th bst-table-column="version">{{ "Summary" | translate }}</th>
+          </tr>
+          </thead>
+
+          <tbody>
+          <tr bst-table-row ng-repeat="package in table.rows">
+            <td bst-table-cell>
+              <a ui-sref="package.info({packageId: package.id})" target="_blank">
+                {{ package.nvrea}}
+              </a>
+            </td>
+            <td bst-table-cell>
+              {{ package.summary }}
+            </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+ </div>
+
+  <div data-block="modal-footer">
+    <button class="btn btn-default" ng-click="cancel()" translate>Close</button>
+  </div>
+</div>

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

@@ -56,6 +56,10 @@
                ui-sref="content-view.yum.filter.rpm.details({filterId: filter.id})">
               {{ filter.name }}
             </a>
+            <a ng-if="filter.type === 'modulemd'"
+               ui-sref="content-view.yum.filter.module-stream.list({filterId: filter.id})">
+              {{ filter.name }}
+            </a>
             <a ng-if="filter.type === 'package_group'"
                ui-sref="content-view.yum.filter.package_group.list({filterId: filter.id})">
               {{ filter.name }}

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

@@ -0,0 +1,41 @@
+<div data-extend-template="layouts/partials/table.html">
+
+  <div data-block="list-actions">
+    <button type="button" class="btn btn-primary"
+            ng-disabled="table.numSelected === 0"
+            ng-show="isState('content-view.yum.filter.module-stream.list') && permitted('edit_content_views', contentView)"
+            ng-click="removeModuleStreams(filter)">
+      <span translate>Remove Module Stream</span>
+    </button>
+
+    <button type="button" class="btn btn-primary"
+            ng-disabled="table.numSelected === 0"
+            ng-show="isState('content-view.yum.filter.module-stream.available') && permitted('edit_content_views', contentView)"
+            ng-click="addModuleStreams(filter)">
+      <span translate>Add Module Stream</span>
+    </button>
+  </div>
+
+  <div data-block="table">
+    <table class="table table-striped table-bordered" ng-class="{'table-mask': table.working}">
+
+      <thead>
+        <tr bst-table-head row-select>
+          <th bst-table-column><span translate>Name</span></th>
+          <th bst-table-column><span translate>Stream</span></th>
+          <th bst-table-column><span translate>Version</span></th>
+          <th bst-table-column><span translate>Context</span></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="moduleStream in table.rows" row-select="moduleStream">
+          <td bst-table-cell>{{ moduleStream.name }}</td>
+          <td bst-table-cell>{{ moduleStream.stream }}</td>
+          <td bst-table-cell>{{ moduleStream.version}}</td>
+          <td bst-table-cell>{{ moduleStream.context}}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

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

@@ -0,0 +1,43 @@
+<span page-title ng-model="filter">{{ 'Module Stream Filter:' | translate }} {{ filter.name }}</span>
+
+<div class="details details-full">
+  <nav>
+    <ul class="nav nav-tabs nav-tabs-pf">
+
+      <li ng-class="{active: isState('content-view.yum.filter.module-stream.edit')}">
+        <a ui-sref="content-view.yum.filter.module-stream.edit">
+        <span translate>
+	  Details
+        </span>
+        </a>
+      </li>
+
+      <li ng-class="{active: isState('content-view.yum.filter.module-stream.list')}">
+        <a ui-sref="content-view.yum.filter.module-stream.list({filterId: filter.id})">
+        <span translate>
+          List/Remove
+        </span>
+        </a>
+      </li>
+
+      <li ng-class="{active: isState('content-view.yum.filter.module-stream.available')}"
+          ng-show="!contentView.permissions.editable">
+        <a ui-sref="content-view.yum.filter.module-stream.available({filterId: filter.id})">
+        <span translate>
+          Add
+        </span>
+        </a>
+      </li>
+
+      <li ng-class="{active: isState('content-view.yum.filter.module-stream.repositories')}"
+          ng-show="!contentView.permissions.editable">
+        <a ui-sref="content-view.yum.filter.module-stream.repositories({filterId: filter.id})"
+           ng-include="'content-views/details/filters/views/partials/filter-repositories-count.html'">
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <div ui-view></div>
+
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/views/package-filter-details.html

@@ -163,6 +163,10 @@
               <span translate>Edit</span>
             </button>
 
+            <button type="button" class="btn btn-default" ng-click="getMatchingContent(rule)" ng-hide="rule.editMode">
+              <span translate>Show Matching Content</span>
+            </button>
+
             <button bst-save-control
                     on-cancel="restorePrevious(rule); rule.editMode = false"
                     on-save="saveRule(rule)"

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

@@ -29,7 +29,7 @@ angular.module('Bastion.content-views').controller('ContentViewHistoryController
                 taskTypes = $scope.taskTypes,
                 taskType = history.task ? history.task.label : taskTypes[history.action];
 
-            if (taskType === taskTypes.deletion) {
+            if (taskType === taskTypes.removal) {
                 message = translate("Deleted from %s").replace('%s', history.environment.name);
             } else if (taskType === taskTypes.promotion) {
                 message = translate("Promoted to %s").replace('%s', history.environment.name);

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

@@ -28,7 +28,7 @@
            <td bst-table-cell class="preserve-newlines">{{ history.description }}</td>
           <td bst-table-cell>{{ actionText(history) }}</td>
           <td bst-table-cell>{{ history.user }}</td>
-          <td bst-table-cell>{{ history.task.result }}</td>
+          <td bst-table-cell>{{ history.status }}</td>
         </tr>
       </tbody>
     </table>

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

@@ -1,6 +1,6 @@
 <span page-title ng-model="contentView">{{ 'Repositories for Content View:' | translate }} {{ contentView.name }}</span>
 
-<h3 translate>Deb Repositories</h3>
+<h3 translate>Apt Repositories</h3>
 
 <nav data-block="navigation">
   <ul class="nav nav-tabs nav-tabs-pf" ng-show="permitted('edit_content_views', contentView)">
@@ -38,10 +38,10 @@
 
   <span data-block="no-rows-message">
     <span ng-show="isState('content-view.repositories.deb.list')" translate>
-      There are currently no Deb Repositories associated with this Content View, you can add some by clicking on the "Add" tab above.
+      There are currently no Apt Repositories associated with this Content View, you can add some by clicking on the "Add" tab above.
     </span>
     <span ng-show="isState('content-view.repositories.deb.available')">
-      <span translate>There are currently no Deb Repositories to add to this Content View,</span>
+      <span translate>There are currently no Apt Repositories to add to this Content View,</span>
       <a ui-sref="products" translate>add some repositories.</a>
     </span>
   </span>

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

@@ -59,8 +59,7 @@
                readonly="denied('edit_content_views', contentView)">
           </div>
           <p class="help-text" translate>
-            This will solve RPM dependencies on every publish of this Content View. Dependency solving significantly increases
-            publish time (publishes can take over three times as long) and filters will be ignored when adding packages to solve
+            This will solve RPM and Module Stream dependencies on every publish of this Content View. Dependency solving significantly increases publish time (publishes can take over three times as long) and filters will be ignored when adding packages to solve
             dependencies. Also, certain scenarios involving errata may still cause dependency errors.
           </p>
         </dd>

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

@@ -82,7 +82,7 @@
           </label>
         </div>
         <p class="help-block" translate>
-          This will solve RPM dependencies on every publish of this Content View. Dependency solving significantly increases
+          This will solve RPM and Module Stream dependencies on every publish of this Content View. Dependency solving significantly increases
           publish time (publishes can take over three times as long) and filters will be ignored when adding packages to solve
           dependencies. Also, certain scenarios involving errata may still cause dependency errors.
         </p>

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

@@ -5,6 +5,7 @@
         <th bst-table-column="errata_id" sortable>{{ "Errata ID" | translate }}</th>
         <th bst-table-column="title">{{ "Title" | translate }}</th>
         <th bst-table-column="type">{{ "Type" | translate }}</th>
+        <th bst-table-column="modular">{{ "Modular" | translate }}</th>
         <th bst-table-column="numberOfContentHosts">{{ "Applicable Content Hosts" | translate }}</th>
         <th bst-table-column="updated" sortable>{{ "Updated" | translate }}</th>
       </tr>
@@ -37,6 +38,8 @@
           {{ errata.type }}
           <span ng-show="errata.severity">- {{ errata.severity }}</span>
         </td>
+        <td bst-table-cell ng-if="errata.module_streams.length > 0" translate> Yes </td>
+        <td bst-table-cell ng-if="errata.module_streams.length == 0" translate> No </td>
         <td bst-table-cell>{{ errata.hosts_available_count || 0 }}</td>
         <td bst-table-cell><date date="errata.updated" /></td>
       </tr>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/errata.controller.js

@@ -40,7 +40,7 @@ angular.module('Bastion.errata').controller('ErrataController',
 
         $scope.repository = {name: translate('All Repositories'), id: 'all'};
 
-        Repository.queryUnpaged({'organization_id': CurrentOrganization, 'content_type': 'yum'}, function (response) {
+        Repository.queryUnpaged({'organization_id': CurrentOrganization, 'content_type': 'yum', 'with_content': 'erratum'}, function (response) {
             $scope.repositories = [$scope.repository];
             $scope.repositories = $scope.repositories.concat(response.results);
 

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

@@ -44,7 +44,7 @@
           </a>
         </td>
         <td bst-table-cell >{{ host.content_facet_attributes.lifecycle_environment.name}}</td>
-        <td bst-table-cell >{{ host.content_facet_attributes.name}}</td>
+        <td bst-table-cell >{{ host.content_facet_attributes.content_view.name}}</td>
       </tr>
 
       </tbody>

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

@@ -62,47 +62,56 @@
 
   <div data-block="right-column">
     <h3 translate>Actions</h3>
+    <div ng-if="hostCollection.total_hosts === 0">
+      <p bst-alert='info'>
+          <span translate>
+            Add hosts to the host collection to see available actions.
+          </span>
+      </p>
+    </div>
 
-    <p translate>
-      The following actions can be performed on content hosts in this host collection:
-    </p>
+    <div ng-if="hostCollection.total_hosts > 0">
+      <p translate>
+        The following actions can be performed on content hosts in this host collection:
+      </p>
 
-    <ul class="list-unstyled">
-      <li bst-feature-flag="remote_actions">
-        <a translate ng-click ="openPackagesModal()">
-          Package Installation, Removal, and Update
-        </a>
-      </li>
+      <ul class="list-unstyled">
+        <li bst-feature-flag="remote_actions">
+          <a translate ng-click ="openPackagesModal()">
+            Package Installation, Removal, and Update
+          </a>
+        </li>
 
-      <li bst-feature-flag="remote_actions">
-        <a translate ng-click="openErrataModal()">
-          Errata Installation
-        </a>
-      </li>
+        <li bst-feature-flag="remote_actions">
+          <a translate ng-click="openErrataModal()">
+            Errata Installation
+          </a>
+        </li>
 
-      <li>
-        <a translate ng-click = "openHostCollectionsModal()">
-          Host Collection Membership
-        </a>
-      </li>
+        <li>
+          <a translate ng-click = "openHostCollectionsModal()">
+            Host Collection Membership
+          </a>
+        </li>
 
-      <li>
-        <a translate ng-click = "openModuleStreamsModal()">
-          Module Stream Management
-        </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
-        </a>
-      </li>
+        <li bst-feature-flag="lifecycle_environments">
+          <a translate ng-click="openEnvironmentModal()">
+            Change assigned Lifecycle Environment or Content View
+          </a>
+        </li>
 
-      <li bst-feature-flag="subscription_management">
-        <a translate ng-click="openSubscriptionsModal()">
-          Subscription Management
-        </a>
-      </li>
-    </ul>
+        <li bst-feature-flag="subscription_management">
+          <a translate ng-click="openSubscriptionsModal()">
+            Subscription Management
+          </a>
+        </li>
+      </ul>
+    </div>
   </div>
 </section>