xsdk-scaffold-rails 0.1.6 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fea489586a3ed39ac4e314a7aeb60083a3226c3654b5f0e5e466bbf02159aaa0
-  data.tar.gz: 0c7c053dde2236f935cc1026f127e4a91026e8c5c4cd66d3dcef05f8571bd72f
+  metadata.gz: 75d85ae55d8bef8eadbb1af2b40f558c60279d31408c2378220bf73ea398eada
+  data.tar.gz: ba396e8dc6effc8787e6ed885d77e65ddfd8c56979dd899d8fc86f1da69b7f0d
 SHA512:
-  metadata.gz: fbd4186e4eae066437757891985e5f6997dd5cc991aac8802b175e1fea40efa5d94476772297eddc6979345dc9699f2bacbcee45ec4c1f40f4caf1751dd5efc6
-  data.tar.gz: cf3f89d3d4ec4f37052f77dc1601622ef9c88d0ea08e71b39fad8f6f5af83eb45d2e0896f0d53233af11db6ca1be70c58b5154f02777592ce61a78f34d66c53e
+  metadata.gz: fe6202b413534c5c6df73eea0f073cfba20c12ad5fc04c7bf580df61699f869c7d32746e36c540d82458f19976b7076a390a51b820d1f76a3503d46c85ce3a21
+  data.tar.gz: 00d7b44019557ea04c309a91ddbb6753cacf37abc5e04f12849e1e1274fb5d2dad72067ed119aba86ab9f100319ef6619c671146a0ab10064b16b4eee771842c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xsdk-scaffold-rails (0.1.6)
+    xsdk-scaffold-rails (0.1.10)
       activerecord (>= 6.0.0)
       pg (>= 1.1)
 

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
@@ -85,7 +89,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"
@@ -116,7 +120,7 @@ module Xsdk
           subschema = nil
           ax = associations.with_indifferent_access
           if ax.key?(c) && (ax[c][:association_type] == :has_many)
-            child_options = '{}'
+            child_options = { options: {}.to_json }
             child_options = { options: ax[c][:options].to_json } if ax[c][:options].present?
             begin
               datatable = "#{ax[c][:clazz]}Datatable".constantize
@@ -163,6 +167,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
@@ -179,6 +191,10 @@ module Xsdk
           []
         end
 
+        def methods
+          []
+        end
+
         def get_table(c)
           ax = associations.with_indifferent_access
           if @foreign_keys.key?(c)
@@ -254,6 +270,20 @@ module Xsdk
         def associations
           {}
         end
+
+        def sorting_map
+          build_headers.map do |h|
+            if h[:type] == 'foreign_key'
+              [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'
+              [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.6"
+      VERSION = "0.1.10"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsdk-scaffold-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.10
 platform: ruby
 authors:
 - Davide Croci
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord