decidim-meetings 0.29.4 → 0.30.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c62bb7e3ede2e0107a2106b921f58139bfb23877893db713d1408032579da53e
-  data.tar.gz: 5fe50d58ea182b1889d8fe590c719e4cdf93bed773e6e97b432f814023c4fb90
+  metadata.gz: dcd3f09c335e14cfd8af7bb8e69aeebb463d7c1a857a8103160de1888501f327
+  data.tar.gz: f2e9d27de11c40f9cdf57b3ca2d12a4242c0817219e199825b2267077ced7b53
 SHA512:
-  metadata.gz: 2ad378367071384cbed6a9294ba913d34b42383bfd820ca7c65a90c38a70182963ed9399dd2f45910f4fd3a37c204bff81a234c0f7991c95c1ebb4254622e2ac
-  data.tar.gz: d31b48902817907e446c32dea541317d75346e89934328d1c98d8dbb5a76ab265a525896743102956a1beefeace6d0080df22c9bdb0d892d47a572577c999982
+  metadata.gz: 86fb431af3abf5c2fc4a5279c20ce5c1966569962d281e17cff0adf1760aa870b21c89766fb34aa005027cd864f7047f3fe864c0da247f4686da1a648fb85383
+  data.tar.gz: 3de5c0b9b0402c9cb690eb6091a71306db567cd9d9b4ff7b9511cf0f7205403a396d38a3fbd501b8ac1613f7eca890ce5d7a0700ae2673a9af73d3a6965e2264

data/app/cells/decidim/meetings/cancel_registration_meeting_button/cancelation_modal.erb

@@ -12,7 +12,7 @@
       <button type="button" class="button button__sm md:button__lg button__transparent-secondary" data-dialog-close="meeting-cancelation-confirm-<%= model.id %>">
         <span><%= t("close", scope: "decidim.shared.flag_modal") %></span>
       </button>
-      <button type="submit" class="button button__sm md:button__lg button__secondary">
+      <button type="submit" class="button button__sm md:button__lg button__transparent-secondary">
         <span><%= t("leave", scope: "decidim.meetings.meetings.show") %></span>
         <%= icon "arrow-right-line" %>
       </button>

data/app/cells/decidim/meetings/cancel_registration_meeting_button/show.erb

@@ -1,4 +1,6 @@
-<%= render :cancelation_modal %>
+<% unless options[:hide_modal] %>
+  <%= render :cancelation_modal %>
+<% end %>
 <%= action_authorized_button_to(
   :join,
   "#",

data/app/cells/decidim/meetings/cancel_registration_meeting_button_cell.rb

@@ -20,7 +20,7 @@ module Decidim
       end
 
       def button_classes
-        "button button__sm button__text-secondary"
+        "button button__sm button__transparent-secondary w-full"
       end
 
       def icon_name

data/app/cells/decidim/meetings/dates_and_map/show.erb

@@ -1,17 +1,17 @@
 <div class="meeting__calendar-container">
   <div class="meeting__calendar meeting__calendar__lg">
-    <div class="meeting__calendar-month">
-      <p><%= l(start_time, format: !same_month? ? "%b" : "%B") %></p>
-      <p class="meeting__calendar-separator"><%= "-" if !same_month? %></p>
-      <p><%= l(end_time, format: "%b") if !same_month? %></p>
+    <div class="meeting__calendar-month mb-4">
+      <span><%= l(start_time, format: !same_month? ? "%b" : "%B") %></span>
+      <span class="meeting__calendar-separator"><%= "-" if !same_month? %></span>
+      <span><%= l(end_time, format: "%b") if !same_month? %></span>
     </div>
     <div class="meeting__calendar-day">
-      <p><%= l(start_time, format: "%d") %></p>
-      <p class="meeting__calendar-separator"><%= "-" if !same_day? || !same_month? %></p>
-      <p><%= l(end_time, format: "%d") if !same_day? || !same_month? %></p>
+      <span><%= l(start_time, format: "%d") %></span>
+      <span class="meeting__calendar-separator"><%= "-" if !same_day? || !same_month? %></span>
+      <span><%= l(end_time, format: "%d") if !same_day? || !same_month? %></span>
     </div>
     <div class="meeting__calendar-year">
-      <p><%= year %></p>
+      <span><%= year %></span>
     </div>
   </div>
 

data/app/cells/decidim/meetings/highlighted_meetings_for_component/show.erb

@@ -16,7 +16,7 @@
 </div>
 <% if show_map? %>
   <div class="meeting-list__block-map">
-    <%= cell "decidim/meetings/meetings_map", collection %>
+    <%= cell "decidim/map", collection, metadata_card: "decidim/meetings/meeting_card_metadata" %>
   </div>
 <% end %>
 <div class="meeting-list__block-list">

data/app/cells/decidim/meetings/join_meeting_button/show.erb

@@ -9,14 +9,17 @@
         disabled: !model.has_available_slots?
       ) %>
     <% else %>
-      <%= render :registration_modal %>
+      <% unless options[:hide_modal] %>
+        <%= render :registration_modal %>
+      <% end %>
       <%= action_authorized_button_to(
         :join,
         i18n_join_text,
         "#",
         class: button_classes,
         disabled: !model.has_available_slots?,
-        data: { "dialog-open": current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" }
+        data: { "dialog-open": current_user.present? ? "meeting-registration-confirm-#{model.id}" : "loginModal" },
+        resource: model
       ) %>
     <% end %>
   <% end %>

data/app/cells/decidim/meetings/meeting_card_metadata_cell.rb

@@ -6,7 +6,7 @@ module Decidim
     class MeetingCardMetadataCell < Decidim::CardMetadataCell
       alias meeting model
 
-      delegate :type_of_meeting, :start_time, :end_time, :category, :withdrawn?, to: :meeting
+      delegate :type_of_meeting, :start_time, :end_time, :withdrawn?, to: :meeting
 
       alias start_date start_time
       alias end_date end_time
@@ -20,10 +20,10 @@ module Decidim
       private
 
       def meeting_items
-        [start_date_item, type, comments_count_item, category_item, withdrawn_item]
+        [start_date_item, type, comments_count_item] + taxonomy_items + [withdrawn_item]
       end
 
-      def meeting_items_for_map
+      def items_for_map
         [dates_item, type].compact_blank.map do |item|
           {
             text: item[:text],

data/app/cells/decidim/meetings/meeting_l_cell.rb

@@ -22,8 +22,20 @@ module Decidim
         render
       end
 
+      def url_extra_params
+        return options[:url_extra_params] if options[:url_extra_params]
+        return {} unless defined?(current_component)
+        return {} if current_component == meeting.component
+
+        { previous_space: "#{current_space.class}##{current_space.id}" }
+      end
+
       private
 
+      def current_space
+        @current_space ||= current_component.participatory_space
+      end
+
       def metadata_cell
         "decidim/meetings/meeting_card_metadata"
       end

data/app/commands/decidim/meetings/admin/copy_meeting.rb

@@ -44,8 +44,7 @@ module Decidim
           @copied_meeting = Decidim.traceability.create!(
             Meeting,
             form.current_user,
-            scope: form.scope,
-            category: form.category,
+            taxonomies: form.taxonomies,
             title: parsed_title,
             description: parsed_description,
             end_time: form.end_time,

data/app/commands/decidim/meetings/admin/create_meeting.rb

@@ -6,16 +6,17 @@ module Decidim
       # This command is executed when the user creates a Meeting from the admin
       # panel.
       class CreateMeeting < Decidim::Commands::CreateResource
-        fetch_form_attributes :scope, :category, :end_time, :start_time, :online_meeting_url, :registration_type,
+        fetch_form_attributes :end_time, :start_time, :online_meeting_url, :registration_type,
                               :registration_url, :address, :latitude, :longitude, :location, :location_hints,
                               :private_meeting, :transparent, :registrations_enabled, :component, :iframe_embed_type,
-                              :comments_enabled, :comments_start_time, :comments_end_time, :iframe_access_level
+                              :comments_enabled, :taxonomizations, :comments_start_time, :comments_end_time, :iframe_access_level
 
         protected
 
         def run_after_hooks
           create_services!
           create_follow_form_resource(form.current_user)
+          link_components!
         end
 
         def attributes
@@ -47,6 +48,11 @@ module Decidim
           end
         end
 
+        def link_components!
+          resource.components = form.components
+          resource.save!
+        end
+
         def create_follow_form_resource(user)
           follow_form = Decidim::FollowForm.from_params(followable_gid: resource.to_signed_global_id.to_s).with_context(current_user: user)
           Decidim::CreateFollow.call(follow_form)

data/app/commands/decidim/meetings/admin/invite_user_to_join_meeting.rb

@@ -79,7 +79,7 @@ module Decidim
             end
           else
             user.name = form.name
-            user.nickname = User.nicknamize(user.name, user.decidim_organization_id)
+            user.nickname = User.nicknamize(user.name, organization: user.organization)
             invite_user_to_sign_up
             create_invitation!
           end

data/app/commands/decidim/meetings/admin/update_meeting.rb

@@ -6,9 +6,9 @@ module Decidim
       # This command is executed when the user changes a Meeting from the admin
       # panel.
       class UpdateMeeting < Decidim::Commands::UpdateResource
-        fetch_form_attributes :scope, :category, :end_time, :start_time, :online_meeting_url, :registration_type,
+        fetch_form_attributes :end_time, :start_time, :online_meeting_url, :registration_type,
                               :registration_url, :registrations_enabled, :address, :latitude, :longitude, :location,
-                              :location_hints,
+                              :location_hints, :taxonomizations,
                               :private_meeting, :transparent, :iframe_embed_type, :comments_enabled,
                               :comments_start_time, :comments_end_time, :iframe_access_level
 
@@ -18,6 +18,7 @@ module Decidim
           send_notification if should_notify_followers?
           schedule_upcoming_meeting_notification if resource.published? && start_time_changed?
           update_services!
+          update_components!
         end
 
         def attributes
@@ -37,6 +38,11 @@ module Decidim
           resource.save!
         end
 
+        def update_components!
+          resource.components = form.components
+          resource.save!
+        end
+
         def send_notification
           Decidim::EventsManager.publish(
             event: "decidim.events.meetings.meeting_updated",

data/app/commands/decidim/meetings/create_meeting.rb

@@ -5,9 +5,9 @@ module Decidim
     # This command is executed when a participant or user group creates a Meeting from the public
     # views.
     class CreateMeeting < Decidim::Commands::CreateResource
-      fetch_form_attributes :scope, :category, :end_time, :start_time, :address, :latitude, :longitude,
+      fetch_form_attributes :end_time, :start_time, :address, :latitude, :longitude,
                             :online_meeting_url, :registration_type, :registration_url, :available_slots,
-                            :registrations_enabled, :component, :iframe_embed_type, :iframe_access_level
+                            :registrations_enabled, :taxonomizations, :component, :iframe_embed_type, :iframe_access_level
 
       protected
 

data/app/commands/decidim/meetings/update_meeting.rb

@@ -52,8 +52,6 @@ module Decidim
           meeting,
           current_user,
           {
-            scope: form.scope,
-            category: form.category,
             title: { I18n.locale => parsed_title },
             description: { I18n.locale => parsed_description },
             end_time: form.end_time,
@@ -73,7 +71,8 @@ module Decidim
             type_of_meeting: form.clean_type_of_meeting,
             online_meeting_url: form.online_meeting_url,
             iframe_embed_type: form.iframe_embed_type,
-            iframe_access_level: form.iframe_access_level
+            iframe_access_level: form.iframe_access_level,
+            taxonomizations: form.taxonomizations
           },
           visibility: "public-only"
         )

data/app/controllers/concerns/decidim/meetings/admin/filterable.rb

@@ -16,15 +16,20 @@ module Decidim
           private
 
           def base_query
-            Meeting.not_hidden.where(component: current_component).order(start_time: :desc).page(params[:page]).per(15)
+            Meeting
+              .not_hidden
+              .where(component: current_component)
+              .or(MeetingLink.find_meetings(component: current_component))
+              .order(start_time: :desc)
+              .page(params[:page])
+              .per(15)
           end
 
           def filters
             [
               :with_any_type,
               :is_upcoming_true,
-              :scope_id_eq,
-              :category_id_eq,
+              :taxonomies_part_of_contains,
               :with_any_origin,
               :closed_at_present
             ]
@@ -33,8 +38,7 @@ module Decidim
           def filters_with_values
             {
               with_any_type: meeting_types,
-              scope_id_eq: scope_ids_hash(scopes.top_level),
-              category_id_eq: category_ids_hash(categories.first_class),
+              taxonomies_part_of_contains: taxonomy_ids_hash(available_root_taxonomies),
               closed_at_present: %w(true false),
               is_upcoming_true: %w(true false),
               with_any_origin: %w(participants official user_group)

data/app/controllers/concerns/decidim/meetings/component_filterable.rb

@@ -18,8 +18,7 @@ module Decidim
             with_any_date: "upcoming",
             activity: "all",
             with_availability: "",
-            with_any_scope: nil,
-            with_any_category: nil,
+            with_any_taxonomies: nil,
             with_any_state: nil,
             with_any_origin: nil,
             with_any_type: nil

data/app/controllers/decidim/meetings/admin/meetings_controller.rb

@@ -5,6 +5,7 @@ module Decidim
     module Admin
       # This controller allows an admin to manage meetings from a Participatory Process
       class MeetingsController < Admin::ApplicationController
+        include Decidim::Admin::HasTrashableResources
         include Decidim::Meetings::Admin::Filterable
 
         helper_method :blank_service
@@ -57,27 +58,6 @@ module Decidim
           end
         end
 
-        def destroy
-          enforce_permission_to(:destroy, :meeting, meeting:)
-
-          Decidim::Meetings::Admin::DestroyMeeting.call(meeting, current_user) do
-            on(:ok) do
-              flash[:notice] = I18n.t("meetings.destroy.success", scope: "decidim.meetings.admin")
-              redirect_to meetings_path
-            end
-
-            on(:invalid) do
-              flash.now[:alert] = I18n.t(
-                "meetings.destroy.invalid.proposals_count",
-                count: proposals.size,
-                scope: "decidim.meetings.admin"
-              )
-
-              render action: "index"
-            end
-          end
-        end
-
         def publish
           enforce_permission_to(:update, :meeting, meeting:)
 
@@ -112,12 +92,24 @@ module Decidim
 
         private
 
+        def trashable_deleted_resource_type
+          :meeting
+        end
+
+        def trashable_deleted_collection
+          @trashable_deleted_collection ||= filtered_collection.only_deleted.deleted_at_desc
+        end
+
+        def trashable_deleted_resource
+          @trashable_deleted_resource ||= Meeting.with_deleted.where(component: current_component).find_by(id: params[:id])
+        end
+
         def meetings
           @meetings ||= filtered_collection
         end
 
         def meeting
-          @meeting ||= meetings.find(params[:id])
+          @meeting ||= Meeting.where(component: current_component).find_by(id: params[:id])
         end
 
         def collection

data/app/controllers/decidim/meetings/admin/registration_form_controller.rb

@@ -23,8 +23,16 @@ module Decidim
           Decidim::EngineRouter.main_proxy(current_component).join_meeting_registration_path(meeting)
         end
 
+        def edit_questions_template
+          "decidim/meetings/admin/registration_form/edit_questions"
+        end
+
         private
 
+        def i18n_questions_flashes_scope
+          "decidim.forms.admin.questionnaires"
+        end
+
         def meeting
           @meeting ||= Meeting.where(component: current_component).find(params[:meeting_id])
         end

data/app/controllers/decidim/meetings/directory/meetings_controller.rb

@@ -11,7 +11,6 @@ module Decidim
         include Paginable
 
         helper Decidim::FiltersHelper
-        helper Decidim::Meetings::MapHelper
         helper Decidim::ResourceHelper
         helper Decidim::ShortLinkHelper
 
@@ -42,11 +41,10 @@ module Decidim
             with_any_date: "upcoming",
             title_or_description_cont: "",
             activity: "all",
-            with_any_scope: nil,
+            with_any_taxonomies: nil,
             with_any_space: nil,
             with_any_type: nil,
-            with_any_origin: nil,
-            with_any_global_category: nil
+            with_any_origin: nil
           }
         end
 

data/app/controllers/decidim/meetings/meetings_controller.rb

@@ -14,6 +14,7 @@ module Decidim
       helper Decidim::ResourceVersionsHelper
       helper Decidim::ShortLinkHelper
       include Decidim::AttachmentsHelper
+      include Decidim::SanitizeHelper
 
       helper_method :meetings, :meeting, :registration, :search, :tab_panel_items
 
@@ -59,9 +60,12 @@ module Decidim
       def show
         raise ActionController::RoutingError, "Not Found" unless meeting
 
-        enforce_permission_to(:read, :meeting, meeting:)
+        maybe_show_redirect_notice!
 
         return if meeting.current_user_can_visit_meeting?(current_user)
+
+        flash[:alert] = I18n.t("meeting.not_allowed", scope: "decidim.meetings")
+        redirect_to(ResourceLocatorPresenter.new(meeting).index)
       end
 
       def edit
@@ -119,12 +123,19 @@ module Decidim
       end
 
       def search_collection
-        Meeting.where(component: current_component).published.not_hidden.visible_for(current_user).with_availability(
-          filter_params[:with_availability]
-        ).includes(
-          :component,
-          attachments: :file_attachment
-        )
+        Meeting
+          .where(component: current_component)
+          .published
+          .not_hidden
+          .or(MeetingLink.find_meetings(component: current_component))
+          .visible_for(current_user)
+          .with_availability(
+            filter_params[:with_availability]
+          )
+          .includes(
+            :component,
+            attachments: :file_attachment
+          )
       end
 
       def meeting_form
@@ -167,6 +178,30 @@ module Decidim
           }
         ] + attachments_tab_panel_items(@meeting)
       end
+
+      def maybe_show_redirect_notice!
+        return unless previous_space
+
+        flash.now[:notice] = I18n.t(
+          "meetings.show.redirect_notice",
+          scope: "decidim.meetings",
+          previous_space_url: request.referer,
+          previous_space_name: decidim_escape_translated(previous_space.title),
+          current_space_name: decidim_escape_translated(current_component.participatory_space.title)
+        )
+      end
+
+      def previous_space
+        return @previous_space if @previous_space
+        return unless params[:previous_space]
+
+        previous_space_class, previous_space_id = params[:previous_space].split("#")
+
+        @previous_space = previous_space_class.constantize.find_by(id: previous_space_id)
+        @previous_space
+      rescue NameError, LoadError
+        nil
+      end
     end
   end
 end

data/app/forms/decidim/meetings/admin/meeting_form.rb

@@ -8,8 +8,7 @@ module Decidim
         include TranslatableAttributes
 
         attribute :services, Array[MeetingServiceForm]
-        attribute :decidim_scope_id, Integer
-        attribute :decidim_category_id, Integer
+        attribute :component_ids, Array[Integer]
         attribute :private_meeting, Boolean
         attribute :transparent, Boolean
         attribute :registration_type, String
@@ -28,8 +27,8 @@ module Decidim
         translatable_attribute :location_hints, String
 
         validates :iframe_embed_type, inclusion: { in: Decidim::Meetings::Meeting.iframe_embed_types }
-        validates :title, translatable_presence: true
-        validates :description, translatable_presence: true
+        validates :title, :description, translatable_presence: true
+        validates :title, :description, translated_etiquette: true
         validates :registration_type, presence: true
         validates :registration_url, presence: true, url: true, if: ->(form) { form.on_different_platform? }
         validates :type_of_meeting, presence: true
@@ -37,9 +36,6 @@ module Decidim
         validates :online_meeting_url, url: true, if: ->(form) { form.online_meeting? || form.hybrid_meeting? }
         validates :comments_start_time, date: { before: :comments_end_time, allow_blank: true, if: proc { |obj| obj.comments_end_time.present? } }
         validates :comments_end_time, date: { after: :comments_start_time, allow_blank: true, if: proc { |obj| obj.comments_start_time.present? } }
-        validates :category, presence: true, if: ->(form) { form.decidim_category_id.present? }
-        validates :scope, presence: true, if: ->(form) { form.decidim_scope_id.present? }
-        validates :decidim_scope_id, scope_belongs_to_component: true, if: ->(form) { form.decidim_scope_id.present? }
         validates :clean_type_of_meeting, presence: true
         validates(
           :iframe_access_level,
@@ -48,14 +44,11 @@ module Decidim
         )
         validate :embeddable_meeting_url
 
-        delegate :categories, to: :current_component
-
         def map_model(model)
           self.services = model.services.map do |service|
             MeetingServiceForm.from_model(service)
           end
 
-          self.decidim_category_id = model.categorization.decidim_category_id if model.categorization
           self.type_of_meeting = model.type_of_meeting
 
           presenter = MeetingEditionPresenter.new(model)
@@ -67,32 +60,25 @@ module Decidim
           services.reject(&:deleted)
         end
 
-        def number_of_services
-          services.size
-        end
+        # linked components
+        def components
+          return [] if private_non_transparent_space?
 
-        alias component current_component
-
-        # Finds the Scope from the given decidim_scope_id, uses component scope if missing.
-        #
-        # Returns a Decidim::Scope
-        def scope
-          @scope ||= @attributes["decidim_scope_id"].value ? current_component.scopes.find_by(id: @attributes["decidim_scope_id"].value) : current_component.scope
-        end
-
-        # Scope identifier
-        #
-        # Returns the scope identifier related to the meeting
-        def decidim_scope_id
-          super || scope&.id
+          if private_meeting && !transparent
+            []
+          else
+            Decidim::Component.where(id: component_ids)
+          end
         end
 
-        def category
-          return unless current_component
+        delegate :private_non_transparent_space?, to: :current_component
 
-          @category ||= categories.find_by(id: decidim_category_id)
+        def number_of_services
+          services.size
         end
 
+        alias component current_component
+
         def clean_type_of_meeting
           type_of_meeting.presence
         end

data/app/forms/decidim/meetings/base_meeting_form.rb

@@ -3,6 +3,8 @@
 module Decidim
   module Meetings
     class BaseMeetingForm < Decidim::Form
+      include Decidim::HasTaxonomyFormAttributes
+
       attribute :address, String
       attribute :latitude, Float
       attribute :longitude, Float
@@ -18,6 +20,10 @@ module Decidim
       validates :start_time, presence: true, date: { before: :end_time }
       validates :end_time, presence: true, date: { after: :start_time }
 
+      def participatory_space_manifest
+        @participatory_space_manifest ||= current_component.participatory_space.manifest.name
+      end
+
       def type_of_meeting_select
         Decidim::Meetings::Meeting::TYPE_OF_MEETING.keys.map do |type|
           [