katello 3.3.2 → 3.4.0.rc1

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

@@ -129,5 +129,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
 
             return ids.join(" or ");
         };
+
+        $scope.convertMemToGB = function (memoryValue) {
+            return (memoryValue / 1024000).toFixed(2);
+        };
     }]
 );

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

@@ -86,7 +86,6 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
                 deferred.resolve(response);
                 $scope.host = response;
                 $scope.successMessages.push(translate('Save Successful.'));
-                $scope.table.replaceRow(response);
             }, function (response) {
                 deferred.reject(response);
                 _.each(response.data.error.full_messages, function (errorMessage) {
@@ -135,14 +134,13 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
                 host.$delete(function () {
                     host.deleting = false;
                     GlobalNotification.setSuccessMessage(translate('Host %s has been deleted.').replace('%s', host.name));
-                    $scope.removeRow(host.id);
-                    $scope.transitionTo('content-hosts.index');
+                    $scope.transitionTo('content-hosts');
                 }, errorHandler);
             } else {
                 HostSubscription.delete({id: host.id}, function () {
                     host.deleting = false;
                     GlobalNotification.setSuccessMessage(translate('Host %s has been unregistered.').replace('%s', host.name));
-                    $scope.transitionTo('content-hosts.index');
+                    $scope.transitionTo('content-hosts');
                 }, errorHandler);
             }
         };

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

@@ -8,17 +8,19 @@
  * @requires translate
  * @requires HostCollection
  * @requires Host
+ * @requires CurrentOrganization
  * @requires Nutupane
  *
  * @description
  *   Provides the functionality for the list host collections details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsController',
-    ['$scope', '$q', '$location', 'translate', 'HostCollection', 'Host', 'Nutupane',
-    function ($scope, $q, $location, translate, HostCollection, Host, Nutupane) {
-        var hostCollectionsPane, params;
+    ['$scope', '$q', '$location', 'translate', 'HostCollection', 'Host', 'CurrentOrganization', 'Nutupane',
+    function ($scope, $q, $location, translate, HostCollection, Host, CurrentOrganization, Nutupane) {
+        var nutupane, params;
 
         params = {
+            'organization_id': CurrentOrganization,
             'search': $location.search().search || "",
             'sort_by': 'name',
             'sort_order': 'ASC',
@@ -26,8 +28,11 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
             'host_id': $scope.$stateParams.hostId
         };
 
-        hostCollectionsPane = new Nutupane(HostCollection, params);
-        $scope.hostCollectionsTable = hostCollectionsPane.table;
+        nutupane = new Nutupane(HostCollection, params);
+        $scope.controllerName = 'katello_host_collections';
+        nutupane.masterOnly = true;
+
+        $scope.table = nutupane.table;
 
         $scope.successMessages = [];
         $scope.errorMessages = [];
@@ -42,10 +47,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
 
             success = function (response) {
                 $scope.successMessages = [translate('Removed %x host collections from content host "%y".')
-                    .replace('%x', $scope.hostCollectionsTable.numSelected).replace('%y', host.name)];
-                $scope.hostCollectionsTable.working = false;
-                $scope.hostCollectionsTable.selectAll(false);
-                hostCollectionsPane.refresh();
+                    .replace('%x', $scope.table.numSelected).replace('%y', host.name)];
+                $scope.table.working = false;
+                $scope.table.selectAll(false);
+                nutupane.refresh();
                 $scope.host.$get();
                 deferred.resolve(response);
             };
@@ -53,12 +58,12 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
             error = function (response) {
                 deferred.reject(response.data.errors);
                 $scope.errorMessages = response.data.errors;
-                $scope.hostCollectionsTable.working = false;
+                $scope.table.working = false;
             };
 
-            $scope.hostCollectionsTable.working = true;
+            $scope.table.working = true;
             hostCollections = _.map(host['host_collections'], 'id');
-            hostCollectionsToRemove = _.map($scope.hostCollectionsTable.getSelected(), 'id');
+            hostCollectionsToRemove = _.map($scope.table.getSelected(), 'id');
 
             data = {"host_collection_ids": _.difference(hostCollections, hostCollectionsToRemove)};
             Host.updateHostCollections({id: host.id}, data, success, error);

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

@@ -0,0 +1,64 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.content-hosts.controller:ContentHostRepositorySetsController
+ *
+ * @requires $scope
+ * @requires translate
+ * @requires Nutupane
+ * @requires HostSubscription
+ * @requires ContentOverrideHelper
+ * @requires GlobalNotification
+ * @requires CurrentOrganization
+ *
+ * @description
+ *   Provides the functionality for the content-host products action pane.
+ */
+angular.module('Bastion.content-hosts').controller('ContentHostRepositorySetsController',
+    ['$scope', 'translate', 'Nutupane', 'HostSubscription', 'ContentOverrideHelper', 'GlobalNotification', 'CurrentOrganization',
+    function ($scope, translate, Nutupane, HostSubscription, ContentOverrideHelper, GlobalNotification, CurrentOrganization) {
+        var nutupane, params, saveContentOverride, success, error;
+
+        params = {
+            id: $scope.$stateParams.hostId,
+            'organization_id': CurrentOrganization,
+            enabled: true,
+            'full_result': true,
+            'include_available_content': true
+        };
+
+        $scope.controllerName = 'katello_products';
+        nutupane = new Nutupane(HostSubscription, params, 'repositorySets');
+        $scope.table = nutupane.table;
+
+        success = function () {
+            $scope.table.working = false;
+            GlobalNotification.setSuccessMessage(translate('Repository Sets settings saved successfully.'));
+            nutupane.refresh();
+        };
+
+        error = function (response) {
+            $scope.table.working = false;
+            GlobalNotification.setErrorMessage(response.data.errors);
+        };
+
+        saveContentOverride = function (contentOverrides) {
+            $scope.table.working = true;
+            HostSubscription.contentOverride({id: $scope.$stateParams.hostId}, contentOverrides, success, error);
+        };
+
+        $scope.overrideToEnabled = function () {
+            var contentOverrides = ContentOverrideHelper.getEnabledContentOverrides($scope.table.getSelected());
+            saveContentOverride(contentOverrides);
+        };
+
+        $scope.overrideToDisabled = function () {
+            var contentOverrides = ContentOverrideHelper.getDisabledContentOverrides($scope.table.getSelected());
+            saveContentOverride(contentOverrides);
+        };
+
+        $scope.resetToDefault = function () {
+            var contentOverrides = ContentOverrideHelper.getDefaultContentOverrides($scope.table.getSelected());
+            saveContentOverride(contentOverrides);
+        };
+    }]
+);

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

@@ -22,35 +22,35 @@ angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsCont
             'sort_order': 'ASC'
         };
 
-        $scope.contentNutupane = new Nutupane(HostSubscription, params);
-        $scope.contentNutupane.table.initialLoad = false;
-        $scope.detailsTable = $scope.contentNutupane.table;
-        $scope.contentNutupane.masterOnly = true;
+        $scope.nutupane = new Nutupane(HostSubscription, params);
+        $scope.controllerName = 'katello_subscriptions';
+        $scope.nutupane.table.initialLoad = false;
+        $scope.table = $scope.nutupane.table;
+        $scope.nutupane.masterOnly = true;
         $scope.isRemoving = false;
 
         $scope.groupedSubscriptions = {};
-        $scope.$watch('detailsTable.rows', function (rows) {
+        $scope.$watch('table.rows', function (rows) {
             $scope.groupedSubscriptions = SubscriptionsHelper.groupByProductName(rows);
         });
 
-        $scope.contentNutupane.setParams(params);
-        $scope.contentNutupane.load(true);
+        $scope.nutupane.setParams(params);
+        $scope.nutupane.load(true);
 
         $scope.disableRemoveButton = function () {
-            return $scope.detailsTable.numSelected === 0 || $scope.isRemoving;
+            return $scope.table.numSelected === 0 || $scope.isRemoving;
         };
 
         $scope.removeSelected = function () {
             var selected;
-            selected = SubscriptionsHelper.getSelectedSubscriptions($scope.detailsTable);
+            selected = SubscriptionsHelper.getSelectedSubscriptions($scope.table);
 
             $scope.isRemoving = true;
             HostSubscription.removeSubscriptions({id: $scope.$stateParams.hostId, 'subscriptions': selected}, function () {
                 Host.get({id: $scope.$stateParams.hostId}, function (host) {
                     $scope.$parent.host = host;
-                    $scope.contentNutupane.table.selectAll(false);
-                    $scope.contentNutupane.refresh();
-                    $scope.table.replaceRow(host);
+                    $scope.nutupane.table.selectAll(false);
+                    $scope.nutupane.refresh();
                     $scope.successMessages.push(translate("Successfully removed %s subscriptions.").replace('%s', selected.length));
                     $scope.isRemoving = false;
                 });

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

@@ -1,9 +1,8 @@
 <span page-title ng-model="host">{{ 'Add Subscriptions for Content Host:' | translate }} {{ host.name }}</span>
-<div data-extend-template="layouts/details-nutupane.html">
-  <div data-block="messages"></div>
 
-  <div data-block="actions">
-     <button class="btn btn-primary"
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="list-actions">
+     <button class="btn btn-default" type="button"
              translate
              ng-hide="denied('edit_hosts', host)"
              ng-disabled="disableAddButton()"
@@ -12,6 +11,23 @@
      </button>
   </div>
 
+  <div data-block="filters">
+    <label class="checkbox-inline" title="{{ 'Only show Subscriptions which can be attached to this Host' | translate }}">
+      <input type="checkbox" ng-model="showMatchHost" ng-change="toggleFilters()"/>
+      <span translate>Applicable to Host</span>
+    </label>
+
+    <label class="checkbox-inline" title="{{ 'Only show Subscriptions which can be applied to products installed on this Host' | translate }}">
+      <input type="checkbox" ng-model="showMatchInstalled" ng-change="toggleFilters()"/>
+      <span translate>Installed Products</span>
+    </label>
+
+    <label class="checkbox-inline" title="{{ 'Only show Subscriptions for products not already covered by a Subscription' | translate }}">
+      <input type="checkbox" ng-model="showNoOverlap" ng-change="toggleFilters()"/>
+      <span translate>Products not covered</span>
+    </label>
+  </div>
+
   <span data-block="no-rows-message" translate>
       You currently don't have any Products to subscribe to, you can add Products after selecting 'Products' under 'Content' in the main menu
   </span>
@@ -21,50 +37,6 @@
   </span>
 
   <div data-block="table">
-    <table ng-class="{'table-mask': detailsTable.working}"
-            class="table table-full">
-       <thead>
-         <tr bst-table-head row-select>
-           <th bst-table-column="quantity" sortable class="align-center"><span translate>Quantity</span></th>
-           <th bst-table-column="attached" sortable><span translate>Attached</span></th>
-           <th bst-table-column="type"><span translate>Type</span></th>
-           <th bst-table-column="startDate" sortable><span translate>Starts</span></th>
-           <th bst-table-column="endDate" sortable><span translate>Expires</span></th>
-           <th bst-table-column="supportLevel"><span translate>Support Level</span></th>
-           <th bst-table-column="contractNumber" sortable><span translate>Contract</span></th>
-           <th bst-table-column="accountNumber" sortable><span translate>Account</span></th>
-         </tr>
-       </thead>
-
-       <tbody>
-         <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions">
-           <td class="row-select"></td>
-           <td colspan="8">
-            {{ name }}
-           </td>
-         </tr>
-         <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
-           <td bst-table-cell>
-             <span ng-hide="subscription.multi_entitlement">
-               1
-             </span>
-             <select ng-hide="!subscription.multi_entitlement"
-                     ng-model="subscription.amount"
-                     ng-options="amount for amount in amountSelectorValues(subscription)"
-                     >
-               <option value="">{{ "Automatic" | translate }}</option>
-             </select>
-           </td>
-           <td bst-table-cell>{{ subscription | subscriptionConsumedFilter }}</td>
-           <td bst-table-cell><div subscription-type="subscription"></div></td>
-           <td bst-table-cell>{{ subscription.start_date | date:"shortDate" }}</td>
-           <td bst-table-cell>{{ subscription.end_date | date:"shortDate" }}</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>
-         </tr>
-       </tbody>
-
-     </table>
+    <div data-extend-template="common/views/subscription-add-or-remove.html"></div>
   </div>
 </div>

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

@@ -1,157 +1,145 @@
 <span page-title ng-model="host">{{ 'Content Host:' | translate }} {{ host.name }}</span>
 
-<div data-extend-template="layouts/panel.html">
-  <div data-block="panel">
-    <section class="nutupane-details" ng-cloak bst-container-scroll>
-      <div ng-show="panel.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <header data-block="header" translate>
+    {{ host.name }}
+  </header>
 
-      <div ng-hide="panel.error">
-        <header class="details-header">
-          <h2 class="fl" translate>Content Host {{ host.name }}</h2>
+  <nav data-block="item-actions">
+    <button class="btn btn-default" type="button"
+            ng-disabled="host.deleting"
+            ng-hide="denied('destroy_hosts', host)"
+            ng-click="openModal()">
+      <span translate>Unregister Host</span>
+    </button>
 
-          <div class="fr">
-            <div bst-modal="unregisterContentHost(host)" model="host">
-              <div data-block="modal-header" translate>
-                Unregister Host "{{host.name}}"?
-              </div>
-              <div data-block="modal-body">
-                <p translate>
-                  Unregister Options:
-                </p>
-
-                <p ng-show="host.hasSubscription()">
-                  <label>
-                    <input name="delete"
-                           ng-model="host.unregisterDelete"
-                           ng-value="false"
-                           type="radio" />
-                    Unregister the host as a subscription consumer.  Provisioning and configuration information is preserved.
-                  </label>
-                </p>
-                <p>
-                  <label>
-                    <input name="delete"
-                           ng-model="host.unregisterDelete"
-                           ng-value="true"
-                           type="radio" />
-                    Completely deletes the host record and removes all reporting, provisioning, and configuration information.
-                  </label>
-                </p>
-              </div>
-            </div>
-
-            <button class="btn btn-default"
-                    ng-disabled="host.deleting"
-                    ng-hide="denied('destroy_hosts', host)"
-                    ng-click="openModal()" translate>Unregister Host</button>
-
-            <button class="btn btn-default" ui-sref="content-hosts.index">
-              <i class="fa fa-remove"></i>
-              {{ "Close" | translate }}
-            </button>
-          </div>
-        </header>
+    <div bst-modal="unregisterContentHost(host)" model="host">
+      <div data-block="modal-header" translate>
+        Unregister Host "{{host.name}}"?
+      </div>
+      <div data-block="modal-body">
+        <p translate>
+          Unregister Options:
+        </p>
 
-        <nav>
-          <ul class="nav nav-tabs">
-            <li ng-class="{active: isState('content-hosts.details.info')}">
-              <a translate
-                 ui-sref="content-hosts.details.info">
-                Details
-              </a>
-            </li>
-            <li ng-class="{active: isState('content-hosts.details.provisioning')}"
-                bst-feature-flag="remote_actions">
-              <a translate
-                 ui-sref="content-hosts.details.provisioning">
-                Provisioning Details
-              </a>
-            </li>
-            <li uib-dropdown
-                ng-class="{active: stateIncludes('content-hosts.details.subscriptions.list') || stateIncludes('content-hosts.details.subscriptions.add') || stateIncludes('content-hosts.details.events')}">
-              <a uib-dropdown-toggle>
-                <span translate>Subscriptions</span>
-                <i class="fa fa-chevron-down"></i>
-              </a>
-              <ul uib-dropdown-menu>
-                <li>
-                  <a ui-sref="content-hosts.details.subscriptions.list" translate>
-                    Subscriptions
-                  </a>
-                </li>
-                <li>
-                  <a ui-sref="content-hosts.details.events" translate>
-                    Events
-                  </a>
-                </li>
-              </ul>
-            </li>
-            <li ng-class="{active: $state.includes('content-hosts.details.host-collections')}">
-              <a translate
-                 ui-sref="content-hosts.details.host-collections.list">
-                Host Collections
-              </a>
-            </li>
-            <li ng-class="{active: stateIncludes('content-hosts.details.tasks')}">
-              <a translate
-                 ui-sref="content-hosts.details.tasks.index">
-                Tasks
-              </a>
-            </li>
-            <li uib-dropdown
-                ng-class="{active: stateIncludes('content-hosts.details.packages-actions') || stateIncludes('content-hosts.details.packages-installed') || stateIncludes('content-hosts.details.packages-upgradeable')}" >
-              <a uib-dropdown-toggle>
-                <span translate>Packages</span>
-                <i class="fa fa-chevron-down"></i>
-              </a>
-              <ul uib-dropdown-menu>
-                <li>
-                  <a ui-sref="content-hosts.details.packages.actions" translate>
-                    Yum Actions
-                  </a>
-                </li>
-                <li>
-                  <a ui-sref="content-hosts.details.packages.installed" translate>
-                    Installed
-                  </a>
-                </li>
-                <li>
-                  <a ui-sref="content-hosts.details.packages.applicable" translate>
-                    Applicable
-                  </a>
-                </li>
-              </ul>
-            </li>
-            <li ng-class="{active: isState('content-hosts.details.errata.index')}">
-              <a translate
-                 ui-sref="content-hosts.details.errata.index">
-                Errata
-              </a>
-            </li>
-            <li ng-class="{active: isState('content-hosts.details.traces.index')}">
-              <a translate
-                 ui-sref="content-hosts.details.traces.index">
-                Traces
-              </a>
-            </li>
-            <li ng-hide="denied('view_products')" ng-class="{active: isState('content-hosts.details.products')}">
-              <a translate
-                 ui-sref="content-hosts.details.products">
-                Product Content
-              </a>
-            </li>
-            <li ng-repeat="menuItem in menuExpander.getMenu('host')">
-              <a href="{{ menuItem.url }}">
-                {{ menuItem.label }}
-              </a>
-            </li>
-          </ul>
-        </nav>
+        <p ng-show="host.hasSubscription()">
+          <label>
+            <input name="delete"
+                   ng-model="host.unregisterDelete"
+                   ng-value="false"
+                   type="radio" />
+            Unregister the host as a subscription consumer.  Provisioning and configuration information is preserved.
+          </label>
+        </p>
+        <p>
+          <label>
+            <input name="delete"
+                   ng-model="host.unregisterDelete"
+                   ng-value="true"
+                   type="radio" />
+            Completely deletes the host record and removes all reporting, provisioning, and configuration information.
+          </label>
+        </p>
+      </div>
+    </div>
+  </nav>
 
-        <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+  <nav data-block="navigation">
+    <ul class="nav nav-tabs">
+      <li ng-class="{active: isState('content-host.info')}">
+        <a translate
+           ui-sref="content-host.info">
+          Details
+        </a>
+      </li>
+      <li ng-class="{active: isState('content-host.provisioning')}"
+          bst-feature-flag="remote_actions">
+        <a translate
+           ui-sref="content-host.provisioning">
+          Provisioning Details
+        </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>
+        </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
+           ui-sref="content-host.host-collections.list">
+          Host Collections
+        </a>
+      </li>
+      <li ng-class="{active: stateIncludes('content-host.tasks')}">
+        <a translate
+           ui-sref="content-host.tasks.index">
+          Tasks
+        </a>
+      </li>
+      <li uib-dropdown
+          ng-class="{active: stateIncludes('content-host.packages-actions') || stateIncludes('content-host.packages-installed') || stateIncludes('content-host.packages-upgradeable')}" >
+        <a uib-dropdown-toggle>
+          <span translate>Packages</span>
+          <i class="fa fa-chevron-down"></i>
+        </a>
+        <ul uib-dropdown-menu>
+          <li>
+            <a ui-sref="content-host.packages.actions" translate>
+              Yum Actions
+            </a>
+          </li>
+          <li>
+            <a ui-sref="content-host.packages.installed" translate>
+              Installed
+            </a>
+          </li>
+          <li>
+            <a ui-sref="content-host.packages.applicable" translate>
+              Applicable
+            </a>
+          </li>
+        </ul>
+      </li>
+      <li ng-class="{active: isState('content-host.errata.index')}">
+        <a translate
+           ui-sref="content-host.errata.index">
+          Errata
+        </a>
+      </li>
+      <li ng-class="{active: isState('content-host.traces.index')}">
+        <a translate
+           ui-sref="content-host.traces.index">
+          Traces
+        </a>
+      </li>
+      <li ng-hide="denied('view_products')" ng-class="{active: isState('content-host.products')}">
+        <a ui-sref="content-host.products" translate>
+          Repository Sets
+        </a>
+      </li>
+      <li ng-repeat="menuItem in menuExpander.getMenu('host')">
+        <a href="{{ menuItem.url }}">
+          {{ menuItem.label }}
+        </a>
+      </li>
+    </ul>
+  </nav>
 
-        <section class="nutupane-sub-section" ui-view></section>
-      </div>
-    </section>
+  <div data-block="content">
+    <section ui-view></section>
   </div>
 </div>