motor-admin 0.4.3 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d3a3e923ca22e7fdf83117a4b7c0bd380ffb345f747d99de9eecceb171ceabc
-  data.tar.gz: fb8239b1a4177781480dc59014c525aa84731eb9baaf63edb72072a81698fbd4
+  metadata.gz: ab0cc50d998434c23dbb9e9722a600b694b9177d7734d2abf347123c97e668cd
+  data.tar.gz: c6f7837f40d9490d694d1491e691aa4154e8649fa6c9d890683a9bb607fdb1d4
 SHA512:
-  metadata.gz: 2effaa91317c2c4b48fbaf9008c4e006419c31e7266effe444ade006a7928b0c436596eeac20510a995b5c194ebbb66ce12edef1acb4c062a3bdef66fb35a5e6
-  data.tar.gz: 002f44a7671b4fc529d7973cf66ef533eb00b1a7603b2d788a81f93f48daa0db56aa76f7040571901423352e29956b15b11116948d5f1fb9cb598cf7e2f04590
+  metadata.gz: b11ed6e3233d6e92c95cf2981236f806d91a985544d83872a20a8bcd9cf2f06e17814ca2dfa1dfdb7031e639950afa97822079ba9b68dc36d76426cbfd6065b5
+  data.tar.gz: dfa730ff66075b589c2a67fb6513fad839a6f60b01335b4eaff67599149822a2071467f1302ec4798235510a3baae77212f75cf02307543fbb3346839f7e0bb0

data/app/controllers/motor/ui_controller.rb

@@ -12,11 +12,11 @@ module Motor
       render_ui
     end
 
-    def new
+    def show
       render_ui
     end
 
-    def show
+    def new
       render_ui
     end
 

data/app/models/motor/alert.rb

@@ -11,7 +11,7 @@ module Motor
     has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
-    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
+    attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }

data/app/models/motor/api_config.rb

@@ -4,8 +4,8 @@ module Motor
   class ApiConfig < ::Motor::ApplicationRecord
     encrypts :credentials if defined?(::Motor::EncryptedConfig)
 
-    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
-    attribute :credentials, default: -> { HashWithIndifferentAccess.new }
+    attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
+    attribute :credentials, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
 
     serialize :credentials, Motor::HashSerializer
     serialize :preferences, Motor::HashSerializer

data/app/models/motor/dashboard.rb

@@ -9,7 +9,7 @@ module Motor
     has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
-    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
+    attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }

data/app/models/motor/form.rb

@@ -10,7 +10,7 @@ module Motor
     has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
-    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
+    attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }

data/app/models/motor/query.rb

@@ -10,7 +10,7 @@ module Motor
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
     has_many :alerts, dependent: :destroy
 
-    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
+    attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }

data/app/models/motor/resource.rb

@@ -4,7 +4,7 @@ module Motor
   class Resource < ::Motor::ApplicationRecord
     audited
 
-    attribute :preferences, default: -> { HashWithIndifferentAccess.new }
+    attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
     serialize :preferences, HashSerializer
   end
 end

data/config/routes.rb

@@ -2,7 +2,7 @@
 
 Motor::Admin.routes.draw do
   namespace :motor, path: '' do
-    mount ActionCable.server => '/cable', as: :cabel if defined?(ActionCable)
+    mount ActionCable.server => '/cable', as: :cable if defined?(ActionCable)
 
     scope 'api', as: :api do
       resources :run_queries, only: %i[show create]

data/lib/motor/active_record_utils/defined_scopes_extension.rb

@@ -22,4 +22,4 @@ module Motor
   end
 end
 
-ActiveRecord::Base.extend(Motor::ActiveRecordUtils::DefinedScopesExtension)
+ActiveSupport.on_load(:active_record) { extend Motor::ActiveRecordUtils::DefinedScopesExtension }

data/lib/motor/admin.rb

@@ -121,8 +121,8 @@ module Motor
 
         if !Motor::ApiConfig.table_exists? || !Motor::Note.table_exists?
           puts
-          puts '  => Run `rails g motor:upgrade && rake db:migrate`' \
-               ' to perform data migration and enable the latest features'
+          puts '  => Run `rails g motor:upgrade && rake db:migrate` ' \
+               'to perform data migration and enable the latest features'
           puts
 
           raise

data/lib/motor/alerts.rb

@@ -27,7 +27,7 @@ module Motor
 
       column_index = result.columns.find_index { |c| c[:name] == column_name }
 
-      emails = result.data.map { |row| row[column_index] }.uniq
+      emails = result.data.pluck(column_index).uniq
 
       emails.each do |email|
         Motor::AlertsMailer.alert_email(alert, email: email).deliver_now!

data/lib/motor/build_schema/merge_schema_configs.rb

@@ -148,7 +148,7 @@ module Motor
       def load_configs(cache_keys)
         resources = Motor::Configs::LoadFromCache.load_resources(cache_key: cache_keys[:resources])
 
-        resources.each_with_object(HashWithIndifferentAccess.new) do |resource, acc|
+        resources.each_with_object(ActiveSupport::HashWithIndifferentAccess.new) do |resource, acc|
           acc[resource.name] = resource.preferences
         end
       end

data/lib/motor/configs/build_configs_hash.rb

@@ -77,7 +77,7 @@ module Motor
 
       def normalize_hash(value)
         case value
-        when Hash, HashWithIndifferentAccess
+        when Hash, ActiveSupport::HashWithIndifferentAccess
           value.to_h.stringify_keys.transform_values { |v| normalize_hash(v) }
         when Array
           value.map { |e| normalize_hash(e) }

data/lib/motor/configs/build_ui_app_tag.rb

@@ -44,7 +44,7 @@ module Motor
           audits_count: Motor::Audit.count,
           i18n: i18n_data,
           base_path: Motor::Admin.routes.url_helpers.motor_path,
-          cabel_path: Motor::Admin.routes.url_helpers.try(:motor_cabel_path),
+          cable_path: Motor::Admin.routes.url_helpers.try(:motor_cable_path),
           admin_settings_path: Rails.application.routes.url_helpers.try(:admin_settings_general_path),
           schema: Motor::BuildSchema.call(cache_keys, current_ability),
           header_links: header_links_data_hash(current_user, current_ability, configs_cache_key),

data/lib/motor/configs/load_from_cache.rb

@@ -3,7 +3,7 @@
 module Motor
   module Configs
     module LoadFromCache
-      CACHE_HASH = HashWithIndifferentAccess.new
+      CACHE_HASH = ActiveSupport::HashWithIndifferentAccess.new
 
       module_function
 

data/lib/motor/notes/notify_mentions.rb

@@ -47,17 +47,15 @@ module Motor
 
         display_value = note.record.attributes[configs['display_column']]
 
-        I18n.t('new_mention_for',
+        I18n.t('motor.new_mention_for',
                resource: ["#{configs['display_name'].singularize} ##{note.record[note.record.class.primary_key]}",
-                          display_value].join(' '),
-               scope: :motor)
+                          display_value].join(' '))
       end
 
       def build_mention_description(note, current_user)
-        I18n.t('user_mentioned_you_with_note',
+        I18n.t('motor.user_mentioned_you_with_note',
                user: current_user&.email || 'Anonymous',
-               note: note.body.truncate(NOTIFICATION_DESCRIPTION_LIMIT),
-               scope: :motor)
+               note: note.body.truncate(NOTIFICATION_DESCRIPTION_LIMIT))
       end
 
       def fetch_users_class(current_user)

data/lib/motor/notes/notify_reminder.rb

@@ -39,10 +39,9 @@ module Motor
 
         display_value = note.record.attributes[configs['display_column']]
 
-        I18n.t('new_reminder_for',
+        I18n.t('motor.new_reminder_for',
                resource: ["#{configs['display_name'].singularize} ##{note.record[note.record.class.primary_key]}",
-                          display_value].join(' '),
-               scope: :motor)
+                          display_value].join(' '))
       end
     end
   end

data/lib/motor/notes/persist.rb

@@ -29,7 +29,7 @@ module Motor
       end
 
       def parse_tag_names(note)
-        note.body.scan(TAG_REGEXP).map { |tag| tag[1..] }
+        note.body.scan(TAG_REGEXP).pluck(1..)
       end
     end
   end

data/lib/motor/notes/reminders_scheduler.rb

@@ -12,7 +12,7 @@ module Motor
 
       REMINDER_NOTIFICATIONS_JOIN_SQL = <<~SQL.squish
         LEFT JOIN motor_notifications
-        ON motor_notifications.record_id = motor_reminders.id
+        ON cast(motor_notifications.record_id as int) = motor_reminders.id
         AND motor_notifications.record_type = 'Motor::Reminder'
       SQL
 

data/lib/motor/resources/fetch_configured_model.rb

@@ -3,7 +3,7 @@
 module Motor
   module Resources
     module FetchConfiguredModel
-      CACHE_HASH = HashWithIndifferentAccess.new
+      CACHE_HASH = ActiveSupport::HashWithIndifferentAccess.new
 
       HAS_AND_BELONGS_TO_MANY_JOIN_MODEL_PREFIX = 'HABTM_'
 

data/lib/motor/version.rb

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

data/ui/dist/manifest.json

@@ -3964,9 +3964,9 @@
   "images/layers-2x.png": "images/layers-2x.png",
   "images/layers.png": "images/layers.png",
   "images/marker-icon.png": "images/marker-icon.png",
-  "main-ef8d17c17507c8301bda.css.gz": "main-ef8d17c17507c8301bda.css.gz",
-  "main-ef8d17c17507c8301bda.js.LICENSE.txt": "main-ef8d17c17507c8301bda.js.LICENSE.txt",
-  "main-ef8d17c17507c8301bda.js.gz": "main-ef8d17c17507c8301bda.js.gz",
-  "main.css": "main-ef8d17c17507c8301bda.css",
-  "main.js": "main-ef8d17c17507c8301bda.js"
+  "main-947a9a9c3b6ed918c60d.css.gz": "main-947a9a9c3b6ed918c60d.css.gz",
+  "main-947a9a9c3b6ed918c60d.js.LICENSE.txt": "main-947a9a9c3b6ed918c60d.js.LICENSE.txt",
+  "main-947a9a9c3b6ed918c60d.js.gz": "main-947a9a9c3b6ed918c60d.js.gz",
+  "main.css": "main-947a9a9c3b6ed918c60d.css",
+  "main.js": "main-947a9a9c3b6ed918c60d.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.5
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-24 00:00:00.000000000 Z
+date: 2023-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload
@@ -2235,8 +2235,8 @@ files:
 - ui/dist/images/layers-2x.png
 - ui/dist/images/layers.png
 - ui/dist/images/marker-icon.png
-- ui/dist/main-ef8d17c17507c8301bda.css.gz
-- ui/dist/main-ef8d17c17507c8301bda.js.gz
+- ui/dist/main-947a9a9c3b6ed918c60d.css.gz
+- ui/dist/main-947a9a9c3b6ed918c60d.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses:
@@ -2265,7 +2265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Low-code Admin panel and Business intelligence