foreman-tasks 7.2.0 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5d611523d1262879b33177bf9c1f4c394142fee8433c2fda798cb4063b60f99
-  data.tar.gz: 1e7974c6fde725d0fe46dcffd6793c7f4b078c3c6e2e3429dce42180e61e4044
+  metadata.gz: 84fbe8d91ad4109b2f32bed34ca474da3274062d1413572f22da460ba84fae2e
+  data.tar.gz: 6176aacd201d2652ffdec31de70a37f34f3cdee4213fcabbea5206692fa3737c
 SHA512:
-  metadata.gz: 6f358b767cf2c8f2f6d31a43aa6c1fca27a6db053311d4540cea15d11c7c76758db192d5b39ecef17fcfc9d89e9e99a233c6b3d14fadd41efcca709aea37704b
-  data.tar.gz: 9c08bf19e2f8bdc05add76a9b8e9b783407b03ba99f0c47325454468a4654e44296f8dafd87e40a5d58ed771edb58900c0ac41738202efce5043193b5580a50c
+  metadata.gz: 2fe679d1b7eef698c3ec42e4d31590cc674e556a91cdd490c4da01aa7ba61988c9a1c1f730972a9d55829b09550fe4235e7192157b976aa71398558a632bae70
+  data.tar.gz: 581e0a7c39164915da8f19505745f6b7c98cbe4dbdbc088073e6fc7d6224b4fb209443ac48a566e008c59ee0e7b53a351b70808efa72d2ffa6fa7c0cd79f0521

data/app/helpers/foreman_tasks/foreman_tasks_helper.rb

@@ -52,8 +52,8 @@ module ForemanTasks
       default = '-'
       return default if recurring_logic.done? || recurring_logic.disabled?
 
-      last_task = recurring_logic.tasks.order(:start_at).last
-      last_task ? last_task.start_at : default
+      upcoming_task = recurring_logic.next_task
+      upcoming_task ? upcoming_task.start_at : default
     end
 
     def time_f(f, attr, field_options = {}, time_options = {}, html_options = {})

data/app/lib/actions/middleware/watch_delegated_proxy_sub_tasks.rb

@@ -51,7 +51,7 @@ module Actions
 
       def notify(event, tasks)
         tasks.each do |task|
-          action.plan_event(event, execution_plan_id: task.execution_plan_id, step_id: task.step_id)
+          action.plan_event(event, execution_plan_id: task.execution_plan_id, step_id: task.step_id, optional: true)
         end
       end
 

data/app/models/foreman_tasks/recurring_logic.rb

@@ -29,6 +29,14 @@ module ForemanTasks
       %w[active disabled finished cancelled failed]
     end
 
+    def last_task
+      tasks.order(:started_at).where.not(started_at: nil).last
+    end
+
+    def next_task
+      tasks.order(:start_at).where(started_at: nil).last
+    end
+
     def enabled=(value)
       task = tasks.find_by(:state => :scheduled)
       if task

data/app/views/foreman_tasks/api/recurring_logics/base.json.rabl

@@ -1,4 +1,9 @@
 object @recurring_logic
 
 attributes :id, :cron_line, :end_time, :iteration, :task_group_id, :state,
-           :max_iteration
+           :max_iteration, :purpose
+
+node(:task_count) { |rl| rl.tasks.count }
+node(:action) { |rl| rl.tasks.first.try(:action) }
+node(:last_occurence) { |rl| rl.last_task&.started_at }
+node(:next_occurence) { |rl| rl.next_task&.start_at }

data/app/views/foreman_tasks/recurring_logics/index.html.erb

@@ -56,7 +56,7 @@
       <td><%= recurring_logic.cron_line %></td>
       <td><%= link_to(recurring_logic.tasks.count, foreman_tasks_tasks_url(:search => "task_group.id = #{recurring_logic.task_group.id}")) %></td>
       <td><%= format_task_input(recurring_logic.tasks.first) %></td>
-      <td><%= recurring_logic.tasks.order(:started_at).where('started_at IS NOT NULL').last.try(:started_at) || "-" %></td>
+      <td><%= recurring_logic.last_task.try(:started_at) || "-" %></td>
       <td><%= recurring_logic_next_occurrence recurring_logic %></td>
       <td><%= recurring_logic.iteration %></td>
       <td><%= format_recurring_logic_limit recurring_logic.max_iteration %></td>

data/config/routes.rb

@@ -72,7 +72,6 @@ Foreman::Application.routes.draw do
         require 'sidekiq/web'
         redis_url = ENV['DYNFLOW_REDIS_URL'] || SETTINGS.dig(:dynflow, :redis_url)
         Sidekiq.redis = { url: redis_url }
-        Sidekiq::Web.set :sessions, false
         mount Sidekiq::Web => '/sidekiq', :constraints => ForemanTasks::Dynflow::SidekiqConsoleConstraint.new
       end
     end

data/db/migrate/20211123170430_tasks_settings_to_dsl_category.rb

@@ -1,5 +1,5 @@
 class TasksSettingsToDslCategory < ActiveRecord::Migration[6.0]
   def up
-    Setting.where(category: 'Setting::ForemanTasks').update_all(category: 'Setting')
+    Setting.where(category: 'Setting::ForemanTasks').update_all(category: 'Setting') if column_exists?(:settings, :category)
   end
 end

data/lib/foreman_tasks/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasks
-  VERSION = '7.2.0'.freeze
+  VERSION = '7.2.1'.freeze
 end

data/webpack/ForemanTasks/Components/TaskDetails/Components/TaskButtons.js

@@ -48,7 +48,7 @@ export const TaskButtons = ({
         <span
           className={`glyphicon glyphicon-refresh ${taskReload ? 'spin' : ''}`}
         />
-        {__(`${taskReload ? 'Stop' : 'Start'}  auto-reloading`)}
+        {taskReload ? __('Stop auto-reloading') : __('Start auto-reloading')}
       </Button>
       <Button
         className="dynflow-button"

data/webpack/ForemanTasks/Components/TaskDetails/Components/__tests__/__snapshots__/TaskButtons.test.js.snap

@@ -19,7 +19,7 @@ exports[`Task rendering render with minimal Props 1`] = `
     <span
       className="glyphicon glyphicon-refresh "
     />
-    Start  auto-reloading
+    Start auto-reloading
   </Button>
   <Button
     active={false}
@@ -118,7 +118,7 @@ exports[`Task rendering render with some Props 1`] = `
     <span
       className="glyphicon glyphicon-refresh spin"
     />
-    Stop  auto-reloading
+    Stop auto-reloading
   </Button>
   <Button
     active={false}

data/webpack/ForemanTasks/Components/TaskDetails/TaskDetails.js

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { Tab, Tabs } from 'patternfly-react';
-import { translate as __ } from 'foremanReact/common/I18n';
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
 import { STATUS } from 'foremanReact/constants';
 import MessageBox from 'foremanReact/components/common/MessageBox';
 import Task from './Components/Task';
@@ -49,7 +49,7 @@ const TaskDetails = ({
       <MessageBox
         key="task-details-error"
         icontype="error-circle-o"
-        msg={__(`Could not receive data: ${APIerror && APIerror.message}`)}
+        msg={sprintf(__('Could not receive data: %s'), APIerror?.message)}
       />
     );
   }

data/webpack/ForemanTasks/Components/TasksTable/Components/SelectAllAlert.js

@@ -1,3 +1,4 @@
+import { FormattedMessage } from 'react-intl';
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Alert, Button } from 'patternfly-react';
@@ -17,14 +18,19 @@ export const SelectAllAlert = ({
         Math.min(itemCount, perPage)
       )}
       <Button bsStyle="link" onClick={selectAllRows}>
-        {__('Select All')}
-        <b> {itemCount} </b> {__('tasks.')}
+        <FormattedMessage
+          id="select-all-tasks"
+          values={{
+            count: <b>{itemCount}</b>,
+          }}
+          defaultMessage={__('Select all {count} tasks')}
+        />
       </Button>
     </React.Fragment>
   );
   const undoSelectText = (
     <React.Fragment>
-      {sprintf(__(`All %s tasks are selected. `), itemCount)}
+      {sprintf(__('All %s tasks are selected.'), itemCount)}
       <Button bsStyle="link" onClick={unselectAllRows}>
         {__('Undo selection')}
       </Button>

data/webpack/ForemanTasks/Components/TasksTable/Components/__test__/__snapshots__/SelectAllAlert.test.js.snap

@@ -6,7 +6,7 @@ exports[`SelectAllAlert renders SelectAllAlert with all rows selected 1`] = `
   onDismiss={null}
   type="info"
 >
-  All 7 tasks are selected. 
+  All 7 tasks are selected.
   <Button
     active={false}
     block={false}
@@ -35,14 +35,17 @@ exports[`SelectAllAlert renders SelectAllAlert with perPage > itemCout 1`] = `
     disabled={false}
     onClick={[MockFunction]}
   >
-    Select All
-    <b>
-       
-      7
-       
-    </b>
-     
-    tasks.
+    <FormattedMessage
+      defaultMessage="Select all {count} tasks"
+      id="select-all-tasks"
+      values={
+        Object {
+          "count": <b>
+            7
+          </b>,
+        }
+      }
+    />
   </Button>
 </Alert>
 `;
@@ -62,14 +65,17 @@ exports[`SelectAllAlert renders SelectAllAlert without all rows selected 1`] = `
     disabled={false}
     onClick={[MockFunction]}
   >
-    Select All
-    <b>
-       
-      7
-       
-    </b>
-     
-    tasks.
+    <FormattedMessage
+      defaultMessage="Select all {count} tasks"
+      id="select-all-tasks"
+      values={
+        Object {
+          "count": <b>
+            7
+          </b>,
+        }
+      }
+    />
   </Button>
 </Alert>
 `;

data/webpack/ForemanTasks/Components/TasksTable/TasksBulkActions.js

@@ -53,7 +53,7 @@ const handleErrorResume = (error, dispatch) => {
   dispatch({ type: TASKS_RESUME_FAILURE, error });
   dispatch(
     addToast(
-      errorToastData(`${__(`Cannot resume tasks at the moment`)} ${error}`)
+      errorToastData(`${__('Cannot resume tasks at the moment')} ${error}`)
     )
   );
 };
@@ -112,7 +112,7 @@ const handleErrorCancel = (error, dispatch) => {
   dispatch({ type: TASKS_CANCEL_FAILURE, error });
   dispatch(
     addToast(
-      errorToastData(`${__(`Cannot cancel tasks at the moment`)} ${error}`)
+      errorToastData(`${__('Cannot cancel tasks at the moment')} ${error}`)
     )
   );
 };
@@ -175,7 +175,7 @@ const handleErrorForceCancel = (error, dispatch) => {
   dispatch(
     addToast(
       errorToastData(
-        `${__(`Cannot force cancel tasks at the moment`)} ${error}`
+        `${__('Cannot force cancel tasks at the moment')} ${error}`
       )
     )
   );

data/webpack/ForemanTasks/Components/TasksTable/TasksTable.js

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Table } from 'foremanReact/components/common/table';
 import { STATUS } from 'foremanReact/constants';
 import MessageBox from 'foremanReact/components/common/MessageBox';
-import { translate as __ } from 'foremanReact/common/I18n';
+import { translate as __, sprintf } from 'foremanReact/common/I18n';
 import Pagination from 'foremanReact/components/Pagination';
 import { getURIQuery } from 'foremanReact/common/helpers';
 import createTasksTableSchema from './TasksTableSchema';
@@ -68,7 +68,7 @@ const TasksTable = ({
       <MessageBox
         key="tasks-table-error"
         icontype="error-circle-o"
-        msg={__(`Could not receive data: ${error && error.message}`)}
+        msg={sprintf(__('Could not receive data: %s'), error?.message)}
       />
     );
   }

data/webpack/ForemanTasks/Components/TasksTable/__tests__/__snapshots__/TasksTable.test.js.snap

@@ -4,7 +4,7 @@ exports[`TasksTable rendering render with error Props 1`] = `
 <MessageBox
   icontype="error-circle-o"
   key="tasks-table-error"
-  msg="Could not receive data: null"
+  msg="Could not receive data: "
 />
 `;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 7.2.0
+  version: 7.2.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-20 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow