katello 3.2.1.1 → 3.3.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/histories/content-view-history.controller.js

@@ -36,6 +36,8 @@ angular.module('Bastion.content-views').controller('ContentViewHistoryController
                 message = translate("Published new version");
             } else if (taskType === taskTypes.export) {
                 message = translate("Exported content view");
+            } else if (taskType === taskTypes.incrementalUpdate) {
+                message = translate("Incremental update");
             }
 
             return message;

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

@@ -24,7 +24,7 @@
        <tr bst-table-row ng-repeat="history in detailsTable.rows">
          <td bst-table-cell>{{ history.created_at | date:'short' }}</td>
          <td bst-table-cell>{{ history.version }} </td>
-         <td bst-table-cell>{{ history.description }} </td>
+         <td bst-table-cell class="preserve-newlines">{{ history.description }}</td>
          <td bst-table-cell>{{ actionText(history) }}</td>
          <td bst-table-cell>{{ history.user }}</td>
          <td bst-table-cell>{{ history.task.result }}</td>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/puppet-modules/views/content-view-puppet-module-names.html

@@ -29,8 +29,7 @@
            ng-model="detailsTable.searchTerm"
            bst-on-enter="detailsTable.search(detailsTable.searchTerm)"
            ng-trim="false"
-           typeahead="item.label for item in detailsTable.fetchAutocomplete($viewValue)"
-           typeahead-empty
+           uib-typeahead="item.label for item in detailsTable.fetchAutocomplete($viewValue)"
            typeahead-template-url="components/views/autocomplete-scoped-search.html"/>
     <span class="input-group-btn">
       <button ng-click="detailsTable.search(detailsTable.searchTerm)" class="btn btn-default" type="button"><i class="fa fa-search"></i></button>
@@ -41,7 +40,7 @@
   <span data-block="selection-summary"></span>
   <span data-block="no-rows-message" translate>No puppet modules found</span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Puppet Modules.
   </span>
 

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

@@ -18,7 +18,7 @@
     You currently don't have any Puppet Modules included in this Content View, you can add Puppet Modules using the button on the right.
   </span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Puppet Modules.
   </span>
 

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

@@ -81,20 +81,20 @@
               </a>
             </li>
 
-            <li ng-class="{active: stateIncludes('content-views.details.composite-content-views')}" ng-show="contentView.composite">
-              <a ui-sref="content-views.details.composite-content-views.list" translate>
+            <li ng-class="{active: stateIncludes('content-views.details.components.composite-content-views')}" ng-show="contentView.composite">
+              <a ui-sref="content-views.details.components.composite-content-views.list" translate>
                 Content Views
               </a>
             </li>
 
-            <li class="dropdown"
+            <li uib-dropdown
                 ng-class="{active: stateIncludes('content-views.details.repositories.yum') || stateIncludes('content-views.details.filters')}"
                 ng-hide="contentView.composite">
-              <a class="dropdown-toggle">
+              <a uib-dropdown-toggle>
                 <span translate>Yum Content</span>
                 <i class="fa fa-chevron-down"></i>
               </a>
-              <ul class="dropdown-menu">
+              <ul uib-dropdown-menu>
                 <li>
                   <a ui-sref="content-views.details.repositories.yum.list" translate>
                     Repositories

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

@@ -69,7 +69,7 @@
       </p>
       <p bst-alert="info" ng-show="isState('content-views.details.repositories.docker.available')">
         <span translate>There are currently no repositories to add to this Content View,</span>
-        <a ui-sref="products.index" translate>add some repositories.</a>
+        <a ui-sref="products" translate>add some repositories.</a>
       </p>
     </div>
 
@@ -94,12 +94,15 @@
             row-select="repository"
             ng-repeat="repository in repositoriesTable.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>
           <td bst-table-cell>{{ repository.product.name }}</td>
           <td bst-table-cell>
+            <span ng-show="repository.url && repository.last_sync == null" translate>
+              Not Synced
+            </span>
             <span ng-show="repository.url">
               {{ repository.last_sync.ended_at | date:"short" }}
             </span>
@@ -112,12 +115,12 @@
             <span ng-hide="repository.url" translate>N/A</span>
           </td>
           <td bst-table-cell>
-            <div ng-if="repository.content_counts.docker_manifest && repository.content_counts.docker_manifest > 0">
+            <div>
               <span translate>
                 {{ repository.content_counts.docker_manifest }} Docker Manifests
               </span>
             </div>
-            <div ng-if="repository.content_counts.docker_tag && repository.content_counts.docker_tag > 0">
+            <div>
               <span translate>
                 {{ repository.content_counts.docker_tag }} Docker Tags
               </span>

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

@@ -99,6 +99,9 @@
           </td>
           <td bst-table-cell>{{ repository.product.name }}</td>
           <td bst-table-cell>
+            <span ng-show="repository.url && repository.last_sync == null" translate>
+              Not Synced
+            </span>
             <span ng-show="repository.url">
               {{ repository.last_sync.ended_at | date:"short" }}
             </span>

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

@@ -31,4 +31,18 @@
     <span class="info-value" ng-hide="contentView.composite" translate>No</span>
   </div>
 
+  <div class="detail">
+    <span class="info-label" translate>
+      Force Puppet Environment
+    </span>
+    <span class="info-value"
+          bst-edit-checkbox="contentView.force_puppet_environment"
+          formatter="booleanToYesNo"
+          on-save="save(contentView)"
+          readonly="denied('edit_content_views', contentView)">
+    </span>
+  </div>
+  <h6 translate>
+    With this option selected, a puppet environment will be created during publish and promote even if no puppet modules have been added to the Content View
+  </h6>
 </div>

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

@@ -69,7 +69,7 @@
       </p>
       <p bst-alert="info" ng-show="isState('content-views.details.repositories.ostree.available')">
         <span translate>There are currently no repositories to add to this Content View,</span>
-        <a ui-sref="products.index" translate>add some repositories.</a>
+        <a ui-sref="products" translate>add some repositories.</a>
       </p>
     </div>
 
@@ -93,12 +93,15 @@
             row-select="repository"
             ng-repeat="repository in repositoriesTable.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>
           <td bst-table-cell>{{ repository.product.name }}</td>
           <td bst-table-cell>
+            <span ng-show="repository.url && repository.last_sync == null" translate>
+              Not Synced
+            </span>
             <span ng-show="repository.url">
               {{ repository.last_sync.ended_at | date:"short" }}
             </span>

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

@@ -31,6 +31,17 @@
        ng-show="working">
   </div>
 
+  <label translate>Description</label>
+  <div>
+    <textarea id="description"
+      name="description"
+      ng-model="description"
+      rows="10"
+      cols="80"
+      tabindex="1">
+    </textarea>
+  </div>
+
   <div>
     <button class="btn btn-primary btn-lg" ng-disabled="promoting || !selectedEnvironment" ng-click="verifySelection()" translate>
       Promote Version

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

@@ -13,7 +13,7 @@
     <h3 translate>Version Details</h3>
   </header>
 
-  <form name="versionForm" class="form-horizontal" role="form" novalidate>
+  <form name="versionForm" class="col-sm-5" role="form" novalidate>
 
     <div bst-form-group label="{{ 'Version' | translate }}">
       <span>{{ contentView['next_version'] }}</span>

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

@@ -69,7 +69,7 @@
       </p>
       <p bst-alert="info" ng-show="isState('content-views.details.repositories.yum.available')">
         <span translate>There are currently no repositories to add to this Content View,</span>
-        <a ui-sref="products.index" translate>add some repositories.</a>
+        <a ui-sref="products" translate>add some repositories.</a>
       </p>
     </div>
 
@@ -94,12 +94,15 @@
             row-select="repository"
             ng-repeat="repository in repositoriesTable.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>
           <td bst-table-cell>{{ repository.product.name }}</td>
           <td bst-table-cell>
+            <span ng-show="repository.url && repository.last_sync == null" translate>
+              Not Synced
+            </span>
             <span ng-show="repository.url">
               {{ repository.last_sync.ended_at | date:"short" }}
             </span>
@@ -112,14 +115,14 @@
             <span ng-hide="repository.url" translate>N/A</span>
           </td>
           <td bst-table-cell>
-            <div ng-if="repository.content_counts.rpm && repository.content_counts.rpm > 0">
-              <a ui-sref="products.details.repositories.manage-content.packages({productId: repository.product.id, repositoryId: repository.id})"
+            <div>
+              <a ui-sref="product.repository.manage-content.packages({productId: repository.product.id, repositoryId: repository.id})"
                  ng-show="repository.content_type == 'yum'"
                  translate>
                 {{ repository.content_counts.rpm }} Packages
               </a>
             </div>
-            <div ng-if="repository.content_counts.erratum && repository.content_counts.erratum > 0">
+            <div>
               <a ui-sref="errata.index({repositoryId: repository.id})"
                  ng-show="repository.content_type == 'yum'"
                  translate>

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

@@ -7,7 +7,7 @@
     This Content View does not have any versions, create your first Content View Version by using the "Publish New Version" button on the right.
   </span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Content View.
   </span>
 
@@ -35,7 +35,7 @@
 
             <div ng-class="{ active: taskInProgress(version) }"
               class="progress progress-striped">
-              <span progressbar animate="false" value="version.task.progressbar.value" type="{{version.task.progressbar.type}}"></span>
+              <span uib-progressbar animate="false" value="version.task.progressbar.value" type="{{version.task.progressbar.type}}"></span>
             </div>
 
             {{ status(version) }}
@@ -77,11 +77,7 @@
             {{ version.file_count }} Files
           </div>
         </td>
-        <td bst-table-cell>
-          <div>
-            {{ version.description }}
-          </div>
-        </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-views.details.promotion', {contentViewId: contentView.id, versionId: version.id})"

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

@@ -17,7 +17,7 @@ angular.module('Bastion.content-views').controller('NewContentViewController',
             var successState = 'content-views.details.repositories.yum.available';
 
             if (response.composite) {
-                successState = 'content-views.details.composite-content-views.available';
+                successState = 'content-views.details.components.composite-content-views.available';
             }
 
             $scope.$parent.table.addRow(response);

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

@@ -37,7 +37,7 @@
   <div class="row">
     <h3 class="col-sm-12" translate>View Details</h3>
 
-    <form name="contentViewForm" class="form-horizontal col-sm-8" novalidate role="form">
+    <form name="contentViewForm" class="col-sm-5" novalidate role="form">
       <div bst-form-group label="{{ 'Name' | translate }}">
         <input id="name"
                name="name"

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

@@ -17,7 +17,7 @@
     You currently don't have any Content Views.  A Content View can be added by using the button on the right.
   </span>
 
-  <span data-block="no-search-results-message">
+  <span data-block="no-search-results-message" translate>
     Your search returned zero Content Views.
   </span>
 

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

@@ -1,6 +1,6 @@
 /**
  * @ngdoc object
- * @name  Bastion.docker-tags.controller:DockerTagsDetailsController
+ * @name  Bastion.docker-tags.controller:DockerTagDetailsController
  *
  * @requires $scope
  * @requires $location
@@ -11,7 +11,7 @@
  * @description
  *   Provides the functionality for the docker tags details action pane.
  */
-angular.module('Bastion.docker-tags').controller('DockerTagsDetailsController',
+angular.module('Bastion.docker-tags').controller('DockerTagDetailsController',
     ['$scope', '$location', 'Nutupane', 'DockerTag', 'CurrentOrganization', 'ApiErrorHandler',
     function ($scope, $location, Nutupane, DockerTag, CurrentOrganization, ApiErrorHandler) {
         $scope.successMessages = [];
@@ -22,6 +22,8 @@ angular.module('Bastion.docker-tags').controller('DockerTagsDetailsController',
             loading: true
         };
 
+        $scope.table = {};
+
         if ($scope.tag) {
             $scope.panel.loading = false;
         }
@@ -40,7 +42,7 @@ angular.module('Bastion.docker-tags').controller('DockerTagsDetailsController',
                 'sort_by': 'name',
                 'sort_order': 'ASC',
                 'paged': false,
-                'ids[]': _.pluck($scope.tag['related_tags'], 'id')
+                'ids[]': _.map($scope.tag['related_tags'], 'id')
             };
             var nutupane = new Nutupane(DockerTag, params);
             $scope.table = nutupane.table;

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

@@ -0,0 +1,32 @@
+<span page-title ng-model="tag">{{ 'Details for Docker Tag:' | translate }} {{ tag.full_name }}</span>
+
+<div data-extend-template="layouts/details-page-with-breadcrumbs.html">
+  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+
+  <header data-block="header">
+    <h2>{{ tag.full_name }}</h2>
+  </header>
+
+  <nav data-block="navigation">
+    <ul class="nav nav-tabs details-nav">
+      <li ng-class="{active: isState('docker-tag.info')}">
+        <a ui-sref="docker-tag.info">
+          <span translate>
+            Details
+          </span>
+        </a>
+      </li>
+      <li ng-class="{active: stateIncludes('docker-tag.environments')}">
+        <a ui-sref="docker-tag.environments">
+          <span translate>
+            Lifecycle Environments
+          </span>
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <div data-block="content">
+    <section ui-view></section>
+  </div>
+</div>

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

@@ -0,0 +1,50 @@
+
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="search">
+    <div class="col-sm-6">
+      <form class="form-inline">
+        <div class="form-group">
+            <input type="text"
+                   class="form-control"
+                   placeholder="{{ 'Filter' | translate }}"
+                   ng-model="dockerTagFilter"/>
+
+        </div>
+      </form>
+    </div>
+  </div>
+
+  <div data-block="table">
+    <table bst-table="table"
+           class="table table-striped"
+           ng-class="{'table-mask': table.working}"
+           ng-show="table.rows.length > 0">
+      <thead>
+        <tr bst-table-head>
+          <th bst-table-column="environment" translate>Environment</th>
+          <th bst-table-column="version" translate>Content View Version</th>
+          <th bst-table-column="path" translate>Published At</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <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})">
+              {{ tag.environment.name }}
+            </a>
+          </td>
+          <td bst-table-cell>
+            <a ui-sref="content-views.details.version.docker({contentViewId: tag.content_view_version.content_view_id, versionId: tag.content_view_version.id})">
+              {{ tag.content_view_version.name }}
+            </a>
+          </td>
+          <td bst-table-cell>
+            {{ tag.repository.full_path }}:{{ tag.name }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

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

@@ -0,0 +1,42 @@
+<div data-extend-template="layouts/two-column-details.html">
+  <div data-block="left-column">
+    <h4 translate>Basic Information</h4>
+
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Product</dt>
+      <dd>
+        <a ui-sref="products.details.info({productId: tag.product.id})">
+          {{ tag.product.name }}
+        </a>
+      </dd>
+
+      <dt translate>Repository</dt>
+      <dd>
+        <a ui-sref="products.details.repositories.manage-content.docker-manifests({productId: tag.product.id, repositoryId: tag.repository.id})">
+          {{ tag.repository.name }}
+        </a>
+      </dd>
+    </dl>
+  </div>
+
+  <div data-block="right-column">
+    <h4 translate>Docker Manifest</h4>
+
+    <dl class="dl-horizontal dl-horizontal-left">
+      <dt translate>Name</dt>
+      <dd>
+        {{ tag.manifest.name }}
+      </dd>
+
+      <dt translate>Digest</dt>
+      <dd>
+        {{ tag.manifest.digest }}
+      </dd>
+
+      <dt translate>Schema Version</dt>
+      <dd>
+        {{ tag.manifest.schema_version }}
+      </dd>
+    </dl>
+  </div>
+</div>