decidim-decidim_awesome 0.10.2 → 0.11.1

data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/modal.erb

@@ -0,0 +1,18 @@
+<%= decidim_modal id: "voting-cards-modal-help", class:"reveal vote_proposal_modal voting-voting_cards" do %>
+  <div data-dialog-container>
+    <div class="reveal__content">
+      <div class="instructions mb-4"><%= vote_instructions %></div>
+      <div class="current-choice voting-voting_cards mb-4">
+        <div class="vote-card"></div>
+      </div>
+      <div class="future-dismiss">
+          <%= check_box_tag "voting_cards-skip_help", current_component.id, false %>
+          <%= label_tag "voting_cards-skip_help", t("decidim.decidim_awesome.voting.voting_cards.modal.skip") %>
+      </div>
+    </div>
+  </div>
+  <div data-dialog-actions>
+    <button type="button" class="button button__lg button__primary hover:bg-secondary vote-action" style="background-color: #e02d2d;"><%= t("decidim.decidim_awesome.voting.voting_cards.modal.proceed") %></button>
+    <button type="button" class="button button__lg button__transparent-secondary cancel-action hollow secondary" data-dialog-close="voting-cards-modal-help"><%= t("decidim.decidim_awesome.voting.voting_cards.modal.cancel") %></button>
+  </div>
+<% end %>

data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal/show.erb

@@ -1,35 +1,40 @@
-<h4 class="heading4 vote-title"><%= title %></h4>
+<div class="flex flex-col justify-center awesome-voting-card">
+  <h4 class="heading4 vote-title mb-2" style="font-size:1.375rem;"><%= title %></h4>
 
-<div class="flex--sbc">
-  <%= vote_block_for(proposal, 3) %>
-  <%= vote_block_for(proposal, 2) %>
-  <%= vote_block_for(proposal, 1) %>
-</div>
+  <div class="flex flex-row gap-1.5 mt-4">
+    <%= vote_block_for(proposal, 3) %>
+    <%= vote_block_for(proposal, 2) %>
+    <%= vote_block_for(proposal, 1) %>
+  </div>
+
+  <% if component_settings.voting_cards_show_abstain? %>
+    <%= action_authorized_link_to :vote,
+                                  voted_for?(0) ? t("decidim.decidim_awesome.voting.voting_cards.abstained") : proposal.manifest.label_for(0),
+                                  proposal_vote_path(0),
+                                  link_options(0).merge({
+                                    title: t("decidim.decidim_awesome.voting.voting_cards.voting_for", proposal: sanitized_title, type: proposal.manifest.label_for(0)),
+                                    class: "button button__sm button__transparent-secondary mb-4 vote-action abstain-button #{classes_for(0)}"
+                                    }) %>
+  <% end %>
 
-<% if component_settings.voting_cards_show_abstain? %>
-  <%= action_authorized_link_to :vote,
-                                voted_for?(0) ? t("decidim.decidim_awesome.voting.voting_cards.abstained") : proposal.manifest.label_for(0),
-                                proposal_vote_path(0),
-                                link_options(0).merge({
-                                  title: t("decidim.decidim_awesome.voting.voting_cards.voting_for", proposal: sanitized_title, type: proposal.manifest.label_for(0)),
-                                  class: "button expanded vote-action abstain-button small #{classes_for(0)}"
-                                  }) %>
-<% end %>
+  <% if voted_for_any? && !current_settings.votes_blocked? %>
+    <p class="text-center" style="margin-bottom:1rem;">
+      <%= action_authorized_link_to :unvote,
+                                    t("decidim.decidim_awesome.voting.voting_cards.change_vote"),
+                                    proposal_vote_path(current_vote&.weight),
+                                    remote: true,
+                                    method: :delete,
+                                    id: "change-vote",
+                                    class: "change-vote-button vote-action font-semibold" %>
+    </p>
+  <% elsif proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
+    <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.maximum_votes_reached") %></p>
+  <% elsif vote_limit_enabled? && remaining_votes_count_for(current_user) <= 0 %>
+    <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.no_votes_remaining") %></p>
+  <% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
+    <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.votes_blocked") %></p>
+  <% end %>
+
+</div>
 
-<% if voted_for_any? && !current_settings.votes_blocked? %>
-  <p class="text-center">
-    <%= action_authorized_link_to :unvote,
-                                  t("decidim.decidim_awesome.voting.voting_cards.change_vote"),
-                                  proposal_vote_path(current_vote&.weight),
-                                  remote: true,
-                                  method: :delete,
-                                  id: "change-vote",
-                                  class: "change-vote-button vote-action" %>
-  </p>
-<% elsif proposal.maximum_votes_reached? && !proposal.can_accumulate_supports_beyond_threshold && current_component.participatory_space.can_participate?(current_user) %>
-  <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.maximum_votes_reached") %></p>
-<% elsif vote_limit_enabled? && remaining_votes_count_for(current_user) <= 0 %>
-  <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.no_votes_remaining") %></p>
-<% elsif current_settings.votes_blocked? || !current_component.participatory_space.can_participate?(current_user) %>
-  <p class="text-center"><%= t("decidim.proposals.proposals.vote_button.votes_blocked") %></p>
-<% end %>
+<%= render :modal if current_component.settings.voting_cards_show_modal_help %>

data/app/cells/decidim/decidim_awesome/voting/voting_cards_proposal_cell.rb

@@ -12,11 +12,16 @@ module Decidim
 
         def vote_block_for(proposal, weight)
           render partial: "vote_block", locals: {
-            proposal: proposal,
-            weight: weight
+            proposal:,
+            weight:
           }
         end
 
+        def vote_instructions
+          translated_attribute(current_component.settings.voting_cards_instructions).presence || t("decidim.decidim_awesome.voting.voting_cards.default_instructions_html",
+                                                                                                   organization: current_organization.name)
+        end
+
         def proposal_votes(weight)
           model.weight_count(weight)
         end
@@ -30,7 +35,7 @@ module Decidim
         end
 
         def proposal_vote_path(weight)
-          proposal_proposal_vote_path(proposal_id: proposal.id, from_proposals_list: from_proposals_list, weight: weight)
+          proposal_proposal_vote_path(proposal_id: proposal.id, from_proposals_list:, weight:)
         end
 
         def link_options(weight)
@@ -68,7 +73,7 @@ module Decidim
             return true
           end
 
-          return true if vote_limit_enabled? && remaining_votes_count_for(current_user) <= 0
+          true if vote_limit_enabled? && remaining_votes_count_for(current_user) <= 0
         end
 
         def voted_for_any?

data/app/commands/concerns/decidim/decidim_awesome/admin/needs_constraint_helpers.rb

@@ -11,7 +11,7 @@ module Decidim
           subconfig = AwesomeConfig.find_or_initialize_by(var: "#{var}_#{@ident}", organization: @organization)
           @constraint = ConfigConstraint.create!(
             awesome_config: subconfig,
-            settings: settings
+            settings:
           )
         end
 
@@ -20,7 +20,7 @@ module Decidim
           return true if constraint.awesome_config.constraints.count > 1
 
           case constraint.awesome_config.var.to_s
-          when /^proposal_custom_field/
+          when /^proposal_(private_)?custom_field/
             false
           else
             true

data/app/commands/concerns/decidim/decidim_awesome/proposals/admin/update_proposal_override.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      module Admin
+        ##
+        # Decorates update draft and update proposal
+        # to avoid private field to be logged in PaperTrail.
+        module UpdateProposalOverride
+          extend ActiveSupport::Concern
+
+          included do
+            private
+
+            alias_method :decidim_original_update_proposal, :update_proposal
+
+            def update_proposal
+              decidim_original_update_proposal
+              update_private_field!
+            end
+
+            def update_private_field!
+              @proposal.update_private_body!(form.private_body) if form.private_body.present?
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/proposals/create_collaborative_draft_override.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      ##
+      # Decorate create_collaborative_draft to avoid
+      # private data to be in PaperTrail
+      module CreateCollaborativeDraftOverride
+        extend ActiveSupport::Concern
+
+        included do
+          private
+
+          alias_method :decidim_original_create_collaborative_draft, :create_collaborative_draft
+
+          def create_collaborative_draft
+            created_draft = decidim_original_create_collaborative_draft
+            # Update the proposal with the private body, to
+            # avoid tracebility on private fields.
+            created_draft.update_private_body!(form.private_body) if form.private_body.present?
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/proposals/create_proposal_override.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      ##
+      # Decorate create_proposal to avoid
+      # private data to be in PaperTrail
+      module CreateProposalOverride
+        extend ActiveSupport::Concern
+
+        included do
+          private
+
+          alias_method :decidim_original_create_proposal, :create_proposal
+
+          def create_proposal
+            created_proposal = decidim_original_create_proposal
+            # Update the proposal with the private body, to
+            # avoid tracebility on private fields.
+            created_proposal.update_private_body!(form.private_body) if form.private_body.present?
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/proposals/update_collaborative_draft_override.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      ##
+      # Decorates update draft and update proposal
+      # to avoid private field to be logged in PaperTrail.
+      module UpdateCollaborativeDraftOverride
+        extend ActiveSupport::Concern
+
+        included do
+          private
+
+          alias_method :decidim_original_update_collaborative_draft, :update_collaborative_draft
+
+          def update_collaborative_draft
+            decidim_original_update_collaborative_draft
+            # Update the proposal with the private body, to
+            # avoid tracebility on private fields.
+            @collaborative_draft.update_private_body!(form.private_body) if form.private_body.present?
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/proposals/update_proposal_override.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      ##
+      # Decorates update draft and update proposal
+      # to avoid private field to be logged in PaperTrail.
+      module UpdateProposalOverride
+        extend ActiveSupport::Concern
+        include Admin::UpdateProposalOverride
+
+        included do
+          private
+
+          alias_method :decidim_original_update_draft, :update_draft
+
+          def update_proposal
+            decidim_original_update_proposal
+            update_private_field!
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/decidim/decidim_awesome/admin/create_constraint.rb

@@ -18,7 +18,7 @@ module Decidim
         #
         # Returns nothing.
         def call
-          return broadcast(:invalid) if form.invalid?
+          return broadcast(:invalid, form.errors.full_messages.join(". ")) if form.invalid?
           return broadcast(:invalid) if attributes.blank?
 
           begin

data/app/commands/decidim/decidim_awesome/admin/create_proposal_custom_field.rb

@@ -8,9 +8,10 @@ module Decidim
 
         # Public: Initializes the command.
         #
-        def initialize(organization)
+        def initialize(organization, config_var = :proposal_custom_fields)
           @organization = organization
           @ident = rand(36**8).to_s(36)
+          @config_var = config_var
         end
 
         # Executes the command. Broadcasts these events:
@@ -20,13 +21,13 @@ module Decidim
         #
         # Returns nothing.
         def call
-          fields = AwesomeConfig.find_or_initialize_by(var: :proposal_custom_fields, organization: @organization)
+          fields = AwesomeConfig.find_or_initialize_by(var: @config_var, organization: @organization)
           fields.value = {} unless fields.value.is_a? Hash
           # TODO: prevent (unlikely) colisions with exisiting values
           fields.value[@ident] = default_definition
           fields.save!
 
-          create_constraint_never(:proposal_custom_field)
+          create_constraint_never(@config_var == :proposal_custom_fields ? :proposal_custom_field : :proposal_private_custom_field)
 
           broadcast(:ok, @ident)
         rescue StandardError => e

data/app/commands/decidim/decidim_awesome/admin/destroy_custom_redirect.rb

@@ -11,7 +11,7 @@ module Decidim
         def initialize(item, organization)
           @item = item
           @organization = organization
-          @redirections = AwesomeConfig.find_by(var: :custom_redirects, organization: organization)
+          @redirections = AwesomeConfig.find_by(var: :custom_redirects, organization:)
         end
 
         # Executes the command. Broadcasts these events:

data/app/commands/decidim/decidim_awesome/admin/destroy_menu_hack.rb

@@ -11,7 +11,7 @@ module Decidim
         def initialize(item, menu_name, organization)
           @item = item
           @organization = organization
-          @menu = AwesomeConfig.find_by(var: menu_name, organization: organization)
+          @menu = AwesomeConfig.find_by(var: menu_name, organization:)
         end
 
         # Executes the command. Broadcasts these events:

data/app/commands/decidim/decidim_awesome/admin/destroy_proposal_custom_field.rb

@@ -8,9 +8,10 @@ module Decidim
         #
         # key - the key to destroy inise proposal_custom_fields
         # organization
-        def initialize(key, organization)
+        def initialize(key, organization, config_var = :proposal_custom_fields)
           @key = key
           @organization = organization
+          @config_var = config_var
         end
 
         # Executes the command. Broadcasts these events:
@@ -20,14 +21,16 @@ module Decidim
         #
         # Returns nothing.
         def call
-          fields = AwesomeConfig.find_by(var: :proposal_custom_fields, organization: @organization)
+          fields = AwesomeConfig.find_by(var: @config_var, organization: @organization)
           return broadcast(:invalid, "Not a hash") unless fields&.value.is_a? Hash
           return broadcast(:invalid, "#{key} key invalid") unless fields.value.has_key?(@key)
 
           fields.value.except!(@key)
           fields.save!
+
           # remove constrains associated (a new config var is generated automatically, by removing it, it will trigger destroy on dependents)
-          constraint = AwesomeConfig.find_by(var: "proposal_custom_field_#{@key}", organization: @organization)
+          constraint = @config_var == :proposal_custom_fields ? :proposal_custom_field : :proposal_private_custom_field
+          constraint = AwesomeConfig.find_by(var: "#{constraint}_#{@key}", organization: @organization)
           constraint.destroy! if constraint.present?
 
           broadcast(:ok, @key)

data/app/commands/decidim/decidim_awesome/admin/rename_scope_label.rb

@@ -34,7 +34,7 @@ module Decidim
             end
           end
 
-          broadcast(:ok, { scope: scope, key: @text })
+          broadcast(:ok, { scope:, key: @text })
         rescue StandardError => e
           broadcast(:invalid, e.message)
         end

data/app/commands/decidim/decidim_awesome/admin/update_constraint.rb

@@ -18,7 +18,7 @@ module Decidim
         #
         # Returns nothing.
         def call
-          return broadcast(:invalid) if form.invalid?
+          return broadcast(:invalid, form.errors.full_messages.join(". ")) if form.invalid?
           return broadcast(:invalid) if attributes.blank?
 
           begin

data/app/commands/decidim/decidim_awesome/admin/update_custom_redirect.rb

@@ -38,8 +38,8 @@ module Decidim
         delegate :to_params, to: :form
 
         def url_exists?
-          return unless redirects
-          return unless redirects.value.is_a? Hash
+          return false unless redirects
+          return false unless redirects.value.is_a? Hash
 
           redirects.value[item.origin].present?
         end

data/app/commands/decidim/decidim_awesome/command.rb

@@ -2,13 +2,7 @@
 
 module Decidim
   module DecidimAwesome
-    # maintains compatibility with v0.26 which uses Rectify
-    if defined? ::Decidim::Command
-      class Command < ::Decidim::Command
-      end
-    else
-      class Command < ::Rectify::Command
-      end
+    class Command < ::Decidim::Command
     end
   end
 end

data/app/controllers/concerns/decidim/decidim_awesome/admin/maintenance_context.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Admin
+      module MaintenanceContext
+        extend ActiveSupport::Concern
+
+        included do
+          layout "decidim/decidim_awesome/admin/maintenance"
+          helper_method :current_view, :available_views, :present_private_data
+
+          private
+
+          def present_private_data(model)
+            PrivateDataPresenter.new(model)
+          end
+
+          def current_view
+            return params[:id] if available_views.include?(params[:id])
+
+            available_views.keys.first
+          end
+
+          def available_views
+            {
+              "private_data" => {
+                title: I18n.t("private_data", scope: "decidim.decidim_awesome.admin.menu.maintenance"),
+                icon: "spy-line",
+                path: decidim_admin_decidim_awesome.maintenance_path("private_data")
+              },
+              "checks" => {
+                title: I18n.t("checks", scope: "decidim.decidim_awesome.admin.menu.maintenance"),
+                icon: "pulse",
+                path: decidim_admin_decidim_awesome.checks_maintenance_index_path
+              }
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/decidim_awesome/admin_accountability/admin/filterable_helper.rb

@@ -18,7 +18,7 @@ module Decidim
                 concat "#{i18n_filter_label(:admin_role_type, filterable_i18n_scope_from_ctx(i18n_ctx))}: "
                 concat t("decidim.decidim_awesome.admin.admin_accountability.admin_roles.#{params[:admin_role_type]}", default: params[:admin_role_type])
                 concat icon_link_to(
-                  "circle-x",
+                  "close-circle-line",
                   url_for(export_params.except(:admin_role_type)),
                   t("decidim.admin.actions.cancel"),
                   class: "action-icon--remove"

data/app/controllers/concerns/decidim/decidim_awesome/content_security_policy.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module ContentSecurityPolicy
+      extend ActiveSupport::Concern
+
+      included do
+        after_action :append_awesome_csp_directives
+      end
+
+      private
+
+      def append_awesome_csp_directives
+        # this is necessary for custom fields
+        content_security_policy.append_csp_directive("font-src", "data:") if DecidimAwesome.enabled?(:proposal_custom_fields)
+        append_awesome_intergram_directives
+      end
+
+      def append_awesome_intergram_directives
+        return unless DecidimAwesome.enabled?(:intergram_for_admins) || DecidimAwesome.enabled?(:intergram_for_public)
+
+        intergram = URI.parse(DecidimAwesome.intergram_url)
+        if intergram.host && intergram.scheme
+          content_security_policy.append_csp_directive("script-src", "#{intergram.scheme}://#{intergram.host}")
+          content_security_policy.append_csp_directive("frame-src", "#{intergram.scheme}://#{intergram.host}")
+          # this script is in the intergram code, but does not look necessary to work
+          # content_security_policy.append_csp_directive("frame-src", "http://www.loadmill.com")
+          # content_security_policy.append_csp_directive("frame-src", "http://app.loadmill.com")
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/decidim_awesome/limit_pending_amendments.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module LimitPendingAmendments
+      extend ActiveSupport::Concern
+
+      included do
+        # rubocop:disable Rails/LexicallyScopedActionFilter
+        before_action :limit_pending_amendments, only: [:new, :create]
+        # rubocop:enable Rails/LexicallyScopedActionFilter
+
+        private
+
+        def limit_pending_amendments
+          return unless amendable&.amendments && amendable&.component&.settings.try(:limit_pending_amendments)
+          return unless amendable.component.settings.try(:amendments_enabled)
+          return unless amendable.component.current_settings.try(:amendment_creation_enabled)
+
+          return unless existing_emendations.any?
+
+          flash[:alert] = t("pending_limit_reached", scope: "decidim.decidim_awesome.amendments", emendation: translated_attribute(existing_emendations.first.title))
+          redirect_back(fallback_location: Decidim::ResourceLocatorPresenter.new(amendable).path)
+        end
+
+        def existing_emendations
+          @existing_emendations ||= begin
+            existing = amendable.amendments.where(state: :evaluating)
+            existing.filter_map { |amendment| !amendment.emendation&.hidden? && amendment.emendation }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/concerns/decidim/decidim_awesome/not_found_redirect.rb

@@ -50,7 +50,7 @@ module Decidim
             destination = "#{destination}#{union}#{query}"
           end
 
-          return destination.strip if destination.present?
+          destination.strip if destination.present?
         end
       end
     end

data/app/controllers/concerns/decidim/decidim_awesome/proposals/proposal_votes_controller_override.rb

@@ -13,7 +13,7 @@ module Decidim
           # rubocop:enable Rails/LexicallyScopedActionFilter
 
           def create
-            enforce_permission_to :vote, :proposal, proposal: proposal
+            enforce_permission_to(:vote, :proposal, proposal:)
             @from_proposals_list = params[:from_proposals_list] == "true"
 
             Decidim::Proposals::VoteProposal.call(proposal, current_user) do
@@ -27,7 +27,7 @@ module Decidim
                   proposal: Decidim::Proposals::Proposal.where(component: current_component)
                 ).map(&:proposal)
 
-                expose(proposals: proposals)
+                expose(proposals:)
                 render :update_buttons_and_counters
               end
 
@@ -47,7 +47,7 @@ module Decidim
           end
 
           def current_vote
-            @current_vote ||= Decidim::Proposals::ProposalVote.find_by(author: current_user, proposal: proposal)
+            @current_vote ||= Decidim::Proposals::ProposalVote.find_by(author: current_user, proposal:)
           end
 
           def vote_manifest

data/app/controllers/decidim/decidim_awesome/admin/application_controller.rb

@@ -9,6 +9,8 @@ module Decidim
       # Note that it inherits from `Decidim::Admin::Components::BaseController`, which
       # override its layout and provide all kinds of useful methods.
       class ApplicationController < Decidim::Admin::ApplicationController
+        layout "decidim/decidim_awesome/admin/application"
+
         def permission_class_chain
           [::Decidim::DecidimAwesome::Admin::Permissions] + super
         end