katello 3.3.2 → 3.4.0.rc1

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

@@ -1,57 +1,41 @@
 <span page-title ng-model="host">{{ 'Content Host' | translate }} {{ host.name }}</span>
 
-<section>
-  <div class="details fl">
-    <section>
-
-      <h4 translate>Provisioning Host Details</h4>
-
-      <div class="detail">
-        <span class="info-label" translate>Name</span>
-        <span class="info-value">
-          <a href="/hosts/{{ host.name }}">
-            {{ host.name }}
-          </a>
-        </span>
-      </div>
-
-      <div class="detail">
-        <span class="info-label" translate>Status</span>
-        <span class="info-value">
-          <i ng-class="contentHostTable.getHostStatusIcon(host.global_status)"></i>
-          {{ host.global_status_label | translate }}
-        </span>
-      </div>
-
-      <div class="detail">
-        <span class="info-label" translate>Operating System</span>
-        <span class="info-value">{{ host.operatingsystem_name }}</span>
-      </div>
-
-      <div class="detail">
-        <span class="info-label" translate>Puppet Environment</span>
-        <span class="info-value">{{ host.puppet_environment_name }}</span>
-      </div>
-
-      <div class="detail">
-        <span class="info-label" translate>Last Puppet Report</span>
-        <span class="info-value">{{ host.last_report | date:'short' }}</span>
-      </div>
-
-      <div class="detail">
-        <span class="info-label" translate>Model</span>
-        <span class="info-value">{{ host.model_name }}</span>
-      </div>
-
-      <div class="detail">
-        <span class="info-label" translate>Host Group</span>
-        <span class="info-value">
-          <a href="/hostgroups/{{ host.hostgroup_id }}-{{ host.hostgroup_name }}/edit">
-            {{ host.hostgroup_name }}
-          </a>
-        </span>
-      </div>
-
-    </section>
+<div data-extend-template="layouts/two-column-details.html">
+  <div data-block="left-column">
+    <h4 translate>Provisioning Host Details</h4>
+
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Name</dt>
+      <dd>
+        <a href="/hosts/{{ host.name }}">
+          {{ host.name }}
+        </a>
+      </dd>
+
+      <dt translate>Status</dt>
+      <dd>
+        <i ng-class="table.getHostStatusIcon(host.global_status)"></i>
+        {{ host.global_status_label | translate }}
+      </dd>
+
+      <dt translate>Operating System</dt>
+      <dd>{{ host.operatingsystem_name }}</dd>
+
+      <dt translate>Puppet Environment</dt>
+      <dd>{{ host.puppet_environment_name }}</dd>
+
+      <dt translate>Last Puppet Report</dt>
+      <dd>{{ host.last_report | date:'short' }}</dd>
+
+      <dt translate>Model</dt>
+      <dd>{{ host.model_name }}</dd>
+
+      <dt translate>Host Group</dt>
+      <dd>
+        <a href="/hostgroups/{{ host.hostgroup_id }}-{{ host.hostgroup_name }}/edit">
+          {{ host.hostgroup_name }}
+        </a>
+      </dd>
+    </dl>
   </div>
-</section>
+</div>

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

@@ -0,0 +1,93 @@
+<div ng-hide="host.hasSubscription()">
+  <div data-extend-template="common/views/registration.html"></div>
+</div>
+
+<div ng-if="host.hasSubscription()">
+  <div bst-alert="info">
+    {{ "Below are the repository content sets currently available for this content host through its subscriptions. For Red Hat subscriptions, additional content can be made available through the" | translate}}
+    <a ng-href="/katello/providers/redhat_provider" translate>Red Hat Repositories page</a>.
+    {{ "Changing default settings requires subscription-manager version 1.10 or newer to be installed on this host." | translate }}
+  </div>
+
+  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+
+  <div class="loading-mask loading-mask-panel" ng-show="displayArea.working">
+    <i class="fa fa-spinner fa-spin"></i>
+    <span translate>Loading..."</span>
+  </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" uib-dropdown keyboard-nav>
+
+        <button class="btn btn-default" type="button" uib-dropdown-toggle>
+          <span translate>Select Action</span>
+        </button>
+
+        <button type="button" class="btn btn-default" uib-dropdown-toggle>
+          <span class="caret"></span>
+        </button>
+
+        <ul class="dropdown-menu-right" uib-dropdown-menu role="menu" aria-labelledby="split-button">
+          <li role="menuitem" ng-show="permitted('edit_activation_keys', activationKey)" ng-class="{disabled: table.numSelected === 0}">
+            <a ng-click="overrideToEnabled()" disable-link="table.numSelected === 0" translate>
+              Override to Enabled
+            </a>
+          </li>
+
+          <li role="menuitem" ng-show="permitted('edit_activation_keys', activationKey)" ng-class="{disabled: table.numSelected === 0}">
+            <a ng-click="overrideToDisabled()" disable-link="table.numSelected === 0" translate>
+              Override to Disabled
+            </a>
+          </li>
+
+          <li role="menuitem" ng-show="permitted('edit_activation_keys', activationKey)" ng-class="{disabled: table.numSelected === 0}">
+            <a ng-click="resetToDefault()" disable-link="table.numSelected === 0" translate>
+              Reset to Default
+            </a>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <span data-block="no-rows-message" translate>
+      No repository sets provided through subscriptions.
+    </span>
+
+    <span data-block="no-search-results-message" translate>
+      Your search returned zero repository sets.
+    </span>
+
+    <div data-block="table">
+      <table class="table table-bordered table-striped" ng-class="{'table-mask': table.working}">
+        <thead>
+          <tr bst-table-head row-select>
+            <th bst-table-column="repository_name" translate>Repository Name</th>
+            <th bst-table-column="product_name" translate>Product Name</th>
+            <th bst-table-column="repository_path" translate>Repository Path</th>
+            <th bst-table-column="enabled" translate>Status</th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <tr class="grey-table-row" bst-table-row ng-repeat-end ng-repeat="productRepoSet in table.rows | filter:repositorySetFilter" row-select="productRepoSet">
+            <td bst-table-cell>{{ productRepoSet.content.name }}</td>
+            <td bst-table-cell>
+              <a ui-sref="product.info({productId: id})">
+                {{ productRepoSet.product.name }}
+              </a>
+            </td>
+            <td bst-table-cell>{{ productRepoSet.content.content_url }}</td>
+            <td bst-table-cell>{{ productRepoSet | repositorySetsEnabled }}</td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

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

@@ -1,19 +1,9 @@
 <span page-title ng-model="host">{{ 'Subscriptions for Content Host:' | translate }} {{ host.name }}</span>
-<div data-extend-template="layouts/details-nutupane.html">
-  <div data-block="messages"></div>
 
-  <span data-block="search">
-    <div class="input-group">
-      <input type="text"
-             class="form-control"
-             placeholder="{{ 'Filter' | translate }}"
-             ng-model="subscriptionSearch"/>
-    </div>
-  </span>
-
-  <div data-block="actions">
-    <div ng-hide="system.readonly" class="nutupane-actions fr">
-       <button class="btn btn-primary"
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="list-actions">
+    <div ng-hide="system.readonly">
+       <button class="btn btn-default" type="button"
                translate
                ng-hide="denied('edit_hosts', host)"
                ng-disabled="disableRemoveButton()"
@@ -24,52 +14,14 @@
   </div>
 
   <span data-block="no-rows-message" translate>
-       You currently don't have any Subscriptions associated with this Content Host, you can add Subscriptions after selecting the 'Add' tab.
+     You currently don't have any Subscriptions associated with this Content Host, you can add Subscriptions after selecting the 'Add' tab.
   </span>
 
   <span data-block="no-search-results-message" translate>
     Your search returned zero Subscriptions.
   </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 | groupedFilter: subscriptionSearch">
-          <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>{{ subscription.quantity_consumed }}</td>
-          <td bst-table-cell>
-            <a ui-sref="subscription.info({subscriptionId: subscription.id})">
-              {{ subscription | subscriptionConsumedFilter }}
-            </a>
-          </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-subscriptions.html

@@ -5,63 +5,60 @@
 </div>
 
 <div ng-if="host.hasSubscription()">
-  <button class="btn btn-primary fr"
-          ng-hide="denied('edit_hosts', host)"
-          ng-click="autoAttachSubscriptions()"
-          ng-disabled="subscription.workingMode">
-  {{ "Run Auto-Attach" | translate }}
-  </button>
+  <section class="row">
+    <div class="col-sm-6">
+      <h4 translate>Subscription Details</h4>
 
-  <span ng-show="subscription.workingMode">
-    <i class="fa fa-spinner inline-icon fa-spin fr"></i>
-    <span translate>Working</span>
-  </span>
-
-  <section class="details">
-    <h4 translate>Subscription Details</h4>
-    <div class="detail">
-      <span class="info-label" translate>Status</span>
-        <span class="info-value">
-          <i ng-class="contentHostTable.getHostStatusIcon(host.subscription_global_status)"></i>
+      <dl class="dl-horizontal dl-horizontal-left">
+        <dt translate>Status</dt>
+        <dd>
+          <i ng-class="table.getHostStatusIcon(host.subscription_global_status)"></i>
           {{ host.subscription_status_label | translate }}
-        </span>
-    </div>
+        </dd>
 
-    <div ng-show="host.subscription_facet_attributes.compliance_reasons.length > 0" class="detail">
-      <span class="info-label" translate>Details</span>
-      <div class="info-value">
-        <ul class="compliance-reasons">
-          <li ng-repeat="reason in host.subscription_facet_attributes.compliance_reasons">{{ reason }}</li>
-        </ul>
-      </div>
-    </div>
+        <dt ng-show="host.subscription_facet_attributes.compliance_reasons.length > 0" translate>Details</dt>
+        <dd ng-show="host.subscription_facet_attributes.compliance_reasons.length > 0">
+          <ul class="compliance-reasons">
+            <li ng-repeat="reason in host.subscription_facet_attributes.compliance_reasons">{{ reason }}</li>
+          </ul>
+        </dd>
+
+        <dt translate>Auto-Attach</dt>
+        <dd>
+          <div bst-edit-checkbox="host.subscription_facet_attributes.autoheal"
+               formatter="booleanToYesNo"
+               readonly="denied('edit_hosts', host)"
+               on-save="saveSubscriptionFacet(host)">
+          </div>
+
+          <a ng-hide="denied('edit_hosts', host)"
+             ng-click="autoAttachSubscriptions()"
+             ng-disabled="subscription.workingMode">
+            <span translate>Run Auto-Attach</span>
+          </a>
+
+          <span ng-show="subscription.workingMode">
+            <i class="fa fa-spinner inline-icon fa-spin"></i>
+            <span translate>Working</span>
+          </span>
+        </dd>
 
-    <div class="detail">
-      <span class="info-label" translate>Auto-Attach</span>
-      <span class="info-value"
-            bst-edit-checkbox="host.subscription_facet_attributes.autoheal"
-            formatter="booleanToYesNo"
+        <dt translate>Service Level</dt>
+        <dd bst-edit-select="host.subscription_facet_attributes.service_level"
             readonly="denied('edit_hosts', host)"
+            selector="host.subscription_facet_attributes.service_level"
+            options="serviceLevels()"
+            options-format="option for option in options"
             on-save="saveSubscriptionFacet(host)">
-      </span>
-    </div>
-    <div class="detail">
-      <span class="info-label" translate>Service Level</span>
-          <span class="info-value"
-                bst-edit-select="host.subscription_facet_attributes.service_level"
-                readonly="denied('edit_hosts', host)"
-                selector="host.subscription_facet_attributes.service_level"
-                options="serviceLevels()"
-                options-format="option for option in options"
-                on-save="saveSubscriptionFacet(host)">
-          </span>
+        </dd>
+      </dl>
     </div>
   </section>
 
   <nav>
-    <ul class="nav nav-tabs" ng-show="permitted('attach_subscriptions')">
-      <li ng-class="{active: isState('content-hosts.details.subscriptions.list')}">
-        <a ui-sref="content-hosts.details.subscriptions.list">
+    <ul class="nav nav-tabs nav-tabs-pf" ng-show="permitted('attach_subscriptions')">
+      <li ng-class="{active: isState('content-host.subscriptions.list')}">
+        <a ui-sref="content-host.subscriptions.list">
           <!-- TODO: other pages too - label "List" vs. "List/Remove" based on edit permissions -->
           <span translate>
             List/Remove
@@ -69,8 +66,8 @@
         </a>
       </li>
 
-      <li ng-class="{active: stateIncludes('content-hosts.details.subscriptions.add')}">
-        <a ui-sref="content-hosts.details.subscriptions.add">
+      <li ng-class="{active: stateIncludes('content-host.subscriptions.add')}">
+        <a ui-sref="content-host.subscriptions.add">
           <span translate>
             Add
           </span>
@@ -81,36 +78,4 @@
 
   <div ui-view></div>
 
-</div>
-
-<!--
-http://projects.theforeman.org/issues/4253
-  <div ui-view></div>
-    <div class="filter-options">
-      <span class="filter-option">
-        <input type="checkbox"
-               id="subscriptions-match"
-               class="input"
-               ng-model="availableSubscriptionsTable.matchSystem"
-               ng-change="availableSubscriptionsTable.filterSubscriptions()"/>
-        <label for="subscriptions-match" translate>Subscriptions match system</label>
-      </span>
-      <span class="filter-option">
-        <input type="checkbox"
-               id="subscriptions-match-installed"
-               class="input"
-               ng-model="availableSubscriptionsTable.matchInstalled"
-               ng-change="availableSubscriptionsTable.filterSubscriptions()"/>
-        <label for="subscriptions-match-installed" translate>Subscriptions match installed software</label>
-      </span>
-
-      <span class="filter-option">
-        <input type="checkbox"
-               id="subscriptions-no-overlap"
-               class="input"
-               ng-model="availableSubscriptionsTable.noOverlap"
-               ng-change="availableSubscriptionsTable.filterSubscriptions()"/>
-        <label for="subscriptions-no-overlap" translate>No overlap with current</label>
-        </span>
-    </div>
--->
+</div>

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

@@ -1,4 +1,3 @@
-<div tasks-table  details-state="content-hosts.details.tasks.details"
-              known-context="contentHost,organization"
-              resource-type="Host::Managed"
-              resource-id="{{ host.id }}"/>
+<div tasks-table details-state="content-host.tasks.details" known-context="contentHost,organization"
+     resource-type="Host::Managed" resource-id="{{ host.id }}">
+</div>

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

@@ -1,24 +1,55 @@
-<span page-title>{{ 'Content Hosts' | translate }}</span>
-
-<div data-extend-template="layouts/nutupane.html">
+<div data-extend-template="layouts/table-with-header.html">
 
   <div data-block="header">
-    {{ 'Content Hosts' | translate }}
+    <h2 translate>Content Hosts</h2>
   </div>
 
-  <div data-block="actions">
+  <div data-block="list-actions">
     <button class="btn btn-default"
-            ng-disabled="table.numSelected === 0"
-            ng-show="permitted('edit_hosts') || permitted('destroy_hosts')"
-            ui-sref="content-hosts.bulk-actions.host-collections">
-      <span translate>Bulk Actions</span>
-    </button>
-
-    <button class="btn btn-primary"
+            type="button"
             ng-show="permitted('create_hosts')"
             ui-sref="content-hosts.register">
       <span translate>Register Content Host</span>
     </button>
+
+    <div class="btn-group" uib-dropdown keyboard-nav>
+      <button type="button" class="btn btn-default" uib-dropdown-toggle>
+        <span translate>Select Action</span>
+      </button>
+
+      <button type="button" class="btn btn-default" uib-dropdown-toggle>
+        <span class="caret"></span>
+      </button>
+
+      <ul class="dropdown-menu dropdown-menu-right" uib-dropdown-menu role="menu" aria-labelledby="split-button">
+        <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openHostCollectionsModal()" disable-link="table.numSelected === 0" translate>Change Host Collections</a>
+        </li>
+
+        <li bst-feature-flag="remote_actions" role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openPackagesModal()" disable-link="table.numSelected === 0" translate>Manage Packages</a>
+        </li>
+
+        <li bst-feature-flag="remote_actions" role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openErrataModal()" disable-link="table.numSelected === 0" translate>Manage Errata</a>
+        </li>
+
+        <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openEnvironmentModal()" disable-link="table.numSelected === 0" translate>Change Lifecycle Environment</a>
+        </li>
+
+        <li role="menuitem" ng-show="permitted('edit_hosts')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openSubscriptionsModal()" disable-link="table.numSelected === 0" translate>Manage Subscriptions</a>
+        </li>
+
+        <li class="divider"></li>
+
+        <li role="menuitem" ng-show="permitted('destroy_hosts')" ng-class="{disabled: table.numSelected === 0}">
+          <a ng-click="openModal()" disable-link="table.numSelected === 0" translate>Remove Hosts</a>
+          <span bst-modal="performDestroyHosts()" template-url="content-hosts/bulk/views/content-hosts-bulk-destroy-modal.html"></span>
+        </li>
+      </ul>
+    </div>
   </div>
 
   <span data-block="no-rows-message" translate>
@@ -28,5 +59,68 @@
   <span data-block="no-search-results-message" translate>
     Your search returned zero Content Hosts.
   </span>
-  
+
+  <div data-block="table">
+    <table class="table table-striped table-bordered"
+           ng-class="{'table-mask': table.working}"
+           ng-show="table.rows.length > 0">
+      <thead>
+        <tr bst-table-head row-select>
+          <th bst-table-column="name" sortable><span translate>Name</span></th>
+          <th bst-table-column="subscription_status" sortable>
+            {{ "Subscription Status" | translate }}
+          </th>
+          <th bst-table-column="status">
+            <span translate>Installable Updates</span>
+          </th>
+          <th bst-table-column="os" sortable><span translate>OS</span></th>
+          <th bst-table-column="lifecycle_environment" sortable><span sortable translate>Environment</span></th>
+          <th bst-table-column="content_view" sortable><span translate>Content View</span></th>
+          <th bst-table-column="registered_at" sortable><span translate>Registered</span></th>
+          <th bst-table-column="last_checkin" sortable><span translate>Last Checkin</span></th>
+        </tr>
+      </thead>
+
+      <div data-extend-template="layouts/select-all-results.html"></div>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="host in table.rows" row-select="host"
+            ng-controller="ContentHostStatusController">
+          <td bst-table-cell>
+            <a ui-sref="content-host.info({hostId: host.id})">
+              {{ host.name }}
+            </a>
+          </td>
+          <td bst-table-cell>
+          <span ng-class="table.getHostStatusIcon(host.subscription_global_status)">
+          </span>
+          </td>
+          <td>
+            <a ui-sref="content-host.errata.index({hostId: host.id})">
+              <span class="aligned-errata-count" errata-counts="host.content_facet_attributes.errata_counts"></span>
+            </a>
+
+            <a ui-sref="content-host.packages.applicable({hostId: host.id})">
+            <span class="aligned-errata-count">
+              <span class="errata-count">
+                <span>
+                  {{ host.content_facet_attributes.upgradable_package_count || 0 }}
+                </span>
+                <i class="fa fa-cube inline-icon"
+                   ng-class="{black: host.content_facet_attributes.upgradable_package_count === 0,
+                              green: host.content_facet_attributes.upgradable_package_count > 0}"
+                   title="{{ 'Package Updates' | translate }}"></i>
+              </span>
+            </span>
+            </a>
+          </td>
+          <td bst-table-cell>{{ host.operatingsystem_name }}</td>
+          <td bst-table-cell>{{ host.content_facet_attributes.lifecycle_environment.name }}</td>
+          <td bst-table-cell>{{ host.content_facet_attributes.content_view.name || "" }}</td>
+          <td bst-table-cell>{{ (host.subscription_facet_attributes.registered_at | date:'short') || ("Never registered" | translate) }}</td>
+          <td bst-table-cell>{{ (host.subscription_facet_attributes.last_checkin | date:'short') || ("Never checked in" | translate) }}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>