Merge branch 'dev' into epic/26180-pdf-export-for-time-sheets

Gemfile

@@ -218,7 +218,7 @@ gem "dry-validation"
 gem "store_attribute", "~> 1.0"
 
 # Appsignal integration
-gem "appsignal", "~> 4.2", require: false
+gem "appsignal", "~> 3.10.0", require: false
 
 gem "view_component"
 # Lookbook

Gemfile.lock

@@ -335,8 +335,7 @@ GEM
     airbrake-ruby (6.2.2)
       rbtree3 (~> 0.6)
     android_key_attestation (0.3.0)
-    appsignal (4.2.0)
-      logger
+    appsignal (3.10.0)
       rack
     ast (2.4.2)
     attr_required (1.0.2)
@@ -345,8 +344,8 @@ GEM
     awesome_nested_set (3.7.0)
       activerecord (>= 4.0.0, < 8.0)
     aws-eventstream (1.3.0)
-    aws-partitions (1.1012.0)
-    aws-sdk-core (3.212.0)
+    aws-partitions (1.1013.0)
+    aws-sdk-core (3.214.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -1209,7 +1208,7 @@ DEPENDENCIES
   acts_as_tree (~> 2.9.0)
   addressable (~> 2.8.0)
   airbrake (~> 13.0.0)
-  appsignal (~> 4.2)
+  appsignal (~> 3.10.0)
   auto_strip_attributes (~> 2.5)
   awesome_nested_set (~> 3.7.0)
   aws-sdk-core (~> 3.107)

app/components/_index.sass

@@ -17,3 +17,4 @@
 @import "projects/row_component"
 @import "op_primer/border_box_table_component"
 @import "work_packages/exports/modal_dialog_component"
+@import "work_package_relations_tab/index_component"

app/components/work_package_relations_tab/add_work_package_child_dialog_component.html.erb

@@ -0,0 +1,30 @@
+<%=
+  render(Primer::Alpha::Dialog.new(title: dialog_title,
+                                   size: :large,
+                                   id: DIALOG_ID)) do |d|
+    d.with_header(variant: :large)
+    d.with_body(classes: "Overlay-body_autocomplete_height") do
+      render(WorkPackageRelationsTab::AddWorkPackageChildFormComponent.new(
+        work_package: @work_package
+      ))
+    end
+    d.with_footer do
+      component_collection do |buttons|
+        buttons.with_component(Primer::ButtonComponent.new(
+          data: {
+            'close-dialog-id': DIALOG_ID
+          }
+        )) do
+          t("button_cancel")
+        end
+        buttons.with_component(Primer::ButtonComponent.new(
+          scheme: :primary,
+          form: FORM_ID,
+          data: { turbo: true },
+          type: :submit)) do
+          t("button_save")
+        end
+      end
+    end
+  end
+%>

app/components/work_package_relations_tab/add_work_package_child_dialog_component.rb

@@ -0,0 +1,54 @@
+# 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 WorkPackageRelationsTab::AddWorkPackageChildDialogComponent < ApplicationComponent
+  include ApplicationHelper
+  include OpTurbo::Streamable
+  include OpPrimer::ComponentHelpers
+
+  I18N_NAMESPACE = "work_package_relations_tab"
+  DIALOG_ID = "add-work-package-child-dialog"
+  FORM_ID = "add-work-package-child-form"
+
+  attr_reader :work_package
+
+  def initialize(work_package:)
+    super()
+
+    @work_package = work_package
+  end
+
+  private
+
+  def dialog_title
+    child_label = t("#{I18N_NAMESPACE}.relations.label_child_singular")
+    t("#{I18N_NAMESPACE}.label_add_x", x: child_label)
+  end
+end

app/components/work_package_relations_tab/add_work_package_child_form_component.html.erb

@@ -0,0 +1,38 @@
+<%= component_wrapper do %>
+  <%= primer_form_with(
+    id: FORM_ID,
+    model: WorkPackage.new,
+    **submit_url_options,
+    data: {
+      turbo: true,
+      update_work_package: true
+    }
+    ) do |f| %>
+    <%# Form fields section %>
+    <%= flex_layout(my: 3) do |flex|
+        flex.with_row do
+          if @base_errors&.any?
+            render(Primer::Alpha::Banner.new(mb: 3, icon: :stop, scheme: :danger)) { @base_errors.join("\n") }
+          end
+        end
+        flex.with_row do
+          render_inline_form(f) do |my_form|
+            my_form.work_package_autocompleter(
+              name: :id,
+              label: WorkPackage.model_name.human,
+              visually_hide_label: false,
+              autocomplete_options: {
+                resource: 'work_packages',
+                searchKey: 'subjectOrId',
+                openDirectly: false,
+                focusDirectly: false,
+                dropdownPosition: 'bottom',
+                appendTo: "##{DIALOG_ID}",
+                data: { test_selector: ID_FIELD_TEST_SELECTOR }
+              }
+            )
+          end
+        end
+      end %>
+  <% end %>
+<% end %>

app/components/work_package_relations_tab/add_work_package_child_form_component.rb

@@ -0,0 +1,52 @@
+# 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 WorkPackageRelationsTab::AddWorkPackageChildFormComponent < ApplicationComponent
+  include ApplicationHelper
+  include OpTurbo::Streamable
+  include OpPrimer::ComponentHelpers
+
+  DIALOG_ID = "add-work-package-child-dialog"
+  FORM_ID = "add-work-package-child-form"
+  ID_FIELD_TEST_SELECTOR = "work-package-child-form-id"
+  I18N_NAMESPACE = "work_package_relations_tab"
+
+  def initialize(work_package:, base_errors: nil)
+    super()
+
+    @work_package = work_package
+    @base_errors = base_errors
+  end
+
+  def submit_url_options
+    { method: :post,
+      url: work_package_children_path(@work_package) }
+  end
+end

app/components/work_package_relations_tab/index_component.html.erb

@@ -0,0 +1,103 @@
+<%= component_wrapper(tag: "turbo-frame") do %>
+  <%=
+    if should_render_create_button?
+      flex_layout(justify_content: :space_between, mb: 4) do |action_bar|
+        action_bar.with_column do
+          render(Primer::Beta::Text.new(color: :muted)) do
+            t("#{I18N_NAMESPACE}.index.action_bar_title")
+          end
+        end
+
+        # Prevent the menu from overflowing on Safari
+        action_bar.with_column(flex_shrink: 0) do
+          render(Primer::Alpha::ActionMenu.new(test_selector: NEW_RELATION_ACTION_MENU,
+                                               menu_id: NEW_RELATION_ACTION_MENU)) do |menu|
+            menu.with_show_button do |button|
+              button.with_leading_visual_icon(icon: :"plus")
+              button.with_trailing_action_icon(icon: :"triangle-down")
+              t(:label_relation)
+            end
+
+            if should_render_add_relations?
+              Relation::TYPES.each do |relation_type, type_configuration_hash|
+                label_key = "#{I18N_NAMESPACE}.relations.#{type_configuration_hash[:name]}_singular"
+                menu.with_item(
+                  label: t(label_key).capitalize,
+                  href: new_relation_path(relation_type:),
+                  test_selector: new_button_test_selector(relation_type:),
+                  content_arguments: {
+                    data: { turbo_stream: true }
+                  }
+                ) do |item|
+                  item.with_description.with_content(t("#{I18N_NAMESPACE}.relations.#{relation_type}_description"))
+                end
+              end
+            end
+
+            if should_render_add_child?
+              menu.with_item(
+                label: t("#{I18N_NAMESPACE}.relations.label_child_singular").capitalize,
+                href: new_work_package_child_path(@work_package),
+                test_selector: new_button_test_selector(relation_type: :child),
+                content_arguments: {
+                  data: { turbo_stream: true }
+                }
+              ) do |item|
+                item.with_description.with_content(t("#{I18N_NAMESPACE}.relations.child_description"))
+              end
+            end
+          end
+        end
+      end
+    end
+  %>
+
+  <%=
+    flex_layout(mb: 3) do |flex|
+      if any_relations?
+        key_namespace = "#{I18N_NAMESPACE}.relations"
+
+        # Relations
+        directionally_aware_grouped_relations.each do |relation_type, relations_of_type|
+          base_key = "#{key_namespace}.label_#{relation_type}"
+
+          flex.with_row(mb: 4) do
+            render_relation_group(
+              title: t("#{base_key}_plural").capitalize,
+              relation_type:,
+              items: relations_of_type
+            ) do |relation|
+              render(WorkPackageRelationsTab::RelationComponent.new(work_package:,
+                                                                    relation:))
+            end
+          end
+        end
+
+        # Children
+        if children.any?
+          base_key = "#{key_namespace}.label_child"
+
+          flex.with_row do
+            render_relation_group(
+              title: t("#{base_key}_plural").capitalize,
+              relation_type: :children,
+              items: children
+            ) do |child|
+              render(WorkPackageRelationsTab::RelationComponent.new(work_package:,
+                                                                    relation: nil,
+                                                                    child:))
+            end
+          end
+        end
+      else
+        flex.with_row do
+          render Primer::Beta::Blankslate.new(border: true) do |component|
+            component.with_visual_icon(icon: "package-dependents")
+            component.with_heading(tag: :h4).with_content(t("#{I18N_NAMESPACE}.index.blankslate_heading"))
+            component.with_description { t("#{I18N_NAMESPACE}.index.blankslate_description") }
+          end
+        end
+      end
+    end
+  %>
+<% end %>