motor-admin 0.4.22 → 0.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c865c0857941a1626234b641e4f20a4b961389f8f55639602b287ae7b68334b2
-  data.tar.gz: 20d007ae2ff17717db20197e8035502fe828940650d0c7c822084e3d51868bb4
+  metadata.gz: 073751c55b6f68c411439fa4dfde30a04318eff7a6a1764f4aea09c92998cb17
+  data.tar.gz: dd7bd5c8314c137e91cde7cfaa3f2809f645f914ae227c276e1571949388d828
 SHA512:
-  metadata.gz: 8d84bf72ace1611c23690b5ab97b3ec5505039afa87f9b9ce64b464bea75268e55baa0db3d9cd2b7ef6b32ba5e5ffce59416e86674582724d0042104f5e7c79b
-  data.tar.gz: c3d4372c18e32f55050bfd9377e0e28704c4280188a480f3586383e879581c6b6c8596dc2db5ed30d7ae4e60000f9278119762f098691bba6f59634a1ff2774d
+  metadata.gz: 2f50cc4819a6d9a3bd6ac0f1b386e969cf3e829cdf7f110cb6273f50cbed459443dfc990e4f7888755f5e9bdcefe71436cfe69ef777da161b3cd2a7634d3cea5
+  data.tar.gz: '0095cfc6d0746bf614b79e2345ce5d70df2d4c848c8107d197f2ee6ae3b7eabbd08284360af0639434ac040228b4dd456cd95674b4c4062189fa92f6f0dc6d1a'

data/app/controllers/motor/auth_tokens_controller.rb

@@ -28,7 +28,7 @@ module Motor
 
     def respond_with_generic_jwt
       payload = { uid: current_user.id, exp: GENERIC_TOKEN_TTL.from_now.to_i }
-      token = JWT.encode(payload, Rails.application.secrets.secret_key_base)
+      token = JWT.encode(payload, Rails.application.credentials.secret_key_base)
 
       render json: { token: token }
     end

data/app/controllers/motor/run_api_requests_controller.rb

@@ -46,7 +46,7 @@ module Motor
 
       payload = { uid: current_user.id, email: current_user.email, exp: JWT_TTL.from_now.to_i }
 
-      JWT.encode(payload, Rails.application.secrets.secret_key_base)
+      JWT.encode(payload, Rails.application.credentials.secret_key_base)
     end
 
     def request_params

data/app/controllers/motor/run_graphql_requests_controller.rb

@@ -38,7 +38,7 @@ module Motor
 
       payload = { uid: current_user.id, email: current_user.email, exp: JWT_TTL.from_now.to_i }
 
-      JWT.encode(payload, Rails.application.secrets.secret_key_base)
+      JWT.encode(payload, Rails.application.credentials.secret_key_base)
     end
 
     def request_params

data/app/models/motor/alert.rb

@@ -12,7 +12,12 @@ module Motor
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
-    serialize :preferences, HashSerializer
+
+    if Rails.version.to_f >= 7.1
+      serialize :preferences, coder: HashSerializer
+    else
+      serialize :preferences, HashSerializer
+    end
 
     scope :active, -> { where(deleted_at: nil) }
     scope :enabled, -> { where(is_enabled: true) }

data/app/models/motor/api_config.rb

@@ -7,8 +7,13 @@ module Motor
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
     attribute :credentials, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
 
-    serialize :credentials, Motor::HashSerializer
-    serialize :preferences, Motor::HashSerializer
+    if Rails.version.to_f >= 7.1
+      serialize :credentials, coder: Motor::HashSerializer
+      serialize :preferences, coder: Motor::HashSerializer
+    else
+      serialize :credentials, Motor::HashSerializer
+      serialize :preferences, Motor::HashSerializer
+    end
 
     has_one :form, dependent: nil, foreign_key: :api_config_name, primary_key: :name, inverse_of: :api_config
 

data/app/models/motor/audit.rb

@@ -4,6 +4,10 @@ module Motor
   class Audit < Audited::Audit
     self.table_name = 'motor_audits'
 
-    serialize :audited_changes, HashSerializer
+    if Rails.version.to_f >= 7.1
+      serialize :audited_changes, coder: HashSerializer
+    else
+      serialize :audited_changes, HashSerializer
+    end
   end
 end

data/app/models/motor/config.rb

@@ -4,6 +4,10 @@ module Motor
   class Config < ::Motor::ApplicationRecord
     audited
 
-    serialize :value, HashSerializer
+    if Rails.version.to_f >= 7.1
+      serialize :value, coder: HashSerializer
+    else
+      serialize :value, HashSerializer
+    end
   end
 end

data/app/models/motor/dashboard.rb

@@ -10,7 +10,12 @@ module Motor
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
-    serialize :preferences, HashSerializer
+
+    if Rails.version.to_f >= 7.1
+      serialize :preferences, coder: HashSerializer
+    else
+      serialize :preferences, HashSerializer
+    end
 
     scope :active, -> { where(deleted_at: nil) }
 

data/app/models/motor/form.rb

@@ -11,7 +11,12 @@ module Motor
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
-    serialize :preferences, HashSerializer
+
+    if Rails.version.to_f >= 7.1
+      serialize :preferences, coder: HashSerializer
+    else
+      serialize :preferences, HashSerializer
+    end
 
     scope :active, -> { where(deleted_at: nil) }
   end

data/app/models/motor/query.rb

@@ -11,7 +11,12 @@ module Motor
     has_many :alerts, dependent: :destroy
 
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
-    serialize :preferences, HashSerializer
+
+    if Rails.version.to_f >= 7.1
+      serialize :preferences, coder: HashSerializer
+    else
+      serialize :preferences, HashSerializer
+    end
 
     scope :active, -> { where(deleted_at: nil) }
 

data/app/models/motor/resource.rb

@@ -5,6 +5,11 @@ module Motor
     audited
 
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
-    serialize :preferences, HashSerializer
+
+    if Rails.version.to_f >= 7.1
+      serialize :preferences, coder: HashSerializer
+    else
+      serialize :preferences, HashSerializer
+    end
   end
 end

data/lib/generators/motor/migration.rb

@@ -6,7 +6,7 @@ module Motor
       def next_migration_number(dirname)
         next_migration_number = current_migration_number(dirname) + 1
 
-        if ::ActiveRecord::Base.timestamped_migrations
+        if ::ActiveRecord::Base.try(:timestamped_migrations) || ::ActiveRecord.try(:timestamped_migrations)
           [Time.now.utc.strftime('%Y%m%d%H%M%S'), format('%.14d', next_migration_number)].max
         else
           format('%.3d', next_migration_number)

data/lib/motor/admin.rb

@@ -4,6 +4,8 @@ module Motor
   class Admin < ::Rails::Engine
     config.custom_html = ''
 
+    ActiveSupport.cache_format_version = Rails.version.to_f
+
     if !Motor.development? && Rails.env.development?
       config.eager_load_paths.delete(File.expand_path('../../app/controllers', __dir__))
       config.eager_load_paths.delete(File.expand_path('../../app/controllers/concerns', __dir__))

data/lib/motor/queries/run_query.rb

@@ -67,21 +67,14 @@ module Motor
 
         statement = prepare_sql_statement(connection_class, query, limit, variables_hash, filters)
 
-        connection_class.transaction do
-          result =
-            case connection_class.connection.class.name
-            when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
-              PostgresqlExecQuery.call(connection_class.connection, statement)
-            else
-              statement = normalize_statement_for_sql(statement)
-
-              connection_class.connection.exec_query(*statement)
-            end
+        case connection_class.connection.class.name
+        when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
+          PostgresqlExecQuery.call(connection_class.connection, statement)
+        else
+          statement = normalize_statement_for_sql(statement)
 
-          raise ActiveRecord::Rollback
+          connection_class.connection.exec_query(*statement)
         end
-
-        result
       end
 
       def validate_query!(sql)

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.4.22'
+  VERSION = '0.4.24'
 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-13a7c05e5e481d3fe39b.css.gz": "main-13a7c05e5e481d3fe39b.css.gz",
-  "main-13a7c05e5e481d3fe39b.js.LICENSE.txt": "main-13a7c05e5e481d3fe39b.js.LICENSE.txt",
-  "main-13a7c05e5e481d3fe39b.js.gz": "main-13a7c05e5e481d3fe39b.js.gz",
-  "main.css": "main-13a7c05e5e481d3fe39b.css",
-  "main.js": "main-13a7c05e5e481d3fe39b.js"
+  "main-3b866105d1b5846018e0.css.gz": "main-3b866105d1b5846018e0.css.gz",
+  "main-3b866105d1b5846018e0.js.LICENSE.txt": "main-3b866105d1b5846018e0.js.LICENSE.txt",
+  "main-3b866105d1b5846018e0.js.gz": "main-3b866105d1b5846018e0.js.gz",
+  "main.css": "main-3b866105d1b5846018e0.css",
+  "main.js": "main-3b866105d1b5846018e0.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.22
+  version: 0.4.24
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-15 00:00:00.000000000 Z
+date: 2023-12-25 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-13a7c05e5e481d3fe39b.css.gz
-- ui/dist/main-13a7c05e5e481d3fe39b.js.gz
+- ui/dist/main-3b866105d1b5846018e0.css.gz
+- ui/dist/main-3b866105d1b5846018e0.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.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Low-code Admin panel and Business intelligence