para 0.8.11 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61c7a5614276ef1baeb61bc3374e309f17b3316e87bcf4694a3fdd5fb57ac3ed
-  data.tar.gz: 7af31c4c81ba3c3ac2b925ee719914e3d781e67c1033d225d668033d2a27243a
+  metadata.gz: 0d193279195926cf9c9d771bc66d9d0087bfe61ff9e7662f1c66833278088dc1
+  data.tar.gz: deaba7951bc96c94bf6175bf55061b2d14f988d9f992d538e27774ad21587a78
 SHA512:
-  metadata.gz: 3c0c2d1301ee1cf60438125c8067062809d05ca5ed5a61d8884f60ff72986bf10f1682a40c2f1fa3c00df81188f8530e950d8eda484d8cd4a179ea41e0843110
-  data.tar.gz: 518d36587de3461721498f6a76660a7c85ffb96eed5f3a8724cd7056855a21e83e509351b444538b6fe101792239ab908540603f9027fbe7960c908f286fb264
+  metadata.gz: '0584c068c6a24a3a8a9c9a608f4c2288644df56ca6b34007c98da511ab22ec55178ff1462d43e411a43ecf4b00cc0dcbc05b7529ba6c2643302b8b8930c96810'
+  data.tar.gz: 54d4160767fce3095334d2d81c370cf3fc103d07ef0db5afe1b180c2325fde2cd727d3db5c541bfe49395f607d69667b4fa83b33df22c1a06b22a619ecfa2981

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

@@ -5,8 +5,10 @@ module Para
     #
     def admin_component_sections
       @admin_component_sections ||= begin
-        Para::ComponentSection.ordered.includes(:components).tap do |sections|
-          sections.flat_map(&:components).each(&method(:decorate))
+        sections = Para::ComponentSection.ordered.includes(:components, :parent_component)
+
+        sections.tap do |loaded_sections|
+          loaded_sections.flat_map(&:components).each(&method(:decorate))
         end
       end
     end
@@ -23,5 +25,11 @@ module Para
       config = Para.components.component_configuration_for(component.identifier)
       !config.shown_if || instance_exec(&config.shown_if)
     end
+
+    def current_component_or_parent?(component)
+      return false unless @component
+
+      @component == component || @component.parent_component == component
+    end
   end
 end

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

@@ -36,7 +36,7 @@ module Para
       end
 
       def component_navigation
-        parent_component = (
+        parent_component = @component && (
           @component.parent_component ||
           @component.child_components.any? && @component
         )

data/app/helpers/para/tag_helper.rb

@@ -19,9 +19,13 @@ module Para
       attributes = model_field_mappings(model).fields
       relation = options.fetch(:relation, model.name.to_s.underscore.pluralize)
       allow_adding_resource = options.fetch(:addable, true)
+      force_list = options.fetch(:force_list, false)
 
-      partial = :list
-      partial = :tree if model.respond_to?(:roots) && can?(:tree, model)
+      partial = if !force_list && model.respond_to?(:roots) && can?(:tree, model)
+        :tree
+      else
+        :list
+      end
 
       render(
         partial: find_partial_for(relation, partial),

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

@@ -15,7 +15,7 @@
           %ul.component-section-list-items.collapse.in{ id: "collapse-section-#{index}" }
             - component_section.components.each do |component|
               - if can?(:manage, component) && show_component?(component)
-                %li.component-item{ class: (@component == component) && 'active' }
+                %li.component-item{ class: ('active' if current_component_or_parent?(component)) }
                   = link_to component.main_navigation_name, component.path
 
     - else

data/config/locales/en.yml

@@ -13,14 +13,14 @@ en:
           error: "Could not delete %{model}"
         clone:
           success: "%{model} cloned"
-          error: "Could not clone %{model}"  
-    
+          error: "Could not clone %{model}"
+
     jobs:
       para/importer/base:
         progressing: "The file is being imported, please wait a few moments ..."
         success: "The import of the file was successfully completed"
         success_with_errors: |
-          The import of the file was done, but some lines 
+          The import of the file was done, but some lines
           were not taken into account due to errors :
         other_errors: "<br>And <b>%{count}</b> others errors ..."
         error: "The selected file contains errors and could not be imported"
@@ -40,9 +40,6 @@ en:
     confirmation:
       shared:
         destroy: 'Are you sure that you want to delete %{model} ?'
-    
-    component:
-      none_created: "No components yet ..."
 
     component:
       create: "Create a component"
@@ -146,7 +143,7 @@ en:
         type: "Type"
         model_type: "Resource"
         namespaced: "Only list component's resources"
-  
+
   activemodel:
     models:
       settings_rails/form:

data/lib/para/markup/resources_table.rb

@@ -92,9 +92,9 @@ module Para
         end
 
         content_tag(:th, options) do
-          if (sort = options.delete(:sort))
+          if search && (sort = options.delete(:sort))
             view.sort_link(search, *sort, label, hide_indicator: true)
-          elsif searchable?(field_name)
+          elsif search && searchable?(field_name)
             view.sort_link(search, field_name, label, hide_indicator: true)
           else
             label

data/lib/para/version.rb

@@ -1,3 +1,3 @@
 module Para
-  VERSION = '0.8.11'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.9.0
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -152,16 +152,22 @@ dependencies:
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -334,16 +340,22 @@ dependencies:
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement