decidim-initiatives 0.21.0 → 0.22.0

data/app/permissions/decidim/initiatives/permissions.rb

@@ -18,16 +18,18 @@ module Decidim
         list_public_initiatives?
         read_public_initiative?
         search_initiative_types_and_scopes?
+        request_membership?
 
         return permission_action unless user
 
         create_initiative?
-        request_membership?
 
         vote_initiative?
         sign_initiative?
         unvote_initiative?
 
+        initiative_attachment?
+
         permission_action
       end
 
@@ -37,6 +39,10 @@ module Decidim
         @initiative ||= context.fetch(:initiative, nil) || context.fetch(:current_participatory_space, nil)
       end
 
+      def initiative_type
+        @initiative_type ||= context[:initiative_type]
+      end
+
       def list_public_initiatives?
         allow! if permission_action.subject == :initiative &&
                   permission_action.action == :list
@@ -78,16 +84,28 @@ module Decidim
         return unless permission_action.subject == :initiative &&
                       permission_action.action == :request_membership
 
-        can_request = !initiative.published? &&
-                      initiative.promoting_committee_enabled? &&
-                      !initiative.has_authorship?(user) &&
-                      (
-                        Decidim::Initiatives.do_not_require_authorization ||
-                        UserAuthorizations.for(user).any? ||
-                        Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
-                      )
+        toggle_allow(can_request_membership?)
+      end
+
+      def can_request_membership?
+        return access_request_without_user? if user.blank?
+
+        access_request_membership?
+      end
 
-        toggle_allow(can_request)
+      def access_request_without_user?
+        !initiative.published? && initiative.promoting_committee_enabled? || Decidim::Initiatives.do_not_require_authorization
+      end
+
+      def access_request_membership?
+        !initiative.published? &&
+          initiative.promoting_committee_enabled? &&
+          !initiative.has_authorship?(user) &&
+          (
+            Decidim::Initiatives.do_not_require_authorization ||
+            UserAuthorizations.for(user).any? ||
+            Decidim::UserGroups::ManageableUserGroups.for(user).verified.any?
+          )
       end
 
       def has_initiatives?
@@ -131,6 +149,13 @@ module Decidim
         toggle_allow(can_unvote)
       end
 
+      def initiative_attachment?
+        return unless permission_action.action == :add_attachment &&
+                      permission_action.subject == :initiative
+
+        toggle_allow(initiative_type.attachments_enabled?)
+      end
+
       def public_report_content_action?
         return unless permission_action.action == :create &&
                       permission_action.subject == :moderation

data/app/serializers/decidim/initiatives/initiative_serializer.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    class InitiativeSerializer < Decidim::Exporters::Serializer
+      # Serializes an inititative
+      def serialize
+        {
+          id: resource.id,
+          title: resource.title,
+          description: resource.description,
+          state: resource.state,
+          created_at: resource.created_at,
+          published_at: resource.published_at,
+          signature_end_date: resource.signature_end_date,
+          signature_type: resource.signature_type,
+          signatures: resource.supports_count,
+          scope: {
+            name: resource.scope&.name
+          },
+          type: {
+            title: resource.type&.title
+          },
+          authors: {
+            id: resource.author_users.map(&:id),
+            name: resource.author_users.map(&:name)
+          }
+        }
+      end
+    end
+  end
+end

data/app/services/decidim/initiatives/diff_renderer.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    class DiffRenderer < BaseDiffRenderer
+      private
+
+      # Lists which attributes will be diffable and how they should be rendered.
+      def attribute_types
+        {
+          description: :i18n_html,
+          title: :i18n,
+          state: :string
+        }
+      end
+    end
+  end
+end

data/app/services/decidim/initiatives/initiative_search.rb

@@ -16,7 +16,9 @@ module Decidim
       def base_query
         Decidim::Initiative
           .includes(scoped_type: [:scope])
+          .joins("JOIN decidim_users ON decidim_users.id = decidim_initiatives.decidim_author_id")
           .where(organization: options[:organization])
+          .published
       end
 
       # Handle the search_text filter
@@ -29,22 +31,38 @@ module Decidim
               "%#{search_text}%"
             )
           )
+          .or(
+            query.where(
+              "cast(decidim_initiatives.id as text) ILIKE ?", "%#{search_text}%"
+            )
+          )
+          .or(
+            query.where(
+              "decidim_users.name ILIKE ? OR decidim_users.nickname ILIKE ?", "%#{search_text}%", "%#{search_text}%"
+            )
+          )
       end
 
       # Handle the state filter
       def search_state
-        case state
-        when "closed"
-          query.closed
-        else # Assume open
-          query.open
-        end
+        accepted = state.member?("accepted") ? query.accepted : nil
+        rejected = state.member?("rejected") ? query.rejected : nil
+        answered = state.member?("answered") ? query.answered : nil
+        open = state.member?("open") ? query.open : nil
+        closed = state.member?("closed") ? query.closed : nil
+
+        query
+          .where(id: accepted)
+          .or(query.where(id: rejected))
+          .or(query.where(id: answered))
+          .or(query.where(id: open))
+          .or(query.where(id: closed))
       end
 
-      def search_type
-        return query if type == "all"
+      def search_type_id
+        return query if type_ids.include?("all")
 
-        types = InitiativesTypeScope.where(decidim_initiatives_types_id: type).pluck(:id)
+        types = InitiativesTypeScope.where(decidim_initiatives_types_id: type_ids).pluck(:id)
 
         query.where(scoped_type: types)
       end
@@ -58,13 +76,39 @@ module Decidim
       end
 
       def search_scope_id
-        return if scope_id.nil?
+        return query if scope_ids.include?("all")
 
-        query
-          .joins(:scoped_type)
-          .where(
-            "decidim_initiatives_type_scopes.decidim_scopes_id": scope_id
-          )
+        clean_scope_ids = scope_ids
+
+        conditions = []
+        conditions << "decidim_initiatives_type_scopes.decidim_scopes_id IS NULL" if clean_scope_ids.delete("global")
+        conditions.concat(["? = ANY(decidim_scopes.part_of)"] * clean_scope_ids.count) if clean_scope_ids.any?
+
+        query.joins(:scoped_type).references(:decidim_scopes).where(conditions.join(" OR "), *clean_scope_ids.map(&:to_i))
+      end
+
+      def search_area_id
+        return query if area_ids.include?("all")
+
+        query.where(decidim_area_id: area_ids)
+      end
+
+      private
+
+      # Private: Returns an array with checked type ids.
+      def type_ids
+        [type_id].flatten
+      end
+
+      # Private: Returns an array with checked scope ids.
+      def scope_ids
+        [scope_id].flatten
+      end
+
+      # Private: Returns an array with checked area ids, handling area_types which are coded as its
+      # areas ids joined by _.
+      def area_ids
+        area_id.map { |id| id.split("_") }.flatten.uniq
       end
     end
   end

data/app/services/decidim/initiatives/status_change_notifier.rb

@@ -38,12 +38,11 @@ module Decidim
           .deliver_later
       end
 
+      # Does nothing
       def notify_validating_initiative
-        initiative.organization.admins.each do |user|
-          Decidim::Initiatives::InitiativesMailer
-            .notify_validating_request(initiative, user)
-            .deliver_later
-        end
+        # It has been moved into SendInitiativeToTechnicalValidation command as a standard notification
+        # It would be great to move the functionality of this class, which is invoked on Initiative#after_save,
+        # to the corresponding commands to follow the architecture of Decidim.
       end
 
       def notify_validating_result

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

@@ -0,0 +1,8 @@
+<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">
+  <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>
+    <% end %>
+  </ul>
+</div>

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

@@ -22,6 +22,7 @@
     </div>
 
     <div class="row">
+      <% unless single_initiative_type? %>
       <div class="columns xlarge-6">
         <%= form.select :type_id,
                         initiative_type_options,
@@ -36,7 +37,7 @@
                           "data-signature-types-search-url": decidim_initiatives.initiative_type_signature_types_search_url
                         } %>
       </div>
-
+      <% end %>
       <div class="columns xlarge-6">
         <%= form.select :decidim_scope_id, [], {}, { disabled: !@form.signature_type_updatable? } %>
       </div>
@@ -54,6 +55,24 @@
       </div>
     <% end %>
 
+    <% if can_edit_custom_signature_end_date?(current_initiative) %>
+      <div class="row column">
+        <%= form.date_field :signature_end_date, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+      </div>
+    <% end %>
+
+    <% if current_initiative.area_enabled? %>
+      <div class="field">
+        <%= form.areas_select :area_id,
+                              areas_for_select(current_organization),
+                              {
+                                selected: current_initiative.decidim_area_id,
+                                include_blank: current_initiative.decidim_area_id.blank? || current_initiative.created?
+                              },
+                              disabled: !@form.area_updatable? %>
+      </div>
+    <% end %>
+
     <div class="row">
       <div class="columns xlarge-6">
         <%= form.text_field :hashtag, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
@@ -71,6 +90,10 @@
         </div>
       </div>
     <% end %>
+
+    <% if allowed_to?(:read, :attachment, initiative: current_participatory_space) %>
+      <%= render partial: "initiative_attachments", locals: { current_initiative: current_initiative, current_participatory_space: current_participatory_space } %>
+    <% end %>
   </div>
 </div>
 

data/app/views/decidim/initiatives/admin/initiatives/_initiative_attachments.erb

@@ -0,0 +1,43 @@
+<div class="row column">
+  <div class="columns xlarge-12">
+    <% if current_initiative.documents.any? %>
+      <div class="row column">
+        <strong><%= t ".documents" %>:</strong>
+        <ul id="documents">
+          <% current_initiative.documents.each do |document| %>
+            <li>
+              <%= link_to translated_attribute(document.title), document.url %>
+              <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
+            </li>
+          <% end %>
+        </ul>
+      </div>
+    <% end %>
+
+    <% if current_initiative.photos.any? %>
+      <div class="row column">
+        <strong><%= t(".photos") %>:</strong>
+        <div id="photos" class="gallery row">
+          <% current_initiative.photos.each do |photo| %>
+            <%= link_to photo.big_url, target: "_blank", rel: "noopener" do %>
+              <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: strip_tags(translated_attribute(photo.title)) %>
+            <% end %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+  <div class="columns xlarge-12">
+    <% if allowed_to?(:update, :initiative, initiative: current_initiative) %>
+      <%= aria_selected_link_to t(".edit"),
+                                decidim_admin_initiatives.initiative_attachments_path(current_participatory_space),
+                                class: "button" %>
+      <%= aria_selected_link_to t(".new"),
+                                decidim_admin_initiatives.new_initiative_attachment_path(current_participatory_space),
+                                class: "button" %>
+    <% else %>
+      <%= link_to t(".edit"), "#", class: "button muted disabled" %>
+      <%= link_to t(".new"), "#", class: "button muted disabled" %>
+    <% end %>
+  </div>
+</div>

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

@@ -2,9 +2,12 @@
   <div class="card-divider">
     <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 %>
+      </div>
     </h2>
   </div>
-  <%= admin_filter_selector %>
+  <%= admin_filter_selector(:initiatives) %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
@@ -13,8 +16,9 @@
             <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><%= t("models.initiatives.fields.supports_count", 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>
@@ -33,6 +37,7 @@
             <td><%= humanize_admin_state initiative.state %></td>
             <td><%= initiative.supports_count %>/<%= initiative.scoped_type.supports_required %></td>
             <td><%= l initiative.created_at, format: :short %></td>
+            <td><%= initiative.published_at? ? l(initiative.published_at, format: :short) : "" %></td>
             <td class="table-list__actions">
               <% if allowed_to? :preview, :initiative, initiative: initiative %>
                 <%= icon_link_to "eye",
@@ -52,7 +57,7 @@
               <% if allowed_to?(:answer, :initiative, initiative: initiative) %>
                 <%= icon_link_to "comment-square", edit_initiative_answer_path(initiative.slug), t("actions.answer", scope: "decidim.initiatives"), class: "action-icon action-icon--answer" %>
               <% else %>
-                <%= icon "comment-square", scope: "decidim.admin", class: "action-icon action-icon--disabled" %>
+                <%= icon "comment-square", scope: "decidim.admin", class: "action-icon action-icon--disabled", role: "img", "aria-hidden": true %>
               <% end %>
 
               <% if allowed_to? :read, :initiative, initiative: initiative %>

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

@@ -16,10 +16,22 @@
       <%= form.select :signature_type, form.object.signature_type_options %>
     </div>
 
+    <div class="row column">
+      <%= form.check_box :attachments_enabled %>
+    </div>
+
     <div class="row column">
       <%= form.check_box :undo_online_signatures_enabled %>
     </div>
 
+    <div class="row column">
+      <%= form.check_box :custom_signature_end_date_enabled %>
+    </div>
+
+    <div class="row column">
+      <%= form.check_box :area_enabled %>
+    </div>
+
     <div class="row column" id="promoting-committee-details">
       <%= form.check_box :promoting_committee_enabled %>
 

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

@@ -1,6 +1,6 @@
 <% content_for :back_link do %>
   <%= link_to :back do %>
-    <%= icon "chevron-left", class: "icon--small" %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
     <%= t(".back") %>
   <% end %>
 <% end %>
@@ -19,14 +19,15 @@
     <div class="card">
       <div class="card__content">
         <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form new_initiative_form" }) do |f| %>
+          <%= form_required_explanation %>
           <%= f.hidden_field :type_id %>
           <div class=section>
-            <div class="field">
-              <label for="type_description">
-                <%= t ".initiative_type" %>
+            <% unless single_initiative_type? %>
+              <div class="field">
+                <label for="type_description"><%= t ".initiative_type" %></label>
                 <%= text_field_tag :type_description, strip_tags(translated_attribute(initiative_type.title)), readonly: true %>
-              </label>
-            </div>
+              </div>
+            <% end %>
 
             <div class="field">
               <%= f.text_field :title, autofocus: true, required: true %>
@@ -50,18 +51,51 @@
             <% else %>
               <div class="field">
                 <%= f.select :scope_id,
-                            scopes.map { |scope| [translated_attribute(scope.scope_name), scope&.scope&.id]},
-                            prompt: t(".select_scope") %>
+                             scopes.map { |scope| [translated_attribute(scope.scope_name), scope&.scope&.id] },
+                             include_blank: t(".select_scope") %>
+              </div>
+            <% end %>
+
+            <% if initiative_type.custom_signature_end_date_enabled? %>
+              <div class="field">
+                <%= f.date_field :signature_end_date %>
+              </div>
+            <% end %>
+
+            <% if initiative_type.area_enabled? %>
+              <div class="field">
+                <%= f.areas_select :area_id, areas_for_select(current_organization), prompt: t(".select_area") %>
               </div>
             <% end %>
 
             <% if Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
               <div class="field">
                 <%= f.select :decidim_user_group_id,
-                             Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map{ |g| [g.name, g.id] },
-                             prompt: current_user.name %>
+                             Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.map { |g| [g.name, g.id] },
+                             include_blank: current_user.name %>
               </div>
             <% end %>
+
+            <fieldset>
+              <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
+              <%= f.fields_for :attachment, @form.attachment do |nested_form| %>
+                <div class="field">
+                  <%= nested_form.text_field :title %>
+                </div>
+
+                <div class="field">
+                  <%= nested_form.upload :file, optional: false %>
+                </div>
+
+                <% if @form.errors[:attachment].present? %>
+                  <% @form.errors[:attachment].each do |message| %>
+                    <small class="form-error is-visible">
+                      <%= message %>
+                    </small>
+                  <% end %>
+                <% end %>
+              <% end %>
+            </fieldset>
           </div>
           <div class="actions">
             <%= f.submit t(".continue"), class: "button expanded", data: { disable_with: true } %>