Release OpenProject 16.6.1

Author: ulferts

.github/workflows/docker-scheduled.yml

@@ -7,23 +7,17 @@ on:
   workflow_dispatch: # Allow manual trigger
 
 jobs:
-  generate-matrix:
-    runs-on: ubuntu-latest
-    outputs:
-      matrix: ${{ steps.set-matrix.outputs.matrix }}
-    steps:
-      - uses: actions/checkout@v5
-      - name: Generate matrix
-        id: set-matrix
-        run: ruby script/gh/docker-tags.rb --matrix
-
-  build:
-    needs: generate-matrix
-    strategy:
-      matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
-      fail-fast: false
+  build-dev:
     uses: ./.github/workflows/docker.yml
     with:
-      branch: ${{ matrix.branch }}
-      tag: ${{ matrix.tag }}
-    secrets: inherit
+      branch: dev
+      tag: dev
+    secrets: inherit
+  build-release-candidate:
+    # References to release/X.Y and X.Y-rc are being
+    # updated from the devkit (UpdateWorkflows step) whenever a new release branch is created
+    uses: opf/openproject/.github/workflows/docker.yml@release/16.6
+    with:
+      branch: release/16.6
+      tag: 16.6-rc
+    secrets: inherit

app/components/admin/custom_fields/hierarchy/change_item_parent_dialog_component.rb

@@ -50,7 +50,7 @@ def form_id = "custom-fields--change-item-parent-form"
         def form_arguments
           {
             id: form_id,
-            url: change_parent_custom_field_item_path(custom_field_id: @custom_field.id, id: @hierarchy_item.id),
+            url:,
             model: form_model,
             method: :post
           }
@@ -65,6 +65,15 @@ def hierarchy_service
         def form_model
           CustomField::Hierarchy::Forms::NewParentFormModel.new(new_parent: [])
         end
+
+        def url
+          if @custom_field.is_a?(ProjectCustomField)
+            change_parent_admin_settings_project_custom_field_item_path(project_custom_field_id: @custom_field.id,
+                                                                        id: @hierarchy_item.id)
+          else
+            change_parent_custom_field_item_path(custom_field_id: @custom_field.id, id: @hierarchy_item.id)
+          end
+        end
       end
     end
   end

app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.rb

@@ -44,10 +44,21 @@ def initialize(custom_field:, hierarchy_item:)
 
         def form_arguments
           {
-            action: custom_field_item_path(custom_field_id: @custom_field.id, id: @hierarchy_item.id),
+            action: url,
             method: :delete
           }
         end
+
+        private
+
+        def url
+          if @custom_field.is_a?(ProjectCustomField)
+            admin_settings_project_custom_field_item_path(project_custom_field_id: @custom_field.id,
+                                                          id: @hierarchy_item.id)
+          else
+            custom_field_item_path(custom_field_id: @custom_field.id, id: @hierarchy_item.id)
+          end
+        end
       end
     end
   end

app/components/admin/custom_fields/hierarchy/item_component.html.erb

@@ -38,7 +38,7 @@ See COPYRIGHT and LICENSE files for more details.
             render(Primer::OpenProject::DragHandle.new(draggable: true))
           end
           item_information.with_column(mr: 2) do
-            render(Primer::Beta::Link.new(href: custom_field_item_path(@root.custom_field_id, model), underline: false)) do
+            render(Primer::Beta::Link.new(href: item_link, underline: false)) do
               render(Primer::Beta::Text.new(font_weight: :bold)) { model.label }
             end
           end

app/components/admin/custom_fields/hierarchy/item_component.rb

@@ -49,6 +49,16 @@ def short_text
           "(#{model.short})"
         end
 
+        def item_link
+          custom_field = @root.custom_field
+
+          if project_custom_field_context?
+            admin_settings_project_custom_field_item_path(custom_field.id, model)
+          else
+            custom_field_item_path(custom_field.id, model)
+          end
+        end
+
         def secondary_text
           if model.short.present?
             "(#{model.short})"
@@ -98,58 +108,102 @@ def menu_items(menu) # rubocop:disable Metrics/AbcSize
 
         private
 
+        def project_custom_field_context?
+          @root.custom_field.is_a?(ProjectCustomField)
+        end
+
+        def custom_field_id = @root.custom_field_id
+
         def edit_action_item(menu)
-          menu.with_item(label: I18n.t(:button_edit),
-                         tag: :a,
-                         href: edit_custom_field_item_path(@root.custom_field_id, model)) do |item|
+          href = if project_custom_field_context?
+                   edit_admin_settings_project_custom_field_item_path(custom_field_id, model)
+                 else
+                   edit_custom_field_item_path(custom_field_id, model)
+                 end
+
+          menu.with_item(label: I18n.t(:button_edit), tag: :a, href:) do |item|
             item.with_leading_visual_icon(icon: :pencil)
           end
         end
 
         def add_above_action_item(menu)
+          parent = model.parent
+          position = model.sort_order
+          href = if project_custom_field_context?
+                   new_child_admin_settings_project_custom_field_item_path(custom_field_id, parent, position:)
+                 else
+                   new_child_custom_field_item_path(custom_field_id, parent, position:)
+                 end
+
           menu.with_item(
             label: I18n.t(:button_add_item_above),
             tag: :a,
-            content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } },
-            href: new_child_custom_field_item_path(@root.custom_field_id, model.parent, position: model.sort_order)
+            href:,
+            content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } }
           ) { it.with_leading_visual_icon(icon: "fold-up") }
         end
 
         def add_below_action_item(menu)
+          parent = model.parent
+          position = model.sort_order + 1
+          href = if project_custom_field_context?
+                   new_child_admin_settings_project_custom_field_item_path(custom_field_id, parent, position:)
+                 else
+                   new_child_custom_field_item_path(custom_field_id, parent, position:)
+                 end
+
           menu.with_item(
             label: I18n.t(:button_add_item_below),
             tag: :a,
-            content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } },
-            href: new_child_custom_field_item_path(@root.custom_field_id, model.parent, position: model.sort_order + 1)
+            href:,
+            content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } }
           ) { it.with_leading_visual_icon(icon: "fold-down") }
         end
 
         def add_sub_item_action_item(menu)
-          position = model.children.any? ? model.children.maximum(:sort_order) + 1 : 0
+          children = model.children
+          position = children.any? ? children.maximum(:sort_order) + 1 : 0
+          href = if project_custom_field_context?
+                   new_child_admin_settings_project_custom_field_item_path(custom_field_id, model, position:)
+                 else
+                   new_child_custom_field_item_path(custom_field_id, model, position:)
+                 end
 
           menu.with_item(
             label: I18n.t(:button_add_sub_item),
             tag: :a,
-            content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } },
-            href: new_child_custom_field_item_path(@root.custom_field_id, model, position:)
+            href:,
+            content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } }
           ) { it.with_leading_visual_icon(icon: "op-arrow-in") }
         end
 
         def change_parent_item(menu)
+          href = if project_custom_field_context?
+                   change_parent_admin_settings_project_custom_field_item_path(project_custom_field_id: custom_field_id,
+                                                                               id: model.id)
+                 else
+                   change_parent_custom_field_item_path(custom_field_id:, id: model.id)
+                 end
+
           menu.with_item(
             label: I18n.t(:label_change_parent),
             tag: :a,
-            content_arguments: { data: { controller: "async-dialog" } },
-            href: change_parent_custom_field_item_path(custom_field_id: @root.custom_field_id, id: model.id)
+            href:,
+            content_arguments: { data: { controller: "async-dialog" } }
           ) { it.with_leading_visual_icon(icon: "arrow-switch") }
         end
 
         def move_to_top_action_item(menu)
           form_inputs = [{ name: "new_sort_order", value: 0 }]
+          href = if project_custom_field_context?
+                   move_admin_settings_project_custom_field_item_path(custom_field_id, model)
+                 else
+                   move_custom_field_item_path(custom_field_id, model)
+                 end
 
           menu.with_item(label: I18n.t(:label_sort_highest),
                          tag: :button,
-                         href: move_custom_field_item_path(@root.custom_field_id, model),
+                         href:,
                          content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } },
                          form_arguments: { method: :post, inputs: form_inputs }) do |item|
             item.with_leading_visual_icon(icon: "move-to-top")
@@ -158,10 +212,15 @@ def move_to_top_action_item(menu)
 
         def move_up_action_item(menu)
           form_inputs = [{ name: "new_sort_order", value: model.sort_order - 1 }]
+          href = if project_custom_field_context?
+                   move_admin_settings_project_custom_field_item_path(custom_field_id, model)
+                 else
+                   move_custom_field_item_path(custom_field_id, model)
+                 end
 
           menu.with_item(label: I18n.t(:label_sort_higher),
                          tag: :button,
-                         href: move_custom_field_item_path(@root.custom_field_id, model),
+                         href:,
                          content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } },
                          form_arguments: { method: :post, inputs: form_inputs }) do |item|
             item.with_leading_visual_icon(icon: "chevron-up")
@@ -170,10 +229,15 @@ def move_up_action_item(menu)
 
         def move_down_action_item(menu)
           form_inputs = [{ name: "new_sort_order", value: model.sort_order + 2 }]
+          href = if project_custom_field_context?
+                   move_admin_settings_project_custom_field_item_path(custom_field_id, model)
+                 else
+                   move_custom_field_item_path(custom_field_id, model)
+                 end
 
           menu.with_item(label: I18n.t(:label_sort_lower),
                          tag: :button,
-                         href: move_custom_field_item_path(@root.custom_field_id, model),
+                         href:,
                          content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } },
                          form_arguments: { method: :post, inputs: form_inputs }) do |item|
             item.with_leading_visual_icon(icon: "chevron-down")
@@ -182,21 +246,33 @@ def move_down_action_item(menu)
 
         def move_to_bottom_action_item(menu)
           form_inputs = [{ name: "new_sort_order", value: model.parent.children.length + 1 }]
+          href = if project_custom_field_context?
+                   move_admin_settings_project_custom_field_item_path(custom_field_id, model)
+                 else
+                   move_custom_field_item_path(custom_field_id, model)
+                 end
 
           menu.with_item(label: I18n.t(:label_sort_lowest),
                          tag: :button,
-                         href: move_custom_field_item_path(@root.custom_field_id, model),
+                         href:,
                          content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } },
                          form_arguments: { method: :post, inputs: form_inputs }) do |item|
             item.with_leading_visual_icon(icon: "move-to-bottom")
           end
         end
 
         def deletion_action_item(menu)
+          href = if project_custom_field_context?
+                   delete_admin_settings_project_custom_field_item_path(project_custom_field_id: custom_field_id,
+                                                                        id: model.id)
+                 else
+                   delete_custom_field_item_path(custom_field_id:, id: model.id)
+                 end
+
           menu.with_item(label: I18n.t(:button_delete),
                          scheme: :danger,
                          tag: :a,
-                         href: delete_custom_field_item_path(custom_field_id: @root.custom_field_id, id: model.id),
+                         href:,
                          content_arguments: { data: { controller: "async-dialog" } }) do |item|
             item.with_leading_visual_icon(icon: :trash)
           end

app/components/admin/custom_fields/hierarchy/item_form_component.rb

@@ -46,15 +46,7 @@ def item_options
         end
 
         def http_verb
-          model.new_record? ? :post : :put
-        end
-
-        def url
-          if model.new_record?
-            new_child_custom_field_item_path(root.custom_field_id, model.parent, position: model.sort_order)
-          else
-            custom_field_item_path(root.custom_field_id, model)
-          end
+          new_record? ? :post : :put
         end
 
         def secondary_input_format
@@ -72,7 +64,31 @@ def secondary_input_format
         private
 
         def root
-          @root ||= model.new_record? ? model.parent.root : model.root
+          @root ||= new_record? ? model.parent.root : model.root
+        end
+
+        def project_custom_field_context?
+          root.custom_field.is_a?(ProjectCustomField)
+        end
+
+        def new_record? = model.new_record?
+
+        def custom_field_id = root.custom_field_id
+
+        def url # rubocop:disable Metrics/AbcSize
+          parent = model.parent
+          position = model.sort_order
+          if project_custom_field_context?
+            if new_record?
+              new_child_admin_settings_project_custom_field_item_path(custom_field_id, parent, position:)
+            else
+              admin_settings_project_custom_field_item_path(custom_field_id, model)
+            end
+          elsif new_record?
+            new_child_custom_field_item_path(custom_field_id, parent, position:)
+          else
+            custom_field_item_path(custom_field_id, model)
+          end
         end
       end
     end

app/components/admin/custom_fields/hierarchy/items_component.rb

@@ -46,8 +46,13 @@ def root
 
         def new_item_path
           position = model.children.any? ? model.children.last.sort_order + 1 : 0
+          custom_field_id = root.custom_field_id
 
-          new_child_custom_field_item_path(root.custom_field_id, model, position:)
+          if project_custom_field_context?
+            new_child_admin_settings_project_custom_field_item_path(custom_field_id, model, position:)
+          else
+            new_child_custom_field_item_path(custom_field_id, model, position:)
+          end
         end
 
         def children
@@ -89,14 +94,28 @@ def blank_description_text
 
         private
 
-        def slices
-          nodes = ::CustomFields::Hierarchy::HierarchicalItemService.new.get_branch(item: model).value!
+        def project_custom_field_context?
+          root.custom_field.is_a?(ProjectCustomField)
+        end
+
+        def branch(item)
+          ::CustomFields::Hierarchy::HierarchicalItemService.new.get_branch(item:).value!
+        end
+
+        def slices # rubocop:disable Metrics/AbcSize
+          custom_field = root.custom_field
 
-          nodes.map do |item|
-            if item.root?
-              { href: custom_field_items_path(root.custom_field_id), label: root.custom_field.name }
+          branch(model).map do |item|
+            if project_custom_field_context?
+              if item.root?
+                { href: admin_settings_project_custom_field_items_path(custom_field.id), label: custom_field.name }
+              else
+                { href: admin_settings_project_custom_field_item_path(custom_field.id, item), label: item.label }
+              end
+            elsif item.root?
+              { href: custom_field_items_path(custom_field.id), label: custom_field.name }
             else
-              { href: custom_field_item_path(root.custom_field_id, item), label: item.label }
+              { href: custom_field_item_path(custom_field.id, item), label: item.label }
             end
           end
         end