motor-admin 0.1.34 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d39e56e7ea8a0b52d05594f2b1fb6f12860d9fd5771fbcf9bec758ce5752f08
-  data.tar.gz: 5cd61073f5a310dd5562225476134358cec33ab1df16983b0faca249a434c91e
+  metadata.gz: c650dcb3b3585c6776bb7ece77590fe9e69e5c64323dfa7827870f11203afe09
+  data.tar.gz: 4e9e8e62612c93686c1c5ed2532b14a260e44078830302f7155e49a45a0b6a66
 SHA512:
-  metadata.gz: bcb86c3d249b14ae24d8a37fc5418ab41e789602ede38c5ab31dbda19d82100ac1f1321ff868fef6c7e892fdde2559905afbcfe22e85c65b63ce0c826092bfc1
-  data.tar.gz: 051cfe7a8bdcee2ca9f173954de10108d5682c5f59c2a4291443f32552f31020baeaec78a2f7806d78be13df73f5a9a73742b77c9c4943eee1a60db81ec18100
+  metadata.gz: a8325df21f414fc4dfb5e61173ca94312662012d3a3ba12cb128a6c7c91d88b0cc97bfb344d8466500f43fd28bc6c3195eaa662e11ddb4c3333fbe1257611ad2
+  data.tar.gz: 787be19b2a2407237060341ff623e20f40a86fc5a76ce075e75c1dd62fbede8bbd94dd7a0312072cd60af12571c9dcf7edf2afe7e088e6c75267893156cd8482

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,11 +2,13 @@
 
 module Motor
   class Alert < ::Motor::ApplicationRecord
+    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/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,9 +2,11 @@
 
 module Motor
   class Dashboard < ::Motor::ApplicationRecord
+    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,9 +2,11 @@
 
 module Motor
   class Form < ::Motor::ApplicationRecord
+    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,10 +2,13 @@
 
 module Motor
   class Query < ::Motor::ApplicationRecord
+    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,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