decidim-decidim_awesome 0.10.2 → 0.10.3

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

@@ -65,7 +65,7 @@
     border-bottom: none;
 
     .vote-card {
-      margin-top: .5rem;
+      margin-top: 0.5rem;
 
       .vote-label {
         margin-bottom: 1rem;
@@ -80,7 +80,7 @@
   }
 
   &.loading {
-    opacity: .3;
+    opacity: 0.3;
     pointer-events: none;
     position: relative;
 
@@ -102,7 +102,7 @@
   }
 
   .votes_counter {
-    letter-spacing: .2rem;
+    letter-spacing: 0.2rem;
     font-size: 1rem;
   }
 
@@ -123,7 +123,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 +171,7 @@
   }
 
   .dim {
-    opacity: .3;
+    opacity: 0.3;
     pointer-events: none;
   }
 
@@ -199,8 +199,8 @@
 
     &:hover {
       text-decoration: none;
-      font-size: .9rem;
-      margin-top: .1rem;
+      font-size: 0.9rem;
+      margin-top: 0.1rem;
     }
   }
 

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/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/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(decidim_component_id: id)
+                                               .where.not(decidim_awesome_proposal_extra_fields: { private_body: nil })
+                                               .count.to_s
+      end
+
+      def last_date
+        @last_date ||= Decidim::Proposals::Proposal.joins(:extra_fields)
+                                                   .where(decidim_component_id: id)
+                                                   .where.not(decidim_awesome_proposal_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: id,
+          name: name,
+          path: path,
+          total: total,
+          last_date: last_date,
+          time_ago: time_ago,
+          locked: locked?,
+          done: 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/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(decidim_awesome_proposal_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/proposal_serializer_override.rb

@@ -31,6 +31,7 @@ module Decidim
             state: proposal.state.to_s,
             reference: proposal.reference,
             answer: ensure_translatable(proposal.answer),
+            answered_at: proposal.answered_at,
             supports: proposal.proposal_votes_count,
             weights: proposal_vote_weights,
             endorsements: {

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,42 @@
+# 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
+
+        def author_name(author)
+          if author.respond_to?(:name)
+            translated_attribute(author.name) # is a Decidim::User or Decidim::Organization or Decidim::UserGroup
+          elsif author.respond_to?(:title)
+            translated_attribute(author.title) # is a Decidim::Meetings::Meeting
+          end
+        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

data/app/views/decidim/decidim_awesome/admin/checks/index.html.erb

@@ -1,28 +1,33 @@
-<div class="card">
-  <div class="card-divider">
-    <h2 class="card-title"><%= t ".title" %></h2>
-  </div>
-  <div class="card-section">
-    <p>
-      <span class="label <%= decidim_version_valid? ? "success" : "alert" %>"><%= t ".decidim_version", version: decidim_version %></span>
-      <%= check decidim_version_valid? %>
-    </p>
-  </div>
-  <div class="card-section">
-    <p><%= t(".images_migrated") %>
-    <% if images_migrated? %>
-      <%= check true %></p>
-    <% else %>
-      <%= check false %></p>
-      <div class="callout alert">
-        <p><%= t(".pending_image_migrations", total: pending_image_migrations).html_safe %></p>
-        <%= link_to t(".start_image_migrations"), migrate_images_path, method: :post, class: "button" %>
-      </div>
-    <% end %>
-  </div>
-  <div class="card-section">
-    <ul class="vertical menu">
-      <% overrides.each do |group, props| %>
+<!--
+  Force tailwind to compile these classes
+  class="fill-success fill-alert"
+-->
+<div class="card-divider">
+  <h2 class="card-title"><%= t ".title" %></h2>
+</div>
+<div class="card-section decidim-version">
+  <p>
+    <span class="label <%= decidim_version_valid? ? "success" : "alert" %>"><%= t ".decidim_version", version: decidim_version %></span>
+    <%= check decidim_version_valid? %>
+  </p>
+</div>
+
+<div class="card-section">
+  <p><%= t(".images_migrated") %>
+  <% if images_migrated? %>
+    <%= check true %></p>
+  <% else %>
+    <%= check false %></p>
+    <div class="callout alert">
+      <p><%= t(".pending_image_migrations", total: pending_image_migrations).html_safe %></p>
+      <%= link_to t(".start_image_migrations"), migrate_images_path, method: :post, class: "button" %>
+    </div>
+  <% end %>
+</div>
+
+<div class="card-section">
+  <ul class="vertical menu">
+    <% overrides.each do |group, props| %>
       <li>
         <strong><%= t ".#{group}" %></strong>
         <ul class="vertical menu">
@@ -36,16 +41,16 @@
         </ul>
         <br>
       </li>
-      <% end %>
-    </ul>
-    <ul class="vertical menu heads">
-      <li>
-        <strong><%= t ".head_tags" %></strong>
-        <ul class="vertical menu">
+    <% end %>
+  </ul>
+  <ul class="vertical menu heads">
+    <li>
+      <strong><%= t ".head_tags" %></strong>
+      <ul class="vertical menu">
         <% {
-          CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_decidim_awesome')]",
-          JavaScript: "//script[contains(@src,'decidim_decidim_awesome')]"
-          }.each do |part, xpath| %>
+        CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_decidim_awesome')]",
+        JavaScript: "//script[contains(@src,'decidim_decidim_awesome')]"
+        }.each do |part, xpath| %>
           <li>
             <%= part %>
             <% if head.xpath(xpath).count.positive? %>
@@ -56,16 +61,16 @@
               <code class="help-text code-block"><%= head_addons(part) %></code>
             <% end %>
           </li>
-          <% end %>
-        </ul>
-      </li>
-      <li>
-        <strong><%= t ".admin_head_tags" %></strong>
-        <ul class="vertical menu">
+        <% end %>
+      </ul>
+    </li>
+    <li>
+      <strong><%= t ".admin_head_tags" %></strong>
+      <ul class="vertical menu">
         <% {
-          CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_admin_decidim_awesome')]",
-          JavaScript: "//script[contains(@src,'decidim_admin_decidim_awesome')]"
-          }.each do |part, xpath| %>
+        CSS: "//head/link[@rel='stylesheet'][contains(@href,'decidim_admin_decidim_awesome')]",
+        JavaScript: "//script[contains(@src,'decidim_admin_decidim_awesome')]"
+        }.each do |part, xpath| %>
           <li>
             <%= part %>
             <% if admin_head.xpath(xpath).count.positive? %>
@@ -76,9 +81,8 @@
               <code class="help-text code-block"><%= admin_addons(part) %></code>
             <% end %>
           </li>
-          <% end %>
-        </ul>
-      </li>
-    </ul>
-  </div>
+        <% end %>
+      </ul>
+    </li>
+  </ul>
 </div>

data/app/views/decidim/decidim_awesome/admin/config/_autoedit_box_label.html.erb

@@ -2,6 +2,11 @@
     <%= t("config.#{var}",
         scope: "activemodel.attributes",
         id: "<span class='awesome-auto-edit' data-var='#{var}' data-scope='#{scope}' data-key='#{key}'>#{key}</span>").html_safe %>
-    <%= icon_link_to "pencil", "#", t("edit_label", scope: "decidim.decidim_awesome.admin.config.form"), class: "action-icon--edit awesome-auto-edit", data: { "scope" => "#{scope}" } %>
-    <%= link_to t("remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}"), delete_path, method: :delete, class: "float-right delete-box", data: { confirm: t("sure_to_remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}") } %>
+
+    <%= icon_link_to "pencil", "#", t("edit_label", scope: "decidim.decidim_awesome.admin.config.form"), class: "awesome-auto-edit", data: { "scope" => "#{scope}" } %>
+
+    <%= link_to delete_path, method: :delete, class: "float-right delete-box", title: t("remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}"), data: { confirm: t("sure_to_remove", scope: "decidim.decidim_awesome.admin.config.form_#{var}") } do %>
+        <%= icon "circle-x" %>
+        <%= t("delete", scope: "decidim.decidim_awesome.admin.config.form_#{var}") %>
+    <% end %>
 <% end %>

data/app/views/decidim/decidim_awesome/admin/config/_constraints.html.erb

@@ -5,23 +5,31 @@
       <span aria-hidden="true">&times;</span>
     </button>
   </div>
-
-  <h5><%= t ".title" %></h5>
+  <h5 class="mb-2"><%= t ".title" %></h5>
   <% if constraints.blank? %>
     <span class="label warning"><%= t ".always" %></span>
   <% end %>
 
-  <ul class="constraints-list<%= " inactive" if constraints&.detect{|c| c.settings["participatory_space_manifest"]=="none" } %>">
+  <ul class="constraints-list<%= " inactive" if constraints.detect { |c| c.settings["participatory_space_manifest"] == "none" } %> <%= "no-items" if constraints.blank? || constraints.all? { |c| c.settings.none? { |k, val| val.present? } } %>">
     <% constraints&.each do |constraint| %>
+      <% if constraint.settings.any? { |k, val| val.present? } %>
         <li>
-            <% constraint.settings.reverse_each do |k, val| %>
+          <% constraint.settings.reverse_each do |k, val| %>
+            <% if val.present? %>
               <span class="label <%= k %> constraint-<%= val %>"><%= translate_constraint_value constraint, k %></span>
             <% end %>
-          <a href="<%= constraint_path(id: constraint.id, key: key) %>" class="edit-condition"><%= t ".edit" %></a>
-          <%= link_to t(".delete"), constraint_path(id: constraint.id), remote: true, method: :delete %>
+          <% end %>
+          <button id="<%= "edit-#{key}-#{constraint.id}" %>" type="button" name="button" class="edit-condition" data-dialog-open="<%= "edit-modal-#{key}" %>" data-constraints-url="<%= constraint_path(id: constraint.id, key: key) %>">
+            <%= t ".edit" %>
+          </button>
+
+          <%= link_to t(".delete"), constraint_path(id: constraint.id), remote: true, method: :delete, class: "delete-condition" %>
         </li>
       <% end %>
+    <% end %>
   </ul>
-  <a href="<%= new_constraint_path(key: key) %>" class="add-condition" data-open="constraintsModal"><%= t ".add_condition" %></a>
-
+  <button id="<%= "new-#{key}" %>" type="button" name="button" class="add-condition button small button__secondary" data-open="constraintsModal" data-constraints-url="<%= new_constraint_path(key: key) %>">
+    <%= icon "plus", class: "small" %>
+    <%= t ".add_condition" %>
+  </button>
 </div>

data/app/views/decidim/decidim_awesome/admin/config/_form_admins.html.erb

@@ -3,7 +3,7 @@
     <p class="help-text"><%= t("help.scoped_admins", scope: "decidim.decidim_awesome.admin.config.form") %></p>
 
     <% form.object.scoped_admins&.each do |key, value| %>
-      <div class="scoped_admins_container" data-key="<%= key %>">
+      <div class="card p-4 scoped_admins_container js-box-container" data-key="<%= key %>">
         <%= render(partial: "decidim/decidim_awesome/admin/config/autoedit_box_label", locals: { var: "scoped_admins", key: key, scope: "scoped_admin_#{key}", delete_path: decidim_admin_decidim_awesome.scoped_admin_path(key: key) }) %>
         <p class="form-error is-visible" id="scoped-admin-error-<%= $key %>"><%= errors[key.to_sym].join("<br>") if errors %></p>