para 0.8.3.3 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 34cf9dd56413ef5e25dc49969075a9cfe6344c04b49bcc2411dac16b58b6f2da
-  data.tar.gz: 7e6ce611948b6d096f2479a91f451e9ff98708ddca65de0aa3d7cf44aa0b8912
+SHA1:
+  metadata.gz: 2699b3fe934e113bc1679347cbe97ac94b0959c1
+  data.tar.gz: af695377ab693265ad2d1a28ae0e6588565dcc2d
 SHA512:
-  metadata.gz: a956b05c65552b0c407891a52237e268d2c04d67cce364d7faf1163776d672ff8cc1a6259d2b6f8af024ffe588d6d55f2bd1dcc541c7085f2b7550c8a4f781c9
-  data.tar.gz: 54fd0283d7cb5e928bf3a5b866feba4a8e2aa1a5978fc0756c6af5e4ff4228f292cc87beb142b0040060cfd1af4f8095a1ea2ce28326bd80524f9d29565d5eb2
+  metadata.gz: 44bf7f39afb5ac20c01ad50f91cf1c6ac34dbead25f7aa0d94dd4f9fa1fcd8c26f3228e85769a3d13859564fc6575da90b69294681da8dc4baabae733bbe2e91
+  data.tar.gz: ffeb5936f4db9c9b58a9e0d92135da5eb04ef24a5d5b4311a7ebf6cad355ba7b9b5fe8e50930ea981f1e812e4a483b26a38b67a6e3286573d38a0181c3193e14

data/app/assets/javascripts/para/admin.coffee

@@ -6,7 +6,8 @@
 #= require jasny-bootstrap
 #= require simple_form_extension
 #= require jquery.scrollto
-#= require html5-sortable
+#= require Sortable
+#= require jquery.sortable
 #= require cocoon
 #= require jquery.remote-modal-form
 #= require jquery.iframe-transport

data/app/assets/javascripts/para/admin/table.coffee

@@ -12,11 +12,9 @@ class Para.ResourceTable
 
     @$tbody.sortable
       handle: '.order-anchor'
-      forcePlaceholderSize: true
-      items: 'tr'
-      placeholder: "<tr><td colspan=\"100%\" class=\"sortable-placeholder\"></td></tr>"
-
-    @$tbody.on('sortupdate', $.proxy(@sortUpdate, this))
+      draggable: 'tr'
+      ghostClass: 'sortable-placeholder'
+      onUpdate: $.proxy(@sortUpdate, this)
 
   sortUpdate: ->
     @$tbody.find('tr').each (i, el) ->

data/app/assets/javascripts/para/admin/tree.coffee

@@ -6,22 +6,75 @@ class Para.ResourceTree
     @orderUrl = @$el.data('url')
     @maxDepth = parseInt @$el.data('max-depth')
 
-    $(".tree")
-      .sortable
-        handle: ".handle"
-        items: ".node"
-        connectWith: ".tree"
-      .on('sortupdate', $.proxy(@sortUpdate, this))
-
-  sortUpdate: (e, data) ->
-    @handlePlaceholder($el) for $el in [data.endparent, data.startparent, data.item.find('.tree')]
+    # Each is needed here as the sortable jQuery plugin doesn't loop over each found node
+    # but initializes the tree on the first found element.
+    $(".tree").each(@initializeSubTree)
+
+  initializeSubTree: (_i, el) =>
+    $(el).sortable(
+      group: "tree"
+      handle: ".handle"
+      draggable: ".node"
+      fallbackOnBody: true
+      swapThreshold: 0.65
+      animation: 150
+      onSort: @handleOrderUpdated
+      onMove: @isMovementValid
+    )
+
+  # Note : This method is called often (many times per second while we're dragging) and
+  # takes quite some processing.
+  isMovementValid: (e) =>
+    $movedNode = $(e.dragged)
+    $target = $(e.related)
+
+    # Calculate the deepness of the moved and target nodes
+    movedNodeDeepness = $movedNode.parents(".node").length - 1
+    # If the target is a node, the moved node root deepness is gonna be the same as the
+    # the target one, else the tree's parent node is counted also
+    targetDeepness = $target.parents(".node").length - 1
+
+    # Find the deepest node in the subtree of the moved node
+    $movedNodeSubtrees = $movedNode.find(".tree")
+    movedNodeTreeDeepness = 0
+
+    # The movedNodeTreeDeepness is the maximum deepness of a child node of the current
+    # moved node, relative to the moved node
+    $movedNodeSubtrees.each (i, el) =>
+      subtreeDeepness = $(el).parents(".node").length - 1
+      subtreeRelativeDeepness = subtreeDeepness - movedNodeDeepness
+      movedNodeTreeDeepness = Math.max(movedNodeTreeDeepness, subtreeRelativeDeepness)
+
+    # Calculate the final subtree deepness once we move the whole moved node subtree to
+    # its target position
+    finalSubtreeDeepnessAfterMove = movedNodeTreeDeepness + targetDeepness
+
+    # We finally validate the move only if the final subtree deepness is lower than the
+    # maximum allowed depth
+    finalSubtreeDeepnessAfterMove <= @maxDepth
+
+  handleOrderUpdated: (e) =>
+
+    # Get all involved tree leaves that may include a subtree
+    treeLeaves = [$(e.target), $(e.from), $(e.item).find('.tree')]
+
+    # Update their placeholder display wether they can be a drop target or not
+    @handlePlaceholder($el) for $el in treeLeaves
+    # Save the tree structure on the server
     @updateOrder()
 
+  # This method checks wether a given tree leaf can be a drop target, depending
+  # on wether it's located at the maximum allowed depth for the tree or not, and adds or
+  # remove a the visual placeholder to indicate its droppable state.
+  #
   handlePlaceholder: ($el) ->
     $placeholder = $el.find("> .placeholder")
-    if $el.parents('.tree').length - 1 >= @maxDepth or $el.find('> .node').length
+    parentsCount = $el.parents('.node').length - 1
+    hasChildren = $el.find('> .node').length
+
+    if parentsCount >= @maxDepth or hasChildren
       $placeholder.hide()
-      $el.children("> .tree").each (index, el) => @handlePlaceholder $(el)
+      $el.children(".tree").each (index, el) => @handlePlaceholder($(el))
     else
       $placeholder.show()
 
@@ -29,9 +82,8 @@ class Para.ResourceTree
     Para.ajax(
       url: @orderUrl
       method: 'patch'
-      data:
-        resources: @buildOrderedData()
-      success: $.proxy(@orderUpdated, this)
+      data: { resources: @buildOrderedData() }
+      success: @orderUpdated
     )
 
   buildOrderedData: ->
@@ -41,11 +93,11 @@ class Para.ResourceTree
       data[index] = {
         id: $this.data("id"),
         position: index,
-        parent_id: $this.parent().parent().data("id")
+        parent_id: $this.parents(".node:first").data("id")
       }
     data
 
-  orderUpdated: ->
+  orderUpdated: =>
     # TODO: Add flash message to display ordering success
 
 $(document).on 'page:change turbolinks:load', ->

data/app/assets/javascripts/para/inputs/multi-select-input.coffee

@@ -122,10 +122,9 @@ class Para.MultiSelectInput extends Vertebra.View
 
     @$selectedItems.sortable
       handle: '.order-anchor'
-      forcePlaceholderSize: true
-      placeholder: "<tr><td colspan='#{ columnsCount }'></td></tr>"
+      animation: 150
 
-    @$selectedItems.on('sortupdate', @selectedItemsSorted)
+    @$selectedItems.on('sort', @selectedItemsSorted)
 
   selectedItemsSorted: =>
     indices = {}

data/app/assets/javascripts/para/inputs/nested_many.coffee

@@ -13,17 +13,17 @@ class Para.NestedManyField
 
     @$fieldsList.sortable
       handle: '.order-anchor'
-      forcePlaceholderSize: true
+      animation: 150
+      onUpdate: $.proxy(@handleOrderingUpdated, this)
 
-    @$fieldsList.on('sortupdate', $.proxy(@sortUpdate, this))
-
-  sortUpdate: ->
-    @$fieldsList.find('.form-fields').each (i, el) ->
+  handleOrderingUpdated: ->
+    @$fieldsList.find('.form-fields:visible').each (i, el) ->
       $(el).find('.resource-position-field').val(i)
 
   initializeCocoon: ->
     @$fieldsList.on 'cocoon:after-insert', $.proxy(@afterInsertField, this)
     @$fieldsList.on 'cocoon:before-remove', $.proxy(@beforeRemoveField, this)
+    @$fieldsList.on 'cocoon:after-remove', $.proxy(@afterRemoveField, this)
 
   afterInsertField: (e, $element) ->
     if ($collapsible = $element.find('[data-open-on-insert="true"]')).length
@@ -32,7 +32,7 @@ class Para.NestedManyField
     if @orderable
       @$fieldsList.sortable('destroy')
       @initializeOrderable()
-      @sortUpdate()
+      @handleOrderingUpdated()
 
     $element.simpleForm()
 
@@ -42,6 +42,10 @@ class Para.NestedManyField
     # create an empty nested resource otherwise
     $nextEl.remove() if $nextEl.is('[data-attributes-mappings]') and not $element.is('[data-persisted]')
 
+  # When a sub field is removed, update every sub field position
+  afterRemoveField: ->
+    @handleOrderingUpdated();
+
   openInsertedField: ($field) ->
     $target = $($field.attr('href'))
     $target.collapse('show')

data/app/assets/stylesheets/para/admin/src/_list.sass

@@ -9,7 +9,11 @@
 .actions-control
   list-style: none
   padding: 0
-  margin: 0
+  margin: 0 15px 0 0
+
+  &:last-child
+    margin-right: 0
+
   li
     +inline-block
     padding: 0 5px
@@ -42,7 +46,7 @@
 
   .page-list-heading
     border-bottom: 1px solid $gray-light
-    
+
   .page-list-body:last-child
     padding-bottom: 0
 
@@ -76,7 +80,7 @@
       color: $gray
       border-color: transparent
       &:hover
-        color: $gray-dark    
+        color: $gray-dark
 
 
 .page-entries-info

data/app/helpers/para/admin/nested_inputs_helper.rb

@@ -0,0 +1,17 @@
+module Para
+  module Admin
+    module NestedInputsHelper
+      # Helper that allows filling a parent association for a given resource, based on the
+      # inverse_of option of the parent resource association.
+      #
+      def with_inverse_association_for(resource, attribute_name, parent_resource)
+        resource.tap do
+          association_name = parent_resource.association(attribute_name).options[:inverse_of]
+          return resource unless association_name
+
+          resource.association(association_name).replace(parent_resource)
+        end
+      end
+    end
+  end
+end

data/app/helpers/para/admin/page_helper.rb

@@ -12,8 +12,11 @@ module Para
       end
 
       def build_action(action)
-        content_tag(:div, class: 'actions-control pull-right') do  
-          link_to(action[:url], class: 'btn btn-default btn-shadow') do
+        link_options = action.fetch(:link_options, {})
+        link_options[:class] ||= "btn btn-default btn-shadow"
+
+        content_tag(:div, class: 'actions-control pull-right') do
+          link_to(action[:url], link_options) do
             (
               (fa_icon(action[:icon], class: 'fa-fw') if action[:icon]) +
               action[:label]

data/app/helpers/para/tag_helper.rb

@@ -21,7 +21,7 @@ module Para
       allow_adding_resource = options.fetch(:addable, true)
 
       partial = :list
-      partial = :tree if model.respond_to? :roots
+      partial = :tree if model.respond_to?(:roots) && can?(:tree, model)
 
       render(
         partial: find_partial_for(relation, partial),
@@ -48,6 +48,8 @@ module Para
     end
 
     def add_button_for(component, relation, model)
+      return unless can?(:create, model)
+
       partial_name = if component.subclassable?
         :subclassable_add_button
       else

data/app/views/para/admin/resources/_tree.html.haml

@@ -4,6 +4,10 @@
       = render partial: find_partial_for(relation, :actions), locals: { relation: relation, component: component, model: model, allow_adding_resource: allow_adding_resource }
 
     - if resources.length > 0
+      - if resources.total_count > 100
+        .page-entries-info
+          = page_entries(resources)
+
       %ul.tree.root-tree{ data: { url: component.relation_path(model.model_name.route_key, action: :tree), :"max-depth" => max_depth_for(model) } }
         = render partial: find_partial_for(model, 'tree_item'), collection: resources.roots, as: :root, locals: { model: model}
 

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

@@ -1,10 +1,10 @@
 .nested-many-field{ class: [('orderable' if orderable), ('nested-many-field-inset' if inset)] }
   .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, nested_locals: nested_locals, inset: inset, render_partial: render_partial, remote_partial_params: remote_partial_params }
+      = render partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), locals: { form: nested_form, model: nested_form.object.class, subclass: subclass, nested_locals: nested_locals, inset: inset, uncollapsed: uncollapsed, render_partial: render_partial, remote_partial_params: remote_partial_params }
   -# Add button
   - if add_button
     - if subclass
-      = render partial: 'para/inputs/nested_many/add_with_subclasses', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, orderable: orderable, subclasses: subclasses, inset: inset, add_button_label: add_button_label, add_button_class: add_button_class, render_partial: render_partial, remote_partial_params: remote_partial_params }
+      = render partial: 'para/inputs/nested_many/add_with_subclasses', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, orderable: orderable, subclasses: subclasses, inset: inset, uncollapsed: uncollapsed, add_button_label: add_button_label, add_button_class: add_button_class, render_partial: render_partial, remote_partial_params: remote_partial_params }
     - else
-      = render partial: 'para/inputs/nested_many/add', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, orderable: orderable, inset: inset, add_button_label: add_button_label, add_button_class: add_button_class, render_partial: render_partial, remote_partial_params: remote_partial_params }
+      = render partial: 'para/inputs/nested_many/add', locals: { form: form, model: model, dom_identifier: dom_identifier, nested_locals: nested_locals, attribute_name: attribute_name, orderable: orderable, inset: inset, uncollapsed: uncollapsed, add_button_label: add_button_label, add_button_class: add_button_class, render_partial: render_partial, remote_partial_params: remote_partial_params }

data/app/views/para/inputs/nested_many/_add.html.haml

@@ -1,2 +1,2 @@
-= link_to_add_association form, attribute_name, partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: "btn btn-shadow add-button nested-many-inset-add-button #{add_button_class}", data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: model, nested_locals: nested_locals, inset: inset, render_partial: render_partial, remote_partial_params: remote_partial_params } } do
+= link_to_add_association form, attribute_name, partial: find_partial_for(model, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: "btn btn-shadow add-button nested-many-inset-add-button #{add_button_class}", data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: model, nested_locals: nested_locals, inset: inset, uncollapsed: uncollapsed, render_partial: render_partial, remote_partial_params: remote_partial_params } } do
   = add_button_label

data/app/views/para/inputs/nested_many/_add_with_subclasses.html.haml

@@ -5,5 +5,5 @@
   %ul.dropdown-menu
     - subclasses.each do |submodel|
       %li
-        = link_to_add_association form, attribute_name, wrap_object: proc { submodel.new }, partial: find_partial_for(submodel, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: 'dropdown-link', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: submodel, nested_locals: nested_locals, inset: inset, render_partial: render_partial, remote_partial_params: remote_partial_params } } do
+        = link_to_add_association form, attribute_name, wrap_object: proc { with_inverse_association_for(submodel.new, attribute_name, form.object) }, partial: find_partial_for(submodel, 'nested_many/container', partial_dir: 'inputs'), form_name: 'form', class: 'dropdown-link', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, orderable: orderable, locals: { model: submodel, nested_locals: nested_locals, inset: inset, uncollapsed: uncollapsed, render_partial: render_partial, remote_partial_params: remote_partial_params } } do
           = submodel.model_name.human

data/app/views/para/inputs/nested_many/_container.html.haml

@@ -11,7 +11,7 @@
 
     = form.remove_association_button
 
-  .panel-collapse.form-inputs.collapse{ id: form.nested_resource_dom_id, class: ('in' if inset && form.object.persisted?), data: { rendered: render_partial, render_path: @component.path(remote_partial_params), id: form.object.id, :"object-name" => form.object_name, :"model-name" => model.name } }
+  .panel-collapse.form-inputs.collapse{ id: form.nested_resource_dom_id, class: ('in' if uncollapsed && form.object.persisted?), data: { rendered: render_partial, render_path: @component.path(remote_partial_params), id: form.object.id, :"object-name" => form.object_name, :"model-name" => model.name } }
     .panel-body{ data: { :"nested-form-container" => true } }
       - if render_partial
         = render partial: find_partial_for(model, :fields), locals: { form: form }.merge(nested_locals)

data/app/views/para/inputs/nested_one/_add_with_subclasses.html.haml

@@ -6,5 +6,5 @@
   %ul.dropdown-menu
     - subclasses.each do |submodel|
       %li
-        = link_to_add_association form, attribute_name, wrap_object: proc { submodel.new }, partial: find_partial_for(submodel, 'nested_one/container', partial_dir: 'inputs'), form_name: 'form', class: 'dropdown-link', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, locals: { form: form, model: submodel, subclass: subclass, nested_locals: nested_locals } } do
+        = link_to_add_association form, attribute_name, wrap_object: proc { with_inverse_association_for(submodel.new, attribute_name, form.object) }, partial: find_partial_for(submodel, 'nested_one/container', partial_dir: 'inputs'), form_name: 'form', class: 'dropdown-link', data: { :'association-insertion-node' => "##{ dom_identifier }", :'association-insertion-method' => 'append' }, render_options: { nested_attribute_name: attribute_name, locals: { form: form, model: submodel, subclass: subclass, nested_locals: nested_locals } } do
           = submodel.model_name.human

data/lib/generators/para/install/templates/initializer.rb

@@ -27,9 +27,17 @@ Para.config do |config|
   # config.resource_name_methods += [:full_name]
 
   # Configure the theme navigation bar color not gray but blue darker
-  # 
+  #
   # config.dark_theme = true
 
+  # Do not uncollapse by default "inset" nested fields, which makes all such nested field
+  # blocks get collapsed on page load, and can be easier to read for big blocks.
+  #
+  # This also speeds up page loading when used in conjunction to remote partial loading
+  # for nested fields
+  #
+  # config.uncollapse_inset_nested_fields = false
+
   # Set if the Para::Breadcrumb::Controller module should be included into the
   # app, allowing easy breadcrumbs management in the app.
   #

data/lib/para/config.rb

@@ -42,6 +42,9 @@ module Para
     mattr_accessor :dark_theme
     @@dark_theme = false
 
+    mattr_accessor :uncollapse_inset_nested_fields
+    @@uncollapse_inset_nested_fields = true
+
     # Allows changing default cache store used by Para to store jobs through
     # the ActiveJob::Status gem
     #

data/lib/para/form_builder/containers.rb

@@ -27,7 +27,9 @@ module Para
       end
 
       def actions_buttons_for(options)
-        names = [:submit, :submit_and_edit, :submit_and_add_another, :cancel]
+        names = [:submit, :submit_and_edit]
+        names << :submit_and_add_another if template.can?(:create, object.class)
+        names << :cancel
 
         names.select! { |name| Array.wrap(options[:only]).include?(name) } if options[:only]
         names.reject! { |name| Array.wrap(options[:except]).include?(name) } if options[:except]

data/lib/para/inputs/nested_many_input.rb

@@ -32,6 +32,7 @@ module Para
               add_button_label: add_button_label,
               add_button_class: add_button_class,
               inset: inset?,
+              uncollapsed: uncollapsed?,
               render_partial: render_partial?,
               remote_partial_params: remote_partial_params
             }
@@ -50,9 +51,13 @@ module Para
       def inset?
         options.fetch(:inset, false)
       end
-      
+
+      def uncollapsed?
+        inset? && Para.config.uncollapse_inset_nested_fields
+      end
+
       def render_partial?
-        options[:render_partial] || object.errors.any? || (object.persisted? && inset?)
+        options[:render_partial] || object.errors.any? || (object.persisted? && uncollapsed?)
       end
 
       def remote_partial_params

data/lib/para/job/base.rb

@@ -33,9 +33,9 @@ module Para
       end
 
       def ensure_total_progress
-        return if @total_progress
+        return if @_total_progress
 
-        @total_progress ||= if respond_to?(:total_progress, true)
+        @_total_progress ||= if respond_to?(:total_progress, true)
           progress.total = total_progress
         else
           progress[:total]

data/lib/para/markup/resources_buttons.rb

@@ -2,14 +2,14 @@ module Para
   module Markup
     class ResourcesButtons < Para::Markup::Component
       attr_reader :component
-      
+
       def initialize(component, view)
         @component = component
         super(view)
       end
 
       def clone_button(resource)
-        return unless resource.class.cloneable?
+        return unless resource.class.cloneable? && view.can?(:clone, resource)
 
         path = component.relation_path(
           resource, action: :clone, return_to: view.request.fullpath
@@ -29,6 +29,8 @@ module Para
       end
 
       def edit_button(resource)
+        return unless view.can?(:edit, resource)
+
         path = component.relation_path(
           resource, action: :edit, return_to: view.request.fullpath
         )
@@ -39,6 +41,8 @@ module Para
       end
 
       def delete_button(resource)
+        return unless view.can?(:delete, resource)
+
         path = component.relation_path(resource, return_to: view.request.fullpath)
 
         options = {