para 0.12.1 → 0.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee25a77e578b14d822cbf8827991f6c6920c580acddeb2120d0e6a2570795fa
-  data.tar.gz: 41ee3d94327eeeacfb5ee1da6430956d5862ed0e242d0d09180bef828e46a921
+  metadata.gz: e5f4c1a9a889b3800d615452bda318bac05fc3d49b88c612af3cd2a714cb3fe8
+  data.tar.gz: a665a5affd7b2a3938baf185c41221eed335b42be7dabf8ff1d17145212dfecb
 SHA512:
-  metadata.gz: acd659f13038e225325293d30820d115f5054ca6ba36cccc44e5404bc2e5d0e01226815b41aa38bc3f8c76f6299891c621c4e7d1d2306eaaa76a9f1c97f24891
-  data.tar.gz: 7da8328b9591a785d922ddd3f12c61f95d57f7c3e8a327b5667ad22cbfabeeaaabac1c7c8d0e6ed50dee7bc48ceb7e172aac92b3a9593b6919678e4b957bcc1a
+  metadata.gz: 7a71ed497361f0b442965a7331159d9c2c2dfd7f745674f8698f446e1a6651f3bdfacd96f314f2e00d657ba13390f55ca317221aca45284d6770419bd820be79
+  data.tar.gz: 6e1bb4347edeacd0f067dc401e77ce72926ed9ae9d4e61326799376d3ca7063db196a275c58b79d96c29e21ba5004d56f8cdbb976c98dfac22f91522b352955a

data/app/assets/stylesheets/para/admin/src/_sorting.scss

@@ -31,12 +31,15 @@
   content: "\f0dc";
   opacity: .3;
 }
+
 .sort_link.asc:before {
-  content: "\f0d7";
+  content: "\f0d8";
 }
+
 .sort_link.desc:before {
-  content: "\f0d8";
+  content: "\f0d7";
 }
+
 .sort_link.asc.disabled:before,
 .sort_link.desc.disabled:before {
   opacity: .1;

data/app/javascripts/para/admin/job-tracker.js

@@ -22,11 +22,11 @@ function trackProgressFor(element, jobStatusUrl) {
 }
 
 document.documentElement.addEventListener('turbo:frame-load', function(e) {
-  if (e.target.id != 'para_admin_modal') return;
+  if (e.target.id !== 'para_admin_modal') return;
 
   loadedElement = e.target.childNodes[0];
 
-  var jobStatusUrl = loadedElement && loadedElement.dataset.jobStatusUrl;
+  var jobStatusUrl = loadedElement?.dataset?.jobStatusUrl;
   if (!jobStatusUrl) return;
 
   trackProgressFor(loadedElement, jobStatusUrl);

data/app/javascripts/para/index.js

@@ -14,8 +14,6 @@ import "./vendor/jquery.sortable";
 
 import "./application";
 
-import "./lib/page-loading";
-
 import "./inputs/material-input";
 import "./inputs/multi-select-input";
 import "./inputs/nested_many";

data/lib/para/attribute_field/base.rb

@@ -56,6 +56,10 @@ module Para
 
         reference = model.reflect_on_all_associations.find do |association|
           association.foreign_key == name
+        rescue ArgumentError
+          # This can happen when the association is polymorphic and the foreign key can't
+          # be determined, in this case, we just ignore the association.
+          false
         end
 
         if reference
@@ -75,12 +79,11 @@ module Para
         true
       end
 
-      #
       def searchable?
         options[:searchable] != false && (
-          [:string, :text].include?(type.to_sym) && !name.match(/password/)
+          %i[string text].include?(type.to_sym) && !name.match(/password/)
         ) && (
-          !model.respond_to?(:ransackable_attributes) || 
+          !model.respond_to?(:ransackable_attributes) ||
           model.ransackable_attributes.include?(name.to_s)
         )
       end
@@ -94,7 +97,7 @@ module Para
       def field_options
         self.class._field_options.each_with_object({}) do |params, hash|
           value = send(params[:method_name])
-          hash[params[:key]] = value if value != nil || params[:options][:allow_nil]
+          hash[params[:key]] = value if !value.nil? || params[:options][:allow_nil]
         end
       end
 

data/lib/para/model_field_parsers/relations.rb

@@ -42,8 +42,10 @@ module Para
           # attributes mappings above
           next if AttributeField::RelationField == fields_hash[name]
 
-          # Remove foreign key, if existing, from fields
-          fields_hash.delete(reflection.foreign_key.to_s)
+          unless through_polymorphic_reflection?(reflection)
+            # Remove foreign key, if existing, from fields
+            fields_hash.delete(reflection.foreign_key.to_s)
+          end
 
           # Do not process polymorphic belongs to for now ...
           if reflection.options[:polymorphic] == true
@@ -52,27 +54,25 @@ module Para
           end
 
           if model.nested_attributes_options[name]
-            if reflection.collection?
-              fields_hash[name] = AttributeField::NestedManyField.new(
-                model, name: name, type: 'has_many', field_type: 'nested_many'
-              )
-            else
-              fields_hash[name] = AttributeField::NestedOneField.new(
-                model, name: name, type: 'belongs_to', field_type: 'nested_one'
-              )
-            end
-          else
-            if reflection.collection?
-              remove_counter_cache_column!(name, reflection)
+            fields_hash[name] = if reflection.collection?
+                                  AttributeField::NestedManyField.new(
+                                    model, name: name, type: 'has_many', field_type: 'nested_many'
+                                  )
+                                else
+                                  AttributeField::NestedOneField.new(
+                                    model, name: name, type: 'belongs_to', field_type: 'nested_one'
+                                  )
+                                end
+          elsif reflection.collection?
+            remove_counter_cache_column!(name, reflection)
 
-              fields_hash[name] = AttributeField::HasManyField.new(
-                model, name: name, type: 'has_many', field_type: 'multi_select'
-              )
-            elsif !reflection.options[:through]
-              fields_hash[name] = AttributeField::BelongsToField.new(
-                model, name: name, type: 'belongs_to', field_type: 'selectize'
-              )
-            end
+            fields_hash[name] = AttributeField::HasManyField.new(
+              model, name: name, type: 'has_many', field_type: 'multi_select'
+            )
+          elsif !reflection.options[:through]
+            fields_hash[name] = AttributeField::BelongsToField.new(
+              model, name: name, type: 'belongs_to', field_type: 'selectize'
+            )
           end
         end
       end
@@ -84,14 +84,23 @@ module Para
         return unless (inverse_relation = reflection.inverse_of)
         return unless (counter_name = inverse_relation.options[:counter_cache])
 
-        counter_name = if String === counter_name
-          counter_name
-        else
-          "#{ name }_count"
-        end
+        counter_name = if counter_name.is_a?(String)
+                         counter_name
+                       else
+                         "#{name}_count"
+                       end
 
         fields_hash.delete(counter_name)
       end
+
+      def through_polymorphic_reflection?(reflection)
+        reflection.through_reflection? && (
+          (
+            reflection.through_reflection.options[:polymorphic] &&
+            !reflection.through_reflection.options[:source_type]
+          ) || through_polymorphic_reflection?(reflection.through_reflection)
+        )
+      end
     end
   end
 end

data/lib/para/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Para
-  VERSION = '0.12.1'
+  VERSION = '0.12.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.2
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_decorator
@@ -487,7 +487,6 @@ files:
 - app/javascripts/para/inputs/multi-select-input.js
 - app/javascripts/para/inputs/nested_many.js
 - app/javascripts/para/lib/fetch.js
-- app/javascripts/para/lib/page-loading.js
 - app/javascripts/para/plugins-includes.js.erb
 - app/javascripts/para/simple_form_extension/colorpicker.js
 - app/javascripts/para/simple_form_extension/datetimepicker.js

data/app/javascripts/para/lib/page-loading.js

@@ -1,42 +0,0 @@
-Para.PageLoading = class PageLoading {
-  constructor() {
-    this.start = this.start.bind(this);
-    this.stop = this.stop.bind(this);
-  }
-
-  start() {
-    return this.addLoadingMarkup();
-  }
-
-  stop() {
-    return this.removeLoadingMarkup();
-  }
-
-  addLoadingMarkup() {
-    $('<div/>', {
-      class: 'loading-overlay',
-      'data-loading-overlay': true
-    }).prependTo('body');
-    
-    $('<div/>', {
-      class: 'loading-spinner',
-      'data-loading-spinner': true
-    }).prependTo('body');
-  }
-
-  removeLoadingMarkup() {
-    $('[data-loading-overlay]').remove();
-    return $('[data-loading-spinner]').remove();
-  }
-
-};
-
-// Global loading manager allowing to
-Para.loadingManager = new Para.PageLoading();
-
-$(document).on('turbo:before-fetch-request', Para.loadingManager.start);
-
-$(document).on('turbo:load turbo:frame-load turbo:before-stream-render turbo:frame-missing turbo:fetch-request-error', function() {
-  Para.loadingManager.stop();
-  return $('body').on('submit', '[data-para-form]:not([data-remote])', Para.loadingManager.start);
-});