motor-admin 0.1.36 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e0174dc9b889d34d1cff62947e5f330d04c37a8eea6a1036b88a5735edc3b9c
-  data.tar.gz: 84136e87872e4bd988055090e602e831f85516286f4dc39b9c15cd635feb5c03
+  metadata.gz: 6b5c8de183eb4dca0deba15c13f4e17a5cd4b6042ba2aa72e69e4056f0dd07bb
+  data.tar.gz: 5696598a4d1a461fb401b6bd6b9036dbe8ac8d31ce71d8e19edabb0e68b4fa91
 SHA512:
-  metadata.gz: 8d637a2d8b014e7c57c6e77b92c9c62c96ccb3a6201173e455122ab1c9f0d0cfe5070380712ce5618bf9975a225d5622336bd4e16ed1f33d689d9f340dcaf9e4
-  data.tar.gz: 241c173529982aa8403691eb0818f8cf5357a61ae1b7820caca288a7d91faf9f1aa00485c1a716df266777de9bac37b2da36700ed04d0463b98f05299dff8cb9
+  metadata.gz: 05e81845c5be4540e7062b945b7ca21a51c197a6c540da1ce747fc478f8105e4e80b375bcf708a1e2b634fffe732c6024fa0626a77baaddfc99eb8bdbdcc6d4e
+  data.tar.gz: 581692e4333bdcde696190897b810206cc7cc222d8a82796d8ba098130b76801b843e6a72b791ba0b8a1aca1686ed88cb14c5c0161953f21273628ae811c55c5

data/app/controllers/motor/alerts_controller.rb

@@ -18,12 +18,15 @@ module Motor
     end
 
     def create
-      ApplicationRecord.transaction { @alert.save! }
-      Motor::Alerts::ScheduledAlertsCache.clear
-
-      render json: { data: Motor::ApiQuery::BuildJson.call(@alert, params) }
-    rescue Motor::Alerts::Persistance::NameAlreadyExists
-      name_already_exists_response
+      if Motor::Alerts::Persistance.name_already_exists?(@alert)
+        name_already_exists_response
+      else
+        ApplicationRecord.transaction { @alert.save! }
+        Motor::Alerts::ScheduledAlertsCache.clear
+        Motor::Configs::WriteToFile.call
+
+        render json: { data: Motor::ApiQuery::BuildJson.call(@alert, params) }
+      end
     rescue Motor::Alerts::Persistance::InvalidInterval
       invalid_interval_response
     end
@@ -31,6 +34,7 @@ module Motor
     def update
       Motor::Alerts::Persistance.update_from_params!(@alert, alert_params)
       Motor::Alerts::ScheduledAlertsCache.clear
+      Motor::Configs::WriteToFile.call
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@alert, params) }
     rescue Motor::Alerts::Persistance::NameAlreadyExists
@@ -42,6 +46,8 @@ module Motor
     def destroy
       @alert.update!(deleted_at: Time.current)
 
+      Motor::Configs::WriteToFile.call
+
       head :ok
     end
 

data/app/controllers/motor/configs_controller.rb

@@ -17,6 +17,7 @@ module Motor
         end
 
       @config.save!
+      Motor::Configs::WriteToFile.call
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@config, params) }
     rescue ActiveRecord::RecordNotUnique

data/app/controllers/motor/dashboards_controller.rb

@@ -22,6 +22,7 @@ module Motor
         render json: { errors: [{ source: 'title', detail: 'Title already exists' }] }, status: :unprocessable_entity
       else
         ApplicationRecord.transaction { @dashboard.save! }
+        Motor::Configs::WriteToFile.call
 
         render json: { data: Motor::ApiQuery::BuildJson.call(@dashboard, params) }
       end
@@ -31,6 +32,7 @@ module Motor
 
     def update
       Motor::Dashboards::Persistance.update_from_params!(@dashboard, dashboard_params)
+      Motor::Configs::WriteToFile.call
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@dashboard, params) }
     rescue Motor::Dashboards::Persistance::TitleAlreadyExists
@@ -40,6 +42,8 @@ module Motor
     def destroy
       @dashboard.update!(deleted_at: Time.current)
 
+      Motor::Configs::WriteToFile.call
+
       head :ok
     end
 

data/app/controllers/motor/forms_controller.rb

@@ -22,6 +22,7 @@ module Motor
         render json: { errors: [{ source: 'name', detail: 'Name already exists' }] }, status: :unprocessable_entity
       else
         ApplicationRecord.transaction { @form.save! }
+        Motor::Configs::WriteToFile.call
 
         render json: { data: Motor::ApiQuery::BuildJson.call(@form, params) }
       end
@@ -31,6 +32,7 @@ module Motor
 
     def update
       Motor::Forms::Persistance.update_from_params!(@form, form_params)
+      Motor::Configs::WriteToFile.call
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@form, params) }
     rescue Motor::Forms::Persistance::NameAlreadyExists
@@ -40,6 +42,8 @@ module Motor
     def destroy
       @form.update!(deleted_at: Time.current)
 
+      Motor::Configs::WriteToFile.call
+
       head :ok
     end
 

data/app/controllers/motor/queries_controller.rb

@@ -22,6 +22,7 @@ module Motor
         render json: { errors: [{ source: 'name', detail: 'Name already exists' }] }, status: :unprocessable_entity
       else
         ApplicationRecord.transaction { @query.save! }
+        Motor::Configs::WriteToFile.call
 
         render json: { data: Motor::ApiQuery::BuildJson.call(@query, params) }
       end
@@ -31,6 +32,7 @@ module Motor
 
     def update
       Motor::Queries::Persistance.update_from_params!(@query, query_params)
+      Motor::Configs::WriteToFile.call
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@query, params) }
     rescue Motor::Queries::Persistance::NameAlreadyExists
@@ -40,6 +42,8 @@ module Motor
     def destroy
       @query.update!(deleted_at: Time.current)
 
+      Motor::Configs::WriteToFile.call
+
       head :ok
     end
 

data/app/controllers/motor/resources_controller.rb

@@ -12,6 +12,7 @@ module Motor
 
     def create
       Motor::BuildSchema::PersistResourceConfigs.call(@resource)
+      Motor::Configs::WriteToFile.call
 
       render json: { data: Motor::ApiQuery::BuildJson.call(@resource, params) }
     end

data/app/controllers/motor/ui_controller.rb

@@ -7,12 +7,16 @@ module Motor
     def index
       Motor.reload! if Motor.development?
 
+      Motor::Configs::SyncFromFile.call
+
       render :show
     end
 
     def show
       Motor.reload! if Motor.development?
 
+      Motor::Configs::SyncFromFile.call
+
       render :show
     end
   end

data/app/models/motor/alert.rb

@@ -2,13 +2,13 @@
 
 module Motor
   class Alert < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     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/application_record.rb

@@ -4,5 +4,15 @@ module Motor
   class ApplicationRecord < ActiveRecord::Base
     self.abstract_class = true
     self.table_name_prefix = 'motor_'
+
+    def self.audited(*args)
+      default_class = Audited.audit_class
+
+      Audited.audit_class = Motor::Audit
+
+      super
+    ensure
+      Audited.audit_class = default_class
+    end
   end
 end

data/app/models/motor/config.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class Config < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     serialize :value, HashSerializer
   end

data/app/models/motor/dashboard.rb

@@ -2,11 +2,11 @@
 
 module Motor
   class Dashboard < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     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

@@ -2,11 +2,11 @@
 
 module Motor
   class Form < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     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

@@ -2,12 +2,13 @@
 
 module Motor
   class Query < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     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/app/models/motor/resource.rb

@@ -2,7 +2,7 @@
 
 module Motor
   class Resource < ::Motor::ApplicationRecord
-    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+    audited
 
     serialize :preferences, HashSerializer
   end

data/app/views/motor/ui/show.html.erb

@@ -1 +1 @@
-<%= raw(Motor::UiConfigs.app_tag) %>
+<%= raw(Motor::Configs::BuildUiAppTag.call) %>

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
@@ -138,9 +138,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.column :created_at, :datetime
     end
 
-    add_index :motor_audits, %i[auditable_type auditable_id version], name: 'auditable_index'
-    add_index :motor_audits, %i[associated_type associated_id], name: 'associated_index'
-    add_index :motor_audits, %i[user_id user_type], name: 'user_index'
+    add_index :motor_audits, %i[auditable_type auditable_id version], name: 'motor_auditable_index'
+    add_index :motor_audits, %i[associated_type associated_id], name: 'motor_auditable_associated_index'
+    add_index :motor_audits, %i[user_id user_type], name: 'motor_auditable_user_index'
     add_index :motor_audits, :request_uuid
     add_index :motor_audits, :created_at
   end

data/lib/motor.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'concurrent/executor/fixed_thread_pool'
+require 'concurrent/timer_task'
 require 'cancancan'
 require 'ar_lazy_preload'
 require 'js_regex'
@@ -7,6 +9,9 @@ require 'fugit'
 require 'csv'
 require 'active_record/filter'
 require 'audited'
+require 'uri'
+require 'net/http'
+require 'net/https'
 
 module Motor
   PATH = Pathname.new(__dir__)
@@ -18,7 +23,8 @@ module Motor
       Dir[PATH.join('./motor/**/*.rb')].each do |f|
         next if f.ends_with?('alerts/scheduler.rb')
         next if f.ends_with?('alerts/scheduled_alerts_cache.rb')
-        next if f.ends_with?('ui_configs.rb')
+        next if f.ends_with?('configs/load_from_cache.rb')
+        next if f.ends_with?('configs/sync_from_file.rb')
 
         load f
       end
@@ -46,15 +52,16 @@ end
 
 require 'motor/version'
 require 'motor/admin'
-require 'motor/audited_utils'
 require 'motor/assets'
+require 'motor/active_record_utils'
 require 'motor/build_schema'
 require 'motor/api_query'
 require 'motor/tags'
-require 'motor/ui_configs'
+require 'motor/configs'
 require 'motor/queries'
 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/admin.rb

@@ -28,6 +28,14 @@ module Motor
       end
     end
 
+    initializer 'motor.configs.sync_middleware' do
+      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
       Rails.application.config.filter_parameters += %i[io]
     end

data/lib/motor/alerts/persistance.rb

@@ -43,30 +43,44 @@ 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.tags.reload
+        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])
+        alert.updated_at = [params[:updated_at], Time.current].min if params[:updated_at].present?
 
         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