tramway-core 4.0.1.2 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e06c110cd0f30a7243f4e279aa171da53cc31f6491b42499c46773e8246f530
-  data.tar.gz: 478b5ace1fb571aea1c844affeee3d33f0871d31958f0c02b0740d7c3d01b313
+  metadata.gz: ac7eeed94de14add119fbc165ccb751d66434804820b453d0291c032d5a60fa1
+  data.tar.gz: d94cc5ae90bc4b0d8f39be2f95ac03b3cfa63ff45ad656edcb33001681d50218
 SHA512:
-  metadata.gz: dac7d047d46554fc5223d73773fc9b89320fbad418f9198f7bdda46fcac62fa0f01c5aee54b348ab729855f602a698df07e152a7d23113da1dbc8fd778af824c
-  data.tar.gz: 8ab86f5111052e9fc2db73ba09a0fdf910fcef1ee1b6610a026edf3502cf44c4d394b790982a16434c9020dd57d108d9ad61cbe130855279ddf51420c2618cea
+  metadata.gz: 32f49b4b39499903f3a9b3f27d2f3310df8ceb1694e1112d5e31a91c88ce7d61660ed64fc4174abb06cad1f48a42ae043ad0157024fb6b6d113bb604a0619105
+  data.tar.gz: 8bc142f5f9d0f9cd9a8d724ca5656091010defbd578279a05be929da1eca2452324d508266c25981e0fa395dd31fcb0c418ce503b2d30994a6f0b7fb99c842f3

data/app/forms/tramway/core/application_form.rb

@@ -35,6 +35,7 @@ class Tramway::Core::ApplicationForm
   class << self
     include Tramway::Core::ApplicationForms::AssociationClassHelpers
     include Tramway::Core::ApplicationForms::ConstantClassActions
+    include Tramway::Core::ApplicationForms::Frontend
 
     delegate :defined_enums, to: :model_class
 

data/app/forms/tramway/core/application_forms/association_object_helpers.rb

@@ -14,14 +14,16 @@ module Tramway::Core::ApplicationForms::AssociationObjectHelpers
 
   def define_polymorphic_association(association, _class_name)
     self.class.send(:define_method, "#{association}=") do |value|
-      association_class = value.split('_')[0..-2].join('_').camelize
-      association_class = association_class.constantize if association_class.is_a? String
-      if association_class.nil?
-        Tramway::Error.raise_error :tramway, :core, :application_form, :initialize, :polymorphic_class_is_nil,
-          association_name: association
-      else
-        model.send "#{association}=", association_class.find(value.split('_')[-1])
-        send "#{association}_type=", association_class.to_s
+      if value.present?
+        association_class = value.split('_')[0..-2].join('_').camelize
+        association_class = association_class.constantize if association_class.is_a? String 
+        if association_class.nil?
+          Tramway::Error.raise_error :tramway, :core, :application_form, :initialize, :polymorphic_class_is_nil,
+            association_name: association
+        else
+          model.send "#{association}=", association_class.find(value.split('_')[-1])
+          send "#{association}_type=", association_class.to_s
+        end
       end
     end
   end

data/app/forms/tramway/core/application_forms/frontend.rb

@@ -0,0 +1,9 @@
+module Tramway::Core::ApplicationForms::Frontend
+  def react_component(on = false)
+    @react_component = on
+  end
+
+  def is_react_component?
+    @react_component ||= false
+  end
+end

data/app/helpers/tramway/core/inputs/polymorphic_associations_helper.rb

@@ -15,7 +15,9 @@ module Tramway::Core::Inputs::PolymorphicAssociationsHelper
     if form_object.send(property).present?
       "#{form_object.send(property).class.to_s.underscore}_#{form_object.send(property).id}"
     else
-      "#{value[:type]&.underscore}_#{value[:id]}"
+      if value[:type].present? && value[:id].present? 
+        "#{value[:type]&.underscore}_#{value[:id]}"
+      end
     end
   end
 

data/app/helpers/tramway/core/inputs_helper.rb

@@ -15,6 +15,7 @@ module Tramway::Core::InputsHelper
     build_input_attributes(object: object, property: property, options: options,
                            value: build_value_for_association(form_object, property, value),
                            collection: build_collection_for_association(form_object, property),
+                           include_blank: true,
                            selected: form_object.model.send("#{property}_id") || value)
   end
 
@@ -25,6 +26,7 @@ module Tramway::Core::InputsHelper
                            collection: build_collection_for_polymorphic_association(form_object, property),
                            options: options.merge(
                              as: :select,
+                             include_blank: true,
                              label_method: ->(obj) { "#{obj.class.model_name.human} | #{obj.name}" },
                              value_method: lambda { |obj|
                                "#{obj.class.to_s.underscore.sub(/_decorator$/, '')}_#{obj.id}"

data/app/models/tramway/core/application_record.rb

@@ -43,7 +43,7 @@ class Tramway::Core::ApplicationRecord < ActiveRecord::Base
     end
 
     def search_by(*attributes, **associations)
-      pg_search_scope :full_text_search, against: attributes, associated_against: associations
+      pg_search_scope :full_text_search, against: attributes, associated_against: associations, using: [:tsearch, :trigram]
     end
 
     def uploader(attribute_name, uploader_name, **options)

data/app/views/tramway/core/shared/_input.html.haml

@@ -20,6 +20,8 @@
       = form.association property, **association_params(**input_params).merge(as: :hidden)
   - when :polymorphic_association
     = form.input property, **polymorphic_association_params(**input_params.merge(value: value))
+  - when :react_component
+    = react_component "#{property.camelize}Input", value: value
   - else
     - options = input_params[:options] || {}
     = form.input property, **simple_params(**input_params.merge(type: type)).merge(options)

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '4.0.1.2'
+    VERSION = '4.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 4.0.1.2
+  version: 4.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-10 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: audited
@@ -326,6 +326,7 @@ files:
 - app/forms/tramway/core/application_forms/association_object_helpers.rb
 - app/forms/tramway/core/application_forms/constant_class_actions.rb
 - app/forms/tramway/core/application_forms/constant_object_actions.rb
+- app/forms/tramway/core/application_forms/frontend.rb
 - app/forms/tramway/core/application_forms/object_helpers.rb
 - app/forms/tramway/core/application_forms/properties_object_helper.rb
 - app/forms/tramway/core/application_forms/submit_helper.rb