decidim-proposals 0.27.9 → 0.28.0.rc4

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

@@ -2,53 +2,39 @@ import attachGeocoding from "src/decidim/geocoding/attach_input"
 import getCoordinateInputName from "src/decidim/geocoding/coordinate_input";
 
 $(() => {
-  const $checkbox = $("input:checkbox[name$='[has_address]']");
-  const $addressInput = $("#address_input");
-  const $addressInputField = $("input", $addressInput);
   const $map = $("#address_map");
-  let latFieldName = "latitude";
-  let longFieldName = "longitude";
+  const $addressInputField = $("[data-decidim-geocoding]");
 
-  if ($addressInputField.length > 0) {
-    latFieldName = getCoordinateInputName("latitude", $addressInputField, {})
-    longFieldName = getCoordinateInputName("longitude", $addressInputField, {})
-  }
+  if ($map.length) {
+    if (!$addressInputField.data("coordinates")) {
+      $map.hide();
+    }
+    $addressInputField.on("geocoder-suggest-coordinates.decidim", () => $map.show());
 
-  $map.hide();
+    let latFieldName = "latitude";
+    let longFieldName = "longitude";
 
-  if ($checkbox.length > 0) {
-    const toggleInput = () => {
-      if ($checkbox[0].checked) {
-        $addressInput.show();
-        $addressInputField.prop("disabled", false);
-      } else {
-        $addressInput.hide();
-        $addressInputField.prop("disabled", true);
-      }
+    if ($addressInputField.length > 0) {
+      latFieldName = getCoordinateInputName("latitude", $addressInputField, {})
+      longFieldName = getCoordinateInputName("longitude", $addressInputField, {})
     }
-    toggleInput();
-    $checkbox.on("change", toggleInput);
-  }
 
-  if ($addressInput.length > 0) {
-    if ($checkbox[0].checked) {
-      $map.show();
-    }
+    $("[data-decidim-map]").on("ready.decidim", (event) => {
+      const ctrl = $(event.target).data("map-controller");
 
-    const ctrl = $("[data-decidim-map]").data("map-controller");
-    ctrl.setEventHandler("coordinates", (ev) => {
-      $(`input[name='${latFieldName}']`).val(ev.lat);
-      $(`input[name='${longFieldName}']`).val(ev.lng);
-    });
+      ctrl.setEventHandler("coordinates", (ev) => {
+        $(`input[name='${latFieldName}']`).val(ev.lat);
+        $(`input[name='${longFieldName}']`).val(ev.lng);
+      });
 
-    attachGeocoding($addressInputField, null, (coordinates) => {
-      $map.show();
-      // Remove previous marker when user updates address in address field
-      ctrl.removeMarker();
-      ctrl.addMarker({
-        latitude: coordinates[0],
-        longitude: coordinates[1],
-        address: $addressInput.val()
+      attachGeocoding($addressInputField, null, (coordinates) => {
+        // Remove previous marker when user updates address in address field
+        ctrl.removeMarker();
+        ctrl.addMarker({
+          latitude: coordinates[0],
+          longitude: coordinates[1],
+          address: $addressInputField.val()
+        });
       });
     });
   }

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

@@ -47,12 +47,6 @@ $(() => {
     }
   }
 
-  const resetForms = function() {
-    $("#js-bulk-actions-dropdown button").each(function() {
-      $(`#js-form-${$(this).data("action")}`)[0].reset();
-    })
-  }
-
   const showOtherActionsButtons = function() {
     $("#js-other-actions-wrapper").removeClass("hide");
   }
@@ -74,7 +68,6 @@ $(() => {
   window.showOtherActionsButtons = showOtherActionsButtons;
   window.hideOtherActionsButtons = hideOtherActionsButtons;
   window.hideBulkActionForms = hideBulkActionForms;
-  window.resetForms = resetForms;
 
   if ($(".js-bulk-action-form").length) {
     hideBulkActionForms();

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

@@ -0,0 +1,20 @@
+import TomSelect from "tom-select/dist/cjs/tom-select.popular";
+
+document.addEventListener("DOMContentLoaded", () => {
+  const tagContainers = document.querySelectorAll("#proposals_list");
+  tagContainers.forEach((container) => {
+    const { tmName, tmItems, tmNoResults } = container.dataset
+    const config = {
+      plugins: ["remove_button", "dropdown_input"],
+      allowEmptyOption: true,
+      items: JSON.parse(tmItems),
+      render: {
+        item: (data, escape) => `<div>${escape(data.text)}<input type="hidden" name="${tmName}[]" value="${data.value}" /></div>`,
+        // eslint-disable-next-line camelcase
+        ...(tmNoResults && { no_results: () => `<div class="no-results">${tmNoResults}</div>` })
+      }
+    };
+
+    return new TomSelect(container, config)
+  })
+});

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

@@ -0,0 +1,97 @@
+@import "tom-select/dist/scss/tom-select";
+
+.proposal-list {
+  &__aside {
+    &__button-container {
+      @apply flex flex-col gap-4 md:gap-10 w-full;
+    }
+  }
+
+  &__map {
+    /* negative main padding values */
+    @apply md:-ml-16 -mt-6 md:-mt-12 aspect-square md:aspect-[21/9] [&>*]:h-full [&+*]:mt-6 md:[&+*]:mt-12;
+  }
+}
+
+.proposal {
+  &__cost {
+    @apply space-y-3 bg-background rounded p-4 text-black;
+
+    &-period {
+      @apply text-gray-2 uppercase text-sm;
+    }
+  }
+
+  &__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;
+    }
+  }
+
+  &__container {
+    [data-decidim-map] {
+      @apply aspect-[5/1];
+    }
+  }
+}
+
+.proposal-participatory {
+  &__heading {
+    @apply pb-6 border-b-4 border-background font-sans font-semibold text-xl md:text-3xl;
+  }
+
+  &__section {
+    @apply p-4 rounded hover:bg-background-4 space-y-4 transition;
+  }
+
+  &__section + &__section {
+    @apply mt-2;
+  }
+
+  &__title {
+    @apply block font-semibold text-xl text-secondary;
+  }
+
+  &__text {
+    @apply text-md text-gray-2;
+  }
+
+  &__button {
+    @apply inline-flex items-center gap-1 px-0 md:px-6 border-gray-3 border-0 md:border-r first:pl-0 last:pr-0 last:border-r-0 text-sm text-secondary;
+
+    & > span {
+      @apply underline;
+    }
+
+    & > svg {
+      @apply w-3.5 h-3.5 fill-current text-gray;
+    }
+  }
+
+  &__section:hover &__title {
+    @apply underline;
+  }
+
+  &__section:hover .label {
+    @apply text-white bg-secondary;
+  }
+}
+
+/* overwrite tom-select defaults */
+.ts {
+  &-control {
+    @apply border-gray text-md min-h-[40px];
+
+    input {
+      @apply font-normal text-black text-md;
+    }
+  }
+
+  &-dropdown {
+    @apply text-md text-gray-2 font-normal;
+
+    .active {
+      @apply text-white bg-secondary;
+    }
+  }
+}

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

@@ -72,7 +72,7 @@ module Decidim
         end
 
         def user_valuator_role
-          @user_valuator_role ||= space.user_roles(:valuator).find_by(user: user)
+          @user_valuator_role ||= space.user_roles(:valuator).find_by(user:)
         end
 
         def user_is_valuator?
@@ -84,7 +84,7 @@ module Decidim
         def valuator_assigned_to_proposal?
           @valuator_assigned_to_proposal ||=
             Decidim::Proposals::ValuationAssignment
-            .where(proposal: proposal, valuator_role: user_valuator_role)
+            .where(proposal:, valuator_role: user_valuator_role)
             .any?
         end
 
@@ -112,7 +112,7 @@ module Decidim
           component_settings.participatory_texts_enabled?
         end
 
-        # There's no special condition to create proposal notes, only
+        # There is no special condition to create proposal notes, only
         # users with access to the admin section can do it.
         def can_create_proposal_note?
           allow! if permission_action.subject == :proposal_note

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

@@ -4,7 +4,6 @@ module Decidim
   module Proposals
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        allow_embed_proposal?
         return permission_action unless user
 
         # Delegate the admin permission checks to the admin permissions class
@@ -48,14 +47,6 @@ module Decidim
         @proposal ||= context.fetch(:proposal, nil) || context.fetch(:resource, nil)
       end
 
-      # As this is a public action, we need to run this before other checks
-      def allow_embed_proposal?
-        return unless permission_action.action == :embed && permission_action.subject == :proposal && proposal
-        return disallow! if proposal.withdrawn?
-
-        allow!
-      end
-
       def voting_enabled?
         return unless current_settings
 
@@ -71,7 +62,7 @@ module Decidim
       def remaining_votes
         return 1 unless vote_limit_enabled?
 
-        proposals = Proposal.where(component: component)
+        proposals = Proposal.where(component:)
         votes_count = ProposalVote.where(author: user, proposal: proposals).size
         component_settings.vote_limit - votes_count
       end

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Proposals::ProposalNote`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Proposals::Proposal`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views
@@ -15,9 +15,13 @@ module Decidim
       class ProposalPresenter < Decidim::Log::BasePresenter
         private
 
+        def resource_presenter
+          @resource_presenter ||= Decidim::Proposals::Log::ResourcePresenter.new(action_log.resource, h, action_log.extra["resource"])
+        end
+
         def diff_fields_mapping
           {
-            title: :i18n,
+            title: "Decidim::Proposals::AdminLog::ValueTypes::ProposalTitleBodyPresenter",
             body: "Decidim::Proposals::AdminLog::ValueTypes::ProposalTitleBodyPresenter",
             state: "Decidim::Proposals::AdminLog::ValueTypes::ProposalStatePresenter",
             answered_at: :date,

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

@@ -6,8 +6,8 @@ module Decidim
       # This class holds the logic to present a `Decidim::Proposals::ValuationAssignment`
       # for the `AdminLog` log.
       #
-      # Usage should be automatic and you shouldn't need to call this class
-      # directly, but here's an example:
+      # Usage should be automatic and you should not need to call this class
+      # directly, but here is an example:
       #
       #    action_log = Decidim::ActionLog.last
       #    view_helpers # => this comes from the views

data/app/presenters/decidim/proposals/admin_log/value_types/proposal_title_body_presenter.rb

@@ -5,10 +5,12 @@ module Decidim
     module AdminLog
       module ValueTypes
         class ProposalTitleBodyPresenter < Decidim::Log::ValueTypes::DefaultPresenter
+          include Decidim::TranslatableAttributes
+
           def present
             return unless value
 
-            translated_value = h.decidim_escape_translated(value)
+            translated_value = translated_attribute(value)
             return if translated_value.blank?
 
             renderer = Decidim::ContentRenderers::HashtagRenderer.new(translated_value)

data/app/presenters/decidim/proposals/log/resource_presenter.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    module Log
+      class ResourcePresenter < Decidim::Log::ResourcePresenter
+        private
+
+        # Private: Presents resource name.
+        #
+        # Returns an HTML-safe String.
+        def present_resource_name
+          if resource.present?
+            Decidim::Proposals::ProposalPresenter.new(resource).title
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/proposals/log/valuation_assignment_presenter.rb

@@ -11,7 +11,7 @@ module Decidim
         # Returns an HTML-safe String.
         def present_resource_name
           if resource.present?
-            resource.proposal.presenter.title(html_escape: true)
+            Decidim::Proposals::ProposalPresenter.new(resource.proposal).title
           else
             super
           end

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

@@ -40,11 +40,11 @@ module Decidim
       def title(links: false, extras: true, html_escape: false, all_locales: false)
         return unless proposal
 
-        super proposal.title, links, html_escape, all_locales, extras: extras
+        super proposal.title, links, html_escape, all_locales, extras:
       end
 
       def id_and_title(links: false, extras: true, html_escape: false)
-        "##{proposal.id} - #{title(links: links, extras: extras, html_escape: html_escape)}"
+        "##{proposal.id} - #{title(links:, extras:, html_escape:)}"
       end
 
       def body(links: false, extras: true, strip_tags: false, all_locales: false)
@@ -53,6 +53,10 @@ module Decidim
         content_handle_locale(proposal.body, all_locales, extras, links, strip_tags)
       end
 
+      def editor_body(all_locales: false, extras: true)
+        editor_locales(proposal.body, all_locales, extras:)
+      end
+
       # Returns the proposal versions, hiding not published answers
       #
       # Returns an Array.

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

@@ -29,10 +29,10 @@ module Decidim
 
         diff.update(
           attribute => {
-            type: type,
+            type:,
             label: I18n.t(attribute, scope: i18n_scope),
-            old_value: old_value,
-            new_value: new_value
+            old_value:,
+            new_value:
           }
         )
       end

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

@@ -82,15 +82,15 @@ module Decidim
         proposal = if author.nil?
                      create_with_authors(
                        attributes: origin_attributes,
-                       original_proposal: original_proposal,
-                       action_user: action_user
+                       original_proposal:,
+                       action_user:
                      )
                    else
                      create(
                        attributes: origin_attributes,
-                       author: author,
-                       user_group_author: user_group_author,
-                       action_user: action_user
+                       author:,
+                       user_group_author:,
+                       action_user:
                      )
                    end
 
@@ -122,7 +122,7 @@ module Decidim
 
           new_attachment.save!
         rescue Errno::ENOENT, OpenURI::HTTPError => e
-          Rails.logger.warn("[ERROR] Couldn't copy attachment from proposal #{original_proposal.id} when copying to component due to #{e.message}")
+          Rails.logger.warn("[ERROR] Could not copy attachment from proposal #{original_proposal.id} when copying to component due to #{e.message}")
         end
       end
 

data/app/views/decidim/proposals/admin/participatory_texts/_article-preview.html.erb

@@ -3,11 +3,9 @@
     <%= form.hidden_field :position, class: "position" %>
     <%= form.text_field :title, required: true %>
   </div>
-</div>
-<% if proposal.article? %>
-<div class="grid-x">
+  <% if proposal.article? %>
   <div class="cell">
     <%= form.text_area :body, required: true, rows: 5 %>
   </div>
+  <% end %>
 </div>
-<% end %>

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

@@ -1,2 +1,2 @@
-<%= link_to t(".discard_all"), discard_participatory_texts_path, method: "POST", id: "discard-all", class: "button tiny button--title alert", data: { confirm: t(".are_you_sure") } %>
-<%= link_to t(".import_doc"), new_import_participatory_texts_path, id: "import-doc", class: "button tiny button--title" %>
+<%= link_to t(".discard_all"), discard_participatory_texts_path, method: "POST", id: "discard-all", class: "button button__sm button__secondary alert", data: { confirm: t(".are_you_sure") } %>
+<%= link_to t(".import_doc"), new_import_participatory_texts_path, id: "import-doc", class: "button button__sm button__secondary" %>

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

@@ -1,54 +1,66 @@
-<%= decidim_form_for(@preview_form, url: participatory_texts_path, class: "form grid-container") do |form| %>
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title">
-      <%= t(".title") %>
-      <%= render partial: "bulk-actions" %>
-    </h2>
-  </div>
-  <div class="card-section">
-    <% if @drafts.any? %>
-      <p><%= t(".info_1") %></p>
-      <ul id="participatory-text" class="accordion js-sortable mb-m"
-        data-accordion
-        data-multi-expand="true"
-        data-allow-all-closed="true">
-        <%= form.fields_for(:proposals) do |prop_form| %>
-        <% proposal= @drafts[prop_form.index] %>
-          <li class="accordion-item <%= proposal.article? ? "is-active" : nil %>" data-accordion-item>
-            <a href="#" class="accordion-title flex--sbc"><%= preview_participatory_text_section_title(proposal) %><span class="mr-m"><%= icon "menu", class: "icon--small", role: "img", "aria-hidden": true %></span></a>
-            <div class="accordion-content" data-tab-content>
-              <%= render "article-preview", { form: prop_form, proposal: proposal } %>
-            </div>
-          </li>
-        <% end %>
-      </ul>
-    <% end -%>
-  </div>
+<% add_decidim_page_title(t(".title")) %>
+
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+    <%= render partial: "bulk-actions" %>
+  </h2>
 </div>
 <% if @drafts.any? %>
-  <div class="button--double form-general-submit">
-    <%= form.submit t(".save_draft"), name: :save_draft, class: "button" %>
-    <%= form.submit t(".publish_document"), class: "button success" %>
+  <div class="item__edit item__edit-1col">
+    <div class="item__edit-form">
+      <%= decidim_form_for(@preview_form, url: participatory_texts_path, html: { class: "form-defaults form grid-container" }) do |form| %>
+        <div class="form__wrapper">
+          <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"
+                  data-accordion
+                  data-sort-url="#"
+                  data-multi-expand="true"
+                  data-allow-all-closed="true">
+                <%= form.fields_for(:proposals) do |prop_form| %>
+                  <% proposal = @drafts[prop_form.index] %>
+
+                  <li class="py-4 draggable-content <%= proposal.article? ? "is-active" : nil %>" data-accordion-item draggable="true">
+                    <a href="#" class="accordion-title font-bold mt-5"><%= preview_participatory_text_section_title(proposal) %>
+                      <span class="mr-m"><%= icon "menu-line", class: "fill-black" %></span>
+                    </a>
+                    <div class="accordion-content" data-tab-content>
+                      <%= render "article-preview", { form: prop_form, proposal: } %>
+                    </div>
+                  </li>
+                <% end %>
+              </ul>
+            </div>
+          </div>
+        </div>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <%= form.submit t(".save_draft"), name: :save_draft, class: "button button__sm button__secondary" %>
+            <%= form.submit t(".publish_document"), class: "button button__sm button__secondary" %>
+          </div>
+        </div>
+      <% end -%>
+    </div>
   </div>
 <% end %>
-<% end -%>
 <script>
-$(window).on("load", function() {
-  // Not all browsers submit the buttons as form data.
-  $('button[name="save_draft"]').on("click", function(ev) {
-    ev.preventDefault();
+  $(window).on("load", function() {
+    // Not all browsers submit the buttons as form data.
+    $("button[name=\"save_draft\"]").on("click", function(ev) {
+      ev.preventDefault();
 
-    var $form = $(this).parents("form");
-    $form.append('<input type="hidden" name="save_draft" value="true" />');
-    $form.submit();
+      var $form = $(this).parents("form");
+      $form.append("<input type=\"hidden\" name=\"save_draft\" value=\"true\" />");
+      $form.submit();
+    });
+    $("#participatory-text").on("sortupdate",
+      function(event, ui) {
+        $("#participatory-text li").each(function(idx, li) {
+          input = $(li).find("input.position").val(idx + 1);
+        });
+      }
+    );
   });
-  $( "#participatory-text" ).on( "sortupdate",
-    function( event, ui ) {
-      $('#participatory-text li').each(function(idx, li) {
-        input= $(li).find("input.position").val(idx+1)
-      })
-    }
-  )
-})
 </script>

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

@@ -1,39 +1,37 @@
-<%= decidim_form_for(@import, url: import_participatory_texts_path, class: "form grid-container") do |form| %>
-  <div class="card">
-    <div class="card-divider">
-      <h2 class="card-title"><%= t(".title") %></h2>
-    </div>
-    <div class="card-section">
-      <div class="grid-x">
-        <div class="cell">
-          <div id="import-title" class="row column">
-            <%= form.translated :text_field, :title, autofocus: true %>
+<% add_decidim_page_title(t(".title")) %>
+<div class="item_show__header">
+  <h2 class="item_show__header-title">
+    <%= t(".title") %>
+  </h2>
+</div>
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@import, url: import_participatory_texts_path, html: { class: "form form-defaults grid-container" }) do |form| %>
+      <div class="form__wrapper">
+        <div class="card pt-4">
+          <div class="card-section">
+            <div id="import-title" class="row column">
+              <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
+            </div>
+
+            <div id="import-desc" class="row column">
+              <%= form.translated :text_area, :description, aria: { label: :description } %>
+            </div>
+
+            <div class="row column">
+              <%= form.upload :document, label: t(".document_legend", valid_mime_types: mime_types_with_document_examples).html_safe, button_class: "button button__sm button__transparent-secondary" %>
+            </div>
           </div>
         </div>
-      </div>
-      <div class="grid-x">
-        <div class="cell">
-          <div id="import-desc" class="row column">
-            <%= form.translated :text_area, :description %>
+        <div class="item__edit-sticky">
+          <div class="item__edit-sticky-container">
+            <div class="flex-col-reverse md:flex-row justify-between text-white">
+              <%= t(".bottom_hint") %>
+              <%= form.submit t(".upload_document"), class: "button button__sm button__secondary" %>
+            </div>
           </div>
         </div>
       </div>
-      <div class="grid-x">
-        <div class="cell">
-          <fieldset>
-            <legend> <%= t(".document_legend", valid_mime_types: mime_types_with_document_examples).html_safe %> </legend>
-              <div class="row column">
-                <%= form.upload :document, required: true %>
-              </div>
-          </fieldset>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="grid-x align-center mt-sm">
-    <%= form.submit t(".upload_document") %>
-  </div>
-  <div class="grid-x align-center">
-    <%= t(".bottom_hint") %>
+    <% end -%>
   </div>
-<% end -%>
+</div>