decidim-meetings 0.29.2 → 0.30.0.rc2

data/app/helpers/decidim/meetings/application_helper.rb

@@ -7,7 +7,6 @@ module Decidim
     module ApplicationHelper
       include PaginateHelper
       include Decidim::MapHelper
-      include Decidim::Meetings::MapHelper
       include Decidim::Comments::CommentsHelper
       include Decidim::SanitizeHelper
       include Decidim::CheckBoxesTreeHelper
@@ -39,6 +38,41 @@ module Decidim
         flat_filter_values(:all, :upcoming, :past, scope: "decidim.meetings.meetings.filters.date_values")
       end
 
+      # rubocop:disable Metrics/ParameterLists
+      # rubocop:disable Metrics/CyclomaticComplexity
+      def filter_sections(date: false, type: false, origin: false, taxonomies: false, space_type: false, activity: false)
+        @filter_sections ||= begin
+          items = []
+          if date
+            items.append(method: :with_any_date, collection: filter_date_values, label: t("decidim.meetings.meetings.filters.date"), id: "date",
+                         type: :radio_buttons)
+          end
+          items.append(method: :with_any_type, collection: filter_type_values, label: t("decidim.meetings.meetings.filters.type"), id: "type") if type
+          if taxonomies
+            available_taxonomy_filters.each do |taxonomy_filter|
+              items.append(method: "with_any_taxonomies[#{taxonomy_filter.root_taxonomy_id}]",
+                           collection: filter_taxonomy_values_for(taxonomy_filter),
+                           label: decidim_sanitize_translated(taxonomy_filter.name),
+                           id: "taxonomy-#{taxonomy_filter.root_taxonomy_id}")
+            end
+          end
+          items.append(method: :with_any_origin, collection: filter_origin_values, label: t("decidim.meetings.meetings.filters.origin"), id: "origin") if origin
+          if space_type
+            items.append(method: :with_any_space, collection: directory_meeting_spaces_values, label: t("decidim.meetings.directory.meetings.index.space_type"),
+                         id: "space_type")
+          end
+          if activity
+            items.append(method: :activity, collection: activity_filter_values, label: t("decidim.meetings.meetings.filters.activity"), id: "activity",
+                         type: :radio_buttons)
+          end
+          items.reject { |item| item[:collection].blank? }
+        end
+      end
+      # rubocop:enable Metrics/ParameterLists
+      # rubocop:enable Metrics/CyclomaticComplexity
+
+      delegate :available_taxonomy_filters, to: :current_component
+
       # Options to filter meetings by activity.
       def activity_filter_values
         flat_filter_values(:all, :my_meetings, scope: "decidim.meetings.meetings.filters")

data/app/helpers/decidim/meetings/directory/application_helper.rb

@@ -8,7 +8,6 @@ module Decidim
       module ApplicationHelper
         include PaginateHelper
         include Decidim::MapHelper
-        include Decidim::Meetings::MapHelper
         include Decidim::Meetings::MeetingsHelper
         include Decidim::Comments::CommentsHelper
         include Decidim::SanitizeHelper
@@ -27,6 +26,15 @@ module Decidim
           )
         end
 
+        def available_taxonomy_filters
+          @available_taxonomy_filters ||= begin
+            participatory_spaces = current_organization.public_participatory_spaces
+            components = Decidim::Component.where(manifest_name: "meetings", participatory_space: participatory_spaces)
+            filter_ids = components.map(&:settings).pluck(:taxonomy_filters).flatten.compact
+            Decidim::TaxonomyFilter.for(current_organization).where(id: filter_ids)
+          end
+        end
+
         def filter_date_values
           %w(all upcoming past).map { |k| [k, t(k, scope: "decidim.meetings.meetings.filters.date_values")] }
         end
@@ -43,57 +51,10 @@ module Decidim
           filter_tree_from_array(spaces)
         end
 
-        def directory_filter_categories_values
-          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)
-
-            sorted_main_categories = current_participatory_space.categories.first_class.includes(:subcategories).sort_by do |category|
-              [category.weight, translated_attribute(category.name, current_organization)]
-            end
-
-            categories_values = categories_values(sorted_main_categories)
-
-            next if categories_values.empty?
-
-            key_point = current_participatory_space.class.name.gsub("::", "__") + current_participatory_space.id.to_s
-
-            TreeNode.new(
-              TreePoint.new(key_point, translated_attribute(current_participatory_space.title, current_organization)),
-              categories_values
-            )
-          end
-
-          list_of_ps.compact!
-          TreeNode.new(
-            TreePoint.new("", t("decidim.meetings.application_helper.filter_category_values.all")),
-            list_of_ps
-          )
-        end
-
         # Options to filter meetings by activity.
         def activity_filter_values
           %w(all my_meetings).map { |k| [k, t(k, scope: "decidim.meetings.meetings.filters")] }
         end
-
-        protected
-
-        def categories_values(sorted_main_categories)
-          sorted_main_categories.flat_map do |category|
-            sorted_descendant_categories = category.descendants.includes(:subcategories).sort_by do |subcategory|
-              [subcategory.weight, translated_attribute(subcategory.name, current_organization)]
-            end
-
-            subcategories = sorted_descendant_categories.flat_map do |subcategory|
-              TreePoint.new(subcategory.id.to_s, translated_attribute(subcategory.name, current_organization))
-            end
-
-            TreeNode.new(
-              TreePoint.new(category.id.to_s, translated_attribute(category.name, current_organization)),
-              subcategories
-            )
-          end
-        end
       end
     end
   end

data/app/helpers/decidim/meetings/meetings_helper.rb

@@ -142,6 +142,11 @@ module Decidim
         base_url = "https://calendar.google.com/calendar/u/0/r/eventedit"
         "#{base_url}?#{params.to_param}"
       end
+
+      def render_schema_org_event_meeting(meeting)
+        exported_meeting = Decidim::Exporters::JSON.new([meeting], Decidim::Meetings::SchemaOrgEventMeetingSerializer).export.read
+        JSON.pretty_generate(JSON.parse(exported_meeting).first)
+      end
     end
   end
 end

data/app/models/decidim/meetings/invite.rb

@@ -33,6 +33,16 @@ module Decidim
         update!(rejected_at: Time.current, accepted_at: nil)
       end
       alias decline! reject!
+
+      def self.ransackable_attributes(auth_object = nil)
+        return [] unless auth_object&.admin?
+
+        %w(accepted_at rejected_at sent_at)
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w(user)
+      end
     end
   end
 end

data/app/models/decidim/meetings/meeting.rb

@@ -12,12 +12,14 @@ module Decidim
       include Decidim::HasReference
       include Decidim::ScopableResource
       include Decidim::HasCategory
+      include Decidim::Taxonomizable
       include Decidim::Followable
       include Decidim::Comments::CommentableWithComponent
       include Decidim::Comments::HasAvailabilityAttributes
       include Decidim::Searchable
       include Decidim::Traceable
       include Decidim::Loggable
+      include Decidim::DownloadYourData
       include Decidim::Forms::HasQuestionnaire
       include Decidim::Paddable
       include Decidim::ActsAsAuthor
@@ -26,6 +28,7 @@ module Decidim
       include Decidim::TranslatableResource
       include Decidim::Publicable
       include Decidim::FilterableResource
+      include Decidim::SoftDeletable
 
       TYPE_OF_MEETING = { in_person: 0, online: 10, hybrid: 20 }.freeze
       REGISTRATION_TYPES = { registration_disabled: 0, on_this_platform: 10, on_different_platform: 20 }.freeze
@@ -45,6 +48,8 @@ module Decidim
         foreign_key: :decidim_user_id,
         source: :user
       )
+      has_many :meeting_links, dependent: :destroy, class_name: "Decidim::Meetings::MeetingLink", foreign_key: "decidim_meeting_id"
+      has_many :components, through: :meeting_links, class_name: "Decidim::Component", foreign_key: "decidim_component_id"
 
       enum iframe_access_level: [:all, :signed_in, :registered], _prefix: true
       enum iframe_embed_type: [:none, :embed_in_meeting_page, :open_in_live_event_page, :open_in_new_tab], _prefix: true
@@ -57,6 +62,7 @@ module Decidim
 
       geocoded_by :address
 
+      scope :closed, -> { where.not(closed_at: nil) }
       scope :published, -> { where.not(published_at: nil) }
       scope :past, -> { where(arel_table[:end_time].lteq(Time.current)) }
       scope :upcoming, -> { where(arel_table[:end_time].gteq(Time.current)) }
@@ -151,6 +157,10 @@ module Decidim
       # we create a salt for the meeting only on new meetings to prevent changing old IDs for existing (Ether)PADs
       before_create :set_default_salt
 
+      def self.export_serializer
+        Decidim::Meetings::DownloadYourDataMeetingSerializer
+      end
+
       def self.participants_iframe_embed_types
         iframe_embed_types.except(:open_in_live_event_page)
       end
@@ -370,7 +380,19 @@ module Decidim
       end
 
       def self.ransackable_scopes(_auth_object = nil)
-        [:with_any_type, :with_any_date, :with_any_space, :with_any_origin, :with_any_scope, :with_any_category, :with_any_global_category]
+        [:with_any_type, :with_any_date, :with_any_space, :with_any_origin, :with_any_taxonomies, :with_any_global_category]
+      end
+
+      def self.ransackable_attributes(auth_object = nil)
+        base = %w(description id_string search_text title)
+
+        return base unless auth_object&.admin?
+
+        base + %w(is_upcoming closed_at)
+      end
+
+      def self.ransackable_associations(_auth_object = nil)
+        %w(taxonomies)
       end
 
       def self.ransack(params = {}, options = {})

data/app/models/decidim/meetings/meeting_link.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class MeetingLink < Meetings::ApplicationRecord
+      include Decidim::HasComponent
+
+      belongs_to :meeting, foreign_key: "decidim_meeting_id", class_name: "Decidim::Meetings::Meeting"
+      belongs_to :component, foreign_key: "decidim_component_id", class_name: "Decidim::Component"
+
+      # Finds all the meetings linked to the given component
+      # filtering out meetings that belong to private not transparent spaces.
+      def self.find_meetings(component:)
+        meetings = Meeting
+                   .joins(:meeting_links)
+                   .where("decidim_meetings_meeting_links.component": component)
+                   .filter do |meeting|
+          !meeting.component.private_non_transparent_space?
+        end
+
+        Meeting.where(id: meetings.map(&:id))
+      end
+    end
+  end
+end

data/app/packs/entrypoints/decidim_meetings_admin.js

@@ -1,5 +1,6 @@
 import "src/decidim/meetings/admin/agendas"
 import "src/decidim/meetings/admin/destroy_meeting_alert"
 import "src/decidim/meetings/admin/meetings_form"
+import "src/decidim/meetings/admin/meetings_components_form"
 import "src/decidim/meetings/admin/registrations_form"
 import "src/decidim/meetings/admin/registrations_invite_form"

data/app/packs/src/decidim/meetings/admin/meetings_components_form.js

@@ -0,0 +1,77 @@
+import TomSelect from "tom-select/dist/cjs/tom-select.popular";
+import createTooltip from "src/decidim/tooltips"
+
+/**
+ * This module manages the Linked Spaces section from the
+ * admin meeting edit form.
+ *
+ * It allows to add and remove components to the meeting and
+ * setup a TomSelect for the components selector.
+ */
+
+const handleRemoveButton = (button) => {
+  button.addEventListener("click", function() {
+    button.closest("tr").remove();
+  });
+};
+
+const handleAddButton = () => {
+  const select = document.querySelector("select[name='add_component_select']");
+  const componentId = select.value;
+  const componentTitle = select.options[select.selectedIndex].text;
+
+  if (!componentId) {
+    return;
+  }
+
+  const table = document.querySelector(".js-components");
+  const body = document.querySelector(".js-components tbody");
+  const template = document.querySelector("#meeting_component_template");
+  const clone = template.content.cloneNode(true);
+  const title = clone.querySelector(".js-component-title");
+  const id = clone.querySelector("input");
+  const button = clone.querySelector(".js-remove-component");
+
+  title.textContent = componentTitle;
+  id.value = componentId;
+  if (button) {
+    handleRemoveButton(button);
+  }
+
+  body.appendChild(clone);
+
+  const tooltips = body.querySelectorAll("[data-tooltip]")
+
+  if (tooltips.length) {
+    createTooltip(tooltips[tooltips.length - 1]);
+  }
+
+  select.value = "";
+  table.classList.remove("hidden");
+};
+
+const setupTomSelect = () => {
+  const componentsSelect = document.querySelector(
+    "#add_component_select"
+  );
+
+  const config = {
+    plugins: ["dropdown_input"]
+  };
+
+  if (componentsSelect) {
+    return new TomSelect(componentsSelect, config);
+  }
+  return null;
+}
+
+document.addEventListener("DOMContentLoaded", () => {
+  document.querySelectorAll(".js-remove-component").forEach(handleRemoveButton);
+  const addButton = document.querySelector(".js-add-component")
+
+  if (addButton) {
+    addButton.addEventListener("click", handleAddButton);
+  }
+
+  setupTomSelect();
+});

data/app/packs/src/decidim/meetings/admin/meetings_form.js

@@ -86,10 +86,16 @@ $(() => {
   if ($form.length > 0) {
     const $privateMeeting = $form.find("#private_meeting");
     const $transparent = $form.find("#transparent");
+    const $warning = $form.find(".js-private-warning");
+    const $assign = $form.find(".js-add-component");
 
     const toggleDisabledHiddenFields = () => {
       const enabledPrivateSpace = $privateMeeting.find("input[type='checkbox']").prop("checked");
+      const enabledTransparent = $transparent.find("input[type='checkbox']").prop("checked");
+
       $transparent.find("input[type='checkbox']").attr("disabled", "disabled");
+      $warning?.toggleClass("hidden", !enabledPrivateSpace || enabledTransparent);
+      $assign?.attr("disabled", enabledPrivateSpace && !enabledTransparent);
 
       if (enabledPrivateSpace) {
         $transparent.find("input[type='checkbox']").attr("disabled", !enabledPrivateSpace);
@@ -97,6 +103,8 @@ $(() => {
     };
 
     $privateMeeting.on("change", toggleDisabledHiddenFields);
+    $transparent.on("change", toggleDisabledHiddenFields);
+
     toggleDisabledHiddenFields();
 
     attachGeocoding($form.find("#meeting_address"));

data/app/permissions/decidim/meetings/admin/permissions.rb

@@ -41,7 +41,7 @@ module Decidim
           return disallow! if meeting && !meeting.official?
 
           case permission_action.action
-          when :close, :copy, :destroy, :export_registrations, :update, :read_invites
+          when :close, :copy, :export_registrations, :update, :read_invites
             toggle_allow(meeting.present?)
           when :invite_attendee
             toggle_allow(meeting.present? && meeting.registrations_enabled?)

data/app/permissions/decidim/meetings/permissions.rb

@@ -84,13 +84,20 @@ module Decidim
       end
 
       def can_create_meetings?
-        component_settings&.creation_enabled_for_participants? && public_space_or_member?
+        (component_settings&.creation_enabled_for_participants? && can_participate?) || initiative_authorship?
       end
 
-      def public_space_or_member?
+      def can_participate?
+        context[:current_component].participatory_space.can_participate?(user)
+      end
+
+      def initiative_authorship?
+        return false unless Decidim.module_installed?("initiatives")
+
         participatory_space = context[:current_component].participatory_space
 
-        participatory_space.private_space? ? space_member?(participatory_space, user) : true
+        participatory_space.is_a?(Decidim::Initiative) &&
+          participatory_space.has_authorship?(user)
       end
 
       # Neither platform admins, nor space admins should be able to create meetings from the public side.
@@ -101,21 +108,18 @@ module Decidim
       end
 
       def can_update_meeting?
-        component_settings&.creation_enabled_for_participants? &&
-          meeting.authored_by?(user) &&
+        meeting.authored_by?(user) &&
           !meeting.closed?
       end
 
       def can_withdraw_meeting?
-        component_settings&.creation_enabled_for_participants? &&
-          meeting.authored_by?(user) &&
+        meeting.authored_by?(user) &&
           !meeting.withdrawn? &&
           !meeting.past?
       end
 
       def can_close_meeting?
-        component_settings&.creation_enabled_for_participants? &&
-          meeting.authored_by?(user) &&
+        meeting.authored_by?(user) &&
           meeting.past?
       end
 

data/app/presenters/decidim/meetings/admin_log/meeting_presenter.rb

@@ -39,7 +39,7 @@ module Decidim
 
         def action_string
           case action
-          when "close", "create", "delete", "export_registrations", "update"
+          when "close", "create", "delete", "export_registrations", "update", "soft_delete", "restore"
             "decidim.meetings.admin_log.meeting.#{action}"
           else
             super

data/app/presenters/decidim/meetings/meeting_presenter.rb

@@ -10,6 +10,8 @@ module Decidim
       include ActionView::Helpers::UrlHelper
       include Decidim::SanitizeHelper
 
+      alias super_title title
+
       def meeting
         __getobj__
       end
@@ -18,6 +20,12 @@ module Decidim
         Decidim::ResourceLocatorPresenter.new(meeting).path
       end
 
+      def taxonomy_names(html_escape: false, all_locales: false)
+        meeting.taxonomies.map do |taxonomy|
+          super_title(taxonomy.name, false, html_escape, all_locales)
+        end
+      end
+
       def display_mention
         link_to title, meeting_path
       end
@@ -25,7 +33,7 @@ module Decidim
       def title(links: false, html_escape: false, all_locales: false)
         return unless meeting
 
-        super meeting.title, links, html_escape, all_locales
+        super(meeting.title, links, html_escape, all_locales)
       end
 
       def description(links: false, extras: true, strip_tags: false, all_locales: false)
@@ -103,6 +111,10 @@ module Decidim
         ""
       end
 
+      def space_title
+        translated_attribute component.participatory_space.title
+      end
+
       def profile_path
         resource_locator(meeting).path
       end

data/app/queries/decidim/meetings/filtered_meetings.rb

@@ -28,8 +28,8 @@ module Decidim
       # by a range of dates.
       def query
         meetings = Decidim::Meetings::Meeting.not_hidden.published.where(component: @components)
-        meetings = meetings.where("created_at >= ?", @start_at) if @start_at.present?
-        meetings = meetings.where("created_at <= ?", @end_at) if @end_at.present?
+        meetings = meetings.where(created_at: @start_at..) if @start_at.present?
+        meetings = meetings.where(created_at: ..@end_at) if @end_at.present?
         meetings
       end
     end

data/app/queries/decidim/meetings/metrics/meeting_followers_metric_measure.rb

@@ -14,10 +14,10 @@ module Decidim
           meetings = Decidim::Meetings::Meeting.where(component: @resource).joins(:component)
 
           meetings_followers = Decidim::Follow.where(followable: meetings).joins(:user)
-                                              .where("decidim_follows.created_at <= ?", end_time)
+                                              .where(decidim_follows: { created_at: ..end_time })
           cumulative_users = meetings_followers.pluck(:decidim_user_id)
 
-          meetings_followers = meetings_followers.where("decidim_follows.created_at >= ?", start_time)
+          meetings_followers = meetings_followers.where(decidim_follows: { created_at: start_time.. })
           quantity_users = meetings_followers.pluck(:decidim_user_id)
 
           {

data/app/queries/decidim/meetings/metrics/meetings_metric_manage.rb

@@ -13,9 +13,9 @@ module Decidim
             next if cumulative_value.zero?
 
             quantity_value = quantity[key] || 0
-            category_id, space_type, space_id = key
+            taxonomy_id, space_type, space_id = key
             record = Decidim::Metric.find_or_initialize_by(day: @day.to_s, metric_type: @metric_name,
-                                                           organization: @organization, decidim_category_id: category_id,
+                                                           organization: @organization, decidim_taxonomy_id: taxonomy_id,
                                                            participatory_space_type: space_type, participatory_space_id: space_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
             record.save!
@@ -31,16 +31,16 @@ module Decidim
             manifest.participatory_spaces.call(@organization).public_spaces
           end
           @query = Decidim::Meetings::Meeting.where(component: visible_components_from_spaces(spaces)).joins(:component)
-                                             .left_outer_joins(:category).visible
-          @query = @query.where("decidim_meetings_meetings.created_at <= ?", end_time)
-          @query = @query.group("decidim_categorizations.decidim_category_id",
+                                             .left_outer_joins(:taxonomizations).visible
+          @query = @query.where(decidim_meetings_meetings: { created_at: ..end_time })
+          @query = @query.group("decidim_taxonomizations.taxonomy_id",
                                 :participatory_space_type,
                                 :participatory_space_id)
           @query
         end
 
         def quantity
-          @quantity ||= query.where("decidim_meetings_meetings.created_at >= ?", start_time).count
+          @quantity ||= query.where(decidim_meetings_meetings: { created_at: start_time.. }).count
         end
       end
     end

data/app/serializers/decidim/meetings/base_download_your_data_serializer.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class BaseDownloadYourDataSerializer < Decidim::Exporters::Serializer
+      # This is the Base class for Invite and Registrations models for the download your data feature
+      def serialize
+        {
+          id: resource.id,
+          created_at: resource.created_at,
+          updated_at: resource.updated_at,
+          meeting: {
+            title: resource.meeting.title,
+            url: Decidim::ResourceLocatorPresenter.new(resource.meeting).url,
+            description: resource.meeting.description,
+            start_time: resource.meeting.start_time,
+            end_time: resource.meeting.end_time,
+            address: resource.meeting.address,
+            location: resource.meeting.location,
+            location_hints: resource.meeting.location_hints,
+            reference: resource.meeting.reference,
+            attendees_count: resource.meeting.attendees_count,
+            attending_organizations: resource.meeting.attending_organizations,
+            closed_at: resource.meeting.closed_at,
+            closing_report: resource.meeting.closing_report,
+            published_at: resource.meeting.published_at
+          }
+        }
+      end
+    end
+  end
+end

data/app/serializers/decidim/meetings/download_your_data_invite_serializer.rb

@@ -2,34 +2,14 @@
 
 module Decidim
   module Meetings
-    class DownloadYourDataInviteSerializer < Decidim::Exporters::Serializer
+    class DownloadYourDataInviteSerializer < BaseDownloadYourDataSerializer
       # Serializes an invite for download your data
       def serialize
-        {
-          id: resource.id,
-          sent_at: resource.sent_at,
-          accepted_at: resource.accepted_at,
-          rejected_at: resource.rejected_at,
-          user: {
-            name: resource.user.name,
-            email: resource.user.email
-          },
-          meeting: {
-            title: resource.meeting.title,
-            description: resource.meeting.description,
-            start_time: resource.meeting.start_time,
-            end_time: resource.meeting.end_time,
-            address: resource.meeting.address,
-            location: resource.meeting.location,
-            location_hints: resource.meeting.location_hints,
-            reference: resource.meeting.reference,
-            attendees_count: resource.meeting.attendees_count,
-            attending_organizations: resource.meeting.attending_organizations,
-            closed_at: resource.meeting.closed_at,
-            closing_report: resource.meeting.closing_report,
-            published_at: resource.meeting.published_at
-          }
-        }
+        super.merge({
+                      sent_at: resource.sent_at,
+                      accepted_at: resource.accepted_at,
+                      rejected_at: resource.rejected_at
+                    })
       end
     end
   end

data/app/serializers/decidim/meetings/download_your_data_meeting_serializer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class DownloadYourDataMeetingSerializer < Decidim::Meetings::MeetingSerializer
+      # Serializes a Meeting for download your data feature
+      #
+      # Remove the author information as it is the same of the user that
+      # requested the data
+      def serialize
+        super.except!(:author)
+      end
+    end
+  end
+end