motor-admin 0.1.31 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34d4ac091383f79174302c02c385c3757f5aa34f3903339579268c5b1f8be6f4
-  data.tar.gz: 5311fb94097abbb727371002c44a019bca9b84b60d9ba3271a3e4029adbe6f5f
+  metadata.gz: 8e0174dc9b889d34d1cff62947e5f330d04c37a8eea6a1036b88a5735edc3b9c
+  data.tar.gz: 84136e87872e4bd988055090e602e831f85516286f4dc39b9c15cd635feb5c03
 SHA512:
-  metadata.gz: 938d8910276a5ea54df6254cdd6d7964c5f34ceb7e87fe8c2aa76227dab5bc4a1d03653c9450012d2d013ff03e9f70163644c3530fd9ea23af6c98941c531561
-  data.tar.gz: f94105d6c8c14225fac6f3e341aef95399a8723d958f2d34e7715c05593d993bdda1cc2674b6d32a74216507271d0d559de3f221ba49a9b9b9d769d6c090f78b
+  metadata.gz: 8d637a2d8b014e7c57c6e77b92c9c62c96ccb3a6201173e455122ab1c9f0d0cfe5070380712ce5618bf9975a225d5622336bd4e16ed1f33d689d9f340dcaf9e4
+  data.tar.gz: 241c173529982aa8403691eb0818f8cf5357a61ae1b7820caca288a7d91faf9f1aa00485c1a716df266777de9bac37b2da36700ed04d0463b98f05299dff8cb9

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/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/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,53 +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 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 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/models/motor/alert.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class Alert < ::Motor::ApplicationRecord
+    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+
     belongs_to :query
     belongs_to :author, polymorphic: true, optional: true
 

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
+    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+
     serialize :value, HashSerializer
   end
 end

data/app/models/motor/dashboard.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class Dashboard < ::Motor::ApplicationRecord
+    AuditedUtils.with_audit_class(Motor::Audit) { 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
+    AuditedUtils.with_audit_class(Motor::Audit) { 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
+    AuditedUtils.with_audit_class(Motor::Audit) { audited }
+
     belongs_to :author, polymorphic: true, optional: true
 
     has_many :taggable_tags, as: :taggable
@@ -10,5 +12,13 @@ module Motor
     serialize :preferences, HashSerializer
 
     scope :active, -> { where(deleted_at: nil) }
+
+    def result(variables_hash = {})
+      result = Motor::Queries::RunQuery.call(self, variables_hash: variables_hash)
+      column_names = result.columns.pluck(:name)
+
+      result.data.map { |row| column_names.zip(row).to_h }
+    end
+    alias run result
   end
 end

data/app/models/motor/resource.rb

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

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: '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, :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

data/lib/motor.rb

@@ -6,6 +6,7 @@ require 'js_regex'
 require 'fugit'
 require 'csv'
 require 'active_record/filter'
+require 'audited'
 
 module Motor
   PATH = Pathname.new(__dir__)
@@ -45,7 +46,7 @@ end
 
 require 'motor/version'
 require 'motor/admin'
-# require 'motor/api'
+require 'motor/audited_utils'
 require 'motor/assets'
 require 'motor/build_schema'
 require 'motor/api_query'

data/lib/motor/admin.rb

@@ -15,9 +15,16 @@ module Motor
             end
 
           puts
-          puts "⚡ Motor Admin is starting under #{url}"
+          puts "⚡ Motor::Admin is starting under #{url}"
+        else
           puts
+          puts '⚠️  Motor::Admin is not mounted.'
+          puts 'Add the following line to your config/routes.rb:'
+          puts
+          puts "    mount Motor::Admin => '/admin'"
         end
+
+        puts
       end
     end
 

data/lib/motor/api_query/filter.rb

@@ -34,20 +34,29 @@ module Motor
 
       def normalize_filter_hash(hash)
         hash.each_with_object({}) do |(action, value), acc|
-          acc[action] =
+          new_action, new_value =
             if value.is_a?(Hash)
-              normalize_filter_hash(value)
+              [action, normalize_filter_hash(value)]
             else
-              normalize_action_value(action, value)
+              normalize_action(action, value)
             end
+
+          acc[new_action] = new_value
+
+          acc
         end
       end
 
-      def normalize_action_value(action, value)
-        if %w[like ilike].include?(action)
-          value.sub(LIKE_FILTER_VALUE_REGEXP, '%\1%')
+      def normalize_action(action, value)
+        case action
+        when 'contains'
+          ['ilike', value.sub(LIKE_FILTER_VALUE_REGEXP, '%\1%')]
+        when 'starts_with'
+          ['ilike', value.sub(LIKE_FILTER_VALUE_REGEXP, '\1%')]
+        when 'ends_with'
+          ['ilike', value.sub(LIKE_FILTER_VALUE_REGEXP, '%\1')]
         else
-          value
+          [action, value]
         end
       end
     end

data/lib/motor/audited_utils.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module AuditedUtils
+  module_function
+
+  def with_audit_class(new_class)
+    old_class = Audited.audit_class
+
+    Audited.audit_class = new_class
+
+    yield
+  ensure
+    Audited.audit_class = old_class
+  end
+end

data/lib/motor/build_schema.rb

@@ -48,8 +48,8 @@ module Motor
 
     DEFAULT_TABS = [
       {
-        name: 'summary',
-        display_name: 'Summary',
+        name: 'details',
+        display_name: 'Details',
         tab_type: 'default',
         preferences: {},
         visible: true

data/lib/motor/build_schema/load_from_rails.rb

@@ -11,7 +11,7 @@ module Motor
         models.map do |model|
           build_model_schema(model)
         rescue StandardError, NotImplementedError => e
-          Rails.logger.error(e)
+          Rails.logger.error(e) if model.name != 'Audited::Audit'
 
           next
         end.compact
@@ -24,6 +24,7 @@ module Motor
         models = models.reject(&:abstract_class)
 
         models -= Motor::ApplicationRecord.descendants
+        models -= [Motor::Audit]
         models -= [ActiveRecord::SchemaMigration] if defined?(ActiveRecord::SchemaMigration)
         models -= [ActiveStorage::Blob] if defined?(ActiveStorage::Blob)
         models -= [ActiveStorage::VariantRecord] if defined?(ActiveStorage::VariantRecord)

data/lib/motor/tags.rb

@@ -21,7 +21,8 @@ module Motor
     end
 
     def remove_missing_tags(taggable, tags)
-      tags_to_remove = taggable.tags.reject { |tt| tt.name.downcase.in?(tags) }
+      downcase_tags = tags.map(&:downcase)
+      tags_to_remove = taggable.tags.reject { |tt| tt.name.downcase.in?(downcase_tags) }
 
       taggable.tags -= tags_to_remove
 

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.31'
+  VERSION = '0.1.36'
 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-b27ee7bbbc5e97fb1743.css.gz": "main-b27ee7bbbc5e97fb1743.css.gz",
-  "main-b27ee7bbbc5e97fb1743.js.LICENSE.txt": "main-b27ee7bbbc5e97fb1743.js.LICENSE.txt",
-  "main-b27ee7bbbc5e97fb1743.js.gz": "main-b27ee7bbbc5e97fb1743.js.gz",
-  "main.css": "main-b27ee7bbbc5e97fb1743.css",
-  "main.js": "main-b27ee7bbbc5e97fb1743.js"
+  "main-358ea31cd7020f915067.css.gz": "main-358ea31cd7020f915067.css.gz",
+  "main-358ea31cd7020f915067.js.LICENSE.txt": "main-358ea31cd7020f915067.js.LICENSE.txt",
+  "main-358ea31cd7020f915067.js.gz": "main-358ea31cd7020f915067.js.gz",
+  "main.css": "main-358ea31cd7020f915067.css",
+  "main.js": "main-358ea31cd7020f915067.js"
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.36
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-08 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: audited
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.9'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -132,12 +146,14 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/controllers/concerns/motor/load_and_authorize_dynamic_resource.rb
 - app/controllers/concerns/motor/wrap_io_params.rb
 - app/controllers/motor/active_storage_attachments_controller.rb
 - app/controllers/motor/alerts_controller.rb
 - app/controllers/motor/api_base_controller.rb
 - app/controllers/motor/application_controller.rb
 - app/controllers/motor/assets_controller.rb
+- app/controllers/motor/audits_controller.rb
 - app/controllers/motor/configs_controller.rb
 - app/controllers/motor/dashboards_controller.rb
 - app/controllers/motor/data_controller.rb
@@ -157,6 +173,7 @@ files:
 - app/models/motor/alert.rb
 - app/models/motor/alert_lock.rb
 - app/models/motor/application_record.rb
+- app/models/motor/audit.rb
 - app/models/motor/config.rb
 - app/models/motor/dashboard.rb
 - app/models/motor/form.rb
@@ -192,6 +209,7 @@ files:
 - lib/motor/api_query/search.rb
 - lib/motor/api_query/sort.rb
 - lib/motor/assets.rb
+- lib/motor/audited_utils.rb
 - lib/motor/build_schema.rb
 - lib/motor/build_schema/active_storage_attachment_schema.rb
 - lib/motor/build_schema/find_display_column.rb
@@ -214,8 +232,8 @@ files:
 - lib/motor/ui_configs.rb
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-b27ee7bbbc5e97fb1743.css.gz
-- ui/dist/main-b27ee7bbbc5e97fb1743.js.gz
+- ui/dist/main-358ea31cd7020f915067.css.gz
+- ui/dist/main-358ea31cd7020f915067.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: