Merge pull request opf#15495 from opf/feature/53669-change-default-view-for-meetings-module-to-upcoming-invitations

[#53669] Change default view for meetings module to upcoming invitations

Author: mrmir

modules/meeting/app/controllers/meetings_controller.rb

@@ -58,7 +58,7 @@ class MeetingsController < ApplicationController
   def index
     @query = load_query
     @meetings = load_meetings(@query)
-    render 'index', locals: { menu_name: project_or_global_menu }
+    render "index", locals: { menu_name: project_or_global_menu }
   end
 
   current_menu_item :index do
@@ -70,11 +70,11 @@ def show
     if @meeting.is_a?(StructuredMeeting)
       render(Meetings::ShowComponent.new(meeting: @meeting, project: @project))
     elsif @meeting.agenda.present? && @meeting.agenda.locked?
-      params[:tab] ||= 'minutes'
+      params[:tab] ||= "minutes"
     end
   end
 
-  def create
+  def create # rubocop:disable Metrics/AbcSize
     call =
       if @copy_from
         ::Meetings::CopyService
@@ -90,14 +90,15 @@ def create
       text = I18n.t(:notice_successful_create)
       if User.current.time_zone.nil?
         link = I18n.t(:notice_timezone_missing, zone: Time.zone)
-        text += " #{view_context.link_to(link, { controller: '/my', action: :settings, anchor: 'pref_time_zone' }, class: 'link_to_profile')}"
+        text += " #{view_context.link_to(link, { controller: '/my', action: :settings, anchor: 'pref_time_zone' },
+                                         class: 'link_to_profile')}"
       end
       flash[:notice] = text.html_safe # rubocop:disable Rails/OutputSafety
 
-      redirect_to action: 'show', id: call.result
+      redirect_to action: "show", id: call.result
     else
       @meeting = call.result
-      render template: 'meetings/new', project_id: @project, locals: { copy_from: @copy_from }
+      render template: "meetings/new", project_id: @project, locals: { copy_from: @copy_from }
     end
   end
 
@@ -114,13 +115,13 @@ def copy
       .call(save: false)
 
     @meeting = call.result
-    render action: 'new', project_id: @project, locals: { copy_from: }
+    render action: "new", project_id: @project, locals: { copy_from: }
   end
 
   def destroy
     @meeting.destroy
     flash[:notice] = I18n.t(:notice_successful_delete)
-    redirect_to action: 'index', project_id: @project
+    redirect_to action: "index", project_id: @project
   end
 
   def edit
@@ -155,9 +156,9 @@ def update
     @meeting.attributes = @converted_params
     if @meeting.save
       flash[:notice] = I18n.t(:notice_successful_update)
-      redirect_to action: 'show', id: @meeting
+      redirect_to action: "show", id: @meeting
     else
-      render action: 'edit'
+      render action: "edit"
     end
   end
 
@@ -239,7 +240,7 @@ def notify
       flash[:notice] = I18n.t(:notice_successful_notification)
     else
       flash[:error] = I18n.t(:error_notification_with_errors,
-                             recipients: result.errors.map(&:name).join('; '))
+                             recipients: result.errors.map(&:name).join("; "))
     end
 
     redirect_to action: :show, id: @meeting
@@ -256,7 +257,7 @@ def load_query
     query = apply_default_filter_if_none_given(query)
 
     if @project
-      query.where("project_id", '=', @project.id)
+      query.where("project_id", "=", @project.id)
     end
 
     query
@@ -266,6 +267,7 @@ def apply_default_filter_if_none_given(query)
     return query if query.filters.any?
 
     query.where("time", "=", Queries::Meetings::Filters::TimeFilter::FUTURE_VALUE)
+    query.where("invited_user_id", "=", [User.current.id.to_s])
   end
 
   def load_meetings(query)
@@ -337,15 +339,15 @@ def structured_meeting_params
 
   def meeting_type(given_type)
     case given_type
-    when 'dynamic'
-      'StructuredMeeting'
+    when "dynamic"
+      "StructuredMeeting"
     else
-      'Meeting'
+      "Meeting"
     end
   end
 
   def verify_activities_module_activated
-    render_403 if @project && !@project.module_enabled?('activity')
+    render_403 if @project && !@project.module_enabled?("activity")
   end
 
   def set_activity
@@ -368,12 +370,12 @@ def activity_scope
   end
 
   def determine_date_range
-    @days = 31 # Setting.activity_days_default.to_i
+    @days = Setting.activity_days_default.to_i
 
     if params[:from]
       begin
-        ; @date_to = params[:from].to_date + 1.day;
-      rescue StandardError;
+        @date_to = params[:from].to_date + 1.day
+      rescue StandardError
       end
     end
 
@@ -395,8 +397,8 @@ def find_copy_from_meeting
 
   def copy_attributes
     {
-      copy_agenda: params[:copy_agenda] == '1',
-      copy_attachments: params[:copy_attachments] == '1',
+      copy_agenda: params[:copy_agenda] == "1",
+      copy_attachments: params[:copy_attachments] == "1"
     }
   end
 end

modules/meeting/app/helpers/meetings_helper.rb

@@ -44,7 +44,12 @@ def involvement_sidebar_menu_items
   end
 
   def menu_upcoming_meetings_item
-    path = project_or_global_meetings_path
+    path = project_or_global_meetings_path(
+      filters: [
+        { time: { operator: "=", values: ["future"] } }
+      ],
+      sort: "start_time"
+    )
 
     menu_link_element path, t(:label_upcoming_meetings)
   end
@@ -59,13 +64,7 @@ def menu_past_meetings_item
   end
 
   def menu_upcoming_invitations_item
-    path = project_or_global_meetings_path(
-      filters: [
-        { time: { operator: "=", values: ["future"] } },
-        { invited_user_id: { operator: "=", values: [User.current.id.to_s] } }
-      ],
-      sort: "start_time"
-    )
+    path = project_or_global_meetings_path
 
     menu_link_element path, t(:label_upcoming_invitations)
   end

modules/meeting/spec/controllers/meetings_controller_spec.rb

@@ -48,8 +48,8 @@
       let(:meetings) do
         [
           create(:meeting, project:),
-          create(:meeting, project:),
-          create(:meeting, project: other_project)
+          create(:meeting, author: user, project:),
+          create(:meeting, author: user, project: other_project)
         ]
       end
 
@@ -58,9 +58,8 @@
           before do
             get "index"
           end
-
           it { expect(response).to be_successful }
-          it { expect(assigns(:meetings)).to match_array meetings }
+          it { expect(assigns(:meetings)).to match_array meetings[1..2] }
         end
 
         context "when requesting meetings scoped to a project ID" do
@@ -69,7 +68,7 @@
           end
 
           it { expect(response).to be_successful }
-          it { expect(assigns(:meetings)).to match_array meetings[0..1] }
+          it { expect(assigns(:meetings)).to match_array meetings[1] }
         end
       end
     end

modules/meeting/spec/features/meetings_delete_spec.rb

@@ -45,6 +45,9 @@
   let(:index_path) { project_meetings_path(project) }
 
   before do
+    create(:meeting_participant, :invitee, user:, meeting:)
+    create(:meeting_participant, :invitee, user:, meeting: other_meeting)
+
     login_as(user)
   end
 

modules/meeting/spec/features/meetings_global_menu_item_spec.rb

@@ -55,9 +55,9 @@
       expect(page).to have_current_path("/meetings")
     end
 
-    specify '"Upcoming meetings" is the default filter set' do
+    specify '"Upcoming invitations" is the default filter set' do
       within "#main-menu" do
-        expect(page).to have_css(".selected", text: I18n.t(:label_upcoming_meetings))
+        expect(page).to have_css(".selected", text: I18n.t(:label_upcoming_invitations))
       end
     end
   end

modules/meeting/spec/features/meetings_index_spec.rb

@@ -81,33 +81,38 @@
     create(:meeting, project:, title: "Awesome meeting yesterday!", start_time: 1.day.ago)
   end
 
-  shared_let(:other_project_meeting) do
+  let(:other_project_meeting) do
     create(:meeting,
            project: other_project,
            title: "Awesome other project meeting!",
            start_time: 2.days.from_now,
            duration: 2.0,
            location: "not-a-url")
   end
+  let(:ongoing_meeting) do
+    create(:meeting, project:, title: "Awesome ongoing meeting!", start_time: 30.minutes.ago)
+  end
 
   def setup_meeting_involvement
-    create(:meeting_participant, :invitee,  user:, meeting: tomorrows_meeting)
-    create(:meeting_participant, :invitee,  user:, meeting: yesterdays_meeting)
+    invite_to_meeting(tomorrows_meeting)
+    invite_to_meeting(yesterdays_meeting)
     create(:meeting_participant, :attendee, user:, meeting:)
     meeting.update!(author: user)
   end
 
+  def invite_to_meeting(meeting)
+    create(:meeting_participant, :invitee, user:, meeting:)
+  end
+
   before do
     login_as user
   end
 
   shared_examples "sidebar filtering" do |context:|
     context "when filtering with the sidebar" do
-      shared_let(:ongoing_meeting) do
-        create(:meeting, project:, title: "Awesome ongoing meeting!", start_time: 30.minutes.ago)
-      end
-
       before do
+        ongoing_meeting
+        other_project_meeting
         setup_meeting_involvement
         meetings_page.visit!
       end
@@ -199,20 +204,22 @@ def setup_meeting_involvement
   context "when visiting from a global context" do
     let(:meetings_page) { Pages::Meetings::Index.new(project: nil) }
 
-    it "lists all upcoming meetings for all projects the user has access to" do
-      meeting
-      yesterdays_meeting
+    it "lists all upcoming meetings for all projects the user is invited to" do
+      invite_to_meeting(meeting)
+      invite_to_meeting(yesterdays_meeting)
+      invite_to_meeting(other_project_meeting)
 
       meetings_page.navigate_by_modules_menu
       meetings_page.expect_meetings_listed(meeting, other_project_meeting)
       meetings_page.expect_meetings_not_listed(yesterdays_meeting)
     end
 
     it "renders a link to each meeting's location if present and a valid URL" do
-      meeting
-      meeting_with_no_location
-      meeting_with_malicious_location
-      tomorrows_meeting
+      invite_to_meeting(meeting)
+      invite_to_meeting(meeting_with_no_location)
+      invite_to_meeting(meeting_with_malicious_location)
+      invite_to_meeting(tomorrows_meeting)
+      invite_to_meeting(other_project_meeting)
 
       meetings_page.visit!
 
@@ -245,7 +252,8 @@ def setup_meeting_involvement
 
     describe "sorting" do
       before do
-        meeting
+        invite_to_meeting(meeting)
+        invite_to_meeting(other_project_meeting)
         visit meetings_path
         # Start Time ASC is the default sort order for Upcoming meetings
         # We can assert the initial sort by expecting the order is
@@ -338,16 +346,16 @@ def setup_meeting_involvement
     include_examples "sidebar filtering", context: :project
 
     specify "with 1 meeting listed" do
-      meeting
+      invite_to_meeting(meeting)
       meetings_page.visit!
 
       meetings_page.expect_meetings_listed(meeting)
     end
 
     it "with pagination", with_settings: { per_page_options: "1" } do
-      meeting
-      tomorrows_meeting
-      yesterdays_meeting
+      invite_to_meeting(meeting)
+      invite_to_meeting(tomorrows_meeting)
+      invite_to_meeting(yesterdays_meeting)
 
       # First page displays the soonest occurring upcoming meeting
       meetings_page.visit!
@@ -365,10 +373,10 @@ def setup_meeting_involvement
     end
 
     it "renders a link to each meeting's location if present and a valid URL" do
-      meeting
-      meeting_with_no_location
-      meeting_with_malicious_location
-      tomorrows_meeting
+      invite_to_meeting(meeting)
+      invite_to_meeting(meeting_with_no_location)
+      invite_to_meeting(meeting_with_malicious_location)
+      invite_to_meeting(tomorrows_meeting)
 
       meetings_page.visit!
       meetings_page.expect_link_to_meeting_location(meeting)
@@ -379,8 +387,8 @@ def setup_meeting_involvement
 
     describe "sorting" do
       before do
-        meeting
-        tomorrows_meeting
+        invite_to_meeting(meeting)
+        invite_to_meeting(tomorrows_meeting)
         meetings_page.visit!
         # Start Time ASC is the default sort order for Upcoming meetings
         # We can assert the initial sort by expecting the order is

modules/meeting/spec/features/meetings_show_spec.rb

@@ -43,6 +43,10 @@
   current_user { user }
 
   describe "navigate to meeting page" do
+    before do
+      create(:meeting_participant, :invitee, user:, meeting:)
+    end
+
     let(:permissions) { %i[view_meetings] }
 
     it "can visit the meeting" do