Import latest changes from 0.29 (#4)

* update latest changes

* trigger CI

* remove manifest name

* fix locales

* fix specs

---------

Co-authored-by: elviabth <ejbenedith@gmail.com>

Author: microstudi

app/cells/decidim/alternative_landing/content_blocks/alternative_upcoming_meetings_cell.rb

@@ -29,10 +29,6 @@ def meetings
 
         private
 
-        def manifest_name
-          "meetings"
-        end
-
         # A MD5 hash of model attributes because is needed because
         # it ensures the cache version value will always be the same size
         def cache_hash

app/cells/decidim/alternative_landing/content_blocks/alternative_upcoming_meetings_settings_form/show.erb

@@ -8,5 +8,5 @@
       <%= t(".info", component: translated_attribute(component.name), space: translated_attribute(component.participatory_space.title)) %>
     </p>
   <% end %>
-  <%= settings_fields.select :component_id, available_components %>
+  <%= settings_fields.select :component_id, available_components("meetings") %>
 <% end %>

app/cells/decidim/alternative_landing/content_blocks/alternative_upcoming_meetings_settings_form_cell.rb

@@ -5,10 +5,6 @@ module AlternativeLanding
     module ContentBlocks
       class AlternativeUpcomingMeetingsSettingsFormCell < BaseCell
         alias form model
-
-        def manifest_name
-          "meetings"
-        end
       end
     end
   end

app/cells/decidim/alternative_landing/content_blocks/base_cell.rb

@@ -18,22 +18,45 @@ def participatory_spaces
           ].flatten.compact
         end
 
-        def available_components
-          @available_components ||= components.where(manifest_name:).map do |component|
+        def available_components(manifest_name)
+          @available_components ||= {}
+          @available_components[manifest_name] ||= components.where(manifest_name:).map do |component|
             ["#{translated_attribute(component.name)} (#{translated_attribute(component.participatory_space.title)})", component.id]
           end.unshift [t(".all"), nil]
         end
 
-        def component
-          @component ||= components.find_by(id: (defined?(form) ? form.object : model).settings.try(:component_id))
+        def available_posts
+          [
+            [t("sidebar_right_stack_settings_form.filter_posts.all", scope: "decidim.alternative_landing.content_blocks"), "all"],
+            [t("sidebar_right_stack_settings_form.filter_posts.organization", scope: "decidim.alternative_landing.content_blocks"), "organization"],
+            [t("sidebar_right_stack_settings_form.filter_posts.users", scope: "decidim.alternative_landing.content_blocks"), "users"]
+          ]
+        end
+
+        def available_meeting_components
+          special_options = [
+            [t(".all_meetings"), "all"],
+            [t(".let_me_choose_individual_meetings"), "meeting-picker"]
+          ]
+
+          @available_meeting_components ||= special_options + available_components("meetings")
+        end
+
+        def component(component_key = :component)
+          @component_cache ||= {}
+          @component_cache[component_key] ||= begin
+            record = defined?(form) ? form.object : model
+            component_id = record.settings.try("#{component_key}_id")
+            component_relation.find_by(id: component_id) if component_id.present?
+          end
         end
 
         def components
           @components ||= Decidim::Component.where(participatory_space: participatory_spaces)
         end
 
-        def manifest_name
-          raise NotImplementedError
+        def component_relation
+          components
         end
 
         def colors

app/cells/decidim/alternative_landing/content_blocks/latest_blog_posts_cell.rb

@@ -20,17 +20,20 @@ def post_path(post)
         end
 
         def posts
-          @posts ||= Blogs::Post.where(
-            component: component || components
-          ).limit(posts_to_show).order(created_at: :desc)
-        end
+          scope = Blogs::Post.where(component: component || components)
 
-        private
+          case model.settings[:filter]
+          when "organization"
+            scope = scope.where(decidim_author_type: "Decidim::Organization")
+          when "users"
+            scope = scope.where(decidim_author_type: "Decidim::UserBaseEntity")
+          end
 
-        def manifest_name
-          "blogs"
+          scope.limit(posts_to_show).order(created_at: :desc)
         end
 
+        private
+
         # A MD5 hash of model attributes because is needed because
         # it ensures the cache version value will always be the same size
         def cache_hash

app/cells/decidim/alternative_landing/content_blocks/latest_blog_posts_settings_form/show.erb

@@ -8,5 +8,6 @@
       <%= t(".info", component: translated_attribute(component.name), space: translated_attribute(component.participatory_space.title)) %>
     </p>
   <% end %>
-  <%= settings_fields.select :component_id, available_components %>
+  <%= settings_fields.select :component_id, available_components("blogs") %>
+  <%= settings_fields.select :filter, available_posts, label: t("latest_blog_posts_settings_form.filter.name", scope: "decidim.alternative_landing.content_blocks") %>
 <% end %>

app/cells/decidim/alternative_landing/content_blocks/latest_blog_posts_settings_form_cell.rb

@@ -5,10 +5,6 @@ module AlternativeLanding
     module ContentBlocks
       class LatestBlogPostsSettingsFormCell < BaseCell
         alias form model
-
-        def manifest_name
-          "blogs"
-        end
       end
     end
   end

app/cells/decidim/alternative_landing/content_blocks/meetings_picker/show.erb

@@ -0,0 +1,14 @@
+<label for="meetings_list">
+  <%= t("name", scope: "decidim.components.meetings") %>
+
+  <select id="meetings_list"
+          placeholder="<%= t("meetings_picker.choose_meetings", scope: "decidim.alternative_landing.content_blocks.sidebar_right_stack_settings_form") %>"
+          data-tm-name="<%= form_name %>"
+          data-tm-items="<%= selected_ids.to_json %>"
+          data-tm-no-results="<%= t("meetings_picker.no_meetings", scope: "decidim.alternative_landing.content_blocks.sidebar_right_stack_settings_form") %>"
+          class="mt-4" multiple>
+    <% decorated_meetings do |meeting| %>
+      <option value="<%= meeting.id %>"><%= decidim_sanitize translated_attribute(meeting.title) %> (<%= decidim_sanitize meeting.reference %>)</option>
+    <% end %>
+  </select>
+</label>

app/cells/decidim/alternative_landing/content_blocks/meetings_picker_cell.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module AlternativeLanding
+    module ContentBlocks
+      class MeetingsPickerCell < BaseCell
+        def show
+          render
+        end
+
+        alias component model
+
+        def form
+          options[:form]
+        end
+
+        def field
+          options[:field]
+        end
+
+        def form_name
+          "#{form.object_name}[settings][#{field}]"
+        end
+
+        def selected_ids
+          form.object["settings"]&.meeting_ids&.map(&:to_i) || []
+        end
+
+        def meetings
+          @meetings ||= Meetings::Meeting.upcoming.where(
+            component: component || components
+          )
+        end
+
+        def decorated_meetings
+          meetings.map do |meeting|
+            yield Decidim::Meetings::MeetingPresenter.new(meeting)
+          end
+        end
+      end
+    end
+  end
+end

app/cells/decidim/alternative_landing/content_blocks/sidebar_right_stack/show.erb

@@ -14,7 +14,7 @@
       <p><%= translated_body %></p>
     </div>
     <div>
-      <a href="<%= translated_url("sidebar")%>" class="button button__sm md:button__lg button__secondary no-underline mt-4 mb-4">
+      <a href="<%= translated_url("sidebar") %>" class="button button__sm md:button__lg button__secondary no-underline mt-4 mb-4">
         <%= translated_link_text("sidebar") %>
       </a>
     </div>
@@ -29,12 +29,12 @@
         <div class="splide__slider">
           <div class="splide__track">
             <ul class="splide__list">
-              <% meetings.each do |meeting|%>
+              <% meetings.each do |meeting| %>
                 <li class="splide__slide min-h-[100px] ">
                   <%
                   formatted_date = l(meeting.start_time, format: :long)
                   %>
-                  <h3 class="text-2xl"><%= translated_attribute(meeting.title) %></h3>
+                  <h3 class="text-2xl"><%= decidim_sanitize translated_attribute(meeting.title) %></h3>
                   <p><%= "#{formatted_date}" %></p>
                 </li>
               <% end %>
@@ -54,13 +54,13 @@
 
     <div class="stack_two h-[40vh] w-[100vw] md:w-[50vw] grid grid-rows-3">
       <div class="w-[100vw] md:w-[50vw]">
-        <h2 class="mt-4 mb-4 text-5xl font-bold uppercase"><%= decidim_sanitize translated_title("posts")%></h2>
+        <h2 class="mt-4 mb-4 text-5xl font-bold uppercase"><%= decidim_sanitize translated_title("posts") %></h2>
       </div>
-      <div id="alternative-landing-sidebar-splide-post"class="splide w-[100vw] md:w-[50vw] m-auto">
+      <div id="alternative-landing-sidebar-splide-post" class="splide w-[100vw] md:w-[50vw] m-auto">
         <div class="splide__slider">
           <div class="splide__track">
             <ul class="splide__list">
-              <% posts.each do |post|%>
+              <% posts.each do |post| %>
                 <li class="splide__slide post">
                   <h3 class="text-2xl"><%= translated_attribute(post.title) %></h3>
                 </li>