motor-admin 0.1.68 → 0.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e112faacd3ff1806f8ac4c0520b87a649ea98d004a1745cdc1e3de7040aea92
-  data.tar.gz: 1d5ef79ead4b16cadab43e0e970cc8a6ae0bf553fa5526a961df6a83edb4157a
+  metadata.gz: 02757b4dc451f8f6e177860318c61961e0136608886e8da9356c16a338acc43a
+  data.tar.gz: c5edccdaa00543b47a4f723d7cb41b80597bf1af9e8e93176404c357de04e874
 SHA512:
-  metadata.gz: 59b77ef4d3546c94361644598d12d832eb5fdcf354c8edd2ce0d2918b1115b38d8011080ecd402dcf5d2c79130dc9b1daf87ec707f4ccbbf19c80ee5ff5ef595
-  data.tar.gz: a725435fe5d93e71d8d0bde3e40429f8a1a3538b5053035338ceb08c62a0ac7936d990fcc0d08ef126d437046cd54c14e8f070a9f50fb60c8a0362eae4a3849f
+  metadata.gz: f90f9a091f038f7a5d5815041181d921adb990402233b1c7bda4de4cd1fa48013d4f0cb689b7d244d9f711830db184cba505aeed17e1b37227872e8eb71b6f61
+  data.tar.gz: a10ce5ef3e4880ca4010529c35dbed9fe440973b09239e6fbc85f7009d65f2b3f0ee87f9cf25e5a26c46550e567dd1f0d884487b8d32ba29942571250bd15ae6

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

@@ -214,3 +214,4 @@ en:
     visibility: Visibility
     visualization: Visualization
     write_only: Write-Only
+    richtext: Richtext

data/config/locales/es.yml

@@ -214,6 +214,7 @@ es:
     textarea: Área de texto
     unit: Unidad
     write_only: Sólo escritura
+    richtext: Texto enriquecido
     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.70'
 end

data/ui/dist/manifest.json

@@ -2068,11 +2068,11 @@
   "mail-opened.svg": "icons/mail-opened.svg",
   "mail.svg": "icons/mail.svg",
   "mailbox.svg": "icons/mailbox.svg",
-  "main-9350c345bc241fd25d73.css.gz": "main-9350c345bc241fd25d73.css.gz",
-  "main-9350c345bc241fd25d73.js.LICENSE.txt": "main-9350c345bc241fd25d73.js.LICENSE.txt",
-  "main-9350c345bc241fd25d73.js.gz": "main-9350c345bc241fd25d73.js.gz",
-  "main.css": "main-9350c345bc241fd25d73.css",
-  "main.js": "main-9350c345bc241fd25d73.js",
+  "main-abb83b21b8fb726b4db6.css.gz": "main-abb83b21b8fb726b4db6.css.gz",
+  "main-abb83b21b8fb726b4db6.js.LICENSE.txt": "main-abb83b21b8fb726b4db6.js.LICENSE.txt",
+  "main-abb83b21b8fb726b4db6.js.gz": "main-abb83b21b8fb726b4db6.js.gz",
+  "main.css": "main-abb83b21b8fb726b4db6.css",
+  "main.js": "main-abb83b21b8fb726b4db6.js",
   "man.svg": "icons/man.svg",
   "manual-gearbox.svg": "icons/manual-gearbox.svg",
   "map-2.svg": "icons/map-2.svg",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.68
+  version: 0.1.70
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-25 00:00:00.000000000 Z
+date: 2021-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
@@ -171,6 +171,7 @@ files:
 - lib/motor-admin.rb
 - lib/motor.rb
 - lib/motor/active_record_utils.rb
+- lib/motor/active_record_utils/action_text_attribute_patch.rb
 - lib/motor/active_record_utils/active_record_connection_column_patch.rb
 - lib/motor/active_record_utils/active_record_filter_patch.rb
 - lib/motor/active_record_utils/active_storage_blob_patch.rb
@@ -1494,8 +1495,8 @@ files:
 - ui/dist/icons/zoom-money.svg.gz
 - ui/dist/icons/zoom-out.svg.gz
 - ui/dist/icons/zoom-question.svg.gz
-- ui/dist/main-9350c345bc241fd25d73.css.gz
-- ui/dist/main-9350c345bc241fd25d73.js.gz
+- ui/dist/main-abb83b21b8fb726b4db6.css.gz
+- ui/dist/main-abb83b21b8fb726b4db6.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: