motor-admin 0.2.39 → 0.2.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e3ce846e29191c7486d32cd8fb4e06596d73e11d46e8d34d93094c6407c9efa
-  data.tar.gz: 6b875912c05b215c6a7407b64658d51ed2d035925a4816ef8d5c50e3cbe59a59
+  metadata.gz: a51c13e10df9707cb2130c580660133d07a543c55e97157ebe8660099ff602e6
+  data.tar.gz: 81a887350a6fec48cae6fa7c0d74d1efaae29456685e7d2bb63d8347d6aab7e4
 SHA512:
-  metadata.gz: d5ec9f6d2f97ac583f17b1948c9488f7df31a2b6e85789d2f8877d623c8d9a2403712dde886ff4855061661f9f8af431619727693175d7da05753ba3dd2bbbe1
-  data.tar.gz: 6737e74641f4ae7fb60845757f8741bbb082a001f44bf0933c8795157f76b513462e3e38d36de04229e8a5bc16dfbd9217a50ddda70752b223503a367405902e
+  metadata.gz: f9d5172d6d3014145c39f3640def2f7dbedf4b79dd0c2021562933d6da5caff0430f95334a30cb8c3fed6afa884753d1bd268cf28f8171fe9e03fc3d755d1049
+  data.tar.gz: 8a56bce2407c3314d41ecb5d977e275da6b36fd40ac41468912ded8d02b386f3af27b4410e1be0e6c4b4c6b99736239326c663f4aadac4b9f5e30c5bcf30c2f3

data/config/locales/en.yml

@@ -293,3 +293,6 @@ en:
     regexp: RegExp
     message: Message
     should_be_a_valid_regexp: Should be a valid RegExp string
+    order_by: Order by
+    ascending: Ascending
+    descending: Descending

data/config/locales/es.yml

@@ -293,6 +293,9 @@ es:
     regexp: RegExp
     message: Mensaje
     should_be_a_valid_regexp: Debe ser una cadena RegExp válida
+    order_by: Ordenar por
+    ascending: Ascendente
+    descending: Descendente
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -289,6 +289,9 @@ pt:
     regexp: RegExp
     message: Mensagem
     should_be_a_valid_regexp: Deve ser uma string RegExp válida
+    order_by: Encomendar por
+    ascending: Ascendente
+    descending: Decrescente
     i:
       locale: pt
       select:

data/lib/motor/api_query/apply_scope.rb

@@ -26,7 +26,17 @@ module Motor
 
         return rel unless scope_configs
 
-        ApiQuery::Filter.call(rel, scope_configs[:preferences][:filter])
+        rel = ApiQuery::Filter.call(rel, scope_configs[:preferences][:filter])
+
+        apply_order(rel, scope_configs[:preferences][:sort])
+      end
+
+      def apply_order(rel, params)
+        return rel if params.blank?
+
+        sort_key, sort_order = params.values_at(:key, :order)
+
+        rel.order(sort_key => sort_order)
       end
     end
   end

data/lib/motor/queries/run_query.rb

@@ -194,7 +194,9 @@ module Motor
       def normalize_statement_for_sql(statement)
         sql, _, attributes = statement
 
-        sql = ActiveRecord::Base.sanitize_sql([sql.gsub(STATEMENT_VARIABLE_REGEXP, '?'), attributes.map(&:value)])
+        sql = ActiveRecord::Base.send(:replace_bind_variables,
+                                      sql.gsub(STATEMENT_VARIABLE_REGEXP, '?'),
+                                      attributes.map(&:value))
 
         [sql, 'SQL', attributes]
       end

data/lib/motor/resources/fetch_configured_model.rb

@@ -41,7 +41,7 @@ module Motor
       def define_default_scope(klass, config)
         return klass if config[:custom_sql].blank?
 
-        klass.instance_variable_set(:@__motor_custom_sql, config[:custom_sql].squish)
+        klass.instance_variable_set(:@__motor_custom_sql, config[:custom_sql].squish.delete_suffix(';'))
 
         klass.instance_eval do
           default_scope do

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.39'
+  VERSION = '0.2.41'
 end

data/ui/dist/manifest.json

@@ -2601,9 +2601,9 @@
   "icons/zoom-out.svg.gz": "icons/zoom-out.svg.gz",
   "icons/zoom-question.svg": "icons/zoom-question.svg",
   "icons/zoom-question.svg.gz": "icons/zoom-question.svg.gz",
-  "main-01a5fc164f7a205535b6.css.gz": "main-01a5fc164f7a205535b6.css.gz",
-  "main-01a5fc164f7a205535b6.js.LICENSE.txt": "main-01a5fc164f7a205535b6.js.LICENSE.txt",
-  "main-01a5fc164f7a205535b6.js.gz": "main-01a5fc164f7a205535b6.js.gz",
-  "main.css": "main-01a5fc164f7a205535b6.css",
-  "main.js": "main-01a5fc164f7a205535b6.js"
+  "main-f7a83db6d8381e2638a1.css.gz": "main-f7a83db6d8381e2638a1.css.gz",
+  "main-f7a83db6d8381e2638a1.js.LICENSE.txt": "main-f7a83db6d8381e2638a1.js.LICENSE.txt",
+  "main-f7a83db6d8381e2638a1.js.gz": "main-f7a83db6d8381e2638a1.js.gz",
+  "main.css": "main-f7a83db6d8381e2638a1.css",
+  "main.js": "main-f7a83db6d8381e2638a1.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.39
+  version: 0.2.41
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2021-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -1526,8 +1526,8 @@ files:
 - ui/dist/icons/zoom-money.svg.gz
 - ui/dist/icons/zoom-out.svg.gz
 - ui/dist/icons/zoom-question.svg.gz
-- ui/dist/main-01a5fc164f7a205535b6.css.gz
-- ui/dist/main-01a5fc164f7a205535b6.js.gz
+- ui/dist/main-f7a83db6d8381e2638a1.css.gz
+- ui/dist/main-f7a83db6d8381e2638a1.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: