katello 3.0.0.rc1 → 3.0.0.rc2

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

@@ -50,7 +50,7 @@
 
     <span data-block="actions" bst-feature-flag="remote_actions">
 
-        <div bst-modal="applySelected()">
+        <div bst-modal="applySelected()" model="host">
           <div data-block="modal-header" translate>Apply Errata to Content Host "{{host.name}}"?</div>
           <div data-block="modal-body" translate>Are you sure you want to apply Errata to content host "{{ host.name }}"?</div>
           <div data-block="modal-confirm-button" translate>Apply</div>

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

@@ -36,7 +36,9 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
 
         $scope.host.$promise.then(function (host) {
             $scope.hostFactsAsObject = doubleColonNotationToObject(host.facts);
-            $scope.originalEnvironment = host.content.lifecycle_environment;
+            if (host.hasContent()) {
+                $scope.originalEnvironment = host.content.lifecycle_environment;
+            }
         });
 
         $scope.successMessages = [];
@@ -122,10 +124,10 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsInfoContro
         $scope.virtualGuestIds = function (host) {
             var ids = [];
             angular.forEach(host.subscription['virtual_guests'], function (guest) {
-                ids.push('id:%s'.replace('%s', guest.id));
+                ids.push('name = %s'.replace('%s', guest.name));
             });
 
-            return ids.join(" ");
+            return ids.join(" or ");
         };
     }]
 );

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

@@ -15,8 +15,8 @@
  *   Provides the functionality for the content host details action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostDetailsController',
-    ['$scope', '$state', '$q', 'translate', 'Host', 'Organization', 'CurrentOrganization', 'MenuExpander', 'ApiErrorHandler',
-    function ($scope, $state, $q, translate, Host, Organization, CurrentOrganization, MenuExpander, ApiErrorHandler) {
+    ['$scope', '$state', '$q', 'translate', 'Host', 'HostSubscription', 'Organization', 'CurrentOrganization', 'GlobalNotification', 'MenuExpander', 'ApiErrorHandler',
+    function ($scope, $state, $q, translate, Host, HostSubscription, Organization, CurrentOrganization, GlobalNotification, MenuExpander, ApiErrorHandler) {
         $scope.menuExpander = MenuExpander;
         $scope.successMessages = [];
         $scope.errorMessages = [];
@@ -25,7 +25,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
             loading: true
         };
 
-        $scope.host = Host.get({id: $scope.$stateParams.hostId}, function () {
+        $scope.host = Host.get({id: $scope.$stateParams.hostId}, function (host) {
+            host.unregisterDelete = !host.hasSubscription(); //default to delete if no subscription
             $scope.panel.loading = false;
         }, function (response) {
             $scope.panel.loading = false;
@@ -116,5 +117,28 @@ angular.module('Bastion.content-hosts').controller('ContentHostDetailsController
 
             return deferred.promise;
         };
+
+        $scope.unregisterContentHost = function (host) {
+            var errorHandler = function (response) {
+                host.deleting = false;
+                GlobalNotification.setErrorMessage(translate('An error occured: %s').replace('%s', response.data.displayMessage));
+            };
+            host.deleting = true;
+
+            if (host.unregisterDelete) {
+                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');
+                }, 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');
+                }, errorHandler);
+            }
+        };
     }]
 );

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

@@ -4,43 +4,96 @@
  *
  * @requires $scope
  * @requires translate
- * @requires ContentHost
- * @requires Product
- * @requires CurrentOrganization
+ * @requires HostSubscription
  *
  * @description
  *   Provides the functionality for the content-host products action pane.
  */
 angular.module('Bastion.content-hosts').controller('ContentHostProductsController',
-    ['$scope', 'translate', 'ContentHost', 'Product', 'CurrentOrganization',
-    function ($scope, translate, ContentHost, Product, CurrentOrganization) {
+    ['$scope', 'translate', 'HostSubscription',
+    function ($scope, translate, HostSubscription) {
+        var defaultOverride = "default",
+            enabledOverride = "1",
+            disabledOverride = "0";
 
-        $scope.successMessages = [];
-        $scope.errorMessages = [];
-        $scope.displayArea = { working: true, isAvailableContent: false };
+        function processOverrides(overrides) {
+            var products = {};
 
-        $scope.isAnyAvailableContent = function (products) {
-            var isAvailableContent = false;
-            angular.forEach(products, function (product) {
-                if (product['available_content'].length > 0) {
-                    isAvailableContent = true;
+            angular.forEach(overrides, function (override) {
+                if (angular.isUndefined(products[override.product.name])) {
+                    products[override.product.name] = [];
                 }
+
+                override.enabledText = $scope.getEnabledText(override.enabled, override.enabled_override);
+                products[override.product.name].push(override);
             });
-            return isAvailableContent;
+
+            $scope.products = products;
+            $scope.displayArea.isAvailableContent = Object.keys(products).length !== 0;
+            $scope.displayArea.working = false;
+        }
+
+        $scope.getEnabledText = function (enabled, overrideEnabled) {
+            var enabledText;
+            overrideEnabled = overrideEnabled + "";
+
+            if (overrideEnabled === defaultOverride) {
+                enabledText = enabled ? translate("Yes (Default)") : translate("No (Default)");
+            } else if (overrideEnabled === enabledOverride) {
+                enabledText = translate("Override to Yes");
+            } else {
+                enabledText = translate("Override to No");
+            }
+
+            return enabledText;
         };
 
-        $scope.contentHost.$promise.then(function () {
-            ContentHost.products({id: $scope.contentHost.uuid,
-                                  'organization_id': CurrentOrganization,
-                                  enabled: true,
-                                  'full_result': true,
-                                  'include_available_content': true
-                                 }, function (response) {
-                $scope.products = response.results;
-                $scope.displayArea.isAvailableContent = $scope.isAnyAvailableContent($scope.products);
-                $scope.displayArea.working = false;
-            });
-        });
+        $scope.overrideEnableChoices = function (override) {
+            var choices;
+            if (override.enabled === true) {
+                choices = [
+                    {name: $scope.getEnabledText(true, defaultOverride), id: "default"},
+                    {name: $scope.getEnabledText(null, 0), id: disabledOverride}
+                ];
+            } else {
+                choices = [
+                    {name: $scope.getEnabledText(false, defaultOverride), id: "default"},
+                    {name: $scope.getEnabledText(null, 1), id: enabledOverride}
+                ];
+            }
+            return choices;
+        };
 
+        $scope.success = function (content) {
+            content.enabledText = $scope.getEnabledText(content.enabled, content.enabled_override);
+            $scope.successMessages.push(translate('Updated override for %y to "%x".')
+                    .replace('%x', content.enabledText).replace("%y", content.content.name));
+        };
+
+        $scope.error = function (error) {
+            $scope.errorMessages.push(error.data.errors);
+        };
+
+        $scope.saveContentOverride = function (content) {
+            var params = {'content_label': content.content.label,
+                           name: "enabled",
+                           value: content.enabled_override
+                         };
+
+            HostSubscription.contentOverride({id: $scope.host.id}, params,
+                    function () {
+                        $scope.success(content);
+                    },
+                    $scope.error);
+        };
+
+        $scope.successMessages = [];
+        $scope.errorMessages = [];
+        $scope.displayArea = { working: true, isAvailableContent: false };
+
+        HostSubscription.productContent({id: $scope.$stateParams.hostId, 'full_result': true,
+                              'include_available_content': true }, function (response) {
+            processOverrides(response.results);
+        });
     }]
 );

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

@@ -34,12 +34,12 @@
 
        <tbody>
          <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions">
-          <td class="row-select"></td>
-           <td bst-table-cell colspan="8">
-             <a href='/subscriptions/{{ subscription.id }}/info'>
+           <td class="row-select">
+             <a href='/subscriptions/{{ subscription.id }}/info' class="confined-text">
               {{ name }}
              </a>
            </td>
+           <td bst-table-cell colspan="8"></td>
          </tr>
          <tr bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
            <td bst-table-cell>

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

@@ -10,22 +10,44 @@
 
   <div ng-hide="panel.error">
     <header class="details-header">
-      <h2 class="fl" translate>Content Host {{ contentHost.name }}</h2>
+      <h2 class="fl" translate>Content Host {{ host.name }}</h2>
 
       <div class="fr">
-
-        <div bst-modal="unregisterContentHost(contentHost)">
+        <div bst-modal="unregisterContentHost(host)" model="host">
           <div data-block="modal-header" translate>
-            Unregister Content Host "{{contentHost.name}}"?
+            Unregister Host "{{host.name}}"?
           </div>
-          <div data-block="modal-body" translate>
-            Are you sure you want to unregister content host "{{ contentHost.name }}"?
+          <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>
+        </div>
 
         <button class="btn btn-default"
-                ng-hide="denied('destroy_hosts', contentHost)"
-                ng-click="openModal()" translate>Unregister Content Host</button>
+                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 }}
@@ -97,7 +119,7 @@
             Product Content
           </a>
         </li>
-        <li ng-repeat="menuItem in menuExpander.getMenu('contentHost')">
+        <li ng-repeat="menuItem in menuExpander.getMenu('host')">
           <a href="{{ menuItem.url }}">
             {{ menuItem.label }}
           </a>

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

@@ -1,11 +1,11 @@
 <span page-title ng-model="host">{{ 'Content Host' | translate }} {{ host.name }}</span>
 
 <section>
-  <div class="details fl" ng-hide="host.hasContent()">
+  <div class="details fl" ng-hide="host.hasContent() || host.hasSubscription()">
     <div data-extend-template="common/views/registration.html"></div>
   </div>
 
-  <div class="details fl" ng-show="host.hasContent()">
+  <div class="details fl" ng-show="host.hasContent() || host.hasSubscription()">
     <section>
       <h4 translate>Basic Information</h4>
 
@@ -50,21 +50,21 @@
         </span>
       </div>
 
-      <div ng-show="host.virtual_guests" class="detail">
+      <div ng-show="host.subscription.virtual_guests" class="detail">
         <span class="info-label" translate>Virtual Guests</span>
         <div class="info-value">
           <a ng-click="reloadSearch(virtualGuestIds(host))"
-               translate translate-n="host.virtual_guests.length"
-               translate-plural="{{ host.virtual_guests.length }} Content Hosts">
+               translate translate-n="host.subscription.virtual_guests.length"
+               translate-plural="{{ host.subscription.virtual_guests.length }} Content Hosts">
              1 Content Host
           </a>
         </div>
       </div>
 
-      <div ng-show="host.virtual_host" class="detail">
+      <div ng-show="host.subscription.virtual_host" class="detail">
         <span class="info-label" translate>Virtual Host</span>
         <div class="info-value">
-          <a ui-sref="content-hosts.details.info({contentHostId: host.subscription.virtual_host.uuid })">{{ host.virtual_host.name }}</a>
+          <a ui-sref="content-hosts.details.info({hostId: host.subscription.virtual_host.id })">{{ host.subscription.virtual_host.name }}</a>
         </div>
       </div>
 
@@ -143,7 +143,7 @@
       <div class="divider"></div>
     </section>
 
-    <section>
+    <section ng-show="host.hasContent()">
       <h4 translate>Installed Products</h4>
 
       <p translate ng-show="!host.subscription.installed_products || host.subscription.installed_products.length == 0">

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

@@ -22,30 +22,30 @@
         This Content Host is not attached to any subscriptions that provide content
       </div>
 
-      <div ng-repeat="product in products" ng-hide="product.available_content.length < 1"
-           ng-controller="ContentHostProductDetailsController" ng-init="productDetails(product)">
+      <div ng-repeat="(product_name, overrides) in products">
+
         <i ng-class="{'fa fa-plus': !expanded, 'fa fa-minus': expanded}" class="expand-icon"
            ng-click="expanded = !expanded">
-          <b>{{ product.name }}</b>
+          <b>{{ product_name }}</b>
         </i>
 
         <div class="row" ng-show="expanded">
-          <div class="col-md-11 col-md-offset-1" ng-show="details.available_content.length < 1"
+          <div class="col-md-11 col-md-offset-1" ng-show="contents.length < 1"
                translate>
             No repository content.
           </div>
 
-          <div class="col-md-11 col-md-offset-1" ng-repeat="content in product.available_content">
-            <h4><u>{{ content.content.name }}</u></h4>
+          <div class="col-md-11 col-md-offset-1" ng-repeat="override in overrides">
+            <h4><u>{{ override.content.name }}</u></h4>
 
             <div class="detail row">
               <span class="col-sm-4" translate>Enabled?</span>
               <span class="col-sm-3"
-                    bst-edit-select="content.enabledText"
-                    readonly="denied('edit_hosts', contentHost)"
-                    selector="content.overrideEnabled"
-                    options="overrideEnableChoices(content)"
-                    on-save="saveContentOverride(content)">
+                    bst-edit-select="override.enabledText"
+                    readonly="denied('edit_hosts', host)"
+                    selector="override.enabled_override"
+                    options="overrideEnableChoices(override)"
+                    on-save="saveContentOverride(override)">
               </span>
             </div>
           </div>

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

@@ -45,12 +45,12 @@
 
       <tbody>
         <tr bst-table-row ng-repeat-start="(name, subscriptions) in groupedSubscriptions | groupedFilter: subscriptionSearch">
-          <td class="row-select"></td>
-          <td bst-table-cell colspan="8">
-            <a href='/subscriptions/{{ subscription.id }}/info'>
+          <td class="row-select">
+            <a href='/subscriptions/{{ subscription.id }}/info' class="confined-text">
               {{ name }}
             </a>
           </td>
+          <td bst-table-cell colspan="8"></td>
         </tr>
         <tr bst-table-row ng-repeat-end ng-repeat="subscription in subscriptions" row-select="subscription">
           <td bst-table-cell>{{ subscription | subscriptionAttachAmountFilter}}</td>

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

@@ -40,7 +40,7 @@
       Cancel
     </a>
 
-    <div bst-modal="promote()">
+    <div bst-modal="promote()" model="selectedEnvironment" model="selectedEnvironment">
       <div data-block="modal-header" translate>Force Promote?</div>
       <div data-block="modal-body" translate>Promote version to {{ selectedEnvironment.name }}?<br /><br />{{ suggestedEnvironmentMessage() }}</div>
       <div data-block="modal-confirm-button" translate>Promote</div>

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

@@ -8,15 +8,15 @@
       <tr bst-table-head>
         <th bst-table-column translate>Name</th>
         <th bst-table-column translate>Author</th>
-        <th bst-table-column translate>Version</th>
       </tr>
     </thead>
 
     <tbody>
       <tr bst-table-row ng-repeat="puppetModule in detailsTable.rows">
-        <td bst-table-cell>{{ puppetModule.name }}</td>
+        <td bst-table-cell>
+          <a ui-sref="puppet-modules.details.info({puppetModuleId: puppetModule.id})">{{ puppetModule.name }}-{{ puppetModule.version }}</a>
+        </td>
         <td bst-table-cell>{{ puppetModule.author }}</td>
-        <td bst-table-cell>{{ puppetModule.version }}</td>
       </tr>
     </tbody>
   </table>

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

@@ -81,7 +81,7 @@ angular.module('Bastion.errata').controller('ApplyErrataController',
                 });
 
                 if ($scope.applyErrata) {
-                    params['update_systems'] = $scope.selectedContentHosts;
+                    params['update_hosts'] = $scope.selectedContentHosts;
                 }
 
                 error = function (response) {

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

@@ -12,41 +12,64 @@
  *   Provides the functionality for the available host collection details action pane.
  */
 angular.module('Bastion.errata').controller('ErrataContentHostsController',
-    ['$scope', 'Nutupane', 'ContentHost', 'Environment', 'CurrentOrganization',
-    function ($scope, Nutupane, ContentHost, Environment, CurrentOrganization) {
+    ['$scope', 'Nutupane', 'Host', 'Environment', 'CurrentOrganization',
+    function ($scope, Nutupane, Host, Environment, CurrentOrganization) {
         var nutupane, params;
 
         $scope.successMessages = [];
         $scope.errorMessages = [];
 
+        $scope.restrictInstallable = false;
+
         params = {
             'erratum_id': $scope.$stateParams.errataId,
             'organization_id': CurrentOrganization
         };
 
-        if (!params['erratum_id']) {
-            params['errata_ids'] = _.pluck($scope.table.getSelected(), 'id');
-        }
-
-        nutupane = new Nutupane(ContentHost, params, 'getPost');
+        nutupane = new Nutupane(Host, params);
         nutupane.table.closeItem = function () {};
         nutupane.enableSelectAllResults();
 
         $scope.nutupane = nutupane;
         $scope.detailsTable = nutupane.table;
+        $scope.nutupane.searchTransform = function(term) {
+            var addition = '( ' + $scope.errataSearchString($scope.restrictInstallable) + ' )';
+            if (angular.isDefined($scope.environment_id)) {
+                addition = addition + ' and lifecycle_environment_id = ' + $scope.environmentId;
+            }
+
+            if (term === "" || angular.isUndefined(term)) {
+                return addition;
+            }
+            return term + ' and ' + addition;
+        };
 
         Environment.queryUnpaged(function (response) {
             $scope.environments = response.results;
         });
 
         $scope.toggleInstallable = function () {
-            nutupane.table.params['erratum_restrict_installable'] = $scope.errata.showInstallable;
             nutupane.refresh();
         };
 
+        $scope.errataSearchString = function(installable) {
+            var searchTerm = installable ? 'installable_errata' : 'applicable_errata',
+                searchStatements, errataIds;
+
+            if ($scope.errata) {
+                errataIds = [$scope.errata['errata_id']];
+            } else {
+                errataIds = _.pluck($scope.table.getSelected(), 'errata_id');
+            }
+
+            searchStatements = _.map(errataIds, function(errataId) {
+                return searchTerm + ' = "' + errataId + '"';
+            });
+            return searchStatements.join(" or ");
+        };
+
         $scope.selectEnvironment = function (environmentId) {
-            params['environment_id'] = environmentId;
-            nutupane.setParams(params);
+            $scope.environmentId = environmentId;
             nutupane.refresh();
         };