Merge remote-tracking branch 'origin/release/14.4' into dev

app/contracts/notifications/create_contract.rb

@@ -31,7 +31,6 @@ class CreateContract < ::ModelContract
     attribute :recipient
     attribute :subject
     attribute :reason
-    attribute :project
     attribute :actor
     attribute :resource
     attribute :journal

app/mailers/digest_mailer.rb

@@ -82,10 +82,9 @@ def work_packages(recipient_id, notification_ids)
   def load_notifications(notification_ids)
     Notification
       .where(id: notification_ids)
-      .includes(:project, :resource)
+      .includes(:resource)
       .reject do |notification|
         notification.resource.nil? ||
-        notification.project.nil? ||
         (notification.journal.nil? && !notification.date_alert?)
       end
   end

app/models/notification.rb

@@ -48,7 +48,6 @@ class Notification < ApplicationRecord
 
   belongs_to :recipient, class_name: "User"
   belongs_to :actor, class_name: "User"
-  belongs_to :project
   belongs_to :journal
   belongs_to :resource, polymorphic: true
 

app/models/queries/notifications/filters/project_filter.rb

@@ -28,4 +28,15 @@
 
 class Queries::Notifications::Filters::ProjectFilter < Queries::Notifications::Filters::NotificationFilter
   include Queries::Filters::Shared::ProjectFilter::Optional
+
+  # This is currently work package specific same as all the other parts of the NotificationQuery
+  self.model = WorkPackage
+
+  def joins
+    <<~SQL.squish
+      JOIN #{WorkPackage.table_name}
+      ON #{WorkPackage.table_name}.id = #{Notification.table_name}.resource_id
+      AND #{Notification.table_name}.resource_type = 'WorkPackage'
+    SQL
+  end
 end

app/models/queries/notifications/group_bys/group_by_project.rb

@@ -33,6 +33,16 @@ def self.key
     :project
   end
 
+  def joins
+    # Only Notifications for work_packages are currently supported via the query.
+    # E.g. the visible statement used in the query is WorkPackage specific.
+    <<~SQL.squish
+      JOIN work_packages
+      ON notifications.resource_id = work_packages.id
+      AND notifications.resource_type = 'WorkPackage'
+    SQL
+  end
+
   def name
     :project_id
   end

app/models/queries/notifications/orders/project_order.rb

@@ -34,15 +34,23 @@ def self.key
   end
 
   def joins
-    :project
+    <<~SQL.squish
+      JOIN #{WorkPackage.table_name} work_packages_order
+      ON work_packages_order.id = #{Notification.table_name}.resource_id
+      AND #{Notification.table_name}.resource_type = 'WorkPackage'
+      JOIN #{Project.table_name}
+      ON #{Project.table_name}.id = work_packages_order.project_id
+    SQL
   end
 
   protected
 
   def order(scope)
-    order_string = "projects.name"
-    order_string += " DESC" if direction == :desc
+    with_raise_on_invalid do
+      order_string = "#{Project.table_name}.name"
+      order_string += " DESC" if direction == :desc
 
-    scope.order(order_string)
+      scope.order(order_string)
+    end
   end
 end

app/services/notifications/create_from_model_service.rb

@@ -106,7 +106,6 @@ def update_or_create_notification(recipient_id, reason)
   def create_notification(recipient_id, reason)
     notification_attributes = {
       recipient_id:,
-      project:,
       resource:,
       journal:,
       actor: user_with_fallback,

app/services/notifications/set_attributes_service.rb

@@ -27,20 +27,5 @@
 #++
 
 module Notifications
-  class SetAttributesService < ::BaseServices::SetAttributes
-    private
-
-    def set_default_attributes(params)
-      super
-
-      set_default_project unless model.project
-    end
-
-    ##
-    # Try to determine the project context from the journal (if any)
-    # or the resource if it has a project set
-    def set_default_project
-      model.project = model.journal&.project || model.resource.try(:project)
-    end
-  end
+  class SetAttributesService < ::BaseServices::SetAttributes; end
 end

app/workers/notifications/create_date_alerts_notifications_job/service.rb

@@ -70,7 +70,6 @@ def create_date_alert_notification(user, work_package, reason)
     create_service = Notifications::CreateService.new(user:)
     create_service.call(
       recipient_id: user.id,
-      project_id: work_package.project_id,
       resource: work_package,
       reason:
     )

config/locales/crowdin/js-zh-TW.yml

@@ -901,7 +901,7 @@ zh-TW:
         copy: "整批複製"
         delete: "整批刪除"
       button_clear: "清除"
-      comment_added: "成功發表意見。"
+      comment_added: "留言成功"
       comment_send_failed: "發生錯誤。無法留言。"
       comment_updated: "留言已成功更新。"
       confirm_edit_cancel: "是否確定取消編輯中的工作項目"

config/locales/crowdin/zh-TW.yml

@@ -1895,7 +1895,7 @@ zh-TW:
   label_collapsed_click_to_show: "已收合。按一下以顯示"
   label_configuration: 組態
   label_comment_add: "新增留言"
-  label_comment_added: "新增內容"
+  label_comment_added: "新增留言"
   label_comment_delete: "刪除留言"
   label_comment_plural: "留言"
   label_commits_per_author: "每個作者的Commit"
@@ -2124,7 +2124,7 @@ zh-TW:
   label_new_statuses_allowed: "允許的新狀態"
   label_news_singular: "最新消息"
   label_news_added: "有最新消息"
-  label_news_comment_added: "最新消息新增留言"
+  label_news_comment_added: "「最新消息」有新留言"
   label_news_latest: "最新消息"
   label_news_new: "增加消息"
   label_news_edit: "編輯消息"

db/migrate/20240820123011_remove_project_from_notification.rb

@@ -0,0 +1,83 @@
+#-- 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 RemoveProjectFromNotification < ActiveRecord::Migration[7.1]
+  def change
+    reversible do |direction|
+      direction.down do
+        execute <<~SQL.squish
+          UPDATE notifications
+          SET project_id = work_package_journals.project_id
+          FROM journals
+          JOIN work_package_journals
+          ON journals.data_id = work_package_journals.id AND journals.data_type = 'Journal::WorkPackageJournal'
+          WHERE notifications.journal_id = journals.id AND notifications.resource_type = 'WorkPackage'
+        SQL
+
+        execute <<~SQL.squish
+          UPDATE notifications
+          SET project_id = forums.project_id
+          FROM journals
+          JOIN message_journals
+          ON journals.data_id = message_journals.id AND journals.data_type = 'Journal::MessageJournal'
+          JOIN forums ON message_journals.forum_id = forums.id
+          WHERE notifications.journal_id = journals.id AND notifications.resource_type = 'Message'
+        SQL
+
+        execute <<~SQL.squish
+          UPDATE notifications
+          SET project_id = wikis.project_id
+          FROM wiki_pages
+          JOIN wikis
+          ON wiki_pages.wiki_id = wikis.id
+          WHERE notifications.resource_id = wiki_pages.id AND notifications.resource_type = 'WikiPage'
+        SQL
+
+        execute <<~SQL.squish
+          UPDATE notifications
+          SET project_id = news_journals.project_id
+          FROM journals
+          JOIN news_journals
+          ON journals.data_id = news_journals.id AND journals.data_type = 'Journal::NewsJournal'
+          WHERE notifications.journal_id = journals.id AND notifications.resource_type = 'News'
+        SQL
+
+        execute <<~SQL.squish
+          UPDATE notifications
+          SET project_id = news.project_id
+          FROM comments
+          JOIN news
+          ON comments.commented_id = news.id AND comments.commented_type = 'News'
+          WHERE notifications.resource_id = comments.id AND notifications.resource_type = 'Comment'
+        SQL
+      end
+    end
+
+    remove_reference :notifications, :project
+  end
+end

docs/system-admin-guide/backup/README.md

@@ -13,19 +13,25 @@ Unless disabled via the [configuration](../../installation-and-operations/config
 
 You can yourself create backups of your OpenProject installation. Go to *Administration* and *Backup* to get started.
 
-![administration-backup](administration-backup-2034314.png)
-
 To be able to create a backup, a so called _backup token_ has to be generated first. This is supposed to add another level of security since backing up the whole installation includes sensitive data.
 
 You will then need to create a backup token by clicking **+ Backup token**.
 
-![create-backup-token](create-backup-token.png)
+![Create a backup token in OpenProject administration](openproject_system_guide_backup_tocken.png)
+
+You will be asked to enter **create** to confirm that you wish to create a token.
+
+![Confirm creating a backup token in OpenProject](openproject_system_guide_backup_token_confirm.png)
+
+In the next step you will be asked to confirm your password. 
 
-You will be asked to confirm your password when you try to generate or reset a token. The _backup token_ will only be displayed once after it has been generated. Make sure you store it in a safe place.
+> [!IMPORTANT]
+>
+> The _backup token_ will only be displayed **once** after it has been generated. Make sure you store it in a safe place.
 
 The system generates the token which you then fill in where requested in the field below. Then you can press the **Request backup** button
 
-![backup-code](backup-code.png)
+![Success backup token generation message in OpenProject](openproject_system_guide_backup_token_success.png)
 
 Each time you request a backup this token has to be provided. This also applies when requesting a backup via the API where on top of the API token the _backup token_ will have to be provided as well.
 

docs/system-admin-guide/design/README.md

@@ -67,7 +67,7 @@ Aside from uploading logos and icons, you can also customize the colors used wit
 To do this change the color values (entered as color hex code) in the *Advanced settings* section. In order to find the right hex code for a color, you can use a website, such as [color-hex.com](https://www.color-hex.com/).
  You can see the selected color in the preview area next to the color hex code. Therefore, it is possible to see the selected color before saving the changes.
 
-> ![TIP]
+> [!TIP]
 > If the button color you select is too light to have white text on top of it, the icon and text color will be displayed in black instead.
 
 ![Advanced color settings in OpenProject](openproject_system_guide_design_advanced_settings_primer.png)

lib/api/v3/notifications/notification_eager_loading_wrapper.rb

@@ -44,7 +44,10 @@ def wrap(notifications)
           # because it is a polymorphic association. That being as it is, currently only
           # work packages are assigned.
           def set_resource(notifications)
-            work_packages_by_id = WorkPackage.where(id: notifications.pluck(:resource_id).uniq).index_by(&:id)
+            work_packages_by_id = WorkPackage
+                                    .includes(:project)
+                                    .where(id: notifications.pluck(:resource_id).uniq)
+                                    .index_by(&:id)
 
             notifications.each do |notification|
               notification.resource = work_packages_by_id[notification.resource_id]

lib/api/v3/notifications/notification_representer.rb

@@ -77,8 +77,6 @@ class NotificationRepresenter < ::API::Decorators::Single
                             skip_render: ->(*) { represented.actor.nil? },
                             v3_path: :user
 
-        associated_resource :project
-
         associated_resource :journal,
                             as: :activity,
                             representer: ::API::V3::Activities::ActivityRepresenter,
@@ -87,11 +85,26 @@ class NotificationRepresenter < ::API::Decorators::Single
 
         polymorphic_resource :resource
 
+        resource :project,
+                 getter: ->(*) {
+                           ::API::V3::Projects::ProjectRepresenter
+                             .create(represented.resource.project, current_user:, embed_links:)
+                         },
+                 link: ->(*) {
+                         {
+                           href: api_v3_paths.project(represented.resource.project.id),
+                           title: represented.resource.project.name
+                         }
+                       },
+                 setter: ->(*) {
+                           raise NotImplementedError
+                         }
+
         def _type
           "Notification"
         end
 
-        self.to_eager_load = %i[project actor journal]
+        self.to_eager_load = %i[actor journal]
       end
     end
   end

spec/contracts/notifications/create_contract_spec.rb

@@ -37,7 +37,6 @@
     end
   end
 
-  let(:notification_context) { build_stubbed(:project) }
   let(:notification_resource) { build_stubbed(:journal) }
   let(:notification_recipient) { build_stubbed(:user) }
   let(:notification_subject) { "Some text" }
@@ -46,8 +45,7 @@
   let(:notification_mail_reminder_sent) { false }
 
   let(:notification) do
-    Notification.new(project: notification_context,
-                     recipient: notification_recipient,
+    Notification.new(recipient: notification_recipient,
                      subject: notification_subject,
                      reason: notification_reason,
                      resource: notification_resource,

spec/factories/notification_factory.rb

@@ -6,11 +6,10 @@
     mail_alert_sent { false }
     reason { :mentioned }
     recipient factory: :user
-    project
-    resource { association :work_package, project: }
+    resource { association :work_package }
 
     trait :for_milestone do
-      resource { association :work_package, :is_milestone, project: }
+      resource { association :work_package, :is_milestone }
     end
     # journal and actor are not listed by intend.
     # They will be set in the after_build callback.

spec/features/notifications/navigation_spec.rb

@@ -12,15 +12,13 @@
   shared_let(:notification) do
     create(:notification,
            recipient:,
-           project:,
            resource: work_package,
            journal: work_package.journals.last)
   end
 
   shared_let(:second_notification) do
     create(:notification,
            recipient:,
-           project:,
            resource: second_work_package,
            journal: second_work_package.journals.last)
   end

spec/features/notifications/notification_center/notification_center_date_alert_mention_spec.rb

@@ -18,16 +18,14 @@
            reason: :mentioned,
            recipient: user,
            resource: work_package,
-           actor:,
-           project:)
+           actor:)
   end
 
   shared_let(:notification_date_alert) do
     create(:notification,
            reason: :date_alert_due_date,
            recipient: user,
-           resource: work_package,
-           project:)
+           resource: work_package)
   end
 
   let(:center) { Pages::Notifications::Center.new }