motor-admin 0.1.68 → 0.1.74

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e112faacd3ff1806f8ac4c0520b87a649ea98d004a1745cdc1e3de7040aea92
-  data.tar.gz: 1d5ef79ead4b16cadab43e0e970cc8a6ae0bf553fa5526a961df6a83edb4157a
+  metadata.gz: 594696e523cc46971936cd1c344f9cbb1fe3a6a65997ff8777c38d2d2f5eb72f
+  data.tar.gz: 02adfd4800fd33dbe83ae82f76bb01a20e48c3f7c9811b229c847e4ca5992500
 SHA512:
-  metadata.gz: 59b77ef4d3546c94361644598d12d832eb5fdcf354c8edd2ce0d2918b1115b38d8011080ecd402dcf5d2c79130dc9b1daf87ec707f4ccbbf19c80ee5ff5ef595
-  data.tar.gz: a725435fe5d93e71d8d0bde3e40429f8a1a3538b5053035338ceb08c62a0ac7936d990fcc0d08ef126d437046cd54c14e8f070a9f50fb60c8a0362eae4a3849f
+  metadata.gz: 181180ab8edac829a717a17fa818d9cb76ae29fb55bba3ab04491da98cc90913317e04fc450c5b6535402a14e28c19a51fbb0b5468f3a770474ca39ed60c7a98
+  data.tar.gz: 000a7e6bfea6f6e5901b0e8f587533a3b9d955756b9fc8bcb9501f3db1cfbc050300bd485bed9e6bcf205f4b2e7e6c2ca52e6efd9cb82c76cf24ee8fcecf1321

data/app/controllers/motor/api_base_controller.rb

@@ -5,6 +5,12 @@ module Motor
     include Motor::CurrentUserMethod
     include Motor::CurrentAbility
 
+    if defined?(ActionText::Content)
+      before_action do
+        ActionText::Content.renderer = Motor::ApplicationController.renderer.new(request.env)
+      end
+    end
+
     unless Rails.env.test?
       rescue_from StandardError do |e|
         Rails.logger.error(e)

data/config/locales/en.yml

@@ -18,6 +18,8 @@ en:
     add_query: Add Query
     add_scope: Add Scope
     add_tab: Add Tab
+    adjust_form: Adjust form
+    adjust_fields: Adjust fields
     alert_email_has_been_sent: Alert email has been sent!
     alert_has_been_activated: Alert has been activated
     alert_has_been_disabled: Alert has been disabled
@@ -36,6 +38,7 @@ en:
     bar_chart: Bar chart
     base: Base
     boolean: Boolean
+    build_custom_form: Build custom form
     cancel: Cancel
     cents: Cents
     checkbox: Checkbox
@@ -134,6 +137,7 @@ en:
     or: Or
     other_than: Other than
     param_name: Param name
+    password: Password
     path: Path
     percent: Percent
     pie_chart: Pie chart
@@ -158,6 +162,7 @@ en:
     revert: Revert
     revision_has_been_applied: Revision has been applied
     revisions: Revisions
+    richtext: Richtext
     row_chart: Row chart
     save: Save
     save_and_create_new: Save and Create New

data/config/locales/es.yml

@@ -214,6 +214,11 @@ es:
     textarea: Área de texto
     unit: Unidad
     write_only: Sólo escritura
+    richtext: Texto enriquecido
+    adjust_form: Ajustar formulario
+    adjust_fields: Ajustar campos
+    build_custom_form: Crear formulario personalizado
+    password: Contraseña
     i:
       locale: es
       select:

data/lib/motor/active_record_utils.rb

@@ -22,3 +22,4 @@ 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'

data/lib/motor/active_record_utils/action_text_attribute_patch.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+if defined?(ActionText::Attribute)
+  ActionText::Attribute::ClassMethods.prepend(Module.new do
+    # rubocop:disable Naming/PredicateName
+    def has_rich_text(*args)
+      super
+
+      name = args.first
+
+      alias_method :"#{name}_body=", :"#{name}="
+
+      define_method(:"#{name}_body") do
+        send(name).body&.to_trix_html
+      end
+    end
+    # rubocop:enable Naming/PredicateName
+  end)
+end

data/lib/motor/active_record_utils/active_storage_links_extension.rb

@@ -6,10 +6,6 @@ module Motor
       def path
         Rails.application.routes.url_helpers.rails_blob_path(self, only_path: true)
       end
-
-      def url
-        Rails.application.routes.url_helpers.url_for(self)
-      end
     end
   end
 end

data/lib/motor/build_schema/load_from_rails.rb

@@ -8,6 +8,11 @@ module Motor
 
       I18N_SCOPES_KEY = 'activerecord.scopes'
 
+      ACTION_TEXT_REFLECTION_PREFIX = 'rich_text_'
+      ACTION_TEXT_COLUMN_SUFFIX = '_body'
+      ACTION_TEXT_SCOPE_PREFIX = 'with_rich_text_'
+      ACTIVE_STORAGE_SCOPE_PREFIX = 'with_attached_'
+
       module_function
 
       def call
@@ -40,6 +45,7 @@ module Motor
         models -= [ActiveRecord::SchemaMigration] if defined?(ActiveRecord::SchemaMigration)
         models -= [ActiveRecord::InternalMetadata] if defined?(ActiveRecord::InternalMetadata)
         models -= [ActiveStorage::Blob] if defined?(ActiveStorage::Blob)
+        models -= [ActionText::RichText] if defined?(ActionText::RichText)
         models -= [ActiveStorage::VariantRecord] if defined?(ActiveStorage::VariantRecord)
 
         models
@@ -72,7 +78,8 @@ module Motor
         model.defined_scopes.map do |scope_name|
           scope_name = scope_name.to_s
 
-          next if scope_name.starts_with?('with_attached')
+          next if scope_name.starts_with?(ACTIVE_STORAGE_SCOPE_PREFIX)
+          next if scope_name.starts_with?(ACTION_TEXT_SCOPE_PREFIX)
 
           {
             name: scope_name,
@@ -139,6 +146,10 @@ module Motor
       end
 
       def build_reflection_column(name, model, ref, default_attrs)
+        if !ref.polymorphic? && ref.klass.name == 'ActionText::RichText'
+          return build_action_text_column(name, model, ref)
+        end
+
         column_name = ref.belongs_to? ? ref.foreign_key.to_s : name
         is_attachment = !ref.polymorphic? && ref.klass.name == 'ActiveStorage::Attachment'
         access_type = ref.belongs_to? || is_attachment ? ColumnAccessTypes::READ_WRITE : ColumnAccessTypes::READ_ONLY
@@ -156,6 +167,22 @@ module Motor
         }
       end
 
+      def build_action_text_column(name, model, ref)
+        name = name.delete_prefix(ACTION_TEXT_REFLECTION_PREFIX)
+
+        {
+          name: name + ACTION_TEXT_COLUMN_SUFFIX,
+          display_name: model.human_attribute_name(name),
+          column_type: 'richtext',
+          access_type: BuildSchema::ColumnAccessTypes::READ_WRITE,
+          default_value: '',
+          validators: fetch_validators(model, name, ref),
+          format: {},
+          reference: nil,
+          virtual: true
+        }
+      end
+
       def build_reference(model, name, reflection)
         {
           name: name,

data/lib/motor/version.rb

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