From 371f699a11ae57d7add7fe6a3066b93f5951adc6 Mon Sep 17 00:00:00 2001
From: Oleksii Kriuchykhin <okriuchykhin@biosistemika.com>
Date: Wed, 20 Nov 2019 23:08:23 +0100
Subject: [PATCH] Fix AR preloading for repository table [SCI-4070]

---
 app/helpers/repository_datatable_helper.rb                    | 4 +++-
 .../repository_datatable/repository_asset_value_serializer.rb | 2 +-
 .../repository_datatable/repository_list_value_serializer.rb  | 2 +-
 .../repository_status_value_serializer.rb                     | 4 ++--
 .../repository_datatable/repository_text_value_serializer.rb  | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/helpers/repository_datatable_helper.rb b/app/helpers/repository_datatable_helper.rb
index 669c9aa0a..1bf94ee46 100644
--- a/app/helpers/repository_datatable_helper.rb
+++ b/app/helpers/repository_datatable_helper.rb
@@ -9,7 +9,9 @@ module RepositoryDatatableHelper
                           _team,
                           assigned_rows)
     parsed_records = []
-    repository_rows.each do |record|
+    includes_json = { repository_cells: Extends::REPOSITORY_SEARCH_INCLUDES }
+
+    repository_rows.includes(includes_json).each do |record|
       row = {
         'DT_RowId': record.id,
         '1': assigned_row(record, assigned_rows),
diff --git a/app/serializers/repository_datatable/repository_asset_value_serializer.rb b/app/serializers/repository_datatable/repository_asset_value_serializer.rb
index 10095b09d..a71aa8edc 100644
--- a/app/serializers/repository_datatable/repository_asset_value_serializer.rb
+++ b/app/serializers/repository_datatable/repository_asset_value_serializer.rb
@@ -7,7 +7,7 @@ module RepositoryDatatable
     attributes :value, :value_type
 
     def value
-      asset = object.value.asset
+      asset = object.repository_asset_value.asset
       {
         id: asset.id,
         url: rails_blob_path(asset.file, disposition: 'attachment'),
diff --git a/app/serializers/repository_datatable/repository_list_value_serializer.rb b/app/serializers/repository_datatable/repository_list_value_serializer.rb
index 87be086d5..b587bef6d 100644
--- a/app/serializers/repository_datatable/repository_list_value_serializer.rb
+++ b/app/serializers/repository_datatable/repository_list_value_serializer.rb
@@ -5,7 +5,7 @@ module RepositoryDatatable
     attributes :value, :value_type
 
     def value
-      object.value.data
+      object.repository_list_value.data
     end
   end
 end
diff --git a/app/serializers/repository_datatable/repository_status_value_serializer.rb b/app/serializers/repository_datatable/repository_status_value_serializer.rb
index 7d3534369..818fa0785 100644
--- a/app/serializers/repository_datatable/repository_status_value_serializer.rb
+++ b/app/serializers/repository_datatable/repository_status_value_serializer.rb
@@ -6,8 +6,8 @@ module RepositoryDatatable
 
     def value
       {
-        icon: object.value.repository_status_item.icon,
-        status: object.value.repository_status_item.status
+        icon: object.repository_status_value.repository_status_item.icon,
+        status: object.repository_status_value.repository_status_item.status
       }
     end
   end
diff --git a/app/serializers/repository_datatable/repository_text_value_serializer.rb b/app/serializers/repository_datatable/repository_text_value_serializer.rb
index fce3f7248..0980457c5 100644
--- a/app/serializers/repository_datatable/repository_text_value_serializer.rb
+++ b/app/serializers/repository_datatable/repository_text_value_serializer.rb
@@ -5,7 +5,7 @@ module RepositoryDatatable
     attributes :value, :value_type
 
     def value
-      object.value.data
+      object.repository_text_value.data
     end
   end
 end