foreman-tasks 4.0.0 → 5.0.0

data/locale/zh_CN/foreman_tasks.po

@@ -74,6 +74,9 @@ msgstr "已选择所有％s任务。 "
 msgid "All proxies with the required feature are unavailable at the moment"
 msgstr "具备所需功能的所有代理暂时都不可用"
 
+msgid "Allow proxy batch tasks"
+msgstr ""
+
 msgid "Allow triggering tasks on the smart proxy in batches"
 msgstr "允许批量触发智能代理上的任务"
 
@@ -99,15 +102,15 @@ msgstr "取消"
 msgid "Cancel Selected"
 msgstr "取消选择"
 
-msgid "Cancel all cancellable tasks"
-msgstr "取消所有可取消的任务"
-
 msgid "Cancel enforced: the task might be still running on the proxy"
 msgstr "強制取消：任務可能還在代理伺服器上執行"
 
 msgid "Cancel recurring logic"
 msgstr "取消週期邏輯"
 
+msgid "Cancel selected cancellable tasks"
+msgstr ""
+
 msgid "Cancel selected tasks"
 msgstr "取消选择的任务"
 
@@ -156,6 +159,9 @@ msgstr "与任务冲突 :"
 msgid "Could not cancel step."
 msgstr ""
 
+msgid "Could not receive data: ${APIerror && APIerror.message}"
+msgstr ""
+
 msgid "Could not receive data: ${error && error.message}"
 msgstr "无法接收数据: ${error && error.message}"
 
@@ -207,6 +213,9 @@ msgstr "清空批次動作"
 msgid "Enable"
 msgstr "启用"
 
+msgid "Enable dynflow console"
+msgstr ""
+
 msgid "Enable the dynflow console (/foreman_tasks/dynflow) for debugging"
 msgstr "啟用 dynflow 主控台（/foreman_tasks/dynflow）作為偵錯使用"
 
@@ -246,9 +255,6 @@ msgstr "无法检查在 %{url} 代理中的任务: %{exception}"
 msgid "Failed to initialize"
 msgstr "無法初始化"
 
-msgid "Field to sort the results on"
-msgstr "用來排序結果的欄位"
-
 msgid "Finished"
 msgstr "完成"
 
@@ -270,12 +276,6 @@ msgstr "Foreman 任务"
 msgid "Fri"
 msgstr "周五"
 
-msgid "Hash version of 'order' param"
-msgstr "「order」參數的雜湊版本"
-
-msgid "How to order the sorted results (e.g. ASC for ascending)"
-msgstr "如何排序結果的順序（比方說 ASC 從下到上）"
-
 msgid "ID"
 msgstr "ID"
 
@@ -381,9 +381,6 @@ msgstr "并非所有选定的任务都可以恢复"
 msgid "Number of attempts to start a task on the smart proxy before failing"
 msgstr "在智慧代理上啟動任務的嘗試次數"
 
-msgid "Number of results per page to return"
-msgstr "每頁要傳回的結果數量"
-
 msgid "Number of seconds to wait for synchronous task to finish."
 msgstr "等待同步任务完成的秒数。"
 
@@ -397,15 +394,18 @@ msgstr "上"
 msgid "Operation"
 msgstr "操作"
 
+msgid "Other includes all stopped tasks that are cancelled or pending"
+msgstr ""
+
+msgid "Other:"
+msgstr ""
+
 msgid "Output"
 msgstr "输出"
 
 msgid "Output:"
 msgstr "输出："
 
-msgid "Page number, starting at 1"
-msgstr "頁數，從 1 開始"
-
 msgid "Parent task"
 msgstr "父任務"
 
@@ -427,9 +427,21 @@ msgstr "轮询间隔乘数"
 msgid "Polling multiplier which is used to multiply the default polling intervals. This can be used to prevent polling too frequently for long running tasks."
 msgstr "轮询乘数，用于乘以默认轮询间隔。这可用于防止对长时间运行的任务进行过于频繁的轮询。"
 
+msgid "Preupgrade job"
+msgstr ""
+
+msgid "Proxy action retry count"
+msgstr ""
+
+msgid "Proxy action retry interval"
+msgstr ""
+
 msgid "Proxy task gone missing from the smart proxy"
 msgstr "代理任务在智能代理中丢失"
 
+msgid "Proxy tasks batch size"
+msgstr ""
+
 msgid "Raw"
 msgstr "Raw"
 
@@ -448,6 +460,12 @@ msgstr "週期邏輯"
 msgid "Recurring logics"
 msgstr "週期邏輯"
 
+msgid "Refresh Data"
+msgstr ""
+
+msgid "Remote action:"
+msgstr ""
+
 msgid "Repeat N times"
 msgstr "重複 N 次"
 
@@ -457,15 +475,15 @@ msgstr "重複直到"
 msgid "Repeats"
 msgstr "重複"
 
+msgid "Require auth for dynflow console"
+msgstr ""
+
 msgid "Require user to be authenticated as user with admin rights when accessing dynflow console"
 msgstr "存取 dynflow 主控台時，需要使用者授權成為擁有 admin 權限的使用者"
 
 msgid "Required lock is already taken by other running tasks."
 msgstr "所需的锁定已由其他正在运行的任务获取。"
 
-msgid "Required lock: %s"
-msgstr "所需的锁定 : %s"
-
 msgid "Resource search_params requires resource_type and resource_id to be specified"
 msgstr "資源 search_params 需要指定 resource_type 與 resource_id"
 
@@ -514,9 +532,6 @@ msgstr "调度的"
 msgid "Search query"
 msgstr "搜索查询"
 
-msgid "Search string"
-msgstr "搜尋字串"
-
 msgid "See %{link} for more details on how to resolve the issue"
 msgstr "有关如何解决此问题的更多详细信息，请参见％{link}"
 
@@ -535,12 +550,12 @@ msgstr "從外部執行者（例如 smart_proxy_dynflow）發送資料到任務"
 msgid "Set up recurring execution"
 msgstr "設定週期執行"
 
+msgid "Setting is off"
+msgstr ""
+
 msgid "Show recurring logic details"
 msgstr "顯示週期邏輯的詳情"
 
-msgid "Sort field and order, e.g. 'name DESC'"
-msgstr "排序欄位與次序，例如「name DESC」"
-
 msgid "Start at"
 msgstr "開始於"
 
@@ -559,7 +574,7 @@ msgstr "州"
 msgid "Step Canceled"
 msgstr ""
 
-msgid "Stop all stoppable tasks"
+msgid "Stop selected stoppable tasks"
 msgstr ""
 
 msgid "Stop specific tasks by ID"
@@ -580,6 +595,9 @@ msgstr "%s 的子任务"
 msgid "Sun"
 msgstr "周日"
 
+msgid "Sync task timeout"
+msgstr ""
+
 msgid "Task"
 msgstr "任務"
 
@@ -610,12 +628,21 @@ msgstr "任务已取消"
 msgid "Tasks"
 msgstr "任务"
 
+msgid "Tasks troubleshooting URL"
+msgstr ""
+
 msgid "The ID of the step inside the execution plan to send the event to"
 msgstr "執行計畫中要發送事件的步驟 ID"
 
 msgid "The recommended approach is to investigate the error messages below and in 'errors' tab, address the primary cause of the issue and resume the task."
 msgstr "推荐的方法是调查下面和“错误”选项卡中的错误消息，解决造成问题的主要原因，然后继续执行任务。"
 
+msgid "The recurring logic was disabled."
+msgstr ""
+
+msgid "The recurring logic was enabled."
+msgstr ""
+
 msgid "The smart proxy task %s failed."
 msgstr "智慧型代理任務 %s 失敗。"
 
@@ -690,6 +717,9 @@ msgstr "专注于最后"
 msgid "Yes"
 msgstr "是"
 
+msgid "You do not have permission"
+msgstr ""
+
 msgid "activation key"
 msgstr "啟動金鑰"
 
@@ -743,6 +773,9 @@ msgstr "较老"
 msgid "organization"
 msgstr "組織"
 
+msgid "other"
+msgstr ""
+
 msgid "paused"
 msgstr "暂停"
 

data/test/controllers/api/tasks_controller_test.rb

@@ -29,7 +29,7 @@ module ForemanTasks
 
         it 'renders task ids when searching by resource id' do
           task = FactoryBot.create(:dynflow_task, :product_create_task)
-          ForemanTasks::Lock.create!(name: "create", resource_type: "Katello::Product", resource_id: 1, task_id: task.id)
+          ForemanTasks::Link.create!(resource_type: "Katello::Product", resource_id: 1, task_id: task.id)
           get :index, params: { :search => "label = Actions::Katello::Product::Create and resource_id = 1" }
           assert_response :success
           data = JSON.parse(response.body)
@@ -43,6 +43,21 @@ module ForemanTasks
           _(data.dig('sort', 'by')).must_equal 'duration'
           _(data['results'].count).must_equal 5
         end
+
+        context 'with current taxonomies' do
+          it 'includes untaxed tasks and taxed by current taxonomy' do
+            org1 = FactoryBot.create(:organization)
+            org2 = FactoryBot.create(:organization)
+            org1_task = FactoryBot.create(:task_with_links, resource_id: org1.id, resource_type: 'Organization')
+            org2_task = FactoryBot.create(:task_with_links, resource_id: org2.id, resource_type: 'Organization')
+            get :index, params: { organization_id: org1.id }
+            assert_response :success
+            results = JSON.parse(response.body)['results']
+            _(results.count).must_equal 6
+            _(results.map { |r| r['id'] }).must_include org1_task.id
+            _(results.map { |r| r['id'] }).wont_include org2_task.id
+          end
+        end
       end
 
       describe 'POST /api/tasks/bulk_search' do

data/test/controllers/tasks_controller_test.rb

@@ -44,8 +44,8 @@ module ForemanTasks
             @locations = [0, 0].map { FactoryBot.create(:location) }
             @tasks = [0, 0].map { FactoryBot.create(:some_task) }
             @tasks.zip(@organizations, @locations).each do |task, org, loc|
-              Lock.link!(org, task.id)
-              Lock.link!(loc, task.id)
+              Link.link!(org, task)
+              Link.link!(loc, task)
             end
           end
 

data/test/factories/task_factory.rb

@@ -42,11 +42,34 @@ FactoryBot.define do
         end
       end
 
+      factory :task_with_links do
+        # posts_count is declared as a transient attribute and available in
+        # attributes on the factory, as well as the callback via the evaluator
+        transient do
+          locks_count { 1 }
+          resource_id { 1 }
+          resource_type { 'type1' }
+        end
+
+        # the after(:create) yields two values; the user instance itself and the
+        # evaluator, which stores all values from the factory, including transient
+        # attributes; `create_list`'s second argument is the number of records
+        # to create and we make sure the user is associated properly to the post
+        after(:create) do |task, evaluator|
+          create_list(
+            :link,
+            1,
+            task: task,
+            resource_type: evaluator.resource_type,
+            resource_id: evaluator.resource_id
+          )
+        end
+      end
+
       factory :task_with_locks do
         # posts_count is declared as a transient attribute and available in
         # attributes on the factory, as well as the callback via the evaluator
         transient do
-          locks_count { 3 }
           resource_id { 1 }
           resource_type { 'type1' }
         end
@@ -58,7 +81,7 @@ FactoryBot.define do
         after(:create) do |task, evaluator|
           create_list(
             :lock,
-            evaluator.locks_count,
+            1,
             task: task,
             resource_type: evaluator.resource_type,
             resource_id: evaluator.resource_id
@@ -68,11 +91,15 @@ FactoryBot.define do
     end
   end
 
+  factory :link, :class => ForemanTasks::Link do
+    resource_type { 'Katello::Repository' }
+    resource_id { 1 }
+    association :task, factory: :task_with_links
+  end
+
   factory :lock, :class => ForemanTasks::Lock do
-    name { 'read' }
     resource_type { 'Katello::Repository' }
     resource_id { 1 }
-    exclusive { true }
     association :task, factory: :task_with_locks
   end
 end

data/test/graphql/queries/recurring_logic_test.rb

@@ -0,0 +1,28 @@
+require 'foreman_tasks_test_helper'
+
+module Queries
+  class RecurringLogicTest < GraphQLQueryTestCase
+    let(:query) do
+      <<-GRAPHQL
+      query($id: String!) {
+        recurringLogic(id: $id) {
+          id
+          cronLine
+        }
+      }
+      GRAPHQL
+    end
+
+    let(:cron_line) { '5 4 3 2 1' }
+    let(:recurring_logic) { FactoryBot.create(:recurring_logic, :cron_line => cron_line) }
+    let(:global_id) { Foreman::GlobalId.for(recurring_logic) }
+    let(:variables) { { id: global_id } }
+    let(:data) { result['data']['recurringLogic'] }
+
+    test "should fetch recurring logic" do
+      assert_empty result['errors']
+      assert_equal global_id, data['id']
+      assert_equal cron_line, data['cronLine']
+    end
+  end
+end

data/test/graphql/queries/recurring_logics_query_test.rb

@@ -0,0 +1,30 @@
+require 'foreman_tasks_test_helper'
+
+module Queries
+  class RecurringLogicsTest < GraphQLQueryTestCase
+    let(:query) do
+      <<-GRAPHQL
+      query {
+        recurringLogics {
+          nodes {
+            id
+            cronLine
+          }
+        }
+      }
+      GRAPHQL
+    end
+
+    let(:data) { result['data']['recurringLogics'] }
+
+    setup do
+      FactoryBot.create_list(:recurring_logic, 2)
+    end
+
+    test "should fetch recurring logics" do
+      assert_empty result['errors']
+      expected_count = ::ForemanTasks::RecurringLogic.count
+      assert_not_equal 0, expected_count
+    end
+  end
+end

data/test/graphql/queries/task_query_test.rb

@@ -0,0 +1,33 @@
+require 'foreman_tasks_test_helper'
+
+module Queries
+  class TaskQueryTest < GraphQLQueryTestCase
+    let(:query) do
+      <<-GRAPHQL
+      query (
+        $id: String!
+      ) {
+        task(id: $id) {
+          id
+          action
+          result
+        }
+      }
+      GRAPHQL
+    end
+
+    let(:res) { 'inconclusive' }
+    let(:task) { FactoryBot.create(:some_task, :result => res) }
+
+    let(:global_id) { Foreman::GlobalId.for(task) }
+    let(:variables) { { id: global_id } }
+    let(:data) { result['data']['task'] }
+
+    test 'should fetch task data' do
+      assert_empty result['errors']
+
+      assert_equal global_id, data['id']
+      assert_equal task.result, data['result']
+    end
+  end
+end

data/test/graphql/queries/tasks_query_test.rb

@@ -0,0 +1,31 @@
+require 'foreman_tasks_test_helper'
+
+module Queries
+  class TasksQueryTest < GraphQLQueryTestCase
+    let(:query) do
+      <<-GRAPHQL
+      query {
+        tasks {
+          nodes {
+            id
+            action
+            result
+          }
+        }
+      }
+      GRAPHQL
+    end
+
+    let(:data) { result['data']['tasks'] }
+
+    setup do
+      FactoryBot.create_list(:some_task, 2)
+    end
+
+    test "should fetch recurring logics" do
+      assert_empty result['errors']
+      expected_count = ::ForemanTasks::Task.count
+      assert_not_equal 0, expected_count
+    end
+  end
+end