decidim-meetings 0.30.5 → 0.31.0.rc1

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

@@ -8,11 +8,11 @@ module Decidim
           return permission_action unless user
           return permission_action unless permission_action.scope == :admin
 
-          allowed_registration_form_action?
-          allowed_meeting_action?
-          allowed_agenda_action?
-          allowed_poll_action?
-          allowed_export_answers?
+          return Decidim::Meetings::Admin::MeetingPermissions.new(user, permission_action, context).permissions if subject == :meeting
+          return Decidim::Meetings::Admin::QuestionnairePermissions.new(user, permission_action, context).permissions if subject == :questionnaire
+          return Decidim::Meetings::Admin::AgendaPermissions.new(user, permission_action, context).permissions if subject == :agenda
+
+          toggle_allow(poll.present? && meeting.present?) if subject == :poll && action == :update
 
           permission_action
         end
@@ -23,70 +23,9 @@ module Decidim
           @meeting ||= context.fetch(:meeting, nil)
         end
 
-        def agenda
-          @agenda ||= context.fetch(:agenda, nil)
-        end
-
         def poll
           @poll ||= context.fetch(:poll, nil)
         end
-
-        def registration_form
-          @registration_form ||= context.fetch(:questionnaire, nil)
-        end
-
-        def allowed_meeting_action?
-          return unless permission_action.subject == :meeting
-
-          return disallow! if meeting && !meeting.official?
-
-          case permission_action.action
-          when :close, :copy, :export_registrations, :update, :read_invites
-            toggle_allow(meeting.present?)
-          when :invite_attendee
-            toggle_allow(meeting.present? && meeting.registrations_enabled?)
-          when :create
-            allow!
-          end
-        end
-
-        def allowed_registration_form_action?
-          return unless permission_action.subject == :questionnaire
-
-          case permission_action.action
-          when :update
-            toggle_allow(registration_form.present?)
-          end
-        end
-
-        def allowed_agenda_action?
-          return unless permission_action.subject == :agenda
-
-          case permission_action.action
-          when :create
-            toggle_allow(meeting.present?)
-          when :update
-            toggle_allow(agenda.present? && meeting.present?)
-          end
-        end
-
-        def allowed_poll_action?
-          return unless permission_action.subject == :poll
-
-          case permission_action.action
-          when :update
-            toggle_allow(poll.present? && meeting.present?)
-          end
-        end
-
-        def allowed_export_answers?
-          return unless permission_action.subject == :questionnaire
-
-          case permission_action.action
-          when :export_answers
-            permission_action.allow!
-          end
-        end
       end
     end
   end

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    module Admin
+      class QuestionnairePermissions < Decidim::DefaultPermissions
+        def permissions
+          return permission_action unless user
+          return permission_action unless permission_action.scope == :admin
+          return permission_action unless subject == :questionnaire
+
+          case permission_action.action
+          when :update
+            toggle_allow(registration_form.present?)
+          when :export_responses
+            allow!
+          end
+
+          permission_action
+        end
+
+        private
+
+        def registration_form
+          @registration_form ||= context.fetch(:questionnaire, nil)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    class MeetingPermissions < Decidim::DefaultPermissions
+      private
+
+      def target_scope = :public
+
+      def target_subject = :meeting
+
+      def can_read?
+        user_has_any_role?(user, meeting.participatory_space, broad_check: true) || (!meeting&.hidden? && meeting&.current_user_can_visit_meeting?(user))
+      end
+
+      def meeting
+        @meeting ||= context.fetch(:meeting, nil)
+      end
+
+      def can_join?
+        meeting.can_be_joined_by?(user) &&
+          authorized?(:join, resource: meeting)
+      end
+
+      def can_join_waitlist?
+        meeting.waitlist_enabled? &&
+          !meeting.has_available_slots? &&
+          !meeting.has_registration_for?(user) &&
+          authorized?(:join_waitlist, resource: meeting)
+      end
+
+      def can_leave?
+        meeting.registrations_enabled?
+      end
+
+      def can_decline_invitation?
+        meeting.registrations_enabled? &&
+          meeting.invites.exists?(user:)
+      end
+
+      def can_create?
+        return false unless user
+
+        (component_settings&.creation_enabled_for_participants? && can_participate?) || initiative_authorship?
+      end
+
+      def can_update?
+        meeting.authored_by?(user) &&
+          !meeting.closed?
+      end
+
+      def can_withdraw?
+        meeting.authored_by?(user) &&
+          !meeting.withdrawn? &&
+          !meeting.past?
+      end
+
+      def can_close?
+        meeting.authored_by?(user) &&
+          meeting.past?
+      end
+
+      def can_register?
+        return false unless user
+
+        meeting.can_register_invitation?(user) &&
+          authorized?(:register, resource: meeting)
+      end
+
+      def can_reply_poll?
+        meeting.present? &&
+          meeting.poll.present? &&
+          authorized?(:reply_poll, resource: meeting)
+      end
+
+      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.is_a?(Decidim::Initiative) &&
+          participatory_space.has_authorship?(user)
+      end
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "meeting_permissions"
+
 module Decidim
   module Meetings
     class Permissions < Decidim::DefaultPermissions
@@ -8,53 +10,13 @@ module Decidim
         return Decidim::Meetings::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
 
-        if permission_action.subject == :meeting && permission_action.action == :read
-          toggle_allow(user_has_any_role?(user, meeting.participatory_space, broad_check: true) || (!meeting&.hidden? && meeting&.current_user_can_visit_meeting?(user)))
-          return permission_action
-        end
+        return Decidim::Meetings::MeetingPermissions.new(user, permission_action, context).permissions if subject == :meeting
 
-        return permission_action unless user
+        toggle_allow(can_respond_question?) if subject == :response && action == :create
+        toggle_allow(can_update_question?) if subject == :question && action == :update
+        toggle_allow(can_update_poll?) if subject == :poll && action == :update
 
-        case permission_action.subject
-        when :answer
-          case permission_action.action
-          when :create
-            toggle_allow(can_answer_question?)
-          end
-        when :question
-          case permission_action.action
-          when :update
-            toggle_allow(can_update_question?)
-          end
-        when :meeting
-          case permission_action.action
-          when :join
-            toggle_allow(can_join_meeting?)
-          when :leave
-            toggle_allow(can_leave_meeting?)
-          when :decline_invitation
-            toggle_allow(can_decline_invitation?)
-          when :create
-            toggle_allow(can_create_meetings?)
-          when :update
-            toggle_allow(can_update_meeting?)
-          when :withdraw
-            toggle_allow(can_withdraw_meeting?)
-          when :close
-            toggle_allow(can_close_meeting?)
-          when :register
-            toggle_allow(can_register_invitation_meeting?)
-          when :reply_poll
-            toggle_allow(can_reply_poll?)
-          end
-        when :poll
-          case permission_action.action
-          when :update
-            toggle_allow(can_update_poll?)
-          end
-        else
-          return permission_action
-        end
+        return permission_action unless user
 
         permission_action
       end
@@ -69,37 +31,6 @@ module Decidim
         @question ||= context.fetch(:question, nil)
       end
 
-      def can_join_meeting?
-        meeting.can_be_joined_by?(user) &&
-          authorized?(:join, resource: meeting)
-      end
-
-      def can_leave_meeting?
-        meeting.registrations_enabled?
-      end
-
-      def can_decline_invitation?
-        meeting.registrations_enabled? &&
-          meeting.invites.exists?(user:)
-      end
-
-      def can_create_meetings?
-        (component_settings&.creation_enabled_for_participants? && can_participate?) || initiative_authorship?
-      end
-
-      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.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.
       def space_member?(participatory_space, user)
         return false unless user
@@ -107,33 +38,6 @@ module Decidim
         participatory_space.participatory_space_private_users.exists?(decidim_user_id: user.id)
       end
 
-      def can_update_meeting?
-        meeting.authored_by?(user) &&
-          !meeting.closed?
-      end
-
-      def can_withdraw_meeting?
-        meeting.authored_by?(user) &&
-          !meeting.withdrawn? &&
-          !meeting.past?
-      end
-
-      def can_close_meeting?
-        meeting.authored_by?(user) &&
-          meeting.past?
-      end
-
-      def can_register_invitation_meeting?
-        meeting.can_register_invitation?(user) &&
-          authorized?(:register, resource: meeting)
-      end
-
-      def can_reply_poll?
-        meeting.present? &&
-          meeting.poll.present? &&
-          authorized?(:reply_poll, resource: meeting)
-      end
-
       def can_update_poll?
         user.present? &&
           user.admin? &&
@@ -141,8 +45,8 @@ module Decidim
           meeting.poll.present?
       end
 
-      def can_answer_question?
-        question.present? && user.present? && !question.answered_by?(user)
+      def can_respond_question?
+        question.present? && user.present? && !question.responded_by?(user)
       end
 
       def can_update_question?

data/app/presenters/decidim/meetings/admin_log/value_types/meeting_title_description_presenter.rb

@@ -10,7 +10,7 @@ module Decidim
           def present
             return unless value
 
-            renderer = Decidim::ContentRenderers::HashtagRenderer.new(h.decidim_escape_translated(value))
+            renderer = Decidim::ContentRenderers::BlobRenderer.new(h.decidim_escape_translated(value))
             renderer.render(links: false).html_safe
           end
         end

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    #
+    # Decorator for agenda items
+    #
+    class AgendaItemPresenter < Decidim::ResourcePresenter
+      include Decidim::ResourceHelper
+      include Decidim::SanitizeHelper
+
+      def agenda_item
+        __getobj__
+      end
+
+      def description(links: false, strip_tags: false, all_locales: false)
+        return unless agenda_item
+
+        content_handle_locale(agenda_item.description, all_locales, links, strip_tags)
+      end
+
+      def editor_description(all_locales: false)
+        return unless agenda_item
+
+        editor_locales(agenda_item.description, all_locales)
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Decidim
     class MeetingPresenter < Decidim::ResourcePresenter
       include Decidim::ResourceHelper
       include ActionView::Helpers::UrlHelper
+      include Decidim::SanitizeHelper
 
       alias super_title title
 
@@ -21,7 +22,7 @@ module Decidim
 
       def taxonomy_names(html_escape: false, all_locales: false)
         meeting.taxonomies.map do |taxonomy|
-          super_title(taxonomy.name, false, html_escape, all_locales)
+          super_title(taxonomy.name, html_escape, all_locales)
         end
       end
 
@@ -29,22 +30,22 @@ module Decidim
         link_to title, meeting_path
       end
 
-      def title(links: false, html_escape: false, all_locales: false)
+      def title(html_escape: false, all_locales: false)
         return unless meeting
 
-        super(meeting.title, links, html_escape, all_locales)
+        super(meeting.title, html_escape, all_locales)
       end
 
-      def description(links: false, extras: true, strip_tags: false, all_locales: false)
+      def description(links: false, strip_tags: false, all_locales: false)
         return unless meeting
 
-        content_handle_locale(meeting.description, all_locales, extras, links, strip_tags)
+        content_handle_locale(meeting.description, all_locales, links, strip_tags)
       end
 
-      def editor_description(all_locales: false, extras: true)
+      def editor_description(all_locales: false)
         return unless meeting
 
-        editor_locales(meeting.description, all_locales, extras:)
+        editor_locales(meeting.description, all_locales)
       end
 
       def location(all_locales: false)
@@ -71,17 +72,17 @@ module Decidim
         end
       end
 
-      def closing_report(links: false, extras: false, strip_tags: false, all_locales: false)
+      def closing_report(links: false, strip_tags: false, all_locales: false)
         return unless meeting
 
-        content_handle_locale(meeting.closing_report, all_locales, extras, links, strip_tags)
+        content_handle_locale(meeting.closing_report, all_locales, links, strip_tags)
       end
 
       def registration_email_custom_content(links: false, all_locales: false)
         return unless meeting
 
         handle_locales(meeting.registration_email_custom_content, all_locales) do |content|
-          renderer = Decidim::ContentRenderers::HashtagRenderer.new(decidim_sanitize_editor_admin(content))
+          renderer = Decidim::ContentRenderers::BlobRenderer.new(decidim_sanitize_editor_admin(content))
           renderer.render(links:).html_safe
         end
       end
@@ -130,12 +131,8 @@ module Decidim
         false
       end
 
-      def has_tooltip?
-        false
-      end
-
       def proposals
-        return unless Decidim::Meetings.enable_proposal_linking
+        return unless Decidim.module_installed?(:proposals)
         return unless meeting
 
         @proposals ||= meeting.authored_proposals.load

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Meetings
+    #
+    # Decorator for meeting registrations
+    #
+    class RegistrationPresenter < SimpleDelegator
+      delegate :name, :email, to: :user
+
+      def status
+        return I18n.t("attended", scope: "decidim.meetings.models.registration.status") if validated?
+
+        I18n.t("not_attended", scope: "decidim.meetings.models.registration.status")
+      end
+
+      def status_html_class
+        return "success" if validated?
+
+        "alert"
+      end
+    end
+  end
+end

data/app/queries/decidim/meetings/{questionnaire_user_answers.rb → questionnaire_user_responses.rb}

@@ -2,8 +2,8 @@
 
 module Decidim
   module Meetings
-    # A class used to collect user answers for a questionnaire
-    class QuestionnaireUserAnswers < Decidim::Query
+    # A class used to collect user responses for a questionnaire
+    class QuestionnaireUserResponses < Decidim::Query
       # Syntactic sugar to initialize the class and return the queried objects.
       #
       # questionnaire - a Questionnaire object
@@ -18,11 +18,11 @@ module Decidim
         @questionnaire = questionnaire
       end
 
-      # Finds and group answers by user for each questionnaire's question.
+      # Finds and group responses by user for each questionnaire's question.
       def query
-        answers = Answer.joins(:question).where(questionnaire: @questionnaire)
+        responses = Response.joins(:question).where(questionnaire: @questionnaire)
 
-        answers.sort_by { |answer| answer.question.position }.group_by(&:user).values
+        responses.sort_by { |response| response.question.position }.group_by(&:user).values
       end
     end
   end

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

@@ -11,20 +11,19 @@ module Decidim
           code: resource.code,
           user: {
             name: resource.user.name,
-            email: resource.user.email,
-            user_group: resource.user_group&.name || ""
+            email: resource.user.email
           },
-          registration_form_answers: serialize_answers
+          registration_form_responses: serialize_responses
         }
       end
 
       private
 
-      def serialize_answers
+      def serialize_responses
         return [] unless resource.meeting.questionnaire
 
-        Decidim::Forms::UserAnswersSerializer.new(
-          resource.meeting.questionnaire.answers.where(user: resource.user)
+        Decidim::Forms::UserResponsesSerializer.new(
+          resource.meeting.questionnaire.responses.where(user: resource.user)
         ).serialize
       end
     end

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

@@ -12,7 +12,6 @@ module Decidim
           location_hints: :i18n,
           start_time: :date,
           end_time: :date,
-          decidim_user_group_id: :user_group,
           decidim_scope_id: :scope
         }
       end

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

@@ -15,6 +15,7 @@
     <div class="meeting-list__modal-input">
       <input id="urlCalendarUrl" type="text" title="<%= t(".calendar_url") %>" value="<%= "#{path}" %>" readonly>
       <button
+        data-controller="clipboard-copy"
         data-clipboard-copy="#urlCalendarUrl"
         data-clipboard-copy-label="<%= t(".copy_calendar_url_copied") %>"
         data-clipboard-copy-message="<%= t(".copy_calendar_url_message") %>"

data/app/views/decidim/meetings/admin/agenda/_agenda_item_fields.html.erb

@@ -9,7 +9,7 @@
 
 <div class="grid-x">
   <div class="cell">
-    <%= form.translated :editor, :description, tabs_id:, rows: 6, aria: { label: :description } %>
+    <%= form.translated :editor, :description, resource_mentionable: true, tabs_id:, rows: 6, aria: { label: :description } %>
   </div>
 </div>
 

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

@@ -1,5 +1,5 @@
 <div class="form__wrapper attendee-fields">
-  <div class="card" data-component="accordion" id="accordion-attendee">
+  <div class="card" data-controller="accordion" id="accordion-attendee">
     <div class="card-divider">
       <button class="card-divider-button" data-open="true" data-controls="panel-attendee" type="button">
         <%= icon "arrow-right-s-line" %>

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

@@ -19,7 +19,7 @@
         </div>
       </div>
 
-    <% if Decidim::Meetings.enable_proposal_linking %>
+    <% if Decidim.module_installed?(:proposals) %>
       <div class="row column">
         <%= render partial: "decidim/proposals/proposals/proposals_picker", locals: { form:, field: :proposals } %>
       </div>

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

@@ -2,11 +2,11 @@
   <div class="card pt-4">
     <div class="card-section">
       <div class="row column">
-        <%= form.translated :text_field, :title, autofocus: true, class: "js-hashtags", hashtaggable: true, aria: { label: :title } %>
+        <%= form.translated :text_field, :title, autofocus: true, aria: { label: :title } %>
       </div>
 
       <div class="row column">
-        <%= form.translated :editor, :description, hashtaggable: true, aria: { label: :description } %>
+        <%= form.translated :editor, :description, resource_mentionable: true, aria: { label: :description } %>
       </div>
 
       <div class="row column">
@@ -91,6 +91,7 @@
       <%= render partial: "decidim/comments/admin/shared/availability_fields", locals: { form: } %>
     </div>
   </div>
+  <%= render "decidim/meetings/admin/meetings/reminders", form: %>
   <%= render "decidim/meetings/admin/meetings/services", form: , id: tabs_id_for_service(blank_service) %>
   <%= render "decidim/meetings/admin/meetings/linked_spaces", form: %>
 </div>

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

@@ -1,6 +1,6 @@
 <%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
 
-<div class="card" data-component="accordion" id="accordion-linked-spaces">
+<div class="card" data-controller="accordion" id="accordion-linked-spaces">
   <div class="card-divider">
     <button class="card-divider-button" data-open="false" data-controls="panel-linked-spaces" type="button">
       <%= icon "arrow-right-s-line" %>