decidim-proposals 0.29.1 → 0.30.0.rc1

data/app/models/decidim/proposals/proposal_note.rb

@@ -9,12 +9,23 @@ module Decidim
 
       belongs_to :proposal, foreign_key: "decidim_proposal_id", class_name: "Decidim::Proposals::Proposal", counter_cache: true
       belongs_to :author, foreign_key: "decidim_author_id", class_name: "Decidim::User"
+      has_many :replies, foreign_key: "parent_id", class_name: "Decidim::Proposals::ProposalNote", inverse_of: :parent, dependent: :destroy
+      belongs_to :parent, class_name: "Decidim::Proposals::ProposalNote", inverse_of: :replies, optional: true
 
+      scope :not_reply, -> { where(parent_id: nil) }
       default_scope { order(created_at: :asc) }
 
       def self.log_presenter_class_for(_log)
         Decidim::Proposals::AdminLog::ProposalNotePresenter
       end
+
+      def reply?
+        parent.present?
+      end
+
+      def formatted_body
+        Decidim::ContentProcessor.render_without_format(body)
+      end
     end
   end
 end

data/app/models/decidim/proposals/proposal_state.rb

@@ -38,7 +38,7 @@ module Decidim
       protected
 
       def generate_token
-        self.token = ensure_unique_token(translated_attribute(title).parameterize(separator: "_"))
+        self.token = ensure_unique_token(token.presence || translated_attribute(title).parameterize(separator: "_"))
       end
 
       def ensure_unique_token(token)

data/app/packs/entrypoints/decidim_proposals.js

@@ -1,6 +1,7 @@
 import "src/decidim/proposals/utils"
 import "src/decidim/proposals/add_proposal"
 import "src/decidim/proposals/choose_proposals"
+import "src/decidim/proposals/exit_handler"
 
 // Images
 require.context("../images", true)

data/app/packs/entrypoints/decidim_proposals_geocoding.js

@@ -0,0 +1,2 @@
+import "src/decidim/proposals/reverse_geocoding.js"
+import "stylesheets/decidim/proposals/geocoding_addons.scss";

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

@@ -13,13 +13,20 @@ $(() => {
     return $(".table-list [data-published-state=false] .js-check-all-proposal:checked").length
   }
 
+  const selectedProposalsAllowsAnswerCount = function() {
+    return $(".table-list [data-allow-answer=true] .js-check-all-proposal:checked").length
+  }
+
   const selectedProposalsCountUpdate = function() {
     const selectedProposals = selectedProposalsCount();
     const selectedProposalsNotPublishedAnswer = selectedProposalsNotPublishedAnswerCount();
+    const allowAnswerProposals = selectedProposalsAllowsAnswerCount();
+
     if (selectedProposals === 0) {
       $("#js-selected-proposals-count").text("")
       $("#js-assign-proposals-to-valuator-actions").addClass("hide");
       $("#js-unassign-proposals-from-valuator-actions").addClass("hide");
+      $("#js-taxonomy-change-proposals-actions").addClass("hide");
     } else {
       $("#js-selected-proposals-count").text(selectedProposals);
     }
@@ -36,6 +43,13 @@ $(() => {
     } else {
       $('button[data-action="publish-answers"]').parent().hide();
     }
+
+    if (allowAnswerProposals > 0) {
+      $('button[data-action="apply-answer-template"]').parent().show();
+      $("#js-form-apply-answer-template-number").text(allowAnswerProposals);
+    } else {
+      $('button[data-action="apply-answer-template"]').parent().hide();
+    }
   }
 
   const showBulkActionsButton = function() {
@@ -91,7 +105,8 @@ $(() => {
       let action = $(e.target).data("action");
       const panelActions = [
         "assign-proposals-to-valuator",
-        "unassign-proposals-from-valuator"
+        "unassign-proposals-from-valuator",
+        "taxonomy-change-proposals"
       ];
 
       if (!action) {

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

@@ -0,0 +1,73 @@
+const allowExitFrom = (el) => {
+  if (el.id === "exit-proposal-notification-link" || el.classList.contains("no-modal")) {
+    return true;
+  }
+
+  return false;
+};
+
+document.addEventListener("DOMContentLoaded", () => {
+  const exitNotification = document.getElementById("exit-proposal-notification");
+  const exitLink = document.getElementById("exit-proposal-notification-link");
+  if (!exitLink) {
+    return;
+  }
+  const defaultExitUrl = exitLink.href;
+  const defaultExitLinkText = exitLink.textContent;
+  const signOutPath = window.Decidim.config.get("sign_out_path");
+  let exitLinkText = defaultExitLinkText;
+
+  if (!exitNotification) {
+    // Do not apply when not inside the voting pipeline
+    return;
+  }
+
+  const openExitNotification = (url, method = null) => {
+    if (method && method !== "get") {
+      exitLink.setAttribute("data-method", method);
+    } else {
+      exitLink.removeAttribute("data-method");
+    }
+
+    exitLink.setAttribute("href", url);
+    exitLink.textContent = exitLinkText;
+    window.Decidim.currentDialogs["exit-proposal-notification"].open();
+  };
+
+  const handleClicks = (link) => {
+    link.addEventListener("click", (event) => {
+      exitLinkText = defaultExitLinkText;
+
+      if (
+        !allowExitFrom(link) &&
+        ((window.Decidim.currentDialogs["exit-proposal-notification"].dialog.querySelector("[data-dialog-container]")).dataset.minimumVotesReached !== "true") &&
+        ((window.Decidim.currentDialogs["exit-proposal-notification"].dialog.querySelector("[data-dialog-container]")).dataset.minimumVotesCount > 0)
+      ) {
+        event.preventDefault();
+        openExitNotification(link.getAttribute("href"), link.dataset.method);
+      }
+    });
+  };
+
+  document.querySelectorAll("a").forEach(handleClicks);
+  // Custom handling for the header sign-out link
+  const signOutLink = document.querySelector(`[href='${signOutPath}']`);
+  if (signOutLink) {
+    signOutLink.addEventListener("click", (event) => {
+      event.preventDefault();
+      event.stopPropagation();
+
+      exitLinkText = signOutLink.textContent;
+      openExitNotification(signOutLink.getAttribute("href"), signOutLink.dataset.method);
+    });
+  }
+
+  // Custom handling for links that open the exit notification dialog
+  const dialogOpenLinks = document.querySelectorAll("a[data-dialog-open='exit-proposal-notification']");
+  dialogOpenLinks.forEach((link) => {
+    link.addEventListener("click", () => {
+      exitLinkText = defaultExitLinkText;
+      openExitNotification(defaultExitUrl);
+    });
+  });
+});

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

@@ -103,15 +103,213 @@
   }
 
   &__grid-text-title {
-    @apply flex justify-between flex-row md:flex-col md:items-start lg:flex-row lg:items-center;
+    @apply flex justify-between items-start gap-y-2 flex-row md:flex-col lg:flex-row;
+  }
+
+  &__list-list {
+    .card__proposals-item {
+      @apply border-l-4 rounded-[10px] md:rounded-md border-[#F5F5F5] hover:border-tertiary focus-visible:border-tertiary flex flex-col md:items-center md:flex-row md:justify-between min-h-0 md:min-h-[127px] lg:min-h-[83px];
+
+      .card__list {
+        @apply border-none md:flex-1 md:items-center mb-2.5 md:mb-0;
+
+        &-metadata {
+          @apply gap-y-1 md:flex md:flex-row md:items-center md:gap-x-2 md:mt-0.5;
+
+          & > div {
+            @apply md:pl-0 md:pr-2;
+          }
+        }
+      }
+
+      .card__proposals-votes {
+        @apply flex md:flex-col lg:flex-row bg-[#F5F5F5] justify-around md:flex-[0.6] lg:flex-[0.8] items-center md:items-stretch lg:items-center lg:min-w-[196px] h-[68px] md:h-auto lg:h-[68px];
+
+        button {
+          @apply bg-[var(--secondary)];
+
+          &[disabled] {
+            @apply opacity-50 text-white border-current cursor-not-allowed;
+          }
+        }
+
+        &-limited {
+          @apply flex flex-col p-0 md:p-2 lg:p-0 md:flex-row md:flex-wrap lg:flex-col lg:flex-nowrap flex-1 md:flex-none lg:flex-1 justify-center;
+
+          .proposals__aside-progress {
+            @apply flex flex-col w-[80%] items-center md:order-1 lg:order-none md:flex-[1_1_100%] lg:flex-none;
+          }
+
+          .progress-bar {
+            &__units {
+              @apply md:order-none;
+            }
+
+            &__number {
+              span {
+                @apply text-sm;
+              }
+            }
+          }
+        }
+
+        &-unlimited {
+          @apply flex flex-row flex-1 lg:flex-1 justify-center md:flex-none;
+
+          .progress-bar__number {
+            span {
+              @apply text-xl;
+            }
+          }
+        }
+
+        .progress-bar {
+          &__number {
+            @apply flex justify-center items-center mx-1;
+
+            span {
+              @apply leading-6 font-semibold #{!important};
+            }
+          }
+
+          &__units {
+            @apply text-sm leading-[22px] mx-1;
+          }
+        }
+
+        &-container {
+          @apply flex-1 md:w-full md:flex-none p-2 lg:p-0 lg:m-3 lg:w-[164px];
 
-    .label {
-      @apply md:mt-2;
+          button {
+            @apply text-sm leading-[18px] font-semibold py-1;
+          }
+        }
+
+        &-hidden {
+          @apply md:flex-none;
+
+          .card__proposals-votes-container {
+            @apply md:flex-none md:w-[130px] lg:w-[164px] lg:p-0;
+          }
+        }
+      }
     }
   }
 
-  &__list-metadata {
-    @apply md:flex md:flex-row md:items-center md:gap-4;
+  &__grid-grid {
+    @apply md:gap-4;
+
+    .card__proposals-item {
+      @apply flex flex-col justify-between border-solid border-[#D3D5D9] border rounded;
+
+      .card__grid {
+        @apply mb-2.5 md:mb-0 flex-1 justify-between;
+
+        box-shadow: none !important;
+
+        &-text {
+          @apply justify-end lg:gap-y-8;
+        }
+
+        &-metadata {
+          @apply mt-0 md:flex md:flex-row;
+
+          > :first-child {
+            flex: 1 !important;
+          }
+
+          > :not(:first-child) {
+            @apply border-r border-[#D3D5D9];
+          }
+
+          & > div {
+            @apply px-2 md:px-2;
+          }
+        }
+      }
+
+      .card__proposals-votes {
+        @apply flex bg-[#F5F5F5EE] justify-around items-center px-4 h-[68px];
+
+        button {
+          @apply bg-[var(--secondary)];
+
+          &[disabled] {
+            @apply opacity-50 text-white border-current cursor-not-allowed;
+          }
+        }
+
+        &-limited {
+          @apply flex flex-col lg:items-start flex-1 md:mr-4 lg:mr-0;
+
+          .proposals__aside-progress {
+            @apply flex flex-col-reverse w-[80%] items-center;
+          }
+
+          .progress-bar {
+            &__number {
+              @apply lg:w-[80%];
+
+              span {
+                @apply text-sm;
+              }
+            }
+
+            &__units {
+              @apply flex justify-center w-[80%];
+            }
+          }
+        }
+
+        &-unlimited {
+          @apply flex flex-row flex-1 lg:flex-1 md:flex-none md:mr-4 lg:mr-0;
+
+          .progress-bar__number {
+            span {
+              @apply text-xl;
+            }
+          }
+        }
+
+        .progress-bar {
+          &__number {
+            @apply flex justify-center items-center;
+
+            span {
+              @apply leading-6 font-semibold #{!important};
+            }
+          }
+
+          &__units {
+            @apply text-sm leading-[22px] mx-1;
+          }
+        }
+
+        &-container {
+          @apply flex-1 lg:w-[164px] lg:flex-none;
+
+          button {
+            @apply text-sm leading-[18px] font-semibold py-1;
+
+            .already-voted-icon {
+              @apply w-4 h-4;
+            }
+          }
+        }
+
+        &-hidden {
+          @apply md:justify-end;
+
+          .card__proposals-votes-container {
+            @apply md:flex-none md:w-[130px] lg:w-[164px];
+
+            button {
+              @apply md:px-0 lg:px-6;
+            }
+          }
+        }
+      }
+    }
   }
 }
 
@@ -133,3 +331,46 @@
     }
   }
 }
+
+#proposal-voting-rules {
+  [id="dropdown-menu-proposal-voting-rules"] {
+    &[aria-hidden="true"] {
+      @apply hidden;
+    }
+  }
+
+  [data-target="dropdown-menu-proposal-voting-rules"] {
+    @apply w-full flex items-center justify-between gap-2 p-2 first-of-type:[&>svg]:block last-of-type:[&>svg]:hidden;
+
+    & > span {
+      @apply hidden font-semibold text-secondary;
+
+      &:only-of-type,
+      &.is-active {
+        @apply flex items-center gap-2 [&_svg]:fill-current;
+      }
+    }
+
+    > svg {
+      @apply w-6 h-6 flex-none text-secondary fill-current;
+    }
+
+    &[aria-expanded="false"] > svg:last-of-type,
+    &[aria-expanded="true"] > svg:first-of-type {
+      @apply hidden;
+    }
+
+    &[aria-expanded="true"] > svg:last-of-type,
+    &[aria-expanded="false"] > svg:first-of-type {
+      @apply block;
+    }
+  }
+}
+
+.layout-item-complementary {
+  @apply container grid grid-cols-1 lg:grid-cols-12;
+
+  .item_voting_rules {
+    @apply lg:col-start-2 lg:col-span-10;
+  }
+}

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

@@ -30,11 +30,8 @@ module Decidim
           # time limit.
           allow! if permission_action.subject == :proposal && permission_action.action == :edit && admin_edition_is_available?
 
-          # Every user allowed by the space can update the category of the proposal
-          allow! if permission_action.subject == :proposal_category && permission_action.action == :update
-
-          # Every user allowed by the space can update the scope of the proposal
-          allow! if permission_action.subject == :proposal_scope && permission_action.action == :update
+          # Every user allowed by the space can update the taxonomy of the proposal
+          allow! if permission_action.subject == :proposal_taxonomy && permission_action.action == :update
 
           # Every user allowed by the space can import proposals from another_component
           allow! if permission_action.subject == :proposals && permission_action.action == :import

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

@@ -4,17 +4,20 @@ module Decidim
   module Proposals
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        return permission_action unless user
-
         # Delegate the admin permission checks to the admin permissions class
         return Decidim::Proposals::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
 
+        toggle_allow(!proposal.hidden?) if permission_action.subject == :proposal && permission_action.action == :read
+        return permission_action unless user
+
         case permission_action.subject
         when :proposal
-          apply_proposal_permissions(permission_action)
+          apply_proposal_permissions(permission_action) unless permission_action.action == :read
         when :collaborative_draft
           apply_collaborative_draft_permissions(permission_action)
+        when :proposal_coauthor_invites
+          apply_proposal_coauthor_invites(permission_action)
         else
           permission_action
         end
@@ -158,6 +161,46 @@ module Decidim
 
         toggle_allow(collaborative_draft.created_by?(user))
       end
+
+      def apply_proposal_coauthor_invites(permission_action)
+        return toggle_allow(false) unless coauthor
+        return toggle_allow(false) unless proposal
+
+        case permission_action.action
+        when :invite
+          toggle_allow(valid_coauthor? && !notification_already_sent?)
+        when :cancel
+          toggle_allow(valid_coauthor? && notification_already_sent?)
+        when :accept, :decline
+          toggle_allow(can_be_coauthor?)
+        end
+      end
+
+      def coauthor
+        context.fetch(:coauthor, nil)
+      end
+
+      def notification_already_sent?
+        @notification_already_sent ||= proposal.coauthor_invitations_for(coauthor).any?
+      end
+
+      def coauthor_in_comments?
+        @coauthor_in_comments ||= proposal.comments.where(author: coauthor).any?
+      end
+
+      def valid_coauthor?
+        return false unless proposal.authors.include?(user)
+        return false unless proposal.user_has_actions?(coauthor)
+
+        coauthor_in_comments?
+      end
+
+      def can_be_coauthor?
+        return false unless user == coauthor
+        return false unless proposal.user_has_actions?(coauthor)
+
+        notification_already_sent?
+      end
     end
   end
 end

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

@@ -27,7 +27,7 @@ module Decidim
 
         def action_string
           case action
-          when "answer", "create", "update", "publish_answer"
+          when "answer", "create", "update", "publish_answer", "soft_delete", "restore"
             "decidim.proposals.admin_log.proposal.#{action}"
           else
             super

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

@@ -40,7 +40,7 @@ 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:
+        super(proposal.title, links, html_escape, all_locales, extras:)
       end
 
       def id_and_title(links: false, extras: true, html_escape: false)

data/app/queries/decidim/proposals/filtered_proposals.rb

@@ -28,8 +28,8 @@ module Decidim
       # by a range of dates.
       def query
         proposals = Decidim::Proposals::Proposal.where(component: @components)
-        proposals = proposals.where("created_at >= ?", @start_at) if @start_at.present?
-        proposals = proposals.where("created_at <= ?", @end_at) if @end_at.present?
+        proposals = proposals.where(created_at: @start_at..) if @start_at.present?
+        proposals = proposals.where(created_at: ..@end_at) if @end_at.present?
         proposals
       end
     end

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

@@ -18,13 +18,13 @@ 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.created_at <= ?", end_time).accepted
+          @query = @query.where(decidim_proposals_proposals: { created_at: ..end_time }).accepted
           @query = @query.group("decidim_categorizations.id", :participatory_space_type, :participatory_space_id)
           @query
         end
 
         def quantity
-          @quantity ||= query.where("decidim_proposals_proposals.created_at >= ?", start_time).count
+          @quantity ||= query.where(decidim_proposals_proposals: { created_at: start_time.. }).count
         end
       end
     end

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

@@ -13,9 +13,9 @@ module Decidim
             next if cumulative_value.zero?
 
             quantity_value = quantity[key] || 0
-            category_id, space_type, space_id, proposal_id = key
+            taxonomy_id, space_type, space_id, proposal_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
-                                                           organization: @organization, decidim_category_id: category_id,
+                                                           organization: @organization, decidim_taxonomy_id: taxonomy_id,
                                                            participatory_space_type: space_type, participatory_space_id: space_id,
                                                            related_object_type: "Decidim::Proposals::Proposal", related_object_id: proposal_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
@@ -31,18 +31,18 @@ module Decidim
           components = Decidim::Component.where(participatory_space: retrieve_participatory_spaces).published
           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
-            ON (proposals.id = decidim_categorizations.categorizable_id
-            AND decidim_categorizations.categorizable_type = 'Decidim::Proposals::Proposal')
+          join_taxonomies = <<~EOJOINCATS
+            LEFT OUTER JOIN decidim_taxonomizations
+            ON (proposals.id = decidim_taxonomizations.taxonomizable_id
+            AND decidim_taxonomizations.taxonomizable_type = 'Decidim::Proposals::Proposal')
           EOJOINCATS
           @query = Decidim::Endorsement.joins("INNER JOIN decidim_proposals_proposals proposals ON resource_id = proposals.id")
                                        .joins(join_components)
-                                       .joins(join_categories)
+                                       .joins(join_taxonomies)
                                        .where(resource_id: proposals.pluck(:id))
                                        .where(resource_type: Decidim::Proposals::Proposal.name)
-          @query = @query.where("decidim_endorsements.created_at <= ?", end_time)
-          @query = @query.group("decidim_categorizations.id",
+          @query = @query.where(decidim_endorsements: { created_at: ..end_time })
+          @query = @query.group("decidim_taxonomizations.taxonomy_id",
                                 :participatory_space_type,
                                 :participatory_space_id,
                                 :resource_id)
@@ -50,7 +50,7 @@ module Decidim
         end
 
         def quantity
-          @quantity ||= query.where("decidim_endorsements.created_at >= ?", start_time).count
+          @quantity ||= query.where(decidim_endorsements: { created_at: start_time.. }).count
         end
       end
     end

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

@@ -30,17 +30,17 @@ module Decidim
 
         def retrieve_proposals_followers(from_start: false)
           @proposals_followers ||= Decidim::Follow.where(followable: retrieve_proposals).joins(:user)
-                                                  .where("decidim_follows.created_at <= ?", end_time)
+                                                  .where(decidim_follows: { created_at: ..end_time })
 
-          return @proposals_followers.where("decidim_follows.created_at >= ?", start_time) if from_start
+          return @proposals_followers.where(decidim_follows: { created_at: start_time.. }) if from_start
 
           @proposals_followers
         end
 
         def retrieve_drafts_followers(from_start: false)
           @drafts_followers ||= Decidim::Follow.where(followable: retrieve_collaborative_drafts).joins(:user)
-                                               .where("decidim_follows.created_at <= ?", end_time)
-          return @drafts_followers.where("decidim_follows.created_at >= ?", start_time) if from_start
+                                               .where(decidim_follows: { created_at: ..end_time })
+          return @drafts_followers.where(decidim_follows: { created_at: start_time.. }) if from_start
 
           @drafts_followers
         end

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

@@ -41,19 +41,19 @@ module Decidim
                                                                 "Decidim::Meetings::Meeting"
                                                               ]
                                                             })
-                                                     .where("decidim_proposals_proposals.published_at <= ?", end_time)
+                                                     .where(decidim_proposals_proposals: { published_at: ..end_time })
                                                      .not_withdrawn
 
-          return @proposals.where("decidim_proposals_proposals.published_at >= ?", start_time) if from_start
+          return @proposals.where(decidim_proposals_proposals: { published_at: start_time.. }) if from_start
 
           @proposals
         end
 
         def retrieve_votes(from_start: false)
           @votes ||= Decidim::Proposals::ProposalVote.joins(:proposal).where(proposal: retrieve_proposals).joins(:author)
-                                                     .where("decidim_proposals_proposal_votes.created_at <= ?", end_time)
+                                                     .where(decidim_proposals_proposal_votes: { created_at: ..end_time })
 
-          return @votes.where("decidim_proposals_proposal_votes.created_at >= ?", start_time) if from_start
+          return @votes.where(decidim_proposals_proposal_votes: { created_at: start_time.. }) if from_start
 
           @votes
         end
@@ -61,10 +61,10 @@ module Decidim
         def retrieve_endorsements(from_start: false)
           @endorsements ||= Decidim::Endorsement.joins("INNER JOIN decidim_proposals_proposals proposals ON resource_id = proposals.id")
                                                 .where(resource: retrieve_proposals)
-                                                .where("decidim_endorsements.created_at <= ?", end_time)
+                                                .where(decidim_endorsements: { created_at: ..end_time })
                                                 .where(decidim_author_type: "Decidim::UserBaseEntity")
 
-          return @endorsements.where("decidim_endorsements.created_at >= ?", start_time) if from_start
+          return @endorsements.where(decidim_endorsements: { created_at: start_time.. }) if from_start
 
           @endorsements
         end