decidim-decidim_awesome 0.8.0 → 0.12.0

data/Rakefile

@@ -26,6 +26,7 @@ def copy_helpers
   FileUtils.mkdir_p "spec/decidim_dummy_app/app/views/v0.11", verbose: true
   FileUtils.cp_r "lib/decidim/decidim_awesome/test/layouts", "spec/decidim_dummy_app/app/views/v0.11/layouts", verbose: true
   FileUtils.cp "lib/decidim/decidim_awesome/test/initializer.rb", "spec/decidim_dummy_app/config/initializers/decidim_awesome.rb", verbose: true
+  FileUtils.cp "spec/fixtures/files/tile-0.png", "spec/decidim_dummy_app/public/tile-0.png", verbose: true
 end
 
 desc "Generates a dummy app for testing"
@@ -51,6 +52,6 @@ task :development_app do
   end
 
   install_module("development_app")
-  seed_db("development_app")
   override_webpacker_config_files("development_app")
+  seed_db("development_app")
 end

data/app/cells/concerns/decidim/decidim_awesome/global_menu_cell_override.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module GlobalMenuCellOverride
+      extend ActiveSupport::Concern
+
+      included do
+        def cache_hash
+          [
+            "decidim/content_blocks/global_menu",
+            current_organization.cache_key_with_version,
+            I18n.locale,
+            awesome_config[:home_content_block_menu].to_s
+          ].join(Decidim.cache_key_separator)
+        end
+      end
+    end
+  end
+end

data/app/cells/concerns/decidim/decidim_awesome/proposal_l_cell_override.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module ProposalLCellOverride
+      extend ActiveSupport::Concern
+
+      included do
+        private
+
+        alias_method :decidim_original_cache_hash, :cache_hash
+
+        def metadata_cell
+          @metadata_cell ||= awesome_voting_manifest_for(resource&.component)&.proposal_metadata_cell.presence || "decidim/proposals/proposal_metadata"
+        end
+
+        def cache_hash
+          all_extra_fields = memoize("extra_fields")
+          extra_fields = all_extra_fields ? all_extra_fields[resource.id] : resource.extra_fields
+
+          @cache_hash ||= "#{decidim_original_cache_hash}#{Decidim.cache_key_separator}#{extra_fields&.vote_weight_totals}"
+        end
+      end
+    end
+  end
+end

data/app/cells/decidim/decidim_awesome/content_blocks/map/show.erb

@@ -1,14 +1,7 @@
-<section class="wrapper-home map-block home-section">
-  <div class="row">
+<section class="map-block home__section">
+  <%= content_tag("h3", section_title) if section_title.present? %>
 
-    <%= section_title %></h3>
-
-    <div class="row">
-      <div class="columns medium-12">
-        <%= awesome_map_for global_map_components do %>
-          <%= render partial: "decidim/decidim_awesome/map_component/map/map_template.html", locals: { categories: all_categories, map_height: model.settings.map_height } %>
-        <% end %>
-      </div>
-    </div>
-  </div>
+  <%= awesome_map_for global_map_components do %>
+    <%= render partial: "decidim/decidim_awesome/map_component/map/map_template.html", locals: { categories: all_categories, map_height: model.settings.map_height } %>
+  <% end %>
 </section>

data/app/cells/decidim/decidim_awesome/content_blocks/map_cell.rb

@@ -40,13 +40,13 @@ module Decidim
 
         def global_map_components
           @global_map_components ||= Decidim::Component.where(manifest_name: [:meetings, :proposals]).published.filter do |component|
-            case component.manifest.name
-            when :meetings
-              true
-            when :proposals
-              component.settings.geocoding_enabled
-            else
-              false
+            if component.organization == current_organization
+              case component.manifest.name
+              when :meetings
+                true
+              when :proposals
+                component.settings.geocoding_enabled
+              end
             end
           end
         end

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

@@ -0,0 +1,69 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Voting
+      # This cell renders metadata for an instance of a Proposal
+      class ProposalMetadataCell < ::Decidim::Proposals::ProposalMetadataCell
+        private
+
+        def proposal_items
+          [coauthors_item, comments_count_item, endorsements_count_item, weight_count_item, state_item, emendation_item]
+        end
+
+        def current_vote
+          @current_vote ||= vote_for(current_user) if current_user
+        end
+
+        def user_voted_weight
+          current_vote&.weight
+        end
+
+        def all_weights
+          @all_weights ||= begin
+            weights = [3, 2, 1]
+            weights << 0 if resource.component.settings.voting_cards_show_abstain
+            weights.index_with do |weight|
+              weight_count_for(weight)
+            end
+          end
+        end
+
+        def weight_tags
+          @weight_tags ||= all_weights.map do |num, weight|
+            content_tag "span", title: resource.manifest.label_for(num), class: "voting-weight_#{num}" do
+              "#{t("decidim.decidim_awesome.voting.voting_cards.weights.weight_#{num}_short")} #{weight}"
+            end.html_safe
+          end
+        end
+
+        def weight_count_item
+          # return unless resource.respond_to?(:weight_count)
+          return if resource.component.current_settings.votes_hidden?
+          return if resource&.rejected? || resource&.withdrawn?
+
+          {
+            text: weight_tags.join(" | ").html_safe,
+            icon: "#{user_voted_weight ? "checkbox" : "close"}-circle-line",
+            data_attributes: all_weights.transform_keys { |num| "weight-#{num}" }
+          }
+        end
+
+        def vote_for(user)
+          user_votes = memoize("user_votes")
+          return user_votes[resource.id] if user_votes
+
+          resource.votes.find_by(author: user)
+        end
+
+        def weight_count_for(weight)
+          all_extra_fields = memoize("extra_fields")
+          extra_fields = all_extra_fields ? all_extra_fields[resource.id] : resource.extra_fields
+          return 0 unless extra_fields
+
+          extra_fields.vote_weight_totals[weight.to_s] || 0
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Voting
+      class VotingCardsBaseCell < Decidim::ViewModel
+        include Decidim::IconHelper
+        include Decidim::ComponentPathHelper
+        include Decidim::Proposals::ProposalVotesHelper
+        include Decidim::Proposals::Engine.routes.url_helpers
+
+        delegate :current_settings, to: :current_component
+
+        def proposal
+          model
+        end
+
+        def sanitized_title
+          strip_tags(translated_attribute(proposal.title))
+        end
+
+        def current_component
+          proposal.component
+        end
+
+        def component_settings
+          current_component.settings
+        end
+
+        def current_vote
+          @current_vote ||= Decidim::Proposals::ProposalVote.find_by(author: current_user, proposal: model)
+        end
+
+        def user_voted_weight
+          current_vote&.weight
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+<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 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 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_votes_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>
+
+<%= render :modal if current_component.settings.voting_cards_show_modal_help %>

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

@@ -0,0 +1,16 @@
+<div id="vote-container" data-proposal-id="<%= proposal.id %>">
+  <div class="vote-block">
+    <% unless current_settings.votes_hidden? %>
+      <p class="vote-count" data-weight="<%= weight %>"><%= proposal_votes(weight) %></p>
+    <% end %>
+    <%= action_authorized_link_to :vote,
+                                  proposal_vote_path(weight),
+                                  **link_options(weight) do %>
+      <span class="vote-label"><%= proposal.manifest.label_for(weight) %></span>
+      <%= content_tag :svg, role: "img" do
+        content_tag(:title, t("decidim.decidim_awesome.voting.voting_cards.voting_for", proposal: sanitized_title, type: proposal.manifest.label_for(weight))) +
+        content_tag(:use, "", "href" => svg_path(weight))
+      end %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Voting
+      class VotingCardsProposalCell < VotingCardsBaseCell
+        VOTE_WEIGHTS = [0, 1, 2, 3].freeze
+
+        def show
+          render :show
+        end
+
+        def vote_block_for(proposal, weight)
+          render partial: "vote_block", locals: {
+            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: translated_attribute(current_organization.name))
+        end
+
+        def proposal_votes(weight)
+          model.weight_count(weight)
+        end
+
+        def voted_for?(option)
+          user_voted_weight == option
+        end
+
+        def from_proposals_list
+          options[:from_proposals_list]
+        end
+
+        def proposal_vote_path(weight)
+          proposal_proposal_vote_path(proposal_id: proposal.id, from_proposals_list:, weight:)
+        end
+
+        def link_options(weight)
+          ops = {
+            class: "vote-action vote-card #{classes_for(weight)}"
+          }
+          if current_user
+            ops.merge!({
+                         remote: true,
+                         method: :post
+                       })
+          end
+          ops
+        end
+
+        def svg_path(weight)
+          card = "handcard"
+          card = "handcheck" if voted_for?(weight)
+          "#{asset_pack_path("media/images/#{card}.svg")}#handcard"
+        end
+
+        def classes_for(weight)
+          ops = ["weight_#{weight}"]
+          ops << "voted" if voted_for?(weight)
+          ops << "dim" if voted_for_any? && !voted_for?(weight)
+          ops << "disabled" if disabled?
+
+          ops.join(" ")
+        end
+
+        def disabled?
+          return true if voted_for_any? || current_settings.votes_blocked?
+
+          return true if proposal.maximum_votes_reached? && !proposal.can_accumulate_votes_beyond_threshold && current_component.participatory_space.can_participate?(current_user)
+
+          true if vote_limit_enabled? && remaining_votes_count_for(current_user) <= 0
+        end
+
+        def voted_for_any?
+          VOTE_WEIGHTS.any? { |opt| voted_for?(opt) }
+        end
+
+        def title
+          txt ||= translated_attribute(current_component.settings.voting_cards_box_title)
+          return "" if txt == "-"
+
+          txt.presence || t("decidim.decidim_awesome.voting.voting_cards.default_box_title")
+        end
+      end
+    end
+  end
+end

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
+            decidim_original_create_proposal
+            # Update the proposal with the private body, to
+            # avoid tracebility on private fields.
+            @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 ::Decidim::DecidimAwesome::Proposals::Admin::UpdateProposalOverride
+
+        included do
+          private
+
+          alias_method :decidim_original_update_draft, :update_draft
+
+          def update_draft
+            decidim_original_update_draft
+            update_private_field!
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/system/create_organization_override.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module System
+      module CreateOrganizationOverride
+        extend ActiveSupport::Concern
+
+        included do
+          private
+
+          alias_method :decidim_create_organization, :create_organization
+
+          def create_organization
+            @organization = decidim_create_organization
+            if form.clean_awesome_admins_available_authorizations.present?
+              AwesomeConfig.create!(
+                var: :admins_available_authorizations,
+                organization: @organization,
+                value: form.clean_awesome_admins_available_authorizations
+              )
+            end
+            @organization
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/system/update_organization_override.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module System
+      module UpdateOrganizationOverride
+        extend ActiveSupport::Concern
+
+        included do
+          private
+
+          alias_method :decidim_original_save_organization, :save_organization
+
+          def save_organization
+            decidim_original_save_organization
+            if form.clean_awesome_admins_available_authorizations.present?
+              add_awesome_configs!
+            elsif awesome_config&.persisted?
+              awesome_config.destroy!
+            end
+          end
+
+          def add_awesome_configs!
+            awesome_config.value = form.clean_awesome_admins_available_authorizations
+            awesome_config.save!
+          end
+
+          def awesome_config
+            @awesome_config ||= AwesomeConfig.find_or_initialize_by(var: :admins_available_authorizations, organization: @organization)
+          end
+        end
+      end
+    end
+  end
+end

data/app/commands/concerns/decidim/decidim_awesome/update_account_override.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module UpdateAccountOverride
+      extend ActiveSupport::Concern
+
+      included do
+        alias_method :decidim_update_personal_data, :update_personal_data
+        alias_method :decidim_send_update_summary!, :send_update_summary!
+
+        def update_personal_data
+          decidim_update_personal_data
+          return if @form.user_time_zone.blank?
+
+          current_user.extended_data ||= {}
+          if @form.user_time_zone == current_user.organization.time_zone
+            current_user.extended_data.delete("time_zone")
+          else
+            current_user.extended_data["time_zone"] = @form.user_time_zone
+          end
+        end
+
+        def send_update_summary!(changes)
+          decidim_send_update_summary!(changes - ["extended_data"])
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@
 module Decidim
   module DecidimAwesome
     module Admin
-      class CreateConstraint < Rectify::Command
+      class CreateConstraint < Command
         # Public: Initializes the command.
         #
         # form - A constraint form
@@ -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
@@ -39,7 +39,7 @@ module Decidim
         attr_reader :form, :constraint
 
         def attributes
-          form.attributes.filter { |_i, v| v.present? }
+          form.attributes.compact_blank
         end
       end
     end