decidim-meetings 0.28.5 → 0.29.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20662cea40901317d4c4765081acf7f6787583e752f6a8935497c40c82a92493
-  data.tar.gz: 4c3ea479c4c0020e0004e875d9ff50bd82b33fffa6476e1c80558b0cd3ece5b7
+  metadata.gz: decb2f078a63be67ef8a425057c0f01b3b8c027fe5225842746761890632185c
+  data.tar.gz: 88c81b8077db6bd1a381816f578a99d4861d54f586ca862b23ddd299e45295c1
 SHA512:
-  metadata.gz: a149064e3f37cfd335dff4f8484c75e52e189402fc0cb62ebdd82305c22dd9204b8f6f685bee9382232338295e1e294b49f8e4e6992c85b74ac74332181246c9
-  data.tar.gz: 7fb532e3e413c1739cadf239cc04de633bd939a6c30bd23b84be497c5e87924a4c0dfbfc10eea20f8b234e76fd2a45423cad71cbc24244beeb5084d3568c46ef
+  metadata.gz: cf7184a26d0682c05b29fb45ae7fb761cad50b1b9a8ad5af55a7390524147a413c583d6905fceb5ee5d16f18479e345a6ffc326fe21e4137f232056681599e0e
+  data.tar.gz: 85351934fbfd8c52c8f5705eff919a7fbdc67fc54b8515132f0f7ec33ef5a5df51d77f7ee679da07c42b2ab42f4841fad79c464a99e207b93c188a9dcda5272e

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

@@ -4,7 +4,7 @@ require "cell/partial"
 
 module Decidim
   module Meetings
-    # This cell renders the list of public participanting
+    # This cell renders the list of public participating
     # organizations of a meeting.
     #
     # Example:

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

@@ -2,9 +2,8 @@
 
 module Decidim
   module Meetings
-    # This cell renders the button to cancel a meeting registation.
+    # This cell renders the button to cancel a meeting registration.
     class CancelRegistrationMeetingButtonCell < Decidim::ViewModel
-      include Decidim::IconHelper
       include MeetingCellsHelper
 
       def show

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

@@ -15,11 +15,9 @@
     </div>
   </div>
 
-  <% if display_map? %>
-    <%= static_map %>
-  <% elsif online? %>
+  <%= static_map %>
+
+  <% if online? %>
     <%= cell("decidim/address", meeting, online: true) %>
-  <% else %>
-    <%= cell("decidim/address", meeting) %>
   <% end %>
 </div>

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

@@ -14,7 +14,7 @@ module Decidim
       delegate :snippets, to: :controller
 
       def static_map
-        render :static_map
+        return render :static_map if display_map?
       end
 
       def year

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

@@ -11,7 +11,6 @@ module Decidim
       include Decidim::Meetings::ApplicationHelper
       include Decidim::ComponentPathHelper
       include Decidim::CardHelper
-      include Decidim::LayoutHelper
 
       delegate :snippets, to: :controller
 
@@ -31,7 +30,7 @@ module Decidim
 
       def base_relation
         @base_relation ||= Decidim::Meetings::Meeting.where(component: model)
-                                                     .except_withdrawn
+                                                     .not_withdrawn
                                                      .published
                                                      .not_hidden
                                                      .visible_for(current_user)

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

@@ -1,4 +1,5 @@
 <div class="meeting__aside-progress">
   <span><%= t("remaining_slots", scope: "decidim.meetings.meetings.show", count: model.remaining_slots) %></span>
   <progress value="<%= model.remaining_slots %>" max="<%= model.available_slots %>"></progress>
+  <span class="meeting__aside-progress-label"><%= model.remaining_slots %> / <%= model.available_slots %></span>
 </div>

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

@@ -5,9 +5,6 @@ module Decidim
     # This cell renders the button to join a meeting.
     class JoinMeetingButtonCell < Decidim::ViewModel
       include MeetingCellsHelper
-      include Decidim::SanitizeHelper
-      include ActionView::Helpers::FormTagHelper
-      include ActionView::Helpers::FormOptionsHelper
 
       def show
         return unless model.can_be_joined_by?(current_user) || model.on_different_platform?

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

@@ -4,9 +4,6 @@ module Decidim
   module Meetings
     # This cell renders metadata for an instance of a Meeting
     class MeetingCardMetadataCell < Decidim::CardMetadataCell
-      include Decidim::LayoutHelper
-      include ActionView::Helpers::DateHelper
-
       alias meeting model
 
       delegate :type_of_meeting, :start_time, :end_time, :category, :withdrawn?, to: :meeting

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

@@ -6,7 +6,6 @@ module Decidim
     # the default size is the List Card (:l)
     # also available the List Item Card (:list_item)
     class MeetingCell < Decidim::ViewModel
-      include Decidim::SanitizeHelper
       include MeetingCellsHelper
       include Cell::ViewModel::Partial
 

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

@@ -7,19 +7,16 @@ module Decidim
     # This cell renders the List (:l) meeting card
     # for an instance of a Meeting
     class MeetingLCell < Decidim::CardLCell
-      delegate :component_settings, to: :controller
-
       alias meeting model
 
-      def extra_class
-        "card__calendar-list__reset"
-      end
-
-      # Renders the date in the meeting card list
       def has_image?
         true
       end
 
+      def extra_class
+        "card__calendar-list__reset"
+      end
+
       def image
         render
       end

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

@@ -1,11 +1,11 @@
-<div class="card__icondata">
-  <ul class="card-data">
-    <li class="card-data__item">
+<div>
+  <ul>
+    <li>
       <%= resource_icon %>
     </li>
-    <li class="card-data__item">
+    <li>
       <div class="text-left">
-        <div class="card__icondata--address">
+        <div>
           <% if future? %>
             <span><%= t("link_available_soon", scope: "decidim.meetings.meetings.show") %></span>
           <% elsif live? %>

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

@@ -5,7 +5,6 @@ module Decidim
     # This cell renders the URL address of an online meeting.
     class MeetingUrlCell < Decidim::Meetings::OnlineMeetingCell
       include Cell::ViewModel::Partial
-      include LayoutHelper
 
       private
 

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

@@ -5,8 +5,6 @@ module Decidim
     # This cell renders the online meeting link section
     # of a online or both type of meeting.
     class OnlineMeetingLinkCell < Decidim::Meetings::OnlineMeetingCell
-      include Decidim::LayoutHelper
-
       def online_meeting_url?
         model.online_meeting_url.present?
       end

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

@@ -1,7 +1,11 @@
 <% answer_options_with_percentages.each do |(answer_option_body, answer_percentage)| %>
-  <label><%= translated_attribute(answer_option_body) %></label>
   <div class="meeting-polls__answer">
-    <div class="meeting-polls__answer--value"><%= answer_percentage %></div>
-    <div class="meeting-polls__answer--bar"><div style="width: <%= answer_percentage %>"></div></div>
+    <div class="meeting-polls__answer--bar">
+      <div style="width: <%= answer_percentage %>"></div>
+    </div>
+    <div class="meeting-polls__answer--value">
+      <span><%= translated_attribute(answer_option_body) %></span>
+      <span><%= answer_percentage %></span>
+    </div>
   </div>
 <% end %>

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

@@ -5,8 +5,6 @@ module Decidim
     # This cell renders the percentage of responses which chose
     # the given answer option in a meeting poll question
     class QuestionResponsesCell < Decidim::ViewModel
-      include ActionView::Helpers::NumberHelper
-
       def show
         render
       end

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

@@ -89,8 +89,8 @@ module Decidim
           form.services_to_persist.map do |service|
             Decidim::Meetings::Service.create!(
               meeting: copied_meeting,
-              "title" => service.title,
-              "description" => service.description
+              title: service.title,
+              description: service.description
             )
           end
         end

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

@@ -5,33 +5,15 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Meeting from the admin
       # panel.
-      class CreateAgenda < Decidim::Command
-        def initialize(form, meeting)
-          @form = form
-          @meeting = meeting
-          @agenda = nil
-        end
-
-        # Creates the agenda if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if @form.invalid?
-
-          transaction do
-            create_agenda!
-            create_agenda_items
-          end
+      class CreateAgenda < Decidim::Commands::CreateResource
+        fetch_form_attributes :title, :visible, :meeting
 
-          broadcast(:ok, @agenda)
-        end
-
-        private
+        protected
 
-        attr_reader :form, :meeting
+        def resource_class = Decidim::Meetings::Agenda
 
-        def create_agenda_items
-          @form.agenda_items.each do |form_agenda_item|
+        def run_after_hooks
+          form.agenda_items.each do |form_agenda_item|
             create_agenda_item(form_agenda_item)
           end
         end
@@ -43,10 +25,10 @@ module Decidim
             position: form_agenda_item.position,
             duration: form_agenda_item.duration,
             parent_id: form_agenda_item.parent_id,
-            agenda: @agenda
+            agenda: resource
           }
 
-          create_nested_model(form_agenda_item, agenda_item_attributes, @form.agenda_items) do |agenda_item|
+          create_nested_model(form_agenda_item, agenda_item_attributes, form.agenda_items) do |agenda_item|
             form_agenda_item.agenda_item_children.each do |form_agenda_item_child|
               agenda_item_child_attributes = {
                 title: form_agenda_item_child.title,
@@ -54,7 +36,7 @@ module Decidim
                 position: form_agenda_item_child.position,
                 duration: form_agenda_item_child.duration,
                 parent_id: agenda_item.id,
-                agenda: @agenda
+                agenda: resource
               }
 
               create_nested_model(form_agenda_item_child, agenda_item_child_attributes, agenda_item.agenda_item_children)
@@ -77,16 +59,6 @@ module Decidim
             record.save!
           end
         end
-
-        def create_agenda!
-          @agenda = Decidim.traceability.create!(
-            Agenda,
-            @form.current_user,
-            title: @form.title,
-            visible: @form.visible,
-            meeting: @meeting
-          )
-        end
       end
     end
   end

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

@@ -5,84 +5,51 @@ module Decidim
     module Admin
       # This command is executed when the user creates a Meeting from the admin
       # panel.
-      class CreateMeeting < Decidim::Command
-        def initialize(form)
-          @form = form
-        end
-
-        # Creates the meeting if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if @form.invalid?
+      class CreateMeeting < Decidim::Commands::CreateResource
+        fetch_form_attributes :scope, :category, :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
 
-          transaction do
-            create_meeting!
-            create_services!
-          end
+        protected
 
+        def run_after_hooks
+          create_services!
           create_follow_form_resource(form.current_user)
-          broadcast(:ok, meeting)
         end
 
-        private
-
-        attr_reader :form, :meeting
-
-        def create_meeting!
+        def attributes
           parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
           parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
-          params = {
-            scope: form.scope,
-            category: form.category,
-            title: parsed_title,
-            description: parsed_description,
-            end_time: form.end_time,
-            start_time: form.start_time,
-            online_meeting_url: form.online_meeting_url,
-            registration_type: form.registration_type,
-            registration_url: form.registration_url,
-            type_of_meeting: form.clean_type_of_meeting,
-            address: form.address,
-            latitude: form.latitude,
-            longitude: form.longitude,
-            location: form.location,
-            location_hints: form.location_hints,
-            private_meeting: form.private_meeting,
-            transparent: form.transparent,
-            author: form.current_organization,
-            registration_terms: form.current_component.settings.default_registration_terms,
-            registrations_enabled: form.registrations_enabled,
-            component: form.current_component,
-            questionnaire: Decidim::Forms::Questionnaire.new,
-            iframe_embed_type: form.iframe_embed_type,
-            comments_enabled: form.comments_enabled,
-            comments_start_time: form.comments_start_time,
-            comments_end_time: form.comments_end_time,
-            iframe_access_level: form.iframe_access_level
-          }
-
-          @meeting = Decidim.traceability.create!(
-            Meeting,
-            form.current_user,
-            params,
-            visibility: "all"
-          )
+          super.merge({
+                        title: parsed_title,
+                        description: parsed_description,
+                        type_of_meeting: form.clean_type_of_meeting,
+                        author: form.current_organization,
+                        registration_terms: form.current_component.settings.default_registration_terms,
+                        questionnaire: Decidim::Forms::Questionnaire.new
+                      })
         end
 
+        def resource_class = Decidim::Meetings::Meeting
+
+        def extra_params = { visibility: "all" }
+
+        private
+
         def create_services!
           form.services_to_persist.each do |service|
             Decidim::Meetings::Service.create!(
-              meeting:,
-              "title" => service.title,
-              "description" => service.description
+              meeting: resource,
+              title: service.title,
+              description: service.description
             )
           end
         end
 
         def create_follow_form_resource(user)
-          follow_form = Decidim::FollowForm.from_params(followable_gid: meeting.to_signed_global_id.to_s).with_context(current_user: user)
-          Decidim::CreateFollow.call(follow_form, 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)
         end
       end
     end

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

@@ -5,44 +5,15 @@ module Decidim
     module Admin
       # This command is executed when the user destroys a Meeting from the admin
       # panel.
-      class DestroyMeeting < Decidim::Command
-        # Initializes a CloseMeeting Command.
-        #
-        # meeting - The current instance of the page to be closed.
-        # current_user - the user performing the action
-        def initialize(meeting, current_user)
-          @meeting = meeting
-          @current_user = current_user
-        end
-
-        # Destroys the meeting if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid, proposals.size) if proposals.any?
-
-          destroy_meeting
-          broadcast(:ok)
-        end
+      class DestroyMeeting < Decidim::Commands::DestroyResource
+        protected
 
-        private
-
-        attr_reader :current_user, :meeting
-
-        def destroy_meeting
-          Decidim.traceability.perform_action!(
-            :delete,
-            meeting,
-            current_user
-          ) do
-            meeting.destroy!
-          end
-        end
+        def invalid? = proposals.any?
 
         def proposals
           return [] unless Decidim::Meetings.enable_proposal_linking
 
-          @proposals ||= meeting.authored_proposals.load
+          @proposals ||= resource.authored_proposals.load
         end
       end
     end

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

@@ -3,33 +3,14 @@
 module Decidim
   module Meetings
     module Admin
-      # This command is executed when the user creates a Meeting from the admin
+      # This command is executed when the user updates a Meeting from the admin
       # panel.
-      class UpdateAgenda < Decidim::Command
-        def initialize(form, agenda)
-          @form = form
-          @agenda = agenda
-        end
-
-        # Creates the agenda if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if @form.invalid?
+      class UpdateAgenda < Decidim::Commands::UpdateResource
+        fetch_form_attributes :title, :visible
 
-          transaction do
-            update_agenda!
-            update_agenda_items
-          end
-
-          broadcast(:ok, @agenda)
-        end
+        protected
 
-        private
-
-        attr_reader :form
-
-        def update_agenda_items
+        def run_after_hooks
           @form.agenda_items.each do |form_agenda_item|
             update_agenda_item(form_agenda_item)
           end
@@ -44,7 +25,7 @@ module Decidim
             parent_id: form_agenda_item.parent_id
           }
 
-          update_nested_model(form_agenda_item, agenda_item_attributes, @agenda.agenda_items) do |agenda_item|
+          update_nested_model(form_agenda_item, agenda_item_attributes, resource.agenda_items) do |agenda_item|
             form_agenda_item.agenda_item_children.each do |form_agenda_item_child|
               agenda_item_child_attributes = {
                 title: form_agenda_item_child.title,
@@ -52,7 +33,7 @@ module Decidim
                 position: form_agenda_item_child.position,
                 duration: form_agenda_item_child.duration,
                 parent_id: agenda_item.id,
-                agenda: @agenda
+                agenda: resource
               }
 
               update_nested_model(form_agenda_item_child, agenda_item_child_attributes, agenda_item.agenda_item_children)
@@ -75,15 +56,6 @@ module Decidim
             record.save!
           end
         end
-
-        def update_agenda!
-          Decidim.traceability.update!(
-            @agenda,
-            form.current_user,
-            title: form.title,
-            visible: form.visible
-          )
-        end
       end
     end
   end

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

@@ -5,87 +5,49 @@ module Decidim
     module Admin
       # This command is executed when the user changes a Meeting from the admin
       # panel.
-      class UpdateMeeting < Decidim::Command
-        # Initializes a UpdateMeeting Command.
-        #
-        # form - The form from which to get the data.
-        # meeting - The current instance of the page to be updated.
-        def initialize(form, meeting)
-          @form = form
-          @meeting = meeting
+      class UpdateMeeting < Decidim::Commands::UpdateResource
+        fetch_form_attributes :scope, :category, :end_time, :start_time, :online_meeting_url, :registration_type,
+                              :registration_url, :registrations_enabled, :address, :latitude, :longitude, :location,
+                              :location_hints,
+                              :private_meeting, :transparent, :iframe_embed_type, :comments_enabled,
+                              :comments_start_time, :comments_end_time, :iframe_access_level
+
+        protected
+
+        def run_after_hooks
+          send_notification if should_notify_followers?
+          schedule_upcoming_meeting_notification if resource.published? && start_time_changed?
+          update_services!
         end
 
-        # Updates the meeting if valid.
-        #
-        # Broadcasts :ok if successful, :invalid otherwise.
-        def call
-          return broadcast(:invalid) if form.invalid?
-
-          transaction do
-            update_meeting!
-            send_notification if should_notify_followers?
-            schedule_upcoming_meeting_notification if meeting.published? && start_time_changed?
-            update_services!
-          end
-
-          broadcast(:ok, meeting)
-        end
-
-        private
-
-        attr_reader :form, :meeting
-
-        def update_meeting!
+        def attributes
           parsed_title = Decidim::ContentProcessor.parse_with_processor(:hashtag, form.title, current_organization: form.current_organization).rewrite
           parsed_description = Decidim::ContentProcessor.parse(form.description, current_organization: form.current_organization).rewrite
-
-          Decidim.traceability.update!(
-            meeting,
-            form.current_user,
-            scope: form.scope,
-            category: form.category,
-            title: parsed_title,
-            description: parsed_description,
-            end_time: form.end_time,
-            start_time: form.start_time,
-            online_meeting_url: form.online_meeting_url,
-            registration_type: form.registration_type,
-            registration_url: form.registration_url,
-            registrations_enabled: form.registrations_enabled,
-            type_of_meeting: form.clean_type_of_meeting,
-            address: form.address,
-            latitude: form.latitude,
-            longitude: form.longitude,
-            location: form.location,
-            location_hints: form.location_hints,
-            private_meeting: form.private_meeting,
-            transparent: form.transparent,
-            iframe_embed_type: form.iframe_embed_type,
-            comments_enabled: form.comments_enabled,
-            comments_start_time: form.comments_start_time,
-            comments_end_time: form.comments_end_time,
-            iframe_access_level: form.iframe_access_level
-          )
+          super.merge({
+                        title: parsed_title,
+                        description: parsed_description,
+                        type_of_meeting: form.clean_type_of_meeting
+                      })
         end
 
         def update_services!
-          meeting.services = form.services_to_persist.map do |service|
-            Decidim::Meetings::Service.new("title" => service.title, "description" => service.description)
+          resource.services = form.services_to_persist.map do |service|
+            Decidim::Meetings::Service.new(title: service.title, description: service.description)
           end
-          meeting.save!
+          resource.save!
         end
 
         def send_notification
           Decidim::EventsManager.publish(
             event: "decidim.events.meetings.meeting_updated",
             event_class: Decidim::Meetings::UpdateMeetingEvent,
-            resource: meeting,
-            followers: meeting.followers
+            resource:,
+            followers: resource.followers
           )
         end
 
         def should_notify_followers?
-          meeting.published? && important_attributes.any? { |attr| meeting.previous_changes[attr].present? }
+          resource.published? && important_attributes.any? { |attr| resource.previous_changes[attr].present? }
         end
 
         def important_attributes
@@ -93,17 +55,17 @@ module Decidim
         end
 
         def start_time_changed?
-          meeting.previous_changes["start_time"].present?
+          resource.previous_changes["start_time"].present?
         end
 
         def schedule_upcoming_meeting_notification
-          return if meeting.start_time < Time.zone.now
+          return if resource.start_time < Time.zone.now
 
-          checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(meeting)
+          checksum = Decidim::Meetings::UpcomingMeetingNotificationJob.generate_checksum(resource)
 
           Decidim::Meetings::UpcomingMeetingNotificationJob
-            .set(wait_until: meeting.start_time - Decidim::Meetings.upcoming_meeting_notification)
-            .perform_later(meeting.id, checksum)
+            .set(wait_until: resource.start_time - Decidim::Meetings.upcoming_meeting_notification)
+            .perform_later(resource.id, checksum)
         end
       end
     end