katello 4.15.0 → 4.16.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-system-purpose-modal.controller.js

@@ -19,14 +19,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkSystemPurpos
 
         $scope.organization = Organization.get({id: CurrentOrganization});
 
-        $scope.purposeAddonsList = function () {
-            var defaultOptions = ['No Change', 'None (Clear)'];
-            if ($scope.organization.system_purposes && $scope.organization.system_purposes.addons) {
-                return defaultOptions.concat($scope.organization.system_purposes.addons);
-            }
-            return [];
-        };
-
         $scope.defaultUsages = ['No change', 'None (Clear)', 'Production', 'Development/Test', 'Disaster Recovery'];
         $scope.defaultRoles = ['No change', 'None (Clear)', 'Red Hat Enterprise Linux Server', 'Red Hat Enterprise Linux Workstation', 'Red Hat Enterprise Linux Compute Node'];
         $scope.defaultServiceLevels = ['No change', 'None (Clear)', 'Self-Support', 'Standard', 'Premium'];
@@ -37,54 +29,22 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkSystemPurpos
         $scope.selectedRoles = $scope.defaultRoles[0];
         $scope.selectedServiceLevels = $scope.defaultServiceLevels[0];
 
-        $scope.selected = {
-           addons: undefined
-        };
-
         $scope.selectedItemToParam = function (item) {
             var mapping = {
                 "None (Clear)": "",
-                "No change": null,
-                "": []
+                "No change": null
             };
-            if (Array.isArray(item)) {
-                return $scope.selectedAddonsToParam(item);
-            }
             if (mapping.hasOwnProperty(item)) {
                 return mapping[item];
             }
             return item;
         };
 
-        $scope.selectedAddonsToParam = function (addons) {
-            var intentOptions = ['No Change', 'None (Clear)'];
-
-            var userIntent = intentOptions.filter(function(val) {
-                return addons.indexOf(val) !== -1;
-            });
-
-            if (userIntent.length === 0) {
-                return addons;
-            }
-
-            if (userIntent.includes('No Change')) {
-                return null;
-            }
-
-            if (userIntent.includes('None (Clear)') && addons.length === 1) {
-                return [];
-            } if (userIntent.includes('None (Clear)') && addons.length > 1) {
-                addons.shift();
-                return addons;
-            }
-        };
-
         function actionParams() {
             var params = hostIds;
 
             params['purpose_usage'] = $scope.selectedItemToParam($scope.selectedUsages);
             params['purpose_role'] = $scope.selectedItemToParam($scope.selectedRoles);
-            params['purpose_addons'] = $scope.selectedItemToParam($scope.selectedAddons);
             params['service_level'] = $scope.selectedItemToParam($scope.selectedServiceLevels);
 
             return params;

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/content-hosts-bulk-traces-modal.controller.js

@@ -34,7 +34,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkTracesContro
                 Notification.setSuccessMessage(message, {
                     link: {
                         children: translate("View job invocations."),
-                        href: translate("/job_invocations")
+                        href: "/job_invocations"
                     }});
                 $scope.ok();
             };

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

@@ -102,11 +102,11 @@
               <span ng-switch="newHostDetailsUI">
                 <a ng-switch-when="true" target="_blank" href="{{ '/hosts?search=installable_errata%3D' + erratum.errata_id }}">
                   {{ erratum.affected_hosts_count }}
-                <span class="fa fa-external-link"/>
+                  <span class="fa fa-external-link"></span>
                 </a>
                 <a ng-switch-when="false" target="_blank" href="{{ '/content_hosts?search=installable_errata%3D' + erratum.errata_id }}">
                 {{ erratum.affected_hosts_count }}
-                <span class="fa fa-external-link"/>
+                  <span class="fa fa-external-link"></span>
               </a>
               </span>
              </td>

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

@@ -16,7 +16,7 @@
         </p>
 
         <p>
-        <div content-access-mode-banner/>
+        <div content-access-mode-banner></div>
         </p>
 
         <p class="help-text" translate ng-show="table.numSelected > 0 && !simpleContentAccessEnabled">
@@ -106,7 +106,7 @@
               <td bst-table-cell>{{ subscription | subscriptionConsumedFilter }}</td>
               <td bst-table-cell><div subscription-type="subscription"></div></td>
               <td bst-table-cell><div subscription-start-date="subscription"></div></td>
-              <td bst-table-cell><date date="subscription.end_date" /></td>
+              <td bst-table-cell><date date="subscription.end_date" ></date></td>
               <td bst-table-cell>{{ subscription.support_level }}</td>
               <td bst-table-cell>{{ subscription.contract_number }}</td>
               <td bst-table-cell>{{ subscription.account_number }}</td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/views/content-hosts-bulk-system-purpose-modal.html

@@ -47,19 +47,6 @@
                 id="selectedRoles"
                 >
         </select></dd>
-        <br /><br />
-
-        <dt style="margin-left: -75px;"><label ng-hide="!purposeAddonsList().length" translate>Add ons:</label></dt>
-
-        <dd><select multiple ng-multiple="true"
-                ng-hide="!purposeAddonsList().length"
-                ng-options="item for item in purposeAddonsList()"
-                ng-model="selectedAddons">
-        </select></dd>
-        <div class="help-block" style="text-align:center; margin-left: -180px;">
-          <p translate>ctrl-click or shift-click to select multiple Add ons</p>
-        </div>
-        <br /><br />
         </dl></b>
       </div>
     </form>

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

@@ -136,7 +136,7 @@
               </a>
             </td>
             <td bst-table-cell>{{ erratum.title }}</td>
-            <td bst-table-cell><date date="erratum.updated" /></td>
+            <td bst-table-cell><date date="erratum.updated" ></date></td>
           </tr>
         </tbody>
       </table>

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

@@ -109,11 +109,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
             $scope.saveSubscriptionFacet($scope.host);
         };
 
-        $scope.clearAddOns = function () {
-            $scope.host.subscription_facet_attributes['purpose_addons'] = [];
-            $scope.saveSubscriptionFacet($scope.host);
-        };
-
         $scope.clearServiceLevel = function () {
             $scope.host.subscription_facet_attributes['service_level'] = '';
             $scope.saveSubscriptionFacet($scope.host);

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

@@ -25,15 +25,13 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
 
         $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
 
-        $scope.organization = Organization.get({id: CurrentOrganization}, function(org) {
-            $scope.purposeAddonsCount += org.system_purposes.addons.length;
+        $scope.organization = Organization.get({id: CurrentOrganization}, function() {
         });
 
         $scope.defaultUsages = ['Production', 'Development/Test', 'Disaster Recovery'];
         $scope.defaultRoles = ['Red Hat Enterprise Linux Server', 'Red Hat Enterprise Linux Workstation', 'Red Hat Enterprise Linux Compute Node'];
         $scope.defaultServiceLevels = ['Self-Support', 'Standard', 'Premium'];
 
-        $scope.purposeAddonsCount = 0;
         $scope.simpleContentAccessEnabled = simpleContentAccessEnabled;
 
         $scope.panel = {
@@ -46,7 +44,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
                 host.unregisterDelete = !host.hasSubscription() || deleteHostOnUnregister;
                 host.deleteHostOnUnregister = deleteHostOnUnregister;
                 $scope.panel.loading = false;
-                $scope.purposeAddonsCount += host.subscription_facet_attributes.purpose_addons.length;
             }, function (response) {
                 $scope.panel.loading = false;
                 ApiErrorHandler.handleGETRequestErrors(response, $scope);
@@ -83,14 +80,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
                 'release_version': host.subscription_facet_attributes.release_version
             };
 
-            if ($scope.purposeAddonsList) {
-                newHost['subscription_facet_attributes']['purpose_addons'] = _.chain($scope.purposeAddonsList).filter(function(addOn) {
-                    return addOn.selected;
-                }).map(function(addOn) {
-                    return addOn.name;
-                }).value();
-            }
-
             return $scope.save(newHost, true);
         };
         // @TODO end hack
@@ -192,29 +181,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
             });
         };
 
-        $scope.purposeAddons = function () {
-            var purposeAddons;
-            var addOns;
-
-            return $scope.organization.$promise.then(function(org) {
-                $scope.purposeAddonsList = [];
-                addOns = org.system_purposes.addons;
-
-                purposeAddons = $scope.host.subscription_facet_attributes.purpose_addons;
-                angular.forEach(purposeAddons, function(addOn) {
-                    if (addOn && !_.includes(addOns, addOn)) {
-                        addOns.push(addOn);
-                    }
-                });
-
-                angular.forEach(addOns, function (addOn) {
-                    $scope.purposeAddonsList.push({"name": addOn, "selected": purposeAddons.indexOf(addOn) > -1});
-                });
-
-                return $scope.purposeAddonsList;
-            });
-        };
-
         $scope.unregisterContentHost = function (host) {
             var errorHandler = function (response) {
                 host.deleting = false;

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

@@ -130,18 +130,6 @@
             on-delete="clearRole()"
             on-save="saveSubscriptionFacet(host)">
         </dd>
-
-        <dt translate>Add ons</dt>
-        <dd bst-edit-multiselect="host.subscription_facet_attributes.purpose_addons"
-            readonly="denied('edit_hosts', host) || purposeAddonsCount === 0"
-            formatter="arrayToString"
-            deletable="true"
-            on-delete="clearAddOns()"
-            selector="host.subscription_facet_attributes.purpose_addons"
-            options="purposeAddons()"
-            on-save="saveSubscriptionFacet(host)">
-        </dd>
-
       </dl>
 
       <div class="divider"></div>
@@ -290,7 +278,7 @@
 
       <dl class="dl-horizontal dl-horizontal-left">
         <dt translate>Registered</dt>
-        <dd><long-date-time date="host.created_at" /></dd>
+        <dd><long-date-time date="host.created_at" ></long-date-time></dd>
 
         <dt translate> Registered By</dt>
         <dd>
@@ -317,7 +305,7 @@
         </dd>
 
         <dt translate>Last Checkin</dt>
-        <dd><long-date-time date="host.subscription_facet_attributes.last_checkin" default="'Never checked in' | translate" /></dd>
+        <dd><long-date-time date="host.subscription_facet_attributes.last_checkin" default="'Never checked in' | translate" ></long-date-time></dd>
       </dl>
 
       <div class="divider"></div>

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

@@ -25,7 +25,7 @@
       <dd>{{ host.puppet_environment_name }}</dd>
 
       <dt translate>Last Puppet Report</dt>
-      <dd><short-date-time date="host.last_report" /></dd>
+      <dd><short-date-time date="host.last_report" ></short-date-time></dd>
 
       <dt translate>Model</dt>
       <dd>{{ host.model_name }}</dd>

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

@@ -139,8 +139,8 @@
           <td bst-table-cell>{{ host.operatingsystem_name }}</td>
           <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment.name }}</td>
           <td bst-table-cell>{{ host.content_facet_attributes.content_view.name || "" }}</td>
-          <td bst-table-cell><long-date-time date="host.subscription_facet_attributes.registered_at" default="'Never registered' | translate" /></td>
-          <td bst-table-cell><long-date-time date="host.subscription_facet_attributes.last_checkin" default="'Never checked in' | translate" /></td>
+          <td bst-table-cell><long-date-time date="host.subscription_facet_attributes.registered_at" default="'Never registered' | translate"></long-date-time></td>
+          <td bst-table-cell><long-date-time date="host.subscription_facet_attributes.last_checkin" default="'Never checked in' | translate"></long-date-time></td>
         </tr>
       </tbody>
     </table>

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

@@ -1,38 +1,52 @@
-(function () {
-    'use strict';
-
-    /**
-     * @ngdoc controller
-     * @name  Bastion.debs.controller:DebsController
-     *
-     * @description
-     *   Handles fetching deb packages and populating Nutupane based on the current
-     *   ui-router state.
-     *
-     * @requires translate
-     *
-     */
-    function DebsController($scope, $location, translate, Nutupane, Deb, CurrentOrganization) {
+/**
+ * @ngdoc controller
+ * @name  Bastion.debs.controller:DebsController
+ *
+ * @description
+ *   Handles fetching deb packages and populating Nutupane based on the current
+ *   ui-router state.
+ *
+ * @requires translate
+ *
+ */
+angular.module('Bastion.debs').controller('DebsController',
+    ['$scope', '$location', 'translate', 'Nutupane', 'Deb', 'Repository', 'CurrentOrganization',
+    function DebsController($scope, $location, translate, Nutupane, Deb, Repository, CurrentOrganization) {
         var nutupane;
 
         var params = {
             'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
+            'repository_id': $location.search().repositoryId || null,
             'paged': true,
             'sort_by': 'name',
             'sort_order': 'ASC'
         };
 
-        nutupane = new Nutupane(Deb, params);
+        nutupane = $scope.nutupane = new Nutupane(Deb, params);
         nutupane.primaryOnly = true;
 
         $scope.table = nutupane.table;
 
         // Labels so breadcrumb strings can be translated
         $scope.label = translate('Debs');
+        $scope.repositoriesLabel = translate('Repositories');
 
         $scope.controllerName = 'katello_debs';
 
+        $scope.repository = {name: translate('All Repositories'), id: 'all'};
+
+        Repository.queryUnpaged({'organization_id': CurrentOrganization, 'content_type': 'deb', 'with_content': 'deb'}, function (response) {
+            $scope.repositories = [$scope.repository];
+            $scope.repositories = $scope.repositories.concat(response.results);
+
+            if ($location.search().repositoryId) {
+                $scope.repository = _.find($scope.repositories, function (repository) {
+                    return repository.id === parseInt($location.search().repositoryId, 10);
+                });
+            }
+        });
+
         Deb.queryPaged({'organization_id': CurrentOrganization}, function (result) {
             $scope.packageCount = result.total;
         });
@@ -50,12 +64,22 @@
             nutupane.refresh();
         };
 
-    }
+        $scope.$watch('repository', function (repository) {
+            var nutupaneParams = nutupane.getParams();
 
-    angular
-        .module('Bastion.debs')
-        .controller('DebsController', DebsController);
+            if (repository.id === 'all') {
+                nutupaneParams['repository_id'] = null;
+                nutupane.setParams(nutupaneParams);
+            } else {
+                $location.search('repositoryId', repository.id);
+                nutupaneParams['repository_id'] = repository.id;
+                nutupane.setParams(nutupaneParams);
+            }
 
-    DebsController.$inject = ['$scope', '$location', 'translate', 'Nutupane', 'Deb', 'CurrentOrganization'];
+            if (!nutupane.table.initialLoad) {
+                nutupane.refresh();
+            }
+        });
 
-})();
+    }]
+);

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

@@ -45,7 +45,8 @@
         '$scope',
         'Nutupane',
         'ContentViewVersion',
-        'CurrentOrganization'
+        'CurrentOrganization',
+        'translate'
     ];
 
 })();

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

@@ -6,6 +6,10 @@
     <h2 translate>Deb Packages</h2>
   </header>
 
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
+  </div>
+
   <div data-block="filters">
     <label class="checkbox-inline" title="{{ 'Only show Packages that are Applicable to one or more Content Hosts' | translate }}">
       <input type="checkbox" ng-model="showApplicable" ng-disabled="showUpgradable" ng-change="toggleFilters()"/>

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

@@ -28,7 +28,7 @@
           <span ng-show="contentView.composite" translate>Yes</span>
           <span ng-hide="contentView.composite" translate>No</span>
         </td>
-        <td bst-table-cell><long-date-time date="contentView.last_published" /></td>
+        <td bst-table-cell><long-date-time date="contentView.last_published" ></long-date-time></td>
         <td bst-table-cell class="number-cell">{{ contentView.repositories.length || 0 }}</td>
       </tr>
     </tbody>

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

@@ -44,7 +44,7 @@
       </div>
       <div bst-alert='info'>
         <span translate>
-          The <i>Registry Name Pattern</i> overrides the default name by which container images may be pulled from the server. (By default this name is a combination of Organization, Lifecycle Environment, Content View, Product, and Repository labels.)
+          The <i>Registry Name Pattern</i> overrides the default name by which container images may be pulled from the server. (By default this name is a combination of Organization, Lifecycle Environment, Content View, Product, and Repository labels delimited by forward slashes "/".)
 
           <br/><br/>The name may be constructed using ERB syntax. Variables available for use are:
 

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

@@ -46,7 +46,7 @@
         </td>
         <td bst-table-cell class="number-cell">{{ errata.hosts_available_count || 0 }}</td>
 
-        <td bst-table-cell><date date="errata.updated" /></td>
+        <td bst-table-cell><date date="errata.updated"></date></td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata-tasks-list.html

@@ -2,4 +2,5 @@
 <div tasks-table  details-state="errata.tasks.task"
      known-context="errata,organization"
      resource-type="Katello::Erratum"
-     resource-id="{{ errara.id }}"/>
+     resource-id="{{ errara.id }}">
+</div>