katello 3.10.2 → 3.11.0.rc1

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/dates/dates.module.js

@@ -0,0 +1,50 @@
+/**
+ * @ngdoc module
+ * @name  Bastion.dates
+ *
+ * @description
+ *   Module providing directives for formatting dates.
+ */
+angular.module('Bastion.dates', [
+    'Bastion',
+    'react'
+]);
+
+angular.module('Bastion.dates').factory('componentRegistry',
+    ['$window', function($window) {
+        return $window.tfm.componentRegistry;
+    }]
+);
+
+angular.module('Bastion.dates').factory('dateComponent',
+    ['componentRegistry', function(componentRegistry) {
+        return function(componentName) {
+            var dateWrapper = componentRegistry.wrapperFactory().with('i18n').wrapper;
+            return dateWrapper(componentRegistry.getComponent(componentName).type);
+        };
+    }]
+);
+
+angular.module('Bastion.dates').directive('date',
+    ['dateComponent', 'reactDirective', function(dateComponent, reactDirective) {
+        return reactDirective(dateComponent('IsoDate'), ['date']);
+    }]
+);
+
+angular.module('Bastion.dates').directive('shortDateTime',
+    ['dateComponent', 'reactDirective', function(dateComponent, reactDirective) {
+        return reactDirective(dateComponent('ShortDateTime'), ['date', 'seconds']);
+    }]
+);
+
+angular.module('Bastion.dates').directive('longDateTime',
+    ['dateComponent', 'reactDirective', function(dateComponent, reactDirective) {
+        return reactDirective(dateComponent('LongDateTime'), ['date', 'seconds']);
+    }]
+);
+
+angular.module('Bastion.dates').directive('relativeDate',
+    ['dateComponent', 'reactDirective', function(dateComponent, reactDirective) {
+        return reactDirective(dateComponent('RelativeDateTime'), ['date']);
+    }]
+);

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

@@ -28,7 +28,7 @@
           <span ng-show="contentView.composite" translate>Yes</span>
           <span ng-hide="contentView.composite" translate>No</span>
         </td>
-        <td bst-table-cell>{{ contentView.last_published | date:'longDate' }}</td>
+        <td bst-table-cell><long-date-time date="contentView.last_published" /></td>
         <td bst-table-cell class="number-cell">{{ contentView.repositories.length || 0 }}</td>
       </tr>
     </tbody>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-details.html

@@ -54,7 +54,6 @@ organization.label
 repository.name
 repository.label
 repository.docker_upstream_name
-repository.url
 content_view.label
 content_view.name
 content_view.version

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-errata.html

@@ -50,7 +50,8 @@
           <span ng-show="errata.severity">- {{ errata.severity | errataSeverity}}</span>
         </td>
         <td bst-table-cell class="number-cell">{{ errata.hosts_available_count || 0 }}</td>
-        <td bst-table-cell>{{ errata.updated | date:'shortDate'}}</td>
+
+        <td bst-table-cell><date date="errata.updated" /></td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/details/views/environment-ostree.html

@@ -18,6 +18,7 @@
         <th bst-table-column translate>Name</th>
         <th bst-table-column translate>Version</th>
         <th bst-table-column translate>Commit</th>
+        <th bst-table-column translate>Date</th>
       </tr>
     </thead>
 
@@ -26,6 +27,7 @@
         <td bst-table-cell>{{ branch.name }}</td>
         <td bst-table-cell>{{ branch.version }}</td>
         <td bst-table-cell>{{ branch.commit }}</td>
+        <td bst-table-cell>{{ branch.version_date }}</td>
       </tr>
     </tbody>
   </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/environments/environments.module.js

@@ -17,5 +17,6 @@ angular.module('Bastion.environments', [
     'Bastion.ostree-branches',
     'Bastion.puppet-modules',
     'Bastion.repositories',
-    'Bastion.content-views'
+    'Bastion.content-views',
+    'Bastion.dates'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/details/views/erratum-info.html

@@ -24,10 +24,10 @@
       <dd>{{ errata.severity | errataSeverity }}</dd>
 
       <dt translate>Issued</dt>
-      <dd>{{ errata.issued | date:'shortDate' }}</dd>
+      <dd><short-date-time date="errata.issued" /></dd>
 
       <dt translate>Last Updated On</dt>
-      <dd>{{ errata.updated | date:'shortDate' }}</dd>
+      <dd><short-date-time date="errata.updated" /></dd>
 
       <dt translate>Reboot Suggested?</dt>
       <dd>{{ errata.reboot_suggested | booleanToYesNo }}</dd>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/errata.module.js

@@ -12,5 +12,6 @@ angular.module('Bastion.errata', [
     'Bastion.common',
     'Bastion.i18n',
     'Bastion.components.formatters',
-    'Bastion.tasks'
+    'Bastion.tasks',
+    'Bastion.dates'
 ]);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/errata/views/errata.html

@@ -101,7 +101,7 @@
             <span translate>{{ errata.hosts_applicable_count || 0 }} Applicable, </span>
             <span translate>{{ errata.hosts_available_count || 0 }} Installable</span>
           </td>
-          <td bst-table-cell>{{ errata.updated | date:'shortDate'}}</td>
+          <td bst-table-cell><short-date-time date="errata.updated" /></td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/ostree-branches/details/views/ostree-branch-info.html

@@ -10,6 +10,9 @@
 
       <dt translate>Commit</dt>
       <dd>{{ branch.commit }}</dd>
+
+      <dt translate>Date</dt>
+      <dd>{{ branch.version_date }}</dd>
     </dl>
   </div>
 </div>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/bulk/views/products-bulk-sync-plan-modal.html

@@ -68,10 +68,10 @@
             <tr bst-table-row ng-repeat="syncPlan in table.rows" class="clickable-row"
                 ng-click="selectSyncPlan(syncPlan)" ng-class="{'selected-row': syncPlan === selectedSyncPlan }">
               <td bst-table-cell>{{ syncPlan.name }}</td>
-              <td bst-table-cell>{{ syncPlan.sync_date | date:'medium' }}</td>
+              <td bst-table-cell><long-date-time date="syncPlan.sync_date" /></td>
               <td bst-table-cell>{{ syncPlan.enabled }}</td>
               <td bst-table-cell>{{ syncPlan.interval | translate | capitalize }}</td>
-              <td bst-table-cell>{{ syncPlan.next_sync | date:'medium' }}</td>
+              <td bst-table-cell><long-date-time date="syncPlan.next_sync" /></td>
             </tr>
           </tbody>
         </table>
@@ -84,4 +84,4 @@
       Done
     </button>
   </div>
-</div>
+</div>

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

@@ -21,7 +21,7 @@
       </dd>
 
       <dt translate>Backend Identifier</dt>
-      <dd>{{ repository.backend_identifier }}</dd>
+      <dd>{{ repository.pulp_id }}</dd>
 
       <dt translate>Type</dt>
       <dd>{{ repository.content_type }}</dd>
@@ -250,13 +250,14 @@
       <dd ng-show="repository.last_sync == null" translate>
         Not Synced
       </dd>
-      <dd ng-hide="repository.last_sync == null || repository.last_sync.ended_at == null" translate>
-        {{ repository.last_sync_words }} Ago ({{ repository.last_sync.ended_at | date:'medium' }} Local Time)
+      <dd ng-hide="repository.last_sync == null || repository.last_sync.ended_at == null">
+        <relative-date date="repository.last_sync.ended_at" />
+        (<short-date-time date="repository.last_sync.ended_at" /> <translate>Local Time</translate>)
       </dd>
 
       <dt translate>Next Sync</dt>
-      <dd ng-show="repository.product.sync_plan.next_sync" translate>
-        {{ repository.product.sync_plan.next_sync | date:'medium' }} (Server Time)
+      <dd ng-show="repository.product.sync_plan.next_sync">
+        <long-date-time date="repository.product.sync_plan.next_sync" /> (<translate>Server Time</translate>)
       </dd>
       <dd ng-hide="repository.product.sync_plan.next_sync" translate>
         Synced manually, no interval set.

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

@@ -19,6 +19,7 @@
           <th bst-table-column><span translate>Branch Name</span></th>
           <th bst-table-column><span translate>Version</span></th>
           <th bst-table-column><span translate>Commit</span></th>
+          <th bst-table-column><span translate>Date</span></th>
         </tr>
       </thead>
 
@@ -33,6 +34,9 @@
           <td bst-table-cell>
             {{ item.commit }}
           </td>
+          <td bst-table-cell>
+            {{ item.version_date }}
+          </td>
         </tr>
       </tbody>
     </table>

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

@@ -87,13 +87,14 @@
       <span ng-include="'products/details/partials/sync-status.html'"></span>
 
       <dt translate>Last Sync</dt>
-      <dd translate>
-        {{ product.last_sync_words }} Ago ({{ product.sync_status.finish_time | date:'medium' }} Local Time)
+      <dd>
+        <relative-date date="product.last_sync" />
+        (<long-date-time date="product.last_sync" /> <translate>Local Time</translate>)
       </dd>
 
       <dt translate>Next Sync</dt>
-      <dd ng-show="product.sync_plan.next_sync" translate>
-        {{ product.sync_plan.next_sync | date:'medium' }} (Server Time)
+      <dd ng-show="product.sync_plan.next_sync">
+        <long-date-time date="product.sync_plan.next_sync" /> (<translate>Server Time</translate>)
       </dd>
       <dd ng-hide="product.sync_plan.next_sync" translate>
         Synced manually, no interval set.

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

@@ -21,7 +21,7 @@
 angular.module('Bastion.products').controller('ProductsController',
     ['$scope', '$state', '$sce', '$location', '$uibModal', 'translate', 'Nutupane', 'Product', 'ProductBulkAction', 'CurrentOrganization', 'Notification',
     function ($scope, $state, $sce, $location, $uibModal, translate, Nutupane, Product, ProductBulkAction, CurrentOrganization, Notification) {
-        var nutupane, nutupaneParams, taskLink, getBulkParams, bulkError, params;
+        var nutupane, nutupaneParams, getBulkParams, bulkError, params;
 
         getBulkParams = function () {
             return {
@@ -90,13 +90,12 @@ angular.module('Bastion.products').controller('ProductsController',
             var success;
 
             success = function (task) {
-                var url = $state.href('task', {taskId: task.id}), message;
-
-                taskLink = $sce.trustAsHtml("<a href=" + url + ">here</a>");
-                message = translate("Product sync has been initiated in the background. " +
-                    "Click %s to monitor the progress.");
-
-                Notification.setSuccessMessage(message.replace('%s', taskLink));
+                var message = translate("Product sync has been initiated in the background.");
+                Notification.setSuccessMessage(message, {
+                    link: {
+                        children: translate("Click to monitor task progress."),
+                        href: translate("/foreman_tasks/tasks/%taskId").replace('%taskId', task.id)
+                    }});
             };
 
             ProductBulkAction.syncProducts(getBulkParams(), success, bulkError);

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/products/views/partials/product-table-sync-status.html

@@ -1,6 +1,7 @@
-<div class="list-unstyled" ng-show="product.last_sync_words">
-  <div translate>
-    Last synced {{ product.last_sync_words }} ago.
+<div class="list-unstyled" ng-show="product.last_sync">
+  <div>
+    <span translate>Last synced </span>
+    <relative-date date="product.last_sync" />.
   </div>
   <div ng-show="mostImportantSyncState(product) == 'pending'"
         translate
@@ -23,4 +24,4 @@
         1 successfully synced repository.
   </div>
 </div>
-<span ng-hide="product.last_sync_words" translate>Never synced</span>
+<span ng-hide="product.last_sync" translate>Never synced</span>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/details/views/subscription-info.html

@@ -8,7 +8,7 @@
 
       <dt translate>Description</dt>
       <dd>{{ subscription.description }}</dd>
-      
+
       <dt>
         <span translate>Virt-Who Usage Required</span>
         <i class="pf pficon-info"
@@ -26,10 +26,10 @@
       <dd>{{ subscription | subscriptionConsumedFilter }}</dd>
 
       <dt translate>Starts</dt>
-      <dd>{{ subscription.start_date | date:"short" }}</dd>
+      <dd><short-date-time date="subscription.start_date" /></dd>
 
       <dt translate>Ends</dt>
-      <dd>{{ subscription.end_date | date:"short" }}</dd>
+      <dd><short-date-time date="subscription.end_date" /></dd>
 
       <dt translate>Product ID</dt>
       <dd>{{ subscription.product_id }}</dd>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-details.html

@@ -19,12 +19,12 @@
 
     <div class="detail">
       <span class="info-label" translate>Generated On</span>
-      <span class="info-value">{{ manifestImport.generatedDate | date:"short" }}</span>
+      <span class="info-value"><short-date-time date="manifestImport.generatedDate" /></span>
     </div>
 
     <div class="detail">
       <span class="info-label" translate>Last Updated</span>
-      <span class="info-value">{{ upstream.updated | date:"short" }}</span>
+      <span class="info-value"><short-date-time date="upstream.updated" /></span>
     </div>
 
   </section>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/manifest/views/manifest-import-history.html

@@ -11,7 +11,7 @@
           <i ng-class="status.status == 'FAILURE' ? 'fa fa-warning' : 'fa fa-check'" />
           {{ status.statusMessage }}
         </td>
-        <td>{{ status.created | date:"short" }}</td>
+        <td><short-date-time date="status.created" /></td>
     </tr>
   </tbody>
 </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscription-start-date.html

@@ -1,2 +1,2 @@
 
-{{ subscription.start_date | date:"shortDate" }}{{ checkFutureDate(subscription.start_date) }}
+<short-date-time date="subscription.start_date" />{{ checkFutureDate(subscription.start_date) }}

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/subscriptions/views/subscriptions.html

@@ -51,7 +51,7 @@
           </td>
           <td bst-table-cell><div subscription-type="subscription"></div></td>
           <td bst-table-cell><div subscription-start-date="subscription"></div></td>
-          <td bst-table-cell>{{ subscription.end_date | date:"shortDate" }}</td>
+          <td bst-table-cell><short-date-time date="subscription.end_date" /></td>
           <td bst-table-cell>{{ subscription.support_level }}</td>
           <td bst-table-cell>{{ subscription.contract_number }}</td>
           <td bst-table-cell>{{ subscription.account_number }}</td>

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

@@ -42,7 +42,7 @@
       </dd>
 
       <dt translate>Next Sync</dt>
-      <dd>{{ syncPlan.next_sync | date:'medium' }}</dd>
+      <dd><long-date-time date="syncPlan.next_sync" /></dd>
 
       <dt translate>Recurring Logic</dt>
       <dd>

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

@@ -43,10 +43,10 @@
             </a>
           </td>
           <td bst-table-cell>{{ syncPlan.description }}</td>
-          <td bst-table-cell>{{ syncPlan.sync_date | date:'medium' }}</td>
+          <td bst-table-cell><long-date-time date="syncPlan.sync_date" /></td>
           <td bst-table-cell>{{ syncPlan.enabled }}</td>
           <td bst-table-cell>{{ syncPlan.interval | translate | capitalize }}</td>
-          <td bst-table-cell>{{ syncPlan.next_sync | date:'medium' }}</td>
+          <td bst-table-cell><long-date-time date="syncPlan.next_sync" /></td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/task-details.html

@@ -8,10 +8,10 @@
   <dd>{{ task.username }}</dd>
 
   <dt translate>Started At</dt>
-  <dd>{{ task.started_at | date:"short"  }}</dd>
+  <dd><short-date-time date="task.started_at" /></dd>
 
   <dt translate>Finished At</dt>
-  <dd>{{ task.ended_at | date:"short"  }}</dd>
+  <dd><short-date-time date="task.ended_at" /></dd>
 
   <dt translate>Parameters</dt>
   <dd ng-switch="isArray(task.humanized.input)">

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/tasks-table.html

@@ -32,7 +32,7 @@
             </a>
           </td>
           <td bst-table-cell>{{ task.username }}</td>
-          <td bst-table-cell>{{ task.started_at | date:"short" }}</td>
+          <td bst-table-cell><short-date-time date="task.started_at" /></td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/app/assets/javascripts/bastion_katello/tasks/views/user-tasks-table.html

@@ -22,7 +22,7 @@
               {{ task.humanized.input | taskInputShort | taskInputCompile }}
             </a>
           </td>
-          <td bst-table-cell>{{ task.started_at | date:"short" }}</td>
+          <td bst-table-cell><short-date-time date="task.started_at" /></td>
         </tr>
       </tbody>
     </table>

data/engines/bastion_katello/lib/bastion_katello/engine.rb

@@ -14,7 +14,12 @@ module BastionKatello
 
       Bastion.register_plugin(
         :name => 'bastion_katello',
-        :javascript => 'bastion_katello/bastion_katello',
+        :javascript => proc do
+          [
+            javascript_include_tag(*webpack_asset_paths('katello_common', :extension => 'js'), "data-turbolinks-track" => true),
+            javascript_include_tag('bastion_katello/bastion_katello')
+          ]
+        end,
         :stylesheet => 'bastion_katello/bastion_katello',
         :pages => %w(
           activation_keys

data/lib/katello/engine.rb

@@ -27,7 +27,7 @@ module Katello
         :pulp => {
           :default_login => 'admin',
           :url => 'https://localhost/pulp/api/v2/',
-          :bulk_load_size => 100,
+          :bulk_load_size => 2000,
           :skip_checksum_validation => false,
           :upload_chunk_size => 1_048_575, # upload size in bytes to pulp. see SSLRenegBufferSize in apache
           :sync_threads => 4,
@@ -80,8 +80,8 @@ module Katello
     end
 
     initializer "katello.initialize_cp_listener", :before => :finisher_hook do
-      unless ForemanTasks.dynflow.config.remote? || File.basename($PROGRAM_NAME) == 'rake' || Rails.env.test?
-        ForemanTasks.dynflow.config.on_init do |world|
+      unless Rails.env.test?
+        ForemanTasks.dynflow.config.post_executor_init do |world|
           ::Actions::Candlepin::ListenOnCandlepinEvents.ensure_running(world)
           ::Actions::Katello::EventQueue::Monitor.ensure_running(world)
         end