katello 3.3.2 → 3.4.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/repository-details-info.filter.js

@@ -0,0 +1,29 @@
+/**
+ * @ngdoc object
+ * @name  Bastion.repositories.controller:OstreeUpstreamSyncPolicyFilter
+ *
+ * @requires translate
+ * @requires OstreeUpstreamSyncPolicy
+ *
+ * @description
+ *   Provides the Ostree Upstream Sync policy filter functionality for the repository details info page.
+ */
+
+angular.module('Bastion.components.formatters').filter('ostreeUpstreamSyncPolicyFilter', ['translate', 'OstreeUpstreamSyncPolicy', function (translate, OstreeUpstreamSyncPolicy) {
+    return function (displayValue, repository) {
+        var policy = repository["ostree_upstream_sync_policy"];
+        if ( policy === "custom") {
+            return OstreeUpstreamSyncPolicy.syncPolicyName(policy, repository["ostree_upstream_sync_depth"]);
+        }
+        return OstreeUpstreamSyncPolicy.syncPolicyName(policy);
+    };
+}]);
+
+angular.module('Bastion.components.formatters').filter('upstreamPasswordFilter', [function () {
+    return function (displayValue, repository) {
+        if (repository["upstream_password_exists"]) {
+            return "******";
+        }
+        return null;
+    };
+}]);

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

@@ -17,8 +17,8 @@
  *   Provides the functionality for the repository details pane.
  */
 angular.module('Bastion.repositories').controller('RepositoryManageContentController',
-    ['$scope', '$state', 'translate', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'PuppetModule', 'DockerManifest', 'OstreeBranch',
-    function ($scope, $state, translate, Nutupane, Repository, Package, PackageGroup, PuppetModule, DockerManifest, OstreeBranch) {
+    ['$scope', '$state', 'translate', 'Nutupane', 'Repository', 'Package', 'PackageGroup', 'PuppetModule', 'DockerManifest', 'OstreeBranch', 'File',
+    function ($scope, $state, translate, Nutupane, Repository, Package, PackageGroup, PuppetModule, DockerManifest, OstreeBranch, File) {
         var currentState, contentTypes;
 
         function success(response, selected) {
@@ -52,14 +52,15 @@ angular.module('Bastion.repositories').controller('RepositoryManageContentContro
             'package-groups': { type: PackageGroup },
             'puppet-modules': { type: PuppetModule },
             'docker-manifests': { type: DockerManifest },
-            'ostree-branches': { type: OstreeBranch }
+            'ostree-branches': { type: OstreeBranch },
+            'files': {type: File}
         };
 
         $scope.contentNutupane = new Nutupane(contentTypes[currentState].type, {
             'repository_id': $scope.$stateParams.repositoryId
         });
         $scope.table = $scope.contentNutupane.table;
-        $scope.table.closeItem = function () {};
+        $scope.contentNutupane.masterOnly = true;
 
         $scope.removeContent = function () {
             var selected = $scope.table.getSelected();

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

@@ -47,12 +47,30 @@
             ApiErrorHandler.handleGETRequestErrors(response, $scope);
         });
 
+        $scope.hideSyncButton = function(repository, advancedSync) {
+            var result = $scope.syncInProgress(repository.last_sync) || !repository.url || $scope.denied('sync_products', $scope.product);
+            if (advancedSync) {
+                result = result || repository.content_type !== 'yum';
+            }
+            return result;
+        };
+
+        $scope.disableSyncLink = function (adavancedSync) {
+            return $scope.hideSyncButton($scope.repository, adavancedSync);
+        };
+
         $scope.syncRepository = function (repository) {
             Repository.sync({id: repository.id}, function (task) {
                 $state.go('product.repository.tasks.details', {taskId: task.id});
             }, errorHandler);
         };
 
+        $scope.republishRepository = function (repository) {
+            Repository.republish({id: repository.id}, function (task) {
+                $state.go('product.repository.tasks.details', {taskId: task.id});
+            }, errorHandler);
+        };
+
         $scope.syncInProgress = function (task) {
             var inProgress = false;
             if (task && (task.state === 'pending' || task.state === 'running')) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/details/views/repository-advanced-sync-options.html

@@ -0,0 +1,54 @@
+  <div class="radio">
+    <label>
+      <input type="radio" ng-model="syncType" value="standard" />
+      <span translate>
+        Optimized Sync
+      </span>
+    </label>
+    <div class="help-block">
+      <span translate>
+        Standard sync, optimized for speed by bypassing any unneeded steps.
+      </span>
+    </div>
+  </div>
+
+  <div class="radio">
+    <label>
+      <input type="radio" ng-model="syncType" value="skipMetadataCheck" />
+      <span translate>
+        Complete Sync
+      </span>
+    </label>
+    <div class="help-block">
+      <span translate>
+        Sync even if the upstream metadata appears to have no change. This option is only relevant for yum repositories and will take longer than an optimized sync. Choose this option if:
+      </span>
+      <ul class="list-aligned">
+        <li translate>One or more RPMs are not showing up in the local repository even though they exist in the upstream repository.</li>
+      </ul>
+    </div>
+  </div>
+
+  <div class="radio">
+    <label>
+      <input type="radio" ng-model="syncType" value="validateContents" />
+      <span translate>
+        Validate Content Sync
+      </span>
+    </label>
+    <div class="help-block">
+      <span translate>
+        Performs a complete sync, verifying the checksum of all packages afterwards.  Any missing or corrupt RPMs will be re-downloaded.  This option will take the longest amount of time and is only relevant for yum repositories..  Choose this option if:
+      </span>
+      <ul class="list-aligned">
+        <li translate>Specific RPMs are throwing a 404 from yum or dnf.</li>
+        <li translate>RPMs are corrupt, often leading to an error "Package does not match intended download".</li>
+      </ul>
+      <span ng-show="repository.download_policy === 'on_demand'">
+        <i class="fa fa-warning"></i>
+        <span translate>
+          When validating content, repositories using the "On Demand" download policy will download all packages within the repository.
+        </span>
+      </span>
+    </div>
+  </div>

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

@@ -0,0 +1,29 @@
+<span page-title ng-model="repository">{{ 'Repository:' | translate }} {{ repository.name }}</span>
+
+<div>
+  <h3 translate>Advanced Sync</h3>
+
+  <div bst-alerts success-messages="successMessages" error-messages="errorMessages"></div>
+
+  <div data-extend-template="products/details/repositories/details/views/repository-advanced-sync-options.html"></div>
+
+  <div class="control-group buttons">
+    <button class="btn btn-primary"
+            ng-click="advancedSync(syncType); working = true;"
+            ng-disabled="syncType === undefined || working">
+
+      <i class="fa fa-spinner fa-spin" ng-show="working"></i>
+      <span ng-show="working" translate>Starting</span>
+      <span ng-hide="working" translate>Sync</span>
+    </button>
+
+    <button class="btn btn-default"
+            type="button"
+            ui-sref="product.repository.info"
+            ng-disabled="working"
+            translate>
+      Cancel
+    </button>
+  </div>
+</div>
+

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

@@ -7,9 +7,8 @@
 
   <div data-block="item-actions">
     <div class="btn-group" uib-dropdown keyboard-nav bst-feature-flag="custom_products">
-      <button type="button" class="btn btn-default" ng-click="syncRepository(repository)"
-              ng-disabled="syncInProgress(repository.last_sync) || !repository.url || denied('sync_products', product)">
-        <span translate>Sync Now</span>
+      <button type="button" class="btn btn-default" uib-dropdown-toggle>
+        <span translate>Select Action</span>
       </button>
 
       <button type="button" class="btn btn-default" uib-dropdown-toggle>
@@ -18,10 +17,8 @@
       </button>
 
       <ul class="dropdown-menu-right" uib-dropdown-menu role="menu">
-        <li role="menuitem">
-          <a ng-click="syncRepository(repository)"
-             ng-hide="syncInProgress(repository.last_sync) || !repository.url || denied('sync_products', product)"
-             translate>
+        <li role="menuitem" ng-hide="hideSyncButton(repository, false)" ng-class="{disabled: disableSyncLink()}">
+          <a ng-click="syncRepository(repository)" disable-link="disableSyncLink()" translate>
             Sync Now
           </a>
 
@@ -38,9 +35,29 @@
           </span>
         </li>
 
+        <li role="menuitem" ng-hide="hideSyncButton(repository, true)" ng-class="{disabled: disableSyncLink()}">
+          <a ui-sref="product.repository.advanced_sync({repositoryId: repository.id})" disable-link="disableSyncLink()" translate>
+            Advanced Sync
+          </a>
+        </li>
+
+        <li role="menuitem" ng-hide="syncInProgress(repository.last_sync) || denied('edit_products', product)">
+          <a ng-click="republishRepository(repository)" translate>
+            Republish Repository Metadata
+          </a>
+
+          <span class="disabled" ng-show="syncInProgress(repository.last_sync)" translate>
+            Cannot republish Repository, a sync is already in progress.
+          </span>
+
+          <span class="disabled" ng-show="denied('sync_products', product)" translate>
+            Cannot republish Repository without the proper permissions.
+          </span>
+        </li>
+
         <li class="divider" bst-feature-flag="custom_products" ng-hide="denied('delete_repositories')"></li>
-        <li role="menuitem" ng-hide="denied('delete_repositories')">
-          <a ng-click="openModal()" ng-show="canRemove(repository, product)" translate>
+        <li role="menuitem" ng-show="canRemove(repository, product)">
+          <a ng-click="openModal()" translate>
             Remove Repository
           </a>
 

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

@@ -14,6 +14,9 @@
       <dt translate>Label</dt>
       <dd>{{ repository.label }}</dd>
 
+      <dt translate>Backend Identifier</dt>
+      <dd>{{ repository.backend_identifier }}</dd>
+
       <dt translate>Type</dt>
       <dd>{{ repository.content_type }}</dd>
 
@@ -46,9 +49,18 @@
       </dd>
 
       <dt translate>Upstream Password</dt>
-      <dd bst-edit-text="repository.upstream_password"
+      <dd bst-edit-custom="repository.upstream_password_exists"
+          readonly="denied('edit_products', product)"
           on-save="save(repository)"
-          readonly="product.redhat || denied('edit_products', product)">
+          formatter="upstreamPasswordFilter"
+          formatter-options="repository"
+          deletable="repository.upstream_password_exists"
+          on-delete="clearUpstreamPassword()"
+          >
+          <input id="upstream_password"
+            name="upstream_password"
+            type="password"
+            ng-model="repository.upstream_password"/>
       </dd>
 
       <span ng-show="repository.content_type === 'yum'">
@@ -67,7 +79,6 @@
             readonly="denied('edit_products', product)">
         </dd>
       </span>
-      
       <dt translate>Publish via HTTPS</dt>
       <dd translate>Yes</dd>
 
@@ -91,6 +102,23 @@
           </span>
         </p>
       </dd>
+      <span ng-if="repository.content_type == 'ostree'">
+        <dt translate>Upstream Sync Policy</dt>
+        <dd bst-edit-custom="repository.ostree_upstream_sync_policy"
+            readonly="denied('edit_products', product)"
+            on-save="save(repository)"
+            formatter="ostreeUpstreamSyncPolicyFilter"
+            formatter-options="repository"
+            >
+            <select ng-options="id as name for (id, name) in ostreeUpstreamSyncPolicies" ng-model="repository.ostree_upstream_sync_policy">
+            </select>
+            <input id="ostree_upstream_sync_depth"
+              name="ostree_upstream_sync_depth"
+              ng-model="repository.ostree_upstream_sync_depth"
+              type="number"
+              ng-disabled="repository.ostree_upstream_sync_policy !== 'custom'"/>
+        </dd>
+      </span>
 
       <span ng-if="repository.content_type === 'yum' && !product.redhat">
         <dt translate>GPG Key</dt>
@@ -101,7 +129,6 @@
             on-save="save(repository)">
         </dd>
       </span>
-
       <span ng-if="repository.content_type == 'yum'">
         <dt translate>Download Policy</dt>
         <dd bst-edit-select="downloadPolicyDisplay(repository.download_policy)"
@@ -158,7 +185,7 @@
           <th colspan="2" translate>Content Type</th>
         </tr>
         </thead>
-        
+
         <tbody>
         <tr ng-show="repository.content_type === 'yum'">
           <td translate>Packages</td>
@@ -171,7 +198,7 @@
         <tr ng-show="repository.content_type === 'yum'">
           <td translate>Errata</td>
           <td class="align-center">
-            <a ui-sref="errata.index({repositoryId: repository.id})">
+            <a ui-sref="errata({repositoryId: repository.id})">
               {{ repository.content_counts.erratum || 0 }}
             </a>
           </td>
@@ -195,7 +222,7 @@
         <tr ng-show="repository.content_type === 'docker'">
           <td translate>Docker Manifests</td>
           <td class="align-center">
-            <a ui-sref="product.repository.manage-content.docker-manifests({productId: product.id, repositoryId: repository.id})" translate>
+            <a ui-sref="product.repository.manage-content.docker-manifests({productId: product.id, repositoryId: repository.id})">
               {{ repository.content_counts.docker_manifest || 0 }}
             </a>
           </td>
@@ -203,18 +230,26 @@
         <tr ng-show="repository.content_type === 'docker'">
           <td translate>Docker Tags</td>
           <td class="align-center">
-            <a ui-sref="product.repository.manage-content.docker-manifests({productId: product.id, repositoryId: repository.id})" translate>
+            <a ui-sref="product.repository.manage-content.docker-manifests({productId: product.id, repositoryId: repository.id})">
               {{ repository.content_counts.docker_tag || 0 }}
             </a>
           </td>
         </tr>
         <tr ng-show="repository.content_type === 'ostree'">
           <td translate>OSTree Branches</td>
-          <td class="align-center">{{ repository.content_counts.ostree_branch || 0 }}</td>
+          <td class="align-center">
+            <a ui-sref="product.repository.manage-content.ostree-branches({productId: product.id, repositoryId: repository.id})">
+               {{ repository.content_counts.ostree_branch || 0 }}
+            </a>
+          </td>
         </tr>
         <tr ng-show="repository.content_type === 'file'">
           <td translate>Files</td>
-          <td class="align-center">{{ repository.content_counts.file || 0 }}</td>
+          <td class="align-center">
+            <a ui-sref="product.repository.manage-content.files({productId: product.id, repositoryId: repository.id})">
+              {{ repository.content_counts.file || 0 }}
+            </a>
+          </td>
         </tr>
         </tbody>
       </table>
@@ -241,7 +276,7 @@
         </div>
 
         <div class="form-group">
-          <button class="btn btn-primary"
+          <button type="button" class="btn btn-primary"
                   ng-hide="denied('edit_products', product)"
                   upload-submit ng-click="progress.uploading = true">
             <i class="fa fa-spinner fa-spin" ng-show="progress.uploading"></i>

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

@@ -29,7 +29,7 @@
       </div>
     </div>
 
-    <button class="btn btn-default"
+    <button type="button" class="btn btn-default"
             ng-click="openModal()"
             ng-hide="denied('edit_products')"
             ng-disabled="table.working || table.numSelected === 0">

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

@@ -0,0 +1,64 @@
+<span page-title ng-model="repository">{{ 'Manage Files 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>
+      File removal 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 }} files?">
+        Remove File?
+      </div>
+      <div data-block="modal-body"
+           translate
+           translate-n="table.numSelected"
+           translate-plural="Are you sure you want to remove the {{ table.numSelected }} files 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 Files</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>Path</span></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <tr bst-table-row ng-repeat="file in table.rows" row-select="file">
+          <td bst-table-cell>
+            {{ file.name }}
+          </td>
+          <td bst-table-cell>
+            {{ file.path }}
+          </td>
+        </tr>
+      </tbody>
+
+    </table>
+  </div>
+
+</div>

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

@@ -28,7 +28,7 @@
       </div>
     </div>
 
-    <button class="btn btn-default"
+    <button type="button" class="btn btn-default"
             ng-hide="denied('edit_products')"
             ng-click="openModal()"
             ng-disabled="table.working || table.numSelected === 0">