decidim-proposals 0.28.3 → 0.29.0.rc1

data/app/packs/src/decidim/proposals/admin/proposals.js

@@ -2,6 +2,8 @@
 /* eslint no-unused-vars: 0 */
 /* eslint id-length: ["error", { "exceptions": ["e"] }] */
 
+import TomSelect from "tom-select/dist/cjs/tom-select.popular";
+
 $(() => {
   const selectedProposalsCount = function() {
     return $(".table-list .js-check-all-proposal:checked").length
@@ -16,6 +18,8 @@ $(() => {
     const selectedProposalsNotPublishedAnswer = selectedProposalsNotPublishedAnswerCount();
     if (selectedProposals === 0) {
       $("#js-selected-proposals-count").text("")
+      $("#js-assign-proposals-to-valuator-actions").addClass("hide");
+      $("#js-unassign-proposals-from-valuator-actions").addClass("hide");
     } else {
       $("#js-selected-proposals-count").text(selectedProposals);
     }
@@ -65,7 +69,7 @@ $(() => {
     $(".js-bulk-action-form").addClass("hide");
   }
 
-  // Expose functions to make them avaialble in .js.erb templates
+  // Expose functions to make them available in .js.erb templates
   window.selectedProposalsCount = selectedProposalsCount;
   window.selectedProposalsNotPublishedAnswerCount = selectedProposalsNotPublishedAnswerCount;
   window.selectedProposalsCountUpdate = selectedProposalsCountUpdate;
@@ -80,20 +84,36 @@ $(() => {
     hideBulkActionForms();
     $("#js-bulk-actions-button").addClass("hide");
 
-    $("#js-bulk-actions-dropdown ul li button").click(function(e) {
-      e.preventDefault();
+    $("#js-bulk-actions-dropdown ul li button").click(function (e) {
+      $("#js-bulk-actions-dropdown").removeClass("is-open");
+      hideBulkActionForms();
+
       let action = $(e.target).data("action");
+      const panelActions = [
+        "assign-proposals-to-valuator",
+        "unassign-proposals-from-valuator"
+      ];
 
-      if (action) {
-        $(`#js-form-${action}`).submit(function() {
-          $(".layout-content > .callout-wrapper").html("");
-        })
+      if (!action) {
+        return;
+      }
+
+      if (panelActions.includes(action)) {
+        $(`#js-form-${action}`).submit(function () {
+          $(".layout-content > div[data-callout-wrapper]").html("");
+        });
+
+        $(`#js-${action}-actions`).removeClass("hide");
+      } else {
+        $(`#js-form-${action}`).submit(function () {
+          $(".layout-content > div[data-callout-wrapper]").html("");
+        });
 
         $(`#js-${action}-actions`).removeClass("hide");
         hideBulkActionsButton(true);
         hideOtherActionsButtons();
       }
-    })
+    });
 
     // select all checkboxes
     $(".js-check-all").change(function() {
@@ -148,3 +168,18 @@ $(() => {
     });
   }
 });
+
+document.addEventListener("DOMContentLoaded", () => {
+  const valuatorMultiselectContainers = document.querySelectorAll(
+    ".js-valuator-multiselect"
+  );
+
+  valuatorMultiselectContainers.forEach((container) => {
+    const config = {
+      plugins: ["remove_button", "dropdown_input"],
+      allowEmptyOption: true
+    };
+
+    return new TomSelect(container, config);
+  });
+});

data/app/packs/stylesheets/decidim/proposals/proposals.scss

@@ -24,7 +24,7 @@
 
   &__aside {
     &-vote {
-      @apply flex flex-row-reverse md:flex-col gap-4 items-center md:items-stretch justify-between first:[&>*]:grow last:[&>*]:w-1/4 md:last:[&>*]:w-auto;
+      @apply flex flex-row-reverse md:flex-col gap-4 items-center md:items-stretch justify-around md:last:[&>*]:w-auto;
     }
   }
 
@@ -77,6 +77,44 @@
   }
 }
 
+#proposals {
+  .view-layout__links {
+    @apply flex gap-4 items-center;
+
+    svg {
+      @apply inline-block w-5 h-5;
+
+      &.view-icon--disabled {
+        @apply fill-gray;
+      }
+    }
+  }
+}
+
+.card {
+  &__proposal-placeholder-g {
+    @apply w-full h-full fill-primary;
+
+    g {
+      path {
+        @apply fill-primary;
+      }
+    }
+  }
+
+  &__grid-text-title {
+    @apply flex justify-between flex-row md:flex-col md:items-start lg:flex-row lg:items-center;
+
+    .label {
+      @apply md:mt-2;
+    }
+  }
+
+  &__list-metadata {
+    @apply md:flex md:flex-row md:items-center md:gap-4;
+  }
+}
+
 /* overwrite tom-select defaults */
 .ts {
   &-control {

data/app/permissions/decidim/proposals/admin/permissions.rb

@@ -13,9 +13,9 @@ module Decidim
             if valuator_assigned_to_proposal?
               can_create_proposal_note?
               can_create_proposal_answer?
+              can_assign_valuator_to_proposal?
             end
             can_export_proposals?
-            valuator_can_unassign_valuator_from_proposals?
 
             return permission_action
           end
@@ -49,7 +49,7 @@ module Decidim
           allow! if permission_action.subject == :proposals && permission_action.action == :split
 
           # Every user allowed by the space can assign proposals to a valuator
-          allow! if permission_action.subject == :proposals && permission_action.action == :assign_to_valuator
+          can_assign_valuator_to_proposal?
 
           # Every user allowed by the space can unassign a valuator from proposals
           can_unassign_valuator_from_proposals?
@@ -62,11 +62,23 @@ module Decidim
             allow!
           end
 
+          if permission_action.subject == :proposal_state
+            if permission_action.action == :destroy
+              toggle_allow(proposal_state.proposals.empty?)
+            else
+              allow!
+            end
+          end
+
           permission_action
         end
 
         private
 
+        def proposal_state
+          @state ||= context.fetch(:proposal_state, nil)
+        end
+
         def proposal
           @proposal ||= context.fetch(:proposal, nil)
         end
@@ -137,8 +149,8 @@ module Decidim
           allow! if permission_action.subject == :proposals && permission_action.action == :unassign_from_valuator
         end
 
-        def valuator_can_unassign_valuator_from_proposals?
-          can_unassign_valuator_from_proposals? if user == context.fetch(:valuator, nil)
+        def can_assign_valuator_to_proposal?
+          allow! if permission_action.subject == :proposals && permission_action.action == :assign_to_valuator
         end
 
         def can_export_proposals?

data/app/presenters/decidim/proposals/admin_log/proposal_state_presenter.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module AdminLog
+      class ProposalStatePresenter < Decidim::Log::BasePresenter
+        private
+
+        def diff_fields_mapping
+          {
+            title: :i18n,
+            default: :boolean,
+            token: :string,
+            description: :i18n,
+            css_class: :string
+          }
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/proposals/proposal_presenter.rb

@@ -69,10 +69,10 @@ module Decidim
           version_state_published = state_published_change.last.present? if state_published_change
 
           if version_state_published
-            version.changeset["state"] = pending_state_change if pending_state_change
+            version.changeset["decidim_proposals_proposal_state_id"] = parsed_state_change(*pending_state_change) if pending_state_change
             pending_state_change = nil
-          elsif version.changeset["state"]
-            pending_state_change = version.changeset.delete("state")
+          elsif version.changeset["decidim_proposals_proposal_state_id"]
+            pending_state_change = version.changeset.delete("decidim_proposals_proposal_state_id")
           end
 
           next if version.event == "update" && Decidim::Proposals::DiffRenderer.new(version).diff.empty?
@@ -86,6 +86,15 @@ module Decidim
       def resource_manifest
         proposal.class.resource_manifest
       end
+
+      private
+
+      def parsed_state_change(old_state, new_state)
+        [
+          translated_attribute(Decidim::Proposals::ProposalState.find_by(id: old_state)&.title),
+          translated_attribute(Decidim::Proposals::ProposalState.find_by(id: new_state)&.title)
+        ]
+      end
     end
   end
 end

data/app/queries/decidim/proposals/metrics/endorsements_metric_manage.rb

@@ -29,7 +29,7 @@ module Decidim
           return @query if @query
 
           components = Decidim::Component.where(participatory_space: retrieve_participatory_spaces).published
-          proposals = Decidim::Proposals::Proposal.where(component: components).except_withdrawn
+          proposals = Decidim::Proposals::Proposal.where(component: components).not_withdrawn
           join_components = "INNER JOIN decidim_components ON decidim_components.manifest_name = 'proposals' AND proposals.decidim_component_id = decidim_components.id"
           join_categories = <<~EOJOINCATS
             LEFT OUTER JOIN decidim_categorizations

data/app/queries/decidim/proposals/metrics/proposal_followers_metric_measure.rb

@@ -46,7 +46,7 @@ module Decidim
         end
 
         def retrieve_proposals
-          Decidim::Proposals::Proposal.where(component: @resource).except_withdrawn
+          Decidim::Proposals::Proposal.where(component: @resource).not_withdrawn
         end
 
         def retrieve_collaborative_drafts

data/app/queries/decidim/proposals/metrics/proposal_participants_metric_measure.rb

@@ -5,7 +5,7 @@ module Decidim
     module Metrics
       # Searches for Participants in the following actions
       #  - Create a proposal (Proposals)
-      #  - Give support to a proposal (Proposals)
+      #  - Vote to a proposal (Proposals)
       #  - Endorse (Proposals)
       class ProposalParticipantsMetricMeasure < Decidim::MetricMeasure
         def valid?
@@ -16,12 +16,12 @@ module Decidim
           cumulative_users = []
           cumulative_users |= retrieve_votes.pluck(:decidim_author_id)
           cumulative_users |= retrieve_endorsements.pluck(:decidim_author_id)
-          cumulative_users |= retrieve_proposals.pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguosity must be called this way
+          cumulative_users |= retrieve_proposals.pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguousness must be called this way
 
           quantity_users = []
           quantity_users |= retrieve_votes(from_start: true).pluck(:decidim_author_id)
           quantity_users |= retrieve_endorsements(from_start: true).pluck(:decidim_author_id)
-          quantity_users |= retrieve_proposals(from_start: true).pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguosity must be called this way
+          quantity_users |= retrieve_proposals(from_start: true).pluck("decidim_coauthorships.decidim_author_id") # To avoid ambiguousness must be called this way
 
           {
             cumulative_users: cumulative_users.uniq,
@@ -42,7 +42,7 @@ module Decidim
                                                               ]
                                                             })
                                                      .where("decidim_proposals_proposals.published_at <= ?", end_time)
-                                                     .except_withdrawn
+                                                     .not_withdrawn
 
           return @proposals.where("decidim_proposals_proposals.published_at >= ?", start_time) if from_start
 

data/app/queries/decidim/proposals/metrics/proposals_metric_manage.rb

@@ -32,7 +32,7 @@ module Decidim
           end
           @query = Decidim::Proposals::Proposal.where(component: visible_components_from_spaces(spaces)).joins(:component)
                                                .left_outer_joins(:category)
-          @query = @query.where("decidim_proposals_proposals.published_at <= ?", end_time).except_withdrawn.not_hidden
+          @query = @query.where("decidim_proposals_proposals.published_at <= ?", end_time).not_withdrawn.not_hidden
           @query = @query.group("decidim_categorizations.decidim_category_id",
                                 :participatory_space_type,
                                 :participatory_space_id)

data/app/queries/decidim/proposals/metrics/votes_metric_manage.rb

@@ -31,7 +31,7 @@ module Decidim
           spaces = Decidim.participatory_space_manifests.flat_map do |manifest|
             manifest.participatory_spaces.call(@organization).public_spaces
           end
-          proposal_ids = Decidim::Proposals::Proposal.where(component: visible_components_from_spaces(spaces)).except_withdrawn.not_hidden.pluck(:id)
+          proposal_ids = Decidim::Proposals::Proposal.where(component: visible_components_from_spaces(spaces)).not_withdrawn.not_hidden.pluck(:id)
           @query = Decidim::Proposals::ProposalVote.joins(proposal: :component)
                                                    .left_outer_joins(proposal: :category)
                                                    .where(proposal: proposal_ids)

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

@@ -15,7 +15,7 @@ module Decidim
           address: :string,
           latitude: :string,
           longitude: :string,
-          state: :string
+          decidim_proposals_proposal_state_id: :string
         }
       end
 

data/app/views/decidim/proposals/admin/imports/_proposals_fields.html.erb

@@ -1,5 +1,5 @@
 <% if current_organization.user_groups_enabled? && form.object.user_groups.any? %>
-  <div class="field">
+  <div>
     <%= form.select(
         :user_group_id,
         form.object.user_groups.map { |g| [g.name, g.id] },

data/app/views/decidim/proposals/admin/participatory_texts/index.html.erb

@@ -1,4 +1,5 @@
 <% add_decidim_page_title(t(".title")) %>
+<%= append_stylesheet_pack_tag "participatory_texts_admin" %>
 
 <div class="item_show__header">
   <h1 class="item_show__header-title">
@@ -14,7 +15,7 @@
           <div class="card">
             <div class="row column">
               <p class="mt-3"><%= t(".info_1") %></p>
-              <ul id="participatory-text" class="draggable-list js-connect js-list-actives accordion  mb-m mt-2.5 ml-2.5 mr-2.5"
+              <ul id="participatory-text" class="draggable-list js-connect js-list-actives mt-2.5 ml-2.5 mr-2.5"
                   data-component="accordion"
                   data-accordion
                   data-sort-url="#"
@@ -27,7 +28,7 @@
                     <a data-open="true" data-controls="article-<%= proposal.id %>">
                       <%= icon "arrow-right-s-line" %>
                       <%= preview_participatory_text_section_title(proposal) %>
-                      <span class="mr-m"><%= icon "menu-line", class: "fill-black" %></span>
+                      <span><%= icon "menu-line", class: "fill-black" %></span>
                     </a>
                     <div data-tab-content id="article-<%= proposal.id %>">
                       <%= render "article-preview", { form: prop_form, proposal: } %>

data/app/views/decidim/proposals/admin/proposal_answers/_form.html.erb

@@ -5,12 +5,12 @@
         <h2 class="card-title"><%= t ".title", title: present(proposal).title %></h2>
       </div>
 
-      <% if Decidim.module_installed?(:templates) %>
+      <% if defined?(Decidim::Templates) %>
         <%= render "decidim/templates/admin/proposal_answer_templates/template_chooser", form: f %>
       <% end %>
 
       <div class="row column flex items-center gap-x-4 my-2">
-        <%= f.collection_radio_buttons :internal_state, [["not_answered", t(".not_answered")], ["accepted", t(".accepted")], ["rejected", t(".rejected")], ["evaluating", t(".evaluating")]], :first, :last, prompt: true do |builder|
+        <%= f.collection_radio_buttons :internal_state, available_states, :token, ->(a) { translated_attribute(a.title) }, prompt: true do |builder|
               builder.label { builder.radio_button + builder.text } end %>
       </div>
 

data/app/views/decidim/proposals/admin/proposal_notes/_proposal_notes.html.erb

@@ -10,9 +10,9 @@
       <% proposal.notes.each do |note| %>
         <div class="comment">
           <div class="comment__header">
-            <div class="author-data">
-              <div class="author-data__main">
-                <div class="author author--inline">
+            <div>
+              <div>
+                <div class="author">
                   <strong><span class="author__name"><%= note.author.name %></span></strong>
                   <span><%= l note.created_at, format: :decidim_short %></span>
                 </div>

data/app/views/decidim/proposals/admin/proposal_states/_form.html.erb

@@ -0,0 +1,67 @@
+<div class="form__wrapper">
+  <div class="card pt-4">
+    <div class="card-section">
+      <div class="row column">
+        <%= form.translated :text_field, :title, aria: { label: :title }, data: { "text-copy" => true, "target" => "strong[data-label-preview]" } %>
+      </div>
+      <div class="row column">
+        <%= form.translated :text_area, :announcement_title, aria: { label: :announcement_title }, data: { "text-copy" => true, "target" => "div[data-announcement-preview] .flash__title" } %>
+      </div>
+
+      <div class="row column proposal-status__color">
+        <% Decidim::Proposals::ProposalState.colors.each do |color_key, color_values| %>
+          <% state_id = "proposal_state_text_color_#{color_values[:foreground].delete("#").downcase}" %>
+          <style>
+            <%= "##{state_id}" %> {
+              box-shadow:  0 0 0 1.5px <%= color_values[:foreground] %>, 0 0 0 6px <%= color_values[:background] %>;
+              accent-color: <%= color_values[:foreground] %>;
+            }
+
+            <%= "##{state_id}" %>:checked  {
+              box-shadow: 0 0 0 6px <%= color_values[:foreground] %>;
+            }
+          </style>
+          <%= form.radio_button :text_color, color_values[:foreground],
+                                label: color_values[:name],
+                                class: "!mr-4",
+                                data: {
+                                  "sync-radio-buttons" => true,
+                                  "sync-radio-buttons-value" => color_key,
+                                  "css-preview" => true,
+                                  "css-preview-updates" =>
+                                    "strong[data-label-preview]:color:#{color_values[:foreground]}; " +
+                                    "div[data-announcement-preview]:color:#{color_values[:foreground]}; " +
+                                    "div[data-announcement-preview]:borderColor:#{color_values[:foreground]}/var(--tw-border-opacity)"
+                                } %>
+
+          <%= form.radio_button :bg_color, color_values[:background],
+                                label: color_values[:name],
+                                style: "display: none;",
+                                data: {
+                                  "sync-radio-buttons-value-target" => color_key,
+                                  "css-preview" => true,
+                                  "css-preview-updates" =>
+                                    "strong[data-label-preview]:backgroundColor:#{color_values[:background]}; " +
+                                    "div[data-announcement-preview]:backgroundColor:#{color_values[:background]};"
+                                } %>
+        <% end %>
+
+        <div class="mt-8">
+          <strong class="label" style="<%= "background-color: #{form.object.bg_color}; color: #{form.object.text_color};" %>" data-label-preview>
+            <%= decidim_escape_translated(form.object.title).presence || t(".preview") %>
+          </strong>
+        </div>
+
+        <div class="flash flex-col " style="<%= "background-color: #{form.object.bg_color}; color: #{form.object.text_color}; border-color: #{form.object.text_color} / var(--tw-border-opacity);" %>" data-announcement-preview>
+          <div class="flash__title">
+            <%= decidim_escape_translated(form.object.announcement_title).presence || t(".preview") %>
+          </div>
+          <div class="flash__message">
+            <p></p><div class="rich-text-display">Id voluptate amet optio nobis temporibus ipsam veritatis distinctio dolore.</div><p></p>
+          </div>
+        </div>
+      </div>
+
+    </div>
+  </div>
+</div>

data/app/views/decidim/proposals/admin/proposal_states/edit.html.erb

@@ -0,0 +1,18 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t(".title") %>
+  </h1>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form edit_proposal_state proposal_form_admin" }) do |f| %>
+      <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".update"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/proposals/admin/proposal_states/index.html.erb

@@ -0,0 +1,50 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="card">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t(".title") %>
+      <%= link_to t("actions.new_proposal_state", scope: "decidim.proposals"), new_proposal_state_path, class: "button button__sm button__secondary" if allowed_to? :create, :proposal_state %>
+    </h1>
+  </div>
+  <div class="table-scroll mt-16">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th class="!text-left">
+            <%= t("models.proposal_state.title", scope: "decidim.proposals") %>
+          </th>
+          <th>
+            <%= t("models.proposal_state.css_class", scope: "decidim.proposals") %>
+          </th>
+          <th><%= t("actions.title", scope: "decidim.proposals") %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% proposal_states.each do |state| %>
+          <tr>
+            <td>
+              <%= translated_attribute(state.title) %>
+            </td>
+            <td>
+              <strong class="label" style="<%= state.css_style %>">
+                <%= decidim_sanitize_translated(state.token) %>
+              </strong>
+            </td>
+            <td>
+              <% if allowed_to? :update, :proposal_state, proposal_state: state %>
+                <%= icon_link_to "pencil-line", edit_proposal_state_path(state), t("actions.edit_proposal_state", scope: "decidim.proposals"), class: "action-icon--edit-proposal" %>
+              <% else %>
+                <span class="action-space icon"></span>
+              <% end %>
+              <% if allowed_to?(:destroy, :proposal_state, proposal_state: state) %>
+                <%= icon_link_to "delete-bin-line", proposal_state_path(state), t("actions.destroy", scope: "decidim.proposals"), method: :delete, data: { confirm: t("actions.delete_proposal_state_confirm", scope: "decidim.proposals") }, class: "action-icon--delete-proposal" %>
+              <% end %>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
+
+<%= decidim_paginate proposal_states %>

data/app/views/decidim/proposals/admin/proposal_states/new.html.erb

@@ -0,0 +1,18 @@
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h1 class="item_show__header-title">
+    <%= t(".title") %>
+  </h1>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, html: { class: "form-defaults form new_proposal_state proposal_form_admin" }) do |f| %>
+      <%= render partial: "form", object: f, locals: { title: t(".title") } %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= f.submit t(".create"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/proposals/admin/proposals/_bulk-actions.html.erb

@@ -10,17 +10,13 @@
 
   <% if allowed_to? :import, :proposals %>
     <%= import_dropdown do %>
-      <%= link_to new_proposals_import_path do %>
-        <li class="imports--component imports--proposals">
-          <%= t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")) %>
+      <li class="imports--component imports--proposals">
+        <%= link_to t("actions.import", scope: "decidim.proposals", name: t("models.proposal.name", scope: "decidim.proposals.admin")), new_proposals_import_path %>
+      </li>
+      <% current_component.manifest.import_manifests.each do |import_manifest| %>
+        <li class="imports--file imports--<%= import_manifest.name %>">
+          <%= link_to import_manifest.message(:label, self), admin_imports_path(current_component, name: import_manifest.name) %>
         </li>
-        <% current_component.manifest.import_manifests.each do |import_manifest| %>
-          <%= link_to admin_imports_path(current_component, name: import_manifest.name) do %>
-            <li class="imports--file imports--<%= import_manifest.name %>">
-              <%= import_manifest.message(:label, self) %>
-            </li>
-          <% end %>
-        <% end %>
       <% end %>
     <% end %>
   <% end %>
@@ -34,6 +30,4 @@
 <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/scope-change" %>
 <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/merge" %>
 <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/split" %>
-<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/assign_to_valuator" %>
-<%= render partial: "decidim/proposals/admin/proposals/bulk_actions/unassign_from_valuator" %>
 <%= render partial: "decidim/proposals/admin/proposals/bulk_actions/publish_answers" %>

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

@@ -1,16 +1,16 @@
 <div class="form__wrapper">
   <div class="card pt-4">
     <div class="card-section">
-      <div class="row column hashtags__container pb-4">
+      <div class="row column pb-4">
         <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, aria: { label: :title } %>
       </div>
-      <div class="row column hashtags__container">
+      <div class="row column">
         <%= form.translated :editor, :body, hashtaggable: true, aria: { label: :body } %>
       </div>
       <% if @form.component_automatic_hashtags.any? %>
-        <div class="field">
+        <div>
           <%= form.label :automatic_hashtags %>
-          <div class="checkboxes hashtags">
+          <div class="hashtags">
             <% @form.component_automatic_hashtags.each do |hashtag| %>
               <label>
                 <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
@@ -20,9 +20,9 @@
         </div>
       <% end %>
       <% if @form.component_suggested_hashtags.any? %>
-        <div class="field">
+        <div>
           <%= form.label :suggested_hashtags %>
-          <div class="checkboxes hashtags">
+          <div class="hashtags">
             <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last do |option|
                 option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
               end %>

data/app/views/decidim/proposals/admin/proposals/_proposal-tr.html.erb

@@ -56,11 +56,11 @@
   </td>
 
   <td class="valuators-count">
-    <%= proposal.valuation_assignments.size %>
+    <%= proposal.valuation_assignments_count %>
   </td>
 
   <td>
-    <strong class="label <%= proposal_state_css_class proposal %>">
+    <strong class="label <%= proposal_state_css_class proposal %>" style="<%= proposal_state_css_style proposal %>">
       <%= t("decidim/amendment", scope: "activerecord.models", count: 1) if proposal.emendation? %>
       <%= proposal_complete_state proposal %>
     </strong>