Merge pull request jbox-web#418 from dmorehouse/master

n-rodriguez · web-flow · commit b541799c6967 · 2023-04-19T20:28:52.000+02:00
Fix server-side out of order ajax responses
diff --git a/lib/ajax-datatables-rails/base.rb b/lib/ajax-datatables-rails/base.rb
@@ -73,11 +73,13 @@ def additional_data
 
     # JSON structure sent to jQuery DataTables
     def as_json(*)
+      draw_resp = (params[:draw].present?) ? { draw: params[:draw].to_i } : { }
+
       {
         recordsTotal:    records_total_count,
         recordsFiltered: records_filtered_count,
         data:            sanitize_data(data),
-      }.merge(additional_data)
+      }.merge(draw_resp).merge(additional_data)
     end
 
     # User helper methods
diff --git a/spec/ajax-datatables-rails/base_spec.rb b/spec/ajax-datatables-rails/base_spec.rb
@@ -181,6 +181,7 @@ def paginate_records(records)
         data = datatable.as_json
         expect(data[:recordsTotal]).to eq 5
         expect(data[:recordsFiltered]).to eq 5
+        expect(data[:draw]).to eq 1
         expect(data[:data]).to be_a(Array)
         expect(data[:data].size).to eq 5
       end
@@ -192,6 +193,7 @@ def paginate_records(records)
           data = datatable.as_json
           expect(data[:recordsTotal]).to eq 5
           expect(data[:recordsFiltered]).to eq 5
+          expect(data[:draw]).to eq 1
           expect(data[:data]).to be_a(Array)
           expect(data[:data].size).to eq 5
           expect(data[:foo]).to eq 'bar'
