para 0.12.1 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee25a77e578b14d822cbf8827991f6c6920c580acddeb2120d0e6a2570795fa
-  data.tar.gz: 41ee3d94327eeeacfb5ee1da6430956d5862ed0e242d0d09180bef828e46a921
+  metadata.gz: d2e8f3dd97232094cbf6840ad5ec462068c43019dec82f3c872d48bb5f0d8ffa
+  data.tar.gz: 2b3d6cd3dbfa31daef6cdca4e3e040843f10e350f02c9687dec51f1c641de12c
 SHA512:
-  metadata.gz: acd659f13038e225325293d30820d115f5054ca6ba36cccc44e5404bc2e5d0e01226815b41aa38bc3f8c76f6299891c621c4e7d1d2306eaaa76a9f1c97f24891
-  data.tar.gz: 7da8328b9591a785d922ddd3f12c61f95d57f7c3e8a327b5667ad22cbfabeeaaabac1c7c8d0e6ed50dee7bc48ceb7e172aac92b3a9593b6919678e4b957bcc1a
+  metadata.gz: 1c5d0d01332d290463ac6b3c856e2260ee62625ceb9a9e76ea0887f13188ce7df691b23be95e40b20b271a19c5650975844944c6bf1f50262b8677eaa7189d86
+  data.tar.gz: 29ad0aba0dc5ac675f601e8891641aa28e38649550202a03858c46a9703e2a257a52e09bf5ee21ce74f6ca21e877c141888f081ffdba6b88c69fb1bafa4cadd3

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/controllers/index.js

@@ -8,3 +8,6 @@ application.register("para-admin-flash-message", ParaAdminFlashMessageController
 
 import SelectizeFieldController from "./selectize_field_controller";
 application.register("selectize-field", SelectizeFieldController);
+
+import NestedManyInputController from "./nested_many_input_controller";
+application.register("nested-many-input", NestedManyInputController);

data/app/javascripts/para/{inputs/nested_many.js → controllers/nested_many_input_controller.js}

@@ -1,52 +1,70 @@
-Para.NestedManyField = class NestedManyField {
-  constructor($field1) {
+import { Controller } from '@hotwired/stimulus';
+
+export default class extends Controller {
+  connect() {
     this.stoppingPropagation = this.stoppingPropagation.bind(this);
     this.afterInsertField = this.afterInsertField.bind(this);
     this.beforeRemoveField = this.beforeRemoveField.bind(this);
-    // When a sub field is removed, update every sub field position
+    this.handleOrderingUpdated = this.handleOrderingUpdated.bind(this);
     this.afterRemoveField = this.afterRemoveField.bind(this);
     this.collapseShown = this.collapseShown.bind(this);
-    this.$field = $field1;
+
+    this.$field = $(this.element);
     this.$fieldsList = this.$field.find('.fields-list');
-    this.initializeOrderable();
+    this.initializeSortable();
     this.initializeCocoon();
     this.$field.on('shown.bs.collapse', this.stoppingPropagation(this.collapseShown));
   }
 
-  initializeOrderable() {
-    this.orderable = this.$field.hasClass('orderable');
-    if (!this.orderable) {
-      return;
-    }
+  initializeSortable() {
+    this.isSortable = this.$field.hasClass('orderable');
+
+    if (!this.isSortable) return;
+
     return this.$fieldsList.sortable({
       handle: '.order-anchor',
       animation: 150,
-      onUpdate: $.proxy(this.handleOrderingUpdated, this)
+      onUpdate: this.handleOrderingUpdated
     });
   }
 
   handleOrderingUpdated() {
     var formFields;
     formFields = [];
+
     return this.$fieldsList.find('.form-fields:visible').each(function(_i, el) {
-      var $el, $parent, isNestedField, j, len;
+      let $parent, isNestedField, j, len;
+
       for (j = 0, len = formFields.length; j < len; j++) {
         $parent = formFields[j];
         isNestedField = $parent.find(el).length;
       }
+
       if (isNestedField) {
         return;
       }
-      $el = $(el);
+
+      const $el = $(el);
       $el.find('.resource-position-field:eq(0)').val(formFields.length);
       return formFields.push($el);
     });
   }
 
   initializeCocoon() {
-    this.$fieldsList.on('cocoon:after-insert', this.stoppingPropagation(this.afterInsertField));
-    this.$fieldsList.on('cocoon:before-remove', this.stoppingPropagation(this.beforeRemoveField));
-    return this.$fieldsList.on('cocoon:after-remove', this.stoppingPropagation(this.afterRemoveField));
+    this.$fieldsList.on(
+      'cocoon:after-insert', 
+      this.stoppingPropagation(this.afterInsertField)
+    );
+
+    this.$fieldsList.on(
+      'cocoon:before-remove', 
+      this.stoppingPropagation(this.beforeRemoveField)
+    );
+
+    return this.$fieldsList.on(
+      'cocoon:after-remove', 
+      this.stoppingPropagation(this.afterRemoveField)
+    );
   }
 
   stoppingPropagation(callback) {
@@ -61,9 +79,9 @@ Para.NestedManyField = class NestedManyField {
     if (($collapsible = $element.find('[data-open-on-insert="true"]')).length) {
       this.openInsertedField($collapsible);
     }
-    if (this.orderable) {
+    if (this.isSortable) {
       this.$fieldsList.sortable('destroy');
-      this.initializeOrderable();
+      this.initializeSortable();
       this.handleOrderingUpdated();
     }
     return $element.simpleForm();
@@ -90,22 +108,24 @@ Para.NestedManyField = class NestedManyField {
   }
 
   collapseShown(e) {
-    var $target;
-    $target = $(e.target);
-    if ($target.is("[data-rendered]") || $target.data("rendered")) {
-      return this.initializeCollapseContent($target);
+    const { target } = e;
+
+    if (target.dataset.isRendered) {
+      return this.initializeCollapseContent(target);
     } else {
-      this.loadCollapseContent($target);
-      return this.scrollToTarget($target);
+      this.loadCollapseContent(target);
+      return this.scrollToTarget(target);
     }
   }
 
-  initializeCollapseContent($target) {
-    this.scrollToTarget($target);
-    return this.focusFirstField($target);
+  initializeCollapseContent(target) {
+    this.scrollToTarget(target);
+    return this.focusFirstVisibleInputInside(target);
   }
 
-  scrollToTarget($target) {
+  scrollToTarget(target) {
+    const $target = $(target);
+
     var $affixNavTabs, $field, scrollOffset;
     $field = this.$field.find(`[data-toggle='collapse'][href='#${$target.attr('id')}']`);
     scrollOffset = -($('[data-header]').outerHeight() + 30);
@@ -117,35 +137,32 @@ Para.NestedManyField = class NestedManyField {
     });
   }
 
-  focusFirstField($target) {
-    return $target.find('input, textarea, select').eq('0').focus();
+  focusFirstVisibleInputInside(target) {
+    setTimeout(() => {
+      target.querySelector('input:not([type="hidden"]), textarea, select')?.focus();
+    }, 100);
   }
 
-  loadCollapseContent($target) {
-    var data, targetUrl;
-    targetUrl = $target.data("render-path");
-    if (!targetUrl) {
-      return;
-    }
-    data = {
-      "id": $target.data("id"),
-      "object_name": $target.data("object-name"),
-      "model_name": $target.data("model-name")
+  loadCollapseContent(target) {
+    const $target = $(target);
+    const targetUrl = target.dataset.renderPath;
+
+    if (!targetUrl) return;
+
+    const data = {
+      id: target.dataset.id,
+      object_name: target.dataset.objectName,
+      model_name: target.dataset.modelName
     };
-    return $.get(targetUrl, data).then((resp) => {
-      var $content;
-      $content = $(resp);
-      $target.find("[data-nested-form-container]:eq(0)").html($content);
+
+    $.get(targetUrl, data).then((resp) => {
+      const $content = $(resp);
+      $target.find('[data-nested-form-container]:eq(0)').html($content);
       $content.simpleForm();
-      this.focusFirstField($target);
-      return $target.data("rendered", true);
+
+      this.focusFirstVisibleInputInside(target);
+      
+      target.dataset.isRendered = true;
     });
   }
-
 };
-
-$.simpleForm.onDomReady(function($document) {
-  return $document.find('.nested-many-field').each(function(i, el) {
-    return new Para.NestedManyField($(el));
-  });
-});

data/app/javascripts/para/index.js

@@ -14,11 +14,7 @@ import "./vendor/jquery.sortable";
 
 import "./application";
 
-import "./lib/page-loading";
-
-import "./inputs/material-input";
 import "./inputs/multi-select-input";
-import "./inputs/nested_many";
 
 import "./admin/async-progress";
 import "./admin/filters-form";

data/app/views/para/inputs/_nested_many.html.haml

@@ -1,4 +1,4 @@
-.nested-many-field{ class: [('orderable' if orderable), ('nested-many-field-inset' if inset)] }
+.nested-many-field{ class: [('orderable' if orderable), ('nested-many-field-inset' if inset)], data: { controller: "nested-many-input" } }
   .fields-list{ id: dom_identifier }
     = form.simple_fields_for attribute_name, resources, nested_attribute_name: attribute_name, orderable: orderable, track_attribute_mappings: render_partial do |nested_form|
       = render partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), locals: { form: nested_form, model: nested_form.object.class, subclass: subclass, allow_destroy_if: allow_destroy_if, nested_locals: nested_locals, inset: inset, uncollapsed: uncollapsed, render_partial: render_partial, remote_partial_params: remote_partial_params }

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.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.12.3
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_decorator
@@ -479,15 +479,13 @@ files:
 - app/javascripts/para/application.js
 - app/javascripts/para/controllers/application.js
 - app/javascripts/para/controllers/index.js
+- app/javascripts/para/controllers/nested_many_input_controller.js
 - app/javascripts/para/controllers/para_admin_flash_message_controller.js
 - app/javascripts/para/controllers/para_admin_modal_controller.js
 - app/javascripts/para/controllers/selectize_field_controller.js
 - app/javascripts/para/index.js
-- app/javascripts/para/inputs/material-input.js
 - 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
@@ -794,7 +792,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.8
+rubygems_version: 3.5.17
 signing_key:
 specification_version: 4
 summary: Rails admin engine

data/app/javascripts/para/inputs/material-input.js

@@ -1,7 +0,0 @@
-$(document).on('page:change turbo:load turbo:frame-load', function() {
-  return $('body').on('focusin focusout', 'input, select, textarea', function(e) {
-    var focused;
-    focused = e.type === 'focusin';
-    return $(e.target).closest('.form-group').toggleClass('focused', focused);
-  });
-});

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);
-});