katello 3.2.1.1 → 3.3.0.rc1

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

@@ -0,0 +1,67 @@
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+
+<section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
+  <h4 translate>Package Actions</h4>
+  <p bst-alert="info" ng-hide="host.content_facet_attributes.katello_agent_installed">
+    <span translate>
+      The katello-agent package is required to manage packages on this Host.
+      Please install the katello-agent package to manage packages on
+      {{ host.name }}. To install the package, connect directly to the
+      host from a terminal and use yum.
+    </span>
+  </p>
+  <section>
+    <div class="nutupane-details-bar row">
+      <form ng-submit="performPackageAction(packageAction.actionType, packageAction.term)" role="form">
+
+        <div class="form-group col-sm-2">
+          <select class="form-control" ng-model="packageAction.actionType" name="remote_action" required>
+            <option value="packageInstall" translate>Package Install</option>
+            <option value="packageUpdate" translate>Package Update</option>
+            <option value="packageRemove" translate>Package Remove</option>
+            <option value="groupInstall" translate>Group Install</option>
+            <option value="groupRemove" translate>Group Remove</option>
+          </select>
+        </div>
+
+        <div class="form-group col-sm-5">
+          <div class="input-group">
+            <input class="form-control"
+                   type="text"
+                   placeholder="{{ 'Package/Group Name' | translate}}"
+                   ng-model="packageAction.term"/>
+
+            <span uib-dropdown class="input-group-btn">
+              <button class="btn btn-default"
+                      ng-hide="denied('edit_hosts', host)"
+                      ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0"
+                      translate>
+                Perform
+              </button>
+              <button uib-dropdown-toggle class="btn btn-default"
+                      ng-hide="!remoteExecutionPresent || denied('edit_content_hosts', contentHost)"
+                      ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0"
+                      type="button" id="use-remote-execution">
+                <span class="caret"></span>
+              </button>
+              <ul uib-dropdown-menu role="menu" aria-labelledby="use-remote-execution">
+                <li role="presentation"><a ng-click="performViaKatelloAgent(packageAction.actionType, packageAction.term)" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
+                <li role="presentation"><a ng-click="performViaRemoteExecution(packageAction.actionType, packageAction.term, false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
+                <li role="presentation"><a ng-click="performViaRemoteExecution(packageAction.actionType, packageAction.term, true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
+              </ul>
+            </span>
+          </div>
+        </div>
+
+        <div class="form-group">
+          <button class="btn btn-primary"
+                  translate
+                  ng-disabled="working"
+                  ng-click="updateAll()">
+            Update All Packages
+          </button>
+        </div>
+      </form>
+    </div>
+  </section>
+</section>

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

@@ -0,0 +1,65 @@
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+
+<h4 translate>Applicable Packages</h4>
+
+<div data-extend-template="layouts/details-nutupane.html">
+
+  <span data-block="no-rows-message" translate>
+    The host has not reported any applicable packages for upgrade.
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero Packages.
+  </span>
+
+  <div data-block="actions" bst-feature-flag="remote_actions">
+    <div ng-hide="denied('edit_hosts', host)" class="nutupane-actions fr">
+      <form ng-submit="performDefaultUpdateAction()" role="form">
+
+        <span uib-dropdown class="btn-group">
+          <button class="btn btn-default"
+                  ng-hide="denied('edit_hosts', host)"
+                  ng-disabled="working || detailsTable.numSelected === 0"
+                  translate>
+            Upgrade Selected
+          </button>
+          <button uib-dropdown-toggle class="btn btn-default"
+                  ng-hide="!remoteExecutionPresent || denied('edit_hosts', contentHost)"
+                  ng-disabled="working ||  detailsTable.numSelected === 0"
+                  type="button" id="use-remote-execution">
+            <span class="caret"></span>
+          </button>
+          <ul uib-dropdown-menu role="menu" aria-labelledby="use-remote-execution">
+            <li role="presentation"><a ng-click="performViaKatelloAgent('packageUpdate', getKatelloAgentCommand())" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
+            <li role="presentation"><a ng-click="performViaRemoteExecution('packageUpdate', getRemoteExecutionCommand(), false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
+            <li role="presentation"><a ng-click="performViaRemoteExecution('packageUpdate', getRemoteExecutionCommand(), true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
+          </ul>
+        </span>
+
+        <button class="btn btn-primary"
+                translate
+                ng-disabled="working"
+                ng-click="updateAll()">
+          Update All Packages
+        </button>
+      </form>
+    </div>
+  </div>
+
+  <div data-block="table">
+    <table ng-class="{'table-mask': detailsTable.working}" class="table table-full table-striped">
+      <thead>
+      <tr bst-table-head row-select>
+        <th bst-table-column="name" translate>Upgradable Package</th>
+      </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="package in detailsTable.rows" row-select="package">
+          <td bst-table-cell>{{ package.nvra }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+

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

@@ -0,0 +1,52 @@
+<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
+
+<section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
+  <p bst-alert="info" ng-hide="host.content_facet_attributes.katello_agent_installed">
+    <span translate>
+      The katello-agent package is required to manage packages on this Host.
+      Please install the katello-agent package to manage packages on
+      {{ host.name }}. To install the package, connect directly to the
+      host from a terminal and use yum.
+    </span>
+  </p>
+</section>
+
+<h4 translate>Installed Packages</h4>
+
+<div data-extend-template="layouts/details-nutupane.html">
+  <span data-block="no-rows-message" translate>
+    The host has not reported any installed packages, registering with subscription-manager should cause these to be reported.
+  </span>
+
+  <span data-block="no-search-results-message" translate>
+    Your search returned zero Packages.
+  </span>
+
+  <div data-block="actions" bst-feature-flag="remote_actions">
+    <div ng-hide="denied('edit_hosts', host)" class="nutupane-actions fr">
+      <button class="btn btn-primary"
+              translate
+              ng-disabled="working || detailsTable.numSelected === 0"
+              ng-click="removeSelectedPackages()">
+        {{ 'Remove Selected' | translate }}
+      </button>
+    </div>
+  </div>
+
+  <div data-block="table">
+    <table ng-class="{'table-mask': detailsTable.working}" class="table table-full table-striped">
+      <thead>
+      <tr bst-table-head row-select>
+        <th bst-table-column="name" translate>Installed Package</th>
+      </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="package in detailsTable.rows" row-select="package">
+          <td bst-table-cell>{{ package.nvra }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+

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

@@ -1,119 +1,9 @@
-<span page-title ng-model="host">{{ 'Packages for: ' | translate }} {{ host.name }}</span>
-
-<section ng-hide="denied('edit_hosts', host)" bst-feature-flag="remote_actions">
-  <h4 translate>Package Actions</h4>
-  <p bst-alert="info" ng-hide="host.content_facet_attributes.katello_agent_installed">
-    <span translate>
-      The katello-agent package is required to manage packages on this Host.
-      Please install the katello-agent package to manage packages on
-      {{ host.name }}. To install the package, connect directly to the
-      host from a terminal and use yum.
-    </span>
-  </p>
-  <section>
-
-    <form role="form" id="packageActionForm" method="post" action="/katello/remote_execution">
-      <input type="hidden" name="name" ng-value="packageActionFormValues.package"/>
-      <input type="hidden" name="remote_action" ng-value="packageActionFormValues.remoteAction"/>
-      <input type="hidden" name="host_ids" ng-value="packageActionFormValues.hostIds"/>
-      <input type="hidden" name="customize" ng-value="packageActionFormValues.customize"/>
-      <input type="hidden" name="authenticity_token" ng-value="packageActionFormValues.authenticityToken"/>
-    </form>
-
-    <div class="nutupane-details-bar row">
-      <form ng-submit="performPackageAction()" role="form">
-
-        <div class="form-group col-sm-2">
-          <select class="form-control" ng-model="packageAction.actionType" name="remote_action" required>
-            <option value="packageInstall" translate>Package Install</option>
-            <option value="packageUpdate" translate>Package Update</option>
-            <option value="packageRemove" translate>Package Remove</option>
-            <option value="groupInstall" translate>Group Install</option>
-            <option value="groupRemove" translate>Group Remove</option>
-          </select>
-        </div>
-
-        <div class="form-group col-sm-5">
-          <div class="input-group">
-            <input class="form-control"
-                   type="text"
-                   placeholder="{{ 'Package/Group Name' | translate}}"
-                   ng-model="packageAction.term"/>
-
-            <span class="input-group-btn">
-              <button class="btn btn-default"
-                      ng-hide="denied('edit_hosts', host)"
-                      ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0"
-                      translate>
-                Perform</button>
-                <button class="btn btn-default dropdown-toggle"
-                        ng-hide="!remoteExecutionPresent || denied('edit_content_hosts', contentHost)"
-                        ng-disabled="working || packageAction.term === undefined || packageAction.term.length === 0"
-                        type="button" id="use-remote-execution" data-toggle="dropdown">
-                  <span class="caret"></span>
-                </button>
-                <ul class="dropdown-menu" role="menu" aria-labelledby="use-remote-execution">
-                  <li role="presentation"><a ng-click="performViaKatelloAgent()" role="menuitem" tabindex="-1" href="#" translate>via Katello agent</a></li>
-                  <li role="presentation"><a ng-click="performViaRemoteExecution(false)" role="menuitem" tabindex="-1" href="#" translate>via remote execution</a></li>
-                  <li role="presentation"><a ng-click="performViaRemoteExecution(true)" role="menuitem" tabindex="-1" href="#" translate>via remote execution - customize first</a></li>
-                </ul>
-            </span>
-          </div>
-        </div>
-
-        <div class="form-group fr">
-          <button class="btn btn-primary"
-                  translate
-                  ng-disabled="working"
-                  ng-click="updateAll()">
-            Update All Packages
-          </button>
-        </div>
-      </form>
-    </div>
-  </section>
-</section>
-
-<div data-extend-template="layouts/details-nutupane.html">
-  <h4 translate>Installed Packages</h4>
-
-  <span data-block="no-rows-message" translate>
-    The host has not reported any installed packages, registering with subscription-manager should cause these to be reported.
-  </span>
-
-  <span data-block="no-search-results-message">
-    Your search returned zero Packages.
-  </span>
-
-
-  <div data-block="actions" bst-feature-flag="remote_actions">
-    <div ng-hide="denied('edit_hosts', host)" class="nutupane-actions fr">
-      <button class="btn btn-primary"
-              translate
-              ng-disabled="working || detailsTable.numSelected === 0"
-              ng-click="removeSelectedPackages()">
-        {{ 'Remove Selected' | translate }}
-      </button>
-    </div>
-  </div>
-
-  <div data-extend-template="layouts/select-all-results.html"></div>
-
-  <div data-block="table">
-    <table ng-class="{'table-mask': detailsTable.working}" class="table table-full table-striped">
-      <thead>
-      <tr bst-table-head row-select>
-        <th bst-table-column="name" translate>Installed Package</th>
-      </tr>
-      </thead>
-
-      <tbody>
-        <tr bst-table-row ng-repeat="package in detailsTable.rows" row-select="package">
-          <td class="row-select"></td>
-          <td bst-table-cell>{{ package.nvra }}</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</div>
-
+<form role="form" id="packageActionForm" method="post" action="/katello/remote_execution">
+  <input type="hidden" name="name" ng-value="packageActionFormValues.package"/>
+  <input type="hidden" name="remote_action" ng-value="packageActionFormValues.remoteAction"/>
+  <input type="hidden" name="host_ids" ng-value="packageActionFormValues.hostIds"/>
+  <input type="hidden" name="customize" ng-value="packageActionFormValues.customize"/>
+  <input type="hidden" name="authenticity_token" ng-value="packageActionFormValues.authenticityToken"/>
+</form>
+
+<div ui-view></div>

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

@@ -0,0 +1,76 @@
+<span page-title ng-model="host">{{ 'Traces for: ' | translate }} {{ host.name }}</span>
+
+<div class="details fl" ng-hide="host.hasContent()">
+  <div data-extend-template="common/views/registration.html"></div>
+</div>
+
+<div ng-if="host && host.hasContent()" ng-hide="denied('edit_hosts', host)">
+  <div data-block="messages" ng-show="detailsTable.rows.length > 0">
+    <p bst-alert="info" >
+      <span translate ng-show="remoteExecutionPresent">
+        Only the Applications with a Helper can be restarted.
+      </span>
+      <span translate ng-show="!remoteExecutionPresent">
+        Remote execution plugin is required to be able to run any helpers.
+      </span>
+    </p>
+  </div>
+
+  <form id="traceActionForm" method="post" action="/katello/remote_execution">
+    <input type="hidden" name="remote_action" value="service_restart"/>
+    <input type="hidden" name="name" ng-value="traceActionFormValues.helper"/>
+    <input type="hidden" name="host_ids" ng-value="traceActionFormValues.hostIds"/>
+    <input type="hidden" name="customize" ng-value="traceActionFormValues.customize"/>
+    <input type="hidden" name="authenticity_token" ng-value="traceActionFormValues.authenticityToken"/>
+  </form>
+
+  <div data-extend-template="layouts/details-nutupane.html">
+    <div data-block="header" bst-feature-flag="remote_actions">
+      <span translate>Traces</span>
+    </div>
+
+    <span data-block="actions" ng-hide="contentHost.readonly">
+      <div bst-modal="performViaRemoteExecution(false)" model="host">
+        <div data-block="modal-header" translate>Restart Services on Content Host "{{host.name}}"?</div>
+        <div data-block="modal-body" translate>Are you sure you want to restart services on content host "{{ host.name }}"?</div>
+        <div data-block="modal-confirm-button" translate>Restart</div>
+      </div>
+
+        <span bst-feature-flag="remote_actions">
+          <span class="btn-group" uib-dropdown>
+            <button class="btn btn-primary"
+                    translate
+                    ng-hide="denied('edit_hosts', host)"
+                    ng-disabled="detailsTable.getSelected().length == 0 || !remoteExecutionPresent"
+                    ng-click="openModal()">
+              Restart Selected
+            </button>
+          </span>
+        </span>
+    </span>
+
+    <span data-block="no-rows-message" translate>
+      There are no Traces to display.
+    </span>
+
+    <div data-block="table">
+      <table class="table table-striped table-bordered" ng-class="{'table-mask': detailsTable.working}">
+        <thead>
+          <tr bst-table-head row-select>
+            <th bst-table-column="application" translate>Application</th>
+            <th bst-table-column="app_type" translate>Type</th>
+            <th bst-table-column="helper" translate>Helper</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr bst-table-row ng-repeat="trace in detailsTable.rows | filter:detailsTable.tracesCompare" row-select="trace">
+            <td bst-table-cell >{{ trace.application }}</td>
+            <td bst-table-cell >{{ trace.app_type }}</td>
+            <td bst-table-cell >{{ trace.helper }}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+
+  </div>
+</div>

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

@@ -59,8 +59,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddHostCollection
 
             $scope.hostCollectionsTable.working = true;
 
-            hostCollections = _.pluck(host['host_collections'], 'id');
-            hostCollectionsToAdd = _.pluck($scope.hostCollectionsTable.getSelected(), 'id');
+            hostCollections = _.map(host['host_collections'], 'id');
+            hostCollectionsToAdd = _.map($scope.hostCollectionsTable.getSelected(), 'id');
             data = {"host_collection_ids": _.union(hostCollections, hostCollectionsToAdd)};
 
             Host.updateHostCollections({id: host.id}, data, success, error);

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

@@ -57,8 +57,8 @@ angular.module('Bastion.content-hosts').controller('ContentHostHostCollectionsCo
             };
 
             $scope.hostCollectionsTable.working = true;
-            hostCollections = _.pluck(host['host_collections'], 'id');
-            hostCollectionsToRemove = _.pluck($scope.hostCollectionsTable.getSelected(), 'id');
+            hostCollections = _.map(host['host_collections'], 'id');
+            hostCollectionsToRemove = _.map($scope.hostCollectionsTable.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/views/content-host-add-subscriptions.html

@@ -16,7 +16,7 @@
       You currently don't have any Products to subscribe to, you can add Products after selecting 'Products' under 'Content' in the main menu
   </span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Products.
   </span>
 

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

@@ -67,13 +67,13 @@
                 Provisioning Details
               </a>
             </li>
-            <li class="dropdown"
+            <li uib-dropdown
                 ng-class="{active: stateIncludes('content-hosts.details.subscriptions.list') || stateIncludes('content-hosts.details.subscriptions.add') || stateIncludes('content-hosts.details.events')}">
-              <a class="dropdown-toggle">
+              <a uib-dropdown-toggle>
                 <span translate>Subscriptions</span>
                 <i class="fa fa-chevron-down"></i>
               </a>
-              <ul class="dropdown-menu">
+              <ul uib-dropdown-menu>
                 <li>
                   <a ui-sref="content-hosts.details.subscriptions.list" translate>
                     Subscriptions
@@ -98,11 +98,29 @@
                 Tasks
               </a>
             </li>
-            <li ng-class="{active: isState('content-hosts.details.packages')}">
-              <a translate
-                 ui-sref="content-hosts.details.packages">
-                Packages
+            <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
@@ -110,6 +128,12 @@
                 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">
@@ -130,4 +154,4 @@
       </div>
     </section>
   </div>
-</div>
+</div>