decidim-meetings 0.25.0.rc4 → 0.26.0.rc1

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    #
+    # Decorator for meetings in users context
+    #
+    class MeetingEditionPresenter < MeetingPresenter
+      def sanitized(content)
+        organization.rich_text_editor_in_public_views? ? decidim_sanitize_editor(content) : decidim_sanitize(content)
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ module Decidim
     #
     class MeetingPresenter < Decidim::ResourcePresenter
       include Decidim::ResourceHelper
+      include Decidim::SanitizeHelper
 
       def meeting
         __getobj__
@@ -18,13 +19,15 @@ module Decidim
         super meeting.title, links, html_escape, all_locales
       end
 
-      def description(links: false, all_locales: false)
+      def description(links: false, extras: true, strip_tags: false, all_locales: false)
         return unless meeting
 
-        handle_locales(meeting.description, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_sanitize(content))
+        new_description = handle_locales(meeting.description, all_locales) do |content|
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(sanitized(content))
           renderer.render(links: links).html_safe
         end
+
+        content_handle_locale(new_description, all_locales, extras, links, strip_tags)
       end
 
       def location(all_locales: false)
@@ -55,7 +58,7 @@ module Decidim
         return unless meeting
 
         handle_locales(meeting.closing_report, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_sanitize(content))
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(sanitized(content))
           renderer.render(links: links).html_safe
         end
       end
@@ -64,7 +67,7 @@ module Decidim
         return unless meeting
 
         handle_locales(meeting.registration_email_custom_content, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_sanitize(content))
+          renderer = Decidim::ContentRenderers::HashtagRenderer.new(sanitized(content))
           renderer.render(links: links).html_safe
         end
       end
@@ -97,7 +100,7 @@ module Decidim
         resource_locator(meeting).path
       end
 
-      def avatar_url
+      def avatar_url(_variant = nil)
         ActionController::Base.helpers.asset_pack_path("media/images/decidim_meetings.svg")
       end
 
@@ -125,6 +128,10 @@ module Decidim
 
         proposals.map.with_index { |proposal, index| "#{index + 1}) #{proposal.title}\n" }
       end
+
+      def sanitized(content)
+        decidim_sanitize_editor(content)
+      end
     end
   end
 end

data/app/services/decidim/meetings/diff_renderer.rb

@@ -5,11 +5,11 @@ module Decidim
     class DiffRenderer < BaseDiffRenderer
       def attribute_types
         {
-          title: :string,
-          description: :html,
+          title: :i18n,
+          description: :i18n_html,
           address: :string,
-          location: :string,
-          location_hints: :string,
+          location: :i18n,
+          location_hints: :i18n,
           start_time: :date,
           end_time: :date,
           decidim_user_group_id: :user_group,

data/app/services/decidim/meetings/directory/meeting_search.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Directory
+      class MeetingSearch < Decidim::Meetings::MeetingSearch
+        text_search_fields :title, :description
+
+        def search_space
+          return query if options[:space].blank? || options[:space] == "all"
+
+          query.joins(:component).where(decidim_components: { participatory_space_type: options[:space].collect(&:classify) })
+        end
+
+        private
+
+        # Private: Creates an array of category ids.
+        # It contains categories' subcategories ids as well.
+        def all_category_ids
+          cat_ids = fetch_category_ids
+
+          component.flat_map do |comp|
+            comp
+              .categories
+              .where(id: cat_ids)
+              .or(comp.categories.where(parent_id: cat_ids))
+              .pluck(:id).tap { |ids| ids.prepend(nil) if category_ids.include?("without") }
+          end
+        end
+
+        # take a param list like ["2", "10", "Decidim__Assembly4", "Decidim__Assembly2"]
+        # return a param list like [47, 48, 43, 44, 45, 46, 41, 42, 27, 28, 32, 31, 29, 30, 26, 25]
+        def fetch_category_ids
+          cat_ids = category_ids.without("without")
+
+          additional_ids = cat_ids.select { |a| a =~ /Decidim__/ }
+
+          additional_ids = parse_category_ids(additional_ids)
+          cat_ids.collect(&:to_i).without(0).push(*additional_ids)
+        end
+
+        # this function expects an array of the following format : [ "Decidim__Assembly4", "Decidim__Assembly2"]
+        # It will transform each parameter into an array of class_name and id [["Decidim::Assembly", "4"], ["Decidim::Assembly", "2"]]
+        # After we rebuild the find query and retrun the category_ids for each participatory space
+        def parse_category_ids(additional_ids)
+          additional_ids = additional_ids.map { |a| a.gsub("__", "::").gsub(/(\d+)/, '.\1').split(".") }
+          additional_ids = additional_ids.map { |v| v.first.safe_constantize.send(:find, v.last.to_i).category_ids }
+          additional_ids.flatten
+        end
+      end
+    end
+  end
+end

data/app/services/decidim/meetings/meeting_iframe_embedder.rb

@@ -48,7 +48,7 @@ module Decidim
 
       private
 
-      EMBEDDABLE_SERVICES = %( www.youtube.com www.twitch.tv )
+      EMBEDDABLE_SERVICES = %( www.youtube.com www.twitch.tv meet.jit.si )
 
       attr_accessor :online_meeting_service_url
 

data/app/services/decidim/meetings/meeting_search.rb

@@ -13,8 +13,10 @@ module Decidim
       # page        - The page number to paginate the results.
       # per_page    - The number of meetings to return per page.
       def initialize(options = {})
-        scope = options.fetch(:scope, Meeting.published)
-        super(scope, options)
+        options[:scope] = options.fetch(:scope, Meeting.published)
+        options[:scope] = options[:state] == "withdrawn" ? options[:scope].withdrawn : options[:scope].except_withdrawn
+        options[:scope] = options[:scope].includes(:component, :attachments)
+        super(options[:scope], options)
       end
 
       # Handle the date filter
@@ -47,6 +49,17 @@ module Decidim
           query
         end
       end
+
+      # Handle the state filter
+      def search_state
+        return query.withdrawn if state == "withdrawn"
+
+        query.except_withdrawn
+      end
+
+      def results
+        super.includes(attachments: :file_attachment, component: { participatory_space: :organization })
+      end
     end
   end
 end

data/app/views/decidim/meetings/admin/meeting_copies/_form.html.erb

@@ -13,10 +13,17 @@
     </div>
 
     <div class="row column">
+      <%= form.select :type_of_meeting,
+                      @form.type_of_meeting_select,
+                      { include_blank: t(".select_a_meeting_type") },
+                      { multiple: false } %>
+    </div>
+
+    <div class="row column field" data-meeting-type="in_person">
       <%= form.geocoding_field :address %>
     </div>
 
-    <div class="row column">
+    <div class="row column field" data-meeting-type="in_person">
       <%= form.translated :text_area, :location %>
     </div>
 
@@ -24,6 +31,14 @@
       <%= form.translated :text_area, :location_hints %>
     </div>
 
+    <div class="row column field" data-meeting-type="online">
+      <%= form.text_field :online_meeting_url %>
+    </div>
+
+    <div class="row column field" data-meeting-type="online">
+      <%= form.check_box :show_embedded_iframe %>
+    </div>
+
     <div class="row">
       <div class="columns xlarge-6">
         <%= form.datetime_field :start_time %>

data/app/views/decidim/meetings/admin/meeting_copies/new.html.erb

@@ -1,4 +1,4 @@
-<%= decidim_form_for(@form, url: meeting_copies_path(meeting), method: :post, html: { class: "form copy_meetings" }) do |f| %>
+<%= decidim_form_for(@form, url: meeting_copies_path(meeting), method: :post, html: { class: "form copy_meetings " }) do |f| %>
   <%= render partial: "form", object: f, locals: { title: t("meeting_copies.new.title", scope: "decidim.admin"), select: t("meeting_copies.new.select", scope: "decidim.admin") } %>
 
   <div class="button--double form-general-submit">

data/app/views/decidim/meetings/admin/meetings/_form.html.erb

@@ -38,9 +38,20 @@
       <p class="help-text"><%= t(".online_meeting_url_help") %></p>
     </div>
 
-    <div class="field" data-meeting-type="online">
-      <%= form.check_box :show_embedded_iframe %>
-      <p class="help-text"><%= t(".show_embedded_iframe_help") %></p>
+    <div class="iframe-fields">
+      <div class="row column field iframe-fields--embed-type" id="meeting_iframe_embed_type" data-meeting-type="online">
+        <%= form.select :iframe_embed_type,
+          @form.iframe_embed_type_select,
+          { multiple: false } %>
+        <p class="help-text"><%= t(".show_embedded_iframe_help") %></p>
+      </div>
+
+      <div class="row column field iframe-fields--access-level" data-meeting-type="online-access-level">
+        <%= form.select :iframe_access_level,
+          @form.iframe_access_level_select,
+          { include_blank: t(".select_an_iframe_access_level") },
+          { multiple: false } %>
+      </div>
     </div>
 
     <div class="row">
@@ -99,6 +110,7 @@
       <p class="help-text"><%= t(".registration_email_help") %></p>
     </div>
 
+    <%= render partial: "decidim/comments/admin/shared/availability_fields", locals: { form: form } %>
   </div>
 </div>
 

data/app/views/decidim/meetings/directory/meetings/_filters.html.erb

@@ -0,0 +1,34 @@
+<%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "meetings" } %>
+
+<%= filter_form_for filter do |form| %>
+  <div class="filters__section">
+    <div class="filters__search">
+      <div class="input-group">
+        <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t("decidim.meetings.meetings.filters.search"), title: t("decidim.meetings.meetings.filters.search"), "aria-label": t("decidim.meetings.meetings.filters.search"), data: { disable_dynamic_change: true } %>
+        <div class="input-group-button">
+          <button type="submit" class="button" aria-controls="meetings">
+            <%= icon "magnifying-glass", aria_label: t("decidim.meetings.meetings.filters.search"), role: "img" %>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <% unless @forced_past_meetings %>
+    <%= form.check_boxes_tree :date, filter_date_values, legend_title: t("decidim.meetings.meetings.filters.date") %>
+  <% end %>
+
+  <%= form.check_boxes_tree :type, filter_type_values, legend_title: t("decidim.meetings.meetings.filters.type") %>
+
+  <%= form.check_boxes_tree :scope_id, directory_filter_scopes_values, legend_title: t("decidim.meetings.meetings.filters.scope") %>
+
+  <%= form.check_boxes_tree :category_id, directory_filter_categories_values, legend_title: t("decidim.meetings.meetings.filters.category") %>
+
+  <%= form.check_boxes_tree :origin, directory_filter_origin_values, legend_title: t("decidim.meetings.meetings.filters.origin") %>
+
+  <%= form.check_boxes_tree :space, directory_meeting_spaces_values, legend_title: t("decidim.meetings.directory.meetings.index.space_type") %>
+
+  <% if current_user %>
+    <%= form.collection_radio_buttons :activity, activity_filter_values, :first, :last, { legend_title: t("decidim.meetings.meetings.filters.activity") }, "aria-controls": "meetings" %>
+  <% end %>
+<% end %>

data/app/views/decidim/meetings/directory/meetings/index.html.erb

@@ -10,24 +10,7 @@
 
     <div class="columns mediumlarge-4 large-3">
       <div class="card card--secondary show-for-mediumlarge">
-        <%= render partial: "decidim/shared/filter_form_help", locals: { skip_to_id: "meetings" } %>
-        <%= filter_form_for filter, meetings_directory.root_path do |form| %>
-          <div class="filters__section">
-            <div class="filters__search">
-              <div class="input-group">
-                <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".search"), title: t(".search"), "aria-label": t(".search") %>
-                <div class="input-group-button">
-                  <button type="submit" class="button">
-                    <%= icon "magnifying-glass", aria_label: t(".search"), role: "img" %>
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <%= form.collection_radio_buttons :date, [["upcoming", t(".upcoming")], ["past", t(".past")]], :first, :last, legend_title: t(".date") %>
-          <%= form.collection_radio_buttons :space, @meeting_spaces, :first, :last, legend_title: t(".space_type") %>
-        <% end %>
+          <%= render partial: "filters" %>
       </div>
     </div>
     <div id="meetings" class="columns mediumlarge-8 large-9">

data/app/views/decidim/meetings/meetings/_filters.html.erb

@@ -14,6 +14,8 @@
     </div>
   </div>
 
+  <%= form.hidden_field "state", value: params.dig("filter", "state") %>
+
   <% unless @forced_past_meetings %>
     <%= form.check_boxes_tree :date, filter_date_values, legend_title: t(".date") %>
   <% end %>

data/app/views/decidim/meetings/meetings/_filters_small_view.html.erb

@@ -1,13 +1,13 @@
 <div class="filters-controls hide-for-mediumlarge">
-  <button data-open="filter-box" class="filters-controls__trigger">
+  <button data-open="filter-box" class="filters-controls__trigger" aria-controls="filter-box" aria-haspopup="dialog">
     <%= t ".filter" %>
     <%= icon "caret-bottom", class: "icon--small float-right", aria_label: t(".unfold"), role: "img" %>
   </button>
 </div>
 
-<div class="reveal" id="filter-box" data-reveal>
+<div class="reveal" id="filter-box" data-reveal role="dialog" aria-modal="true" aria-labelledby="filter-box-label">
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t ".filter_by" %>:</h3>
+    <h3 id="filter-box-label" class="reveal__title"><%= t ".filter_by" %>:</h3>
     <button class="close-button" data-close aria-label="<%= t(".close_modal") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

data/app/views/decidim/meetings/meetings/_form.html.erb

@@ -33,9 +33,20 @@
   <p class="help-text"><%= t(".online_meeting_url_help") %></p>
 </div>
 
-<div class="field" data-meeting-type="online">
-  <%= form.check_box :show_embedded_iframe %>
-  <p class="help-text"><%= t(".show_embedded_iframe_help") %></p>
+<div class="iframe-fields">
+  <div class="field" data-meeting-type="online">
+    <%= form.select :iframe_embed_type,
+      @form.iframe_embed_type_select,
+      { multiple: false } %>
+    <p class="help-text"><%= t(".show_embedded_iframe_help") %></p>
+  </div>
+
+  <div class="field iframe-fields--access-level" id="meeting_iframe_embed_type" data-meeting-type="online-access-level">
+    <%= form.select :iframe_access_level,
+      @form.iframe_access_level_select,
+      { include_blank: t(".select_an_iframe_access_level") },
+      { multiple: false } %>
+  </div>
 </div>
 
 <div class="field">

data/app/views/decidim/meetings/meetings/_linked_meetings.html.erb

@@ -14,7 +14,7 @@
               <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
             </div>
           </div>
-          <%= decidim_sanitize( present(meeting).description ) %>
+          <%= decidim_sanitize_editor(present(meeting).description) %>
         </div>
       </div>
     </div>

data/app/views/decidim/meetings/meetings/_meetings.html.erb

@@ -1,3 +1,11 @@
+<% if params.dig("filter", "state").present? && params["filter"]["state"] == "withdrawn" %>
+  <div class="callout warning">
+    <%= t("decidim.meetings.meetings.index.text_banner",
+          go_back_link: link_to(t("decidim.meetings.meetings.index.click_here"), meetings_path("filter[state]" => nil)),
+          ).html_safe %>
+  </div>
+<% end %>
+
 <% if @forced_past_meetings %>
   <div class="callout warning">
     <%= t ".upcoming_meetings_warning" %>
@@ -23,3 +31,13 @@
   <% end %>
 </div>
 <%= decidim_paginate meetings, order_start_time: params[:order_start_time], scope_id: params[:scope_id] %>
+
+<div class="row">
+  <div class="text-right">
+    <% if params.dig("filter", "state").present? && params["filter"]["state"] == "withdrawn" %>
+      <%= link_to t("decidim.meetings.meetings.index.see_all"), meetings_path("filter[state]" => nil) %>
+    <% else %>
+      <%= link_to t("decidim.meetings.meetings.index.see_all_withdrawn"), meetings_path("filter[state]" => "withdrawn") %>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/meetings/meetings/index.html.erb

@@ -27,6 +27,7 @@
     </div>
   </div>
   <div id="meetings" class="columns mediumlarge-8 large-9" aria-live="polite">
+
     <%= render partial: "meetings" %>
   </div>
 </div>

data/app/views/decidim/meetings/meetings/show.html.erb

@@ -37,20 +37,14 @@ edit_link(
     <% end %>
 
     <% if allowed_to?(:close, :meeting, meeting: meeting) %>
-      <%= link_to t(".close_meeting"), edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), class: "button hollow expanded button-sc button--icon follow-button" %>
+      <% caption =  meeting.closed? ? t(".edit_close_meeting") : t(".close_meeting") %>
+      <%= link_to caption, edit_meeting_meeting_close_path(meeting_id: meeting.id, id: meeting.id), class: "button hollow expanded button-sc button--icon follow-button" %>
     <% end %>
 
     <div class="card extra">
       <div class="card__content">
-        <div class="extra__date">
-          <%= l meeting.start_time, format: "%d" %>
-          <span class="extra__month"><%= l meeting.start_time, format: "%B" %>
-            <%= l(meeting.start_time, format: "%Y") if meeting.start_time.year != Date.current.year %>
-          </span>
-        </div>
-        <div class="extra__time">
-          <%= meeting.start_time.strftime("%H:%M") %> - <%= meeting.end_time.strftime("%H:%M") %>
-        </div>
+        <%= cell("decidim/date_range", { start: meeting.start_time, end: meeting.end_time }) %>
+
         <%= cell "decidim/meetings/join_meeting_button", meeting, big_button: true, show_remaining_slots: true %>
         <%= render partial: "decidim/shared/follow_button", locals: { followable: meeting, large: false  } %>
       </div>
@@ -125,13 +119,18 @@ edit_link(
           <%= t("transparent", scope: "decidim.meetings.types") %>
         </span>
       <% end %>
-      <%= decidim_sanitize(present(meeting).description(links: true)) %>
+      <% if meeting.withdrawn? %>
+        <span class="<%= meeting_type_badge_css_class("withdraw") %> label proposal-status">
+          <%= t("withdraw", scope: "decidim.meetings.types") %>
+        </span>
+      <% end %>
+      <%= render_meeting_body(@meeting) %>
 
       <% if meeting.maps_enabled? && !meeting.online_meeting? %>
         <%= render partial: "decidim/shared/static_map", locals: { icon_name: "meetings", geolocalizable: meeting } %>
       <% end %>
 
-      <% unless meeting.in_person_meeting? %>
+      <% unless meeting.in_person_meeting? || meeting.withdrawn? %>
         <%= cell "decidim/meetings/online_meeting_link", meeting %>
       <% end %>
 
@@ -163,7 +162,7 @@ edit_link(
     <% if meeting.closed? && meeting.closing_visible? %>
       <div class="section">
         <h3 class="section-heading"><%= t(".meeting_minutes") %></h3>
-        <%= decidim_sanitize translated_attribute meeting.closing_report %>
+        <%= decidim_sanitize_editor translated_attribute meeting.closing_report %>
       </div>
     <% end %>
 

data/config/locales/ar.yml

@@ -305,20 +305,13 @@ ar:
         export_calendar: تصدير التقويم
       conference_venues: أماكن المؤتمر
       content_blocks:
-        upcoming_events:
-          name: الأحداث القادمة
-          upcoming_events: الاجتماعات القادمة
-          view_all_events: عرض الكل
+        upcoming_meetings:
+          view_all_meetings: عرض الكل
       directory:
         meetings:
           index:
-            all: الكل
-            date: تاريخ
             meetings: اجتماعات
-            past: الماضي
-            search: بحث
             space_type: الفضاء التشاركي
-            upcoming: القادمة
       last_activity:
         new_meeting_at_html: "<span>اجتماع جديد في %{link}</span>"
       mailer: