katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-add-subscriptions.html

@@ -3,7 +3,7 @@
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
     <div ng-hide="denied('edit_activation_keys', activationKey)">
-       <button class="btn btn-primary"
+       <button class="btn btn-primary" type="button"
                translate
                ng-disabled="disableAddButton()"
                ng-click="addSelected()">
@@ -21,56 +21,6 @@
   </span>
 
   <div data-block="table">
-    <table ng-class="{'table-mask': table.working}" class="table table-bordered">
-      <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 bst-table-row 
-            ng-repeat-end
-            class="grey-table-row"
-            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 getAmountSelectorValues(subscription)"
-                    >
-              <option value="">{{ "Automatic" | translate }}</option>
-            </select>
-          </td>
-          <td bst-table-cell>
-            <a href='/subscriptions/{{ subscription.id }}' class="confined-text">
-              {{ 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/activation-keys/details/views/activation-key-associations-content-hosts.html

@@ -28,7 +28,7 @@
         <tr bst-table-row ng-repeat="host in table.rows"
             ng-controller="ContentHostStatusController">
           <td bst-table-cell>
-            <a ui-sref="content-hosts.details.info({hostId: host.id})">
+            <a ui-sref="content-host.info({hostId: host.id})">
               {{ host.name }}
             </a>
           </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-details.html

@@ -7,8 +7,8 @@
 
   <div data-block="item-actions">
     <div class="btn-group" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
-      <button class="btn btn-default" ng-disabled="denied('create_activation_key')" ui-sref="activation-key.copy">
-        <span translate>Copy Activation Key</span>
+      <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>
@@ -58,7 +58,7 @@
       <li ng-class="{active: stateIncludes('activation-key.products')}">
         <a ui-sref="activation-key.products">
           <span translate>
-            Product Content
+            Repository Sets
           </span>
         </a>
       </li>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-host-collections-table.html

@@ -13,6 +13,7 @@
 
     <div data-block="list-actions">
       <button ng-if="isState('activation-key.host-collections.list')"
+              type="button"
               class="btn btn-default"
               ng-hide="denied('edit_activation_keys', activationKey)"
               ng-disabled="table.numSelected == 0 || table.working"
@@ -20,6 +21,7 @@
         {{ 'Remove Selected' | translate }}
       </button>
       <button ng-if="isState('activation-key.host-collections.add')"
+              type="button"
               class="btn btn-default"
               ng-hide="denied('edit_activation_keys', activationKey)"
               ng-disabled="table.numSelected == 0 || table.working"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-host-collections.html

@@ -1,7 +1,7 @@
 <span page-title ng-model="activationKey">{{ 'Host Collections for:' | translate }} {{ activationKey.name }}</span>
 
 <nav>
-  <ul class="nav nav-tabs" ng-show="permitted('edit_activation_keys', activationKey)">
+  <ul class="nav nav-tabs nav-tabs-pf" ng-show="permitted('edit_activation_keys', activationKey)">
     <li ng-class="{active: isState('activation-key.host-collections.list')}">
       <a ui-sref="activation-key.host-collections.list">
         <span translate>List/Remove</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-repository-sets.html

@@ -0,0 +1,85 @@
+<div bst-alert="info">
+  <span translate>Below are the Repository Sets currently available for this activation key through its subscriptions. For Red Hat subscriptions, additional content can be made available through the</span>
+  <a ng-href="/katello/providers/redhat_provider" translate>Red Hat Repositories page.</a>
+  <span translate>Changing default settings for content hosts that register with this activation key requires subscription-manager version 1.10 or newer to be installed on that host.</span>
+</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 translate>
+        Select Action
+      </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>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/details/views/activation-key-subscriptions-list.html

@@ -2,8 +2,8 @@
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
-    <button class="btn btn-primary"
-           translate
+    <button class="btn btn-primary" type="button"
+            translate
            ng-hide="denied('edit_activation_keys', activationKey)"
            ng-disabled="disableRemoveButton()"
            ng-click="removeSelected()">
@@ -20,42 +20,6 @@
   </span>
 
   <div data-block="table">
-    <table ng-class="{'table-mask': table.working}" class="table table-bordered">
-      <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 | subscriptionAttachAmountFilter }}</td>
-          <td bst-table-cell>
-            <a href='/subscriptions/{{ subscription.id }}' class="confined-text">
-              {{ 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/activation-keys/details/views/activation-key-subscriptions.html

@@ -21,7 +21,7 @@
 </section>
 
 <nav>
-  <ul class="nav nav-tabs" ng-show="permitted('edit_activation_keys', activationKey)">
+  <ul class="nav nav-tabs nav-tabs-pf" ng-show="permitted('edit_activation_keys', activationKey)">
     <li ng-class="{active: isState('activation-key.subscriptions.list')}">
       <a ui-sref="activation-key.subscriptions.list">
         <!-- TODO: other pages too - label "List" vs. "List/Remove" based on edit permissions -->

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/new/views/activation-key-new.html

@@ -17,22 +17,22 @@
                required/>
       </div>
 
-      <div bst-form-group label="{{ 'Host Limit' | translate }}" field="max_hosts">
-        <span translate>Unlimited Hosts:</span>
-        <input type="checkbox"
-               name="limit"
-               ng-model="activationKey.unlimited_hosts"/>
+      <div class="checkbox">
+        <label>
+          <input type="checkbox" name="limit" ng-model="activationKey.unlimited_hosts"/>
+          <span translate>Unlimited Hosts</span>
+        </label>
+      </div>
 
-        <div bst-form-group label="{{ 'Limit' | translate }}" ng-hide="activationKey.unlimited_hosts">
-          <input id="max_hosts"
-                 name="max_hosts"
-                 class="form-control"
-                 ng-model="activationKey.max_hosts"
-                 ng-required="!activationKey.unlimited_hosts"
-                 type="number"
-                 min="1"
-                 max="2147483648"/>
-        </div>
+      <div bst-form-group label="{{ 'Limit' | translate }}" field="max_hosts" ng-hide="activationKey.unlimited_hosts">
+        <input id="max_hosts"
+               name="max_hosts"
+               class="form-control"
+               ng-model="activationKey.max_hosts"
+               ng-required="!activationKey.unlimited_hosts"
+               type="number"
+               min="1"
+               max="2147483648"/>
       </div>
 
       <div bst-form-group label="{{ 'Description' | translate }}">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/activation-keys/views/activation-keys.html

@@ -7,9 +7,9 @@
   </div>
 
   <div data-block="list-actions">
-    <button class="btn btn-default" ui-sref="activation-keys.new" ng-hide="denied('create_activation_keys')">
-      <i class="fa fa-plus"></i>
-      {{ "New Activation Key" | translate }}
+    <button type="button" class="btn btn-primary" ui-sref="activation-keys.new" ng-hide="denied('create_activation_keys')">
+      <i class="pficon pficon-add-circle-o"></i>
+      {{ "Create Activation Key" | translate }}
     </button>
   </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion-katello-bootstrap.js

@@ -5,6 +5,7 @@ BASTION_MODULES.push(
     'Bastion.content-views',
     'Bastion.content-views.versions',
     'Bastion.docker-tags',
+    'Bastion.files',
     'Bastion.ostree-branches',
     'Bastion.hosts',
     'Bastion.puppet-modules',

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/bastion_katello.js

@@ -25,6 +25,9 @@
 //= require "bastion_katello/docker-tags/docker-tags.module.js"
 //= require_tree "./docker-tags"
 
+//= require "bastion_katello/files/files.module"
+//= require_tree "./files"
+
 //= require "bastion_katello/ostree-branches/ostree-branches.module.js"
 //= require_tree "./ostree-branches"
 
@@ -58,6 +61,9 @@
 //= require "bastion_katello/products/products.module.js"
 //= require_tree "./products"
 
+//= require "bastion_katello/repository-sets/repository-sets.module.js"
+//= require_tree "./repository-sets"
+
 //= require "bastion_katello/sync-plans/sync-plans.module.js"
 //= require_tree "./sync-plans"
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/common/views/subscription-add-or-remove.html

@@ -0,0 +1,50 @@
+<table bst-table="table" ng-class="{'table-mask': table.working}"
+        class="table table-bordered">
+   <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" class="row-selector-label">
+       <td class="row-select"></td>
+       <td colspan="8">
+         <b>{{ name }}</b>
+       </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>
+         <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><div subscription-start-date="subscription"></div></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>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-hosts/bulk/{content-hosts-bulk-action-environment.controller.js → content-hosts-bulk-environment-modal.controller.js}

@@ -1,29 +1,32 @@
 /**
  * @ngdoc object
- * @name  Bastion.content-hosts.controller:ContentHostsBulkActionEnvironmentController
+ * @name  Bastion.content-hosts.controller:ContentHostsBulkEnvironmentModalController
  *
  * @requires $scope
+ * @requires $state
+ * @requires $uibModalInstance
  * @requires HostBulkAction
  * @requires Organization
  * @requires CurrentOrganization
  * @requires ContentView
+ * @requires GlobalNotification
+ * @requires hostIds
  *
  * @description
  *   A controller for providing bulk action functionality for setting content view and environment
  */
-angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionEnvironmentController',
-    ['$scope', '$state', 'HostBulkAction', 'Organization', 'CurrentOrganization', 'ContentView',
-    function ($scope, $state, HostBulkAction, Organization, CurrentOrganization, ContentView) {
+angular.module('Bastion.content-hosts').controller('ContentHostsBulkEnvironmentModalController',
+    ['$scope', '$state', '$uibModalInstance', 'HostBulkAction', 'Organization', 'CurrentOrganization', 'ContentView', 'GlobalNotification', 'hostIds',
+    function ($scope, $state, $uibModalInstance, HostBulkAction, Organization, CurrentOrganization, ContentView, GlobalNotification, hostIds) {
 
         function actionParams() {
-            var params = $scope.nutupane.getAllSelectedResults();
+            var params = hostIds;
             params['organization_id'] = CurrentOrganization;
             params['environment_id'] = $scope.selected.environment.id;
             params['content_view_id'] = $scope.selected.contentView.id;
             return params;
         }
 
-        $scope.setState(false, [], []);
         $scope.selected = {
             environment: undefined,
             contentView: undefined
@@ -32,7 +35,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionEnviro
         $scope.environments = Organization.readableEnvironments({id: CurrentOrganization});
 
         $scope.disableAssignButton = function (confirm) {
-            return confirm || $scope.table.numSelected === 0 || $scope.state.working ||
+            return confirm || hostIds === 0 ||
                 angular.isUndefined($scope.selected.environment) || angular.isUndefined($scope.selected.contentView);
         };
 
@@ -52,14 +55,22 @@ angular.module('Bastion.content-hosts').controller('ContentHostsBulkActionEnviro
         };
 
         $scope.performAction = function () {
-            $scope.setState(true, [], []);
-
             HostBulkAction.environmentContentView(actionParams(), function (task) {
-                $scope.setState(false, [], []);
-                $state.go('content-hosts.bulk-actions.task-details', {taskId: task.id});
-            }, function (data) {
-                $scope.setState(false, [], data.errors);
+                $scope.ok();
+                $state.go('content-hosts.bulk-task', {taskId: task.id});
+            }, function (response) {
+                angular.forEach(response.data.errors, function (error) {
+                    GlobalNotification.setErrorMessage(error);
+                });
             });
         };
+
+        $scope.ok = function () {
+            $uibModalInstance.close();
+        };
+
+        $scope.cancel = function () {
+            $uibModalInstance.dismiss('cancel');
+        };
     }]
 );