motor-admin 0.2.67 → 0.2.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75f26db509fb239be8405486aeb45a3b5dc7396e5bc5d2bea828f5c08292c8c4
-  data.tar.gz: 80c31338d1da7dde9604b17fe342abc52a4a3dd7d2357974b6aca4dc2e7a5dde
+  metadata.gz: 885521243b3baee41d99092e65a3587a5823a60b3b9a1991240f443f17871014
+  data.tar.gz: 7573f833491e98ddfc3f900cc9e54a3db3816cc65264de7f65b5b1a0338aecf6
 SHA512:
-  metadata.gz: '0397cdd6b0c746d0bf0c777ad582d8ed67fe9a2a74ea9d714db2d8e19563eeb481d94fdb9a1ee52be5b197cd43b593275ac38fe1c5b51fcae11bef3f93288c11'
-  data.tar.gz: 4e5843cd2a3e8e451b3877c297678d1a7effe140307242a8e157997095f72d6c4c8c86f514a4ec8f40c1644f4d63c90b5139cca0e0ed1cd443a07ce0249a63b6
+  metadata.gz: 4f9da8421e6a1ef9c19ddc3dd5d4bd67bbeed982a87899702900cf63b05da64c80bd50f909b219867422e2a11a73e7ac3cc15c8c57ad745fa467b01f820e9a2a
+  data.tar.gz: ff6b87764536384b5fa6445f4c34384d96ff5ebd58aa7d6c5c23e797a458f15aa4451319bd53a6d02a21cce61f20ac45c471a80eb0eb773974bbcbc9bb61a61d

data/app/controllers/motor/active_storage_attachments_controller.rb

@@ -9,29 +9,30 @@ module Motor
     load_and_authorize_resource :attachment, class: 'ActiveStorage::Attachment', parent: false
 
     def create
-      if attachable?(record)
-        record.public_send(@attachment.name).attach(file_params)
+      @attachment.assign_attributes(blob: ActiveStorage::Blob.create_and_upload!(file_params), record: record)
+      @attachment.assign_attributes(record_type: '', record_id: 0) unless record
 
-        head :ok
+      if @attachment.save(validate: false)
+        render json: { data: Motor::ApiQuery::BuildJson.call(@attachment, params, current_ability) }
       else
-        head :unprocessable_entity
+        render json: { errors: @attachment.errors }, status: :unprocessable_entity
       end
     end
 
     private
 
     def record
-      record_pk = @attachment.record.class.primary_key
-
-      Motor::Resources::FetchConfiguredModel.call(
-        @attachment.record.class,
-        cache_key: Motor::Resource.maximum(:updated_at)
-      ).find_by(record_pk => @attachment.record[record_pk])
-    end
-
-    def attachable?(record)
-      record.respond_to?("#{@attachment.name}_attachment=") ||
-        record.respond_to?("#{@attachment.name}_attachments=")
+      @record ||=
+        if @attachment.record
+          record_pk = @attachment.record.class.primary_key
+
+          Motor::Resources::FetchConfiguredModel.call(
+            @attachment.record.class,
+            cache_key: Motor::Resource.maximum(:updated_at)
+          ).find_by(record_pk => @attachment.record[record_pk])
+        else
+          current_user
+        end
     end
 
     def file_params

data/config/locales/el.yml

@@ -302,6 +302,10 @@ el:
     on_collection: Κατά τη συλλογή
     association: Σύνδεση
     action_has_been_removed: Η ενέργεια αυτή έχει καταργηθεί
+    html: HTML
+    edit_html: Edit HTML
+    there_are_unsaved_changes_close_form: "There are unsaved changes. Close form?"
+    send_file_url: Send file URL
     i:
       locale: el
       select:

data/config/locales/en.yml

@@ -307,3 +307,7 @@ en:
     every_minute: Every minute
     every_5_minutes: Every 5 minutes
     do_not_refresh: Do not refresh
+    html: HTML
+    edit_html: Edit HTML
+    there_are_unsaved_changes_close_form: "There are unsaved changes. Close form?"
+    send_file_url: Send file URL

data/config/locales/es.yml

@@ -302,6 +302,10 @@ es:
     on_collection: En la colección
     association: Asociación
     action_has_been_removed: Esta acción ha sido eliminada
+    html: HTML
+    edit_html: Edit HTML
+    there_are_unsaved_changes_close_form: "There are unsaved changes. Close form?"
+    send_file_url: Send file URL
     i:
       locale: es
       select:

data/config/locales/pt.yml

@@ -298,6 +298,10 @@ pt:
     on_collection: Na coleção
     association: Associação
     action_has_been_removed: Esta ação foi removida
+    html: HTML
+    edit_html: Edit HTML
+    there_are_unsaved_changes_close_form: "There are unsaved changes. Close form?"
+    send_file_url: Send file URL
     i:
       locale: pt
       select:

data/lib/motor/active_record_utils.rb

@@ -41,6 +41,4 @@ require_relative './active_record_utils/defined_scopes_extension'
 require_relative './active_record_utils/active_storage_links_extension'
 require_relative './active_record_utils/active_storage_blob_patch'
 require_relative './active_record_utils/active_record_filter_patch'
-require_relative './active_record_utils/active_record_connection_column_patch'
 require_relative './active_record_utils/action_text_attribute_patch'
-require_relative './active_record_utils/ar_lazy_preload_patch'

data/lib/motor/api_query/build_json.rb

@@ -164,7 +164,7 @@ module Motor
       # @param params [Hash]
       # @return [Boolean]
       def limit_zero_params?(params)
-        params.dig(:page, :limit).yield_self { |limit| limit.present? && limit.to_i.zero? }
+        params.dig(:page, :limit).then { |limit| limit.present? && limit.to_i.zero? }
       end
     end
   end

data/lib/motor/build_schema/find_display_column.rb

@@ -55,7 +55,7 @@ module Motor
       def fetch_column_names(model)
         model.columns.map do |column|
           next unless column.type.in?(BuildSchema::SEARCHABLE_COLUMN_TYPES)
-          next if column.respond_to?(:array?) && column.array?
+          next if column.try(:array?)
 
           column.name
         end.compact

data/lib/motor/build_schema/find_searchable_columns.rb

@@ -22,7 +22,7 @@ module Motor
       def find_searchable_columns(model)
         model.columns.map do |column|
           next unless column.type.in?(COLUMN_TYPES)
-          next if column.respond_to?(:array?) && column.array?
+          next if column.try(:array?)
           next if model.validators_on(column.name).any?(ActiveModel::Validations::InclusionValidator)
 
           column.name

data/lib/motor/build_schema/load_from_rails.rb

@@ -131,12 +131,13 @@ module Motor
           display_name: Utils.humanize_column_name(model.human_attribute_name(column.name)),
           column_type: fetch_column_type(column, model),
           column_source: ColumnSources::TABLE,
-          is_array: column.array?,
+          is_array: column.try(:array?),
           access_type: access_type,
           default_value: default_attrs[column.name],
           validators: fetch_validators(model, column.name),
           reference: nil,
           format: fetch_format_hash(column, model),
+          description: '',
           virtual: false
         }
       end

data/lib/motor/build_schema.rb

@@ -65,7 +65,8 @@ module Motor
       default_value: nil,
       reference: nil,
       format: {},
-      validators: []
+      validators: [],
+      description: ''
     }.with_indifferent_access
 
     ACTION_DEFAULTS = {

data/lib/motor/queries/run_query.rb

@@ -7,14 +7,7 @@ module Motor
 
       QueryResult = Struct.new(:data, :columns, :error, keyword_init: true)
 
-      CTE_NAME = '__query__'
-
-      WITH_STATEMENT_START = "WITH #{CTE_NAME} AS ("
-
-      WITH_STATEMENT_TEMPLATE = <<~SQL
-        #{WITH_STATEMENT_START}%<sql_body>s
-        )
-      SQL
+      SUBQUERY_NAME = '__query__'
 
       STATEMENT_VARIABLE_REGEXP = /\$\d+/.freeze
       PG_ERROR_REGEXP = /\APG.+ERROR:/.freeze
@@ -51,7 +44,7 @@ module Motor
       # @param exception [ActiveRecord::StatementInvalid]
       # @return [String]
       def build_error_message(exception)
-        exception.message.sub(WITH_STATEMENT_START, '').sub(PG_ERROR_REGEXP, '').strip.upcase_first
+        exception.message.sub(PG_ERROR_REGEXP, '').strip.upcase_first
       end
 
       # @param query [Motor::Query]
@@ -61,7 +54,7 @@ module Motor
       # @return [ActiveRecord::Result]
       def execute_query(query, limit, variables_hash, filters)
         result = nil
-        statement = prepare_sql_statement(connection_class.connection, query, limit, variables_hash, filters)
+        statement = prepare_sql_statement(connection_class, query, limit, variables_hash, filters)
 
         connection_class.transaction do
           result =
@@ -129,38 +122,42 @@ module Motor
         end
       end
 
-      # @param connection [Object]
+      # @param connection_class [Class]
       # @param query [Motor::Query]
       # @param limit [Integer]
       # @param variables_hash [Hash]
       # @param filters [Hash]
       # @return [Array]
-      def prepare_sql_statement(connection, query, limit, variables_hash, filters)
+      def prepare_sql_statement(connection_class, query, limit, variables_hash, filters)
         variables = merge_variable_default_values(query.preferences.fetch(:variables, []), variables_hash)
 
         sql, query_variables = RenderSqlTemplate.call(query.sql_body, variables)
-        cte_sql = format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.delete_suffix(';'))
-        cte_select_sql = build_cte_select_sql(connection, limit, filters)
+        select_sql = build_select_sql(connection_class, sql, limit, filters)
 
         attributes = build_statement_attributes(query_variables)
 
-        [[cte_sql, cte_select_sql].join, 'SQL', attributes]
+        [select_sql, 'SQL', attributes]
       end
 
+      # @param connection_class [Class]
+      # @param sql [String]
       # @param limit [Number]
       # @param filters [Hash]
       # @return [String]
-      def build_cte_select_sql(connection, limit, filters)
-        table = Arel::Table.new(CTE_NAME)
+      def build_select_sql(connection_class, sql, limit, filters)
+        sql = sql.strip.delete_suffix(';').gsub(/\A\)+/, '').gsub(/\z\(+/, '')
+
+        subquery_sql = Arel.sql("(#{sql}) as #{SUBQUERY_NAME}")
 
         arel_filters = build_filters_arel(filters)
 
-        expresion = table.project(table[Arel.star])
-        expresion = expresion.where(arel_filters) if arel_filters.present?
+        rel = connection_class.from(subquery_sql)
+                              .select(Arel::Table.new(SUBQUERY_NAME)[Arel.star])
+                              .where(arel_filters)
 
-        expresion.take(limit.to_i) unless connection.class.name.include?('SQLServerAdapter')
+        rel = rel.limit(limit.to_i) unless connection_class.connection.class.name.include?('SQLServerAdapter')
 
-        expresion.to_sql.delete('"')
+        rel.to_sql
       end
 
       # @param filters [Hash]
@@ -168,7 +165,7 @@ module Motor
       def build_filters_arel(filters)
         return nil if filters.blank?
 
-        table = Arel::Table.new(CTE_NAME)
+        table = Arel::Table.new(SUBQUERY_NAME)
 
         arel_filters = filters.map { |key, value| table[key].in(value) }
 
@@ -213,7 +210,10 @@ module Motor
       end
 
       def connection_class
-        defined?(ResourceRecord) ? ResourceRecord : ActiveRecord::Base
+        @connection_class ||=
+          'ResourceRecord'.safe_constantize ||
+          'ApplicationRecord'.safe_constantize ||
+          Class.new(ActiveRecord::Base).tap { |e| e.abstract_class = true }
       end
     end
   end

data/lib/motor/resources.rb

@@ -5,7 +5,7 @@ module Motor
     RESOURCE_ATTRS = %w[display_name display_column icon custom_sql visible display_primary_key
                         searchable_columns].freeze
     COLUMN_ATTRS = %w[name display_name column_type access_type default_value reference virtual format
-                      validators].freeze
+                      validators description].freeze
     ASSOCIATION_ATTRS = %w[name display_name model_name icon visible foreign_key primary_key options virtual
                            polymorphic slug].freeze
     SCOPE_ATTRS = %w[name display_name scope_type preferences visible].freeze

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.2.67'
+  VERSION = '0.2.70'
 end