decidim-meetings 0.27.8 → 0.28.0.rc4

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

@@ -12,26 +12,21 @@ module Decidim
       include Decidim::SanitizeHelper
       include Decidim::CheckBoxesTreeHelper
       include Decidim::RichTextEditorHelper
+      include ::Decidim::FollowableHelper
 
       def filter_origin_values
-        origin_values = []
-        origin_values << TreePoint.new("official", t("decidim.meetings.meetings.filters.origin_values.official"))
-        origin_values << TreePoint.new("participants", t("decidim.meetings.meetings.filters.origin_values.participants")) # todo
-        if current_organization.user_groups_enabled?
-          origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) # todo
-        end
-        # if current_organization.user_groups_enabled? and component_settings enabled enabled
+        origin_keys = %w(official participants)
+        origin_keys << "user_group" if current_organization.user_groups_enabled?
 
-        TreeNode.new(
-          TreePoint.new("", t("decidim.meetings.meetings.filters.origin_values.all")),
-          origin_values
-        )
+        origin_values = flat_filter_values(*origin_keys, scope: "decidim.meetings.meetings.filters.origin_values")
+        origin_values.prepend(["", t("all", scope: "decidim.meetings.meetings.filters.origin_values")])
+
+        filter_tree_from_array(origin_values)
       end
 
       def filter_type_values
-        type_values = []
-        Decidim::Meetings::Meeting::TYPE_OF_MEETING.each do |type|
-          type_values << TreePoint.new(type, t("decidim.meetings.meetings.filters.type_values.#{type}"))
+        type_values = flat_filter_values(*Decidim::Meetings::Meeting::TYPE_OF_MEETING.keys, scope: "decidim.meetings.meetings.filters.type_values").map do |args|
+          TreePoint.new(*args)
         end
 
         TreeNode.new(
@@ -41,23 +36,16 @@ module Decidim
       end
 
       def filter_date_values
-        [
-          ["all", t("decidim.meetings.meetings.filters.date_values.all")],
-          ["upcoming", t("decidim.meetings.meetings.filters.date_values.upcoming")],
-          ["past", t("decidim.meetings.meetings.filters.date_values.past")]
-        ]
+        flat_filter_values(:all, :upcoming, :past, scope: "decidim.meetings.meetings.filters.date_values")
       end
 
       # Options to filter meetings by activity.
       def activity_filter_values
-        [
-          ["all", t("decidim.meetings.meetings.filters.all")],
-          ["my_meetings", t("decidim.meetings.meetings.filters.my_meetings")]
-        ]
+        flat_filter_values(:all, :my_meetings, scope: "decidim.meetings.meetings.filters")
       end
 
       # If the meeting is official or the rich text editor is enabled on the
-      # frontend, the meeting body is considered as safe content; that's unless
+      # frontend, the meeting body is considered as safe content; that is unless
       # the meeting comes from a collaborative_draft or a participatory_text.
       def safe_content?
         rich_text_editor_in_public_views? || safe_content_admin?
@@ -90,12 +78,17 @@ module Decidim
       end
 
       def online_or_hybrid_meeting?(meeting)
-        meeting.online_meeting? || meeting.hybrid_meeting?
+        meeting.online? || meeting.hybrid?
       end
 
       def iframe_embed_or_live_event_page?(meeting)
         %w(embed_in_meeting_page open_in_live_event_page).include? meeting.iframe_embed_type
       end
+
+      def apply_meetings_pack_tags
+        append_stylesheet_pack_tag("decidim_meetings", media: "all")
+        append_javascript_pack_tag("decidim_meetings")
+      end
     end
   end
 end

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

@@ -13,11 +13,12 @@ module Decidim
         include Decidim::Comments::CommentsHelper
         include Decidim::SanitizeHelper
         include Decidim::CheckBoxesTreeHelper
+        include Decidim::IconHelper
+        include Decidim::FiltersHelper
 
         def filter_type_values
-          type_values = []
-          Decidim::Meetings::Meeting::TYPE_OF_MEETING.each do |type|
-            type_values << TreePoint.new(type, t("decidim.meetings.meetings.filters.type_values.#{type}"))
+          type_values = flat_filter_values(*Decidim::Meetings::Meeting::TYPE_OF_MEETING.keys, scope: "decidim.meetings.meetings.filters.type_values").map do |args|
+            TreePoint.new(*args)
           end
 
           TreeNode.new(
@@ -27,53 +28,19 @@ module Decidim
         end
 
         def filter_date_values
-          [
-            ["all", t("decidim.meetings.meetings.filters.date_values.all")],
-            ["upcoming", t("decidim.meetings.meetings.filters.date_values.upcoming")],
-            ["past", t("decidim.meetings.meetings.filters.date_values.past")]
-          ]
-        end
-
-        def directory_filter_scopes_values
-          main_scopes = current_organization.scopes.top_level
-
-          scopes_values = main_scopes.includes(:scope_type, :children).flat_map do |scope|
-            TreeNode.new(
-              TreePoint.new(scope.id.to_s, translated_attribute(scope.name, current_organization)),
-              scope_children_to_tree(scope)
-            )
-          end
-
-          scopes_values.prepend(TreePoint.new("global", t("decidim.scopes.global")))
-
-          TreeNode.new(
-            TreePoint.new("", t("decidim.meetings.application_helper.filter_scope_values.all")),
-            scopes_values
-          )
-        end
-
-        def scope_children_to_tree(scope)
-          return unless scope.children.any?
-
-          scope.children.includes(:scope_type, :children).flat_map do |child|
-            TreeNode.new(
-              TreePoint.new(child.id.to_s, translated_attribute(child.name, current_organization)),
-              scope_children_to_tree(child)
-            )
-          end
+          %w(all upcoming past).map { |k| [k, t(k, scope: "decidim.meetings.meetings.filters.date_values")] }
         end
 
         def directory_meeting_spaces_values
           participatory_spaces = current_organization.public_participatory_spaces
 
           spaces = participatory_spaces.collect(&:model_name).uniq.map do |participatory_space|
-            TreePoint.new(participatory_space.name.underscore, participatory_space.human(count: 2))
+            [participatory_space.name.underscore, participatory_space.human(count: 2)]
           end
 
-          TreeNode.new(
-            TreePoint.new("", t("decidim.meetings.application_helper.filter_meeting_space_values.all")),
-            spaces
-          )
+          spaces.prepend(["", t("decidim.meetings.application_helper.filter_meeting_space_values.all")])
+
+          filter_tree_from_array(spaces)
         end
 
         def directory_filter_categories_values
@@ -92,7 +59,7 @@ module Decidim
             key_point = current_participatory_space.class.name.gsub("::", "__") + current_participatory_space.id.to_s
 
             TreeNode.new(
-              TreePoint.new(key_point, decidim_escape_translated(current_participatory_space.title)),
+              TreePoint.new(key_point, translated_attribute(current_participatory_space.title, current_organization)),
               categories_values
             )
           end
@@ -104,24 +71,9 @@ module Decidim
           )
         end
 
-        def directory_filter_origin_values
-          origin_values = []
-          origin_values << TreePoint.new("official", t("decidim.meetings.meetings.filters.origin_values.official"))
-          origin_values << TreePoint.new("participants", t("decidim.meetings.meetings.filters.origin_values.participants"))
-          origin_values << TreePoint.new("user_group", t("decidim.meetings.meetings.filters.origin_values.user_groups")) if current_organization.user_groups_enabled?
-
-          TreeNode.new(
-            TreePoint.new("", t("decidim.meetings.meetings.filters.origin_values.all")),
-            origin_values
-          )
-        end
-
         # Options to filter meetings by activity.
         def activity_filter_values
-          [
-            ["all", t("decidim.meetings.meetings.filters.all")],
-            ["my_meetings", t("decidim.meetings.meetings.filters.my_meetings")]
-          ]
+          %w(all my_meetings).map { |k| [k, t(k, scope: "decidim.meetings.meetings.filters")] }
         end
 
         protected

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

@@ -12,15 +12,8 @@ module Decidim
         geocoded_meetings = meetings.select(&:geocoded_and_valid?)
         geocoded_meetings.map do |meeting|
           meeting.slice(:latitude, :longitude, :address).merge(title: translated_attribute(meeting.title),
-                                                               description: html_truncate(translated_attribute(meeting.description), length: 200),
-                                                               startTimeDay: l(meeting.start_time, format: "%d"),
-                                                               startTimeMonth: l(meeting.start_time, format: "%B"),
-                                                               startTimeYear: l(meeting.start_time, format: "%Y"),
-                                                               startTime: "#{meeting.start_time.strftime("%H:%M")} - #{meeting.end_time.strftime("%H:%M")}",
-                                                               icon: icon("meetings", width: 40, height: 70, remove_icon_class: true),
-                                                               location: translated_attribute(meeting.location),
-                                                               locationHints: decidim_html_escape(translated_attribute(meeting.location_hints)),
-                                                               link: resource_locator(meeting).path)
+                                                               link: resource_locator(meeting).path,
+                                                               items: cell("decidim/meetings/meeting_card_metadata", meeting).send(:meeting_items_for_map).to_json)
         end
       end
     end

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

@@ -8,6 +8,7 @@ module Decidim
       include Decidim::Meetings::ApplicationHelper
       include Decidim::TranslationsHelper
       include Decidim::ResourceHelper
+      include Decidim::EndorsableHelper
 
       # Public: truncates the meeting description
       #
@@ -19,7 +20,7 @@ module Decidim
         link = resource_locator(meeting).path
         description = CGI.unescapeHTML present(meeting).description
         tail = "... #{link_to(t("read_more", scope: "decidim.meetings"), link)}".html_safe
-        CGI.unescapeHTML html_truncate(description, max_length: max_length, tail: tail)
+        CGI.unescapeHTML html_truncate(description, max_length:, tail:)
       end
 
       # Public: The css class applied based on the meeting type to
@@ -30,10 +31,10 @@ module Decidim
       # Returns a String.
       def meeting_type_badge_css_class(type)
         case type
-        when "private", "withdraw"
+        when "withdraw"
           "alert"
-        when "transparent"
-          "secondary"
+        when "private", "transparent"
+          "reverse"
         end
       end
 
@@ -84,7 +85,7 @@ module Decidim
       def display_duration_agenda_items(agenda_item_id, index, agenda_items_times)
         html = ""
         if agenda_item_id == agenda_items_times[index][:agenda_item_id]
-          html += "[ #{agenda_items_times[index][:start_time].strftime("%H:%M")} - #{agenda_items_times[index][:end_time].strftime("%H:%M")}]"
+          html += "[#{agenda_items_times[index][:start_time].strftime("%H:%M")} - #{agenda_items_times[index][:end_time].strftime("%H:%M")}]"
         end
         html.html_safe
       end

data/app/jobs/decidim/meetings/hide_all_created_by_author_job.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class HideAllCreatedByAuthorJob < ::Decidim::HideAllCreatedByAuthorJob
+      protected
+
+      def base_query
+        Decidim::Meetings::Meeting.not_hidden.where(author:)
+      end
+    end
+  end
+end

data/app/mailers/decidim/meetings/admin/invite_join_meeting_mailer.rb

@@ -30,7 +30,7 @@ module Decidim
             @locator = Decidim::ResourceLocatorPresenter.new(@meeting)
 
             subject = I18n.t("invite.subject", scope: "decidim.meetings.mailer.invite_join_meeting_mailer")
-            mail(to: user.email, subject: subject)
+            mail(to: user.email, subject:)
           end
         end
 

data/app/mailers/decidim/meetings/registration_mailer.rb

@@ -24,7 +24,7 @@ module Decidim
           add_calendar_attachment
 
           subject = I18n.t("confirmation.subject", scope: "decidim.meetings.mailer.registration_mailer")
-          mail(to: user.email, subject: subject)
+          mail(to: user.email, subject:)
         end
       end
 

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

@@ -27,8 +27,8 @@ module Decidim
       include Decidim::Publicable
       include Decidim::FilterableResource
 
-      TYPE_OF_MEETING = %w(in_person online hybrid).freeze
-      REGISTRATION_TYPE = %w(registration_disabled on_this_platform on_different_platform).freeze
+      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
 
       translatable_fields :title, :description, :location, :location_hints, :closing_report, :registration_terms
 
@@ -48,6 +48,8 @@ module Decidim
 
       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
+      enum type_of_meeting: TYPE_OF_MEETING
+      enum registration_type: REGISTRATION_TYPES, _scopes: false
 
       component_manifest_name "meetings"
 
@@ -82,7 +84,7 @@ module Decidim
       scope :visible_for, lambda { |user|
         (all.distinct if user&.admin?) ||
           if user.present?
-            spaces = Decidim.participatory_space_registry.manifests.filter_map do |manifest|
+            (spaces = Decidim.participatory_space_registry.manifests.filter_map do |manifest|
               table_name = manifest.model_class_name.constantize.try(:table_name)
               next if table_name.blank?
 
@@ -90,8 +92,8 @@ module Decidim
                 name: table_name.singularize,
                 class_name: manifest.model_class_name
               }
-            end
-            user_role_queries = spaces.map do |space|
+            end)
+            (user_role_queries = spaces.map do |space|
               roles_table = "#{space[:name]}_user_roles"
               next unless connection.table_exists?(roles_table)
 
@@ -101,7 +103,7 @@ module Decidim
               (SELECT CONCAT(#{roles_table}.#{space[:name]}_id, '-#{space[:class_name]}')
               FROM #{roles_table} WHERE #{roles_table}.decidim_user_id = ?)
               "
-            end
+            end)
 
             query = "
               decidim_meetings_meetings.private_meeting = ?
@@ -133,12 +135,7 @@ module Decidim
 
       scope :authored_by, ->(author) { where(decidim_author_id: author) }
 
-      scope_search_multi :with_any_type, TYPE_OF_MEETING.map(&:to_sym)
-
-      TYPE_OF_MEETING.each do |type|
-        scope type.to_sym, -> { where(type_of_meeting: type.to_sym) }
-        scope "not_#{type}".to_sym, -> { where.not(type_of_meeting: type.to_sym) }
-      end
+      scope_search_multi :with_any_type, TYPE_OF_MEETING.keys
 
       searchable_fields({
                           scope_id: :decidim_scope_id,
@@ -204,7 +201,7 @@ module Decidim
       end
 
       def has_registration_for?(user)
-        registrations.where(user: user).any?
+        registrations.where(user:).any?
       end
 
       def maps_enabled?
@@ -241,7 +238,7 @@ module Decidim
       end
 
       def current_user_can_visit_meeting?(user)
-        Decidim::Meetings::Meeting.visible_for(user).exists?(id: id)
+        Decidim::Meetings::Meeting.visible_for(user).exists?(id:)
       end
 
       def iframe_access_level_allowed_for_user?(user)
@@ -325,24 +322,6 @@ module Decidim
         [normalized_author.name]
       end
 
-      TYPE_OF_MEETING.each do |type|
-        define_method("#{type}_meeting?") do
-          type_of_meeting == type
-        end
-      end
-
-      def registration_disabled?
-        registration_type == "registration_disabled"
-      end
-
-      def on_this_platform?
-        registration_type == "on_this_platform"
-      end
-
-      def on_different_platform?
-        registration_type == "on_different_platform"
-      end
-
       def has_contributions?
         !!contributions_count && contributions_count.positive?
       end

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

@@ -35,7 +35,7 @@ module Decidim
 
       # Public: returns whether the questionnaire is answered by the user or not.
       def answered_by?(user)
-        questionnaire.answers.where({ user: user, question: self }).any? if questionnaire.questions.present? && user.present?
+        questionnaire.answers.where({ user:, question: self }).any? if questionnaire.questions.present? && user.present?
       end
 
       def number_of_options

data/app/packs/entrypoints/decidim_meetings.js

@@ -4,3 +4,6 @@ import "src/decidim/forms/forms"
 
 // Images
 require.context("../images", true)
+
+// CSS
+import "stylesheets/decidim/meetings/meetings.scss"

data/app/packs/images/decidim/gamification/badges/decidim_gamification_badges_attended_meetings.svg

@@ -1 +1,42 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="meetings-svg" width="1080" height="1080" x="0" y="0" enable-background="new 0 0 1080 1080" version="1.1" viewBox="0 0 1080 1080" xml:space="preserve"><g id="meetings" class="stroke-primary"><g id="paper_down"><polyline id="_x32_5-pct_14_" fill="#31536E" fill-opacity=".25" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="16" points="604.753 874.5 378.529 924.816 367.337 874.497" class="fill-primary"/><polyline id="_x32_5-pct_13_" fill="#31536E" fill-opacity=".25" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="16" points="836.5 510.5 902.72 808.227 836.5 822.955" class="fill-primary"/><polyline id="_x32_5-pct_12_" fill="#31536E" fill-opacity=".25" stroke="#31536E" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="16" points="531.249 205.5 757.471 155.184 766.35 197.105" class="fill-primary"/><polyline id="_x32_5-pct_11_" fill="#31536E" fill-opacity=".25" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="16" points="299.5 569.499 233.28 271.774 299.5 257.045" class="fill-primary"/></g><g id="paper"><polyline fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="16" points="836.5 294.5 836.5 874.5 299.5 874.5 299.5 824.5"/><polyline fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="16" points="299.5 661.5 299.5 205.5 755.5 205.5"/></g><g id="pencil"><path fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="16" d="M310.292,820.867l554.726-554.725c23.627-23.627,23.785-61.775,0.354-85.207l0,0c-23.433-23.431-61.58-23.273-85.206,0.354 L225.439,736.015l-47.714,132.567L310.292,820.867z"/><path id="_x35_0-pct_11_" fill="#31536E" fill-opacity=".5" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="16" d="M836.379,294.78l28.639-28.638c23.627-23.627,23.785-61.775,0.354-85.207l0,0c-23.433-23.431-61.58-23.273-85.206,0.354 l-28.637,28.638" class="fill-primary"/><line x1="751.527" x2="836.38" y1="209.927" y2="294.78" fill="#31536E" stroke="#31536E" stroke-miterlimit="10" stroke-width="16"/><line x1="716.172" x2="801.023" y1="245.283" y2="330.136" fill="none" stroke="#31536E" stroke-miterlimit="10" stroke-width="16"/><polyline fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="16" points="227.476 733.785 270.5 734.958 270.5 771.5 309.745 771.5 310.195 820.982"/><polygon id="_x32_5-pct_15_" fill="#31536E" fill-opacity=".25" stroke="#31536E" stroke-miterlimit="10" stroke-width="8" points="310.292 771.37 776.275 305.387 738.092 267.203 270.694 734.601 270.5 771.5" class="fill-primary"/><polygon fill="#31536E" points="177.629 868.678 200.69 804.604 241.703 845.616" class="fill-primary"/></g><g id="stars_8" class="stars"><path fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4" d="M155.26,565.735c0-14.688-18.667-35.354-35.355-35.354c15.355,0,35.355-20.333,35.355-35.355 c0,15.022,16.666,35.355,35.355,35.355C171.593,530.381,155.26,551.048,155.26,565.735z"/><g><circle cx="904.382" cy="162.858" r="13.5" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="887.883" x2="866.67" y1="146.123" y2="124.91" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="921.824" x2="943.037" y1="180.064" y2="201.277" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="921.117" x2="942.33" y1="146.83" y2="125.617" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="887.883" x2="866.67" y1="180.064" y2="201.277" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/></g><g><line x1="266.689" x2="240.528" y1="898.798" y2="924.962" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="231.335" x2="205.173" y1="934.153" y2="960.317" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="265.982" x2="239.82" y1="960.317" y2="934.153" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="230.628" x2="204.466" y1="924.962" y2="898.798" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/></g><path fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4" d="M922.592,965.056c0,0-21.565,4.035-26.516,8.983c-4.948,4.947-8.982,26.515-8.982,26.515s-4.035-21.564-8.983-26.515 c-4.947-4.948-26.515-8.983-26.515-8.983s22.077-4.546,26.515-8.982c4.438-4.438,8.983-26.516,8.983-26.516 s4.034,21.565,8.982,26.516C901.025,961.021,922.592,965.056,922.592,965.056z"/><g><circle cx="896.863" cy="447.201" r="16.604" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="860.962" cy="447.201" r="6.432" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="896.863" cy="483.103" r="6.433" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="932.765" cy="447.201" r="6.432" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><circle cx="896.863" cy="411.3" r="6.432" fill="#FFD92B" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/></g><g><line x1="298.746" x2="353.649" y1="98.42" y2="153.325" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="353.649" x2="298.746" y1="98.42" y2="153.325" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="308" x2="281" y1="125.447" y2="125.447" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="346" x2="373" y1="125.447" y2="125.447" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="327" x2="327" y1="144.447" y2="171.447" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/><line x1="327" x2="327" y1="106.447" y2="79.447" fill="none" stroke="#31536E" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="10" stroke-width="4"/></g></g></g></svg>
+<svg width="540" height="540" viewBox="0 0 540 540" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M302.378 437.25L189.266 462.408L183.67 437.248" fill="#3E4C5C" fill-opacity="0.25"/>
+<path d="M302.378 437.25L189.266 462.408L183.67 437.248" stroke="#3E4C5C" stroke-width="8" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M418.25 255.25L451.36 404.113L418.25 411.478" fill="#3E4C5C" fill-opacity="0.25"/>
+<path d="M418.25 255.25L451.36 404.113L418.25 411.478" stroke="#3E4C5C" stroke-width="8" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M265.625 102.75L378.736 77.5918L383.175 98.5523" fill="#3E4C5C" fill-opacity="0.25"/>
+<path d="M265.625 102.75L378.736 77.5918L383.175 98.5523" stroke="#3E4C5C" stroke-width="8" stroke-miterlimit="10" stroke-linejoin="round"/>
+<path d="M149.751 284.748L116.641 135.886L149.751 128.521" fill="#3E4C5C" fill-opacity="0.25"/>
+<path d="M149.751 284.748L116.641 135.886L149.751 128.521" stroke="#3E4C5C" stroke-width="8" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M418.25 147.25V437.25H149.75V412.25" stroke="#3E4C5C" stroke-width="8" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M149.75 330.75V102.75H377.75" stroke="#3E4C5C" stroke-width="8" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M155.147 410.434L432.51 133.071C444.323 121.258 444.402 102.184 432.687 90.4676C420.97 78.7521 401.897 78.8311 390.084 90.6446L112.72 368.008L88.8633 434.291L155.147 410.434Z" stroke="#3E4C5C" stroke-width="8" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M418.189 147.39L432.508 133.071C444.322 121.258 444.401 102.184 432.685 90.4676C420.969 78.7521 401.895 78.8311 390.082 90.6446L375.764 104.964" fill="#3E4C5C" fill-opacity="0.5"/>
+<path d="M418.189 147.39L432.508 133.071C444.322 121.258 444.401 102.184 432.685 90.4676C420.969 78.7521 401.895 78.8311 390.082 90.6446L375.764 104.964" stroke="#3E4C5C" stroke-width="8" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M375.764 104.963L418.19 147.389" stroke="#3E4C5C" stroke-width="8" stroke-miterlimit="10"/>
+<path d="M358.086 122.641L400.511 165.067" stroke="#3E4C5C" stroke-width="8" stroke-miterlimit="10"/>
+<path d="M113.738 366.893L135.25 367.479V385.75H154.873L155.098 410.491" stroke="#3E4C5C" stroke-width="8" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M155.146 385.685L388.138 152.694L369.046 133.602L135.347 367.301L135.25 385.75L155.146 385.685Z" fill="#3E4C5C" fill-opacity="0.25" stroke="#3E4C5C" stroke-width="4" stroke-miterlimit="10"/>
+<path d="M88.8145 434.34L100.345 402.303L120.851 422.809L88.8145 434.34Z" fill="#3E4C5C"/>
+<path d="M77.6306 282.866C77.6306 275.522 68.2971 265.189 59.9531 265.189C67.6306 265.189 77.6306 255.023 77.6306 247.512C77.6306 255.023 85.9636 265.189 95.3081 265.189C85.7971 265.189 77.6306 275.523 77.6306 282.866Z" fill="#EBC34B" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M452.191 88.1777C455.919 88.1777 458.941 85.1557 458.941 81.4277C458.941 77.6998 455.919 74.6777 452.191 74.6777C448.463 74.6777 445.441 77.6998 445.441 81.4277C445.441 85.1557 448.463 88.1777 452.191 88.1777Z" fill="#EBC34B" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M443.942 73.0596L433.336 62.4531" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M460.912 90.0293L471.519 100.636" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M460.559 73.4131L471.165 62.8066" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M443.942 90.0293L433.336 100.636" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M133.346 449.398L120.266 462.48" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M115.669 467.076L102.588 480.158" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M132.993 480.158L119.912 467.076" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M115.315 462.48L102.234 449.398" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M461.297 482.526C461.297 482.526 450.514 484.544 448.039 487.018C445.565 489.491 443.548 500.275 443.548 500.275C443.548 500.275 441.53 489.493 439.056 487.018C436.583 484.544 425.799 482.526 425.799 482.526C425.799 482.526 436.837 480.253 439.056 478.035C441.275 475.816 443.548 464.777 443.548 464.777C443.548 464.777 445.565 475.56 448.039 478.035C450.513 480.509 461.297 482.526 461.297 482.526Z" fill="#EBC34B" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M448.433 231.903C453.018 231.903 456.735 228.186 456.735 223.601C456.735 219.016 453.018 215.299 448.433 215.299C443.848 215.299 440.131 219.016 440.131 223.601C440.131 228.186 443.848 231.903 448.433 231.903Z" fill="#EBC34B" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M430.482 226.817C432.258 226.817 433.698 225.377 433.698 223.601C433.698 221.825 432.258 220.385 430.482 220.385C428.705 220.385 427.266 221.825 427.266 223.601C427.266 225.377 428.705 226.817 430.482 226.817Z" fill="#EBC34B" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M448.431 244.767C450.208 244.767 451.648 243.327 451.648 241.55C451.648 239.774 450.208 238.334 448.431 238.334C446.655 238.334 445.215 239.774 445.215 241.55C445.215 243.327 446.655 244.767 448.431 244.767Z" fill="#EBC34B" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M466.384 226.817C468.16 226.817 469.6 225.377 469.6 223.601C469.6 221.825 468.16 220.385 466.384 220.385C464.608 220.385 463.168 221.825 463.168 223.601C463.168 225.377 464.608 226.817 466.384 226.817Z" fill="#EBC34B" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M448.433 208.866C450.209 208.866 451.649 207.426 451.649 205.65C451.649 203.873 450.209 202.434 448.433 202.434C446.657 202.434 445.217 203.873 445.217 205.65C445.217 207.426 446.657 208.866 448.433 208.866Z" fill="#EBC34B" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M149.373 49.209L176.825 76.6615" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M176.825 49.209L149.373 76.6615" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M154 62.7227H140.5" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M173 62.7227H186.5" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M163.5 72.2227V85.7227" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M163.5 53.2227V39.7227" stroke="#3E4C5C" stroke-width="2" stroke-miterlimit="10" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

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

@@ -2,7 +2,6 @@ import AutoButtonsByPositionComponent from "src/decidim/admin/auto_buttons_by_po
 import AutoLabelByPositionComponent from "src/decidim/admin/auto_label_by_position.component"
 import createSortList from "src/decidim/admin/sort_list.component"
 import createDynamicFields from "src/decidim/admin/dynamic_fields.component"
-import createQuillEditor from "src/decidim/editor"
 
 const wrapperSelector = ".meeting-agenda-items";
 const fieldSelector = ".meeting-agenda-item";
@@ -69,8 +68,8 @@ const createDynamicFieldsForAgendaItemChilds = (fieldId) => {
     onAddField: ($field) => {
       createSortableListChild();
 
-      $field.find(".editor-container").each((idx, el) => {
-        createQuillEditor(el);
+      $field[0].querySelectorAll(".editor-container").forEach((el) => {
+        window.createEditor(el);
       });
 
       autoLabelByPositionChild.run();
@@ -124,7 +123,7 @@ createDynamicFields({
     createSortableList();
 
     $field.find(".editor-container").each((idx, el) => {
-      createQuillEditor(el);
+      window.createEditor(el);
     });
 
     autoLabelByPosition.run();

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

@@ -7,16 +7,24 @@ $(() => {
     const $reservedSlots = $form.find("#meeting_reserved_slots");
     const $customizeRegistrationEmail = $form.find("#meeting_customize_registration_email");
 
+    $customizeRegistrationEmail.on("click", (event) => {
+
+      if (event.target.checked) {
+        $("#customize_registration_email-div").removeClass("hidden");
+      } else {
+        $("#customize_registration_email-div").addClass("hidden");
+      }
+    })
+
     const toggleDisabledFields = () => {
       const enabled = $registrationsEnabled.prop("checked");
       $availableSlots.attr("disabled", !enabled);
       $reservedSlots.attr("disabled", !enabled);
       $customizeRegistrationEmail.attr("disabled", !enabled);
 
-      $form.find(".editor-container").each((idx, node) => {
-        const quill = Quill.find(node);
-        quill.enable(enabled);
-      })
+      $form[0].querySelectorAll(".editor-container .ProseMirror").forEach((node) => {
+        node.editor.setOptions({ editable: enabled });
+      });
     };
 
     $registrationsEnabled.on("change", toggleDisabledFields);

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

@@ -62,7 +62,7 @@ $(() => {
 
     createFieldDependentInputs({
       controllerField: $("#meeting_iframe_embed_type"),
-      wrapperSelector: ".iframe-fields",
+      wrapperSelector: "main",
       dependentFieldsSelector: ".iframe-fields--access-level",
       dependentInputSelector: "input",
       enablingCondition: ($field) => {

data/app/packs/src/decidim/meetings/poll.component.js

@@ -1,8 +1,5 @@
 /* eslint id-length: ["error", { "exceptions": ["$"] }] */
 
-import createOptionAttachedInputs from "src/decidim/forms/option_attached_inputs.component"
-import createMaxChoicesAlertComponent from "src/decidim/forms/max_choices_alert.component"
-
 /**
  * A plain Javascript component that handles questions from polls in meetings:
  *   - fetches them via Ajax
@@ -78,7 +75,6 @@ export default class PollComponent {
       this._updateCounter();
       this._setQuestionsState(this.$element);
       this._pollQuestions();
-      this._addValidations();
     });
   }
 
@@ -114,7 +110,7 @@ export default class PollComponent {
 
   /**
    * Initializes the state of a single question with two types of modifications:
-   *   - sets the is-new class if the question is new (doesn't exist in the internal list)
+   *   - sets the is-new class if the question is new (does not exist in the internal list)
    *   - sets the state to open if it was open in the internal list
    * @private
    * @param {jQuery} $el - The HTML container for the questionnaire.
@@ -167,27 +163,4 @@ export default class PollComponent {
       this.$counter.html(`(${questionsCount})`);
     }
   }
-
-  _addValidations() {
-    $(".js-radio-button-collection, .js-check-box-collection").each((idx, el) => {
-      createOptionAttachedInputs({
-        wrapperField: $(el),
-        controllerFieldSelector: "input[type=radio], input[type=checkbox]",
-        dependentInputSelector: "input[type=text], input[type=hidden]"
-      });
-    });
-
-    $.unique($(".js-check-box-collection").parents(".answer")).each((idx, el) => {
-      const maxChoices = $(el).data("max-choices");
-      if (maxChoices) {
-        createMaxChoicesAlertComponent({
-          wrapperField: $(el),
-          controllerFieldSelector: "input[type=checkbox]",
-          controllerCollectionSelector: ".js-check-box-collection",
-          alertElement: $(el).find(".max-choices-alert"),
-          maxChoices: maxChoices
-        });
-      }
-    });
-  }
 }