Refactor concerns, add deface (#121)

* reorder concerns & initializers * move to deface * add locales
coopdevs · Mar 23, 2023 · 141092b · 141092b
1 parent ffe1fba
commit 141092b
Show file tree

Hide file tree

Showing 35 changed files with 122 additions and 767 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    decidim-action_delegator (0.6.1)
+    decidim-action_delegator (0.7.0)
       decidim-admin (>= 0.26.0, < 0.27)
       decidim-consultations (>= 0.26.0, < 0.27)
       decidim-core (>= 0.26.0, < 0.27)
+      deface (>= 1.9)
       savon
       twilio-ruby
 
@@ -334,6 +335,12 @@ GEM
     declarative-builder (0.1.0)
       declarative-option (< 0.2.0)
     declarative-option (0.1.0)
+    deface (1.9.0)
+      actionview (>= 5.2)
+      nokogiri (>= 1.6)
+      polyglot
+      railties (>= 5.2)
+      rainbow (>= 2.1.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     devise (4.8.1)
@@ -543,6 +550,7 @@ GEM
     pg_search (2.3.6)
       activerecord (>= 5.2)
       activesupport (>= 5.2)
+    polyglot (0.3.5)
     premailer (1.18.0)
       addressable
       css_parser (>= 1.12.0)

diff --git a/README.md b/README.md
@@ -46,6 +46,7 @@ Depending on your Decidim version, choose the corresponding version to ensure co
 
 | Version | Compatible Decidim versions |
 |---|---|
+| 0.7.x | 0.26.x |
 | 0.6.x | 0.26.x |
 | 0.5 | 0.25.x |
 | 0.4 | 0.24.x |

diff --git a/...ations/multiple_vote_question_override.rb → ...ations/multiple_vote_question_override.rb b/...ations/multiple_vote_question_override.rb → ...ations/multiple_vote_question_override.rb
diff --git a/...r/consultations/vote_question_override.rb → ...r/consultations/vote_question_override.rb b/...r/consultations/vote_question_override.rb → ...r/consultations/vote_question_override.rb
diff --git a/...ions/consultations_controller_override.rb → ...ions/consultations_controller_override.rb b/...ions/consultations_controller_override.rb → ...ions/consultations_controller_override.rb
@@ -5,6 +5,7 @@ module ActionDelegator
     module Consultations
       module ConsultationsControllerOverride
         extend ActiveSupport::Concern
+        include ::Decidim::ActionDelegator::NeedsConsultationSnippets
 
         included do
           helper ::Decidim::ActionDelegator::DelegationHelper

diff --git a/...ion_multiple_votes_controller_override.rb → ...ion_multiple_votes_controller_override.rb b/...ion_multiple_votes_controller_override.rb → ...ion_multiple_votes_controller_override.rb
diff --git a/...ons/question_votes_controller_override.rb → ...ons/question_votes_controller_override.rb b/...ons/question_votes_controller_override.rb → ...ons/question_votes_controller_override.rb
diff --git a/...ltations/questions_controller_override.rb → ...ltations/questions_controller_override.rb b/...ltations/questions_controller_override.rb → ...ltations/questions_controller_override.rb
@@ -5,6 +5,7 @@ module ActionDelegator
     module Consultations
       module QuestionsControllerOverride
         extend ActiveSupport::Concern
+        include ::Decidim::ActionDelegator::NeedsConsultationSnippets
 
         included do
           helper ::Decidim::ActionDelegator::DelegationHelper

diff --git a/app/controllers/concerns/decidim/action_delegator/needs_consultation_snippets.rb b/app/controllers/concerns/decidim/action_delegator/needs_consultation_snippets.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module ActionDelegator
+    module NeedsConsultationSnippets
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :snippets
+      end
+
+      def snippets
+        @snippets ||= Decidim::Snippets.new
+
+        unless @snippets.any?(:action_delegator_consultation_questions)
+          @snippets.add(:action_delegator_consultation_questions, ActionController::Base.helpers.stylesheet_pack_tag("decidim_action_delegator_questions"))
+          @snippets.add(:action_delegator_consultation_questions, ActionController::Base.helpers.javascript_pack_tag("decidim_action_delegator_questions_js"))
+          @snippets.add(:head, @snippets.for(:action_delegator_consultation_questions))
+        end
+
+        @snippets
+      end
+    end
+  end
+end
diff --git a/...sms/authorizations_controller_override.rb → ...sms/authorizations_controller_override.rb b/...sms/authorizations_controller_override.rb → ...sms/authorizations_controller_override.rb
diff --git a/...gator/consultations/vote_form_override.rb → ...gator/consultations/vote_form_override.rb b/...gator/consultations/vote_form_override.rb → ...gator/consultations/vote_form_override.rb
diff --git a/..._delegator/consultations/vote_override.rb → ..._delegator/consultations/vote_override.rb b/..._delegator/consultations/vote_override.rb → ..._delegator/consultations/vote_override.rb
diff --git a/...errides/decidim/consultations/consultations/_question/add_delegation_link.html.erb.deface b/...errides/decidim/consultations/consultations/_question/add_delegation_link.html.erb.deface
@@ -0,0 +1,3 @@
+<!-- insert_after "erb[loud]:contains('display_take_part_button_for(question)')" -->
+
+<%= render partial: "decidim/action_delegator/link_to_question", locals: { question: question } %>
diff --git a/...decidim/consultations/question_multiple_votes/_form/add_delegation_notice.html.erb.deface b/...decidim/consultations/question_multiple_votes/_form/add_delegation_notice.html.erb.deface
@@ -0,0 +1,8 @@
+<!-- insert_before ".card__content.multiple_votes_form" -->
+
+<% if delegation %>
+  <div class="delegation-callout callout warning">
+    <p><%= t "action_delegator.delegations_modal.callout", scope: "decidim" %> <strong><%= delegation.granter.name %></strong></p>
+  </div>
+  <%= hidden_field_tag :decidim_consultations_delegation_id, delegation.id %>
+<% end %>
diff --git a/...errides/decidim/consultations/questions/_vote_button/add_delegations_link.html.erb.deface b/...errides/decidim/consultations/questions/_vote_button/add_delegations_link.html.erb.deface
@@ -0,0 +1,3 @@
+<!-- insert_before "erb[silent]:contains('elsif question.consultation.active?')" -->
+
+<%= render partial: "decidim/action_delegator/link_to_delegations", locals: { question: question } %>
diff --git a/app/overrides/decidim/consultations/questions/_vote_button/add_modal.html.erb.deface b/app/overrides/decidim/consultations/questions/_vote_button/add_modal.html.erb.deface
@@ -0,0 +1,3 @@
+<!-- insert_before "erb[loud]:contains('javascript_pack_tag')" -->
+
+<%= render partial: "decidim/action_delegator/delegations_modal", locals: { question: question } %>
diff --git a/...consultations/questions/_vote_button/replace_delegation_to_multivote_link.html.erb.deface b/...consultations/questions/_vote_button/replace_delegation_to_multivote_link.html.erb.deface
@@ -0,0 +1,8 @@
+<!-- replace_contents "erb[silent]:contains('if question.multiple?')" 
+     closing_selector "erb[silent]:contains('else')" -->
+
+<%= link_to decidim_consultations.question_question_multiple_votes_path(question, delegation: 0),
+      class: "card__button button expanded",
+      id: "multivote_button" do %>
+  <div class="vote-button-caption"><%= t "questions.vote_button.vote", scope: "decidim" %></div>
+<% end %>
diff --git a/...rrides/decidim/consultations/questions/_vote_modal/add_delegation_callout.html.erb.deface b/...rrides/decidim/consultations/questions/_vote_modal/add_delegation_callout.html.erb.deface
@@ -0,0 +1,3 @@
+<!-- insert_after ".reveal__header" -->
+
+<%= render partial: "decidim/action_delegator/callout", locals: { consultation: question.consultation } %>
diff --git a/...ecidim/consultations/questions/_vote_modal_confirm/add_delegation_callout.html.erb.deface b/...ecidim/consultations/questions/_vote_modal_confirm/add_delegation_callout.html.erb.deface
@@ -0,0 +1,3 @@
+<!-- insert_after ".reveal__header" -->
+
+<%= render partial: "decidim/action_delegator/callout", locals: { consultation: question.consultation } %>
diff --git a/...ides/decidim/consultations/questions/_vote_modal_confirm/add_hidden_field.html.erb.deface b/...ides/decidim/consultations/questions/_vote_modal_confirm/add_hidden_field.html.erb.deface
@@ -0,0 +1,3 @@
+<!-- insert_after "erb[loud]:contains('form.hidden_field :decidim_consultations_response_id')" -->
+
+<%= hidden_field_tag :decidim_consultations_delegation_id, nil, id: "decidim_consultations_delegation_id" %>
diff --git a/app/overrides/layouts/decidim/admin/remove_deprecation.rb b/app/overrides/layouts/decidim/admin/remove_deprecation.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+Deface::Override.new(virtual_path: "layouts/decidim/admin/consultations",
+                     name: "remove_deprecation_warning",
+                     remove: ".callout.warning",
+                     disabled: !Decidim::ActionDelegator.remove_consultation_deprecation_warning)
+Deface::Override.new(virtual_path: "layouts/decidim/admin/consultation",
+                     name: "remove_deprecation_warning",
+                     remove: ".callout.warning",
+                     disabled: !Decidim::ActionDelegator.remove_consultation_deprecation_warning)
diff --git a/...or/consultations_permissions_extension.rb → ...or/consultations_permissions_extension.rb b/...or/consultations_permissions_extension.rb → ...or/consultations_permissions_extension.rb
diff --git a/app/views/decidim/consultations/consultations/_question.html.erb b/app/views/decidim/consultations/consultations/_question.html.erb
diff --git a/app/views/decidim/consultations/consultations/show.html.erb b/app/views/decidim/consultations/consultations/show.html.erb
diff --git a/app/views/decidim/consultations/question_multiple_votes/_form.html.erb b/app/views/decidim/consultations/question_multiple_votes/_form.html.erb
diff --git a/app/views/decidim/consultations/questions/_vote_button.html.erb b/app/views/decidim/consultations/questions/_vote_button.html.erb
diff --git a/app/views/decidim/consultations/questions/_vote_modal.html.erb b/app/views/decidim/consultations/questions/_vote_modal.html.erb
diff --git a/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb b/app/views/decidim/consultations/questions/_vote_modal_confirm.html.erb