decidim-assemblies 0.23.5 → 0.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2b886c349514104d6708e53a42e773ea634b719df96f236db3bf7ed1d41cc4d
-  data.tar.gz: fba8a685d7f34805f95fa241b7a4fdbbeeaeb5bbd146479d49d2bcffb451b178
+  metadata.gz: f1cdccdc43b87cca1180a3e753329bb0b99f74e55d57fe1d4d2e2550fdec0723
+  data.tar.gz: d03ca1b004aa6d853693201af27edb9b5759c68af86fd0f0a588b39be0a5f9ad
 SHA512:
-  metadata.gz: 51e58e11bdfae61a0afdda8f1f56d12315cb2aa6bdcacc86a71f02ffd30d959ca8862e5fc7765c665bdf67c4cd698b5b2fbe488dde0130c2fdbe872cfe88aa58
-  data.tar.gz: c243f7be5e48040946d0a0a85f3a266cfb79aff514a5f5ebb77332eb0ccb342a4105f351f9168b2dda60f95c2d11561805ff1f5712983da12c86d8af00bc17b8
+  metadata.gz: 9a9c07f3f332c9a6182e26cab5370c43674e2fa7400363732460e4e787b20fa5eb53d585ac896896996841a498fd3aa95c70599b522fd9e0f178689260c31ab4
+  data.tar.gz: 5d3531576102d1fa52c8226adfd7613319ad825f5e10af7153fbcc05ede1d5afc4ba9a513020dfd4e0e1b0af275764df06a92485510791672a07f7e500a6a60e

data/app/cells/decidim/assemblies/assembly_m_cell.rb

@@ -41,10 +41,12 @@ module Decidim
       end
 
       def children_count_status
+        # rubocop: disable Style/StringConcatenation
         content_tag(
           :strong,
           t("layouts.decidim.assemblies.index.children")
         ) + " " + children_assemblies_visible_for_user
+        # rubocop: enable Style/StringConcatenation
       end
 
       def children_assemblies_visible_for_user

data/app/cells/decidim/assemblies/statistic/show.erb

@@ -0,0 +1,9 @@
+<div class="space-stats__data">
+  <span class="space-stats__number">
+    <%= stat_number %>
+  </span>
+
+  <h4 class="space-stats__title">
+    <%= stat_title %>
+  </h4>
+</div>

data/app/cells/decidim/assemblies/statistic_cell.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This cell renders a Statistic of a Assemblies
+    class StatisticCell < Decidim::ViewModel
+      include ActionView::Helpers::NumberHelper
+
+      private
+
+      def stat_number
+        number_with_delimiter(model[:stat_number])
+      end
+
+      def stat_title
+        t(model[:stat_title], scope: "decidim.assemblies.statistics")
+      end
+    end
+  end
+end

data/app/cells/decidim/assemblies/statistics/show.erb

@@ -0,0 +1,17 @@
+<section class="row statistics" id="participatory_process-statistics">
+  <div class="columns large-8">
+    <div class="row column">
+      <h3 class="section-heading">
+        <%= stats_heading %>
+      </h3>
+
+      <div class="space-stats">
+        <% if model.present? %>
+          <%= cell("decidim/assemblies/statistic", collection: model) %>
+        <% else %>
+          <span class="muted"><%= no_stats %></span>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</section>

data/app/cells/decidim/assemblies/statistics_cell.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    # This cell renders the Statistics of an Assembly
+    class StatisticsCell < Decidim::ViewModel
+      private
+
+      def stats_heading
+        t("statistics.headline", scope: "decidim.assemblies")
+      end
+
+      def no_stats
+        t("statistics.no_stats", scope: "decidim.assemblies")
+      end
+    end
+  end
+end

data/app/commands/decidim/assemblies/admin/create_assembly.rb

@@ -45,6 +45,7 @@ module Decidim
             organization: form.current_organization,
             title: form.title,
             subtitle: form.subtitle,
+            weight: form.weight,
             slug: form.slug,
             hashtag: form.hashtag,
             description: form.description,

data/app/commands/decidim/assemblies/admin/update_assembly.rb

@@ -94,7 +94,8 @@ module Decidim
             facebook_handler: form.facebook_handler,
             instagram_handler: form.instagram_handler,
             youtube_handler: form.youtube_handler,
-            github_handler: form.github_handler
+            github_handler: form.github_handler,
+            weight: form.weight
           }.merge(uploader_attributes)
         end
 

data/app/controllers/decidim/assemblies/admin/imports_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      # This controller allows importing things.
+      # It is targeted for customizations for importing things that lives under
+      # an assembly.
+      class ImportsController < Decidim::Admin::ImportsController
+        include Concerns::AssemblyAdmin
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/admin/moderations/reports_controller.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      module Moderations
+        # This controller allows admins to manage moderation reports in an assembly.
+        class ReportsController < Decidim::Admin::Moderations::ReportsController
+          include Concerns::AssemblyAdmin
+        end
+      end
+    end
+  end
+end

data/app/controllers/decidim/assemblies/assemblies_controller.rb

@@ -77,7 +77,7 @@ module Decidim
       end
 
       def parent_assemblies
-        search.results.parent_assemblies.order(promoted: :desc)
+        search.results.parent_assemblies.order(weight: :asc, promoted: :desc)
       end
 
       def stats

data/app/forms/decidim/assemblies/admin/assembly_form.rb

@@ -45,6 +45,7 @@ module Decidim
         attribute :parent_id, Integer
         attribute :participatory_processes_ids, Array[Integer]
         attribute :scope_id, Integer
+        attribute :weight, Integer, default: 0
 
         attribute :is_transparent, Boolean
         attribute :promoted, Boolean
@@ -79,6 +80,8 @@ module Decidim
         validates :banner_image, passthru: { to: Decidim::Assembly }
         validates :hero_image, passthru: { to: Decidim::Assembly }
 
+        validates :weight, presence: true
+
         alias organization current_organization
 
         def ensure_parent_cannot_be_child

data/app/helpers/decidim/assemblies/admin/assemblies_admin_menu_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Assemblies
+    module Admin
+      module AssembliesAdminMenuHelper
+        include Decidim::Admin::SidebarMenuHelper
+
+        def admin_assemblies_menu
+          @admin_assemblies_menu ||= sidebar_menu(:admin_assemblies_menu)
+        end
+      end
+    end
+  end
+end

data/app/models/decidim/assembly.rb

@@ -67,7 +67,7 @@ module Decidim
     has_many :components, as: :participatory_space, dependent: :destroy
 
     has_many :children, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :parent, dependent: :destroy
-    belongs_to :parent, foreign_key: "parent_id", class_name: "Decidim::Assembly", inverse_of: :children, optional: true, counter_cache: :children_count
+    belongs_to :parent, class_name: "Decidim::Assembly", inverse_of: :children, optional: true, counter_cache: :children_count
 
     validates_upload :hero_image
     mount_uploader :hero_image, Decidim::HeroImageUploader
@@ -215,9 +215,9 @@ module Decidim
     # rubocop:disable Rails/SkipsModelValidations
     def update_children_paths
       self.class.where(
-        ["#{self.class.table_name}.parents_path <@ :old_path AND #{self.class.table_name}.id != :id", old_path: parents_path_before_last_save, id: id]
+        ["#{self.class.table_name}.parents_path <@ :old_path AND #{self.class.table_name}.id != :id", { old_path: parents_path_before_last_save, id: id }]
       ).update_all(
-        ["parents_path = :new_path || subpath(parents_path, nlevel(:old_path))", new_path: parents_path, old_path: parents_path_before_last_save]
+        ["parents_path = :new_path || subpath(parents_path, nlevel(:old_path))", { new_path: parents_path, old_path: parents_path_before_last_save }]
       )
     end
     # rubocop:enable Rails/SkipsModelValidations

data/app/presenters/decidim/assemblies/assembly_stats_presenter.rb

@@ -2,46 +2,56 @@
 
 module Decidim
   module Assemblies
-    # A presenter to render statistics in the homepage.
+    # A presenter to render statistics in an Assembly.
     class AssemblyStatsPresenter < Rectify::Presenter
       attribute :assembly, Decidim::Assembly
-      include IconHelper
+      include Decidim::IconHelper
 
-      # Public: Render a collection of primary stats.
-      def highlighted
-        highlighted_stats = component_stats(priority: StatsRegistry::HIGH_PRIORITY)
-        highlighted_stats = highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
+      # Public: returns a collection of stats (Hash) for the Assembly Home.
+      def collection
+        highlighted_stats = assembly_participants_stats
+        highlighted_stats.concat(assembly_followers_stats(priority: StatsRegistry::HIGH_PRIORITY))
+        highlighted_stats.concat(component_stats(priority: StatsRegistry::HIGH_PRIORITY))
+        highlighted_stats.concat(component_stats(priority: StatsRegistry::MEDIUM_PRIORITY))
         highlighted_stats = highlighted_stats.reject(&:empty?)
-        highlighted_stats = highlighted_stats.reject { |_manifest, _name, data| data.zero? }
-        grouped_highlighted_stats = highlighted_stats.group_by { |stats| stats.first.name }
-
-        safe_join(
-          grouped_highlighted_stats.map do |_manifest_name, stats|
-            content_tag :div, class: "process_stats-item" do
-              safe_join(
-                stats.each_with_index.map do |stat, index|
-                  render_stats_data(stat[0], stat[1], stat[2], index)
-                end
-              )
+        highlighted_stats = highlighted_stats.reject { |_stat_manifest, _stat_title, stat_number| stat_number.zero? }
+        grouped_highlighted_stats = highlighted_stats.group_by(&:first)
+
+        statistics = []
+        grouped_highlighted_stats.each do |_manifest_name, stats|
+          stats.each_with_index.each do |stat, _index|
+            stat.each_with_index.map do |_item, subindex|
+              next unless (subindex % 3).zero?
+              next if stat[subindex + 2].zero?
+
+              statistics << { stat_title: stat[subindex + 1], stat_number: stat[subindex + 2] }
             end
           end
-        )
+        end
+        statistics
       end
 
       private
 
+      def assembly_participants_stats
+        Decidim.stats.only([:participants_count]).with_context(assembly)
+               .map { |stat_title, stat_number| [assembly.manifest.name, stat_title, stat_number] }
+      end
+
       def component_stats(conditions)
         Decidim.component_manifests.map do |component_manifest|
-          component_manifest.stats.filter(conditions).with_context(published_components).map { |name, data| [component_manifest, name, data] }.flatten
+          component_manifest.stats.except([:proposals_accepted])
+                            .filter(conditions)
+                            .with_context(published_components)
+                            .map { |stat_title, stat_number| [component_manifest.name, stat_title, stat_number] }.flatten
         end
       end
 
-      def render_stats_data(component_manifest, name, data, index)
-        safe_join([
-                    index.zero? ? manifest_icon(component_manifest, role: "img", "aria-hidden": true) : " /&nbsp".html_safe,
-                    content_tag(:span, "#{number_with_delimiter(data)} " + I18n.t(name, scope: "decidim.assemblies.statistics"),
-                                class: "#{name} process_stats-text")
-                  ])
+      def assembly_followers_stats(conditions)
+        Decidim.stats.only([:followers_count])
+               .filter(conditions)
+               .with_context(assembly)
+               .map { |stat_title, stat_number| [assembly.manifest.name, stat_title, stat_number] }
       end
 
       def published_components

data/app/queries/decidim/assemblies/organization_assemblies.rb

@@ -9,7 +9,7 @@ module Decidim
       end
 
       def query
-        Decidim::Assembly.where(organization: @organization)
+        Decidim::Assembly.where(organization: @organization).order(weight: :asc)
       end
     end
   end

data/app/queries/decidim/assemblies/organization_published_assemblies.rb

@@ -14,7 +14,7 @@ module Decidim
           OrganizationAssemblies.new(@organization),
           PublishedAssemblies.new,
           VisibleAssemblies.new(@user)
-        ).query
+        ).query.order(weight: :asc)
       end
     end
   end

data/app/serializers/decidim/assemblies/assembly_serializer.rb

@@ -22,6 +22,7 @@ module Decidim
           decidim_organization_id: assembly.decidim_organization_id,
           title: assembly.title,
           subtitle: assembly.subtitle,
+          weight: assembly.weight,
           short_description: assembly.short_description,
           description: assembly.description,
           remote_hero_image_url: Decidim::Assemblies::AssemblyPresenter.new(assembly).hero_image_url,

data/app/views/decidim/assemblies/admin/assemblies/_form.html.erb

@@ -14,6 +14,10 @@
       <%= form.translated :text_field, :subtitle %>
     </div>
 
+    <div class="row column">
+      <%= form.number_field :weight %>
+    </div>
+
     <div class="row">
       <div class="columns xlarge-6 slug">
         <%= form.text_field :slug %>

data/app/views/decidim/assemblies/admin/assemblies/index.html.erb

@@ -65,7 +65,7 @@
                 <% end %>
               </td>
               <td>
-                <%= l(assembly.creation_date, format: :decidim_short) if assembly.creation_date %>
+                <%= l(assembly.created_at, format: :short) %>
               </td>
               <td class="table-list__state">
                 <% if assembly.private_space? %>
@@ -84,14 +84,20 @@
               <td class="table-list__actions">
                 <% if allowed_to? :create, :assembly, assembly: assembly %>
                   <%= icon_link_to "data-transfer-download", assembly_export_path(assembly), t("actions.export", scope: "decidim.admin"), method: :post, class: "action-icon--export" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :create, :assembly, assembly: assembly %>
                   <%= icon_link_to "clipboard", new_assembly_copy_path(assembly), t("actions.duplicate", scope: "decidim.admin"), class: "action-icon--copy" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :update, :assembly, assembly: assembly %>
                   <%= icon_link_to "pencil", edit_assembly_path(assembly), t("actions.configure", scope: "decidim.admin"), class: "action-icon--new" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if assembly.children.count.positive? || allowed_to?(:create, :assembly) %>
@@ -99,10 +105,14 @@
                       url_for(query_params_with(parent_id_eq: assembly.id)),
                       t("decidim.admin.titles.assemblies"),
                       class: "action-icon--dial #{'highlighted' if assembly.children.count.positive?}" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
 
                 <% if allowed_to? :preview, :assembly, assembly: assembly %>
                   <%= icon_link_to "eye", decidim_assemblies.assembly_path(assembly), t("actions.preview", scope: "decidim.admin"), class: "action-icon--preview" %>
+                <% else %>
+                  <span class="action-space icon"></span>
                 <% end %>
               </td>
             </tr>

data/app/views/decidim/assemblies/admin/assemblies_types/index.html.erb

@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <%= t "decidim.admin.titles.assemblies_types" %>
       <%= link_to t("actions.new_assembly_type", scope: "decidim.admin"),
-                  ["new", "assemblies_type"],
+                  [:new, :assemblies_type],
                   class: "button tiny button--title" if allowed_to? :create, :assembly_type %>
     </h2>
   </div>

data/app/views/decidim/assemblies/assemblies/show.html.erb

@@ -214,7 +214,7 @@ edit_link(
   </div>
 
   <% if current_participatory_space.show_statistics? %>
-    <%= render partial: "statistics" %>
+    <%= cell "decidim/assemblies/statistics", stats.collection %>
   <% end %>
 </div>
 

data/app/views/layouts/decidim/admin/assemblies.html.erb

@@ -1,23 +1,5 @@
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav secondary-nav--subnav">
-    <ul>
-      <% if allowed_to?(:read, :assembly_list) %>
-        <li <% if is_active_link?(decidim_admin_assemblies.assemblies_path) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.assemblies", scope: "decidim.admin"), decidim_admin_assemblies.assemblies_path %>
-        </li>
-      <% end %>
-      <% if allowed_to?(:manage, :assemblies_type) %>
-        <li <% if is_active_link?(decidim_admin_assemblies.assemblies_types_path) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.assemblies_types", scope: "decidim.admin"), decidim_admin_assemblies.assemblies_types_path %>
-        </li>
-      <% end %>
-      <% if allowed_to?(:read, :assemblies_setting) %>
-        <li <% if is_active_link?(decidim_admin_assemblies.edit_assemblies_settings_path) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to I18n.t("menu.assemblies_settings", scope: "decidim.admin"), decidim_admin_assemblies.edit_assemblies_settings_path %>
-        </li>
-      <% end %>
-    </ul>
-  </div>
+<% content_for :sidebar_menu_nav do %>
+  <%= admin_assemblies_menu.render %>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>

data/app/views/layouts/decidim/admin/assembly.html.erb

@@ -13,7 +13,7 @@
           <ul id="components-list">
             <% current_participatory_space.components.each do |component| %>
               <% if component.manifest.admin_engine && user_role_config.component_is_accessible?(component.manifest_name) %>
-                <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_assemblies.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_assemblies.edit_component_permissions_path(current_participatory_space, component)) %> class="is-active" <% end %>>
+                <li <% if is_active_link?(manage_component_path(component)) || is_active_link?(decidim_admin_assemblies.edit_component_path(current_participatory_space, component)) || is_active_link?(decidim_admin_assemblies.edit_component_permissions_path(current_participatory_space, component)) || participatory_space_active_link?(component) %> class="is-active" <% end %>>
                   <%= link_to manage_component_path(component) do %>
                     <%= translated_attribute component.name %>
                     <% if component.primary_stat.present? %>
@@ -68,6 +68,7 @@
           <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.moderations_path(current_participatory_space) %>
         </li>
       <% end %>
+      <%= Decidim::Admin.view_hooks.render(:admin_secondary_nav, deep_dup) %>
     </ul>
   </div>
 <% end %>