decidim-assemblies 0.24.3 → 0.25.0.rc1

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

@@ -3,22 +3,12 @@
 module Decidim
   module Assemblies
     class AssemblyPresenter < SimpleDelegator
-      include Rails.application.routes.mounted_helpers
-      include ActionView::Helpers::UrlHelper
-
-      delegate :url, to: :hero_image, prefix: true
-      delegate :url, to: :banner_image, prefix: true
-
       def hero_image_url
-        return if assembly.hero_image.blank?
-
-        URI.join(decidim.root_url(host: assembly.organization.host), assembly.hero_image_url).to_s
+        assembly.attached_uploader(:hero_image).url(host: assembly.organization.host)
       end
 
       def banner_image_url
-        return if assembly.banner_image.blank?
-
-        URI.join(decidim.root_url(host: assembly.organization.host), assembly.banner_image_url).to_s
+        assembly.attached_uploader(:banner_image).url(host: assembly.organization.host)
       end
 
       def assembly

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

@@ -3,7 +3,7 @@
 module Decidim
   module Assemblies
     # A presenter to render statistics in an Assembly.
-    class AssemblyStatsPresenter < Rectify::Presenter
+    class AssemblyStatsPresenter < Decidim::StatsPresenter
       attribute :assembly, Decidim::Assembly
       include Decidim::IconHelper
 
@@ -13,22 +13,12 @@ module Decidim
         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.concat(comments_stats(:assemblies))
         highlighted_stats = highlighted_stats.reject(&:empty?)
         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
+        statistics(grouped_highlighted_stats)
       end
 
       private

data/app/queries/decidim/assemblies/admin/admin_users.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Assemblies
     module Admin
-      # A class used to find the admins for an assembly.
+      # A class used to find the admins for an assembly or an organization assemblies.
       class AdminUsers < Rectify::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
@@ -12,33 +12,46 @@ module Decidim
           new(assembly).query
         end
 
+        # Syntactic sugar to initialize the class and return the queried objects.
+        #
+        # organization - an organization that needs to find its assembly admins
+        def self.for_organization(organization)
+          new(nil, organization).query
+        end
+
         # Initializes the class.
         #
         # assembly - an assembly that needs to find its assembly admins
-        def initialize(assembly)
+        # organization - an organization that needs to find its assembly admins
+        def initialize(assembly, organization = nil)
           @assembly = assembly
+          @organization = assembly&.organization || organization
         end
 
         # Finds organization admins and the users with role admin for the given assembly.
         #
         # Returns an ActiveRecord::Relation.
         def query
-          Decidim::User.where(id: organization_admins).or(assembly_user_admins)
+          organization.admins.or(assemblies_user_admins)
         end
 
         private
 
-        attr_reader :assembly
+        attr_reader :assembly, :organization
 
-        def organization_admins
-          assembly.organization.admins
+        def assemblies_user_admins
+          Decidim::User.where(
+            id: Decidim::AssemblyUserRole.where(assembly: assemblies, role: :admin)
+                                         .select(:decidim_user_id)
+          )
         end
 
-        def assembly_user_admins
-          assembly_user_admin_ids = Decidim::AssemblyUserRole
-                                    .where(assembly: assembly, role: :admin)
-                                    .pluck(:decidim_user_id)
-          Decidim::User.where(id: assembly_user_admin_ids)
+        def assemblies
+          if assembly
+            [assembly]
+          else
+            Decidim::Assembly.where(organization: organization)
+          end
         end
       end
     end

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

@@ -58,7 +58,8 @@ module Decidim
             youtube_handler: attributes["youtube_handler"],
             github_handler: attributes["github_handler"],
             created_by: attributes["created_by"],
-            meta_scope: attributes["meta_scope"]
+            meta_scope: attributes["meta_scope"],
+            announcement: attributes["announcement"]
           )
           @imported_assembly.remote_hero_image_url = attributes["remote_hero_image_url"] if remote_file_exists?(attributes["remote_hero_image_url"])
           @imported_assembly.remote_banner_image_url = attributes["remote_banner_image_url"] if remote_file_exists?(attributes["remote_banner_image_url"])
@@ -115,7 +116,7 @@ module Decidim
               content_type: file_tmp.content_type,
               attached_to: @imported_assembly,
               weight: file["weight"],
-              file: form.file, # Define attached_to before this
+              file: file_tmp, # Define attached_to before this
               file_size: file_tmp.size
             )
             attachment.create_attachment_collection(file["attachment_collection"])

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

@@ -72,13 +72,15 @@ module Decidim
             attachment_collections: serialize_attachment_collections,
             files: serialize_attachments
           },
-          components: serialize_components
+          components: serialize_components,
+          announcement: assembly.announcement
         }
       end
 
       private
 
       attr_reader :assembly
+      alias resource assembly
 
       def serialize_categories
         return unless assembly.categories.first_class.any?
@@ -141,7 +143,7 @@ module Decidim
 
       def serialize_components
         serializer = Decidim::Exporters::ParticipatorySpaceComponentsSerializer.new(@assembly)
-        serializer.serialize
+        serializer.run
       end
     end
   end

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

@@ -1,5 +1,3 @@
-<%= javascript_include_tag "decidim/slug_form" %>
-
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title"><%= t(".title") %></h2>
@@ -50,6 +48,11 @@
     <div class="row column">
       <%= form.translated :editor, :internal_organisation %>
     </div>
+
+    <div class="row column">
+      <%= form.translated :editor, :announcement %>
+      <p class="help-text"><%== t(".announcement_help") %></p>
+    </div>
   </div>
 
   <div class="card-divider">
@@ -236,4 +239,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/assemblies/admin/assemblies" %>
+<%= javascript_pack_tag "decidim_assemblies_admin" %>

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

@@ -1,4 +1,4 @@
-<%= javascript_include_tag "decidim/slug_form" %>
+<%= javascript_pack_tag "decidim_assemblies_admin" %>
 
 <div class="card" id="assemblies">
   <div class="card-divider">

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

@@ -1,4 +1,4 @@
-<%= javascript_include_tag "decidim/slug_form" %>
+<%= javascript_pack_tag "decidim_assemblies_admin" %>
 
 <div class="card" id="assemblies">
   <div class="card-divider">

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

@@ -16,7 +16,7 @@
       </div>
 
       <div class="row column user-fields--user-picker">
-        <% prompt_options = { url: decidim_admin.users_organization_url, placeholder: t(".select_user") } %>
+        <% prompt_options = { url: decidim_admin.user_entities_organization_url, placeholder: t(".select_user") } %>
         <%= form.autocomplete_select(:user_id, form.object.user.presence,  { multiple: false }, prompt_options) do |user|
           { value: user.id, label: "#{user.name} (@#{user.nickname})" }
         end %>
@@ -63,4 +63,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/assemblies/admin/assembly_members" %>
+<%= javascript_pack_tag "decidim_assemblies_admin" %>

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

@@ -13,7 +13,7 @@
     </div>
     <div class="columns mediumlarge-8 large-6 card--process__column">
       <div class="card--full__image"
-           style="background-image:url(<%= promoted_assembly.hero_image.url %>)">
+           style="background-image:url(<%= promoted_assembly.attached_uploader(:hero_image).path %>)">
         <div class="card__content row collapse">
           <div class="large-6 large-offset-6 columns">
             <%= link_to assembly_path(promoted_assembly), class: "button expanded button--sc" do %>

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

@@ -29,5 +29,5 @@ edit_link(
     </section>
   <% end %>
 <% end %>
-<%= javascript_include_tag "decidim/filters" %>
-<%= javascript_include_tag "decidim/assemblies/orgchart" %>
+
+<%= javascript_pack_tag "decidim_assemblies" %>

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

@@ -1,5 +1,5 @@
 <% add_decidim_meta_tags({
-  image_url: current_participatory_space.hero_image.url,
+  image_url: current_participatory_space.attached_uploader(:hero_image).path,
   description: translated_attribute(current_participatory_space.short_description),
   url: assembly_url(current_participatory_space),
   twitter_handler: current_organization.twitter_handler
@@ -21,6 +21,8 @@ edit_link(
              locals: { text: t("private_space", scope: "decidim.assemblies.show") } %>
 <% end %>
 
+<%= cell("decidim/announcement", current_participatory_space.announcement) %>
+
 <div class="row column">
   <% if current_participatory_space.parent.present? %>
     <div class="row">
@@ -87,7 +89,7 @@ edit_link(
         <section id="assemblies-grid" class="section row collapse">
           <h3 class="section-heading"><%= t("children", scope: "decidim.assemblies.show") %></h3>
           <div class="row small-up-1 medium-up-2 large-up-2 card-grid">
-            <%= render partial: "decidim/assemblies/assembly", collection: current_participatory_space.children.visible_for(current_user).published %>
+            <%= render partial: "decidim/assemblies/assembly", collection: current_participatory_space.children.visible_for(current_user).published.order(weight: :asc) %>
           </div>
         </section>
       <% end %>
@@ -214,8 +216,8 @@ edit_link(
   </div>
 
   <% if current_participatory_space.show_statistics? %>
-    <%= cell "decidim/assemblies/statistics", stats.collection %>
+    <%= cell "decidim/statistics", stats.collection %>
   <% end %>
 </div>
 
-<%= javascript_include_tag "decidim/assemblies/assemblies" %>
+<%= javascript_pack_tag "decidim_assemblies" %>

data/app/views/layouts/decidim/_assembly_header.html.erb

@@ -1,7 +1,7 @@
 <div class="process-header">
   <div class="process-header__inner">
     <div class="row column process-header__main"
-        style="background-image:url(<%= current_participatory_space.banner_image.url %>);">
+        style="background-image:url(<%= current_participatory_space.attached_uploader(:banner_image).path %>);">
     </div>
     <div class="process-header__container row collapse column">
       <div class="columns mediumlarge-8 process-header__info">

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

@@ -1,5 +1,5 @@
 <% content_for :sidebar_menu_nav do %>
-  <%= admin_assemblies_menu.render %>
+  <%= sidebar_menu(:admin_assemblies_menu).render %>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>

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

@@ -1,76 +1,7 @@
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav secondary-nav--subnav">
-    <ul>
-      <%= public_page_link decidim_assemblies.assembly_path(current_participatory_space) %>
-      <% if allowed_to? :update, :assembly, assembly: current_participatory_space %>
-        <li <% if is_active_link?(decidim_admin_assemblies.edit_assembly_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("info", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.edit_assembly_path(current_participatory_space) %>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :component, assembly: current_participatory_space %>
-        <li <% if is_active_link?(decidim_admin_assemblies.components_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("components", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.components_path(current_participatory_space) %>
-          <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)) || 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? %>
-                      <span class="component-counter <%= "component-counter--off" if component.primary_stat.zero? %>"><%= component.primary_stat %></span>
-                    <% end %>
-                  <% end %>
-                </li>
-              <% end %>
-            <% end %>
-          </ul>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :category, assembly: current_participatory_space %>
-        <li <% if is_active_link?(decidim_admin_assemblies.categories_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("categories", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.categories_path(current_participatory_space) %>
-        </li>
-      <% end %>
-      <% if allowed_to?(:read, :attachment_collection, assembly: current_participatory_space) || allowed_to?(:read, :attachment, assembly: current_participatory_space) %>
-        <li>
-          <span class="secondary-nav__subtitle"><%= t("attachments", scope: "decidim.admin.menu.assemblies_submenu") %></span>
-          <ul>
-            <% if allowed_to? :read, :attachment_collection, assembly: current_participatory_space %>
-              <li <% if is_active_link?(decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space)) %> class="is-active" <% end %>>
-                <%= aria_selected_link_to t("attachment_collections", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_attachment_collections_path(current_participatory_space) %>
-              </li>
-            <% end %>
-            <% if allowed_to? :read, :attachment, assembly: current_participatory_space %>
-              <li <% if is_active_link?(decidim_admin_assemblies.assembly_attachments_path(current_participatory_space)) %> class="is-active" <% end %>>
-                <%= aria_selected_link_to t("attachment_files", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_attachments_path(current_participatory_space) %>
-              </li>
-            <% end %>
-          </ul>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :assembly_member, assembly: current_participatory_space %>
-        <li <% if is_active_link?(decidim_admin_assemblies.assembly_members_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("assembly_members", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_members_path(current_participatory_space) %>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :assembly_user_role, assembly: current_participatory_space %>
-        <li <% if is_active_link?(decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("assembly_admins", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.assembly_user_roles_path(current_participatory_space) %>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :space_private_user, assembly: current_participatory_space %>
-        <li <% if is_active_link?(decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("private_users", scope: "decidim.admin.menu.assemblies_submenu"), decidim_admin_assemblies.participatory_space_private_users_path(current_participatory_space) %>
-        </li>
-      <% end %>
-      <% if allowed_to? :read, :moderation, assembly: current_participatory_space %>
-        <li <% if is_active_link?(decidim_admin_assemblies.moderations_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= 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>
+<% content_for :sidebar_menu_nav do %>
+  <%= sidebar_menu(:admin_assembly_menu).render do
+    public_page_link decidim_assemblies.assembly_path(current_participatory_space)
+  end %>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>

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

@@ -1,7 +1,7 @@
 <% add_decidim_page_title(translated_attribute(current_component.name)) if try(:current_component) %>
 <% add_decidim_page_title(translated_attribute(current_participatory_space.title)) %>
 <% add_decidim_meta_tags(
-  image_url: current_participatory_space.banner_image.url,
+  image_url: current_participatory_space.attached_uploader(:banner_image).path,
   description: translated_attribute(current_participatory_space.short_description),
 ) %>
 
@@ -22,4 +22,4 @@
   <% end %>
 <% end %>
 
-<% provide :meta_image_url, current_participatory_space.banner_image.url %>
+<% provide :meta_image_url, current_participatory_space.attached_uploader(:banner_image).path %>

data/config/assets.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+base_path = File.expand_path("..", __dir__)
+
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Webpacker.register_entrypoints(
+  decidim_assemblies: "#{base_path}/app/packs/entrypoints/decidim_assemblies.js",
+  decidim_assemblies_admin: "#{base_path}/app/packs/entrypoints/decidim_assemblies_admin.js"
+)

data/config/locales/ar.yml

@@ -347,23 +347,6 @@ ar:
         scope: نطاق
         social_networks: شبكات التواصل الاجتماعي
         target: من يشارك
-      statistics:
-        answers_count: أجوبة
-        assemblies_count: الجمعيات
-        comments_count: تعليقات
-        debates_count: مناقشات
-        endorsements_count: موافقات
-        meetings_count: اجتماعات
-        orders_count: تأييدات
-        pages_count: صفحات
-        participants_count: مشارك
-        projects_count: مشاريع
-        proposals_count: اقتراحات
-        results_count: نتائج
-        supports_count: تأييدات
-        surveys_count: دراسات استقصائية
-        users_count: مشارك
-        votes_count: الدعم
     assembly_members:
       assembly_member:
         designated_on: المعينة على

data/config/locales/ca.yml

@@ -52,7 +52,7 @@ ca:
         target: Qui participa
         title: Títol
         twitter: Twitter
-        weight: Pes
+        weight: Ordre de posició
         youtube: YouTube
       assembly_member:
         birthday: Aniversari
@@ -262,6 +262,7 @@ ca:
       admin:
         assemblies:
           form:
+            announcement_help: El text que introdueixis aquí es mostrarà a la participant just a sota de la informació de l'assemblea.
             duration: Durada
             duration_help: Si la durada d'aquesta assemblea és limitada, selecciona la data de finalització. En cas contrari, apareixerà com a indefinida.
             filters: Filtres
@@ -381,38 +382,11 @@ ca:
         social_networks: Xarxes socials
         social_networks_title: Compartir aquesta assemblea a
         target: Qui participa
-      statistics:
-        answers_count: Respostes
-        assemblies_count: Assemblees
-        comments_count: Comentaris
-        debates_count: Debats
-        endorsements_count: Adhesions
-        followers_count: Seguidors
-        headline: Estadístiques
-        meetings_count: Trobades
-        no_stats: Encara no hi ha estadístiques.
-        orders_count: Suports
-        pages_count: Pàgines
-        participants_count: Participants
-        posts_count: Publicacions
-        processes_count: Processos
-        projects_count: Projectes
-        proposals_count: Propostes
-        results_count: Resultats
-        supports_count: Suports
-        surveys_count: Enquestes
-        users_count: Participants
-        votes_count: Suports
     assembly_members:
       assembly_member:
         designated_on: Designat a
       index:
         title: Membres
-    conferences:
-      pages:
-        home:
-          highlighted_conferences:
-            conferences_button_title: Enllaç a la pàgina de Jornades mostrant totes les jornades
     events:
       assemblies:
         create_assembly_member:
@@ -445,19 +419,11 @@ ca:
         description: Nombre d'assemblees creades
         object: assemblees
         title: Assemblees
-    pages:
-      home:
-        hero:
-          participate_title: Participa als processos de la plataforma
-        sub_hero:
-          register_title: Registra't
     participatory_processes:
-      pages:
-        home:
-          highlighted_processes:
-            processes_button_title: Enllaç a la pàgina de Processos mostrant tots els processos
       show:
         related_assemblies: Assemblees relacionades
+    statistics:
+      assemblies_count: Assemblees
   errors:
     messages:
       cannot_be_blank: no es pot estar en blanc