motor-admin 0.1.39 → 0.1.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e0ab742c32ae1b59bfa12c6eb1f838e5d379cb5a964521fe7f345de5fabf953
-  data.tar.gz: 9f018c3475ae06b4104e35f30774c80b2098a8a23b7fa3a8e4ac35df089ee98e
+  metadata.gz: 74c91b2c5dbc0b48fa75a4fa9f5ec2eb8a3848b2e65cf819b9ddc3317e379a19
+  data.tar.gz: bee5733d821cde96004674d36c9be0467e32044d921a4b52e863b4be4e3de55b
 SHA512:
-  metadata.gz: '0651978240824b17dc1f379047faf9f5c5a393b9bebe6e37ae692a606630a300454a2c56c88173383defef451787555006d355fe26c2dd38173f0ece03e116a0'
-  data.tar.gz: b15c006847a5c9dcea315741ccc3a46e3a2bba49ab05d2aceab44c75a530ba0f5fad79067aae0b8e31abad9cda105a827cbdb892d93fd1c2c1fe72a2f62a8637
+  metadata.gz: 9bb22f83f9c270696f2d32cc384b98d90a5dab99f7f377258682dbc3622bd574ea0c6bf43de5cd955bb551dd56d6d43b4e618a53803a7d91417a7ec88ae9571f
+  data.tar.gz: 6e1f295abe63ca50e7176789523747810384307c03bcf5c4c719cc41a85296573fb0f6c3e193f06e625ed5801c204a519675539719d966357398293fe3a10977

data/app/controllers/motor/active_storage_attachments_controller.rb

@@ -26,7 +26,7 @@ module Motor
     end
 
     def file_params
-      params.require(:data).require(:file).permit(:io, :filename).to_h
+      params.require(:data).require(:file).permit(:io, :filename).to_h.symbolize_keys
     end
 
     def attachment_params

data/app/models/motor/alert.rb

@@ -7,8 +7,8 @@ module Motor
     belongs_to :query
     belongs_to :author, polymorphic: true, optional: true
 
-    has_many :alert_locks
-    has_many :taggable_tags, as: :taggable
+    has_many :alert_locks, dependent: :destroy
+    has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     serialize :preferences, HashSerializer

data/app/models/motor/dashboard.rb

@@ -6,7 +6,7 @@ module Motor
 
     belongs_to :author, polymorphic: true, optional: true
 
-    has_many :taggable_tags, as: :taggable
+    has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     serialize :preferences, HashSerializer

data/app/models/motor/form.rb

@@ -6,7 +6,7 @@ module Motor
 
     belongs_to :author, polymorphic: true, optional: true
 
-    has_many :taggable_tags, as: :taggable
+    has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
 
     serialize :preferences, HashSerializer

data/app/models/motor/query.rb

@@ -6,8 +6,9 @@ module Motor
 
     belongs_to :author, polymorphic: true, optional: true
 
-    has_many :taggable_tags, as: :taggable
+    has_many :taggable_tags, as: :taggable, dependent: :destroy
     has_many :tags, through: :taggable_tags, class_name: 'Motor::Tag'
+    has_many :alerts, dependent: :destroy
 
     serialize :preferences, HashSerializer
 

data/config/routes.rb

@@ -47,5 +47,3 @@ Motor::Admin.routes.draw do
     end
   end
 end
-
-ActiveSupport::Notifications.instrument('motor.routes.loaded')

data/lib/generators/motor/templates/install.rb

@@ -1,6 +1,6 @@
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def self.up
-    create_table :motor_queries, force: true do |t|
+    create_table :motor_queries do |t|
       t.column :name, :string, null: false
       t.column :description, :string
       t.column :sql_body, :string, null: false
@@ -18,7 +18,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
               where: 'deleted_at IS NULL'
     end
 
-    create_table :motor_dashboards, force: true do |t|
+    create_table :motor_dashboards do |t|
       t.column :title, :string, null: false
       t.column :description, :string
       t.column :preferences, :string, null: false, default: '{}'
@@ -35,7 +35,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
               where: 'deleted_at IS NULL'
     end
 
-    create_table :motor_forms, force: true do |t|
+    create_table :motor_forms do |t|
       t.column :name, :string, null: false
       t.column :description, :string
       t.column :api_path, :string, null: false
@@ -54,7 +54,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
               where: 'deleted_at IS NULL'
     end
 
-    create_table :motor_resources, force: true do |t|
+    create_table :motor_resources do |t|
       t.column :name, :string, null: false, index: { unique: true }
       t.column :preferences, :string, null: false, default: '{}'
 
@@ -63,7 +63,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.index :updated_at
     end
 
-    create_table :motor_configs, force: true do |t|
+    create_table :motor_configs do |t|
       t.column :key, :string, null: false, index: { unique: true }
       t.column :value, :string, null: false, default: '{}'
 
@@ -72,7 +72,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.index :updated_at
     end
 
-    create_table :motor_alerts, force: true do |t|
+    create_table :motor_alerts do |t|
       t.references :query, null: false, foreign_key: { to_table: :motor_queries }, index: true
       t.column :name, :string, null: false
       t.column :description, :string
@@ -92,7 +92,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
               where: 'deleted_at IS NULL'
     end
 
-    create_table :motor_alert_locks, force: true do |t|
+    create_table :motor_alert_locks do |t|
       t.references :alert, null: false, foreign_key: { to_table: :motor_alerts }
       t.column :lock_timestamp, :string, null: false
 
@@ -101,7 +101,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.index %i[alert_id lock_timestamp], unique: true
     end
 
-    create_table :motor_tags, force: true do |t|
+    create_table :motor_tags do |t|
       t.column :name, :string, null: false
 
       t.timestamps
@@ -111,7 +111,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
               unique: true
     end
 
-    create_table :motor_taggable_tags, force: true do |t|
+    create_table :motor_taggable_tags do |t|
       t.references :tag, null: false, foreign_key: { to_table: :motor_tags }, index: true
       t.column :taggable_id, :integer, null: false
       t.column :taggable_type, :string, null: false
@@ -121,7 +121,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
               unique: true
     end
 
-    create_table :motor_audits, force: true do |t|
+    create_table :motor_audits do |t|
       t.column :auditable_id, :integer
       t.column :auditable_type, :string
       t.column :associated_id, :integer

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

@@ -7,3 +7,4 @@ require_relative './active_record_utils/types'
 require_relative './active_record_utils/fetch_methods'
 require_relative './active_record_utils/defined_scopes_extension'
 require_relative './active_record_utils/active_storage_links_extension'
+require_relative './active_record_utils/active_storage_blob_patch'

data/lib/motor/active_record_utils/active_storage_blob_patch.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Motor
+  module ActiveRecordUtils
+    module ActiveStorageBlobPatch
+      KEYWORD_ARGS = %i[io filename content_type metadata identify].freeze
+
+      def build_after_upload(hash)
+        super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
+      end
+
+      def build_after_unfurling(hash)
+        super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
+      end
+
+      def create_after_unfurling!(hash)
+        super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
+      end
+
+      def create_and_upload!(hash)
+        super(**hash.with_indifferent_access.slice(*KEYWORD_ARGS).symbolize_keys)
+      end
+    end
+  end
+end

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'motor/configs/sync_middleware'
-
 module Motor
   class Admin < ::Rails::Engine
     initializer 'motor.startup_message' do
-      ActiveSupport::Notifications.subscribe('motor.routes.loaded') do
+      config.after_initialize do
         next unless Motor.server?
 
+        Rails.application.reload_routes!
+
         if Rails.application.routes.url_helpers.respond_to?(:motor_admin_path)
           url =
             begin
@@ -31,9 +31,11 @@ module Motor
     end
 
     initializer 'motor.configs.sync_middleware' do
-      if Motor::Configs::SyncMiddleware::ACCESS_KEY.present?
-        Rails.application.config.middleware.insert_before(0, Motor::Configs::SyncMiddleware)
-      end
+      next if Motor::Configs::SYNC_ACCESS_KEY.blank?
+
+      require 'motor/configs/sync_middleware'
+
+      Rails.application.config.middleware.insert_after(Rails::Rack::Logger, Motor::Configs::SyncMiddleware)
     end
 
     initializer 'motor.filter_params' do
@@ -67,6 +69,10 @@ module Motor
       ActiveSupport.on_load(:active_storage_attachment) do
         ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)
       end
+
+      ActiveSupport.on_load(:active_storage_blob) do
+        ActiveStorage::Blob.singleton_class.prepend(Motor::ActiveRecordUtils::ActiveStorageBlobPatch)
+      end
     end
   end
 end

data/lib/motor/alerts/persistance.rb

@@ -43,25 +43,31 @@ module Motor
         retry
       end
 
-      def update_from_params!(alert, params)
+      def update_from_params!(alert, params, force_replace: false)
         tag_ids = alert.tags.ids
 
         alert = assign_attributes(alert, params)
 
-        raise NameAlreadyExists if name_already_exists?(alert)
+        raise NameAlreadyExists if !force_replace && name_already_exists?(alert)
         raise InvalidInterval unless alert.cron
 
         ApplicationRecord.transaction do
+          archive_with_existing_name(alert) if force_replace
+
           alert.save!
         end
 
-        alert.touch if tag_ids.sort != alert.tags.reload.ids.sort && params[:updated_at].blank?
+        alert.touch if tags_changed?(tag_ids, alert) && params[:updated_at].blank?
 
         alert
       rescue ActiveRecord::RecordNotUnique
         retry
       end
 
+      def tags_changed?(previous_ids, alert)
+        previous_ids.sort != alert.tags.reload.ids.sort
+      end
+
       def assign_attributes(alert, params)
         alert.assign_attributes(params.slice(*ALERT_ATTRIBUTES))
         alert.preferences[:interval] = normalize_interval(alert.preferences[:interval])
@@ -70,6 +76,11 @@ module Motor
         Motor::Tags.assign_tags(alert, params[:tags])
       end
 
+      def archive_with_existing_name(alert)
+        Motor::Alert.where(['lower(name) = ? AND id != ?', alert.name.to_s.downcase, alert.id])
+                    .update_all(deleted_at: Time.current)
+      end
+
       def normalize_interval(interval)
         interval.to_s.gsub(NORMALIZE_INTERVAL_REGEXP, 'every ')
       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.rb

@@ -68,6 +68,7 @@ module Motor
 end
 
 require_relative './build_schema/active_storage_attachment_schema'
+require_relative './build_schema/adjust_devise_model_schema'
 require_relative './build_schema/load_from_rails'
 require_relative './build_schema/find_display_column'
 require_relative './build_schema/persist_resource_configs'

data/lib/motor/build_schema/adjust_devise_model_schema.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+module Motor
+  module BuildSchema
+    module AdjustDeviseModelSchema
+      HIDDEN_COLUMNS = %w[
+        encrypted_password
+        reset_password_token
+        confirmation_token
+      ].freeze
+
+      READ_ONLY_COLUMNS = %w[
+        reset_password_sent_at
+        remember_created_at
+        sign_in_count
+        current_sign_in_at
+        last_sign_in_at
+        current_sign_in_ip
+        last_sign_in_ip
+        confirmed_at
+        confirmation_sent_at
+      ].freeze
+
+      module_function
+
+      def call(schema, devise_modules)
+        modify_column_access_types!(schema[:columns])
+        add_password_column!(schema[:columns]) if devise_modules.include?(:database_authenticatable)
+
+        schema
+      end
+
+      def modify_column_access_types!(columns)
+        columns.each do |column|
+          column[:access_type] =
+            case column[:name]
+            when *HIDDEN_COLUMNS
+              ColumnAccessTypes::HIDDEN
+            when *READ_ONLY_COLUMNS
+              ColumnAccessTypes::READ_ONLY
+            else
+              column[:access_type]
+            end
+        end
+      end
+
+      def add_password_column!(columns)
+        columns << {
+          name: 'password',
+          display_name: 'Password',
+          column_type: 'string',
+          access_type: 'write_only',
+          default_value: nil,
+          validators: [],
+          virtual: true
+        }
+      end
+    end
+  end
+end

data/lib/motor/build_schema/find_display_column.rb

@@ -3,35 +3,38 @@
 module Motor
   module BuildSchema
     module FindDisplayColumn
-      DISPLAY_NAMES = %w[
-        name
-        full_name
-        fullname
-        last_name
-        lastname
-        first_name
-        firstname
-        fname
-        lname
-        sname
-        phone
-        phone_number
-        email
-        domain
-        phone
-        company
-        filename
-        file_name
-        title
-        url
-        make
-        brand
-        manufacturer
-        model
-        address
-      ].freeze
-
-      DISPLAY_NAME_REGEXP = Regexp.new(Regexp.union(DISPLAY_NAMES).source, Regexp::IGNORECASE)
+      DISPLAY_NAMES = Set.new(
+        %w[
+          name
+          full_name
+          fullname
+          last_name
+          lastname
+          first_name
+          firstname
+          fname
+          lname
+          sname
+          company
+          domain
+          website
+          title
+          phone
+          phone_number
+          email
+          phone
+          filename
+          file_name
+          url
+          make
+          brand
+          manufacturer
+          model
+          address
+        ]
+      ).freeze
+
+      DISPLAY_NAME_REGEXP = Regexp.new(Regexp.union(DISPLAY_NAMES.to_a).source, Regexp::IGNORECASE)
 
       module_function
 

data/lib/motor/build_schema/load_from_rails.rb

@@ -4,12 +4,21 @@ module Motor
   module BuildSchema
     module LoadFromRails
       MUTEX = Mutex.new
+      UNIFIED_TYPES = ActiveRecordUtils::Types::UNIFIED_TYPES
 
       module_function
 
       def call
         models.map do |model|
-          build_model_schema(model)
+          Object.const_get(model.name)
+
+          schema = build_model_schema(model)
+
+          if model.respond_to?(:devise_modules)
+            Motor::BuildSchema::AdjustDeviseModelSchema.call(schema, model.devise_modules)
+          end
+
+          schema
         rescue StandardError, NotImplementedError => e
           Rails.logger.error(e) if model.name != 'Audited::Audit'
 
@@ -20,8 +29,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 +40,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 +94,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),
@@ -111,13 +116,15 @@ module Motor
         model.reflections.map do |name, ref|
           next if !ref.has_one? && !ref.belongs_to?
 
-          begin
-            ref.klass
-          rescue StandardError
-            next
-          end
+          unless ref.polymorphic?
+            begin
+              next if ref.klass.name == 'ActiveStorage::Blob'
+            rescue StandardError => e
+              Rails.logger.error(e)
 
-          next if ref.klass.name == 'ActiveStorage::Blob'
+              next
+            end
+          end
 
           build_reflection_column(name, model, ref, default_attrs)
         end.compact
@@ -125,7 +132,7 @@ module Motor
 
       def build_reflection_column(name, model, ref, default_attrs)
         column_name = ref.belongs_to? ? ref.foreign_key.to_s : name
-        is_attachment = ref.klass.name == 'ActiveStorage::Attachment'
+        is_attachment = !ref.polymorphic? && ref.klass.name == 'ActiveStorage::Attachment'
         access_type = ref.belongs_to? || is_attachment ? ColumnAccessTypes::READ_WRITE : ColumnAccessTypes::READ_ONLY
 
         {
@@ -136,26 +143,26 @@ module Motor
           default_value: default_attrs[column_name],
           validators: fetch_validators(model, column_name, ref),
           format: {},
-          reference: {
-            name: name,
-            model_name: ref.klass.name.underscore,
-            reference_type: ref.belongs_to? ? 'belongs_to' : 'has_one',
-            foreign_key: ref.foreign_key,
-            polymorphic: ref.polymorphic? || is_attachment
-          },
+          reference: build_reference(name, ref),
           virtual: false
         }
       end
 
+      def build_reference(name, reflection)
+        {
+          name: name,
+          display_name: name.humanize,
+          model_name: reflection.polymorphic? ? nil : reflection.klass.name.underscore,
+          reference_type: reflection.belongs_to? ? 'belongs_to' : 'has_one',
+          foreign_key: reflection.foreign_key,
+          polymorphic: reflection.polymorphic?
+        }
+      end
+
       def fetch_associations(model)
         model.reflections.map do |name, ref|
           next if ref.has_one? || ref.belongs_to?
-
-          begin
-            ref.klass
-          rescue StandardError
-            next
-          end
+          next unless valid_reflection?(ref)
 
           model_class = ref.klass
 
@@ -167,7 +174,7 @@ module Motor
             slug: name.underscore,
             model_name: model_class.name.underscore,
             foreign_key: ref.foreign_key,
-            polymorphic: ref.polymorphic? || model_class.name == 'ActiveStorage::Attachment',
+            polymorphic: ref.options[:as].present?,
             visible: true
           }
         end.compact
@@ -181,6 +188,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
@@ -203,6 +214,17 @@ module Motor
         end
       end
 
+      def valid_reflection?(reflection)
+        reflection.klass
+        reflection.foreign_key
+
+        true
+      rescue StandardError => e
+        Rails.logger.error(e)
+
+        false
+      end
+
       def eager_load_models!
         MUTEX.synchronize do
           if Rails::VERSION::MAJOR > 5 && defined?(Zeitwerk::Loader)
@@ -210,6 +232,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.rb

@@ -4,6 +4,7 @@ module Motor
   module Configs
     FILE_PATH = 'config/motor.yml'
     SYNC_API_PATH = '/motor_configs_sync'
+    SYNC_ACCESS_KEY = ENV.fetch('MOTOR_SYNC_API_KEY', '')
   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_file.rb

@@ -9,7 +9,7 @@ module Motor
 
       module_function
 
-      def call
+      def call(with_exception: false)
         MUTEXT.synchronize do
           file = Rails.root.join(FILE_PATH)
 
@@ -17,6 +17,8 @@ module Motor
             begin
               file.ctime
             rescue Errno::ENOENT
+              raise if with_exception
+
               nil
             end
 

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
@@ -100,7 +102,7 @@ module Motor
 
           next if record.updated_at >= attrs[:updated_at]
 
-          update_proc.call(record, attrs)
+          update_proc.call(record, attrs, force_replace: true)
         end
       end
 
@@ -108,7 +110,7 @@ module Motor
         create_items.each do |attrs|
           record = records_class.find_or_initialize_by(id: attrs[:id]).tap { |e| e.deleted_at = nil }
 
-          update_proc.call(record, attrs)
+          update_proc.call(record, attrs, force_replace: true)
         end
       end
 

data/lib/motor/configs/sync_middleware.rb

@@ -3,8 +3,6 @@
 module Motor
   module Configs
     class SyncMiddleware
-      ACCESS_KEY = ENV.fetch('MOTOR_SYNC_API_KEY', '')
-
       KeyNotSpecified = Class.new(StandardError)
       NotAuthenticated = Class.new(StandardError)
 
@@ -14,13 +12,15 @@ module Motor
 
       def call(env)
         if env['PATH_INFO'] == Motor::Configs::SYNC_API_PATH
-          authenticate!(env['QUERY_STRING'])
+          authenticate!(env['HTTP_X_AUTHORIZATION'])
 
           case env['REQUEST_METHOD']
           when 'GET'
             respond_with_configs
           when 'POST'
-            sync_configs(env['rack.input'].read)
+            input = env['rack.input']
+            input.rewind
+            sync_configs(input.read)
           else
             @app.call(env)
           end
@@ -35,14 +35,14 @@ module Motor
 
       private
 
-      def authenticate!(query_string)
-        raise KeyNotSpecified if ACCESS_KEY.blank?
-        raise NotAuthenticated if query_string.blank?
+      def authenticate!(token)
+        raise KeyNotSpecified if Motor::Configs::SYNC_ACCESS_KEY.blank?
+        raise NotAuthenticated if token.blank?
 
         is_token_valid =
           ActiveSupport::SecurityUtils.secure_compare(
-            Digest::SHA256.hexdigest(query_string),
-            Digest::SHA256.hexdigest("token=#{ACCESS_KEY}")
+            Digest::SHA256.hexdigest(token),
+            Digest::SHA256.hexdigest(Motor::Configs::SYNC_ACCESS_KEY)
           )
 
         raise NotAuthenticated unless is_token_valid

data/lib/motor/configs/sync_with_remote.rb

@@ -16,7 +16,7 @@ module Motor
       end
 
       def sync_from_remote!(remote_url, api_key)
-        response = Motor::NetHttpUtils.get(remote_url, { token: api_key })
+        response = Motor::NetHttpUtils.get(remote_url, {}, { 'X-Authorization' => api_key })
 
         raise ApiNotFound if response.is_a?(Net::HTTPNotFound)
         raise UnableToSync, [response.message, response.body].join(': ') unless response.is_a?(Net::HTTPSuccess)
@@ -29,7 +29,15 @@ module Motor
       def sync_to_remote!(remote_url, api_key)
         configs_hash = Motor::Configs::BuildConfigsHash.call
 
-        response = Motor::NetHttpUtils.post(remote_url, { token: api_key }, configs_hash.to_json)
+        response = Motor::NetHttpUtils.post(
+          remote_url,
+          {},
+          {
+            'X-Authorization' => api_key,
+            'Content-Type' => 'application/json'
+          },
+          configs_hash.to_json
+        )
 
         raise ApiNotFound if response.is_a?(Net::HTTPNotFound)
         raise UnableToSync, [response.message, response.body].join(': ') unless response.is_a?(Net::HTTPSuccess)

data/lib/motor/dashboards/persistance.rb

@@ -29,14 +29,16 @@ module Motor
         retry
       end
 
-      def update_from_params!(dashboard, params)
+      def update_from_params!(dashboard, params, force_replace: false)
         tag_ids = dashboard.tags.ids
 
         dashboard = assign_attributes(dashboard, params)
 
-        raise TitleAlreadyExists if title_already_exists?(dashboard)
+        raise TitleAlreadyExists if !force_replace && title_already_exists?(dashboard)
 
         ApplicationRecord.transaction do
+          archive_with_existing_name(dashboard) if force_replace
+
           dashboard.save!
         end
 
@@ -54,11 +56,16 @@ module Motor
         Motor::Tags.assign_tags(dashboard, params[:tags])
       end
 
+      def archive_with_existing_name(dashboard)
+        Motor::Dashboard.where(['lower(title) = ? AND id != ?', dashboard.title.to_s.downcase, dashboard.id])
+                        .update_all(deleted_at: Time.current)
+      end
+
       def title_already_exists?(dashboard)
         if dashboard.new_record?
-          Dashboard.exists?(['lower(title) = ?', dashboard.title.to_s.downcase])
+          Motor::Dashboard.exists?(['lower(title) = ?', dashboard.title.to_s.downcase])
         else
-          Dashboard.exists?(['lower(title) = ? AND id != ?', dashboard.title.to_s.downcase, dashboard.id])
+          Motor::Dashboard.exists?(['lower(title) = ? AND id != ?', dashboard.title.to_s.downcase, dashboard.id])
         end
       end
     end

data/lib/motor/forms/persistance.rb

@@ -29,14 +29,16 @@ module Motor
         retry
       end
 
-      def update_from_params!(form, params)
+      def update_from_params!(form, params, force_replace: false)
         tag_ids = form.tags.ids
 
         form = assign_attributes(form, params)
 
-        raise NameAlreadyExists if name_already_exists?(form)
+        raise NameAlreadyExists if !force_replace && name_already_exists?(form)
 
         ApplicationRecord.transaction do
+          archive_with_existing_name(form) if force_replace
+
           form.save!
         end
 
@@ -54,11 +56,16 @@ module Motor
         Motor::Tags.assign_tags(form, params[:tags])
       end
 
+      def archive_with_existing_name(form)
+        Motor::Form.where(['lower(name) = ? AND id != ?', form.name.to_s.downcase, form.id])
+                   .update_all(deleted_at: Time.current)
+      end
+
       def name_already_exists?(form)
         if form.new_record?
-          Form.exists?(['lower(name) = ?', form.name.to_s.downcase])
+          Motor::Form.exists?(['lower(name) = ?', form.name.to_s.downcase])
         else
-          Form.exists?(['lower(name) = ? AND id != ?', form.name.to_s.downcase, form.id])
+          Motor::Form.exists?(['lower(name) = ? AND id != ?', form.name.to_s.downcase, form.id])
         end
       end
     end

data/lib/motor/net_http_utils.rb

@@ -4,24 +4,25 @@ module Motor
   module NetHttpUtils
     module_function
 
-    def get(url, params = {})
-      request = build_request(Net::HTTP::Get, url, params, nil)
+    def get(url, params = {}, headers = {})
+      request = build_request(Net::HTTP::Get, url, params, headers, nil)
 
       execute_request(request)
     end
 
-    def post(url, params = {}, body = '')
-      request = build_request(Net::HTTP::Post, url, params, body)
+    def post(url, params = {}, headers = {}, body = '')
+      request = build_request(Net::HTTP::Post, url, params, headers, body)
 
       execute_request(request)
     end
 
-    def build_request(method_class, url, params, body)
+    def build_request(method_class, url, params, headers, body)
       uri = URI(url)
       uri.query = params.to_query
 
       request = method_class.new(uri)
       request.body = body if body.present?
+      headers.each { |key, value| request[key] = value }
 
       request
     end

data/lib/motor/queries/persistance.rb

@@ -29,14 +29,16 @@ module Motor
         retry
       end
 
-      def update_from_params!(query, params)
+      def update_from_params!(query, params, force_replace: false)
         tag_ids = query.tags.ids
 
         query = assign_attributes(query, params)
 
-        raise NameAlreadyExists if name_already_exists?(query)
+        raise NameAlreadyExists if !force_replace && name_already_exists?(query)
 
         ApplicationRecord.transaction do
+          archive_with_existing_name(query) if force_replace
+
           query.save!
         end
 
@@ -54,6 +56,11 @@ module Motor
         Motor::Tags.assign_tags(query, params[:tags])
       end
 
+      def archive_with_existing_name(query)
+        Motor::Query.where(['lower(name) = ? AND id != ?', query.name.to_s.downcase, query.id])
+                    .update_all(deleted_at: Time.current)
+      end
+
       def name_already_exists?(query)
         if query.new_record?
           Query.exists?(['lower(name) = ?', query.name.to_s.downcase])

data/lib/motor/tasks/motor.rake

@@ -9,6 +9,14 @@ namespace :motor do
     puts '✅ configs/motor.yml has been updated'
   end
 
+  desc 'Load configs from configs/motor.yml file'
+
+  task load: :environment do
+    Motor::Configs::SyncFromFile.call(with_exception: true)
+
+    puts '✅ configs have been loaded from configs/motor.yml'
+  end
+
   desc 'Synchronize configs with remote application'
 
   task sync: :environment do

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.39'
+  VERSION = '0.1.44'
 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-e443f49b386b119ff25a.css.gz": "main-e443f49b386b119ff25a.css.gz",
-  "main-e443f49b386b119ff25a.js.LICENSE.txt": "main-e443f49b386b119ff25a.js.LICENSE.txt",
-  "main-e443f49b386b119ff25a.js.gz": "main-e443f49b386b119ff25a.js.gz",
-  "main.css": "main-e443f49b386b119ff25a.css",
-  "main.js": "main-e443f49b386b119ff25a.js"
+  "main-e763d59007bb725ea622.css.gz": "main-e763d59007bb725ea622.css.gz",
+  "main-e763d59007bb725ea622.js.LICENSE.txt": "main-e763d59007bb725ea622.js.LICENSE.txt",
+  "main-e763d59007bb725ea622.js.gz": "main-e763d59007bb725ea622.js.gz",
+  "main.css": "main-e763d59007bb725ea622.css",
+  "main.js": "main-e763d59007bb725ea622.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.44
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2021-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -191,6 +191,7 @@ files:
 - lib/motor-admin.rb
 - lib/motor.rb
 - lib/motor/active_record_utils.rb
+- lib/motor/active_record_utils/active_storage_blob_patch.rb
 - lib/motor/active_record_utils/active_storage_links_extension.rb
 - lib/motor/active_record_utils/defined_scopes_extension.rb
 - lib/motor/active_record_utils/fetch_methods.rb
@@ -211,6 +212,7 @@ files:
 - lib/motor/assets.rb
 - lib/motor/build_schema.rb
 - lib/motor/build_schema/active_storage_attachment_schema.rb
+- lib/motor/build_schema/adjust_devise_model_schema.rb
 - lib/motor/build_schema/find_display_column.rb
 - lib/motor/build_schema/load_from_rails.rb
 - lib/motor/build_schema/merge_schema_configs.rb
@@ -242,8 +244,8 @@ files:
 - lib/motor/tasks/motor.rake
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-e443f49b386b119ff25a.css.gz
-- ui/dist/main-e443f49b386b119ff25a.js.gz
+- ui/dist/main-e763d59007bb725ea622.css.gz
+- ui/dist/main-e763d59007bb725ea622.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: