xsdk-scaffold-rails 0.1.5 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74cad8d98a8df248f79c1d710ace09c66a2392c5e3bcf4668e86d68596e2ddc
-  data.tar.gz: ad0dc5bbeb6790674a0f85f5263341fde64370732d8c090e3065f7e6d864bd9a
+  metadata.gz: 4de7a337b36092618e2f8c4d13b22cac4b6427a7ab4b3631c03236f9cbd9735b
+  data.tar.gz: 338b0258c5a76e1cab60ec800080352317f695546ef5957e04985b73e8157ee5
 SHA512:
-  metadata.gz: 823c9c9c86b3fda4f9b062c1ce5bdfa75bbf2140fd1d1f19772f89908ea0f73e6ae59055ca1250a29989d78ffe954fc7f66d9981e3ead71f96acc45c093b9c04
-  data.tar.gz: ab30c2621e46ff55efcb9ea0cef893d1f7a4d8c7f42cb56e5203b5785ae73133f70f0567696274ec6426a4edfdb9ef9aa90bc20708167d3ae15e7ad2e4c0b80a
+  metadata.gz: aa6ffd5f544cdbb8fd943b9c076f958644bc2841010d058e9c4a57d0688d166f180df6a2a9fe5d2513fa93b6db1bcb2860bc013442bb024f6944cb43007a50a6
+  data.tar.gz: 820733e0d444a5cdcb03564d8611c3cb763859d4343edead5f6668db425ac18694160fce65a2a9f83e1a2da373b24a8110b807f22182a7b02ab146b58e02c204

data/Gemfile.lock

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

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

@@ -7,7 +7,7 @@ module Xsdk
           @clazz = clazz
           @foreign_keys = get_foreign_key_map(clazz)
           @only_schema = @options[:only_schema]
-		  @default_values = @options.try(:[], :default) || {}
+          @default_values = @options.try(:[], :default) || {}
         end
 
         def as_json(*)
@@ -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
@@ -101,7 +105,7 @@ module Xsdk
               subschema: get_subschema(c),
               show_new_record: get_if_can_show_new_record(c),
               entity_name: get_entity_name(c),
-			  default: get_default_value(c)
+              default: get_default_value(c)
             }
           end
           headers << { text: 'Azioni', value: 'actions', type: '', in_form: false, in_table: true }
@@ -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
@@ -133,9 +137,9 @@ module Xsdk
           subschema
         end
 
-		def get_default_value(c)
-			@default_values[c]
-		end
+        def get_default_value(c)
+          @default_values[c]
+        end
 
         def get_enum_cols(c)
           arr = []
@@ -159,8 +163,12 @@ module Xsdk
           end
         end
 
+        def transient_columns
+          @options[:transient_columns] || {}
+        end
+
         def columns
-          @clazz.column_names - %w[created_at updated_at]
+          @clazz.column_names - %w[created_at updated_at] + transient_columns.keys
         end
 
         def table_columns
@@ -175,6 +183,10 @@ module Xsdk
           []
         end
 
+        def methods
+          []
+        end
+
         def get_table(c)
           ax = associations.with_indifferent_access
           if @foreign_keys.key?(c)
@@ -201,6 +213,8 @@ module Xsdk
             @foreign_keys[c][0][:class_name].constantize.model_name.human.capitalize
           elsif ax.key?(c) && (ax[c][:association_type] == :has_many)
             ax[c][:clazz].model_name.human.capitalize
+          elsif transient_columns.key?(c)
+            transient_columns[c][:text]
           else
             @clazz.human_attribute_name(c).capitalize
           end
@@ -214,6 +228,8 @@ module Xsdk
             'has_many'
           elsif @clazz.defined_enums.key?(c)
             'enum'
+          elsif transient_columns.key?(c)
+            transient_columns[c][:type]
           else
             @clazz.type_for_attribute(c).type
           end
@@ -246,6 +262,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.5"
+      VERSION = "0.1.9"
     end
   end
 end

metadata

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