katello 3.5.2 → 3.6.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/files/file.factory.js

@@ -3,7 +3,7 @@
 
     /**
      * @ngdoc factory
-     * @name  Bastion.puppet-modules.factory:File
+     * @name  Bastion.files.factory:File
      *
      * @description
      *   Provides a BastionResource for interacting with Files

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

@@ -3,10 +3,10 @@
 
     /**
      * @ngdoc controller
-     * @name  Bastion.puppet-modules.controller:FilesController
+     * @name  Bastion.files.controller:FilesController
      *
      * @description
-     *   Handles fetching puppet modules content and populating Nutupane based on the current
+     *   Handles fetching files and populating Nutupane based on the current
      *   ui-router state.
      */
     function FilesController($scope, Nutupane, File, CurrentOrganization) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/organizations/organization-selector.controller.js

@@ -13,7 +13,8 @@
 
         $scope.selectedOrganization = {};
 
-        Organization.queryUnpaged(function (response) {
+        // TODO: per_page hack necessary because of http://projects.theforeman.org/issues/21800
+        Organization.queryUnpaged({'per_page': 99999999999}, function (response) {
             $scope.organizations = response.results;
         });
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/ostree-branches.routes.js

@@ -9,7 +9,7 @@
  */
 angular.module('Bastion.ostree-branches').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('ostree-branches', {
-        url: '/ostree_branches?repositoryId',
+        url: '/ostree_branches',
         permission: ['view_products', 'view_content_views'],
         views: {
             '@': {

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

@@ -9,7 +9,7 @@
  */
 angular.module('Bastion.packages').config(['$stateProvider', function ($stateProvider) {
     $stateProvider.state('packages', {
-        url: '/packages?repositoryId',
+        url: '/packages',
         permission: ['view_products', 'view_content_views'],
         views: {
             '@': {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-manage-content.controller.js

@@ -12,15 +12,18 @@
  * @requires PackageGroup
  * @requires PuppetModule
  * @requires DockerManifest
+ * @requires DockerManifestList
  * @requires OstreeBranch
+ * @requires File
+ * @requires Deb
  *
  * @description
  *   Provides the functionality for the repository details pane.
  */
 angular.module('Bastion.repositories').controller('RepositoryManageContentController',
-    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'PuppetModule', 'DockerManifest', 'OstreeBranch', 'File',
-    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, PuppetModule, DockerManifest, OstreeBranch, File) {
-        var currentState, contentTypes;
+    ['$scope', '$state', 'translate', 'Notification', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'PuppetModule', 'DockerManifest', 'DockerManifestList', 'OstreeBranch', 'File', 'Deb',
+    function ($scope, $state, translate, Notification, Nutupane, Repository, Package, PackageGroup, PuppetModule, DockerManifest, DockerManifestList, OstreeBranch, File, Deb) {
+        var contentTypes;
 
         function success(response, selected) {
             var message;
@@ -46,18 +49,20 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
             $scope.product = repository.product;
         });
 
-        currentState = $state.current.name.split('.').pop();
+        $scope.currentState = $state.current.name.split('.').pop();
 
         contentTypes = {
             'packages': { type: Package },
             'package-groups': { type: PackageGroup },
             'puppet-modules': { type: PuppetModule },
             'docker-manifests': { type: DockerManifest },
+            'docker-manifest-lists': { type: DockerManifestList },
             'ostree-branches': { type: OstreeBranch },
-            'files': {type: File}
+            'files': { type: File },
+            'debs': { type: Deb }
         };
 
-        $scope.contentNutupane = new Nutupane(contentTypes[currentState].type, {
+        $scope.contentNutupane = new Nutupane(contentTypes[$scope.currentState].type, {
             'repository_id': $scope.$stateParams.repositoryId
         });
         $scope.table = $scope.contentNutupane.table;
@@ -87,5 +92,11 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
             });
         };
 
+        $scope.updateSelectable = function(item) {
+            if ($scope.currentState === "docker-manifests" && !_.isEmpty(item.manifest_lists)) {
+                item.unselectable = true;
+            }
+            return item;
+        };
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-info.html

@@ -19,20 +19,47 @@
 
       <dt translate>Type</dt>
       <dd>{{ repository.content_type }}</dd>
+    </dl>
 
-      <dt ng-show="repository.content_type === 'yum'" translate>Restrict to architecture</dt>
-      <dd bst-edit-select="repository.arch==='noarch'?'Default':repository.arch"
-          selector="repository.arch"
-          options="architectures()"
-          on-save="save(repository)">
-      </dd>
+    <div class="divider"></div>
+    <h4 translate>Sync Settings</h4>
+    <dl class="dl-horizontal dl-horizontal-left">
+      <span ng-show="repository.content_type === 'yum'" >
+        <dt translate>Restrict to architecture</dt>
+        <dd bst-edit-select="repository.arch==='noarch'?'Default':repository.arch"
+            selector="repository.arch"
+            options="architectures()"
+            on-save="save(repository)">
+        </dd>
+      </span>
 
-      <dt ng-show="repository.content_type !== 'docker'" translate>URL</dt>
+      <dt ng-show="repository.content_type !== 'docker'" translate>Upstream URL</dt>
       <dt ng-show="repository.content_type === 'docker'" translate>Registry URL</dt>
       <dd bst-edit-text="repository.url"
           on-save="save(repository)"
           readonly="product.redhat || denied('edit_products', product)">
       </dd>
+      <span ng-if="repository.content_type == 'deb'">
+        <dt translate>Releases</dt>
+        <dd bst-edit-text="repository.deb_releases"
+            on-save="save(repository)"
+            readonly="denied('edit_products', product)">
+        </dd>
+      </span>
+      <span ng-if="repository.content_type == 'deb'">
+        <dt translate>Components</dt>
+        <dd bst-edit-text="repository.deb_components"
+            on-save="save(repository)"
+            readonly="denied('edit_products', product)">
+        </dd>
+      </span>
+      <span ng-if="repository.content_type == 'deb'">
+        <dt translate>Architectures</dt>
+        <dd bst-edit-text="repository.deb_architectures"
+            on-save="save(repository)"
+            readonly="denied('edit_products', product)">
+        </dd>
+      </span>
 
       <span ng-show="repository.content_type === 'docker'" >
         <dt translate>Upstream Repository Name</dt>
@@ -79,7 +106,7 @@
             on-save="save(repository)">
         </dd>
       </span>
-        <span ng-show="repository.content_type === 'yum' || repository.content_type === 'puppet'">
+      <span ng-show="repository.content_type === 'yum' || repository.content_type === 'puppet'">
         <dt translate>Mirror on Sync</dt>
         <dd bst-edit-checkbox="repository.mirror_on_sync"
             formatter="booleanToYesNo"
@@ -87,6 +114,15 @@
             readonly="denied('edit_products', product)">
         </dd>
       </span>
+      <span>
+        <dt translate>Ignore Global HTTP Proxy</dt>
+        <dd bst-edit-checkbox="repository.ignore_global_proxy"
+            formatter="booleanToYesNo"
+            on-save="save(repository)"
+            readonly="denied('edit_products', product)">
+        </dd>
+      </span>
+
       <dt translate>Publish via HTTPS</dt>
       <dd translate>Yes</dd>
 
@@ -203,6 +239,14 @@
             </a>
           </td>
         </tr>
+
+        <tr ng-show="repository.content_type === 'yum'">
+          <td translate>Source RPMs</td>
+          <td class="align-center">
+            {{ repository.content_counts.srpm || 0 }}
+          </td>
+        </tr>
+
         <tr ng-show="repository.content_type === 'yum'">
           <td translate>Errata</td>
           <td class="align-center">
@@ -235,6 +279,15 @@
             </a>
           </td>
         </tr>
+        <tr ng-show="repository.content_type === 'docker'">
+          <td translate>Docker Manifest Lists</td>
+          <td class="align-center">
+            <a ui-sref="product.repository.manage-content.docker-manifest-lists({productId: product.id, repositoryId: repository.id})">
+              {{ repository.content_counts.docker_manifest_list || 0 }}
+            </a>
+          </td>
+        </tr>
+
         <tr ng-show="repository.content_type === 'docker'">
           <td translate>Docker Tags</td>
           <td class="align-center">
@@ -259,6 +312,14 @@
             </a>
           </td>
         </tr>
+        <tr ng-show="repository.content_type === 'deb'">
+          <td translate>deb Packages</td>
+          <td class="align-center">
+            <a ui-sref="product.repository.manage-content.debs({productId: product.id, repositoryId: repository.id})">
+              {{ repository.content_counts.deb || 0 }}
+            </a>
+          </td>
+        </tr>
         </tbody>
       </table>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-debs.html

@@ -0,0 +1,68 @@
+<span page-title ng-model="repository">{{ 'Manage deb Packages for Repository:' | translate }} {{ repository.name }}</span>
+
+<div data-block="messages">
+  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+
+  <div bst-alert="success" ng-hide="generationTaskId === undefined">
+    <button type="button" class="close" ng-click="clearTaskId()">&times;</button>
+    <p translate>
+      deb metadata generation has been initiated in the background.  Click <a href="{{ taskUrl() }}">Here</a> to monitor the progress.
+    </p>
+  </div>
+</div>
+
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="list-actions">
+    <div bst-modal="removeContent()" model="table">
+      <div data-block="modal-header"
+           translate
+           translate-n="table.numSelected"
+           translate-plural="Remove {{ table.numSelected }} debs?">
+        Remove Package?
+      </div>
+      <div data-block="modal-body"
+           translate
+           translate-n="table.numSelected"
+           translate-plural="Are you sure you want to remove the {{ table.numSelected }} packages selected?">
+        Are you sure you want to remove the {{ table.getSelected()[0].name }}?
+      </div>
+    </div>
+
+    <button type="button" class="btn btn-default"
+            ng-hide="denied('edit_products')"
+            ng-click="openModal()"
+            ng-disabled="table.working || table.numSelected === 0">
+      <i class="fa fa-trash-o" ng-hide="table.working"></i>
+      <span translate>Remove Packages</span>
+    </button>
+  </div>
+
+  <div data-block="table">
+    <table class="table table-striped table-bordered" >
+
+      <thead>
+        <tr bst-table-head row-select>
+          <th bst-table-column><span translate>Name</span></th>
+          <th bst-table-column><span translate>Version</span></th>
+          <th bst-table-column><span translate>Architecture</span></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="deb in table.rows" row-select="deb">
+          <td bst-table-cell>
+            {{ deb.name }}
+          </td>
+          <td bst-table-cell>
+            {{ deb.version }}
+          </td>
+          <td bst-table-cell>
+            {{ deb.architecture }}
+          </td>
+        </tr>
+      </tbody>
+
+    </table>
+  </div>
+
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifest-lists.html

@@ -0,0 +1,44 @@
+<span page-title ng-model="repository">{{ 'View Docker Manifest Lists for Repository:' | translate }} {{ repository.name }}</span>
+
+<div data-block="messages">
+  <div bst-alert="success" ng-hide="generationTaskId === undefined">
+    <button type="button" class="close" ng-click="clearTaskId()">&times;</button>
+    <p translate>
+      Docker metadata generation has been initiated in the background.  Click
+      <a ng-href="{{ taskUrl() }}">Here</a> to monitor the progress.
+    </p>
+  </div>
+</div>
+
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="table">
+    <table class="table table-striped table-bordered" >
+
+      <thead>
+        <tr bst-table-head>
+          <th bst-table-column><span translate>Digest</span></th>
+          <th bst-table-column><span translate>Tags</span></th>
+          <th bst-table-column><span translate>Schema Version</span></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="item in table.rows" >
+          <td bst-table-cell>
+            {{ item.digest }}
+          </td>
+          <td>
+            <span ng-repeat="tag in tagsForManifest(item) ">
+              <a ui-sref="docker-tag.info({tagId: tag.id})">
+                <span class="registry-image-tag">{{ tag.name }}</span>
+              </a>
+            </span>
+          </td>
+          <td bst-table-cell>
+            {{ item.schema_version }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-docker-manifests.html

@@ -41,22 +41,23 @@
 
       <thead>
         <tr bst-table-head row-select>
-          <th bst-table-column><span translate>Manifest Name</span></th>
           <th bst-table-column><span translate>Tags</span></th>
           <th bst-table-column><span translate>Schema Version</span></th>
           <th bst-table-column><span translate>Digest</span></th>
+          <th bst-table-column><span translate>Manifest Lists</span></th>
         </tr>
       </thead>
 
       <tbody>
-        <tr bst-table-row ng-repeat="item in table.rows" row-select="item">
+        <tr bst-table-row ng-repeat="item in table.rows"
+            row-select="item" ng-init="updateSelectable(item)">
           <td bst-table-cell>
-            {{ item.name }}
-          </td>
-          <td bst-table-cell>
-            <span ng-repeat="tag in tagsForManifest(item) ">
+            <div ng-if="item.manifest_lists.length > 0" translate>
+              Part of a manifest list
+            </div>
+            <span ng-if="item.manifest_lists.length === 0" ng-repeat="tag in tagsForManifest(item) ">
               <a ui-sref="docker-tag.info({tagId: tag.id})">
-                {{ tag.name }}
+                <span class="registry-image-tag">{{ tag.name }}</span>
               </a>
             </span>
           </td>
@@ -66,6 +67,11 @@
           <td bst-table-cell>
             {{ item.digest }}
           </td>
+          <td bst-table-cell>
+            <span ng-if="item.manifest_lists.length > 0" ng-repeat="ml in item.manifest_lists ">
+              {{ml.digest}}
+            </span>
+          </td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-packages.html

@@ -21,8 +21,8 @@
       <div data-block="modal-body"
            translate
            translate-n="table.numSelected"
-           translate-plural="Are you sure you want to remove the {{ table.numSelected }} packages selected?">
-        Are you sure you want to remove the {{ table.getSelected()[0].name }}?
+           translate-plural="Are you sure you want to remove the {{ table.numSelected }} packages?">
+        Are you sure you want to remove the {{ table.getSelected()[0].name }} package?
       </div>
     </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-manage-puppet-modules.html

@@ -24,8 +24,8 @@
       <div data-block="modal-body"
            translate
            translate-n="table.numSelected"
-           translate-plural="Are you sure you want to remove the {{ table.numSelected }} Puppet modules selected?">
-        Are you sure you want to remove the {{ table.getSelected()[0].name }}?
+           translate-plural="Are you sure you want to remove the {{ table.numSelected }} Puppet Modules?">
+        Are you sure you want to remove the {{ table.getSelected()[0].name }} Puppet Module?
       </div>
     </div>
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/new/views/new-repository.html

@@ -5,7 +5,7 @@
 <div data-block="content" class="row">
   <form name="repositoryForm" class="col-sm-5" novalidate role="form">
     <div>
-      <h4 translate> General Information </h4>
+      <h4 translate> Basic Information </h4>
       <div bst-form-group label="{{ 'Name' | translate }}">
         <input id="name"
                name="name"
@@ -43,8 +43,8 @@
       </div>
     </div>
     <div ng-show="repository.content_type !== undefined">
-      <h4 translate> Sync Information </h4>
-      <div bst-form-group label="{{ 'URL' | translate }}">
+      <h4 translate> Sync Settings </h4>
+      <div bst-form-group label="{{ 'Upstream URL' | translate }}">
         <input id="url"
                name="url"
                ng-model="repository.url"
@@ -55,6 +55,33 @@
         </p>
 
       </div>
+      <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Releases' | translate }}">
+        <input id="deb_releases"
+               name="deb_releases"
+               ng-model="repository.deb_releases"
+               type="text"/>
+        <p class="help-block" translate>
+          Comma separated list of releases (suite or codename) to sync from. Default: stable
+        </p>
+      </div>
+      <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Components' | translate }}">
+        <input id="deb_comonents"
+               name="deb_components"
+               ng-model="repository.deb_components"
+               type="text"/>
+        <p class="help-block" translate>
+          Comma separated list of components to sync from (leave clear to sync all). Example: main
+        </p>
+      </div>
+      <div ng-show="repository.content_type === 'deb'" bst-form-group label="{{ 'Architectures' | translate }}">
+        <input id="deb_architectures"
+               name="deb_architectures"
+               ng-model="repository.deb_architectures"
+               type="text"/>
+        <p class="help-block" translate>
+          Comma separated list of processor architectures to filter the sync by. Example: amd64
+        </p>
+      </div>
 
       <div bst-form-group label="{{ 'Upstream Sync Policy' | translate }}"  ng-show="repository.content_type === 'ostree'">
         <select required
@@ -144,9 +171,20 @@
           Selecting this option will result in contents that are no longer part of the upstream repository being removed during synchronization.
         </p>
       </div>
+
+      <div class="checkbox">
+        <label>
+          <input id="ignore_global_proxy" name="ignore_global_proxy" ng-model="repository.ignore_global_proxy" type="checkbox"/>
+          <span translate>Ignore Global Http Proxy</span>
+        </label>
+
+        <p class="help-block" translate>
+          Selecting this option will result in the globally configured http proxy from not being used.
+        </p>
+      </div>
     </div>
 
-    <div ng-show="repository.content_type === 'yum' || repository.content_type === 'puppet'">
+    <div ng-show="repository.content_type === 'yum' || repository.content_type === 'puppet' || repository.content_type === 'deb' || repository.content_type === 'file'">
       <h4 ng-show="repository.content_type !== undefined" translate> Published Repository Information </h4>
 
       <div bst-form-group label="{{ 'Checksum' | translate }}" ng-show="repository.content_type === 'yum'">