katello 3.1.0.1 → 3.2.0.rc1

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

@@ -92,7 +92,7 @@
       <tbody>
         <tr bst-table-row
             row-select="repository"
-            ng-repeat="repository in repositoriesTable.rows | filter:repositorySearch | filter:repositoryFilter | as:'filteredItems'">
+            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})">
               {{ repository.name }}

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

@@ -0,0 +1,118 @@
+<span page-title ng-model="contentView">{{ 'Repositories for Content View:' | translate }} {{ contentView.name }}</span>
+
+<div class="details details-full">
+
+  <h3 translate>
+    Repository Selection
+  </h3>
+
+  <nav>
+    <ul class="nav nav-tabs">
+      <li ng-class="{active: isState('content-views.details.repositories.file.list')}">
+        <a ui-sref="content-views.details.repositories.file.list">
+          <span translate>
+            List/Remove
+          </span>
+        </a>
+      </li>
+
+      <li ng-class="{active: isState('content-views.details.repositories.file.available')}" ng-show="!contentView.permissions.editable">
+        <a ui-sref="content-views.details.repositories.file.available" translate>
+          Add
+        </a>
+      </li>
+    </ul>
+  </nav>
+
+  <div class="details-header row">
+    <div class="col-sm-8">
+      <div class="input-group">
+
+        <span class="input-group-addon">
+          <select ng-model="product" ng-options="product.name for (id, product) in products">
+          </select>
+        </span>
+
+        <input type="text"
+               class="form-control filter-input"
+               placeholder="{{ 'Filter' | translate }}"
+               ng-model="repositorySearch"/>
+
+      </div>
+    </div>
+
+    <div class="col-sm-4">
+      <button class="btn btn-primary fr"
+              ng-disabled="repositoriesTable.numSelected === 0"
+              ng-show="isState('content-views.details.repositories.file.list') && permitted('edit_content_views', contentView)"
+              ng-click="removeRepositories(contentView)">
+        <i class="fa fa-trash-o"></i>
+        <span translate>Remove Repositories</span>
+      </button>
+      <button class="btn btn-primary fr"
+              ng-disabled="repositoriesTable.numSelected === 0"
+              ng-show="isState('content-views.details.repositories.file.available') && permitted('edit_content_views', contentView)"
+              ng-click="addRepositories(contentView)">
+        <i class="fa fa-plus"></i>
+        <span translate>Add Repositories</span>
+      </button>
+    </div>
+  </div>
+
+  <div bst-table="repositoriesTable" class="nutupane">
+
+    <div ng-show="repositoriesTable.rows.length === 0 && !repositoriesTable.working">
+      <p bst-alert="info" ng-show="isState('content-views.details.repositories.file.list')">
+        <span translate>
+          There are currently no repositories associated with this Content View, you can add some by clicking on the "Add" tab above.
+        </span>
+      </p>
+      <p bst-alert="info" ng-show="isState('content-views.details.repositories.file.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>
+      </p>
+    </div>
+
+    <div class="loading-mask loading-mask-panel" ng-show="repositoriesTable.working">
+      <i class="fa fa-spinner fa-spin"></i>
+      {{ "Loading..." | translate }}
+    </div>
+
+    <table ng-show="repositoriesTable.rows.length > 0"  class="table table-bordered table-striped">
+      <thead>
+        <tr bst-table-head row-select>
+          <th bst-table-column translate>Name</th>
+          <th bst-table-column translate>Product</th>
+          <th bst-table-column translate>Last Sync</th>
+          <th bst-table-column translate>Sync State</th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row
+            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})">
+              {{ repository.name }}
+            </a>
+          </td>
+          <td bst-table-cell>{{ repository.product.name }}</td>
+          <td bst-table-cell>
+            <span ng-show="repository.url">
+              {{ repository.last_sync.ended_at | date:"short" }}
+            </span>
+            <span ng-hide="repository.url" translate>N/A</span>
+          </td>
+          <td bst-table-cell>
+            <span ng-show="repository.url">
+              <a href="/foreman_tasks/tasks/{{repository.last_sync.id}}">{{ repository.last_sync.result | capitalize }}</a>
+            </span>
+            <span ng-hide="repository.url" translate>N/A</span>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+
+</div>

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

@@ -91,7 +91,7 @@
       <tbody>
         <tr bst-table-row
             row-select="repository"
-            ng-repeat="repository in repositoriesTable.rows | filter:repositorySearch | filter:repositoryFilter | as:'filteredItems'">
+            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})">
               {{ repository.name }}

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

@@ -92,7 +92,7 @@
       <tbody>
         <tr bst-table-row
             row-select="repository"
-            ng-repeat="repository in repositoriesTable.rows | filter:repositorySearch | filter:repositoryFilter | as:'filteredItems'">
+            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})">
               {{ repository.name }}

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

@@ -7,6 +7,10 @@
     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">
+    Your search returned zero Content View.
+  </span>
+
   <div data-block="table">
     <table class="table table-striped table-bordered" ng-show="detailsTable.rows.length > 0" bst-table="table">
       <thead>
@@ -26,13 +30,17 @@
           <a ui-sref="content-views.details.version.details({versionId: version.id})" >Version {{ version.version }}</a>
         </td>
         <td bst-table-cell >
-          <a ui-sref="content-views.details.history" ng-hide="hideProgress(version)">
+          <a ng-href="/foreman_tasks/tasks/{{ version.last_event.task.id }}"
+             ng-hide="hideProgress(version)">
+
             <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>
             </div>
+
             {{ status(version) }}
           </a>
+
           <span ng-show="hideProgress(version)">
             {{ historyText(version) }}
             ({{ version.last_event.created_at | date:'short' }})
@@ -65,9 +73,12 @@
           <div translate ng-if="version.ostree_branch_count && version.ostree_branch_count > 0">
             {{ version.ostree_branch_count }} OSTree Branches
           </div>
+          <div translate ng-if="version.file_count && version.file_count > 0">
+            {{ version.file_count }} Files
+          </div>
         </td>
         <td bst-table-cell>
-          <div class="ellipsis-column">
+          <div>
             {{ version.description }}
           </div>
         </td>

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

@@ -64,6 +64,14 @@
                 params: {
                     'composite_version_id': $scope.$stateParams.versionId
                 }
+            },
+            'file': {
+                type: Repository,
+                params: {
+                    'content_type': 'file',
+                    'content_view_version_id': $scope.$stateParams.versionId,
+                    library: true
+                }
             }
         };
 

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

@@ -9,6 +9,7 @@ angular.module('Bastion.content-views.versions', [
     'ngResource',
     'ui.router',
     'Bastion',
+    'Bastion.i18n',
     'Bastion.components',
     'Bastion.repositories',
     'Bastion.packages',

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

@@ -1,13 +1,15 @@
 <div class="details">
-
-  <div class="detail">
-    <span class="info-label" translate>Version</span>
-    <span class="info-value">{{ version.version }}</span>
-  </div>
-
   <div class="detail">
     <span class="info-label" translate>Description</span>
     <span class="info-value" bst-edit-textarea="version.description" readonly="true"></span>
   </div>
 
+  <div class="detail">
+    <span class="info-label" translate>Environments</span>
+    <span ng-repeat="environment in version.environments"  readonly="true">
+      <span class="info-value">
+        {{ environment.name }}<span ng-if="!$last">,</span>
+      </span>
+    </span>
+  </div>
 </div>

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

@@ -0,0 +1,22 @@
+<div data-extend-template="layouts/details-nutupane.html">
+
+  <div data-block="header"></div>
+  <div data-block="selection-summary"></div>
+
+  <table data-block="table" class="table table-striped table-bordered">
+    <thead>
+      <tr bst-table-head>
+        <th bst-table-column translate>Name</th>
+        <th bst-table-column translate>Product</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <tr bst-table-row ng-repeat="repository in detailsTable.rows">
+        <td bst-table-cell>{{ repository.name }}</td>
+        <td bst-table-cell>{{ repository.product.name }}</td>
+      </tr>
+    </tbody>
+  </table>
+
+</div>

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

@@ -1,10 +1,5 @@
 <span page-title ng-model="version">{{ 'Version:' | translate }} {{ version.version }}</span>
 
-<div class="loading-mask loading-mask-panel fa-3x" ng-show="version.id === undefined">
-    <i class="fa fa-spinner fa-spin"></i>
-    {{ "Loading..." | translate }}
-</div>
-
 <div class="details details-full" ng-show="version.id !== undefined">
 
   <ol class="breadcrumb">
@@ -17,17 +12,6 @@
     </li>
   </ol>
 
-  <h3 translate>
-    Version {{ version.version }}
-  </h3>
-
-  <h4>
-    <span translate>Environments: </span>
-    <span ng-repeat="environment in version.environments" ng-if="environment.permissions.readable">
-      {{ environment.name }} <span ng-if="!$last">,</span>
-    </span>
-  </h4>
-
   <nav class="details-navigation">
     <ul>
 
@@ -79,6 +63,12 @@
         </a>
       </li>
 
+      <li ng-class="{active: isState('content-views.details.version.file')}">
+        <a ui-sref="content-views.details.version.file({versionId: version.id})">
+          <span translate>File Repositories</span>
+        </a>
+      </li>
+
       <li ng-class="{active: isState('content-views.details.version.ostree-branches')}"
           ng-show="version.ostree_branch_count !== 0">
         <a ui-sref="content-views.details.version.ostree-branches({versionId: version.id})">

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

@@ -17,4 +17,8 @@
     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">
+    Your search returned zero Content Views.
+  </span>
+
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/docker-manifests/docker-manifests.module.js

@@ -9,6 +9,11 @@
      *   Module for Docker Manifest related functionality.
      */
     angular
-        .module('Bastion.docker-manifests', ['Bastion']);
+        .module('Bastion.docker-manifests', [
+            'ui.router',
+            'Bastion',
+            'Bastion.i18n',
+            'Bastion.components'
+        ]);
 
 })();

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

@@ -1,74 +1,72 @@
 <span page-title ng-model="tag">{{ 'Docker Tag: ' | translate }} {{ tag.full_name }}</span>
 
-<div class="loading-mask loading-mask-panel" ng-show="panel.loading">
-  <i class="fa fa-spinner fa-spin"></i>
-  {{ "Loading..." | translate }}
-</div>
-
+<div data-extend-template="layouts/panel.html">
+  <div data-block="panel">
+    <section class="nutupane-details" ng-cloak bst-container-scroll>
+      <div ng-show="panel.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
 
-<section class="nutupane-details" ng-cloak bst-container-scroll>
-  <div ng-show="panel.error" bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+      <div ng-hide="panel.error">
+        <header class="details-header">
+          <h2 class="fl">{{ tag.full_name }}</h2>
 
-  <div ng-hide="panel.error">
-    <header class="details-header">
-      <h2 class="fl">{{ tag.full_name }}</h2>
-
-      <div class="details-actions fr">
-        <button class="btn btn-default" ui-sref="docker-tags.index">
-          <i class="icon-remove"></i>
-          {{ "Close" | translate }}
-        </button>
-      </div>
-    </header>
+          <div class="details-actions fr">
+            <button class="btn btn-default" ui-sref="docker-tags.index">
+              <i class="icon-remove"></i>
+              {{ "Close" | translate }}
+            </button>
+          </div>
+        </header>
 
-    <div bst-alert success-messages="successMessages" error-messages="errorMessages"></div>
+        <div ng-show="panel.error" bst-alert="warning" success-messages="successMessages" error-messages="errorMessages"></div>
 
-    <div class="details" style="margin: 0 0 2em">
+        <div class="details" style="margin: 0 0 2em">
 
-      <h4 translate>Basic Information</h4>
+          <h4 translate>Basic Information</h4>
 
-      <div class="detail">
-        <span class="info-label" translate>Product</span>
-        <span class="info-value">{{ tag.product.name }}</span>
-      </div>
+          <div class="detail">
+            <span class="info-label" translate>Product</span>
+            <span class="info-value">{{ tag.product.name }}</span>
+          </div>
 
-      <div class="detail">
-        <span class="info-label" translate>Repository</span>
-        <span class="info-value">{{ tag.repository.name }}</span>
-      </div>
+          <div class="detail">
+            <span class="info-label" translate>Repository</span>
+            <span class="info-value">{{ tag.repository.name }}</span>
+          </div>
 
-    </div>
+        </div>
 
-    <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="manifest" translate>Manifest</th>
-          <th bst-table-column="path" translate>Published At</th>
-        </tr>
-      </thead>
+        <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="manifest" translate>Manifest</th>
+              <th bst-table-column="path" translate>Published At</th>
+            </tr>
+          </thead>
 
-      <tbody>
-        <tr bst-table-row
-            ng-repeat="tag in table.rows">
-          <td bst-table-cell>
-            {{ tag.environment.name }}
-          </td>
-          <td bst-table-cell>
-            {{ tag.content_view_version.name }}
-          </td>
-          <td bst-table-cell>
-            {{ tag.manifest.name | limitTo:20 }}...
-          </td>
-          <td bst-table-cell>
-            {{ tag.repository.full_path }}:{{ tag.name }}
-          </td>
-        </tr>
-      </tbody>
-    </table>
+          <tbody>
+            <tr bst-table-row
+                ng-repeat="tag in table.rows">
+              <td bst-table-cell>
+                {{ tag.environment.name }}
+              </td>
+              <td bst-table-cell>
+                {{ tag.content_view_version.name }}
+              </td>
+              <td bst-table-cell>
+                {{ tag.manifest.name | limitTo:20 }}...
+              </td>
+              <td bst-table-cell>
+                {{ tag.repository.full_path }}:{{ tag.name }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </section>
   </div>
-</section>
+</div>