katello 3.5.2 → 3.6.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-available-deb-repositories.controller.js

@@ -0,0 +1,48 @@
+(function () {
+
+    /**
+     * @ngdoc object
+     * @name  Bastion.content-views.controller:ContentViewAvailableDebRepositoriesController
+     *
+     * @requires $scope
+     * @requires Repository
+     * @requires Nutupane
+     * @requires CurrentOrganization
+     * @requires ContentViewRepositoriesUtil
+     *
+     * @description
+     *    Provides UI functionality add deb repositories to a content view
+     */
+    function ContentViewAvailableDebRepositoriesController($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
+        var nutupane;
+
+        ContentViewRepositoriesUtil($scope);
+
+        nutupane = new Nutupane(Repository, {
+            'organization_id': CurrentOrganization,
+            'library': true,
+            'content_type': 'deb',
+            'content_view_id': $scope.$stateParams.contentViewId,
+            'available_for': 'content_view'
+        },
+        'queryUnpaged');
+        $scope.controllerName = 'katello_repositories';
+
+        nutupane.load();
+
+        $scope.table = nutupane.table;
+
+        $scope.addRepositories = function (contentView) {
+            $scope.addSelectedRepositoriesToContentView(nutupane, contentView);
+        };
+    }
+
+    angular
+        .module('Bastion.content-views')
+        .controller('ContentViewAvailableDebRepositoriesController', ContentViewAvailableDebRepositoriesController);
+
+    ContentViewAvailableDebRepositoriesController.$inject = [
+        '$scope', 'Repository', 'Nutupane', 'CurrentOrganization', 'ContentViewRepositoriesUtil'
+    ];
+
+})();

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/content-view-deb-repositories-list.controller.js

@@ -0,0 +1,46 @@
+(function () {
+
+    /**
+     * @ngdoc object
+     * @name  Bastion.content-views.controller:ContentViewDebRepositoriesListController
+     *
+     * @requires $scope
+     * @requires Repository
+     * @requires Nutupane
+     * @requires CurrentOrganization
+     * @requires ContentViewRepositoriesUtil
+     *
+     * @description
+     *    Provides UI functionality list/remove deb repositories from a content view
+     */
+    function ContentViewDebRepositoriesListController($scope, Repository, Nutupane, CurrentOrganization, ContentViewRepositoriesUtil) {
+        var nutupane;
+
+        ContentViewRepositoriesUtil($scope);
+
+        nutupane = new Nutupane(Repository, {
+            'organization_id': CurrentOrganization,
+            'content_view_id': $scope.$stateParams.contentViewId,
+            'content_type': 'deb'
+        },
+        'queryUnpaged');
+        $scope.controllerName = 'katello_repositories';
+
+        nutupane.load();
+
+        $scope.table = nutupane.table;
+
+        $scope.removeRepositories = function () {
+            $scope.removeSelectedRepositoriesFromContentView(nutupane, $scope.contentView);
+        };
+    }
+
+    angular
+        .module('Bastion.content-views')
+        .controller('ContentViewDebRepositoriesListController', ContentViewDebRepositoriesListController);
+
+    ContentViewDebRepositoriesListController.$inject = [
+        '$scope', 'Repository', 'Nutupane', 'CurrentOrganization', 'ContentViewRepositoriesUtil'
+    ];
+
+})();

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

@@ -30,13 +30,6 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
             loading: true
         };
 
-        $scope.contentView = ContentView.get({id: $scope.$stateParams.contentViewId}, function () {
-            $scope.panel.loading = false;
-        }, function (response) {
-            $scope.panel.loading = false;
-            ApiErrorHandler.handleGETRequestErrors(response, $scope);
-        });
-
         $scope.taskTypes = {
             publish: "Actions::Katello::ContentView::Publish",
             promotion: "Actions::Katello::ContentView::Promote",
@@ -57,6 +50,15 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
             return contentView.$update($scope.saveSuccess, $scope.saveError);
         };
 
+        $scope.fetchContentView = function () {
+            $scope.contentView = ContentView.get({id: $scope.$stateParams.contentViewId}, function () {
+                $scope.panel.loading = false;
+            }, function (response) {
+                $scope.panel.loading = false;
+                ApiErrorHandler.handleGETRequestErrors(response, $scope);
+            });
+        };
+
         $scope.getAvailableVersions = function (paramContentView) {
             var deferred, latestVersion, latest;
 
@@ -78,5 +80,7 @@ angular.module('Bastion.content-views').controller('ContentViewDetailsController
             }
             return latest.concat(paramContentView.versions.reverse());
         };
+
+        $scope.fetchContentView();
     }]
 );

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

@@ -40,5 +40,8 @@ angular.module('Bastion.content-views').controller('ContentViewPublishController
             ContentView.publish(data, success, failure);
         };
 
+        //Refetch the content view so that the contentView is updated for latest components
+        $scope.fetchContentView();
+
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/date-type-errata-filter.controller.js

@@ -15,13 +15,8 @@ angular.module('Bastion.content-views').controller('DateTypeErrataFilterControll
     ['$scope', 'translate', 'Rule', 'Notification', function ($scope, translate, Rule, Notification) {
 
         function convertRuleStringsToDates() {
-            if ($scope.rule['start_date']) {
-                $scope.rule['start_date'] = new Date($scope.rule['start_date']);
-            }
-
-            if ($scope.rule['end_date']) {
-                $scope.rule['end_date'] = new Date($scope.rule['end_date']);
-            }
+            $scope.rule['start_date'] = new Date($scope.rule['start_date']);
+            $scope.rule['end_date'] = new Date($scope.rule['end_date']);
         }
 
         function success() {
@@ -71,13 +66,8 @@ angular.module('Bastion.content-views').controller('DateTypeErrataFilterControll
             var params;
 
             // Remove any hours from the dates
-            if (rule['start_date']) {
-                rule['start_date'].setHours(0, 0, 0, 0);
-            }
-
-            if (rule['end_date']) {
-                rule['end_date'].setHours(0, 0, 0, 0);
-            }
+            rule['start_date'].setHours(0, 0, 0, 0);
+            rule['end_date'].setHours(0, 0, 0, 0);
 
             params = {filterId: filter.id, ruleId: rule.id};
             rule.$update(params, success, failure);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/content-views/details/filters/filter-repositories.controller.js

@@ -46,6 +46,10 @@ angular.module('Bastion.content-views').controller('FilterRepositoriesController
             }
 
             $scope.table.rows = displayedRepositories;
+            $scope.table.numSelected = displayedRepositories.length;
+            $scope.table.resource = {
+                subtotal: displayedRepositories.length
+            };
             $scope.showRepos = filterRepositories.length !== 0;
         };
 

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

@@ -0,0 +1,87 @@
+<span page-title ng-model="contentView">{{ 'Repositories for Content View:' | translate }} {{ contentView.name }}</span>
+
+<h3 translate>Deb Repositories</h3>
+
+<nav data-block="navigation">
+  <ul class="nav nav-tabs nav-tabs-pf" ng-show="permitted('edit_content_views', contentView)">
+    <li ng-class="{active: isState('content-view.repositories.deb.list')}">
+      <a ui-sref="content-view.repositories.deb.list">
+        <span translate>
+          List/Remove
+        </span>
+      </a>
+    </li>
+
+    <li ng-class="{active: isState('content-view.repositories.deb.available')}" ng-show="!contentView.permissions.editable">
+      <a ui-sref="content-view.repositories.deb.available" translate>
+        Add
+      </a>
+    </li>
+  </ul>
+</nav>
+
+<div data-extend-template="layouts/partials/table.html">
+  <div data-block="list-actions">
+    <button type="button" class="btn btn-primary"
+            ng-disabled="table.numSelected === 0"
+            ng-show="isState('content-view.repositories.deb.list') && permitted('edit_content_views', contentView)"
+            ng-click="removeRepositories(contentView)">
+      <span translate>Remove Repositories</span>
+    </button>
+    <button type="button" class="btn btn-primary"
+            ng-disabled="table.numSelected === 0"
+            ng-show="isState('content-view.repositories.deb.available') && permitted('edit_content_views', contentView)"
+            ng-click="addRepositories(contentView)">
+      <span translate>Add Repositories</span>
+    </button>
+  </div>
+
+  <span data-block="no-rows-message">
+    <span ng-show="isState('content-view.repositories.deb.list')" translate>
+      There are currently no Deb Repositories associated with this Content View, you can add some by clicking on the "Add" tab above.
+    </span>
+    <span ng-show="isState('content-view.repositories.deb.available')">
+      <span translate>There are currently no Deb Repositories to add to this Content View,</span>
+      <a ui-sref="products" translate>add some repositories.</a>
+    </span>
+  </span>
+
+  <table data-block="table" 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 table.rows | filter:repositorySearch | filter:repositoryFilter as filteredItems">
+        <td bst-table-cell>
+          <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>
+          <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>

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

@@ -80,6 +80,13 @@
         </ul>
       </li>
 
+      <li ng-class="{active: stateIncludes('content-view.repositories.deb')}"
+          ng-hide="contentView.composite">
+        <a ui-sref="content-view.repositories.deb.list" translate>
+          Apt Repositories
+        </a>
+      </li>
+
       <li ng-class="{active: stateIncludes('content-view.repositories.file')}"
           ng-hide="contentView.composite">
         <a ui-sref="content-view.repositories.file.list" translate>

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

@@ -95,6 +95,12 @@
                 {{ repository.content_counts.docker_manifest }} Docker Manifests
               </span>
             </div>
+            <div>
+              <span translate>
+                {{ repository.content_counts.docker_manifest_list }} Docker Manifest Lists
+              </span>
+            </div>
+
             <div>
               <span translate>
                 {{ repository.content_counts.docker_tag }} Docker Tags

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

@@ -13,8 +13,19 @@
 
 <div class="row">
   <div class="col-sm-5">
-    <form name="versionForm" role="form" novalidate>
+    <div bst-alert="info" ng-show="contentView.duplicate_repositories_to_publish.length > 0">
+      You have selected more than one component Content View Version with the same repository resulting in slower publishing:
+      <ul>
+        <li ng-repeat="repository in contentView.duplicate_repositories_to_publish">
+          {{ repository.name }}
+          <ul>
+            <li ng-repeat="content_view in repository.components" >{{ content_view.content_view_name }} {{ content_view.content_view_version}}</li>
+          </ul>
+        </li>
+      </ul>
+    </div>
 
+    <form name="versionForm" role="form" novalidate>
       <div bst-form-group label="{{ 'Version' | translate }}">
         <span>{{ contentView['next_version'] }}</span>
       </div>

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

@@ -92,6 +92,11 @@
               {{ repository.content_counts.rpm }} Packages
             </a>
           </div>
+          <div>
+            <span translate ng-show="repository.content_counts.srpm > 0">
+              {{ repository.content_counts.srpm }} Source RPMs
+            </span>
+          </div>
           <div>
             <a ui-sref="errata({repositoryId: repository.id})"
                ng-show="repository.content_type == 'yum'"

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

@@ -8,7 +8,7 @@
   <span data-block="no-search-results-message" translate>
     Your search returned zero Content View.
   </span>
-  
+
   <div data-block="table">
     <table class="table table-striped table-bordered" bst-table="table">
       <thead>
@@ -55,6 +55,9 @@
             <div translate ng-if="version.package_count && version.package_count > 0">
               {{ version.package_count }} Packages
             </div>
+            <div translate ng-if="version.srpm_count && version.srpm_count > 0">
+              {{ version.srpm_count }} Source RPMs
+            </div>
             <div  ng-if="version.errata_counts.total && version.errata_counts.total > 0">
               <span translate>{{ version.errata_counts.total }} Errata</span>
               (<span errata-counts="version.errata_counts"></span>)
@@ -65,6 +68,9 @@
             <div translate ng-if="version.docker_manifest_count && version.docker_manifest_count > 0">
               {{ version.docker_manifest_count }} Docker Manifests
             </div>
+            <div translate ng-if="version.docker_manifest_list_count && version.docker_manifest_list_count > 0">
+              {{ version.docker_manifest_list_count }} Docker Manifest Lists
+            </div>
             <div translate ng-if="version.docker_tag_count && version.docker_tag_count > 0">
               {{ version.docker_tag_count }} Docker Tags
             </div>
@@ -74,6 +80,9 @@
             <div translate ng-if="version.file_count && version.file_count > 0">
               {{ version.file_count }} Files
             </div>
+            <div translate ng-if="version.deb_count && version.deb_count > 0">
+              {{ version.deb_count }} deb Packages
+            </div>
           </td>
           <td bst-table-cell class="preserve-newlines">{{ version.description }}</td>
           <td class="col-sm-2">

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

@@ -10,7 +10,7 @@
      *   ui-router state.
      */
     function ContentViewVersionContentController($scope, translate, Nutupane, Package, Erratum,
-                                                 PackageGroup, PuppetModule, OstreeBranch, Repository,
+                                                 PackageGroup, PuppetModule, OstreeBranch, Deb, Repository,
                                                  ContentViewVersion) {
         var nutupane, contentTypes, currentState, params;
 
@@ -72,6 +72,17 @@
                     'content_view_version_id': $scope.$stateParams.versionId,
                     library: true
                 }
+            },
+            'apt': {
+                type: Repository,
+                params: {
+                    'content_type': 'deb',
+                    'content_view_version_id': $scope.$stateParams.versionId,
+                    library: true
+                }
+            },
+            'deb': {
+                type: Deb
             }
         };
 
@@ -110,6 +121,6 @@
         .controller('ContentViewVersionContentController', ContentViewVersionContentController);
 
     ContentViewVersionContentController.$inject = ['$scope', 'translate', 'Nutupane', 'Package', 'Erratum',
-                                                   'PackageGroup', 'PuppetModule', 'OstreeBranch', 'Repository', 'ContentViewVersion'];
+                                                   'PackageGroup', 'PuppetModule', 'OstreeBranch', 'Deb', 'Repository', 'ContentViewVersion'];
 
 })();

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

@@ -16,5 +16,7 @@ angular.module('Bastion.content-views.versions', [
     'Bastion.errata',
     'Bastion.package-groups',
     'Bastion.puppet-modules',
-    'Bastion.ostree-branches'
+    'Bastion.ostree-branches',
+    'Bastion.files',
+    'Bastion.debs'
 ]);

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

@@ -0,0 +1,25 @@
+<div data-extend-template="layouts/partials/table.html">
+  <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>
+        <th bst-table-column translate>Content</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <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="product.repository.manage-content.debs({productId: repository.product.id, repositoryId: repository.id})" translate>
+              {{ repository.content_counts.deb }} deb Packages
+            </a>
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>