motor-admin-pz 0.4.22 → 0.4.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '069ac9ff9d7101394c4743ba05f8f935983a9f3f5edaec0e3cfd7e24190d8edc'
-  data.tar.gz: 2ddc0554010612bf3eba3307b2f81b230900eab15bda995def95ac3b4522261d
+  metadata.gz: 93a88182fbcb025e60c5036a8e60ee043a9c86c553fd92ff25d91e83eff1cc94
+  data.tar.gz: 0c704c71d0488b0bfa1ca53392547822496d40b4c2d9912c1454c8ab549b514e
 SHA512:
-  metadata.gz: ef54888102925339f0d542c13a6d730473ee982aab86135fbda5236d093783da4c447959dfc1d2f15739b5407d8537ca073d3201af67e0a9144b1bb805a91dc4
-  data.tar.gz: 91e2861b5750fae47310bd9f6f12cd80be1543624f3ce8da05b388b36b9eef068e9dd73f22f2923cd9d9e514e3007cf2d04a8edf63058ba65a0c875e7506b674
+  metadata.gz: b24ffe23e93d3acf63758e9d4e66b0a6ac555b09b3746a667036289f8971d3d0d26b9913634bcbef77fa8f578168ed8e568556b23c6a68ddd557fd338026684d
+  data.tar.gz: 073bc5aefc3e7dd193cce119c6252cd77da52227519e70d39fb12d351fe9eb4b7287a4f7f1262150cdd3de0d8d5554ebb673220de9da7b883fa886202fa077c1

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/data_controller.rb

@@ -55,6 +55,8 @@ module Motor
     def destroy
       if @resource.respond_to?(:deleted_at)
         @resource.update(deleted_at: Time.current)
+      elsif @resource.respond_to?(:archived_at)
+        @resource.update(archived_at: Time.current)
       else
         @resource.destroy!
       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/alerts/scheduled_alerts_cache.rb

@@ -9,7 +9,11 @@ module Motor
 
       def all
         ActiveRecord::Base.logger.silence do
-          CACHE_STORE.fetch(Motor::Alert.all.maximum(:updated_at)) do
+          cache_key = Motor::Alert.all.maximum(:updated_at)
+
+          return [] if cache_key.nil?
+
+          CACHE_STORE.fetch(cache_key) do
             clear
 
             Motor::Alert.all.active.enabled.to_a

data/lib/motor/queries/run_query.rb

@@ -61,27 +61,18 @@ module Motor
       # @param filters [Hash]
       # @return [ActiveRecord::Result]
       def execute_query(query, limit, variables_hash, filters)
-        result = nil
-
         connection_class = fetch_connection_class(query)
 
         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.26'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin-pz
 version: !ruby/object:Gem::Version
-  version: 0.4.22
+  version: 0.4.26
 platform: ruby
 authors:
 - Pete Matsyburka
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-16 00:00:00.000000000 Z
+date: 2024-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload
@@ -5109,7 +5109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Low-code Admin panel and Business intelligence