katello 3.3.2 → 3.4.0.rc1

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

@@ -36,8 +36,23 @@
     </textarea>
   </div>
 
+  <div class="checkbox">
+    <label translate>
+      <input id="forceMetadataRegeneration"
+             name="forceMetadataRegeneration"
+             ng-model="forceMetadataRegeneration"
+             type="checkbox"/>
+      Force Yum Metadata Regeneration
+    </label>
+    <i class="fa fa-question-circle"
+       uib-tooltip="{{ 'Forces metadata regeneration on yum repos even if the contents of the repo have not changed' | translate }}"
+       tooltip-animation="false"
+       tooltip-append-to-body="true">
+    </i>
+  </div>
+
   <div>
-    <button class="btn btn-primary btn-lg" ng-disabled="promoting || !selectedEnvironment" ng-click="verifySelection()" translate>
+    <button type="button" class="btn btn-primary btn-lg" ng-disabled="promoting || !selectedEnvironment" ng-click="verifySelection()" translate>
       Promote Version
     </button>
 
@@ -48,7 +63,11 @@
     <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>
+      <span data-block="modal-confirm-button">
+        <button class="btn btn-primary" ng-click="ok()">
+          <span translate>Promote</span>
+        </button>
+      </span>
     </div>
   </div>
 

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

@@ -11,24 +11,42 @@
   <h3 translate>Version Details</h3>
 </header>
 
-<form name="versionForm" class="col-sm-5" role="form" novalidate>
+<div class="row">
+  <div class="col-sm-5">
+    <form name="versionForm" role="form" novalidate>
 
-  <div bst-form-group label="{{ 'Version' | translate }}">
-    <span>{{ contentView['next_version'] }}</span>
-  </div>
+      <div bst-form-group label="{{ 'Version' | translate }}">
+        <span>{{ contentView['next_version'] }}</span>
+      </div>
 
-  <div bst-form-group label="{{ 'Description' | translate }}">
+      <div bst-form-group label="{{ 'Description' | translate }}">
     <textarea id="description"
               name="description"
               ng-model="version.description"
               rows="10"
               tabindex="1">
     </textarea>
-  </div>
+      </div>
+
+      <div class="checkbox">
+        <label translate>
+          <input id="forceMetadataRegeneration"
+                 name="forceMetadataRegeneration"
+                 ng-model="version.forceMetadataRegeneration"
+                 type="checkbox"/>
+          Force Yum Metadata Regeneration
+        </label>
+        <i class="fa fa-question-circle"
+           uib-tooltip="{{ 'Forces metadata regeneration on yum repos even if the contents of the repo have not changed' | translate }}"
+           tooltip-animation="false"
+           tooltip-append-to-body="true"></i>
+      </div>
 
-  <div bst-form-buttons
-       on-cancel="transitionTo('content-view.versions', {contentViewId: contentView.id})"
-       on-save="publish(contentView)"
-       working="working">
+      <div bst-form-buttons
+           on-cancel="transitionTo('content-view.versions', {contentViewId: contentView.id})"
+           on-save="publish(contentView)"
+           working="working">
+      </div>
+    </form>
   </div>
-</form>
+</div>

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

@@ -1,13 +1,11 @@
 <span page-title ng-model="contentView">{{ 'Repositories for Content View:' | translate }} {{ contentView.name }}</span>
 
-<header data-block="sub-header">
-  <h3 translate>
-    Repository Selection
-  </h3>
-</header>
+<h3 translate>
+  Repository Selection
+</h3>
 
 <nav>
-  <ul class="nav nav-tabs" ng-show="permitted('edit_content_views', contentView)">
+  <ul class="nav nav-tabs nav-tabs-pf" ng-show="permitted('edit_content_views', contentView)">
     <li ng-class="{active: isState('content-view.repositories.yum.list')}">
       <a ui-sref="content-view.repositories.yum.list">
         <span translate>
@@ -26,13 +24,13 @@
 
 <div data-extend-template="layouts/partials/table.html">
   <div data-block="list-actions">
-    <button class="btn btn-primary"
+    <button type="button" class="btn btn-primary"
             ng-disabled="table.numSelected === 0"
             ng-show="isState('content-view.repositories.yum.list') && permitted('edit_content_views', contentView)"
             ng-click="removeRepositories(contentView)">
       <span translate>Remove Repositories</span>
     </button>
-    <button class="btn btn-primary"
+    <button type="button" class="btn btn-primary"
             ng-disabled="table.numSelected === 0"
             ng-show="isState('content-view.repositories.yum.available') && permitted('edit_content_views', contentView)"
             ng-click="addRepositories(contentView)">
@@ -66,7 +64,7 @@
           row-select="repository"
           ng-repeat="repository in table.rows | filter:repositorySearch | filter:repositoryFilter as filteredItems">
         <td bst-table-cell>
-          <a ui-sref="products.details.repositories.info({productId: repository.product.id, repositoryId: repository.id})">
+          <a ui-sref="product.repository.info({productId: repository.product.id, repositoryId: repository.id})">
             {{ repository.name }}
           </a>
         </td>
@@ -95,7 +93,7 @@
             </a>
           </div>
           <div>
-            <a ui-sref="errata.index({repositoryId: repository.id})"
+            <a ui-sref="errata({repositoryId: repository.id})"
                ng-show="repository.content_type == 'yum'"
                translate>
               {{ repository.content_counts.erratum }} Errata

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

@@ -77,22 +77,40 @@
           </td>
           <td bst-table-cell class="preserve-newlines">{{ version.description }}</td>
           <td class="col-sm-2">
-            <button class="btn btn-default"
-              ng-click="$state.go('content-view.promotion', {contentViewId: contentView.id, versionId: version.id})"
-              ng-hide="denied('promote_or_remove_content_views', contentView)"
-              ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask">
-              <span translate>
-                Promote
-              </span>
-            </button>
-            <button class="btn btn-default"
-              ng-click="$state.go('content-view.version-deletion.environments', {contentViewId: contentView.id, versionId: version.id})"
-              ng-hide="denied('promote_or_remove_content_views', contentView)"
-              ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask">
-              <span translate>
-                Remove
-              </span>
-            </button>
+            <div class="btn-group">
+              <button type="button" class="btn btn-default"
+                ng-click="$state.go('content-view.promotion', {contentViewId: contentView.id, versionId: version.id})"
+                ng-hide="denied('promote_or_remove_content_views', contentView)"
+                ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask">
+                <span translate>
+                  Promote
+                </span>
+              </button>              <button type="button" class="btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <span class="caret"></span>
+                <span class="sr-only">Toggle Dropdown</span>
+              </button>
+              <ul class="dropdown-menu">
+                <li><a href="#">Promote</a></li>
+                <li>
+                  <a href="#"
+                     ng-click="regenerateRepositories(version)"
+                     ng-hide="denied('promote_or_remove_content_views', contentView)"
+                     ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask"
+                     translate>
+                     Regenerate Repository Metadata
+                  </a>
+                </li>
+                <li>
+                  <a href="#"
+                     ng-click="$state.go('content-view.version-deletion.environments', {contentViewId: contentView.id, versionId: version.id})"
+                     ng-hide="denied('promote_or_remove_content_views', contentView)"
+                     ng-disabled="taskInProgress(version) || taskFailed(version) || pendingVersionTask"
+                     translate>
+                      Remove
+                  </a>
+                </li>
+              </ul>
+            </div>
           </td>
         </tr>
       </tbody>

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

@@ -1,8 +1,8 @@
-<span page-title>{{ 'New Content View' | translate }}</span>
+<span page-title>{{ 'Create Content View' | translate }}</span>
 
 <section data-extend-template="layouts/details-page-with-breadcrumbs.html">
   <header data-block="header">
-    <h2 translate>New Content View</h2>
+    <h2 translate>Create Content View</h2>
   </header>
 
   <div class="row">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/content-view-version.factory.js

@@ -17,7 +17,8 @@ angular.module('Bastion.content-views.versions').factory('ContentViewVersion',
                 autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
                 update: {method: 'PUT'},
                 incrementalUpdate: {method: 'POST', params: {action: 'incremental_update'}},
-                promote: {method: 'POST', params: {action: 'promote'}}
+                promote: {method: 'POST', params: {action: 'promote'}},
+                republishRepositories: {method: 'PUT', params: {action: 'republish_repositories'}}
             }
         );
 

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

@@ -5,7 +5,7 @@
         <th bst-table-column="errataId" sortable>{{ "Errata ID" | translate }}</th>
         <th bst-table-column="title">{{ "Title" | translate }}</th>
         <th bst-table-column="type">{{ "Type" | translate }}</th>
-        <th bst-table-column="numberOfContentHosts">{{ "Affected Content Hosts" | translate }}</th>
+        <th bst-table-column="numberOfContentHosts">{{ "Applicable Content Hosts" | translate }}</th>
         <th bst-table-column="updated">{{ "Updated" | translate }}</th>
       </tr>
     </thead>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-ostree-branches.html

@@ -1,11 +1,6 @@
 <div data-extend-template="layouts/partials/table.html">
-  <div data-block="filters">
-    <div class="row">
-      <div class="form-group col-sm-4">
-        <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories">
-        </select>
-      </div>
-    </div>
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
   </div>
 
   <table data-block="table" class="table table-striped table-bordered">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/versions/views/content-view-version-package-groups.html

@@ -1,11 +1,6 @@
 <div data-extend-template="layouts/partials/table.html">
-  <div data-block="filters">
-    <div class="row">
-      <div class="form-group col-sm-4">
-        <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories">
-        </select>
-      </div>
-    </div>
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
   </div>
 
   <table data-block="table" class="table table-striped table-bordered">

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

@@ -1,11 +1,6 @@
 <div data-extend-template="layouts/partials/table.html">
-  <div data-block="filters">
-    <div class="row">
-      <div class="form-group col-sm-4">
-        <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories">
-        </select>
-      </div>
-    </div>
+  <div data-block="search-filter">
+    <select class="form-control" ng-model="repository" ng-options="repository.name for (id, repository) in repositories"></select>
   </div>
 
   <table data-block="table" class="table table-striped table-bordered">

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

@@ -10,7 +10,7 @@
     <tbody>
       <tr bst-table-row ng-repeat="puppetModule in table.rows">
         <td bst-table-cell>
-          <a ui-sref="puppet-modules.details.info({puppetModuleId: puppetModule.id})">{{ puppetModule.name }}-{{ puppetModule.version }}</a>
+          <a ui-sref="puppet-module.info({puppetModuleId: puppetModule.id})">{{ puppetModule.name }}-{{ puppetModule.version }}</a>
         </td>
         <td bst-table-cell>{{ puppetModule.author }}</td>
       </tr>

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

@@ -4,6 +4,7 @@
       <tr bst-table-head>
         <th bst-table-column translate>Name</th>
         <th bst-table-column translate>Product</th>
+        <th bst-table-column translate>Content</th>
       </tr>
     </thead>
 
@@ -11,6 +12,18 @@
       <tr bst-table-row ng-repeat="repository in table.rows">
         <td bst-table-cell>{{ repository.name }}</td>
         <td bst-table-cell>{{ repository.product.name }}</td>
+        <td bst-table-cell>
+          <div>
+            <a ui-sref="products.repository.manage-content.packages({productId: repository.product.id, repositoryId: repository.id})" translate>
+              {{ repository.content_counts.rpm }} Packages
+            </a>
+          </div>
+          <div>
+            <a ui-sref="errata({repositoryId: repository.id})" translate>
+              {{ repository.content_counts.erratum }} Errata
+            </a>
+          </div>
+        </td>
       </tr>
     </tbody>
   </table>

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

@@ -50,7 +50,8 @@
       </a>
     </li>
 
-    <li ng-class="{active: isState('content-view.version.file')}">
+    <li ng-class="{active: isState('content-view.version.file')}"
+        ng-show="version.file_count !== 0">
       <a ui-sref="content-view.version.file({versionId: version.id})">
         <span translate>File Repositories</span>
       </a>

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

@@ -7,7 +7,7 @@
   </div>
 
   <div data-block="list-actions">
-    <a class="btn btn-default" ui-sref="content-views.new" ng-hide="denied('create_content_views')"><i class="fa fa-plus"></i>
+    <a class="btn btn-primary" ui-sref="content-views.new" ng-hide="denied('create_content_views')"><i class="pficon pficon-add-circle-o"></i>
       <span translate>Create New View</span>
     </a>
   </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/docker-tag-details.controller.js

@@ -45,6 +45,7 @@ angular.module('Bastion.docker-tags').controller('DockerTagDetailsController',
                 'ids[]': _.map($scope.tag['related_tags'], 'uuid')
             };
             var nutupane = new Nutupane(DockerTag, params);
+            $scope.controllerName = 'katello_docker_tags';
             $scope.table = nutupane.table;
             $scope.panel.loading = false;
             nutupane.refresh();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/details/views/docker-tag-environments.html

@@ -39,7 +39,7 @@
         <tr bst-table-row
             ng-repeat="tag in table.rows | filter:dockerTagFilter">
           <td bst-table-cell>
-            <a ui-sref="environments.environment.details({environmentId: tag.environment.id})">
+            <a ui-sref="environment.details({environmentId: tag.environment.id})">
               {{ tag.environment.name }}
             </a>
           </td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.controller.js

@@ -25,8 +25,8 @@ angular.module('Bastion.docker-tags').controller('DockerTagsController',
         };
 
         var nutupane = new Nutupane(DockerTag, params);
-        $scope.table = nutupane.table;
         $scope.controllerName = 'katello_docker_tags';
+        $scope.table = nutupane.table;
 
         $scope.table.closeItem = function () {
             $scope.transitionTo('docker-tags');

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-tags/docker-tags.factory.js

@@ -13,7 +13,13 @@ angular.module('Bastion.docker-tags').factory('DockerTag',
         return BastionResource('/katello/api/v2/docker_tags/:id/',
             {id: '@id'},
             {
-                autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
+                autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}},
+                'autocompleteName': {method: 'GET', isArray: false, params: {id: 'auto_complete_name'},
+                    transformResponse: function (data) {
+                        data = angular.fromJson(data);
+                        return {results: data};
+                    }
+                }
             }
         );
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/environment-content.controller.js

@@ -73,7 +73,7 @@
         nutupane.masterOnly = true;
 
         $scope.nutupane = nutupane;
-        $scope.detailsTable = nutupane.table;
+        $scope.table = nutupane.table;
 
         $scope.contentView = {id: 'all', name: translate('All Content Views')};
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/environment.controller.js

@@ -49,7 +49,7 @@
 
             function success() {
                 $scope.successMessages.push(translate('Remove Successful.'));
-                $scope.transitionTo('environments.index');
+                $scope.transitionTo('environments');
             }
 
             function error(response) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-content-views.html

@@ -1,8 +1,4 @@
-<div data-extend-template="layouts/details-nutupane.html">
-
-  <div data-block="header"></div>
-  <div data-block="selection-summary"></div>
-
+<div data-extend-template="layouts/partials/table.html">
   <span data-block="no-rows-message" translate>
     There are no Content Views that match the criteria.
   </span>
@@ -11,7 +7,6 @@
     Your search returned zero Content Views.
   </span>
 
-
   <table data-block="table" class="table table-striped table-bordered">
     <thead>
       <tr bst-table-head>
@@ -23,7 +18,7 @@
     </thead>
 
     <tbody>
-      <tr bst-table-row ng-repeat="contentView in detailsTable.rows">
+      <tr bst-table-row ng-repeat="contentView in table.rows">
         <td bst-table-cell>
           <a ui-sref="content-view.versions({contentViewId: contentView.id})">
             {{ contentView.name }}
@@ -38,5 +33,4 @@
       </tr>
     </tbody>
   </table>
-
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-details.html

@@ -1,26 +1,22 @@
-<div class="details">
+<div data-extend-template="layouts/two-column-details.html">
+  <div data-block="left-column">
+    <h4 translate>Basic Information</h4>
 
-  <div class="detail">
-    <span class="info-label" translate>Name</span>
-      <span class="info-value"
-            bst-edit-text="environment.name"
-            on-save="save(environment)"
-            readonly="denied('edit_lifecycle_environments', environment) || environment.library">
-      </span>
-  </div>
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Name</dt>
+      <dd bst-edit-text="environment.name"
+          on-save="save(environment)"
+          readonly="denied('edit_lifecycle_environments', environment) || environment.library">
+      </dd>
 
-  <div class="detail">
-    <span class="info-label" translate>Label</span>
-    <span class="info-value">{{ environment.label }}</span>
-  </div>
+      <dt translate>Label</dt>
+      <dd>{{ environment.label }}</dd>
 
-  <div class="detail">
-    <span class="info-label" translate>Description</span>
-    <span class="info-value"
-          bst-edit-textarea="environment.description"
+      <dt translate>Description</dt>
+      <dd bst-edit-textarea="environment.description"
           on-save="save(environment)"
           readonly="denied('edit_lifecycle_environments', environment) || environment.library">
-     </span>
+      </dd>
+    </dl>
   </div>
-
 </div>