decidim-initiatives 0.24.0 → 0.25.0.rc1

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

@@ -3,7 +3,7 @@
 module Decidim
   module Initiatives
     module Admin
-      # A class used to find the admins for an initiative.
+      # A class used to find the admins for an initiative or an organization initiatives.
       class AdminUsers < Rectify::Query
         # Syntactic sugar to initialize the class and return the queried objects.
         #
@@ -12,27 +12,32 @@ module Decidim
           new(initiative).query
         end
 
+        # Syntactic sugar to initialize the class and return the queried objects.
+        #
+        # organization - an organization that needs to find its initiative admins
+        def self.for_organization(organization)
+          new(nil, organization).query
+        end
+
         # Initializes the class.
         #
         # initiative - Decidim::Initiative
-        def initialize(initiative)
+        # organization - an organization that needs to find its initiative admins
+        def initialize(initiative, organization = nil)
           @initiative = initiative
+          @organization = initiative&.organization || organization
         end
 
         # Finds organization admins and the users with role admin for the given initiative.
         #
         # Returns an ActiveRecord::Relation.
         def query
-          Decidim::User.where(id: organization_admins)
+          organization.admins
         end
 
         private
 
-        attr_reader :initiative
-
-        def organization_admins
-          initiative.organization.admins
-        end
+        attr_reader :initiative, :organization
       end
     end
   end

data/app/views/decidim/initiatives/admin/committee_requests/index.html.erb

@@ -63,4 +63,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/initiatives/admin/invite_users.js" %>
+<%= javascript_pack_tag "decidim_initiatives_admin" %>

data/app/views/decidim/initiatives/admin/exports/_dropdown.html.erb

@@ -1,8 +1,24 @@
-<span class="exports dropdown tiny button button--simple" data-toggle="export-dropdown"><%= t "actions.export", scope: "decidim.admin" %></span>
-<div class="dropdown-pane" id="export-dropdown" data-dropdown data-position=bottom data-alignment=right data-auto-focus="true" data-close-on-click="true">
+<span class="exports dropdown tiny button button--simple" data-toggle="<%= dropdown_id(collection_ids) %>">
+  <% if collection_ids.present? %>
+    <%= t("actions.export-selection", scope: "decidim.admin") %>
+    <% else %>
+        <%= t("actions.export", scope: "decidim.admin") %>
+    <% end %>
+</span>
+<div class="dropdown-pane"
+     id="<%= dropdown_id(collection_ids) %>"
+     data-dropdown
+     data-position=bottom
+     data-alignment=right
+     data-auto-focus="true"
+     data-close-on-click="true">
   <ul class="vertical menu add-components">
     <% %w{CSV JSON}.each do |format| %>
-      <li class="exports--format--<%= format.downcase %> exports--initiatives"><%= link_to t("decidim.admin.exports.export_as", name: t("decidim.initiatives.admin.exports.initiatives"), export_format: format.upcase), export_initiatives_path(format: format) %></li>
+      <li class="exports--format--<%= format.downcase %> exports--initiatives">
+        <%= link_to t("decidim.admin.exports.export_as", name: t("decidim.initiatives.admin.exports.initiatives"),
+                      export_format: format.upcase),
+                    export_initiatives_path(format: format, collection_ids: collection_ids) %>
+      </li>
     <% end %>
   </ul>
 </div>

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

@@ -119,4 +119,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/initiatives/scoped_type" %>
+<%= javascript_pack_tag "decidim_initiatives_admin" %>

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

@@ -3,7 +3,9 @@
     <h2 class="card-title">
       <%= t "decidim.admin.titles.initiatives" %>
       <div class="button--title">
-        <%= render partial: "decidim/initiatives/admin/exports/dropdown" if allowed_to? :export, :initiatives %>
+        <% if allowed_to? :export, :initiatives %>
+          <%= export_dropdowns(query) %>
+        <% end %>
       </div>
     </h2>
   </div>
@@ -12,18 +14,18 @@
     <div class="table-scroll">
       <table class="table-list">
         <thead>
-          <tr>
-            <th><%= t("models.initiatives.fields.id", scope: "decidim.admin") %></th>
-            <th><%= t("models.initiatives.fields.title", scope: "decidim.admin") %></th>
-            <th><%= t("models.initiatives.fields.state", scope: "decidim.admin") %></th>
-            <th><%= sort_link(query, :supports_count, t("models.initiatives.fields.supports_count", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :created_at, t("models.initiatives.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th><%= sort_link(query, :published_at, t("models.initiatives.fields.published_at", scope: "decidim.admin"), default_order: :desc) %></th>
-            <th class="actions"><%= t ".actions_title" %></th>
-          </tr>
+        <tr>
+          <th><%= t("models.initiatives.fields.id", scope: "decidim.admin") %></th>
+          <th><%= t("models.initiatives.fields.title", scope: "decidim.admin") %></th>
+          <th><%= t("models.initiatives.fields.state", scope: "decidim.admin") %></th>
+          <th><%= sort_link(query, :supports_count, t("models.initiatives.fields.supports_count", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :created_at, t("models.initiatives.fields.created_at", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th><%= sort_link(query, :published_at, t("models.initiatives.fields.published_at", scope: "decidim.admin"), default_order: :desc) %></th>
+          <th class="actions"><%= t ".actions_title" %></th>
+        </tr>
         </thead>
         <tbody>
-          <% @initiatives.each do |initiative| %>
+        <% @initiatives.each do |initiative| %>
           <tr>
             <td><%= initiative.id %></td>
             <td>
@@ -46,7 +48,7 @@
                                  class: "action-icon--preview",
                                  target: "_blank" %>
               <% else %>
-               <span class="action-space icon"></span>
+                <span class="action-space icon"></span>
               <% end %>
 
               <% if allowed_to? :edit, :initiative, initiative: initiative %>
@@ -55,7 +57,7 @@
                                  t("actions.configure", scope: "decidim.admin"),
                                  class: "action-icon--edit" %>
               <% else %>
-               <span class="action-space icon"></span>
+                <span class="action-space icon"></span>
               <% end %>
 
               <% if allowed_to?(:answer, :initiative, initiative: initiative) %>
@@ -72,8 +74,9 @@
               <% else %>
                 <span class="action-space icon"></span>
               <% end %>
+              <%= free_resource_permissions_link(initiative) || content_tag(:span, nil, class: "action-space icon") %>
             </td>
-          <% end %>
+        <% end %>
         </tbody>
       </table>
       <%= paginate @initiatives, theme: "decidim" %>

data/app/views/decidim/initiatives/admin/initiatives/show.html.erb

@@ -177,4 +177,4 @@ rectificació, cancel·lació i oposició, tal com estableix l'article 5 de l'es
 </p>
 
 <a href="#" onclick="window.print();return false;" class="button expanded"><%= t ".print" %></a>
-<%= stylesheet_link_tag "decidim/initiatives/print-initiative", media: "all" %>
+<%= stylesheet_pack_tag "decidim_initiatives_print", media: "all" %>

data/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb

@@ -98,4 +98,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/initiatives/admin/initiatives_types.js" %>
+<%= javascript_pack_tag "decidim_initiatives_admin" %>

data/app/views/decidim/initiatives/admin/initiatives_types/index.html.erb

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

data/app/views/decidim/initiatives/committee_requests/new.html.erb

@@ -1,5 +1,5 @@
 <% add_decidim_meta_tags({
-                             image_url: current_initiative.type.banner_image.url,
+                             image_url: current_initiative.type.attached_uploader(:banner_image).path,
                              description: translated_attribute(current_initiative.description),
                              title: translated_attribute(current_initiative.title),
                              url: initiative_url(current_initiative.id),
@@ -7,7 +7,7 @@
                          }) %>
 
 <% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
-<% provide :meta_image_url, current_initiative.type.banner_image.url %>
+<% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).path %>
 
 <br><br>
 <div class="row column">

data/app/views/decidim/initiatives/create_initiative/_share_committee_link.html.erb

@@ -21,4 +21,4 @@
   <%= link_to t(".continue"), next_wizard_path, class: "button expanded" %>
 </div>
 
-<%= javascript_include_tag "decidim/initiatives/admin/invite_users.js" %>
+<%= javascript_pack_tag "decidim_initiatives_admin" %>

data/app/views/decidim/initiatives/initiatives/_author.html.erb

@@ -2,7 +2,7 @@
   <div class="author-data__main ">
     <div class="author author--inline">
       <span class="author__avatar author__avatar--small">
-        <%= image_tag initiative.author_avatar_url, alt: t("avatar", scope: "activemodel.attributes.group") %>
+        <%= image_tag present(initiative.author).avatar_url, alt: t("decidim.author.avatar", name: decidim_sanitize(initiative.author_name)) %>
       </span>
       <span class="author__name">
         <% if initiative.author.deleted? %>
@@ -10,7 +10,7 @@
             <%= t(".deleted") %>
           </span>
         <% else %>
-          <%= initiative.author_name %>
+          <%= decidim_sanitize(initiative.author_name) %>
         <% end %>
       </span>
     </div>
@@ -19,10 +19,10 @@
       <% unless m.user.deleted? %>
         <div class="author author--inline">
           <span class="author__avatar author__avatar--small">
-            <%= image_tag m.user.avatar_url %>
+            <%= image_tag present(m.user).avatar_url %>
           </span>
           <span class="author__name">
-            <%= m.user.name %>
+            <%= decidim_sanitize(m.user.name) %>
           </span>
         </div>
       <% end %>

data/app/views/decidim/initiatives/initiatives/_committee_members.html.erb

@@ -70,4 +70,4 @@
   </div>
 </fieldset>
 
-<%= javascript_include_tag "decidim/initiatives/admin/invite_users.js" %>
+<%= javascript_pack_tag "decidim_initiatives_admin" %>

data/app/views/decidim/initiatives/initiatives/_filters.html.erb

@@ -2,7 +2,7 @@
   <div class="filters__section">
     <div class="filters__search">
       <div class="input-group">
-        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search") %>
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search") %>
         <div class="input-group-button">
           <button type="submit" class="button">
             <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>

data/app/views/decidim/initiatives/initiatives/_form.html.erb

@@ -70,7 +70,7 @@
     <% if @form.photos.any? %>
       <% @form.photos.each do |photo| %>
         <div class="callout gallery__item" data-closable>
-          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.file.filename %>
+          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.filename %>
           <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
           <button class="close-button"
                   aria-label="<%= t("delete_attachment", scope: "decidim.initiatives.form") %>"
@@ -109,4 +109,4 @@
   <%= render partial: "committee_members" %>
 <% end %>
 
-<%= javascript_include_tag "decidim/initiatives/scoped_type" %>
+<%= javascript_pack_tag "decidim_initiatives" %>

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

@@ -27,6 +27,3 @@ edit_link(
     </div>
   </div>
 <% end %>
-
-<%= javascript_include_tag "decidim/filters" %>
-<%= javascript_include_tag "decidim/results_listing" %>

data/app/views/decidim/initiatives/initiatives/print.html.erb

@@ -153,4 +153,4 @@
 </p>
 
 <a href="#" onclick="window.print();return false;" class="button expanded"><%= t ".print" %></a>
-<%= stylesheet_link_tag "decidim/initiatives/print-initiative", media: "all" %>
+<%= stylesheet_pack_tag "decidim_initiatives_print", media: "all" %>

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

@@ -1,5 +1,5 @@
 <% add_decidim_meta_tags({
-  image_url: current_initiative.type.banner_image.url,
+  image_url: current_initiative.type.attached_uploader(:banner_image).path,
   description: translated_attribute(current_initiative.description),
   title: translated_attribute(current_initiative.title),
   url: initiative_url(current_initiative.id),
@@ -18,7 +18,7 @@ edit_link(
 <%= participatory_space_floating_help %>
 
 <% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
-<% provide :meta_image_url, current_initiative.type.banner_image.url %>
+<% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).path %>
 <div class="row">
   <% unless current_initiative.online_signature_type? %>
     <div class="column">

data/app/views/layouts/decidim/_initiative_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.type.banner_image.url %>);">
+        style="background-image:url(<%= current_participatory_space.type.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/initiative.html.erb

@@ -1,54 +1,7 @@
-<% content_for :secondary_nav do %>
-  <div class="secondary-nav secondary-nav--subnav">
-    <ul>
-      <%= public_page_link decidim_initiatives.initiative_path(current_participatory_space) %>
-      <% if allowed_to? :edit, :initiative, initiative: current_participatory_space %>
-        <li <% if is_active_link?(decidim_admin_initiatives.edit_initiative_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t(".information"), decidim_admin_initiatives.edit_initiative_path(current_participatory_space) %>
-        </li>
-      <% end %>
-
-      <% if current_participatory_space.promoting_committee_enabled? && allowed_to?(:manage_membership, :initiative, initiative: current_participatory_space) %>
-        <li <% if is_active_link?(decidim_admin_initiatives.initiative_committee_requests_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t(".committee_members"), decidim_admin_initiatives.initiative_committee_requests_path(current_participatory_space) %>
-        </li>
-      <% end %>
-
-      <% if allowed_to? :read, :component, initiative: current_participatory_space %>
-        <li <% if is_active_link?(decidim_admin_initiatives.components_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t(".components"), decidim_admin_initiatives.components_path(current_participatory_space) %>
-          <ul>
-            <% current_participatory_space.components.each do |component| %>
-              <% if component.manifest.admin_engine %>
-                <li <% if is_active_link?(manage_component_path(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, :attachment, initiative: current_participatory_space %>
-        <li <% if is_active_link?(decidim_admin_initiatives.initiative_attachments_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t(".attachments"), decidim_admin_initiatives.initiative_attachments_path(current_participatory_space) %>
-        </li>
-      <% end %>
-
-      <% if allowed_to? :read, :moderation %>
-        <li <% if is_active_link?(decidim_admin_initiatives.moderations_path(current_participatory_space)) %> class="is-active" <% end %>>
-          <%= aria_selected_link_to t("moderations", scope: "decidim.admin.menu.participatory_processes_submenu"), decidim_admin_initiatives.moderations_path(current_participatory_space) %>
-        </li>
-      <% end %>
-    </ul>
-  </div>
+<% content_for :sidebar_menu_nav do %>
+  <%= sidebar_menu(:admin_initiative_menu).render do
+    public_page_link decidim_initiatives.initiative_path(current_participatory_space)
+  end %>
 <% end %>
 
 <%= render "layouts/decidim/admin/application" do %>

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

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

data/app/views/layouts/decidim/admin/initiatives_votes.pdf.erb

@@ -3,7 +3,7 @@
   <head>
       <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
       <meta name="viewport" content="width=device-width">
-      <%= wicked_pdf_stylesheet_link_tag "decidim/initiatives/initiatives-votes" %>
+      <%= wicked_pdf_stylesheet_pack_tag "decidim_initiatives_initiatives_votes" %>
     </head>
   <body>
     <%= yield %>

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

@@ -14,5 +14,5 @@
       </div>
     </div>
   <% end %>
-  <%= javascript_include_tag "decidim/initiatives/application" %>
+  <%= javascript_pack_tag "decidim_initiatives" %>
 <% end %>

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

@@ -8,5 +8,5 @@
     <div class="columns large-3"></div>
   </div>
   </div>
-  <%= javascript_include_tag "decidim/initiatives/application" %>
+  <%= javascript_pack_tag "decidim_initiatives" %>
 <% end %>

data/config/assets.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+base_path = File.expand_path("..", __dir__)
+
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Webpacker.register_entrypoints(
+  decidim_initiatives: "#{base_path}/app/packs/entrypoints/decidim_initiatives.js",
+  decidim_initiatives_admin: "#{base_path}/app/packs/entrypoints/decidim_initiatives_admin.js",
+  decidim_initiatives_print: "#{base_path}/app/packs/entrypoints/decidim_initiatives_print.js",
+  decidim_initiatives_initiatives_votes: "#{base_path}/app/packs/entrypoints/decidim_initiatives_initiatives_votes.js"
+)
+Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/initiatives/initiatives")

data/config/locales/ar.yml

@@ -66,6 +66,8 @@ ar:
       actions:
         new_initiative_type: نوع المبادرة الجديدة
       menu:
+        components: المكونات
+        information: معلومات
         initiatives: المبادرات
         initiatives_types: أنواع المبادرة
       models:
@@ -439,11 +441,6 @@ ar:
           vote: إشارة
   layouts:
     decidim:
-      admin:
-        initiative:
-          committee_members: أعضاء اللجنة
-          components: المكونات
-          information: معلومات
       initiative_creation_header:
         back: الى الخلف
         fill_data: إنشاء

data/config/locales/ca.yml

@@ -85,8 +85,13 @@ ca:
         search_placeholder:
           title_or_description_or_id_string_or_author_name_or_author_nickname_cont: Cercar %{collection} per títol, descripció, ID o autoria.
       menu:
+        attachments: Adjunts
+        committee_members: Membres de la comissió
+        components: Components
+        information: Informació
         initiatives: Iniciatives
         initiatives_types: Tipus d'iniciatives
+        moderations: Moderacions
       models:
         initiatives:
           fields:
@@ -580,12 +585,6 @@ ca:
           vote: Signar
   layouts:
     decidim:
-      admin:
-        initiative:
-          attachments: Adjunts
-          committee_members: Membres del comitè
-          components: Components
-          information: Informació
       initiative_creation_header:
         back: Tornar
         fill_data: Crear