motor-admin 0.1.33 → 0.1.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51ebe00c16e1c384a460c6a6b11339c967fbff8b80c0096cb9471abb9082d43c
-  data.tar.gz: 16324c84044ff120d90a5b6955fd7d5cc165e1ec547fe06a69315efc228e17be
+  metadata.gz: 2e0ab742c32ae1b59bfa12c6eb1f838e5d379cb5a964521fe7f345de5fabf953
+  data.tar.gz: 9f018c3475ae06b4104e35f30774c80b2098a8a23b7fa3a8e4ac35df089ee98e
 SHA512:
-  metadata.gz: 29a38abca31cf14b81ea6cedbfdb62bf0e7a6c04e6890c32dd28c3be6a17033b24e4d9fc69f265f4abd816a7660907cde10b5fae0d6e5098d6f7e9c385190440
-  data.tar.gz: c03e22ec45ded369d732b0a59f6035dc8579764d75016161eb294f517b9d714db4485057fae41f54309b2ca03f81daa684147c125ba5c3fb35696e52f91eb4ce
+  metadata.gz: '0651978240824b17dc1f379047faf9f5c5a393b9bebe6e37ae692a606630a300454a2c56c88173383defef451787555006d355fe26c2dd38173f0ece03e116a0'
+  data.tar.gz: b15c006847a5c9dcea315741ccc3a46e3a2bba49ab05d2aceab44c75a530ba0f5fad79067aae0b8e31abad9cda105a827cbdb892d93fd1c2c1fe72a2f62a8637

data/app/controllers/concerns/motor/load_and_authorize_dynamic_resource.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Motor
+  module LoadAndAuthorizeDynamicResource
+    extend ActiveSupport::Concern
+
+    INSTANCE_VARIABLE_NAME = 'resource'
+
+    included do
+      before_action :load_and_authorize_resource
+      before_action :load_and_authorize_association
+    end
+
+    def resource_class
+      @resource_class ||=
+        Motor::BuildSchema::Utils.classify_slug(resource_name_prefix + params[:resource])
+    end
+
+    def resource_name_prefix
+      ''
+    end
+
+    def load_and_authorize_resource
+      options = {
+        class: resource_class,
+        parent: false,
+        instance_name: INSTANCE_VARIABLE_NAME
+      }
+
+      if params[:resource_id].present?
+        options = options.merge(
+          parent: true,
+          id_param: :resource_id
+        )
+      end
+
+      CanCan::ControllerResource.new(
+        self,
+        options
+      ).load_and_authorize_resource
+    rescue ActiveRecord::RecordNotFound
+      head :not_found
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
+    end
+
+    def load_and_authorize_association
+      return if params[:association].blank?
+
+      association = resource_class.reflections[params[:association]]
+
+      if association
+        CanCan::ControllerResource.new(
+          self,
+          class: association.klass,
+          parent: false,
+          through: :resource,
+          through_association: params[:association].to_sym,
+          instance_name: INSTANCE_VARIABLE_NAME
+        ).load_and_authorize_resource
+      else
+        render json: { message: 'Unknown association' }, status: :not_found
+      end
+    rescue ActiveRecord::RecordNotFound
+      head :not_found
+    rescue StandardError => e
+      render json: { errors: [e.message] }, status: :unprocessable_entity
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Motor
+  class AuditsController < ApiBaseController
+    load_and_authorize_resource :audit
+
+    def index
+      audits = Motor::ApiQuery.call(@audits, params)
+
+      render json: {
+        data: Motor::ApiQuery::BuildJson.call(audits, params),
+        meta: Motor::ApiQuery::BuildMeta.call(audits, params)
+      }
+    end
+  end
+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/data_controller.rb

@@ -2,14 +2,10 @@
 
 module Motor
   class DataController < ApiBaseController
-    include Motor::WrapIoParams
-
-    INSTANCE_VARIABLE_NAME = 'resource'
-
     wrap_parameters :data, except: %i[include fields]
 
-    before_action :load_and_authorize_resource
-    before_action :load_and_authorize_association
+    include Motor::WrapIoParams
+    include Motor::LoadAndAuthorizeDynamicResource
 
     def index
       @resources = Motor::ApiQuery.call(@resources, params)
@@ -64,57 +60,6 @@ module Motor
 
     private
 
-    def resource_class
-      @resource_class ||= Motor::BuildSchema::Utils.classify_slug(params[:resource])
-    end
-
-    def load_and_authorize_resource
-      options = {
-        class: resource_class,
-        parent: false,
-        instance_name: INSTANCE_VARIABLE_NAME
-      }
-
-      if params[:resource_id].present?
-        options = options.merge(
-          parent: true,
-          id_param: :resource_id
-        )
-      end
-
-      CanCan::ControllerResource.new(
-        self,
-        options
-      ).load_and_authorize_resource
-    rescue ActiveRecord::RecordNotFound
-      head :not_found
-    rescue StandardError => e
-      render json: { errors: [e.message] }, status: :unprocessable_entity
-    end
-
-    def load_and_authorize_association
-      return if params[:association].blank?
-
-      association = resource_class.reflections[params[:association]]
-
-      if association
-        CanCan::ControllerResource.new(
-          self,
-          class: association.klass,
-          parent: false,
-          through: :resource,
-          through_association: params[:association].to_sym,
-          instance_name: INSTANCE_VARIABLE_NAME
-        ).load_and_authorize_resource
-      else
-        render json: { message: 'Unknown association' }, status: :not_found
-      end
-    rescue ActiveRecord::RecordNotFound
-      head :not_found
-    rescue StandardError => e
-      render json: { errors: [e.message] }, status: :unprocessable_entity
-    end
-
     def resource_params
       if params[:data].present?
         params.require(:data).except(resource_class.primary_key).permit!

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,6 +2,8 @@
 
 module Motor
   class Alert < ::Motor::ApplicationRecord
+    audited
+
     belongs_to :query
     belongs_to :author, polymorphic: true, optional: true
 

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Motor
+  class Audit < Audited::Audit
+    self.table_name = 'motor_audits'
+
+    serialize :audited_changes, HashSerializer
+  end
+end

data/app/models/motor/config.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class Config < ::Motor::ApplicationRecord
+    audited
+
     serialize :value, HashSerializer
   end
 end

data/app/models/motor/dashboard.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class Dashboard < ::Motor::ApplicationRecord
+    audited
+
     belongs_to :author, polymorphic: true, optional: true
 
     has_many :taggable_tags, as: :taggable

data/app/models/motor/form.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class Form < ::Motor::ApplicationRecord
+    audited
+
     belongs_to :author, polymorphic: true, optional: true
 
     has_many :taggable_tags, as: :taggable

data/app/models/motor/query.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class Query < ::Motor::ApplicationRecord
+    audited
+
     belongs_to :author, polymorphic: true, optional: true
 
     has_many :taggable_tags, as: :taggable

data/app/models/motor/resource.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class Resource < ::Motor::ApplicationRecord
+    audited
+
     serialize :preferences, HashSerializer
   end
 end

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

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

data/config/routes.rb

@@ -15,6 +15,7 @@ Motor::Admin.routes.draw do
       resources :alerts, only: %i[index show create update destroy]
       resources :active_storage_attachments, only: %i[create], path: 'data/active_storage__attachments'
       resource :schema, only: %i[show update]
+      resources :audits, only: %i[index]
       resources :resources, path: '/data/:resource',
                             only: %i[index show update create destroy],
                             controller: 'data' do

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

@@ -13,9 +13,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
 
       t.index :updated_at
       t.index 'lower(name)',
-        name: 'motor_queries_lower_name_unique_index',
-        unique: true,
-        where: 'deleted_at IS NULL'
+              name: 'motor_queries_lower_name_unique_index',
+              unique: true,
+              where: 'deleted_at IS NULL'
     end
 
     create_table :motor_dashboards, force: true do |t|
@@ -30,9 +30,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
 
       t.index :updated_at
       t.index 'lower(title)',
-        name: 'motor_dashboards_lower_title_unique_index',
-        unique: true,
-        where: 'deleted_at IS NULL'
+              name: 'motor_dashboards_lower_title_unique_index',
+              unique: true,
+              where: 'deleted_at IS NULL'
     end
 
     create_table :motor_forms, force: true do |t|
@@ -49,9 +49,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
 
       t.index :updated_at
       t.index 'lower(name)',
-        name: 'motor_forms_lower_name_unique_index',
-        unique: true,
-        where: 'deleted_at IS NULL'
+              name: 'motor_forms_lower_name_unique_index',
+              unique: true,
+              where: 'deleted_at IS NULL'
     end
 
     create_table :motor_resources, force: true do |t|
@@ -87,9 +87,9 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
 
       t.index :updated_at
       t.index 'lower(name)',
-        name: 'motor_alerts_lower_name_unique_index',
-        unique: true,
-        where: 'deleted_at IS NULL'
+              name: 'motor_alerts_lower_name_unique_index',
+              unique: true,
+              where: 'deleted_at IS NULL'
     end
 
     create_table :motor_alert_locks, force: true do |t|
@@ -107,8 +107,8 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.timestamps
 
       t.index 'lower(name)',
-        name: 'motor_tags_lower_name_unique_index',
-        unique: true
+              name: 'motor_tags_lower_name_unique_index',
+              unique: true
     end
 
     create_table :motor_taggable_tags, force: true do |t|
@@ -117,12 +117,36 @@ class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Mi
       t.column :taggable_type, :string, null: false
 
       t.index %i[taggable_id taggable_type tag_id],
-        name: 'motor_polymorphic_association_tag_index',
-        unique: true
+              name: 'motor_polymorphic_association_tag_index',
+              unique: true
     end
+
+    create_table :motor_audits, force: true do |t|
+      t.column :auditable_id, :integer
+      t.column :auditable_type, :string
+      t.column :associated_id, :integer
+      t.column :associated_type, :string
+      t.column :user_id, :integer
+      t.column :user_type, :string
+      t.column :username, :string
+      t.column :action, :string
+      t.column :audited_changes, :text
+      t.column :version, :integer, default: 0
+      t.column :comment, :string
+      t.column :remote_address, :string
+      t.column :request_uuid, :string
+      t.column :created_at, :datetime
+    end
+
+    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
 
   def self.down
+    drop_table :motor_audits
     drop_table :motor_alert_locks
     drop_table :motor_alerts
     drop_table :motor_taggable_tags