motor-admin 0.1.9 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d6f58a141ea2313b151ee2648a4b98ea3327b8f81b5d7473d8f4a36e6ffb7a4
-  data.tar.gz: b30868890700641a08cff0abc865e736823def3b066ca8bf38c4968dddd3e2b4
+  metadata.gz: 690872e084d43d0b2759f48a2d33b7399470b6dec88678248982daf0b0ca2e8a
+  data.tar.gz: 3949cd11e7773c19dd03c77dd1b52477ed282e3e40e9e688bf9018e7c93c2b13
 SHA512:
-  metadata.gz: cc33e35f237bc0d15c57da84d67276efa2b26bc09d6b19845a1f6438f81c4e42ec0d5a64274aecaa817faacbde7d5f5c11245b3a0c81f97e3c3e99c808e8b7ec
-  data.tar.gz: 44152701924a0f006ed102080b612db45a9ca76caf6180c58ad04ec4eb6f8e2210e667a9ceec5228d7a9854a77fca67bf86d0660b655c7715bd71875e4d4a4d7
+  metadata.gz: 244c24b44ab251e6a71fe9e4200062b8d6c3679effb03c902759f3ef389d87cf87f8cf7fcf5c48c15a0c4358fc0ee750964b03c17eccd2f3af7cba19a0282ba8
+  data.tar.gz: 9225e1067d918fccd2dbef1c661e5128299579bd05fe4b52738bcb1ca2cc90c7495cbd07a556661000654ff0e4f6fd3e76d8049d44e3748f759e39566f89ffeb

data/app/controllers/motor/active_storage_attachments_controller.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Motor
+  class ActiveStorageAttachmentsController < ApiBaseController
+    wrap_parameters :data, except: %i[include fields]
+
+    load_and_authorize_resource :attachment, class: 'ActiveStorage::Attachment', parent: false
+
+    def create
+      if @attachment.record.respond_to?("#{@attachment.name}_attachment=") || @attachment.record.respond_to?("#{@attachment.name}_attachments=")
+        @attachment.record.public_send(@attachment.name).attach(
+          io: StringIO.new(params.dig(:data, :file, :io).to_s.encode('ISO-8859-1')),
+          filename: params.dig(:data, :file, :filename)
+        )
+
+        head :ok
+      else
+        head :unprocessable_entity
+      end
+    end
+
+    private
+
+    def attachment_params
+      params.require(:data).except(:file).permit!
+    end
+  end
+end

data/app/controllers/motor/alerts_controller.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class AlertsController < ApiBaseController
+    wrap_parameters :data, except: %i[include fields]
+
     load_and_authorize_resource :alert, only: %i[index show update destroy]
 
     before_action :build_alert, only: :create

data/app/controllers/motor/assets_controller.rb

@@ -9,19 +9,31 @@ module Motor
       'text/css'
     ].freeze
 
+    MIME_TYPES = {
+      '.js' => 'application/javascript',
+      '.css' => 'text/css',
+      '.woff2' => 'font/woff2'
+    }.freeze
+
     def show
       filename = params[:filename]
 
       return [404, {}, ''] unless Motor::Assets.manifest.values.include?(filename)
 
+      assign_headers(filename)
+
       self.response_body = CACHE_STORE.fetch(filename) do
-        Motor::Assets.load_asset(filename)
+        Motor::Assets.load_asset(filename, gzip: headers['Content-Encoding'] == 'gzip')
       end
+    end
 
-      headers['Content-Type'] = Marcel::MimeType.for(name: filename)
+    private
 
-      headers['Content-Encoding'] = 'gzip' if !Motor.development? && GZIP_TYPES.include?(headers['Content-Type'])
+    def assign_headers(filename)
+      content_type = MIME_TYPES[File.extname(filename)]
 
+      headers['Content-Type'] = content_type
+      headers['Content-Encoding'] = 'gzip' if !Motor.development? && GZIP_TYPES.include?(content_type)
       headers['Cache-Control'] = 'max-age=31536000'
     end
   end

data/app/controllers/motor/configs_controller.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class ConfigsController < ApiBaseController
+    wrap_parameters :data, except: %i[include fields]
+
     load_and_authorize_resource
 
     def index

data/app/controllers/motor/dashboards_controller.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class DashboardsController < ApiBaseController
+    wrap_parameters :data, except: %i[include fields]
+
     load_and_authorize_resource :dashboard, only: %i[index show update destroy]
 
     before_action :build_dashboard, only: :create

data/app/controllers/motor/data_controller.rb

@@ -4,8 +4,11 @@ module Motor
   class DataController < ApiBaseController
     INSTANCE_VARIABLE_NAME = 'resource'
 
+    wrap_parameters :data, except: %i[include fields]
+
     before_action :load_and_authorize_resource
     before_action :load_and_authorize_association
+    before_action :wrap_io_params
 
     def index
       @resources = Motor::ApiQuery.call(@resources, params)
@@ -96,7 +99,23 @@ module Motor
     end
 
     def resource_params
-      params.fetch(:data, {}).except(resource_class.primary_key).permit!
+      if params[:data].present?
+        params.require(:data).except(resource_class.primary_key).permit!
+      else
+        {}
+      end
+    end
+
+    def wrap_io_params(hash = params)
+      hash.each do |key, value|
+        if key == 'io'
+          hash[key] = StringIO.new(value.encode('ISO-8859-1'))
+        elsif value.is_a?(ActionController::Parameters)
+          wrap_io_params(value)
+        end
+      end
+
+      hash
     end
   end
 end

data/app/controllers/motor/forms_controller.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class FormsController < ApiBaseController
+    wrap_parameters :data, except: %i[include fields]
+
     load_and_authorize_resource :form, only: %i[index show update destroy]
 
     before_action :build_form, only: :create

data/app/controllers/motor/queries_controller.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class QueriesController < ApiBaseController
+    wrap_parameters :data, except: %i[include fields]
+
     load_and_authorize_resource :query, only: %i[index show update destroy]
 
     before_action :build_query, only: :create

data/app/controllers/motor/resources_controller.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class ResourcesController < ApiBaseController
+    wrap_parameters :data, except: %i[include fields]
+
     load_and_authorize_resource
 
     def index

data/app/controllers/motor/run_queries_controller.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class RunQueriesController < ApiBaseController
+    wrap_parameters :data
+
     load_and_authorize_resource :query, only: :show, parent: false
 
     before_action :build_query, only: :create

data/app/controllers/motor/send_alerts_controller.rb

@@ -2,6 +2,8 @@
 
 module Motor
   class SendAlertsController < ApiBaseController
+    wrap_parameters :data
+
     before_action :build_alert, only: :create
     authorize_resource :alert, only: :create
 

data/app/models/motor/alert.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Motor
-  class Alert < ApplicationRecord
+  class Alert < ::Motor::ApplicationRecord
     belongs_to :query
     belongs_to :author, polymorphic: true, optional: true
 

data/app/models/motor/alert_lock.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Motor
-  class AlertLock < ApplicationRecord
+  class AlertLock < ::Motor::ApplicationRecord
     belongs_to :alert
   end
 end

data/app/models/motor/config.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Motor
-  class Config < ApplicationRecord
+  class Config < ::Motor::ApplicationRecord
     serialize :value, HashSerializer
   end
 end

data/app/models/motor/dashboard.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Motor
-  class Dashboard < ApplicationRecord
+  class Dashboard < ::Motor::ApplicationRecord
     belongs_to :author, polymorphic: true, optional: true
 
     has_many :taggable_tags, as: :taggable

data/app/models/motor/form.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Motor
-  class Form < ApplicationRecord
+  class Form < ::Motor::ApplicationRecord
     belongs_to :author, polymorphic: true, optional: true
 
     has_many :taggable_tags, as: :taggable

data/app/models/motor/query.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Motor
-  class Query < ApplicationRecord
+  class Query < ::Motor::ApplicationRecord
     belongs_to :author, polymorphic: true, optional: true
 
     has_many :taggable_tags, as: :taggable

data/app/models/motor/resource.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Motor
-  class Resource < ApplicationRecord
+  class Resource < ::Motor::ApplicationRecord
     serialize :preferences, HashSerializer
   end
 end

data/app/models/motor/tag.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Motor
-  class Tag < ApplicationRecord
+  class Tag < ::Motor::ApplicationRecord
     has_many :taggable_tags
   end
 end

data/app/models/motor/taggable_tag.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Motor
-  class TaggableTag < ApplicationRecord
+  class TaggableTag < ::Motor::ApplicationRecord
     belongs_to :tag
     belongs_to :taggable, polymorphic: true
   end

data/config/routes.rb

@@ -13,6 +13,7 @@ Motor::Admin.routes.draw do
       resources :dashboards, only: %i[index show create update destroy]
       resources :forms, only: %i[index show create update destroy]
       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 :resources, path: '/data/:resource',
                             only: %i[index show update create destroy],

data/lib/motor.rb

@@ -6,6 +6,7 @@ require 'js_regex'
 require 'fugit'
 require 'csv'
 require 'active_record/filter'
+require 'base64'
 
 module Motor
   PATH = Pathname.new(__dir__)

data/lib/motor/active_record_utils.rb

@@ -2,6 +2,8 @@
 
 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'
 
 module ActiveRecordUtils
 end

data/lib/motor/active_record_utils/active_storage_links_extension.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Motor
+  module ActiveRecordUtils
+    module ActiveStorageLinksExtension
+      def path
+        Rails.application.routes.url_helpers.rails_blob_path(self)
+      end
+
+      def url
+        Rails.application.routes.url_helpers.url_for(self)
+      end
+    end
+  end
+end

data/lib/motor/active_record_utils/defined_scopes_extension.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Motor
+  module ActiveRecordUtils
+    module DefinedScopesExtension
+      def scope(name, _body)
+        (@__scopes__ ||= []) << name
+
+        super
+      end
+
+      def defined_scopes
+        @__scopes__ || []
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.extend(Motor::ActiveRecordUtils::DefinedScopesExtension)

data/lib/motor/admin.rb

@@ -2,11 +2,22 @@
 
 module Motor
   class Admin < ::Rails::Engine
+    initializer 'motor.filter_params' do
+      Rails.application.config.filter_parameters += %i[io]
+    end
+
     initializer 'motor.alerts.scheduler' do
-      next if defined?(Sidekiq) && Sidekiq.server?
+      config.after_initialize do |_app|
+        next unless defined?(Rails::Server)
+
+        Motor::Alerts::Scheduler::SCHEDULER_TASK.execute
+      end
+    end
 
-      Motor::Alerts::Scheduler::SCHEDULER_TASK.execute
-      Motor::Alerts::ScheduledAlertsCache::UPDATE_ALERTS_TASK.execute
+    initializer 'motor.active_storage.extensions' do
+      ActiveSupport.on_load(:active_storage_attachment) do
+        ActiveStorage::Attachment.include(Motor::ActiveRecordUtils::ActiveStorageLinksExtension)
+      end
     end
   end
 end

data/lib/motor/alerts/persistance.rb

@@ -44,10 +44,9 @@ module Motor
       end
 
       def update_from_params!(alert, params)
-        raise NameAlreadyExists if name_already_exists?(alert)
-
         alert = assign_attributes(alert, params)
 
+        raise NameAlreadyExists if name_already_exists?(alert)
         raise InvalidInterval unless alert.cron
 
         ApplicationRecord.transaction do

data/lib/motor/alerts/scheduled_alerts_cache.rb

@@ -3,10 +3,6 @@
 module Motor
   module Alerts
     module ScheduledAlertsCache
-      UPDATE_ALERTS_TASK = Concurrent::TimerTask.new(
-        execution_interval: 2.minutes
-      ) { Motor::Alerts::ScheduledAlertsCache.load_alerts }
-
       CACHE_STORE = ActiveSupport::Cache::MemoryStore.new(size: 5.megabytes)
 
       module_function

data/lib/motor/api_query.rb

@@ -4,6 +4,7 @@ require_relative './api_query/sort'
 require_relative './api_query/paginate'
 require_relative './api_query/filter'
 require_relative './api_query/search'
+require_relative './api_query/apply_scope'
 require_relative './api_query/build_meta'
 require_relative './api_query/build_json'
 
@@ -15,6 +16,7 @@ module Motor
       rel = ApiQuery::Sort.call(rel, params[:sort])
       rel = ApiQuery::Paginate.call(rel, params[:page])
       rel = ApiQuery::Filter.call(rel, params[:filter])
+      rel = ApiQuery::ApplyScope.call(rel, params[:scope])
 
       ApiQuery::Search.call(rel, params[:q] || params[:search] || params[:query])
     end

data/lib/motor/api_query/apply_scope.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Motor
+  module ApiQuery
+    module ApplyScope
+      module_function
+
+      def call(rel, scope)
+        return rel if scope.blank?
+
+        scope_symbol = scope.to_sym
+
+        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 }
+
+          return rel unless scope_configs
+
+          ApiQuery::Filter.call(rel, scope_configs[:preferences][:filter])
+        end
+      end
+    end
+  end
+end