katello 3.8.1 → 3.9.0.rc1

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

@@ -15,7 +15,7 @@
       <dd>{{ repository.label }}</dd>
 
       <dt translate>Description</dt>
-      <dd bst-edit-text="repository.description"
+      <dd bst-edit-textarea="repository.description"
 	  on-save="save(repository)"
 	  readonly="product.redhat || denied('edit_products', product)">
       </dd>
@@ -82,26 +82,27 @@
           readonly="denied('edit_products', product)">
       </dd>
 
-      <dt translate>Upstream Username</dt>
-      <dd bst-edit-text="repository.upstream_username"
-          on-save="save(repository)"
-          readonly="product.redhat || denied('edit_products', product)">
-      </dd>
-
-      <dt translate>Upstream Password</dt>
-      <dd bst-edit-custom="repository.upstream_password_exists"
-          readonly="denied('edit_products', product)"
-          on-save="save(repository)"
-          formatter="upstreamPasswordFilter"
-          formatter-options="repository"
-          deletable="repository.upstream_password_exists"
-          on-delete="clearUpstreamPassword()"
-          >
+      <span ng-show="!product.redhat">
+        <dt translate>Upstream Authorization</dt>
+        <dd bst-edit-custom="repository.upstream_auth_exists"
+            readonly="denied('edit_products', product)"
+            on-save="save(repository)"
+            formatter="upstreamPasswordFilter"
+            formatter-options="repository"
+            deletable="repository.upstream_auth_exists"
+            on-delete="clearUpstreamAuth()">
+          <div translate>Upstream Username</div>
+          <input id="upstream_username"
+                 name="upstream_username"
+                 type="name"
+                 ng-model="repository.upstream_username"/>
+          <div translate>Upstream Password</div>
           <input id="upstream_password"
-            name="upstream_password"
-            type="password"
-            ng-model="repository.upstream_password"/>
-      </dd>
+                 name="upstream_password"
+                 type="password"
+                 ng-model="repository.upstream_password"/>
+        </dd>
+      </span>
 
       <span ng-show="repository.content_type === 'yum'">
         <dt translate>Yum Metadata Checksum</dt>
@@ -227,6 +228,13 @@
             on-save="save(repository)">
         </dd>
       </span>
+      <span ng-if="repository.content_type == 'docker'">
+        <dt translate>Limit Sync Tags</dt>
+        <dd bst-edit-text="repository.commaTagsWhitelist"
+            on-save="save(repository)"
+            readonly="denied('edit_products', product)">
+        </dd>
+      </span>
     </dl>
 
     <div class="divider"></div>
@@ -307,6 +315,14 @@
             </a>
           </td>
         </tr>
+        <tr ng-show="repository.content_type === 'yum'">
+          <td translate>Module Streams</td>
+          <td class="align-center">
+            <a ui-sref="product.repository.manage-content.module-streams({productId: product.id, repositoryId: repository.id})">
+              {{ repository.content_counts.module_stream || 0 }}
+            </a>
+          </td>
+        </tr>
         <tr ng-show="repository.content_type === 'puppet'">
           <td translate>Puppet Modules</td>
           <td class="align-center">

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

@@ -0,0 +1,17 @@
+<span page-title ng-model="repository">{{ 'Manage Module Streams 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>
+      Module Stream 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">
+      <ng-include src="'module-streams/views/partials/module-streams-table.html'"> </ng-include>
+  </div>
+</div>

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

@@ -24,7 +24,7 @@
       </div>
 
       <div bst-form-group label="{{ 'Description' | translate }}">
-        <input id="description"
+        <textarea id="description"
 	       name="description"
 	       ng-model="repository.description"
 	       type="text"/>
@@ -90,7 +90,7 @@
         </p>
       </div>
 
-      <div bst-form-group label="{{ 'Upstream Sync Policy' | translate }}"  ng-show="repository.content_type === 'ostree'">
+      <div bst-form-group label="{{ 'Upstream Sync Policy' | translate }}"  ng-if="repository.content_type === 'ostree'">
         <select required
                 id="ostree_upstream_sync_policy"
                 name="ostree_upstream_sync_policy"
@@ -110,7 +110,7 @@
       </div>
 
 
-      <div bst-form-group label="{{ 'Upstream Repository Name' | translate }}"  ng-show="repository.content_type === 'docker'">
+      <div bst-form-group label="{{ 'Upstream Repository Name' | translate }}"  ng-if="repository.content_type === 'docker'">
         <input id="docker_upstream_name"
                name="docker_upstream_name"
                ng-model="repository.docker_upstream_name"
@@ -121,7 +121,7 @@
 
       </div>
 
-      <div bst-form-group label="{{ 'Ignorable Content' | translate }}"  ng-show="repository.content_type === 'yum'">
+      <div bst-form-group label="{{ 'Ignorable Content' | translate }}"  ng-if="repository.content_type === 'yum'">
         <select id="ignorable_content"
                 name="ignorable_content"
                 multiple="true"
@@ -167,7 +167,7 @@
       </div>
 
 
-      <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-show="repository.content_type === 'yum'">
+      <div bst-form-group label="{{ 'Download Policy' | translate }}" ng-if="repository.content_type === 'yum'">
         <select id="download_policy"
                 name="download_policy"
                 ng-model="repository.download_policy"
@@ -180,7 +180,7 @@
         </p>
       </div>
 
-      <div class="checkbox" ng-show="repository.content_type === 'yum' || repository.content_type === 'puppet'">
+      <div class="checkbox" ng-if="repository.content_type === 'yum' || repository.content_type === 'puppet'">
         <label>
           <input id="mirror_on_sync" name="mirror_on_sync" ng-model="repository.mirror_on_sync" type="checkbox"/>
           <span translate>Mirror on Sync</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/details/repositories/repositories.routes.js

@@ -144,6 +144,15 @@
                 parent: 'product.repository.info'
             }
         })
+        .state('product.repository.manage-content.module-streams', {
+            url: '/module_streams',
+            permission: 'view_products',
+            templateUrl: 'products/details/repositories/details/views/repository-manage-module-streams.html',
+            ncyBreadcrumb: {
+                label: "{{'Module Streams' | translate }}",
+                parent: 'product.repository.info'
+            }
+        })
         .state('product.repository.manage-content.debs', {
             url: '/content/debs',
             permission: 'view_products',

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

@@ -132,6 +132,11 @@
                   {{ repository.content_counts.package_group || 0 }} Package Groups
                 </a>
               </div>
+              <div>
+                <a ui-sref="product.repository.manage-content.module-streams({productId: product.id, repositoryId: repository.id})">
+                  {{ repository.content_counts.module_stream || 0 }} Module Streams
+                </a>
+              </div>
             </span>
 
             <span ng-show="repository.content_type == 'docker'">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/discovery.controller.js

@@ -148,7 +148,8 @@ angular.module('Bastion.products').controller('DiscoveryController',
                 id: CurrentOrganization, url: $scope.discovery.url,
                 'content_type': $scope.discovery.contentType,
                 'upstream_username': $scope.discovery.upstreamUsername,
-                'upstream_password': $scope.discovery.upstreamPassword
+                'upstream_password': $scope.discovery.upstreamPassword,
+                search: $scope.discovery.search
             };
 
             Organization.repoDiscover(params, function (task) {

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/discovery/views/discovery.html

@@ -48,6 +48,16 @@
              name="upstreamPassword"/>
     </div>
 
+    <div bst-form-group ng-show="discovery.contentType === 'docker'"
+         label="{{ 'Registry Search Parameter' | translate }}">
+      <input type="text" id="registrySearch"
+             class="form-control"
+             ng-model="discovery.search"
+             ng-disabled="discovery.working"
+             placeholder="Default: * (search all)"
+             name="discoverySearch"/>
+    </div>
+
     <span class="input-group-btn">
       <button ng-show="!discovery.working && permitted('edit_products')"
               ng-disabled="discoveryForm.discoveryUrl.$invalid"

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/new/new-sync-plan-modal.controller.js

@@ -21,8 +21,12 @@ angular.module('Bastion.products').controller('NewSyncPlanModalController',
                 var form = SyncPlanHelper.getForm();
 
                 angular.forEach(response.data.errors, function (errors, field) {
-                    form[field].$setValidity('server', false);
-                    form[field].$error.messages = errors;
+                    if (form[field]) {
+                        form[field].$setValidity('server', false);
+                        form[field].$error.messages = errors;
+                    } else {
+                        Notification.setErrorMessage("Error saving the Sync Plan: " + " " + errors);
+                    }
                 });
             }
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/repository-sets/repository-set.factory.js

@@ -10,7 +10,7 @@
 angular.module('Bastion.repository-sets').factory('RepositorySet',
     ['BastionResource', function (BastionResource) {
         return BastionResource('katello/api/v2/repository_sets/:id/:action', {id: '@id'}, {
+            autocomplete: {method: 'GET', isArray: true, params: {id: 'auto_complete_search'}}
         });
-
     }]
 );

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-details-info.controller.js

@@ -18,11 +18,14 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsInfoController',
             $scope.intervals = [
                 {id: 'hourly', value: translate('hourly')},
                 {id: 'daily', value: translate('daily')},
-                {id: 'weekly', value: translate('weekly')}
+                {id: 'weekly', value: translate('weekly')},
+                {id: 'custom cron', value: translate('custom cron')}
             ];
 
             $scope.menuExpander = MenuExpander;
             $scope.panel = $scope.panel || {loading: false};
+            $scope.editInterval = false;
+            $scope.editedInterval = false;
 
             function updateSyncPlan(syncPlan) {
                 syncPlan.syncDate = new Date(syncPlan['sync_date']);
@@ -32,9 +35,22 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsInfoController',
 
             SyncPlan.get({id: $scope.$stateParams.syncPlanId}, function (syncPlan) {
                 $scope.panel.loading = false;
+                $scope.syncPlanInterval = syncPlan.interval;
                 updateSyncPlan(syncPlan);
-            });
 
+                $scope.$watch('syncPlan.interval', function (interval) {
+                    if (interval !== $scope.syncPlanInterval) {
+                        $scope.editInterval = true;
+                        $scope.editedInterval = (interval === "custom cron");
+                    } else {
+                        $scope.editedInterval = false;
+                        $scope.editInterval = false;
+                    }
+                });
+            });
+            $scope.cancelCronEdit = function () {
+                $scope.$state.reload();
+            };
             $scope.save = function (syncPlan) {
                 var deferred = $q.defer(),
                     syncDate = new Date(syncPlan.syncDate),
@@ -49,6 +65,8 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsInfoController',
                     updateSyncPlan(syncPlan);
                     deferred.resolve(response);
                     Notification.setSuccessMessage(translate('Sync Plan Saved'));
+                    $scope.editInterval = false;
+                    $scope.editedInterval = false;
                 }, function (response) {
                     deferred.reject(response);
                     angular.forEach(response.data.errors, function (errorMessage, key) {
@@ -58,7 +76,6 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsInfoController',
                         Notification.setErrorMessage(translate("An error occurred saving the Sync Plan: ") + errorMessage);
                     });
                 });
-
                 return deferred.promise;
             };
         }]

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/sync-plan-details.controller.js

@@ -40,8 +40,9 @@ angular.module('Bastion.sync-plans').controller('SyncPlanDetailsController',
             };
 
             $scope.removeSyncPlan = function (syncPlan) {
+                var syncPlanName = syncPlan.name;
                 syncPlan.$remove(function () {
-                    Notification.setSuccessMessage(translate('Sync Plan %s has been deleted.').replace('%s', syncPlan.name));
+                    Notification.setSuccessMessage(translate('Sync Plan %s has been deleted.').replace('%s', syncPlanName));
                     $scope.transitionTo('sync-plans');
                 });
             };

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/details/views/sync-plan-info.html

@@ -27,9 +27,9 @@
         <div class="row">
           <div class="col-sm-5">
             <div class="input-group">
-               <input type="text" uib-datepicker-popup id="syncDate" name="syncDate" ng-model="syncPlan.syncDate"
-                      class="form-control" is-open="isOpen" show-weeks="false" tabindex="4" required/>
-               <span class="input-group-btn">
+              <input type="text" uib-datepicker-popup id="syncDate" name="syncDate" ng-model="syncPlan.syncDate"
+                     class="form-control" is-open="isOpen" show-weeks="false" tabindex="4" required/>
+              <span class="input-group-btn">
                  <button type="button" class="btn btn-default" ng-click="isOpen = !isOpen">
                    <i class="fa fa-calendar"></i>
                  </button>
@@ -44,6 +44,13 @@
       <dt translate>Next Sync</dt>
       <dd>{{ syncPlan.next_sync | date:'medium' }}</dd>
 
+      <dt translate>Recurring Logic</dt>
+      <dd>
+        <a href="/foreman_tasks/recurring_logics/{{syncPlan.foreman_tasks_recurring_logic_id}}">
+          {{ syncPlan.foreman_tasks_recurring_logic_id }}
+        </a>
+      </dd>
+
       <dt translate>Sync Enabled</dt>
       <dd bst-edit-checkbox="syncPlan.enabled"
           readonly="denied('edit_sync_plans', syncPlan)"
@@ -58,9 +65,21 @@
           selector="syncPlan.interval"
           options="intervals"
           options-format="value.id as value.value for value in options"
-          on-save="save(syncPlan)">
+          on-save="save(syncPlan)"
+          on-cancel="cancelCronEdit()"
+          forced-working-mode="editedInterval"
+          edit-trigger="editInterval">
       </dd>
 
+      <div ng-show="syncPlan.interval === 'custom cron'">
+      <dt translate>Cron Logic</dt>
+      <dd bst-edit-text="syncPlan.cron_expression"
+          on-save="save(syncPlan)"
+          on-cancel="cancelCronEdit()"
+          readonly="denied('edit_sync_plans', syncPlan)"
+          edit-trigger="editInterval">
+      </dd>
+      </div>
       <dt translate>Products</dt>
       <dd>
         <a ui-sref="sync-plan.products.list">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/new/new-sync-plan.controller.js

@@ -19,25 +19,29 @@ angular.module('Bastion.sync-plans').controller('NewSyncPlanController',
             $scope.syncPlan = new SyncPlan();
             $scope.syncPlan.interval = $scope.intervals[0].id;
             $scope.syncPlan.startDate = new Date();
+            $scope.isWorking = false;
 
             function success(syncPlan) {
-                $scope.working = false;
+                $scope.isWorking = false;
                 $scope.$state.go('sync-plan.info', {syncPlanId: syncPlan.id});
                 Notification.setSuccessMessage(translate('New sync plan successfully created.'));
             }
 
             function error(response) {
                 var form = SyncPlanHelper.getForm();
-
+                $scope.isWorking = false;
                 angular.forEach(response.data.errors, function (errors, field) {
-                    form[field].$setValidity('server', false);
-                    form[field].$error.messages = errors;
+                    if (form[field]) {
+                        form[field].$setValidity('server', false);
+                        form[field].$error.messages = errors;
+                    } else {
+                        Notification.setErrorMessage("Error saving the Sync Plan: " + " " + errors);
+                    }
                 });
-
-                $scope.working = false;
             }
 
             $scope.createSyncPlan = function (syncPlan) {
+                $scope.isWorking = true;
                 SyncPlanHelper.createSyncPlan(syncPlan, success, error);
             };
 

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/new/views/new-sync-plan-form.html

@@ -28,6 +28,14 @@
     </select>
   </div>
 
+  <div bst-form-group label="{{ 'Custom Cron' | translate }}" ng-show="syncPlan.interval === 'custom cron'">
+   <input id="cron_expression"
+             name="cron_expression"
+             ng-model="syncPlan.cron_expression"
+             type="text"
+             tabindex="4"/>
+  </div>
+
   <div bst-form-group label="{{ 'Start Date' | translate }}">
     <div class="input-group">
       <input type="text" uib-datepicker-popup
@@ -36,7 +44,7 @@
              is-open="isOpen"
              ng-model="syncPlan.startDate"
              show-weeks="false"
-             tabindex="4"
+             tabindex="5"
              required/>
 
      <span class="input-group-btn">
@@ -60,10 +68,10 @@
   <div ng-init="setForm(syncPlanForm);"></div>
 
   <div ng-show="isState('sync-plans.new')">
-    <div bst-form-buttons
+    <div bst-save-control
          on-cancel="transitionBack()"
          on-save="createSyncPlan(syncPlan)"
-         working="working">
+         working="isWorking">
     </div>
   </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/sync-plans/sync-plan-helper.service.js

@@ -37,7 +37,8 @@
             return [
                 {id: 'hourly', value: translate('hourly')},
                 {id: 'daily', value: translate('daily')},
-                {id: 'weekly', value: translate('weekly')}
+                {id: 'weekly', value: translate('weekly')},
+                {id: 'custom cron', value: translate('custom cron')}
             ];
 
         };
@@ -48,8 +49,7 @@
          * @returns $resource sync plan
          */
         this.createSyncPlan = function (syncPlan, success, error) {
-            var GMT_OFFSET_MILLISECONDS = syncPlan.startDate.getTimezoneOffset() * 60000,
-                syncDate = new Date(syncPlan.startDate.getTime() + GMT_OFFSET_MILLISECONDS),
+            var syncDate = new Date(syncPlan.startDate.getTime()),
                 syncTime = new Date(syncPlan.startTime || new Date());
             syncDate.setHours(syncTime.getHours());
             syncDate.setMinutes(syncTime.getMinutes());