Merge branch 'dev' into dependabot/bundler/dev/googleauth-1.15.0

Author: klaustopher

.pkgr.yml

@@ -7,6 +7,7 @@ license: "GPL"
 targets:
   debian-11: &debian
     build_dependencies:
+      - wget
       - libsqlite3-dev
     dependencies:
       - unzip
@@ -39,7 +40,7 @@ targets:
 before_precompile: "packaging/setup"
 after_precompile: "packaging/teardown"
 services:
-  - postgres
+  - postgres:17
 installer: https://github.com/pkgr/installer.git
 wizards:
   - https://github.com/pkgr/addon-legacy-installer.git

app/components/work_packages/info_line_component.html.erb

@@ -1,5 +1,5 @@
 <%=
-  flex_layout do |flex|
+  flex_layout(flex_wrap: :wrap) do |flex|
     flex.with_column(mr: 2) do
       render(WorkPackages::HighlightedTypeComponent.new(work_package: @work_package, font_size: :small))
     end

app/contracts/custom_fields/hierarchy/insert_item_contract.rb renamed to app/contracts/custom_fields/hierarchy/insert_list_item_contract.rb

@@ -23,14 +23,14 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
 module CustomFields
   module Hierarchy
-    class InsertItemContract < Dry::Validation::Contract
+    class InsertListItemContract < Dry::Validation::Contract
       config.messages.backend = :i18n
 
       params do

app/contracts/custom_fields/hierarchy/insert_scored_item_contract.rb

@@ -0,0 +1,55 @@
+# 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.
+#++
+
+module CustomFields
+  module Hierarchy
+    class InsertScoredItemContract < Dry::Validation::Contract
+      config.messages.backend = :i18n
+
+      params do
+        required(:parent).filled(type?: CustomField::Hierarchy::Item)
+        required(:label).filled(:string)
+        required(:score).filled(:decimal)
+      end
+
+      rule(:parent) do
+        next if schema_error?(:parent)
+
+        key.failure("must exist") unless value.persisted?
+      end
+
+      rule(:label) do
+        next if schema_error?(:parent)
+
+        key.failure(:not_unique) if values[:parent].children.exists?(label: value)
+      end
+    end
+  end
+end

app/contracts/custom_fields/hierarchy/update_item_contract.rb renamed to app/contracts/custom_fields/hierarchy/update_list_item_contract.rb

@@ -23,14 +23,14 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
 module CustomFields
   module Hierarchy
-    class UpdateItemContract < Dry::Validation::Contract
+    class UpdateListItemContract < Dry::Validation::Contract
       config.messages.backend = :i18n
 
       params do

app/contracts/custom_fields/hierarchy/update_scored_item_contract.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.
+#++
+
+module CustomFields
+  module Hierarchy
+    class UpdateScoredItemContract < Dry::Validation::Contract
+      config.messages.backend = :i18n
+
+      params do
+        required(:item).filled(type?: CustomField::Hierarchy::Item)
+        optional(:label).filled(:string)
+        optional(:score).filled(:decimal)
+      end
+
+      rule(:item) do
+        key.failure(:not_persisted) if value.new_record?
+        key.failure(:root_item) if value.root?
+      end
+
+      rule(:label) do
+        next if schema_error?(:item)
+
+        key.failure(:not_unique) if values[:item].siblings.exists?(label: value)
+      end
+    end
+  end
+end

app/controllers/admin/custom_fields/hierarchy/items_controller.rb

@@ -23,7 +23,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # See COPYRIGHT and LICENSE files for more details.
 #++
@@ -62,7 +62,7 @@ def edit; end
 
         def create
           item_service
-            .insert_item(**item_input)
+            .insert_item(contract_class: create_contract, **item_input)
             .either(
               lambda do |item|
                 redirect_to(
@@ -78,8 +78,13 @@ def create
         end
 
         def update
+          input = item_input
           item_service
-            .update_item(item: @active_item, label: item_input[:label], short: item_input[:short])
+            .update_item(contract_class: update_contract,
+                         item: @active_item,
+                         label: input[:label],
+                         short: input[:short],
+                         score: input[:score])
             .either(
               lambda do |_|
                 redirect_to(custom_field_item_path(@custom_field, @active_item.parent), status: :see_other)
@@ -119,14 +124,37 @@ def item_service
           ::CustomFields::Hierarchy::HierarchicalItemService.new
         end
 
-        def item_input
+        def item_input # rubocop:disable Metrics/AbcSize
           input = { parent: @active_item, label: params[:label] }
           input[:short] = params[:short] if params[:short].present?
+          input[:score] = params[:score] if params[:score].present?
           input[:sort_order] = params[:sort_order].to_i if params[:sort_order].present?
 
           input
         end
 
+        def create_contract
+          case @custom_field.field_format
+          when "hierarchy"
+            ::CustomFields::Hierarchy::InsertListItemContract
+          when "scored_list"
+            ::CustomFields::Hierarchy::InsertScoredItemContract
+          else
+            raise ArgumentError, "unsupported custom field format '#{@custom_field.field_format}'"
+          end
+        end
+
+        def update_contract
+          case @custom_field.field_format
+          when "hierarchy"
+            ::CustomFields::Hierarchy::UpdateListItemContract
+          when "scored_list"
+            ::CustomFields::Hierarchy::UpdateScoredItemContract
+          else
+            raise ArgumentError, "unsupported custom field format '#{@custom_field.field_format}'"
+          end
+        end
+
         def add_errors_to_form(validation_result)
           @new_item = ::CustomField::Hierarchy::Item.new(**item_input)
           validation_result.errors(full: true).to_h.each do |attribute, errors|
@@ -135,7 +163,7 @@ def add_errors_to_form(validation_result)
         end
 
         def add_errors_to_edit_form(validation_result)
-          @active_item.assign_attributes(**validation_result.to_h.slice(:label, :short))
+          @active_item.assign_attributes(**validation_result.to_h.slice(:label, :short, :score))
 
           validation_result.errors(full: true).to_h.each do |attribute, errors|
             @active_item.errors.add(attribute, errors.join(", "))

app/controllers/custom_styles_controller.rb

@@ -35,9 +35,6 @@ class CustomStylesController < ApplicationController
   menu_item :custom_style
 
   UNGUARDED_ACTIONS = %i[logo_download
-                         export_logo_download
-                         export_cover_download
-                         export_footer_download
                          favicon_download
                          touch_icon_download].freeze
 
@@ -76,6 +73,7 @@ def create
   end
 
   def update
+    flash.clear
     @custom_style = get_or_create_custom_style
     if @custom_style.update(custom_style_params)
       redirect_to custom_style_path
@@ -141,6 +139,22 @@ def favicon_delete
     file_delete(:remove_favicon)
   end
 
+  def export_font_regular_delete
+    file_delete(:remove_export_font_regular)
+  end
+
+  def export_font_bold_delete
+    file_delete(:remove_export_font_bold)
+  end
+
+  def export_font_italic_delete
+    file_delete(:remove_export_font_italic)
+  end
+
+  def export_font_bold_italic_delete
+    file_delete(:remove_export_font_bold_italic)
+  end
+
   def touch_icon_delete
     file_delete(:remove_touch_icon)
   end
@@ -171,6 +185,19 @@ def update_themes
     redirect_to custom_style_path
   end
 
+  def export_demo_pdf_download
+    result = ::Exports::PDF::DemoGenerator.new.export!
+    expires_in 0, public: false
+    send_data result.content,
+              filename: result.title,
+              type: "application/pdf",
+              disposition: "inline"
+  rescue StandardError => e
+    Rails.logger.error "Failed to generate demo PDF: #{e.message}"
+    flash[:error] = e.message
+    redirect_to custom_style_path
+  end
+
   private
 
   def theme_from_params
@@ -192,13 +219,19 @@ def get_or_create_custom_style
   end
 
   def custom_style_params
-    params.expect(custom_style: %i[logo remove_logo
-                                   export_logo remove_export_logo
-                                   export_cover remove_export_cover
-                                   export_cover_text_color
-                                   export_footer remove_export_footer
-                                   favicon remove_favicon
-                                   touch_icon remove_touch_icon])
+    params.expect(custom_style: %i[
+                    logo remove_logo
+                    export_logo remove_export_logo
+                    export_cover remove_export_cover
+                    export_footer remove_export_footer
+                    favicon remove_favicon
+                    touch_icon remove_touch_icon
+                    export_font_regular remove_export_font_regular
+                    export_font_bold remove_export_font_bold
+                    export_font_italic remove_export_font_italic
+                    export_font_bold_italic remove_export_font_bold_italic
+                    export_cover_text_color
+                  ])
   end
 
   def file_download(path_method)

app/forms/custom_fields/hierarchy/item_form.rb

@@ -23,7 +23,7 @@
 #
 # 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.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # See COPYRIGHT and LICENSE files for more details.
 #++
@@ -98,6 +98,7 @@ def score_input_field(form_group)
           name: :score,
           label: I18n.t("custom_fields.admin.items.placeholder.score"),
           type: :number,
+          step: :any,
           value: @target_item.score,
           visually_hide_label: true,
           full_width: false,

app/helpers/custom_styles_helper.rb

@@ -56,6 +56,13 @@ def design_tabs
         path: custom_style_path(tab: :pdf_export_styles),
         label: t(:"admin.custom_styles.tab_pdf_export_styles"),
         pdf: true
+      },
+      {
+        name: "pdf_export_font",
+        partial: "custom_styles/pdf_export_font",
+        path: custom_style_path(tab: :pdf_export_font),
+        label: t(:"admin.custom_styles.tab_pdf_export_font"),
+        pdf: true
       }
     ]
   end
@@ -80,4 +87,19 @@ def apply_custom_favicon?
   def apply_custom_touch_icon?
     apply_custom_styles?(skip_ee_check: false) && CustomStyle.current.touch_icon.present?
   end
+
+  def export_fonts_fields(custom_style)
+    %i[regular bold italic bold_italic].map do |variant|
+      field = :"export_font_#{variant}"
+      font = custom_style.public_send(field)
+      {
+        field: field,
+        label: I18n.t("label_custom_export_font_#{variant}"),
+        present: font.present?,
+        filename: custom_style.id && font.present? ? File.basename(font.file.path) : nil,
+        delete_path: public_send(:"custom_style_export_font_#{variant}_delete_path"),
+        instructions: I18n.t("text_custom_export_font_#{variant}_instructions")
+      }
+    end
+  end
 end