motor-admin 0.1.40 → 0.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c650dcb3b3585c6776bb7ece77590fe9e69e5c64323dfa7827870f11203afe09
-  data.tar.gz: 4e9e8e62612c93686c1c5ed2532b14a260e44078830302f7155e49a45a0b6a66
+  metadata.gz: e199bcfee455dceb3c76240eedc692aa869143ebc5521b3b1c7c6ebacc0ff7ec
+  data.tar.gz: 979bd32b1670d8b455a84027979b6e7274ebe5805424382b04fb25ae2cc761d3
 SHA512:
-  metadata.gz: a8325df21f414fc4dfb5e61173ca94312662012d3a3ba12cb128a6c7c91d88b0cc97bfb344d8466500f43fd28bc6c3195eaa662e11ddb4c3333fbe1257611ad2
-  data.tar.gz: 787be19b2a2407237060341ff623e20f40a86fc5a76ce075e75c1dd62fbede8bbd94dd7a0312072cd60af12571c9dcf7edf2afe7e088e6c75267893156cd8482
+  metadata.gz: 1dfc0454884759ce1d2ccb9d71acb083200465e5bc153ab4f0d4dc69492ac5d9d82e3b5525af1e6a332e4152073aa7d072c8f2031ca80469964a2976892b749b
+  data.tar.gz: 311d119be7294aa3da85619543fa7a502be9a602ef72feaf524d263ead9fd10e48fd0c29ae5ad01874d7bb4178eed6173471acdf00b1a824734b098e8bd4e82b

data/lib/motor.rb

@@ -53,6 +53,7 @@ end
 require 'motor/version'
 require 'motor/admin'
 require 'motor/assets'
+require 'motor/active_record_utils'
 require 'motor/build_schema'
 require 'motor/api_query'
 require 'motor/tags'
@@ -62,6 +63,5 @@ require 'motor/dashboards'
 require 'motor/forms'
 require 'motor/alerts'
 require 'motor/hash_serializer'
-require 'motor/active_record_utils'
 require 'motor/net_http_utils'
 require 'motor/railtie'

data/lib/motor/active_record_utils/defined_scopes_extension.rb

@@ -4,7 +4,7 @@ module Motor
   module ActiveRecordUtils
     module DefinedScopesExtension
       def scope(name, _body)
-        (@__scopes__ ||= []) << name
+        (@__scopes__ ||= []) << name.to_sym
 
         super
       end

data/lib/motor/api_query/apply_scope.rb

@@ -13,13 +13,20 @@ module Motor
         if rel.klass.defined_scopes.include?(scope_symbol)
           rel.public_send(scope_symbol)
         else
-          configs = Motor::Resource.find_by_name(rel.klass.name.underscore)
-          scope_configs = configs.preferences[:scopes].find { |s| s[:name] == scope }
+          apply_filter_scope(rel, scope)
+        end
+      end
 
-          return rel unless scope_configs
+      def apply_filter_scope(rel, scope)
+        configs = Motor::Resource.find_by_name(rel.klass.name.underscore)
 
-          ApiQuery::Filter.call(rel, scope_configs[:preferences][:filter])
-        end
+        return rel unless configs
+
+        scope_configs = configs.preferences[:scopes].find { |s| s[:name] == scope }
+
+        return rel unless scope_configs
+
+        ApiQuery::Filter.call(rel, scope_configs[:preferences][:filter])
       end
     end
   end

data/lib/motor/build_schema/find_display_column.rb

@@ -14,15 +14,15 @@ module Motor
         fname
         lname
         sname
+        company
+        domain
+        title
         phone
         phone_number
         email
-        domain
         phone
-        company
         filename
         file_name
-        title
         url
         make
         brand
@@ -42,7 +42,7 @@ module Motor
       end
 
       def select_column_name(column_names)
-        name   = column_names.find { |column_name| column_name.in?(DISPLAY_NAMES) }
+        name   = DISPLAY_NAMES.find { |column_name| column_name.in?(column_names) }
         name ||= column_names.find { |column_name| column_name.match?(DISPLAY_NAME_REGEXP) }
 
         name

data/lib/motor/build_schema/load_from_rails.rb

@@ -4,6 +4,7 @@ module Motor
   module BuildSchema
     module LoadFromRails
       MUTEX = Mutex.new
+      UNIFIED_TYPES = ActiveRecordUtils::Types::UNIFIED_TYPES
 
       module_function
 
@@ -20,8 +21,7 @@ module Motor
       def models
         eager_load_models!
 
-        models = load_descendants(ActiveRecord::Base).uniq
-        models = models.reject(&:abstract_class)
+        models = ActiveRecord::Base.descendants.reject(&:abstract_class)
 
         models -= Motor::ApplicationRecord.descendants
         models -= [Motor::Audit]
@@ -32,12 +32,6 @@ module Motor
         models
       end
 
-      def load_descendants(model)
-        model.descendants + model.descendants.flat_map do |klass|
-          load_descendants(klass)
-        end
-      end
-
       def build_model_schema(model)
         model_name = model.name
 
@@ -92,10 +86,13 @@ module Motor
       end
 
       def build_table_column(column, model, default_attrs)
+        is_enum = model.defined_enums[column.name]
+
         {
           name: column.name,
           display_name: column.name.humanize,
-          column_type: ActiveRecordUtils::Types::UNIFIED_TYPES[column.type.to_s] || column.type.to_s,
+          column_type: is_enum ? 'string' : UNIFIED_TYPES[column.type.to_s] || column.type.to_s,
+          is_array: column.array?,
           access_type: COLUMN_NAME_ACCESS_TYPES.fetch(column.name, ColumnAccessTypes::READ_WRITE),
           default_value: default_attrs[column.name],
           validators: fetch_validators(model, column.name),
@@ -181,6 +178,10 @@ module Motor
             []
           end
 
+        enum = model.defined_enums[column_name]
+
+        validators += [{ includes: enum.keys }] if enum
+
         validators += model.validators_on(column_name).map do |validator|
           build_validator_hash(validator)
         end.compact
@@ -210,6 +211,14 @@ module Motor
           else
             Rails.application.eager_load!
           end
+
+          ActiveRecord::Base.descendants.each do |model|
+            model.reflections.each do |_, ref|
+              ref.klass
+            rescue StandardError
+              next
+            end
+          end
         end
       end
     end

data/lib/motor/configs/build_configs_hash.rb

@@ -9,8 +9,8 @@ module Motor
         cache_keys = LoadFromCache.load_cache_keys
 
         normalize_hash(
-          app_version: Motor::VERSION,
-          file_version: cache_keys.values.max.to_time,
+          engine_version: Motor::VERSION,
+          file_version: cache_keys.values.compact.max.to_time,
           resources: build_resources_hash(cache_keys[:resources]),
           configs: build_configs_hash(cache_keys[:configs]),
           queries: build_queries_hash(cache_keys[:queries]),

data/lib/motor/configs/sync_from_hash.rb

@@ -6,6 +6,8 @@ module Motor
       module_function
 
       def call(configs_hash)
+        return if configs_hash.blank?
+
         configs_hash = configs_hash.with_indifferent_access
 
         Motor::ApplicationRecord.transaction do

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -5,9 +5,9 @@
   "fonts/ionicons.ttf?v=3.0.0-alpha.3": "fonts/ionicons.ttf",
   "fonts/ionicons.woff2?v=3.0.0-alpha.3": "fonts/ionicons.woff2",
   "fonts/ionicons.woff?v=3.0.0-alpha.3": "fonts/ionicons.woff",
-  "main-57d82791202293600221.css.gz": "main-57d82791202293600221.css.gz",
-  "main-57d82791202293600221.js.LICENSE.txt": "main-57d82791202293600221.js.LICENSE.txt",
-  "main-57d82791202293600221.js.gz": "main-57d82791202293600221.js.gz",
-  "main.css": "main-57d82791202293600221.css",
-  "main.js": "main-57d82791202293600221.js"
+  "main-0ef3be65da8d3b0dbabb.css.gz": "main-0ef3be65da8d3b0dbabb.css.gz",
+  "main-0ef3be65da8d3b0dbabb.js.LICENSE.txt": "main-0ef3be65da8d3b0dbabb.js.LICENSE.txt",
+  "main-0ef3be65da8d3b0dbabb.js.gz": "main-0ef3be65da8d3b0dbabb.js.gz",
+  "main.css": "main-0ef3be65da8d3b0dbabb.css",
+  "main.js": "main-0ef3be65da8d3b0dbabb.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.40
+  version: 0.1.41
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2021-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -242,8 +242,8 @@ files:
 - lib/motor/tasks/motor.rake
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-57d82791202293600221.css.gz
-- ui/dist/main-57d82791202293600221.js.gz
+- ui/dist/main-0ef3be65da8d3b0dbabb.css.gz
+- ui/dist/main-0ef3be65da8d3b0dbabb.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: