katello 3.4.5 → 3.5.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/architectures/architectures.module.js

@@ -0,0 +1,14 @@
+/**
+ * @ngdoc module
+ * @name  Bastion.architectures
+ *
+ * @description
+ *    Module for architectures
+ */
+angular.module('Bastion.architectures', [
+    'ngResource',
+    'ui.router',
+    'Bastion',
+    'Bastion.i18n',
+    'Bastion.common'
+]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js

@@ -1,6 +1,7 @@
 BASTION_MODULES.push(
     'Bastion.capsule-content',
     'Bastion.activation-keys',
+    'Bastion.architectures' ,
     'Bastion.common',
     'Bastion.content-views',
     'Bastion.content-views.versions',

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

@@ -82,6 +82,9 @@
 //= require "bastion_katello/settings/settings.module.js"
 //= require_tree "./settings"
 
+//= require "bastion_katello/architectures/architectures.module.js"
+//= require_tree "./architectures"
+
 //= require "bastion_katello/i18n/translations.js"
 
 //= require "bastion_katello/bastion-katello-bootstrap.js"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/capsule-content/capsule-content.controller.js

@@ -122,13 +122,13 @@ angular.module('Bastion.capsule-content').controller('CapsuleContentController',
 
         $scope.isTaskInProgress = isTaskInProgress;
 
-        $scope.syncCapsule = function () {
+        $scope.syncCapsule = function (skipMetadataCheck) {
             if (!$scope.syncState.is(syncState.SYNCING)) {
 
                 $scope.syncErrorMessages = [];
                 $scope.syncState.set(syncState.SYNC_TRIGGERED);
 
-                CapsuleContent.sync({id: capsuleId}).$promise.then(function (task) {
+                CapsuleContent.sync({id: capsuleId, 'skip_metadata_check': skipMetadataCheck}).$promise.then(function (task) {
                     $scope.syncStatus['active_sync_tasks'].push(task);
                     $scope.syncTask = aggregateTasks($scope.syncStatus['active_sync_tasks']);
                     $scope.syncState.set(syncState.SYNCING);

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

@@ -0,0 +1,107 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-hosts.controller:ContentHostsBulkRepositorySetsModalController
+ *
+ * @requires $scope
+ * @requires $location
+ * @requires $uibModalInstance
+ * @requires translate
+ * @requires Nutupane
+ * @requires HostBulkAction
+ * @requires RepositorySet
+ * @requires CurrentOrganization
+ * @requires GlobalNotification
+ * @requires hostIds
+ *
+ * @description
+ *   A controller for providing bulk action functionality to the content hosts page.
+ */
+angular.module('Bastion.content-hosts').controller('ContentHostsBulkRepositorySetsModalController',
+    ['$scope', '$location', '$uibModalInstance', 'translate', 'Nutupane', 'HostBulkAction', 'RepositorySet', 'CurrentOrganization', 'GlobalNotification', 'hostIds',
+    function ($scope, $location, $uibModalInstance, translate, Nutupane, HostBulkAction, RepositorySet, CurrentOrganization, GlobalNotification, hostIds) {
+        var nutupane, nutupaneParams;
+
+        $scope.repositorySets = {
+            action: null
+        };
+
+        nutupaneParams = {
+            'organization_id': CurrentOrganization,
+            'offset': 0,
+            'sort_by': 'name',
+            'sort_order': 'ASC',
+            'paged': true
+        };
+
+        nutupane = new Nutupane(RepositorySet, nutupaneParams, 'queryPaged');
+        $scope.controllerName = 'katello_repository_sets';
+        nutupane.masterOnly = true;
+
+        $scope.table = nutupane.table;
+
+        $scope.confirmRepositorySetAction = function (action) {
+            $scope.repositorySets.confirm = true;
+            $scope.repositorySets.action = action;
+        };
+
+        $scope.performRepositorySetAction = function () {
+            var params, action, success, error, contentOverrides;
+
+            action = $scope.repositorySets.action;
+            params = hostIds;
+            params['organization_id'] = CurrentOrganization;
+            contentOverrides = [];
+            angular.forEach(nutupane.getAllSelectedResults('id').included.resources, function (repositorySet) {
+                var value, remove;
+
+                if (action === 'enable') {
+                    value = true;
+                    remove = false;
+                } else if (action === 'disable') {
+                    value = false;
+                    remove = false;
+                } else if (action === 'reset') {
+                    value = true;
+                    remove = true;
+                }
+                contentOverrides.push({
+                    'content_label': repositorySet.label,
+                    name: 'enabled',
+                    value: value,
+                    remove: remove
+                });
+            });
+            params['content_overrides'] = contentOverrides;
+
+            $scope.repositorySets.action = null;
+
+            success = function (response) {
+                nutupane.invalidate();
+                $scope.ok();
+                $scope.transitionTo('content-hosts.bulk-task', {taskId: response.id});
+            };
+
+            error = function (response) {
+                angular.forEach(response.data.errors, function (responseError) {
+                    GlobalNotification.setErrorMessage(responseError);
+                });
+                $scope.editMode = true;
+            };
+
+            HostBulkAction.updateRepositorySets(params, success, error);
+        };
+
+        $scope.ok = function () {
+            $uibModalInstance.close();
+        };
+
+        $scope.cancel = function () {
+            $uibModalInstance.dismiss('cancel');
+        };
+
+        $scope.repositorySetsAction = function (action) {
+            $scope.repositorySets.action = action;
+            $scope.repositorySets.working = true;
+        };
+    }]
+);

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

@@ -0,0 +1,113 @@
+<div data-extend-template="components/views/bst-modal.html">
+  <h4 data-block="modal-header">Repository Sets Management</h4>
+
+  <div data-block="modal-body">
+    <div class="row">
+      <div class="col-sm-12">
+        <div bst-global-notification></div>
+      </div>
+    </div>
+
+    <div bst-alert="info" ng-show="repositorySets.action == 'enable'">
+      <span translate>
+        Are you sure you want to enable the {{ table.numSelected }} repository set(s) chosen?
+      </span>
+      <div>
+        <button type="button" class="btn btn-default" ng-click="performRepositorySetAction()" translate>Yes</button>
+        <button type="button" class="btn btn-default" ng-click="repositorySets.action = null; repositorySets.working = false" translate>No</button>
+      </div>
+    </div>
+
+    <div bst-alert="info" ng-show="repositorySets.action == 'disable'">
+      <span translate>
+        Are you sure you want to disable the {{ table.numSelected }} repository set(s) chosen?
+      </span>
+      <div>
+        <button type="button" class="btn btn-default" ng-click="performRepositorySetAction()" translate>Yes</button>
+        <button type="button" class="btn btn-default" ng-click="repositorySets.action = null; repositorySets.working = false" translate>No</button>
+      </div>
+    </div>
+
+    <div bst-alert="info" ng-show="repositorySets.action == 'reset'">
+      <span translate>
+        Are you sure you want to reset to default the {{ table.numSelected }} repository set(s) chosen?
+      </span>
+      <div>
+        <button type="button" class="btn btn-default" ng-click="performRepositorySetAction()" translate>Yes</button>
+        <button type="button" class="btn btn-default" ng-click="repositorySets.action = null; repositorySets.working = false" translate>No</button>
+      </div>
+    </div>
+
+    <div data-extend-template="layouts/partials/table.html">
+      <div data-block="search">
+        <input type="text" class="form-control" stop-event="click"
+               placeholder="{{ 'Filter...' | translate }}"
+               ng-model="repositorySetFilter"/>
+      </div>
+
+      <div data-block="list-actions">
+        <div class="btn-group" select-action-dropdown>
+          <ul class="dropdown-menu-right" uib-dropdown-menu role="menu" aria-labelledby="split-button">
+            <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+              <a ng-click="repositorySetsAction('enable')" disable-link="table.numSelected === 0" translate>
+                Override to Enabled
+              </a>
+            </li>
+
+            <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+              <a ng-click="repositorySetsAction('disable')" disable-link="table.numSelected === 0" translate>
+                Override to Disabled
+              </a>
+            </li>
+
+            <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+              <a ng-click="repositorySetsAction('reset')" disable-link="table.numSelected === 0" translate>
+                Reset to Default
+              </a>
+            </li>
+          </ul>
+        </div>
+      </div>
+
+      <span data-block="no-rows-message" translate>
+        No Repository Sets provided through subscriptions.
+      </span>
+
+      <span data-block="no-search-results-message" translate>
+        Your search returned zero Repository Sets.
+      </span>
+
+      <div data-block="table">
+        <table class="table table-striped table-bordered" ng-class="{'table-mask': state.working}">
+          <thead>
+            <tr bst-table-head row-select>
+              <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>
+            </tr>
+          </thead>
+
+          <tbody>
+            <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="repositorySet in table.rows | filter:repositorySetFilter" row-select="repositorySet">
+              <td bst-table-cell>{{ repositorySet.name }}</td>
+              <td bst-table-cell>
+                <a ui-sref="product.info({productId: repositorySet.product.id})">
+                  {{ repositorySet.product.name }}
+                </a>
+              </td>
+              <td bst-table-cell>{{ repositorySet.contentUrl }}</td>
+              <td bst-table-cell>{{ repositorySet | repositorySetsEnabled }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+  </div>
+
+  <div data-block="modal-footer">
+    <button type="button" class="btn btn-primary" ng-click="ok()" translate>
+      Done
+    </button>
+  </div>
+</div>

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

@@ -7,6 +7,19 @@
  */
 angular.module('Bastion.content-hosts').service('ContentHostsHelper',
     function () {
+        this.convertMemToGB = function (memoryValue) {
+            if (angular.isString(memoryValue)) {
+                memoryValue = memoryValue.toLowerCase();
+                if (_.includes(memoryValue, "gb")) {
+                    memoryValue = memoryValue.replace("gb", "").trim();
+                    return memoryValue;
+                }
+                memoryValue = parseInt(memoryValue);
+            }
+            memoryValue = (memoryValue / 1048576).toFixed(2);
+            return memoryValue;
+        };
+
         this.getHostStatusIcon = function (globalStatus) {
             var icons;
             var colors = {

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

@@ -21,20 +21,27 @@
  *   within the table.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostsController',
-    ['$scope', '$q', '$state', '$location', '$window', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'GlobalNotification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper',
-    function ($scope, $q, $state, $location, $window, $uibModal, translate, Nutupane, Host, HostBulkAction, GlobalNotification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper) {
-        var nutupane, params;
+    ['$scope', '$q', '$state', '$location', '$window', '$uibModal', 'translate', 'Nutupane', 'Host', 'HostBulkAction', 'GlobalNotification', 'CurrentOrganization', 'ContentHostsHelper', 'ContentHostsModalHelper', '$httpParamSerializer',
+    function ($scope, $q, $state, $location, $window, $uibModal, translate, Nutupane, Host, HostBulkAction, GlobalNotification, CurrentOrganization, ContentHostsHelper, ContentHostsModalHelper, $httpParamSerializer) {
+        var nutupane, params, query;
 
         $scope.successMessages = [];
         $scope.errorMessages = [];
 
+        if ($location.search().search) {
+            query = '"' + $location.search().search + '"';
+        } else {
+            query = "";
+        }
+
         params = {
             'organization_id': CurrentOrganization,
-            'search': $location.search().search || "",
+            'search': query,
             'sort_by': 'name',
             'sort_order': 'ASC'
         };
 
+        $scope.csvQuery = $httpParamSerializer(params);
         nutupane = new Nutupane(Host, params);
         $scope.controllerName = 'hosts';
         nutupane.masterOnly = true;
@@ -108,6 +115,20 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
             ContentHostsModalHelper.openHostCollectionsModal();
         };
 
+        $scope.openRepositorySetsModal = function () {
+            nutupane.invalidate();
+            $uibModal.open({
+                templateUrl: 'content-hosts/bulk/views/content-hosts-bulk-repository-sets-modal.html',
+                controller: 'ContentHostsBulkRepositorySetsModalController',
+                size: 'lg',
+                resolve: {
+                    hostIds: function () {
+                        return $scope.nutupane.getAllSelectedResults('id');
+                    }
+                }
+            });
+        };
+
         $scope.openPackagesModal = function () {
             nutupane.invalidate();
             ContentHostsModalHelper.openPackagesModal();

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

@@ -119,8 +119,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
             return '/activation_keys!=&panel=activation_key_%s&panelpage=edit'.replace('%s', activationKey.id);
         };
 
-        $scope.memory = ContentHostsHelper.memory;
-
         $scope.virtualGuestIds = function (host) {
             var ids = [];
             if (host && host.subscription_facet_attributes) {
@@ -132,8 +130,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
             return ids.join(" or ");
         };
 
-        $scope.convertMemToGB = function (memoryValue) {
-            return (memoryValue / 1048576).toFixed(2);
+        $scope.convertMemToGB = ContentHostsHelper.convertMemToGB;
+
+        $scope.virtual = function (virt) {
+            return (virt === true || virt === 'true');
         };
     }]
 );

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

@@ -111,8 +111,17 @@
         <dt translate>Number of CPUs</dt>
         <dd>{{ host.facts["cpu::cpu(s)"] }}</dd>
 
+        <dt translate>Sockets</dt>
+        <dd>{{ host.facts['cpu::cpu_socket(s)'] }}</dd>
+
+        <dt translate>Cores per Socket</dt>
+        <dd>{{ host.facts['cpu::core(s)_per_socket'] }}</dd>
+
         <dt translate>RAM (GB)</dt>
         <dd>{{ convertMemToGB(host.facts["memory::memtotal"]) }}</dd>
+
+        <dt translate>Virtual Guest</dt>
+        <dd>{{ virtual(host.facts['virt::is_guest']) | booleanToYesNo }}</dd>
       </dl>
 
       <div class="divider"></div>
@@ -137,30 +146,24 @@
       <dl class="dl-horizontal dl-horizontal-left">
         <dt translate>Security</dt>
         <dd>
-          <a ui-sref="content-host.errata.index({getSearch: 'type=security'})">
-            <i class="fa fa-warning inline-icon"
-               ng-class="{black: host.content_facet_attributes.errata_counts.security === 0, red: host.content_facet_attributes.errata_counts.security > 0}"
-               title="{{ 'Security' | translate }}"></i>
+          <a ui-sref="content-host.errata.index({getSearch: 'type=security'})" ng-class="{black: !host.content_facet_attributes.errata_counts.security, red: host.content_facet_attributes.errata_counts.security > 0}">
+            <i class="fa fa-warning inline-icon" title="{{ 'Security' | translate }}"></i>
             {{ host.content_facet_attributes.errata_counts.security || 0 }}
           </a>
         </dd>
 
         <dt translate>Bug Fix</dt>
         <dd>
-          <a ui-sref="content-host.errata.index({getSearch: 'type=bugfix'})">
-            <i class="fa fa-bug inline-icon"
-               ng-class="{black: host.content_facet_attributes.errata_counts.bugfix === 0, yellow: host.content_facet_attributes.errata_counts.bugfix > 0}"
-               title="{{ 'Bug Fix' | translate }}"></i>
+          <a ui-sref="content-host.errata.index({getSearch: 'type=bugfix'})" ng-class="{black: !host.content_facet_attributes.errata_counts.bugfix, yellow: host.content_facet_attributes.errata_counts.bugfix > 0}">
+            <i class="fa fa-bug inline-icon" title="{{ 'Bug Fix' | translate }}"></i>
             {{ host.content_facet_attributes.errata_counts.bugfix || 0 }}
           </a>
         </dd>
 
         <dt translate>Enhancement</dt>
         <dd>
-          <a ui-sref="content-host.errata.index({getSearch: 'type=enhancement'})">
-            <i class="fa fa-plus-square inline-icon"
-               ng-class="{black: host.content_facet_attributes.errata_counts.enhancement === 0, yellow: host.content_facet_attributes.errata_counts.enhancement > 0}"
-               title="{{ 'Enhancement' | translate }}"></i>
+          <a ui-sref="content-host.errata.index({getSearch: 'type=enhancement'})" ng-class="{black: !host.content_facet_attributes.errata_counts.enhancement, yellow: host.content_facet_attributes.errata_counts.enhancement > 0}">
+            <i class="fa fa-plus-square inline-icon" title="{{ 'Enhancement' | translate }}"></i>
             {{ host.content_facet_attributes.errata_counts.enhancement || 0 }}
           </a>
         </dd>

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

@@ -81,7 +81,7 @@
           <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="productRepoSet in table.rows | filter:repositorySetFilter" row-select="productRepoSet">
             <td bst-table-cell>{{ productRepoSet.content.name }}</td>
             <td bst-table-cell>
-              <a ui-sref="product.info({productId: id})">
+              <a ui-sref="product.info({productId: productRepoSet.product.id})">
                 {{ productRepoSet.product.name }}
               </a>
             </td>

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

@@ -5,6 +5,9 @@
   </div>
 
   <div data-block="list-actions">
+    <a href="/hosts/content_hosts.csv?{{csvQuery}}" class="btn btn-default" target="_self">
+      <span translate>Export</span>
+    </a>
     <button class="btn btn-default"
             type="button"
             ng-show="permitted('create_hosts')"
@@ -34,6 +37,10 @@
           <a ng-click="openSubscriptionsModal()" disable-link="table.numSelected === 0" translate>Manage Subscriptions</a>
         </li>
 
+        <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openRepositorySetsModal()" disable-link="table.numSelected === 0" translate>Manage Repository Sets</a>
+        </li>
+
         <li class="divider"></li>
 
         <li role="menuitem" ng-show="permitted('destroy_hosts')" ng-class="{disabled: table.numSelected === 0}">
@@ -92,14 +99,13 @@
 
             <a ui-sref="content-host.packages.applicable({hostId: host.id})">
             <span class="aligned-errata-count">
-              <span class="errata-count">
+              <span class="errata-count"
+                 ng-class="{black: !host.content_facet_attributes.upgradable_package_count,
+                            green: host.content_facet_attributes.upgradable_package_count > 0}">
                 <span>
                   {{ host.content_facet_attributes.upgradable_package_count || 0 }}
                 </span>
-                <i class="fa fa-cube inline-icon"
-                   ng-class="{black: host.content_facet_attributes.upgradable_package_count === 0,
-                              green: host.content_facet_attributes.upgradable_package_count > 0}"
-                   title="{{ 'Package Updates' | translate }}"></i>
+                <i class="fa fa-cube inline-icon" title="{{ 'Package Updates' | translate }}"></i>
               </span>
             </span>
             </a>