tramway-core 4.0.1 → 4.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60e501986748c5fcfe27092b525dcf97a9f8a591e9a00ea9659f150b746123d1
-  data.tar.gz: 840750721db0f18d04437cd3e840bcf311094aa044dc95cb9f1c50f2e520e516
+  metadata.gz: 071cf2ccd054e5bde3e9ecc232476ec1a48d2aa4e3d51246befdd770a6e89876
+  data.tar.gz: 7aa40b3777e070784dd0f0ca57baf12b4fd6378e5911b1e3dfa25ec6b427e24f
 SHA512:
-  metadata.gz: 341c866e0797198604e6edc1f5275b0b0636e1b24635b5c5a019050f1ee86f46eb664fee80256170db9e41219d926c004bdc7368d32e8afafec417c6595e0b87
-  data.tar.gz: fb50c72df380f9c9bc23564414c06131444b838ea9e6810a0decf083add8a6234283ac83405d539360190282d5123ec7c7ecac2d8e3e206368339c2c9d9b29d2
+  metadata.gz: 8ff54066670f690934e828bd599b8cbeac5ad3cf27c43d2d56f54425f0bbf38708ae9d0bea74983d35a8b08a6a5393ed88810bd5e37672290653293dcb170919
+  data.tar.gz: 521157e341cc6eada7c4c1c4e97b620e5233dc28d15adbe148d53daa0b397d138b4084d69228379cd6a1e45e5fe7bf065f19181080f23d3ee00fc828b4bf8636

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/views/tramway/core/shared/_input.html.haml

@@ -6,7 +6,7 @@
   - type = type[:type]
 - if type.class.in?([ Symbol, String ]) || type&.dig(:input_options)
   - type = type.to_sym
-  - if type != :hidden && input_params.dig(:options, :label) != false
+  - if !type.in?([ :hidden ]) && input_params.dig(:options, :label) != false
     = form.label form_object.model.class.human_attribute_name property
   - case type
   - when :default
@@ -14,7 +14,10 @@
   - when :association
     = form.association property, **association_params(**input_params)
   - when :hidden_association
-    = form.association property, **association_params(**input_params).merge(as: :hidden, input_html: { value: value || form_object.public_send(property).id })
+    - if form_object.public_send(property)&.id
+      = form.association property, **association_params(**input_params).merge(as: :hidden, input_html: { value: form_object.public_send(property)&.id })
+    - else 
+      = form.association property, **association_params(**input_params).merge(as: :hidden)
   - when :polymorphic_association
     = form.input property, **polymorphic_association_params(**input_params.merge(value: value))
   - else

data/lib/tramway/core/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Core
-    VERSION = '4.0.1'
+    VERSION = '4.0.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-02-14 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