para 0.8.7 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8f7d2729a7b4605f42e736da01ed85636b39232c
-  data.tar.gz: 42a119d77586ef8db3eee57231c3a46154141e1c
+SHA256:
+  metadata.gz: 9cd266c603b5629183643836cce701deb33e3322af0a98f021fb48f6922127c6
+  data.tar.gz: 36ff9796de7371559684be64fdb6f402acd5267997e94fb9f739e294d508a6d3
 SHA512:
-  metadata.gz: 44f44a2d7340fa890359d5f259f90b591f2436609399028bb77a54237f1e49b95d81435a807c452234cc58904a2a7773bd469be58b373d4074244a540a325442
-  data.tar.gz: 25280f88dd481faf6882df01416d85b31cc0a3fcc7204487ad53d7837bd7220463b0280141e1cdc203c577960ac103977abbd7d560ca9570fb00dd76325ec166
+  metadata.gz: ddab0a864ddf77239b958c1d03fc5a67c69bfbf551893c45fd000c8b2970f14d865e01b71c786935d0dd27907149c090335ec13413365805f29f25658bb5949e
+  data.tar.gz: f288a5bd00b8bea61093546d9d5ce9ff649c18165564f3fa5876cedfe856f486604ef6ad46b1b57155dc62c21859e4de24936f65169428386da5b42f5b64044b

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,11 +13,10 @@ class Para.NestedManyField
 
     @$fieldsList.sortable
       handle: '.order-anchor'
-      forcePlaceholderSize: true
+      animation: 150
+      onUpdate: $.proxy(@handleOrderingUpdated, this)
 
-    @$fieldsList.on('sortupdate', $.proxy(@sortUpdate, this))
-
-  sortUpdate: ->
+  handleOrderingUpdated: ->
     @$fieldsList.find('.form-fields:visible').each (i, el) ->
       $(el).find('.resource-position-field').val(i)
 
@@ -31,8 +30,9 @@ class Para.NestedManyField
       @openInsertedField($collapsible)
 
     if @orderable
-      @$fieldsList.sortable('reload')
-      @sortUpdate()
+      @$fieldsList.sortable('destroy')
+      @initializeOrderable()
+      @handleOrderingUpdated()
 
     $element.simpleForm()
 
@@ -44,7 +44,7 @@ class Para.NestedManyField
 
   # When a sub field is removed, update every sub field position
   afterRemoveField: ->
-    @sortUpdate();
+    @handleOrderingUpdated();
 
   openInsertedField: ($field) ->
     $target = $($field.attr('href'))

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

@@ -2,18 +2,25 @@ module Para
   module Admin
     module PageHelper
       def page_top_bar(options = {})
-        content_tag(:div, class: 'page-title row') do
+        top_bar = content_tag(:div, class: 'page-title row') do
           content_tag(:h1, options[:title]) +
 
           if (actions = actions_for(options[:type]))
             actions.map(&method(:build_action)).join('').html_safe
           end
         end
+
+        # Return both top bar and component navigation to be displayed at the top of the
+        # page.
+        top_bar + component_navigation
       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]
@@ -27,6 +34,26 @@ module Para
           instance_eval(&action)
         end.compact
       end
+
+      def component_navigation
+        parent_component = @component && (
+          @component.parent_component ||
+          @component.child_components.any? && @component
+        )
+
+        return unless parent_component
+
+        # If the component has a `model_type` option, therefore, an associated model,
+        # we try to render the partial from the relative path of the model, else we
+        # use the component class as the base target path
+        partial_target = parent_component.try(:model_type) || parent_component
+
+        render partial: find_partial_for(partial_target, :navigation),
+                locals: {
+                  parent_component: parent_component,
+                  active_component: @component
+                }
+      end
     end
   end
 end

data/app/models/application_record.rb

@@ -1,3 +1,6 @@
+# Base class used for the `AdminUser` model class as parent but automatically overriden
+# by application's own ApplicationRecord definition in Rails 5+
+#
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
 end

data/app/models/para/application_record.rb

@@ -0,0 +1,20 @@
+module Para
+  # Base class for all para-specific models.
+  #
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+
+    private
+
+    # Adds the `optional: true` option to the belongs_to calls inside the provided block,
+    # but only for Rails 5.1+
+    #
+    def self.with_belongs_to_optional_option_if_needed(&block)
+      if ActiveRecord::Associations::Builder::BelongsTo.valid_options({}).include?(:optional)
+        with_options(optional: true, &block)
+      else
+        block.call
+      end
+    end
+  end
+end

data/app/models/para/cache/item.rb

@@ -3,7 +3,7 @@
 #
 module Para
   module Cache
-    class Item < ActiveRecord::Base
+    class Item < Para::ApplicationRecord
       def value
         Marshal.load(::Base64.decode64(self[:value])) if self[:value].present?
       end

data/app/models/para/component/base.rb

@@ -1,6 +1,6 @@
 module Para
   module Component
-    class Base < ActiveRecord::Base
+    class Base < Para::ApplicationRecord
       self.table_name = 'para_components'
 
       class_attribute :component_name
@@ -16,7 +16,14 @@ module Para
 
       configurable_on :controller
 
-      belongs_to :component_section, class_name: 'Para::ComponentSection'
+      with_belongs_to_optional_option_if_needed do
+        belongs_to :component_section, class_name: 'Para::ComponentSection'
+        belongs_to :parent_component, class_name: 'Para::Component::Base'
+      end
+
+      has_many :child_components, -> { ordered },
+                                  class_name: 'Para::Component::Base',
+                                  foreign_key: 'parent_component_id'
 
       validates :identifier, :type, presence: true
 
@@ -31,6 +38,13 @@ module Para
         )
       end
 
+      def main_navigation_name
+        ::I18n.t(
+          "components.main_navigation.#{ identifier }",
+          default: name
+        )
+      end
+
       def exportable?
         false
       end

data/app/models/para/component_resource.rb

@@ -1,5 +1,5 @@
 module Para
-  class ComponentResource < ActiveRecord::Base
+  class ComponentResource < Para::ApplicationRecord
     belongs_to :component, class_name: 'Para::Component::Base'
     belongs_to :resource, polymorphic: true
   end

data/app/models/para/component_section.rb

@@ -1,5 +1,5 @@
 module Para
-  class ComponentSection < ActiveRecord::Base
+  class ComponentSection < Para::ApplicationRecord
     has_many :components, -> { ordered }, class_name: 'Para::Component::Base',
              autosave: true, foreign_key: :component_section_id,
              dependent: :destroy

data/app/models/para/library/file.rb

@@ -1,6 +1,6 @@
 module Para
   module Library
-    class File < ActiveRecord::Base
+    class File < Para::ApplicationRecord
       if defined?(ActiveStorage)
         has_one_attached :attachment
 

data/app/models/para/page/section.rb

@@ -1,21 +1,14 @@
 module Para
   module Page
-    class Section < ActiveRecord::Base
+    class Section < Para::ApplicationRecord
       self.table_name = 'para_page_sections'
 
       acts_as_orderable parent: :page, as: :sections
 
-      page_relation_options = { polymorphic: true }
-
-      # Make Rails 5+ belongs_to relation optional for the parent page, to allow
-      # using sections in other contexts that directly included into pages
-      #
-      if ActiveRecord::Associations::Builder::BelongsTo.valid_options({}).include?(:optional)
-        page_relation_options[:optional] = true
+      with_belongs_to_optional_option_if_needed do
+        belongs_to :page, polymorphic: true
       end
 
-      belongs_to :page, page_relation_options
-
       def css_class
         @css_class ||= self.class.name.demodulize.underscore.gsub(/_/, '-')
       end

data/app/models/para/page/section_resource.rb

@@ -1,6 +1,6 @@
 module Para
   module Page
-    class SectionResource < ActiveRecord::Base
+    class SectionResource < Para::ApplicationRecord
       self.table_name = 'para_page_section_resources'
 
       acts_as_orderable parent: :section, as: :section_resources

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

@@ -0,0 +1,10 @@
+.top-nav-tabs-affix-placeholder
+  %ul.top-nav-tabs-affix.nav.nav-tabs{ role: "tablist", "data-top-level-affix": true }
+    %li{ class: ("active" if active_component == parent_component) }
+      = link_to parent_component.path do
+        = parent_component.name
+
+    - parent_component.child_components.each do |child_component|
+      %li{ class: ("active" if active_component == child_component) }
+        = link_to child_component.path do
+          = child_component.name