motor-admin 0.2.36 → 0.2.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2247da648b9add9fcaab6b8688289ae7a9908e9b8fb23ead4f5acc5917257491
-  data.tar.gz: b14931d1e8ce8a71cd4e686b29517ddf84a599f8d46d7d1f4dab5c3fca9a5e0f
+  metadata.gz: a51c13e10df9707cb2130c580660133d07a543c55e97157ebe8660099ff602e6
+  data.tar.gz: 81a887350a6fec48cae6fa7c0d74d1efaae29456685e7d2bb63d8347d6aab7e4
 SHA512:
-  metadata.gz: e1bfce35dcbc6f43985617e1c4cb47be55b00b10aa3df1bc07c6ceb28c18e9351af69f7467b2f52ac30fdd13ab62910ae20d978a6a02f4d361343333f526701c
-  data.tar.gz: 4a3671b36ba7704f58140dcfa1db3c0798a7395a57e1ad20648a0898ad026f0dc03444136cea87998d57a7cc8ada53b35a84ac23ed1a2d3e90421b0ba2ac8432
+  metadata.gz: f9d5172d6d3014145c39f3640def2f7dbedf4b79dd0c2021562933d6da5caff0430f95334a30cb8c3fed6afa884753d1bd268cf28f8171fe9e03fc3d755d1049
+  data.tar.gz: 8a56bce2407c3314d41ecb5d977e275da6b36fd40ac41468912ded8d02b386f3af27b4410e1be0e6c4b4c6b99736239326c663f4aadac4b9f5e30c5bcf30c2f3

data/config/locales/en.yml

@@ -287,3 +287,12 @@ en:
     sql: SQL
     api: API
     searchable_columns: Searchable columns
+    validate: Validate
+    error_message: Error message
+    validation_regexp: Validation RegExp
+    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

@@ -287,6 +287,15 @@ es:
     sql: SQL
     api: API
     searchable_columns: Columnas de búsqueda
+    validate: Validar
+    error_message: Mensaje de error
+    validation_regexp: Validación RegExp
+    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

@@ -283,6 +283,15 @@ pt:
     sql: SQL
     api: API
     searchable_columns: Colunas pesquisáveis
+    validate: Validar
+    error_message: Mensagem de erro
+    validation_regexp: Validação RegExp
+    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/alerts/persistance.rb

@@ -87,9 +87,9 @@ module Motor
 
       def name_already_exists?(alert)
         if alert.new_record?
-          Alert.exists?(name: alert.name)
+          Alert.exists?(name: alert.name, deleted_at: nil)
         else
-          Alert.exists?(['name = ? AND id != ?', alert.name, alert.id])
+          Alert.exists?(['name = ? AND id != ? AND deleted_at IS NULL', alert.name, alert.id])
         end
       end
     end

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/build_schema/find_searchable_columns.rb

@@ -16,7 +16,7 @@ module Motor
 
         selected_columns ||= columns.first(SELECT_COLUMNS_AMOUNT)
 
-        ([model.primary_key] + selected_columns).sort
+        ([model.primary_key] + selected_columns).compact.sort
       end
 
       def find_searchable_columns(model)

data/lib/motor/dashboards/persistance.rb

@@ -63,9 +63,9 @@ module Motor
 
       def title_already_exists?(dashboard)
         if dashboard.new_record?
-          Motor::Dashboard.exists?(title: dashboard.title)
+          Motor::Dashboard.exists?(title: dashboard.title, deleted_at: nil)
         else
-          Motor::Dashboard.exists?(['title = ? AND id != ?', dashboard.title, dashboard.id])
+          Motor::Dashboard.exists?(['title = ? AND id != ? AND deleted_at IS NULL', dashboard.title, dashboard.id])
         end
       end
     end

data/lib/motor/forms/persistance.rb

@@ -63,9 +63,9 @@ module Motor
 
       def name_already_exists?(form)
         if form.new_record?
-          Motor::Form.exists?(['name = ?', form.name])
+          Motor::Form.exists?(['name = ? AND deleted_at IS NULL', form.name])
         else
-          Motor::Form.exists?(['name = ? AND id != ?', form.name, form.id])
+          Motor::Form.exists?(['name = ? AND id != ? AND deleted_at IS NULL', form.name, form.id])
         end
       end
     end

data/lib/motor/queries/persistance.rb

@@ -63,9 +63,9 @@ module Motor
 
       def name_already_exists?(query)
         if query.new_record?
-          Query.exists?(name: query.name)
+          Query.exists?(name: query.name, deleted_at: nil)
         else
-          Query.exists?(['name = ? AND id != ?', query.name, query.id])
+          Query.exists?(['name = ? AND id != ? AND deleted_at IS NULL', query.name, query.id])
         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/resources.rb

@@ -4,7 +4,8 @@ module Motor
   module Resources
     RESOURCE_ATTRS = %w[display_name display_column icon custom_sql visible display_primary_key
                         searchable_columns].freeze
-    COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format].freeze
+    COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format
+                      validators].freeze
     ASSOCIATION_ATTRS = %w[name display_name model_name icon visible foreign_key primary_key options virtual
                            polymorphic slug].freeze
     SCOPE_ATTRS = %w[name display_name scope_type preferences visible].freeze

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.36'
+  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-348da28bba8cc2014150.css.gz": "main-348da28bba8cc2014150.css.gz",
-  "main-348da28bba8cc2014150.js.LICENSE.txt": "main-348da28bba8cc2014150.js.LICENSE.txt",
-  "main-348da28bba8cc2014150.js.gz": "main-348da28bba8cc2014150.js.gz",
-  "main.css": "main-348da28bba8cc2014150.css",
-  "main.js": "main-348da28bba8cc2014150.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.36
+  version: 0.2.41
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-17 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-348da28bba8cc2014150.css.gz
-- ui/dist/main-348da28bba8cc2014150.js.gz
+- ui/dist/main-f7a83db6d8381e2638a1.css.gz
+- ui/dist/main-f7a83db6d8381e2638a1.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: