Move the answer notification to the plan view

mainio · Feb 8, 2024 · 1e41ec3 · 1e41ec3
1 parent cc30275
commit 1e41ec3
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 25 deletions.
diff --git a/app/cells/decidim/plans/plan_notification/show.erb b/app/cells/decidim/plans/plan_notification/show.erb
@@ -1,11 +1,13 @@
-<div class="callout callout--icon <%= status_class %>">
+<div class="callout callout--icon <%= status_class %> margin-bottom-2">
   <div class="callout__title">
     <div class="callout__icon">
       <%= icon(icon_key, role: "img", "aria-hidden": true) %>
     </div>
     <p class="h6"><%= title %></p>
   </div>
-  <div class="callout__content">
-    <%== decidim_sanitize description %>
-  </div>
+  <% if has_answer_text? %>
+    <div class="callout__content">
+      <%== decidim_sanitize description %>
+    </div>
+  <% end %>
 </div>
diff --git a/app/cells/decidim/plans/plan_notification_cell.rb b/app/cells/decidim/plans/plan_notification_cell.rb
@@ -16,7 +16,6 @@ class PlanNotificationCell < Decidim::CardMCell
 
       def show
         return unless model.answered?
-        return if answer_text.blank?
 
         render
       end
@@ -54,12 +53,16 @@ def title
       end
 
       def description
-        translated_attribute model.answer
+        answer_text
       end
 
       def answer_text
         @answer_text ||= translated_attribute(model.answer)
       end
+
+      def has_answer_text?
+        strip_tags(answer_text).strip.present?
+      end
     end
   end
 end
diff --git a/app/cells/decidim/plans/plan_view/show.erb b/app/cells/decidim/plans/plan_view/show.erb
@@ -42,6 +42,8 @@
 
     <%= cell("decidim/plans/plan_add_authors", plan) %>
   <% end %>
+
+  <%== plan_notification %>
 </div>
 <div class="row">
   <div class="columns medium-8">

diff --git a/app/cells/decidim/plans/plan_view_cell.rb b/app/cells/decidim/plans/plan_view_cell.rb
@@ -26,6 +26,19 @@ def collaborator_requests
         render :collaborator_requests
       end
 
+      def plan_notification(data = {})
+        context = data[:context] || {}
+        data = data.merge(
+          context: context.merge(current_component: current_component)
+        )
+
+        cell(
+          layout_manifest.notification_layout,
+          plan,
+          data
+        )
+      end
+
       private
 
       def plan
@@ -180,6 +193,10 @@ def current_locale
         I18n.locale.to_s
       end
 
+      def layout_manifest
+        @layout_manifest ||= Decidim::Plans.layouts.find(current_component.settings.layout)
+      end
+
       def routes_proxy
         @routes_proxy ||= EngineRouter.main_proxy(current_component)
       end

diff --git a/app/helpers/decidim/plans/plan_layout_helper.rb b/app/helpers/decidim/plans/plan_layout_helper.rb
@@ -46,19 +46,6 @@ def render_plan_view(plan, data = {})
           data
         )
       end
-
-      def render_plan_notification(plan, data = {})
-        context = data[:context] || {}
-        data = data.merge(
-          context: context.merge(current_component: current_component)
-        )
-
-        cell(
-          layout_manifest.notification_layout,
-          plan,
-          data
-        )
-      end
     end
   end
 end
diff --git a/app/views/decidim/plans/plans/show.html.erb b/app/views/decidim/plans/plans/show.html.erb
@@ -1,9 +1,3 @@
-<% if @plan.answered? %>
-  <% content_for :notification do %>
-    <%= render_plan_notification(@plan) %>
-  <% end %>
-<% end %>
-
 <% add_decidim_meta_tags({
   title: present(@plan).title,
   url: plan_url(@plan.id)