forest_admin_datasource_active_record 1.0.0.pre.beta.48 → 1.0.0.pre.beta.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17839fc311e520887e9351529169cde07e712f063c8c9d0c2d41d03f8a7d2775
-  data.tar.gz: aa33f350dc3d1b65cfd70daecc511a7dc5a729b55e745c2aa57893a4452acd89
+  metadata.gz: 3751729665ad36eddcb41f4e994f500e560475c7f7ae96a7f70f2609270572fd
+  data.tar.gz: 48081174198bec227b8b6114fe5cfa35b72c917ad5a95bea4755be32e420cf0f
 SHA512:
-  metadata.gz: 35ca8d3c35c7fda3a3c9877e19b1510aedb6bb29af91dd4633bfa27404a10c95326045d9d15f4a4e8f0437e2d9c7282d573bd92a657a7622e3213ec514dc2bf3
-  data.tar.gz: 653e02b6ad2e0b1c0595691209b6ba494d8ab3a62425a1e537e908ff77f421ebe8d0ac134566b711a92e968aed69a019a283b0b766de7edba6e51dc9a89d5047
+  metadata.gz: 955a888a7c4fa73370b581a8f78a50b7e2eaf24b65324aded83acc2d195f32449767d7f9a2c75a8b8c02f12f81ddfe30d5e77325edb0868f0616d80d551f4774
+  data.tar.gz: 3d2f22d5028b5f7e08e25567d7f6f7975c0e9e657d8b2e2ad43ee3a9adb148117bb7cdaa64cca8132f778d4f74690f6bad8195eb9129c220ff0ab311374cdc92

data/lib/forest_admin_datasource_active_record/collection.rb

@@ -16,9 +16,9 @@ module ForestAdminDatasourceActiveRecord
     end
 
     def list(_caller, filter, projection)
-      query = Utils::Query.new(self, projection, filter).build
+      query = Utils::Query.new(self, projection, filter)
 
-      query.all.map { |record| Utils::ActiveRecordSerializer.new(record).to_hash }
+      query.get.map { |record| Utils::ActiveRecordSerializer.new(record).to_hash }
     end
 
     def aggregate(_caller, filter, aggregation, limit = nil)

data/lib/forest_admin_datasource_active_record/utils/query.rb

@@ -18,9 +18,16 @@ module ForestAdminDatasourceActiveRecord
         apply_select
       end
 
+      def get
+        build
+
+        return @query.all if @filter.page.nil?
+
+        @query.offset(@filter.page.offset).limit(@filter.page.limit)
+      end
+
       def apply_filter
         @query = apply_condition_tree(@filter.condition_tree) unless @filter.condition_tree.nil?
-        @query = apply_pagination(@filter.page) unless @filter.page.nil?
         @query = apply_sort(@filter.sort) unless @filter.sort.nil?
 
         @query
@@ -92,11 +99,6 @@ module ForestAdminDatasourceActiveRecord
                          "#{@collection.model.table_name}.#{relation_schema.foreign_key}"
                        end
           end
-
-          # @query = @query.select(query_select.join(', '))
-          # @query = @query.eager_load(@projection.relations.keys.map(&:to_sym))
-          # # TODO: replace eager_load by joins because eager_load select ALL columns of relation
-          # # @query = @query.joins(@projection.relations.keys.map(&:to_sym))
         end
 
         @query

data/lib/forest_admin_datasource_active_record/utils/query_aggregate.rb

@@ -37,8 +37,8 @@ module ForestAdminDatasourceActiveRecord
       def compute_result_aggregate(rows)
         rows.map do |row|
           {
-            value: row.send(@operation.to_sym),
-            group: @aggregation.groups.each_with_object({}) do |group, memo|
+            'value' => row.send(@operation.to_sym),
+            'group' => @aggregation.groups.each_with_object({}) do |group, memo|
               memo[group[:field]] = row.send(group[:field].to_sym)
             end
           }

data/lib/forest_admin_datasource_active_record/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceActiveRecord
-  VERSION = "1.0.0-beta.48"
+  VERSION = "1.0.0-beta.49"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_active_record
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.beta.48
+  version: 1.0.0.pre.beta.49
 platform: ruby
 authors:
 - Matthieu