decidim-initiatives 0.19.1 → 0.23.0

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/types/decidim/initiatives/initiative_api_type.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    InitiativeApiType = GraphQL::ObjectType.define do
+      name "InitiativeType"
+      description "An initiative type"
+
+      field :id, !types.ID, "The internal ID for this initiative type"
+      field :title, Decidim::Core::TranslatedFieldType, "Initiative type name"
+      field :description, Decidim::Core::TranslatedFieldType, "This is the initiative type description"
+      field :createdAt, Decidim::Core::DateTimeType, "The date this initiative type was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The date this initiative type was updated", property: :updated_at
+      field :bannerImage, types.String, "Banner image", property: :banner_image
+      field :collectUserExtraFields, types.Boolean, "Collect participant personal data on signature", property: :collect_user_extra_fields
+      field :extraFieldsLegalInformation, types.String, "Legal information about the collection of personal data", property: :extra_fields_legal_information
+      field :minimumCommitteeMembers, types.Int, "Minimum of committee members", property: :minimum_committee_members
+      field :validateSmsCodeOnVotes, types.Boolean, "Add SMS code validation step to signature process", property: :validate_sms_code_on_votes
+      field :undoOnlineSignaturesEnabled, types.Boolean, "Enable participants to undo their online signatures", property: :undo_online_signatures_enabled
+      field :promotingComitteeEnabled, types.Boolean, "If promoting committee is enabled", property: :promoting_committee_enabled
+      field :signatureType, types.String, "Signature type of the initiative", property: :signature_type
+
+      field :initiatives, !types[Decidim::Initiatives::InitiativeType], "The initiatives that have this type"
+    end
+  end
+end

data/app/types/decidim/initiatives/initiative_committee_member_type.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # This type represents a initiative committee member.
+    InitiativeCommitteeMemberType = GraphQL::ObjectType.define do
+      name "InitiativeCommitteeMemberType"
+      description "A initiative committee member"
+
+      field :id, !types.ID, "Internal ID for this member of the committee"
+      field :user, Decidim::Core::UserType, "The decidim user for this initiative committee member"
+
+      field :state, types.Int, "Type of the committee member"
+      field :createdAt, Decidim::Core::DateTimeType, "The date this initiative committee member was created", property: :created_at
+      field :updatedAt, Decidim::Core::DateTimeType, "The date this initiative committee member was updated", property: :updated_at
+    end
+  end
+end

data/app/types/decidim/initiatives/initiative_type.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Initiatives
+    # This type represents a Initiative.
+    InitiativeType = GraphQL::ObjectType.define do
+      interfaces [
+        -> { Decidim::Core::ParticipatorySpaceInterface },
+        -> { Decidim::Core::ScopableInterface },
+        -> { Decidim::Core::AttachableInterface },
+        -> { Decidim::Core::AuthorInterface },
+        -> { Decidim::Initiatives::InitiativeTypeInterface }
+      ]
+
+      name "Initiative"
+      description "A initiative"
+
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this initiative."
+      field :slug, !types.String
+      field :hashtag, types.String, "The hashtag for this initiative"
+      field :createdAt, !Decidim::Core::DateTimeType, "The time this initiative was created", property: :created_at
+      field :updatedAt, !Decidim::Core::DateTimeType, "The time this initiative was updated", property: :updated_at
+      field :publishedAt, !Decidim::Core::DateTimeType, "The time this initiative was published", property: :published_at
+      field :reference, !types.String, "Reference prefix for this initiative"
+      field :state, types.String, "Current status of the initiative"
+      field :signatureType, types.String, "Signature type of the initiative", property: :signature_type
+      field :signatureStartDate, !Decidim::Core::DateType, "The signature start date", property: :signature_start_date
+      field :signatureEndDate, !Decidim::Core::DateType, "The signature end date", property: :signature_end_date
+      field :offlineVotes, types.Int, "The number of offline votes in this initiative", property: :offline_votes
+      field :initiativeVotesCount, types.Int, "The number of votes in this initiative", property: :initiative_votes_count
+      field :initiativeSupportsCount, types.Int, "The number of supports in this initiative", property: :initiative_supports_count
+
+      field :author, !Decidim::Core::AuthorInterface, "The initiative author" do
+        resolve lambda { |obj, _args, _ctx|
+          obj.user_group || obj.author
+        }
+      end
+
+      field :committeeMembers, types[Decidim::Initiatives::InitiativeCommitteeMemberType], property: :committee_members
+    end
+  end
+end

data/app/views/decidim/initiatives/admin/answers/_info_initiative.html.erb

@@ -17,7 +17,7 @@
       <strong><%= t ".state" %>: </strong> <%= I18n.t(initiative.state, scope: "decidim.initiatives.admin_states") %>
     </div>
     <div class="row column">
-      <strong><%= t ".initiative_votes_count" %>: </strong> <%= initiative.initiative_votes_count %>
+      <strong><%= t ".initiative_votes_count" %>: </strong> <%= initiative.online_votes_count %>
     </div>
   </div>
 </div>

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

@@ -3,6 +3,28 @@
     <h2 class="card-title"><%= t ".title" %></h2>
   </div>
 
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :editor, :description, toolbar: :full, lines: 8, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+    </div>
+
+    <div class="row column">
+      <div class="columns xlarge-6">
+        <%= form.text_field :hashtag, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".settings" %></h2>
+  </div>
+
   <div class="card-section">
     <div class="row">
       <div class="columns xlarge-6">
@@ -13,15 +35,8 @@
       </div>
     </div>
 
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
-    </div>
-
-    <div class="row column">
-      <%= form.translated :editor, :description, toolbar: :full, lines: 8, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
-    </div>
-
     <div class="row">
+      <% unless single_initiative_type? %>
       <div class="columns xlarge-6">
         <%= form.select :type_id,
                         initiative_type_options,
@@ -29,14 +44,14 @@
                         {
                           disabled: !@form.signature_type_updatable?,
                           "data-scope-selector": "initiative_decidim_scope_id",
-                          "data-scope-id": form.object.decidim_scope_id,
+                          "data-scope-id": form.object.decidim_scope_id.to_s,
                           "data-scope-search-url": decidim_initiatives.initiative_type_scopes_search_url,
                           "data-signature-types-selector": "initiative_signature_type",
                           "data-signature-type": current_initiative.signature_type,
                           "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,24 +69,54 @@
       </div>
     <% end %>
 
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.text_field :hashtag, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+    <% 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.select :signature_type, [], {}, { disabled: !@form.signature_type_updatable? } %>
       </div>
     </div>
 
-    <% if  current_initiative.accepts_offline_votes? && current_user.admin? %>
+    <% if current_initiative.accepts_offline_votes? && current_user.admin? %>
       <div class="row">
         <div class="columns xlarge-6">
-          <%= form.number_field :offline_votes, min: 1 %>
+          <% @form.offline_votes.each do |scope_id, (votes, scope_name)| %>
+            <%= label_tag "initiative_offline_votes_#{scope_id}", t("activemodel.attributes.initiative.offline_votes_for_scope", scope_name: translated_attribute(scope_name)) %>
+            <%= number_field_tag "initiative[offline_votes][#{scope_id}]", votes, min: 0, id: "initiative_offline_votes_#{scope_id}" %>
+          <% end %>
         </div>
       </div>
     <% end %>
   </div>
 </div>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".attachments" %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row">
+      <% 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>
+</div>
 
 <%= javascript_include_tag "decidim/initiatives/scoped_type" %>

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/export_pdf_signatures.pdf.erb

@@ -41,33 +41,36 @@
 <br>
 <div class="initiatives-votes-table" style="width: 100%; display: block; border: 1pt solid black;">
   <div class="initiatives-votes-table-header" style="background-color: lightgray; display: inline-block; width: 100%; font-size: 12pt; font-weight: bold; border-bottom: 1pt solid black;">
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.initiative_id", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.initiative_title", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.name_and_surname", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.document_number", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.date_of_birth", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.postal_code", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.time_and_date", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.timestamp", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.hash", scope: "decidim.admin") %>
     </div>
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+      <%= t("models.initiatives_votes.fields.scope", scope: "decidim.admin") %>
+    </div>
   </div>
   <% @votes.each do |vote| %>
     <%= cell "decidim/initiatives_votes/vote", vote %>

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

@@ -1,50 +1,13 @@
-<div class="filters row">
-  <div class="column medium-3">
-    <span class="dropdown-menu-inverted_label"><%= t(".filter_by") %> :</span>
-    <ul class="dropdown menu dropdown-inverted" data-dropdown-menu data-close-on-click-inside="false">
-      <li class="is-dropdown-submenu-parent">
-        <a href="#">
-          <% if @state.present? %>
-              <%= t(".filter.#{@state}") %>
-          <% else %>
-              <%= t(".filter.all") %>
-          <% end %>
-        </a>
-        <ul class="menu is-dropdown-submenu">
-          <li><%= link_to t(".filter.created"), url_for(state: "created", q: @query) %></li>
-          <li><%= link_to t(".filter.validating"), url_for(state: "validating", q: @query) %></li>
-          <li><%= link_to t(".filter.discarded"), url_for(state: "discarded", q: @query) %></li>
-          <li><%= link_to t(".filter.published"), url_for(state: "published", q: @query) %></li>
-          <li><%= link_to t(".filter.rejected"), url_for(state: "rejected", q: @query) %></li>
-          <li><%= link_to t(".filter.accepted"), url_for(state: "accepted", q: @query) %></li>
-          <li><%= link_to t(".filter.all"), url_for(q: @query) %></li>
-        </ul>
-      </li>
-    </ul>
-  </div>
-  <div class="column medium-4">
-    <%= form_tag "", method: :get do %>
-        <div class="filters__search">
-          <div class="input-group">
-            <%= search_field_tag :q, @query,label: false, class: "input-group-field", placeholder: t(".search") %>
-            <%= hidden_field_tag :state, @state %>
-            <div class="input-group-button">
-              <button type="submit" class="button button--muted">
-                <%= icon "magnifying-glass", aria_label: t(".search") %>
-              </button>
-            </div>
-          </div>
-        </div>
-    <% end %>
-  </div>
-</div>
-
-<div class="card" id="initiatives">
+<div class="card with-overflow" id="initiatives">
   <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(:initiatives) %>
   <div class="card-section">
     <div class="table-scroll">
       <table class="table-list">
@@ -53,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><%= t("models.initiatives.fields.created_at", 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>
@@ -73,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",
@@ -92,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 %>