foreman-tasks 7.1.1 → 7.2.1

data/locale/zh_TW/foreman_tasks.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: Foreman\n"
+"Project-Id-Version: foreman_tasks 7.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-12 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/test/unit/task_test.rb

@@ -182,17 +182,14 @@ class TasksTest < ActiveSupport::TestCase
   end
 
   describe 'consistency check' do
-    let(:consistent_task) { FactoryBot.create(:dynflow_task, :sync_with_dynflow => true) }
-    let(:inconsistent_task) { FactoryBot.create(:dynflow_task, :inconsistent_dynflow_task) }
-
     it 'ensures the tasks marked as running are really running in Dynflow' do
-      _(consistent_task.state).must_equal 'planned'
-      _(inconsistent_task.state).must_equal 'running'
+      task = ForemanTasks.sync_task(Support::DummyDynflowAction)
+      task.update(:state => 'running') # Updating state updates the timestamp
+      task.update(:state_updated_at => Time.zone.now - 5.minutes)
 
       ForemanTasks::Task::DynflowTask.consistency_check
-
-      _(consistent_task.reload.state).must_equal 'planned'
-      _(inconsistent_task.reload.state).must_equal 'planned'
+      task.reload
+      _(task.state).must_equal 'stopped'
     end
   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.1.1
+  version: 7.2.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dynflow