A platform for community discussion. Free, open, simple.
FIX: Data table sizes and executions pagination in workflows admin (#42263)
Régis Hanoled24248e3085
diff --git a/plugins/discourse-workflows/app/controllers/discourse_workflows/data_tables_controller.rb b/plugins/discourse-workflows/app/controllers/discourse_workflows/data_tables_controller.rbindex a55e8b5f21e..d406ecf9be2 100644--- a/plugins/discourse-workflows/app/controllers/discourse_workflows/data_tables_controller.rb+++ b/plugins/discourse-workflows/app/controllers/discourse_workflows/data_tables_controller.rb@@ -6,7 +6,7 @@ module DiscourseWorkflowsdef indexDiscourseWorkflows::DataTable::List.call(service_params) do |result|- on_success do |data_tables:, total_rows:, table_sizes: {}, load_more_url:|+ on_success do |data_tables:, total_rows:, table_sizes:, load_more_url:|render json: {data_tables:serialize_data(diff --git a/plugins/discourse-workflows/app/controllers/discourse_workflows/executions_controller.rb b/plugins/discourse-workflows/app/controllers/discourse_workflows/executions_controller.rbindex cf96ea172e0..b87d6120587 100644--- a/plugins/discourse-workflows/app/controllers/discourse_workflows/executions_controller.rb+++ b/plugins/discourse-workflows/app/controllers/discourse_workflows/executions_controller.rb@@ -26,7 +26,7 @@ module DiscourseWorkflowsdef indexDiscourseWorkflows::Execution::List.call(service_params) do |result|- on_success do |executions:, load_more_url: nil|+ on_success do |executions:, load_more_url:|render json: {executions:serialize_data(executions, DiscourseWorkflows::ExecutionListSerializer),diff --git a/plugins/discourse-workflows/app/services/discourse_workflows/execution/list.rb b/plugins/discourse-workflows/app/services/discourse_workflows/execution/list.rbindex 348aa370176..26bf601b229 100644--- a/plugins/discourse-workflows/app/services/discourse_workflows/execution/list.rb+++ b/plugins/discourse-workflows/app/services/discourse_workflows/execution/list.rb@@ -23,7 +23,7 @@ module DiscourseWorkflowsmodel :executions, optional: truemodel :has_more, :compute_has_more, optional: true- only_if(:has_more) { model :load_more_url, :compute_load_more_url, optional: true }+ model :load_more_url, :compute_load_more_url, optional: trueprivate@@ -49,6 +49,8 @@ module DiscourseWorkflowsenddef compute_load_more_url(params:, executions:)+ return if !has_more || executions.blank?+path =if params.workflow_id"/admin/plugins/discourse-workflows/workflows/#{params.workflow_id}/executions.json"diff --git a/plugins/discourse-workflows/spec/requests/discourse_workflows/data_tables_controller_spec.rb b/plugins/discourse-workflows/spec/requests/discourse_workflows/data_tables_controller_spec.rbindex 125fb4cdae2..5e65599eefe 100644--- a/plugins/discourse-workflows/spec/requests/discourse_workflows/data_tables_controller_spec.rb+++ b/plugins/discourse-workflows/spec/requests/discourse_workflows/data_tables_controller_spec.rb@@ -41,6 +41,7 @@ RSpec.describe DiscourseWorkflows::DataTablesController dojson = response.parsed_bodyexpect(json["data_tables"].length).to eq(1)expect(json["data_tables"][0]["name"]).to eq(data_table.name)+ expect(json["data_tables"][0]["size"]).to be > 0endit "returns shared pagination meta" dodiff --git a/plugins/discourse-workflows/spec/requests/discourse_workflows/executions_controller_spec.rb b/plugins/discourse-workflows/spec/requests/discourse_workflows/executions_controller_spec.rbindex 14dd006a982..8d247967e3c 100644--- a/plugins/discourse-workflows/spec/requests/discourse_workflows/executions_controller_spec.rb+++ b/plugins/discourse-workflows/spec/requests/discourse_workflows/executions_controller_spec.rb@@ -104,6 +104,20 @@ RSpec.describe DiscourseWorkflows::ExecutionsController doexpect(json["executions"].length).to eq(1)expect(json["executions"][0]["id"]).to eq(execution_1.id)end++ it "returns load more meta when more executions exist" do+ Fabricate(:discourse_workflows_execution, workflow: workflow)+ execution_2 = Fabricate(:discourse_workflows_execution, workflow: workflow)++ get "/admin/plugins/discourse-workflows/executions.json", params: { limit: 1 }++ json = response.parsed_body+ expect(json["executions"].map { |execution| execution["id"] }).to eq([execution_2.id])+ expect(json["meta"]).to eq(+ "load_more_executions" =>+ "/admin/plugins/discourse-workflows/executions.json?cursor=#{execution_2.id}&limit=1",+ )+ endenddescribe "GET /admin/plugins/discourse-workflows/workflows/:workflow_id/executions" do