xsdk-scaffold-rails 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b1b74ace7103e51684bda44a1ce6fdde5cfe25562015c6825cbb63afc3e2706
-  data.tar.gz: 22a1992738b3a78f5e9f3c3cc1f0c2e0e45d7bdeffcf7b20d2cea5842e52d988
+  metadata.gz: 108cdf26bc4f923371e65b2a9b9f2a5329e6873cca09ae947060b6937d57bbef
+  data.tar.gz: b2af28bc2f01ff06ba271482a0e62a83ee8f9ff904f2e07e3fa8a792223430c3
 SHA512:
-  metadata.gz: 4d1ad222a5c2e92c128a180641962f7592972592381f807c5061727da384d767dbc4093246e490cede678ecacc3f9941d2db20e2d7b5d7438f7fc06e59d4424a
-  data.tar.gz: cdf22047a4e6c4da9d15a7dc285e30b4b2652e5a3394e8be6f61f76d0edb08ade62b5ca7010b61525e27f234f949d019f70038bd76b80087d4a50a55ec765eb6
+  metadata.gz: 147f2ddd341e232b7bc2892aec51abec222ffaded11d6557385e202c1983e9d8318236edfde503bae09b620b73d0f43b43d15125d1beba954f1e28a525c80556
+  data.tar.gz: 816c60a6133969e2120ff2c417dee9acd1aeba8060d86a952b3c4b3fc72e6551bc7af1b98bf21616d309765f1c9909f9c200e5c7b8538d943cc86f467eae6e18

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

@@ -25,9 +25,13 @@ module Xsdk
         def paginate(data)
           per_page = @options[:itemsPerPage]
           page = @options[:page] - 1
+          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)
-              .as_json(methods: enum_methods, except: keys_to_exclude, include: has_many_include)
+              .order(order_string)
+              .as_json(methods: methods + enum_methods, except: keys_to_exclude, include: has_many_include)
         end
 
         def keys_to_exclude
@@ -179,6 +183,10 @@ module Xsdk
           []
         end
 
+        def methods
+          []
+        end
+
         def get_table(c)
           ax = associations.with_indifferent_access
           if @foreign_keys.key?(c)
@@ -254,6 +262,20 @@ module Xsdk
         def associations
           {}
         end
+
+        def sorting_map
+          build_headers.map do |h|
+            if h[:type] == 'foreign_key'
+              [h[: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'
+              [nil]
+            else
+              [h[:value].to_sym, "#{h[:table]}.#{h[:table_value]}"]
+            end
+          end.filter { |a| a[0] }.to_h
+        end
       end
     end
   end

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

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

metadata

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