Merge pull request #24641 from opf/feature/meet-185-activity-tab-journalise-and-add-information-about-when-a-work-package-is-added-or-discussed-in-a-meeting

[MEET-185] Activity tab: Journalise and add information about when a work package is added or discussed in a meeting

Author: mrmir

app/components/work_packages/activities_tab/journals/filter_and_sorting_component.html.erb

@@ -44,6 +44,19 @@
             },
             active: show_only_comments?
           )
+          if show_hide_meetings_filter?
+            menu.with_item(
+              label: t("activities.work_packages.activity_tab.label_activity_hide_meetings"),
+              href: update_filter_work_package_activities_path(work_package, filter: WorkPackages::ActivitiesTab::Filters::HIDE_MEETINGS),
+              content_arguments: {
+                data: {
+                  turbo_stream: true, action: "click->work-packages--activities-tab--index#setFilterToHideMeetings",
+                  test_selector: "op-wp-journals-filter-hide-meetings"
+                }
+              },
+              active: hide_meetings?
+            )
+          end
         end
       end
       container.with_column do

app/components/work_packages/activities_tab/journals/filter_and_sorting_component.rb

@@ -59,6 +59,16 @@ def show_only_comments?
         def show_only_changes?
           filter == Filters::ONLY_CHANGES
         end
+
+        def hide_meetings?
+          filter == Filters::HIDE_MEETINGS
+        end
+
+        # Only offer "hide meetings" to users who would see the work package
+        # meetings tab (the same condition used for the WP meetings tab)
+        def show_hide_meetings_filter?
+          User.current.allowed_in_any_project?(:view_meetings)
+        end
       end
     end
   end

app/controllers/work_packages/activities_tab_controller.rb

@@ -236,6 +236,7 @@ def find_journal
     @journal = @work_package
       .journals
       .internal_visible
+      .without_meeting_causes
       .find(params[:id])
   rescue ActiveRecord::RecordNotFound
     respond_with_error(I18n.t("label_not_found"))

app/controllers/work_packages_controller.rb

@@ -268,6 +268,7 @@ def journals
       work_package
         .journals
         .internal_visible
+        .without_meeting_causes
         .changing
         .includes(:user)
         .order(order).to_a

app/models/activities/base_activity_provider.rb

@@ -142,6 +142,7 @@ def event_selection_query(user, from, to, options)
     query = journals_with_data_query
     query = extend_event_query(query)
     query = filter_for_visibility(query, user)
+    query = exclude_meeting_causes(query)
     query = filter_for_event_datetime(query, from, to)
     query = restrict_user(query, options)
     restrict_projects(query, user, options)
@@ -170,6 +171,15 @@ def filter_for_visibility(query, user)
     )
   end
 
+  def exclude_meeting_causes(query)
+    query.where(cause_type_expression.eq(nil).or(cause_type_expression.not_in(Journal::MEETING_CAUSE_TYPES)))
+  end
+
+  def cause_type_expression
+    @cause_type_expression ||=
+      Arel::Nodes::InfixOperation.new("->>", journals_table[:cause], Arel::Nodes.build_quoted("type"))
+  end
+
   def filter_for_event_datetime(query, from, to)
     query = query.where(journals_table[:created_at].gteq(from)) if from
     query = query.where(journals_table[:created_at].lteq(to)) if to

app/models/journal.rb

@@ -88,9 +88,20 @@ class Journal < ApplicationRecord
                    status_name
                    status_id
                    status_changes
+                   meeting_id
+                   source_meeting_id
                  ],
                  prefix: true
-  VALID_CAUSE_TYPES = %w[
+
+  MEETING_CAUSE_TYPES = %w[
+    meeting_agenda_item_added
+    meeting_agenda_item_removed
+    meeting_agenda_item_moved
+    meeting_agenda_item_discussed
+    meeting_outcome_recorded
+  ].freeze
+
+  VALID_CAUSE_TYPES = (%w[
     default_attribute_written
     import
     progress_mode_changed_to_status_based
@@ -104,7 +115,7 @@ class Journal < ApplicationRecord
     work_package_related_changed_times
     work_package_duplicate_closed
     working_days_changed
-  ].freeze
+  ] + MEETING_CAUSE_TYPES).freeze
 
   # Make sure each journaled model instance only has unique version ids
   validates :version, uniqueness: { scope: %i[journable_id journable_type] }

app/models/journal/caused_by_meeting_agenda_item_added.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Journal::CausedByMeetingAgendaItemAdded < CauseOfChange::Base
+  def initialize(meeting)
+    super("meeting_agenda_item_added", "meeting_id" => meeting.id)
+  end
+end

app/models/journal/caused_by_meeting_agenda_item_discussed.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Journal::CausedByMeetingAgendaItemDiscussed < CauseOfChange::Base
+  def initialize(meeting)
+    super("meeting_agenda_item_discussed", "meeting_id" => meeting.id)
+  end
+end

app/models/journal/caused_by_meeting_agenda_item_moved.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Journal::CausedByMeetingAgendaItemMoved < CauseOfChange::Base
+  def initialize(meeting, source_meeting: nil)
+    attributes = { "meeting_id" => meeting.id }
+    attributes["source_meeting_id"] = source_meeting.id if source_meeting
+
+    super("meeting_agenda_item_moved", attributes)
+  end
+end

app/models/journal/caused_by_meeting_agenda_item_removed.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+class Journal::CausedByMeetingAgendaItemRemoved < CauseOfChange::Base
+  def initialize(meeting)
+    super("meeting_agenda_item_removed", "meeting_id" => meeting.id)
+  end
+end