motor-admin 0.2.24 → 0.2.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 676aa441a86219350a066d51023aa10a7765c93dd155008feca17a76eec74177
-  data.tar.gz: 83c5d373aac0a44407c8f805ea01aee8d8e178802f0efc22121c879e3885d9b6
+  metadata.gz: 890e9157c807073892957ebdab77377f9cf36b91f5e00f04fd128f5591764fd2
+  data.tar.gz: 41aa043a58ec68f713bf2a75e21464eb8bad07f000cabacd9fa364e821329414
 SHA512:
-  metadata.gz: fbd445e4805615320ed932974aac218d7ae2092c8751d18762e36550139027cb2f683006c4e419c4f21fff230e3e4c5c6dc837cbb682361b09e9c7ed285a8be8
-  data.tar.gz: 0c5b84920c042f7a55353b6c4e6e9f43366bbc2b044cdd9e6924eddcdcf8b7caf1224c17040bb7003710935528608ff6f83aec9bba9fd8e9cff66920e10b7e4c
+  metadata.gz: d5ea14f4ecd4d9deaadac11b12da0d5d689bf8256505a17b632a30a6758fb61e84650f6b997e352f77ccf91a139242aa04f81661d352cfb72087112304383756
+  data.tar.gz: a4ea641247486ee81239eda91e209e421082d8d45fe0dfffde355749f7e273b1f02964f3e668904a493610b38885da87928dbcee151a5c647c60675d84eb6e6a

data/config/locales/en.yml

@@ -278,3 +278,9 @@ en:
     there_is_nothing_here_yet: There is nothing here yet 🤷‍♂️
     is_null: Is null
     is_not_null: Is not null
+    split_tags_by: Split tags by
+    do_not_split: Do not split
+    semicolon: Semicolon
+    hyphen: Hyphen
+    comma: Comma
+    slash: Slash

data/config/locales/es.yml

@@ -278,6 +278,12 @@ es:
     there_is_nothing_here_yet: Todavía no hay nada aquí 🤷‍♂️
     is_null: Es nulo
     is_not_null: No es nulo
+    split_tags_by: Dividir las etiquetas por
+    do_not_split: No dividir
+    semicolon: Punto y coma
+    hyphen: Guión
+    comma: Coma
+    slash: Slash
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -274,6 +274,12 @@ pt:
     there_is_nothing_here_yet: Ainda não há nada aqui 🤷‍♂️
     is_null: É nulo
     is_not_null: Não é nulo
+    split_tags_by: Dividir as etiquetas por
+    do_not_split: Não dividir
+    semicolon: Ponto-e-vírgula
+    hyphen: Hífen
+    comma: Vírgula
+    slash: Slash
     i:
       locale: pt
       select:

data/lib/motor/build_schema/load_from_rails.rb

@@ -116,13 +116,20 @@ module Motor
       end
 
       def build_table_column(column, model, default_attrs)
+        access_type =
+          if model.primary_key == column.name
+            ColumnAccessTypes::READ_ONLY
+          else
+            COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE)
+          end
+
         {
           name: column.name,
           display_name: Utils.humanize_column_name(model.human_attribute_name(column.name)),
           column_type: fetch_column_type(column, model),
           column_source: ColumnSources::TABLE,
           is_array: column.array?,
-          access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
+          access_type: access_type,
           default_value: default_attrs[column.name],
           validators: fetch_validators(model, column.name),
           reference: nil,

data/lib/motor/configs/load_from_cache.rb

@@ -83,9 +83,7 @@ module Motor
       end
 
       def load_cache_keys
-        result = ActiveRecord::Base.connection.execute(cache_keys_sql).to_a
-
-        result = result.map(&:values) if result.first.is_a?(Hash)
+        result = ActiveRecord::Base.connection.exec_query(cache_keys_sql).rows
 
         result.to_h.with_indifferent_access
       end

data/lib/motor/queries/run_query.rb

@@ -61,7 +61,7 @@ module Motor
       # @return [ActiveRecord::Result]
       def execute_query(query, limit, variables_hash, filters)
         result = nil
-        statement = prepare_sql_statement(query, limit, variables_hash, filters)
+        statement = prepare_sql_statement(connection_class.connection, query, limit, variables_hash, filters)
 
         connection_class.transaction do
           result =
@@ -129,17 +129,18 @@ module Motor
         end
       end
 
+      # @param connection [Object]
       # @param query [Motor::Query]
       # @param limit [Integer]
       # @param variables_hash [Hash]
       # @param filters [Hash]
       # @return [Array]
-      def prepare_sql_statement(query, limit, variables_hash, filters)
+      def prepare_sql_statement(connection, query, limit, variables_hash, filters)
         variables = merge_variable_default_values(query.preferences.fetch(:variables, []), variables_hash)
 
         sql, query_variables = RenderSqlTemplate.call(query.sql_body, variables)
         cte_sql = format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.delete_suffix(';'))
-        cte_select_sql = build_cte_select_sql(limit, filters)
+        cte_select_sql = build_cte_select_sql(connection, limit, filters)
 
         attributes = build_statement_attributes(query_variables)
 
@@ -149,7 +150,7 @@ module Motor
       # @param limit [Number]
       # @param filters [Hash]
       # @return [String]
-      def build_cte_select_sql(limit, filters)
+      def build_cte_select_sql(connection, limit, filters)
         table = Arel::Table.new(CTE_NAME)
 
         arel_filters = build_filters_arel(filters)
@@ -157,7 +158,9 @@ module Motor
         expresion = table.project(table[Arel.star])
         expresion = expresion.where(arel_filters) if arel_filters.present?
 
-        expresion.take(limit.to_i).to_sql.delete('"')
+        expresion.take(limit.to_i) unless connection.class.name.include?('SQLServerAdapter')
+
+        expresion.to_sql.delete('"')
       end
 
       # @param filters [Hash]

data/lib/motor/resources/custom_sql_columns_cache.rb

@@ -9,7 +9,7 @@ module Motor
 
       def call(sql)
         CACHE_STORE.fetch(sql.hash) do
-          Queries::RunQuery.call(Query.new(sql_body: sql), limit: 0).columns
+          Queries::RunQuery.call(Query.new(sql_body: sql), limit: 0).columns || []
         end
       end
     end

data/lib/motor/resources/fetch_configured_model.rb

@@ -5,6 +5,8 @@ module Motor
     module FetchConfiguredModel
       CACHE_HASH = HashWithIndifferentAccess.new
 
+      HAS_AND_BELONGS_TO_MANY_JOIN_MODEL_PREFIX = 'HABTM_'
+
       module_function
 
       def call(model, cache_key:)
@@ -130,13 +132,8 @@ module Motor
       end
 
       def configure_reflection_classes(klass, cache_key)
-        klass.reflections.each do |key, ref|
-          begin
-            next unless ref.klass
-            next if ref.klass.anonymous?
-          rescue StandardError
-            next
-          end
+        klass._reflections.each do |key, ref|
+          next unless configure_reflection_class?(ref)
 
           ref_dup = ref.dup
 
@@ -203,6 +200,19 @@ module Motor
         end
       end
 
+      def configure_reflection_class?(ref)
+        begin
+          return false unless ref.klass
+        rescue StandardError
+          return false
+        end
+
+        return false if ref.klass.anonymous?
+        return false if ref.klass.name.demodulize.starts_with?(HAS_AND_BELONGS_TO_MANY_JOIN_MODEL_PREFIX)
+
+        true
+      end
+
       def sti_model?(model)
         !model.superclass.abstract_class && model.columns_hash[model.inheritance_column.to_s]
       end

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.24'
+  VERSION = '0.2.28'
 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-8421aae2289372e89a1d.css.gz": "main-8421aae2289372e89a1d.css.gz",
-  "main-8421aae2289372e89a1d.js.LICENSE.txt": "main-8421aae2289372e89a1d.js.LICENSE.txt",
-  "main-8421aae2289372e89a1d.js.gz": "main-8421aae2289372e89a1d.js.gz",
-  "main.css": "main-8421aae2289372e89a1d.css",
-  "main.js": "main-8421aae2289372e89a1d.js"
+  "main-9f6b19ff999e209e9d33.css.gz": "main-9f6b19ff999e209e9d33.css.gz",
+  "main-9f6b19ff999e209e9d33.js.LICENSE.txt": "main-9f6b19ff999e209e9d33.js.LICENSE.txt",
+  "main-9f6b19ff999e209e9d33.js.gz": "main-9f6b19ff999e209e9d33.js.gz",
+  "main.css": "main-9f6b19ff999e209e9d33.css",
+  "main.js": "main-9f6b19ff999e209e9d33.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.28
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-13 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -1525,8 +1525,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-8421aae2289372e89a1d.css.gz
-- ui/dist/main-8421aae2289372e89a1d.js.gz
+- ui/dist/main-9f6b19ff999e209e9d33.css.gz
+- ui/dist/main-9f6b19ff999e209e9d33.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: