xsdk-scaffold-rails 0.1.8 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 108cdf26bc4f923371e65b2a9b9f2a5329e6873cca09ae947060b6937d57bbef
-  data.tar.gz: b2af28bc2f01ff06ba271482a0e62a83ee8f9ff904f2e07e3fa8a792223430c3
+  metadata.gz: 9febb86209ef377bac9ac2913c5f9dc7040ffb86217de6bca2144fd8d31cd9c4
+  data.tar.gz: d91f1206b72fb81317896a9b96ab5045f783d99ec5796024c86a9a1ab3a98699
 SHA512:
-  metadata.gz: 147f2ddd341e232b7bc2892aec51abec222ffaded11d6557385e202c1983e9d8318236edfde503bae09b620b73d0f43b43d15125d1beba954f1e28a525c80556
-  data.tar.gz: 816c60a6133969e2120ff2c417dee9acd1aeba8060d86a952b3c4b3fc72e6551bc7af1b98bf21616d309765f1c9909f9c200e5c7b8538d943cc86f467eae6e18
+  metadata.gz: dbbba730369a3f1c38e3cb8e82541f60b6e32d897ef02b5022c2446c4fa02da773495413bc1b180835037c926ed628ee8623afb854bda59b49d92fcf07e99290
+  data.tar.gz: 0cd783af14aeab46f95ae0bdc2675c8a4211ac0735107accd403c92dd1735daa2927fecfe9d9e9699df3ab968d87ce27bb0fab06fff13b2c6772fa64b29c31e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xsdk-scaffold-rails (0.1.7)
+    xsdk-scaffold-rails (0.1.11)
       activerecord (>= 6.0.0)
       pg (>= 1.1)
 
@@ -42,7 +42,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
-    pg (1.2.3)
+    pg (1.3.5)
     racc (1.5.2)
     rack (2.2.3)
     rainbow (3.0.0)
@@ -127,4 +127,4 @@ DEPENDENCIES
   xsdk-scaffold-rails!
 
 BUNDLED WITH
-   2.2.17
+   2.3.10

data/lib/xsdk/scaffold/rails/base_datatable.rb

@@ -28,10 +28,16 @@ module Xsdk
           sort = @options[:sortBy]
           direction = @options[:sortDesc]
           order_string = sort.map.with_index { |k, idx| "#{sorting_map[k.to_sym]} #{direction[idx] ? 'DESC' : 'ASC'}" }
-          data.limit(per_page)
-              .offset(page * per_page)
-              .order(order_string)
-              .as_json(methods: methods + enum_methods, except: keys_to_exclude, include: has_many_include)
+          
+          if per_page > 0
+            data = data.limit(per_page).offset(page * per_page)
+          end
+          
+          data.order(order_string).as_json(
+            methods: methods + enum_methods,
+            except: keys_to_exclude,
+            include: has_many_include
+          )
         end
 
         def keys_to_exclude
@@ -89,7 +95,7 @@ module Xsdk
 
         # Build columns
         def build_headers
-          headers = columns.map do |c|
+          headers = columns_orderd.map do |c|
             {
               value: c, # warehouse_id
               table_value: get_table_value(c),	# "mag1"
@@ -167,6 +173,14 @@ module Xsdk
           @options[:transient_columns] || {}
         end
 
+        def column_name_ordered_list
+          []
+        end
+
+        def columns_orderd
+          column_name_ordered_list + (columns - column_name_ordered_list)
+        end
+
         def columns
           @clazz.column_names - %w[created_at updated_at] + transient_columns.keys
         end
@@ -266,7 +280,7 @@ module Xsdk
         def sorting_map
           build_headers.map do |h|
             if h[:type] == 'foreign_key'
-              [h[:value].to_sym, "#{h[:table]}.#{h[:source]}"]
+              [h[:table_value].to_sym, "#{h[:table]}.#{h[:source]}"]
             elsif h[:type] == 'enum'
               ["#{h[:value]}_text".to_sym, "#{h[:table]}.#{h[:table_value]}"]
             elsif h[:type].nil? || h[:value] == 'actions'

data/lib/xsdk/scaffold/rails/version.rb

@@ -1,7 +1,7 @@
 module Xsdk
   module Scaffold
     module Rails
-      VERSION = "0.1.8"
+      VERSION = "0.1.11"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsdk-scaffold-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.11
 platform: ruby
 authors:
 - Davide Croci
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-20 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord