decidim-decidim_awesome 0.10.2 → 0.11.2

data/app/packs/stylesheets/decidim/decidim_awesome/voting/voting_cards.scss

@@ -8,54 +8,6 @@
 .voting-voting_cards {
   $rectangle-width: 3rem;
 
-  // ProposalM card
-  &-card {
-    a {
-      margin-bottom: 0;
-
-      > svg {
-        margin-bottom: 2px;
-        vertical-align: middle;
-      }
-
-      &.button {
-        &.weight_0 {
-          background-color: var(--voting-cards-weight-0);
-        }
-
-        &.weight_1 {
-          background-color: var(--voting-cards-weight-1);
-        }
-
-        &.weight_2 {
-          background-color: var(--voting-cards-weight-2);
-        }
-
-        &.weight_3 {
-          background-color: var(--voting-cards-weight-3);
-        }
-      }
-    }
-
-    .votes_counter {
-      .weight_0 {
-        color: var(--voting-cards-weight-0);
-      }
-
-      .weight_1 {
-        color: var(--voting-cards-weight-1);
-      }
-
-      .weight_2 {
-        color: var(--voting-cards-weight-2);
-      }
-
-      .weight_3 {
-        color: var(--voting-cards-weight-3);
-      }
-    }
-  }
-
   margin-bottom: 1.5rem;
   border-bottom: 2px solid #d9d9d9;
 
@@ -65,11 +17,12 @@
     border-bottom: none;
 
     .vote-card {
-      margin-top: .5rem;
+      margin-top: 0.5rem;
 
       .vote-label {
         margin-bottom: 1rem;
-        color: $black;
+
+        @apply text-black;
       }
     }
 
@@ -80,15 +33,16 @@
   }
 
   &.loading {
-    opacity: .3;
+    opacity: 0.3;
     pointer-events: none;
     position: relative;
 
+    @apply relative cursor-wait;
+
     &::before {
-      @include spinner(25px, $medium-gray, var(--primary), 800ms);
+      @apply content-[""] block w-6 h-6 rounded-full animate-spin border-4 border-l-background border-y-background border-r-secondary;
 
       z-index: 1000;
-      content: "";
       vertical-align: middle;
       position: absolute;
       top: calc(50% - 12.5px);
@@ -102,7 +56,7 @@
   }
 
   .votes_counter {
-    letter-spacing: .2rem;
+    letter-spacing: 0.2rem;
     font-size: 1rem;
   }
 
@@ -123,7 +77,7 @@
       width: $rectangle-width;
       height: calc($rectangle-width * 2);
       vertical-align: middle;
-      margin: -.5rem 0 0 .5rem;
+      margin: -0.5rem 0 0 0.5rem;
       max-width: 100%;
       transition: transform 150ms ease-in-out;
 
@@ -171,7 +125,7 @@
   }
 
   .dim {
-    opacity: .3;
+    opacity: 0.3;
     pointer-events: none;
   }
 
@@ -190,7 +144,7 @@
     .vote-count {
       font-size: 2rem;
       font-weight: bolder;
-      margin-bottom: 0;
+      margin-bottom: 0.5rem;
     }
   }
 
@@ -199,8 +153,8 @@
 
     &:hover {
       text-decoration: none;
-      font-size: .9rem;
-      margin-top: .1rem;
+      font-size: 0.9rem;
+      margin-top: 0.1rem;
     }
   }
 
@@ -221,3 +175,31 @@
     }
   }
 }
+
+.vote_proposal_modal {
+  div.button__sm {
+    display: inline-block;
+  }
+
+  .vote-label {
+    @apply ml-2;
+  }
+}
+
+.card__list-metadata {
+  .voting-weight_3 {
+    color: var(--voting-cards-weight-3);
+  }
+
+  .voting-weight_2 {
+    color: var(--voting-cards-weight-2);
+  }
+
+  .voting-weight_1 {
+    color: var(--voting-cards-weight-1);
+  }
+
+  .voting-weight_0 {
+    color: var(--voting-cards-weight-0);
+  }
+}

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

@@ -10,6 +10,7 @@ module Decidim
           return permission_action if permission_action.scope != :admin
           return permission_action unless user
           return permission_action if user.read_attribute("admin").blank?
+          return permission_action unless permission_action.action == :edit_config
 
           if permission_action.subject == :admin_accountability && DecidimAwesome.admin_accountability.respond_to?(:include?)
             if global?
@@ -17,8 +18,14 @@ module Decidim
             else
               toggle_allow(DecidimAwesome.admin_accountability.include?(:participatory_space_roles))
             end
-          elsif permission_action.action == :edit_config
-            toggle_allow(config_enabled?(permission_action.subject))
+          elsif permission_action.subject == :private_data && config_enabled?(:proposal_private_custom_fields)
+            if private_data.present?
+              allow! if private_data.destroyable?
+            else
+              allow!
+            end
+          else
+            toggle_allow(config_enabled?(*permission_action.subject))
           end
 
           permission_action
@@ -27,7 +34,11 @@ module Decidim
         private
 
         def global?
-          context.fetch(:global)
+          context.fetch(:global, nil)
+        end
+
+        def private_data
+          context.fetch(:private_data, nil)
         end
       end
     end

data/app/permissions/decidim/decidim_awesome/permissions.rb

@@ -14,15 +14,14 @@ module Decidim
       end
 
       def editor_image_action?
-        return unless permission_action.subject == :editor_image
+        return false unless permission_action.subject == :editor_image
 
         config = context.fetch(:awesome_config, {})
 
         return allow! if user.admin?
         return allow! if config[:allow_images_in_proposals]
-        return allow! if config[:allow_images_in_small_editor]
-        return allow! if config[:allow_images_in_full_editor]
-        return allow! if config[:allow_images_in_markdown_editor]
+        return allow! if config[:allow_images_in_editors]
+        return allow! if config[:allow_videos_in_editors]
       end
     end
   end

data/app/presenters/concerns/decidim/decidim_awesome/breadcrumb_root_menu_item_presenter_override.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module BreadcrumbRootMenuItemPresenterOverride
+      extend ActiveSupport::Concern
+
+      included do
+        def arrow_link(text, url, args = {})
+          link_to url, extended_html_options.merge(class: args.with_indifferent_access[:class]) do
+            "<span>#{text}</span> #{icon("arrow-right-line")}".html_safe
+          end
+        end
+
+        def extended_html_options
+          {}.tap do |opts|
+            opts[:target] = "_blank" if @menu_item.try(:target) == "_blank"
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/{decidim → concerns/decidim}/decidim_awesome/menu_item_presenter_override.rb

@@ -6,12 +6,12 @@ module Decidim
       extend ActiveSupport::Concern
 
       included do
-        def link_to(name = nil, options = nil, html_options = nil, &block)
+        def link_to(name = nil, options = nil, html_options = nil, &)
           html_options ||= {}
           html_options[:target] = @menu_item.try(:target)
 
           options ||= html_options
-          @view.link_to(name, options, html_options, &block)
+          @view.link_to(name, options, html_options, &)
         end
 
         def active
@@ -19,6 +19,14 @@ module Decidim
 
           @menu_item&.active
         end
+
+        def active_for_breadcrumb?
+          is_active_link?(url, @menu_item.try(:original_active) || active)
+        end
+
+        def hacked_not_overriding?
+          !(@menu_item.is_a?(Decidim::MenuItem) || @menu_item.overrided?)
+        end
       end
     end
   end

data/app/presenters/{decidim → concerns/decidim}/decidim_awesome/menu_presenter_override.rb

@@ -17,6 +17,14 @@ module Decidim
                                 end
                               end
         end
+
+        def active_item_for_breadcrumb
+          presented_items.find do |item|
+            next if item.hacked_not_overriding?
+
+            item.active_for_breadcrumb?
+          end
+        end
       end
     end
   end

data/app/presenters/concerns/decidim/decidim_awesome/proposals/proposal_presenter_override.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      ##
+      # Override Proposal Presenter to access private field.
+      module ProposalPresenterOverride
+        extend ActiveSupport::Concern
+        included do
+          def private_body(*)
+            return unless proposal
+
+            proposal.private_body
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/decidim_awesome/admin_log/component_presenter_override.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module AdminLog
+      module ComponentPresenterOverride
+        extend ActiveSupport::Concern
+
+        included do
+          alias_method :decidim_original_action_string, :action_string
+          alias_method :decidim_original_i18n_params, :i18n_params
+
+          def action_string
+            return "decidim.decidim_awesome.admin_log.component.#{action}" if action == "destroy_private_data"
+
+            decidim_original_action_string
+          end
+
+          def i18n_params
+            if action == "destroy_private_data"
+              decidim_original_i18n_params.merge({ count: action_log.extra["count"] })
+            else
+              decidim_original_i18n_params
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/presenters/decidim/decidim_awesome/participatory_space_role_presenter.rb

@@ -5,7 +5,7 @@ module Decidim
     class ParticipatorySpaceRolePresenter < RoleBasePresenter
       # Finds the destroyed entry if exists
       def destroy_entry
-        @destroy_entry ||= PaperTrail::Version.find_by(item_type: item_type, event: "destroy", item_id: item_id)
+        @destroy_entry ||= PaperTrail::Version.find_by(item_type:, event: "destroy", item_id:)
       end
 
       # roles are in the destroyed event if the role has been removed

data/app/presenters/decidim/decidim_awesome/private_data_presenter.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    class PrivateDataPresenter < SimpleDelegator
+      include Decidim::TranslatableAttributes
+      include ActionView::Helpers::DateHelper
+      include ActionView::Helpers::TagHelper
+
+      def name
+        @name ||= "#{translated_attribute(participatory_space.title)} / #{translated_attribute(super)}"
+      end
+
+      def path
+        @path ||= Decidim::EngineRouter.main_proxy(self).root_path
+      end
+
+      def total
+        @total ||= Decidim::Proposals::Proposal.joins(:extra_fields)
+                                               .where(component: self)
+                                               .where.not(extra_fields: { private_body: nil })
+                                               .count.to_s
+      end
+
+      def last_date
+        @last_date ||= Decidim::Proposals::Proposal.joins(:extra_fields)
+                                                   .where(component: self)
+                                                   .where.not(extra_fields: { private_body: nil })
+                                                   .order(private_body_updated_at: :desc)
+                                                   .first&.extra_fields&.private_body_updated_at
+      end
+
+      def time_ago
+        I18n.t("decidim.decidim_awesome.admin.maintenance.private_data.time_ago", time: time_ago_in_words(last_date)) if last_date
+      end
+
+      def destroyable?
+        return false unless last_date
+
+        last_date < DecidimAwesome.private_data_expiration_time.ago
+      end
+
+      def locked?
+        Decidim::DecidimAwesome::Lock.new(organization).locked?(__getobj__)
+      end
+
+      def as_json(_options = nil)
+        {
+          id:,
+          name:,
+          path:,
+          total:,
+          last_date:,
+          time_ago:,
+          locked: locked?,
+          done:
+        }
+      end
+
+      def done
+        return content_tag("span", "", class: "loading-spinner primary") if locked?
+
+        return if destroyable?
+        return if last_date
+
+        I18n.t("decidim.decidim_awesome.admin.maintenance.private_data.done")
+      end
+    end
+  end
+end

data/app/presenters/decidim/decidim_awesome/user_entity_presenter.rb

@@ -6,7 +6,7 @@ module Decidim
       # Finds the destroyed entry if exists
       def destroy_entry
         @destroy_entry ||= begin
-          query = PaperTrail::Version.where(item_type: item_type, event: "update", item_id: item_id)
+          query = PaperTrail::Version.where(item_type:, event: "update", item_id:)
                                      .where("id > ?", entry.id)
           if roles.include? "admin"
             query.where("object_changes LIKE '%\nadmin:\n- true\n- false%'").first

data/app/queries/decidim/decidim_awesome/private_data_finder.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    class PrivateDataFinder
+      def query
+        Component.where(id: proposals.where.not(extra_fields: { private_body: nil }))
+      end
+
+      def proposals
+        Decidim::Proposals::Proposal.select(:decidim_component_id).joins(:extra_fields)
+      end
+
+      def for(resources)
+        Component.where(id: proposals).where(id: resources)
+      end
+    end
+  end
+end

data/app/serializers/concerns/decidim/decidim_awesome/proposals/proposal_serializer_methods.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      # Adds one custom field per column in export if custom fields are activted
+      # Adds vote weights
+      module ProposalSerializerMethods
+        extend ActiveSupport::Concern
+
+        included do
+          include ::Decidim::DecidimAwesome::NeedsAwesomeConfig
+
+          # Override the NeedsAwesomeConfig's awesome_config_instance,
+          # to take context from proposal instead of controller's request.
+          def awesome_config_instance
+            return @custom_config if @custom_config
+
+            @custom_config = Config.new(proposal.organization)
+            @custom_config.context_from_component(proposal.component)
+            @custom_config
+          end
+
+          def serialize_custom_fields
+            payload = {}
+            custom_fields = CustomFields.new(awesome_proposal_custom_fields)
+            if custom_fields.present?
+              @proposal.body.each do |locale, body|
+                if body.is_a?(Hash)
+                  body.each do |translation_locale, value|
+                    fields_entries(custom_fields, value) do |field_key, field_value|
+                      payload["body/#{field_key}/#{translation_locale}".to_sym] = field_value if payload["body/#{field_key}/#{translation_locale}".to_sym].blank?
+                    end
+                  end
+                else
+                  fields_entries(custom_fields, body) do |key, value|
+                    payload["body/#{key}/#{locale}".to_sym] = value
+                  end
+                end
+              end
+            end
+            payload
+          end
+
+          def serialize_private_custom_fields
+            payload = {}
+            private_custom_fields = CustomFields.new(awesome_proposal_private_custom_fields)
+            if private_custom_fields.present?
+              fields_entries(private_custom_fields, proposal.private_body) do |key, value|
+                value = value.first if value.is_a? Array
+                payload["private_body/#{key}".to_sym] = value
+              end
+            end
+            payload
+          end
+
+          # Iterate on custom fields that has a label and name
+          # (will ignore paragraphs and title)
+          def fields_entries(custom_fields, body)
+            custom_fields.apply_xml(body)
+            custom_fields.fields.each do |field|
+              next unless field["label"].present? && field.has_key?("name")
+
+              value = field["userData"].is_a?(Array) ? field["userData"].first : field["userData"]
+              yield field["label"].parameterize, value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/serializers/concerns/decidim/decidim_awesome/proposals/proposal_serializer_override.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      # Adds one custom field per column in export if custom fields are activted
+      # Adds vote weights
+      module ProposalSerializerOverride
+        extend ActiveSupport::Concern
+
+        included do
+          include ProposalSerializerMethods
+
+          alias_method :decidim_original_serialize, :serialize
+
+          def serialize
+            # serialize first the custom fields,
+            # as default serialization will strip proposal body's <xml> tags.
+            serialization = decidim_original_serialize
+            serialization.merge!(proposal_vote_weights)
+            serialization.merge!(serialize_custom_fields)
+          end
+
+          protected
+
+          def proposal_vote_weights
+            payload = {}
+            if proposal.respond_to?(:vote_weights)
+              proposal.update_vote_weights!
+              payload[:votes] = proposal.reload.vote_weights
+            end
+            payload
+          end
+        end
+      end
+    end
+  end
+end

data/app/serializers/decidim/decidim_awesome/proposals/private_proposal_serializer.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module Proposals
+      ##
+      # Custom serializer for Proposals with private data.
+      # Used to separate open-data export and admin export.
+      class PrivateProposalSerializer < ::Decidim::Proposals::ProposalSerializer
+        include ProposalSerializerMethods
+
+        def serialize
+          serialization = super.merge!(serialize_private_custom_fields)
+          serialization.merge!(serialize_private_notes)
+        end
+
+        def serialize_private_notes
+          payload = {}
+          notes = proposal.notes
+          return payload unless notes.any?
+
+          notes.each do |note|
+            payload["notes/#{note.id}".to_sym] = {
+              created_at: note.created_at,
+              note: note.body,
+              author: author_name(note.author)
+            }
+          end
+          payload
+        end
+      end
+    end
+  end
+end

data/app/types/concerns/decidim/decidim_awesome/add_proposal_type_custom_fields.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Decidim
+  module DecidimAwesome
+    module AddProposalTypeCustomFields
+      extend ActiveSupport::Concern
+
+      included do
+        include ::Decidim::DecidimAwesome::NeedsAwesomeConfig
+
+        field :body_fields, TranslatedCustomFieldsType, "Custom fields for this proposal", null: true
+
+        def body_fields
+          return if custom_fields.empty?
+
+          @body_fields ||= object.body.transform_values do |body|
+            sanitize_translated_fields(body)
+          end
+        end
+
+        # Override the NeedsAwesomeConfig's awesome_config_instance,
+        # to take context from proposal instead of controller's request.
+        def awesome_config_instance
+          return @custom_config if @custom_config
+
+          @custom_config = Config.new(object.organization)
+          @custom_config.context_from_component(object.component)
+          @custom_config
+        end
+
+        private
+
+        def custom_fields
+          @custom_fields ||= CustomFields.new(awesome_proposal_custom_fields)
+        end
+
+        def fields_for_xml(body)
+          custom_fields.apply_xml(body)
+          custom_fields.fields.filter_map do |field|
+            next unless field["label"].present? && field.has_key?("name")
+
+            field["userData"] = field["userData"].first if field["userData"].is_a?(Array)
+            field.dup
+          end
+        end
+
+        def sanitize_translated_fields(body)
+          if body.is_a?(Hash)
+            body.transform_values do |value|
+              fields_for_xml(value)
+            end
+          else
+            fields_for_xml(body)
+          end
+        end
+      end
+    end
+  end
+end

data/app/types/concerns/decidim/decidim_awesome/{proposal_type_override.rb → add_proposal_type_vote_weights.rb}

@@ -2,7 +2,7 @@
 
 module Decidim
   module DecidimAwesome
-    module ProposalTypeOverride
+    module AddProposalTypeVoteWeights
       extend ActiveSupport::Concern
 
       included do
@@ -10,6 +10,8 @@ module Decidim
 
         def vote_weights
           current_component = object.component
+          return unless current_component.current_settings.respond_to?(:votes_hidden?)
+
           object.vote_weights unless current_component.current_settings.votes_hidden?
         end
       end