foreman-tasks 12.0.0 → 12.1.0

data/locale/zh_CN/foreman_tasks.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman-tasks 11.0.5\n"
+"Project-Id-Version: foreman-tasks 12.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-12 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -23,9 +23,6 @@ msgstr "%(last)s 最后 %(time)s"
 msgid "%(older)s Older %(time)s"
 msgstr "%(older)s 较老 %(time)s"
 
-msgid "%s Selected Tasks"
-msgstr "%s 选择的任务"
-
 msgid "%s is not valid format of cron line"
 msgstr "%s 不是正确的 cron 行"
 
@@ -63,13 +60,13 @@ msgid "Action"
 msgstr "操作"
 
 msgid "Action with sub plans"
-msgstr ""
+msgstr "有子计划的操作"
 
 msgid "Active"
 msgstr "活跃"
 
-msgid "Active Filters:"
-msgstr "活跃的过滤器："
+msgid "Active Filters"
+msgstr ""
 
 msgid "Active or disabled recurring logic with purpose %s already exists"
 msgstr "带有目的 %s 的活跃或禁用的周期性逻辑已存在"
@@ -99,6 +96,9 @@ msgstr "返回到任务"
 msgid "Backtrace"
 msgstr "回溯"
 
+msgid "Blocks"
+msgstr ""
+
 msgid "Bulk action"
 msgstr "批量操作"
 
@@ -108,6 +108,12 @@ msgstr "取消"
 msgid "Cancel Selected"
 msgstr "取消选择"
 
+msgid "Cancel Selected Tasks"
+msgstr ""
+
+msgid "Cancel Task"
+msgstr ""
+
 msgid "Cancel enforced: the task might be still running on the proxy"
 msgstr "强制取消：任务可能仍在代理服务器上运行"
 
@@ -117,9 +123,6 @@ msgstr "取消重复逻辑"
 msgid "Cancel selected cancellable tasks"
 msgstr "取消所选的可取消的任务"
 
-msgid "Cancel selected tasks"
-msgstr "取消选择的任务"
-
 msgid "Cancel specific tasks by ID"
 msgstr "根据 ID 取消特定任务"
 
@@ -153,9 +156,6 @@ msgstr "将请求 id %{request_id} 改为保存的 id %%{saved_id}"
 msgid "Check for long running tasks"
 msgstr "检查长时间运行的任务"
 
-msgid "Clear All Filters"
-msgstr "清除所有过滤器"
-
 msgid "Clear Cancelled"
 msgstr "清除取消"
 
@@ -198,6 +198,12 @@ msgstr "通过搜索查询删除重复逻辑"
 msgid "Deliver notifications about long running tasks"
 msgstr "提供有关长时间运行的任务的通知"
 
+msgid "Dependencies"
+msgstr ""
+
+msgid "Depends on"
+msgstr ""
+
 msgid "Details"
 msgstr "详情"
 
@@ -276,12 +282,15 @@ msgstr "强制取消"
 msgid "Force Cancel Selected"
 msgstr "强制取消选择"
 
-msgid "Force Cancel selected tasks"
-msgstr "强制取消选择的任务"
-
 msgid "Force Unlock"
 msgstr "强制解除锁定"
 
+msgid "Force Unlock Selected Tasks"
+msgstr ""
+
+msgid "Force Unlock Task"
+msgstr ""
+
 msgid "Foreman Tasks"
 msgstr "Foreman 任务"
 
@@ -316,7 +325,7 @@ msgid "Input"
 msgstr "输入"
 
 msgid "Invalid URL"
-msgstr ""
+msgstr "无效 URL"
 
 msgid "Iteration limit"
 msgstr "重述限制"
@@ -396,6 +405,9 @@ msgstr "无法启动任何任务"
 msgid "No. of Tasks"
 msgstr "任务号"
 
+msgid "None"
+msgstr ""
+
 msgid "Not all the selected tasks can be cancelled"
 msgstr "并非所有选定的任务都可以取消"
 
@@ -520,12 +532,15 @@ msgstr "恢复"
 msgid "Resume Selected"
 msgstr "恢复选择"
 
+msgid "Resume Selected Tasks"
+msgstr ""
+
+msgid "Resume Task"
+msgstr ""
+
 msgid "Resume all paused error tasks"
 msgstr "恢复所有暂停的错误任务"
 
-msgid "Resume selected tasks"
-msgstr "恢复选择的任务"
-
 msgid "Resume specific tasks by ID"
 msgstr "根据 ID 恢复特定任务"
 
@@ -559,9 +574,6 @@ msgstr "搜索查询"
 msgid "See %{link} for more details on how to resolve the issue"
 msgstr "有关如何解决此问题的更多详细信息，请参见%{link}"
 
-msgid "Select Action"
-msgstr "选择操作"
-
 msgid "Select all {count} tasks"
 msgstr "选择所有 {count} 任务"
 
@@ -619,6 +631,9 @@ msgstr "停止与搜索字符串匹配的任务"
 msgid "Stopped"
 msgstr "停止"
 
+msgid "Stopped tasks by result"
+msgstr ""
+
 msgid "Sub tasks"
 msgstr "子任务"
 
@@ -652,6 +667,9 @@ msgstr "任务无法取消"
 msgid "Task count"
 msgstr "任务计数"
 
+msgid "Task dependencies"
+msgstr ""
+
 msgid "Task group common"
 msgstr "任务组一般事项"
 
@@ -704,8 +722,26 @@ msgstr[0] "系统中有%{count}个暂停的任务需要注意"
 msgid "This action will delete all cancelled recurring logics. Please note that this action can't be reversed."
 msgstr "此操作将删除所有取消的重复逻辑。请注意，此操作无法撤消。"
 
-msgid "This will %(action)s %(number)s task(s), putting them in the %(state)s state. Are you sure?"
-msgstr "这将 %(action)s %(number)s 任务，把它们置于 %(state)s 状态。确定吗？"
+msgid "This task may have dependencies on other tasks or may be blocking other tasks from executing. Dependencies are established through task chaining relationships."
+msgstr ""
+
+msgid "This will cancel %(number)s task(s), putting them in the stopped state. Are you sure?"
+msgstr ""
+
+msgid "This will cancel task \\\"%(taskName)s\\\", putting it in the stopped state. Are you sure?"
+msgstr ""
+
+msgid "This will force unlock %(number)s task(s). This may cause harm and should be used with caution. Are you sure?"
+msgstr ""
+
+msgid "This will force unlock task \\\"%(taskName)s\\\". This may cause harm and should be used with caution. Are you sure?"
+msgstr ""
+
+msgid "This will resume %(number)s task(s), putting them in the running state. Are you sure?"
+msgstr ""
+
+msgid "This will resume task \\\"%(taskName)s\\\", putting it in the running state. Are you sure?"
+msgstr ""
 
 msgid "This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."
 msgstr "这将解锁任务正在针对其运行的资源。请注意，这可能会导致状态不一致，应该谨慎使用，然后再确保任务无法恢复。"

data/locale/zh_TW/foreman_tasks.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman-tasks 11.0.5\n"
+"Project-Id-Version: foreman-tasks 12.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-12 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -23,9 +23,6 @@ msgstr ""
 msgid "%(older)s Older %(time)s"
 msgstr ""
 
-msgid "%s Selected Tasks"
-msgstr ""
-
 msgid "%s is not valid format of cron line"
 msgstr "%s 不是 cron 行的正確格式"
 
@@ -68,7 +65,7 @@ msgstr ""
 msgid "Active"
 msgstr "啟用中"
 
-msgid "Active Filters:"
+msgid "Active Filters"
 msgstr ""
 
 msgid "Active or disabled recurring logic with purpose %s already exists"
@@ -99,6 +96,9 @@ msgstr ""
 msgid "Backtrace"
 msgstr "追蹤"
 
+msgid "Blocks"
+msgstr ""
+
 msgid "Bulk action"
 msgstr "批次動作"
 
@@ -108,6 +108,12 @@ msgstr "取消"
 msgid "Cancel Selected"
 msgstr ""
 
+msgid "Cancel Selected Tasks"
+msgstr ""
+
+msgid "Cancel Task"
+msgstr ""
+
 msgid "Cancel enforced: the task might be still running on the proxy"
 msgstr "強制取消：任務可能還在代理伺服器上執行"
 
@@ -117,9 +123,6 @@ msgstr "取消週期邏輯"
 msgid "Cancel selected cancellable tasks"
 msgstr ""
 
-msgid "Cancel selected tasks"
-msgstr ""
-
 msgid "Cancel specific tasks by ID"
 msgstr ""
 
@@ -153,9 +156,6 @@ msgstr ""
 msgid "Check for long running tasks"
 msgstr ""
 
-msgid "Clear All Filters"
-msgstr ""
-
 msgid "Clear Cancelled"
 msgstr ""
 
@@ -198,6 +198,12 @@ msgstr ""
 msgid "Deliver notifications about long running tasks"
 msgstr ""
 
+msgid "Dependencies"
+msgstr ""
+
+msgid "Depends on"
+msgstr ""
+
 msgid "Details"
 msgstr "詳細資訊"
 
@@ -276,12 +282,15 @@ msgstr ""
 msgid "Force Cancel Selected"
 msgstr ""
 
-msgid "Force Cancel selected tasks"
-msgstr ""
-
 msgid "Force Unlock"
 msgstr "強制解除鎖定"
 
+msgid "Force Unlock Selected Tasks"
+msgstr ""
+
+msgid "Force Unlock Task"
+msgstr ""
+
 msgid "Foreman Tasks"
 msgstr ""
 
@@ -396,6 +405,9 @@ msgstr ""
 msgid "No. of Tasks"
 msgstr "任務編號"
 
+msgid "None"
+msgstr ""
+
 msgid "Not all the selected tasks can be cancelled"
 msgstr ""
 
@@ -520,12 +532,15 @@ msgstr "繼續"
 msgid "Resume Selected"
 msgstr ""
 
-msgid "Resume all paused error tasks"
-msgstr "繼續所有處於暫停狀態的錯誤任務"
+msgid "Resume Selected Tasks"
+msgstr ""
 
-msgid "Resume selected tasks"
+msgid "Resume Task"
 msgstr ""
 
+msgid "Resume all paused error tasks"
+msgstr "繼續所有處於暫停狀態的錯誤任務"
+
 msgid "Resume specific tasks by ID"
 msgstr "透過 ID 繼續特定任務"
 
@@ -559,9 +574,6 @@ msgstr "搜尋查詢"
 msgid "See %{link} for more details on how to resolve the issue"
 msgstr ""
 
-msgid "Select Action"
-msgstr "選擇動作"
-
 msgid "Select all {count} tasks"
 msgstr ""
 
@@ -619,6 +631,9 @@ msgstr ""
 msgid "Stopped"
 msgstr ""
 
+msgid "Stopped tasks by result"
+msgstr ""
+
 msgid "Sub tasks"
 msgstr "子任務"
 
@@ -652,6 +667,9 @@ msgstr ""
 msgid "Task count"
 msgstr "工作數量"
 
+msgid "Task dependencies"
+msgstr ""
+
 msgid "Task group common"
 msgstr "任務群組的一般事項"
 
@@ -705,7 +723,25 @@ msgstr[1] ""
 msgid "This action will delete all cancelled recurring logics. Please note that this action can't be reversed."
 msgstr ""
 
-msgid "This will %(action)s %(number)s task(s), putting them in the %(state)s state. Are you sure?"
+msgid "This task may have dependencies on other tasks or may be blocking other tasks from executing. Dependencies are established through task chaining relationships."
+msgstr ""
+
+msgid "This will cancel %(number)s task(s), putting them in the stopped state. Are you sure?"
+msgstr ""
+
+msgid "This will cancel task \\\"%(taskName)s\\\", putting it in the stopped state. Are you sure?"
+msgstr ""
+
+msgid "This will force unlock %(number)s task(s). This may cause harm and should be used with caution. Are you sure?"
+msgstr ""
+
+msgid "This will force unlock task \\\"%(taskName)s\\\". This may cause harm and should be used with caution. Are you sure?"
+msgstr ""
+
+msgid "This will resume %(number)s task(s), putting them in the running state. Are you sure?"
+msgstr ""
+
+msgid "This will resume task \\\"%(taskName)s\\\", putting it in the running state. Are you sure?"
 msgstr ""
 
 msgid "This will unlock the resources that the task is running against. Please note that this might lead to inconsistent state and should be used with caution, after making sure that the task can't be resumed."

data/test/controllers/api/tasks_controller_test.rb

@@ -37,7 +37,7 @@ module ForemanTasks
         end
 
         it 'supports ordering by duration' do
-          get :index, params: { :sort_by => 'duration' }
+          get :index, params: { :order => 'duration' }
           assert_response :success
           data = JSON.parse(response.body)
           assert_equal 'duration', data.dig('sort', 'by')
@@ -104,7 +104,7 @@ module ForemanTasks
         end
 
         it 'shows duration column' do
-          task = ForemanTasks::Task.with_duration.find(FactoryBot.create(:dynflow_task).id)
+          task = ForemanTasks::Task.select_duration.find(FactoryBot.create(:dynflow_task).id)
           get :show, params: { id: task.id }, session: set_session_user
           assert_response :success
           data = JSON.parse(response.body)
@@ -114,7 +114,7 @@ module ForemanTasks
 
       describe 'GET /api/tasks/index' do
         it 'shows duration column' do
-          task = ForemanTasks::Task.with_duration.find(FactoryBot.create(:dynflow_task).id)
+          task = ForemanTasks::Task.select_duration.find(FactoryBot.create(:dynflow_task).id)
           get :index, session: set_session_user
           assert_response :success
           data = JSON.parse(response.body)
@@ -203,6 +203,32 @@ module ForemanTasks
         end
       end
 
+      describe 'GET /api/tasks/:id/details' do
+        it 'shows task dependencies with correct task names' do
+          # Tests https://projects.theforeman.org/issues/39130
+          dependency_task = FactoryBot.create(:dynflow_task, :user_create_task, label: 'Actions::User::Create')
+          blocking_task = FactoryBot.create(:dynflow_task, :user_create_task, label: 'Actions::User::Create')
+
+          ForemanTasks.dynflow.world.persistence.stubs(:find_execution_plan_dependencies)
+                      .with(dependency_task.execution_plan.id)
+                      .returns([])
+          ForemanTasks.dynflow.world.persistence.stubs(:find_blocked_execution_plans)
+                      .with(dependency_task.execution_plan.id)
+                      .returns([blocking_task.external_id])
+
+          get :details, params: { id: dependency_task.id }
+          assert_response :success
+
+          data = JSON.parse(response.body)
+          assert_kind_of Array, data['blocks']
+          assert_equal 1, data['blocks'].length
+
+          blocking_task_data = data['blocks'].first
+          assert_equal blocking_task.id, blocking_task_data['id']
+          assert_equal blocking_task.to_label, blocking_task_data['humanized']
+        end
+      end
+
       describe 'POST /api/tasks/bulk_stop' do
         it 'requires search or task_ids parameter' do
           post :bulk_stop

data/test/controllers/tasks_controller_test.rb

@@ -93,7 +93,7 @@ module ForemanTasks
 
       describe 'index' do
         it 'shows duration column' do
-          task = ForemanTasks::Task.with_duration.find(FactoryBot.create(:some_task).id)
+          task = ForemanTasks::Task.select_duration.find(FactoryBot.create(:some_task).id)
           get(:index, params: {}, session: set_session_user)
           assert_response :success
           row = CSV.parse(response.body, headers: true).first
@@ -122,7 +122,7 @@ module ForemanTasks
 
         it 'shows duration column' do
           parent = ForemanTasks::Task.find(FactoryBot.create(:some_task).id)
-          child = ForemanTasks::Task.with_duration.find(FactoryBot.create(:some_task).id)
+          child = ForemanTasks::Task.select_duration.find(FactoryBot.create(:some_task).id)
           child.parent_task_id = parent.id
           child.save!
           get(:sub_tasks, params: { id: parent.id }, session: set_session_user)
@@ -168,6 +168,50 @@ module ForemanTasks
           end
         end
       end
+
+      describe 'cancel' do
+        it 'finds the dynflow task and cancels it' do
+          task = FactoryBot.create(:dynflow_task)
+          ForemanTasks::Task::DynflowTask.any_instance.stubs(:cancel).returns(true)
+
+          post(:cancel, params: { id: task.id }, session: set_session_user)
+
+          assert_response :success
+          data = JSON.parse(response.body)
+          assert_equal 'OK', data['statusText']
+        end
+
+        it 'returns bad request when task cannot be cancelled' do
+          task = FactoryBot.create(:dynflow_task)
+          ForemanTasks::Task::DynflowTask.any_instance.stubs(:cancel).returns(false)
+
+          post(:cancel, params: { id: task.id }, session: set_session_user)
+
+          assert_response :bad_request
+        end
+      end
+
+      describe 'abort' do
+        it 'finds the dynflow task and aborts it' do
+          task = FactoryBot.create(:dynflow_task)
+          ForemanTasks::Task::DynflowTask.any_instance.stubs(:abort).returns(true)
+
+          post(:abort, params: { id: task.id }, session: set_session_user)
+
+          assert_response :success
+          data = JSON.parse(response.body)
+          assert_equal 'OK', data['statusText']
+        end
+
+        it 'returns bad request when the task cannot be aborted' do
+          task = FactoryBot.create(:dynflow_task)
+          ForemanTasks::Task::DynflowTask.any_instance.stubs(:abort).returns(false)
+
+          post(:abort, params: { id: task.id }, session: set_session_user)
+
+          assert_response :bad_request
+        end
+      end
     end
   end
 end

data/webpack/ForemanTasks/Components/TaskActions/TaskAction.test.js

@@ -12,6 +12,14 @@ jest.mock('foremanReact/components/common/table', () => ({
 }));
 
 jest.mock('foremanReact/redux/API');
+jest.mock('foremanReact/components/ToastsList', () => ({
+  addToast: toast => ({
+    type: 'TOASTS_ADD',
+    payload: {
+      message: toast,
+    },
+  }),
+}));
 
 const task = ['some-id', 'some-name'];
 

data/webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.js

@@ -1,5 +1,6 @@
 import { translate as __, sprintf } from 'foremanReact/common/I18n';
 import { addToast } from 'foremanReact/components/ToastsList';
+import { getURIQuery } from 'foremanReact/common/helpers';
 import { TASKS_DASHBOARD_JS_QUERY_MODES } from '../TasksDashboard/TasksDashboardConstants';
 import { timeToHoursNumber } from '../TasksDashboard/TasksDashboardHelper';
 import {
@@ -8,7 +9,12 @@ import {
   warningToastData,
 } from '../common/ToastsHelpers';
 
-export const convertDashboardQuery = query => {
+const getTasksQuery = () => {
+  const url = window.location.pathname + window.location.search;
+  return getURIQuery(url);
+};
+
+export const convertDashboardQuery = () => {
   const {
     time_mode: timeMode,
     time_horizon: timeHorizon,
@@ -16,7 +22,7 @@ export const convertDashboardQuery = query => {
     result,
     search,
     ...rest
-  } = query;
+  } = getTasksQuery();
 
   const hours = timeToHoursNumber(timeHorizon);
   const timestamp = new Date(new Date() - hours * 60 * 60 * 1000);

data/webpack/ForemanTasks/Components/TaskActions/TaskActionHelpers.test.js

@@ -1,14 +1,19 @@
 import { convertDashboardQuery } from './TaskActionHelpers';
-import {
-  TASKS_DASHBOARD_JS_QUERY_MODES,
-  TASKS_DASHBOARD_AVAILABLE_TIMES,
-} from '../TasksDashboard/TasksDashboardConstants';
 
 let realDate;
 
 describe('convertDashboardQuery', () => {
+  const mockLocation = query => {
+    global.window = Object.create(window);
+    Object.defineProperty(window, 'location', {
+      value: {
+        pathname: '/foreman_tasks/tasks',
+        search: query,
+      },
+      writable: true,
+    });
+  };
   it('convertDashboardQuery should work with full query', () => {
-    // Setup
     const currentDate = new Date('2020-05-08T11:01:58.135Z');
     realDate = Date;
     global.Date = class extends Date {
@@ -20,48 +25,35 @@ describe('convertDashboardQuery', () => {
         return currentDate;
       }
     };
-    const query = {
-      time_mode: TASKS_DASHBOARD_JS_QUERY_MODES.RECENT,
-      time_horizon: TASKS_DASHBOARD_AVAILABLE_TIMES.WEEK,
-      state: 'stopped',
-      result: 'error',
-      search: 'action~job',
-    };
-    const expected =
-      '(state=stopped) and (result=error) and (action~job) and (state_updated_at>2020-05-01T11:01:58.135Z or null? state_updated_at)';
+    mockLocation('?state=stopped&result=error&search=action~job');
+    const expected = '(state=stopped) and (result=error) and (action~job)';
 
-    expect(convertDashboardQuery(query)).toEqual({ search: expected });
+    expect(convertDashboardQuery()).toEqual({ search: expected });
 
-    const query2 = {
-      ...query,
-      time_mode: TASKS_DASHBOARD_JS_QUERY_MODES.OLDER,
-    };
-    const expected2 =
-      '(state=stopped) and (result=error) and (action~job) and (state_updated_at<=2020-05-01T11:01:58.135Z)';
-    expect(convertDashboardQuery(query2)).toEqual({ search: expected2 });
-    // Cleanup
+    mockLocation('?state=stopped&result=error&search=action~job');
+    const expected2 = '(state=stopped) and (result=error) and (action~job)';
+    expect(convertDashboardQuery()).toEqual({ search: expected2 });
     global.Date = realDate;
   });
   it('convertDashboardQuery should work with only search query', () => {
-    const query = {
-      search: 'action~job',
-    };
-    expect(convertDashboardQuery(query)).toEqual({ search: '(action~job)' });
+    mockLocation('?search=action~job');
+    expect(convertDashboardQuery()).toEqual({ search: '(action~job)' });
   });
   it('convertDashboardQuery should work with no query', () => {
-    const query = {};
-    expect(convertDashboardQuery(query)).toEqual({});
+    mockLocation('');
+    expect(convertDashboardQuery()).toEqual({});
   });
   it('convertDashboardQuery should not override unknown keys', () => {
-    const query = { weather: 'nice', search: 'okay', number: 7 };
-    expect(convertDashboardQuery(query)).toEqual({
+    const query = { weather: 'nice', search: 'okay', number: '7' };
+    mockLocation('?weather=nice&search=okay&number=7');
+    expect(convertDashboardQuery()).toEqual({
       ...query,
       search: '(okay)',
     });
   });
   it('convertDashboardQuery should expand other result', () => {
-    const query = { result: 'other' };
-    expect(convertDashboardQuery(query)).toEqual({
+    mockLocation('?result=other');
+    expect(convertDashboardQuery()).toEqual({
       search: '(result ^ (pending, cancelled))',
     });
   });