app/controllers/decidim/meetings/directory/meetings_controller.rb in decidim-meetings-0.25.2 vs app/controllers/decidim/meetings/directory/meetings_controller.rb in decidim-meetings-0.26.0.rc1

@@ -2,34 +2,24 @@
 
 module Decidim
   module Meetings
     module Directory
       # Exposes the meeting resource so users can view them
-      class MeetingsController < Decidim::ApplicationController
+      class MeetingsController < Decidim::Meetings::Directory::ApplicationController
         layout "layouts/decidim/application"
 
         include FilterResource
+        include Filterable
         include Paginable
 
         helper Decidim::WidgetUrlsHelper
         helper Decidim::FiltersHelper
         helper Decidim::Meetings::MapHelper
         helper Decidim::ResourceHelper
 
         helper_method :meetings, :search
 
-        def index
-          @meeting_spaces = search.results.map do |meeting|
-            klass = meeting.component.participatory_space.class
-            [klass.model_name.name.underscore, klass.model_name.human(count: 2)]
-          end.uniq
-          @meeting_spaces = @meeting_spaces.sort_by do |_param, name|
-            name
-          end
-          @meeting_spaces.prepend(["all", t(".all")])
-        end
-
         def calendar
           render plain: CalendarRenderer.for(current_organization), content_type: "type/calendar"
         end
 
         private
@@ -37,29 +27,50 @@
         def meetings
           @meetings ||= paginate(search.results)
         end
 
         def search_klass
-          MeetingSearch
+          ::Decidim::Meetings::Directory::MeetingSearch
         end
 
         def default_filter_params
           {
             date: "upcoming",
             search_text: "",
-            scope_id: "",
-            space: "all"
+            activity: "all",
+            scope_id: default_filter_scope_params,
+            space: default_filter_space_params,
+            type: default_filter_type_params,
+            origin: default_filter_origin_params,
+            category_id: default_filter_category_params
           }
         end
 
-        def default_search_params
-          {
-            scope: Meeting.not_hidden.visible_meeting_for(current_user)
-          }
+        def default_filter_category_params
+          participatory_spaces = current_organization.public_participatory_spaces
+          list_of_ps = []
+          participatory_spaces.flat_map do |current_participatory_space|
+            next unless current_participatory_space.respond_to?(:categories)
+
+            key_point = current_participatory_space.class.name.gsub("::", "__") + current_participatory_space.id.to_s
+
+            list_of_ps.push(key_point)
+            list_of_ps += current_participatory_space.categories.pluck(:id).map(&:to_s)
+          end
+
+          ["all"] + list_of_ps
         end
 
+        def default_filter_space_params
+          %w(all) + current_organization.public_participatory_spaces.collect(&:model_name).uniq.collect(&:name).collect(&:underscore)
+        end
+
+        def default_filter_scope_params
+          %w(all global) + current_organization.scopes.pluck(:id).map(&:to_s)
+        end
+
         def context_params
-          { component: meeting_components, organization: current_organization }
+          { component: meeting_components, organization: current_organization, current_user: current_user }
         end
 
         def meeting_components
           @meeting_components ||= Decidim::Component
                                   .where(manifest_name: "meetings")