katello 3.8.1 → 3.9.0.rc1

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

@@ -41,20 +41,22 @@
 
     <div ng-form name="systemContentForm" class="form" ng-hide="content.workingMode || denied('edit_hosts')" novalidate>
       <div>
-        <input id="package" type="radio"
-               ng-model="content.contentType"
-               ng-change="updatePlaceholder(content.contentType)"
-               ng-disabled="content.confirm"
-               value="package"/>
-        <label for="package" translate>Package</label>
-
-        <input id="package_group" type="radio"
-               ng-model="content.contentType"
-               ng-change="updatePlaceholder(content.contentType)"
-               ng-disabled="content.confirm"
-               value="package_group"/>
-        <label for="package_group" translate>Package Group</label>
-
+        <label class="radio-inline" for="package">
+          <input id="package" type="radio"
+                 ng-model="content.contentType"
+                 ng-change="updatePlaceholder(content.contentType)"
+                 ng-disabled="content.confirm"
+                 value="package"/>
+          <span translate>Package</span>
+        </label>
+        <label class="radio-inline" for="package_group">
+          <input id="package_group" type="radio"
+                 ng-model="content.contentType"
+                 ng-change="updatePlaceholder(content.contentType)"
+                 ng-disabled="content.confirm"
+                 value="package_group"/>
+          <span translate>Package Group</span>
+        </label>
       </div>
 
       <div class="form-group">

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

@@ -39,12 +39,6 @@
     </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">
@@ -70,7 +64,7 @@
       </div>
 
       <span data-block="no-rows-message" translate>
-        No Repository Sets provided through subscriptions.
+        No enabled Repository Sets provided through subscriptions.
       </span>
 
       <span data-block="no-search-results-message" translate>

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

@@ -78,5 +78,16 @@ angular.module('Bastion.content-hosts').service('ContentHostsModalHelper', ['$ui
                 }
             });
         };
+
+        this.openModuleStreamsModal = function() {
+            $uibModal.open({
+                templateUrl: 'content-hosts/bulk/views/content-host-bulk-module-streams-modal.html',
+                controller: 'ContentHostsBulkModuleStreamsModalController',
+                size: 'lg',
+                resolve: {
+                    hostIds: this.resolveFunc()
+                }
+            });
+        };
     }]
 );

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

@@ -23,10 +23,6 @@ angular.module('Bastion.content-hosts').service('ContentHostsHelper',
         this.getHostStatusIcon = function (globalStatus) {
             var icons;
             var colors = {
-                // we can remove 'valid', 'partial', and 'invalid' when http://projects.theforeman.org/issues/15347 is fixed
-                'valid': 'green',
-                'partial': 'yellow',
-                'invalid': 'red',
                 0: 'green',
                 1: 'yellow',
                 2: 'red'
@@ -41,5 +37,13 @@ angular.module('Bastion.content-hosts').service('ContentHostsHelper',
 
             return icons[globalStatus];
         };
+
+        this.getHostPurposeStatusIcon = function (statusCode) {
+            if (parseInt(statusCode) === 0) {
+                return 'pficon pficon-ok';
+            }
+
+            return 'pficon pficon-warning-triangle-o';
+        };
     }
 );

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

@@ -149,5 +149,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostsController',
             nutupane.invalidate();
             ContentHostsModalHelper.openSubscriptionsModal();
         };
+
+        $scope.openModuleStreamsModal = function () {
+            nutupane.invalidate();
+            ContentHostsModalHelper.openModuleStreamsModal();
+        };
     }]
 );

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

@@ -247,5 +247,19 @@ angular.module('Bastion.content-hosts').config(['$stateProvider', function ($sta
             label: "{{ 'Traces' | translate }}",
             parent: 'content-host.info'
         }
+    })
+    .state('content-host.module-streams', {
+        abstract: true,
+        controller: 'ContentHostModuleStreamsController',
+        template: '<div ui-view></div>'
+    })
+    .state('content-host.module-streams.index', {
+        url: '/module-streams',
+        permission: 'view_hosts',
+        templateUrl: 'content-hosts/content/views/content-host-module-streams.html',
+        ncyBreadcrumb: {
+            label: "{{ 'Module Streams' | translate }}",
+            parent: 'content-host.info'
+        }
     });
 }]);

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

@@ -0,0 +1,48 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-hosts.controller:ContentHostModuleStreamsController
+ *
+ * @requires $scope
+ * @resource $timeout
+ * @resource $window
+ * @requires ModuleStream
+ * @requires Nutupane
+ * @requires ModuleStreamActions
+ *
+ * @description
+ *   Provides the functionality for the content host module streams list and actions.
+ */
+angular.module('Bastion.content-hosts').controller('ContentHostModuleStreamsController',
+    ['$scope', '$timeout', '$window', 'ModuleStream', 'Nutupane', 'BastionConfig', 'ModuleStreamActions',
+    function ($scope, $timeout, $window, ModuleStream, Nutupane, BastionConfig, ModuleStreamActions) {
+        $scope.moduleStreamActions = ModuleStreamActions.getActions();
+
+        $scope.working = false;
+
+        $scope.moduleStreamsNutupane = new Nutupane(ModuleStream, {
+            'host_ids': [$scope.$stateParams.hostId],
+            'name_stream_only': '1'
+        });
+
+        $scope.moduleStreamsNutupane.masterOnly = true;
+        $scope.table = $scope.moduleStreamsNutupane.table;
+
+        $scope.remoteExecutionPresent = BastionConfig.remoteExecutionPresent;
+        $scope.remoteExecutionByDefault = BastionConfig.remoteExecutionByDefault;
+        $scope.moduleStreamActionFormValues = {
+            authenticityToken: $window.AUTH_TOKEN.replace(/"/g, ''),
+            remoteAction: 'module_stream_action'
+        };
+
+        $scope.performViaRemoteExecution = function(moduleSpec, actionType) {
+            $scope.working = true;
+            $scope.moduleStreamActionFormValues.moduleSpec = moduleSpec;
+            $scope.moduleStreamActionFormValues.moduleStreamAction = actionType;
+            $scope.moduleStreamActionFormValues.hostIds = $scope.host.id;
+
+            $timeout(function () {
+                angular.element('#moduleStreamActionForm').submit();
+            }, 0);
+        };
+    }
+]);

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

@@ -0,0 +1,68 @@
+<span page-title ng-model="host">{{ 'Module Streams for: ' | translate }} {{ host.name }}</span>
+<div bst-feature-flag="remote_actions">
+  <h3 translate ng-hide="selectedModuleStreamOption === 'available'">Available Module Streams</h3>
+</div>
+
+<div ng-hide="host.hasContent()">
+  <div data-extend-template="common/views/registration.html"></div>
+</div>
+
+<div ng-if="host && host.hasContent()">
+  <form id="moduleStreamActionForm" method="post" action="/katello/remote_execution">
+    <input type="hidden" name="remote_action" ng-value="moduleStreamActionFormValues.remoteAction"/>
+    <input type="hidden" name="module_stream_action" ng-value="moduleStreamActionFormValues.moduleStreamAction"/>
+    <input type="hidden" name="module_spec" ng-value="moduleStreamActionFormValues.moduleSpec"/>
+    <input type="hidden" name="host_ids" ng-value="moduleStreamActionFormValues.hostIds"/>
+    <input type="hidden" name="customize" ng-value="moduleStreamActionFormValues.customize"/>
+    <input type="hidden" name="authenticity_token" ng-value="moduleStreamActionFormValues.authenticityToken"/>
+  </form>
+
+  <div data-extend-template="layouts/partials/table.html">
+
+    <span data-block="no-rows-message" translate>
+      There are no Module Streams to display.
+    </span>
+
+    <span data-block="no-search-results-message" translate>
+      Your search returned zero Module Streams.
+    </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 translate>Name</th>
+            <th bst-table-column translate>Stream</th>
+            <th bst-table-column translate>Actions</th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <tr bst-table-row ng-repeat="module in table.rows">
+            <td bst-table-cell>
+              <a href="/module_streams?search=module_spec%3D{{ module.module_spec }}+and+host%3D{{ host.name }}">
+              {{ module.name }}</a></td>
+            <td bst-table-cell>{{ module.stream }}</td>
+            <td bst-table-cell>
+              <div class="dropdown" ng-hide="!remoteExecutionPresent || denied('edit_content_hosts', contentHost)">
+                <button class="btn btn-default dropdown-toggle" ng-disabled="$scope.working" type="button" id="dropdownMenu1" data-toggle="dropdown"> Actions
+                  <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
+                  <li role="presentation">
+                    <label class="drop-down-check-box">
+                      <input id="customize" name="customize" ng-model="moduleStreamActionFormValues.customize" type="checkbox"/>
+                      <span translate>Customize</span>
+                    </label>
+                  </li>
+                  <li role="presentation" class="divider"></li>
+
+                  <li role="presentation" ng-repeat="action in moduleStreamActions"><a role="menuitem" tabindex="-1" ng-click="performViaRemoteExecution(module.module_spec, action.action)" href="#">{{ action.description}}</a></li>
+                </ul>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

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

@@ -96,6 +96,21 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
             $scope.saveSubscriptionFacet($scope.host);
         };
 
+        $scope.clearRole = function () {
+            $scope.host.subscription_facet_attributes['purpose_role'] = '';
+            $scope.saveSubscriptionFacet($scope.host);
+        };
+
+        $scope.clearUsage = function () {
+            $scope.host.subscription_facet_attributes['purpose_usage'] = '';
+            $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

@@ -11,15 +11,21 @@
  * @requires MenuExpander
  * @requires ApiErrorHandler
  * @requires deleteHostOnUnregister
+ * @requires ContentHostsHelper
  *
  * @description
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister',
-    function ($scope, $state, $q, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister) {
+    ['$scope', '$state', '$q', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'Notification', 'MenuExpander', 'ApiErrorHandler', 'deleteHostOnUnregister', 'ContentHostsHelper',
+    function ($scope, $state, $q, translate, Host, HostSubscription, Organization, CurrentOrganization, Notification, MenuExpander, ApiErrorHandler, deleteHostOnUnregister, ContentHostsHelper) {
         $scope.menuExpander = MenuExpander;
 
+        $scope.getHostStatusIcon = ContentHostsHelper.getHostStatusIcon;
+        $scope.getHostPurposeStatusIcon = ContentHostsHelper.getHostPurposeStatusIcon;
+
+        $scope.purposeAddonsList = [];
+
         $scope.panel = {
             error: false,
             loading: true
@@ -48,12 +54,24 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
 
         $scope.saveSubscriptionFacet = function (host) {
             var newHost = {id: host.id};
+            var addOns = [];
+
+            angular.forEach($scope.purposeAddonsList, function (addOn) {
+                if (addOn.selected) {
+                    addOns.push(addOn.name);
+                }
+            });
+
             newHost['subscription_facet_attributes'] = {
                 id: host.subscription_facet_attributes.id,
                 autoheal: host.subscription_facet_attributes.autoheal,
+                'purpose_role': host.subscription_facet_attributes.purpose_role,
+                'purpose_usage': host.subscription_facet_attributes.purpose_usage,
+                'purpose_addons': addOns,
                 'service_level': host.subscription_facet_attributes.service_level,
                 'release_version': host.subscription_facet_attributes.release_version
             };
+
             return $scope.save(newHost, true);
         };
         // @TODO end hack
@@ -124,6 +142,45 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
             return deferred.promise;
         };
 
+        $scope.purposeRoles = function () {
+            var deferred = $q.defer();
+
+            Organization.get({id: CurrentOrganization}, function (organization) {
+                deferred.resolve(organization.system_purposes.role);
+            });
+
+            return deferred.promise;
+        };
+
+        $scope.purposeUsages = function () {
+            var deferred = $q.defer();
+
+            Organization.get({id: CurrentOrganization}, function (organization) {
+                deferred.resolve(organization.system_purposes.usage);
+            });
+
+            return deferred.promise;
+        };
+
+        $scope.purposeAddons = function () {
+            var deferred = $q.defer();
+
+            Organization.get({id: CurrentOrganization}, function (organization) {
+                deferred.resolve(organization.system_purposes.addons);
+            });
+
+            return deferred.promise.then(
+                function(addOns) {
+                    $scope.purposeAddonsList = [];
+
+                    angular.forEach(addOns, function (addOn) {
+                        $scope.purposeAddonsList.push({"name": addOn, "selected": $scope.host.subscription_facet_attributes.purpose_addons.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-details.html

@@ -129,6 +129,12 @@
           Errata
         </a>
       </li>
+      <li ng-class="{active: isState('content-host.module-streams.index')}">
+        <a translate
+           ui-sref="content-host.module-streams.index">
+          Module Streams
+        </a>
+      </li>
       <li ng-class="{active: isState('content-host.traces.index')}">
         <a translate
            ui-sref="content-host.traces.index">

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

@@ -33,11 +33,11 @@
         </dt>
         <dd bst-feature-flag="remote_actions">
           <span ng-show="host.content_facet_attributes.katello_agent_installed">
-            <span class="{{ table.getHostStatusIcon(0) }}"></span>
+            <span class="{{ getHostStatusIcon(0) }}"></span>
             <span translate>Installed</span>
           </span>
           <span ng-hide="host.content_facet_attributes.katello_agent_installed">
-            <span class="{{ table.getHostStatusIcon(1) }}"></span>
+            <span class="{{ getHostStatusIcon(1) }}"></span>
             <span translate>Not installed</span>
           </span>
         </dd>
@@ -67,7 +67,7 @@
       <dl class="dl-horizontal dl-horizontal-left">
         <dt translate>Subscription 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 }}
         </dd>
 
@@ -85,9 +85,23 @@
             on-save="saveSubscriptionFacet(host)">
         </dd>
 
-        <dt translate>Service Level</dt>
+      </dl>
+
+      <div class="divider"></div>
+
+      <h4 translate>System Purpose</h4>
+
+      <dl class="dl-horizontal dl-horizontal-left">
+        <dt translate>System Purpose Status</dt>
+        <dd>
+          <i ng-class="getHostPurposeStatusIcon(host.purpose_status)"></i>
+          {{ host.purpose_status_label }}
+        </dd>
+        <dt translate>Service Level (SLA)</dt>
         <dd bst-edit-select="host.subscription_facet_attributes.service_level"
             readonly="denied('edit_hosts', host)"
+            icon-class="getHostPurposeStatusIcon(host.purpose_sla_status)"
+            icon-show="host.purpose_sla_status > 0"
             selector="host.subscription_facet_attributes.service_level"
             options="serviceLevels()"
             options-format="option for option in options"
@@ -95,6 +109,46 @@
             on-delete="clearServiceLevel()"
             on-save="saveSubscriptionFacet(host)">
         </dd>
+
+        <dt translate>Usage Type</dt>
+        <dd bst-edit-select="host.subscription_facet_attributes.purpose_usage"
+            readonly="denied('edit_hosts', host)"
+            icon-class="getHostPurposeStatusIcon(host.purpose_usage_status)"
+            icon-show="host.purpose_usage_status > 0"
+            selector="host.subscription_facet_attributes.purpose_usage"
+            options="purposeUsages()"
+            options-format="option for option in options"
+            deletable="true"
+            on-delete="clearUsage()"
+            on-save="saveSubscriptionFacet(host)">
+        </dd>
+
+        <dt translate>Role</dt>
+        <dd bst-edit-select="host.subscription_facet_attributes.purpose_role"
+            readonly="denied('edit_hosts', host)"
+            icon-class="getHostPurposeStatusIcon(host.purpose_role_status)"
+            icon-show="host.purpose_role_status > 0"
+            selector="host.subscription_facet_attributes.purpose_role"
+            options="purposeRoles()"
+            options-format="option for option in options"
+            deletable="true"
+            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)"
+            icon-class="getHostPurposeStatusIcon(host.purpose_addons_status)"
+            icon-show="host.purpose_addons_status > 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>
@@ -263,36 +317,36 @@
         <dt translate>Last Checkin</dt>
         <dd>{{ (host.subscription_facet_attributes.last_checkin | date:'short') || ("Never checked in" | translate) }}</dd>
       </dl>
-    </div>
 
-    <div class="divider"></div>
+      <div class="divider"></div>
 
-    <h4 translate>Networking</h4>
+      <h4 translate>Networking</h4>
 
-    <dl class="dl-horizontal dl-horizontal-left">
-      <dt translate>Hostname</dt>
-      <dd>{{ host.name }}</dd>
+      <dl class="dl-horizontal dl-horizontal-left">
+        <dt translate>Hostname</dt>
+        <dd>{{ host.name }}</dd>
 
-      <dt translate>IPv4 Address</dt>
-      <dd>{{ host.facts["network::ipv4_address"] }}</dd>
+        <dt translate>IPv4 Address</dt>
+        <dd>{{ host.facts["network::ipv4_address"] }}</dd>
 
-      <dt translate>IPv6 Address</dt>
-      <dd>{{ host.facts["network::ipv6_address"] }}</dd>
+        <dt translate>IPv6 Address</dt>
+        <dd>{{ host.facts["network::ipv6_address"] }}</dd>
 
-      <dt translate>Interfaces</dt>
-      <dd>
-        <div ng-repeat="(interfaceName, interface) in hostFactsAsObject.net.interface" >
-          <i ng-class="{'fa fa-plus': !expanded, 'fa fa-minus': expanded}" class="expand-icon"
-             ng-hide="editMode" ng-click="expanded = !expanded"></i>
-          {{ interfaceName }}
-          <div class="sub-detail" ng-show="expanded">
-            <div ng-repeat="(key, value) in interface">
-              <span class="info-sub-label">{{ key.replace("_", " ") }}:</span>
-              <span class="info-sub-value">{{ value }}</span>
+        <dt translate>Interfaces</dt>
+        <dd>
+          <div ng-repeat="(interfaceName, interface) in hostFactsAsObject.net.interface" >
+            <i ng-class="{'fa fa-plus': !expanded, 'fa fa-minus': expanded}" class="expand-icon"
+               ng-hide="editMode" ng-click="expanded = !expanded"></i>
+            {{ interfaceName }}
+            <div class="sub-detail" ng-show="expanded">
+              <div ng-repeat="(key, value) in interface">
+                <span class="info-sub-label">{{ key.replace("_", " ") }}:</span>
+                <span class="info-sub-value">{{ value }}</span>
+              </div>
             </div>
           </div>
-        </div>
-      </dd>
-    </dl>
+        </dd>
+      </dl>
+    </div>
   </div>
 </div>