<% end -%>
diff --git a/app/components/activities/item_component.html.erb b/app/components/activities/item_component.html.erb
index ba689f97991..00520787386 100644
--- a/app/components/activities/item_component.html.erb
+++ b/app/components/activities/item_component.html.erb
@@ -37,19 +37,21 @@ See COPYRIGHT and LICENSE files for more details.
<%= project_suffix %>
diff --git a/app/components/activities/item_subtitle_component.html.erb b/app/components/activities/item_subtitle_component.html.erb
index 05b60d4a1af..0016a82667a 100644
--- a/app/components/activities/item_subtitle_component.html.erb
+++ b/app/components/activities/item_subtitle_component.html.erb
@@ -29,7 +29,8 @@ See COPYRIGHT and LICENSE files for more details.
<%=
- I18n.t(i18n_key,
+ I18n.t(
+ i18n_key,
user: user_html,
datetime: datetime_html
).html_safe
diff --git a/app/components/add_button_component.html.erb b/app/components/add_button_component.html.erb
index 179a0cf8998..88aec27eada 100644
--- a/app/components/add_button_component.html.erb
+++ b/app/components/add_button_component.html.erb
@@ -1,11 +1,14 @@
-<%= render(Primer::ButtonComponent.new(scheme: :primary,
- aria: { label: aria_label },
- title:,
- test_selector:,
- tag: :a,
- id:,
- href: dynamic_path) ) do |button|
- button.with_leading_visual_icon(icon: :plus)
- label_text
-end
-%>
+<%= render(
+ Primer::ButtonComponent.new(
+ scheme: :primary,
+ aria: { label: aria_label },
+ title:,
+ test_selector:,
+ tag: :a,
+ id:,
+ href: dynamic_path
+ )
+ ) do |button|
+ button.with_leading_visual_icon(icon: :plus)
+ label_text
+ end %>
diff --git a/app/components/admin/attachments_settings_header_component.html.erb b/app/components/admin/attachments_settings_header_component.html.erb
index a264231f9aa..65260b6688a 100644
--- a/app/components/admin/attachments_settings_header_component.html.erb
+++ b/app/components/admin/attachments_settings_header_component.html.erb
@@ -30,22 +30,24 @@ See COPYRIGHT and LICENSE files for more details.
<% helpers.html_title t(:label_administration), @title %>
<%= render(Primer::OpenProject::PageHeader.new) do |header|
- header.with_title { t(:"attributes.attachments") }
- header.with_breadcrumbs([{ href: admin_index_path, text: t("label_administration") },
- { href: admin_settings_storages_path, text: t("project_module_storages") },
- t(:"attributes.attachments")])
- header.with_tab_nav(label: nil) do |tab_nav|
- tab_nav.with_tab(selected: @selected == 1, href: admin_settings_attachments_path) do |tab|
- tab.with_text { t("settings.general") }
- end
- tab_nav.with_tab(selected: @selected == 2, href: admin_settings_virus_scanning_path) do |tab|
- tab.with_icon(icon: :"op-enterprise-addons") unless EnterpriseToken.allows_to?("virus_scanning")
- tab.with_text { t(:"settings.antivirus.title") }
- end
- if User.current.admin? && (EnterpriseToken.allows_to?(:virus_scanning) || Attachment.status_quarantined.any?)
- tab_nav.with_tab(selected: @selected == 3, href: admin_quarantined_attachments_path) do |tab|
- tab.with_text { t(:"antivirus_scan.quarantined_attachments.title") }
+ header.with_title { t(:"attributes.attachments") }
+ header.with_breadcrumbs(
+ [{ href: admin_index_path, text: t("label_administration") },
+ { href: admin_settings_storages_path, text: t("project_module_storages") },
+ t(:"attributes.attachments")]
+ )
+ header.with_tab_nav(label: nil) do |tab_nav|
+ tab_nav.with_tab(selected: @selected == 1, href: admin_settings_attachments_path) do |tab|
+ tab.with_text { t("settings.general") }
+ end
+ tab_nav.with_tab(selected: @selected == 2, href: admin_settings_virus_scanning_path) do |tab|
+ tab.with_icon(icon: :"op-enterprise-addons") unless EnterpriseToken.allows_to?("virus_scanning")
+ tab.with_text { t(:"settings.antivirus.title") }
+ end
+ if User.current.admin? && (EnterpriseToken.allows_to?(:virus_scanning) || Attachment.status_quarantined.any?)
+ tab_nav.with_tab(selected: @selected == 3, href: admin_quarantined_attachments_path) do |tab|
+ tab.with_text { t(:"antivirus_scan.quarantined_attachments.title") }
+ end
+ end
end
- end
- end
-end %>
+ end %>
diff --git a/app/components/admin/backups/show_page_header_component.html.erb b/app/components/admin/backups/show_page_header_component.html.erb
index 4b1ddcd8bca..299bdb8e72e 100644
--- a/app/components/admin/backups/show_page_header_component.html.erb
+++ b/app/components/admin/backups/show_page_header_component.html.erb
@@ -29,34 +29,40 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render(Primer::OpenProject::PageHeader.new) do |header|
header.with_title { t(:label_backup) }
- header.with_breadcrumbs([{ href: admin_index_path, text: t(:label_administration) },
- t(:label_backup)])
+ header.with_breadcrumbs(
+ [{ href: admin_index_path, text: t(:label_administration) },
+ t(:label_backup)]
+ )
- header.with_action_button(tag: :a,
- scheme: button_scheme,
- mobile_label: button_title,
- mobile_icon: button_icon,
- size: :medium,
- href: reset_token_admin_backups_path,
- aria: { label: button_title },
- title: button_title) do |button|
+ header.with_action_button(
+ tag: :a,
+ scheme: button_scheme,
+ mobile_label: button_title,
+ mobile_icon: button_icon,
+ size: :medium,
+ href: reset_token_admin_backups_path,
+ aria: { label: button_title },
+ title: button_title
+ ) do |button|
button.with_leading_visual_icon(icon: button_icon)
button_title
end
if @backup_token.present?
- header.with_action_button(tag: :a,
- scheme: :danger,
- mobile_icon: :trash,
- mobile_label: t("backup.label_delete_token"),
- size: :medium,
- href: delete_token_admin_backups_path,
- aria: { label: I18n.t("backup.label_delete_token") },
- data: {
- confirm: I18n.t(:text_are_you_sure),
- method: :post
- },
- title: I18n.t(:button_delete)) do |button|
+ header.with_action_button(
+ tag: :a,
+ scheme: :danger,
+ mobile_icon: :trash,
+ mobile_label: t("backup.label_delete_token"),
+ size: :medium,
+ href: delete_token_admin_backups_path,
+ aria: { label: I18n.t("backup.label_delete_token") },
+ data: {
+ confirm: I18n.t(:text_are_you_sure),
+ method: :post
+ },
+ title: I18n.t(:button_delete)
+ ) do |button|
button.with_leading_visual_icon(icon: :trash)
t("backup.label_delete_token")
end
diff --git a/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_form_modal_component.html.erb b/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_form_modal_component.html.erb
index a7596230ea1..f23190f45cd 100644
--- a/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_form_modal_component.html.erb
+++ b/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_form_modal_component.html.erb
@@ -30,22 +30,28 @@ See COPYRIGHT and LICENSE files for more details.
<%=
component_wrapper do
primer_form_with(
- model: ,
+ model:,
url:,
data: { turbo: true },
method: :post
) do |form|
- concat(render(Primer::Alpha::Dialog::Body.new(
- id: dialog_body_id, test_selector: dialog_body_id, aria: { label: title },
- style: "min-height: 300px"
- )) do
- render(Projects::CustomFields::CustomFieldMappingForm.new(form, project_mapping: @custom_field_project_mapping))
- end)
+ concat(
+ render(
+ Primer::Alpha::Dialog::Body.new(
+ id: dialog_body_id, test_selector: dialog_body_id, aria: { label: title },
+ classes: "Overlay-body_autocomplete_height"
+ )
+ ) do
+ render(Projects::CustomFields::CustomFieldMappingForm.new(form, project_mapping: @custom_field_project_mapping))
+ end
+ )
- concat(render(Primer::Alpha::Dialog::Footer.new(show_divider: false)) do
- concat(render(Primer::ButtonComponent.new(data: { 'close-dialog-id': dialog_id })) { cancel_button_text })
- concat(render(Primer::ButtonComponent.new(scheme: :primary, type: :submit)) { submit_button_text })
- end)
+ concat(
+ render(Primer::Alpha::Dialog::Footer.new(show_divider: false)) do
+ concat(render(Primer::ButtonComponent.new(data: { "close-dialog-id": dialog_id })) { cancel_button_text })
+ concat(render(Primer::ButtonComponent.new(scheme: :primary, type: :submit)) { submit_button_text })
+ end
+ )
end
end
%>
diff --git a/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.html.erb b/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.html.erb
index 6c2d6b0e2b2..3297f3c6dde 100644
--- a/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.html.erb
+++ b/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.html.erb
@@ -28,27 +28,18 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
<%=
- render(Primer::Alpha::Dialog.new(id: DIALOG_ID, title: "Delete item", test_selector: TEST_SELECTOR)) do |dialog|
- dialog.with_header(variant: :large)
- dialog.with_body do
- "Are you sure you want to delete this item from the current hierarchy level?"
- end
-
- dialog.with_footer do
- concat(render(Primer::ButtonComponent.new(data: { "close-dialog-id": DIALOG_ID })) do
- I18n.t(:button_cancel)
- end)
-
- concat(primer_form_with(
- model: @custom_field,
- url: custom_field_item_path(custom_field_id: @custom_field.id, id: @hierarchy_item.id),
- method: :delete,
- data: { turbo: true }
- ) do
- render(Primer::ButtonComponent.new(scheme: :danger, type: :submit, data: { "close-dialog-id": DIALOG_ID })) do
- I18n.t(:button_delete)
- end
- end)
+ render(
+ Primer::OpenProject::DangerDialog.new(
+ title: I18n.t("custom_fields.admin.items.delete_dialog.title"),
+ form_arguments:,
+ size: :large,
+ test_selector: TEST_SELECTOR
+ )
+ ) do |dialog|
+ dialog.with_confirmation_message do |message|
+ message.with_heading(tag: :h2) { I18n.t("custom_fields.admin.items.delete_dialog.heading") }
+ message.with_description_content(I18n.t("custom_fields.admin.items.delete_dialog.description"))
end
+ dialog.with_confirmation_check_box_content(I18n.t(:text_permanent_delete_confirmation_checkbox_label))
end
%>
diff --git a/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.rb b/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.rb
index 851116a4ee4..ce3a9ac0b73 100644
--- a/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.rb
+++ b/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.rb
@@ -34,7 +34,6 @@ module Admin
class DeleteItemDialogComponent < ApplicationComponent
include OpTurbo::Streamable
- DIALOG_ID = "op-hierarchy-item--deletion-confirmation"
TEST_SELECTOR = "op-custom-fields--delete-item-dialog"
def initialize(custom_field:, hierarchy_item:)
@@ -42,6 +41,13 @@ module Admin
@custom_field = custom_field
@hierarchy_item = hierarchy_item
end
+
+ def form_arguments
+ {
+ action: custom_field_item_path(custom_field_id: @custom_field.id, id: @hierarchy_item.id),
+ method: :delete
+ }
+ end
end
end
end
diff --git a/app/components/admin/custom_fields/hierarchy/item_component.html.erb b/app/components/admin/custom_fields/hierarchy/item_component.html.erb
index 80f2b831b8f..4a6973a1295 100644
--- a/app/components/admin/custom_fields/hierarchy/item_component.html.erb
+++ b/app/components/admin/custom_fields/hierarchy/item_component.html.erb
@@ -58,9 +58,11 @@ See COPYRIGHT and LICENSE files for more details.
item_container.with_column do
render(Primer::Alpha::ActionMenu.new(test_selector: "op-hierarchy-item--action-menu")) do |menu|
- menu.with_show_button(icon: "kebab-horizontal",
- scheme: :invisible,
- "aria-label": I18n.t("custom_fields.admin.items.actions"))
+ menu.with_show_button(
+ icon: "kebab-horizontal",
+ scheme: :invisible,
+ "aria-label": I18n.t("custom_fields.admin.items.actions")
+ )
menu_items(menu)
end
end
diff --git a/app/components/admin/design_header_component.html.erb b/app/components/admin/design_header_component.html.erb
index 7f2a4ba6c52..5546c157a75 100644
--- a/app/components/admin/design_header_component.html.erb
+++ b/app/components/admin/design_header_component.html.erb
@@ -31,10 +31,12 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render(Primer::OpenProject::PageHeader.new) do |header|
header.with_title { t(:label_custom_style) }
- header.with_breadcrumbs([{ href: admin_index_path, text: t(:label_administration) },
- t(:label_custom_style)])
+ header.with_breadcrumbs(
+ [{ href: admin_index_path, text: t(:label_administration) },
+ t(:label_custom_style)]
+ )
header.with_description { t(:label_custom_style_description) }
-
+
if @tabs.present?
header.with_tab_nav(label: nil) do |tab_nav|
@tabs.each do |tab|
diff --git a/app/components/admin/enumerations/index_component.html.erb b/app/components/admin/enumerations/index_component.html.erb
new file mode 100644
index 00000000000..9145f180e87
--- /dev/null
+++ b/app/components/admin/enumerations/index_component.html.erb
@@ -0,0 +1,37 @@
+<%=
+component_wrapper do
+ flex_layout(data: wrapper_data_attributes) do |flex|
+ flex.with_row do
+ render(Primer::OpenProject::SubHeader.new) do |subheader|
+ subheader.with_action_button(
+ scheme: :primary,
+ tag: :a,
+ href: helpers.url_for(action: :new),
+ test_selector: "add-enumeration-button"
+ ) do |button|
+ button.with_leading_visual_icon(icon: :plus)
+ I18n.t(:button_add)
+ end
+ end
+ end
+
+ flex.with_row do
+ render(border_box_container(data: drop_target_config)) do |component|
+ component.with_header(font_weight: :bold) { enumeration_class.model_name.human(count: :other) }
+
+ if enumerations.empty?
+ component.with_row do
+ render(Primer::Beta::Text.new(color: :subtle)) { t(:no_results_title_text) }
+ end
+ else
+ enumerations.each do |enumeration|
+ component.with_row(test_selector: "enumeration-row-#{enumeration.id}", data: draggable_item_config(enumeration)) do
+ render(item_component_class.new(enumeration: enumeration, max_position: max_position))
+ end
+ end
+ end
+ end
+ end
+ end
+end
+%>
diff --git a/app/components/admin/enumerations/index_component.rb b/app/components/admin/enumerations/index_component.rb
new file mode 100644
index 00000000000..fe4f84d853a
--- /dev/null
+++ b/app/components/admin/enumerations/index_component.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 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 Admin
+ module Enumerations
+ class IndexComponent < ApplicationComponent
+ include ApplicationHelper
+ include OpPrimer::ComponentHelpers
+ include OpTurbo::Streamable
+
+ options :enumerations
+
+ private
+
+ def max_position
+ enumerations.map(&:position).max
+ end
+
+ def wrapper_data_attributes
+ {
+ controller: "generic-drag-and-drop",
+ "application-target": "dynamic"
+ }
+ end
+
+ def drop_target_config
+ {
+ "is-drag-and-drop-target": true,
+ "target-container-accessor": "& > ul",
+ "target-allowed-drag-type": "enumeration"
+ }
+ end
+
+ def draggable_item_config(enumeration)
+ {
+ "draggable-id": enumeration.id,
+ "draggable-type": "enumeration",
+ "drop-url": helpers.url_for(action: :move, id: enumeration.id)
+ }
+ end
+
+ def enumeration_class
+ enumerations.klass
+ end
+
+ def item_component_class
+ ItemComponent
+ end
+ end
+ end
+end
diff --git a/app/components/admin/enumerations/item_component.html.erb b/app/components/admin/enumerations/item_component.html.erb
new file mode 100644
index 00000000000..c61e8d2ba85
--- /dev/null
+++ b/app/components/admin/enumerations/item_component.html.erb
@@ -0,0 +1,41 @@
+<%=
+ component_wrapper do
+ flex_layout(align_items: :center, justify_content: :space_between) do |enumeration_container|
+ enumeration_container.with_column(flex_layout: true) do |enumeration_info|
+ enumeration_info.with_column(mr: 2) do
+ render(Primer::OpenProject::DragHandle.new(draggable: true))
+ end
+
+ if colored?
+ enumeration_info.with_column(mr: 2) do
+ helpers.icon_for_color enumeration.color
+ end
+ end
+
+ enumeration_info.with_column(mr: 2) do
+ render(Primer::Beta::Link.new(href: helpers.url_for(action: :edit, id: enumeration), underline: false)) do
+ render(Primer::Beta::Text.new(font_weight: :bold)) { enumeration.name }
+ end
+ end
+
+ unless enumeration.active?
+ enumeration_info.with_column(mr: 2) do
+ render(Primer::Beta::Text.new(color: :subtle)) { t(:label_inactive) }
+ end
+ end
+ end
+
+ enumeration_container.with_column do
+ render(Primer::Alpha::ActionMenu.new(test_selector: "op-time-entry-acrtivity--action-menu")) do |menu|
+ menu.with_show_button(
+ icon: "kebab-horizontal",
+ scheme: :invisible,
+ "aria-label": "Actions"
+ )
+
+ build_enumeration_menu(menu)
+ end
+ end
+ end
+ end
+%>
diff --git a/app/components/admin/enumerations/item_component.rb b/app/components/admin/enumerations/item_component.rb
new file mode 100644
index 00000000000..28308898c04
--- /dev/null
+++ b/app/components/admin/enumerations/item_component.rb
@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 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 Admin
+ module Enumerations
+ class ItemComponent < ApplicationComponent
+ include ApplicationHelper
+ include OpPrimer::ComponentHelpers
+ include OpTurbo::Streamable
+
+ options :enumeration
+ options :max_position
+
+ delegate :colored?, to: :enumeration
+
+ private
+
+ def wrapper_uniq_by
+ enumeration.id
+ end
+
+ def first_item?
+ enumeration.position == 1
+ end
+
+ def last_item?
+ enumeration.position == max_position
+ end
+
+ def build_enumeration_menu(menu)
+ edit_enumeration(menu)
+ menu.with_divider
+ if !first_item?
+ move_to_top_enumeration(menu)
+ move_up_enumeration(menu)
+ end
+ if !last_item?
+ move_down_enumeration(menu)
+ move_to_bottom_enumeration(menu)
+ end
+ menu.with_divider
+ deletion_enumeration(menu)
+ end
+
+ def edit_enumeration(menu)
+ menu.with_item(label: I18n.t(:button_edit),
+ tag: :a,
+ href: helpers.url_for(action: :edit, id: enumeration)) do |item|
+ item.with_leading_visual_icon(icon: :pencil)
+ end
+ end
+
+ def move_to_top_enumeration(menu)
+ form_inputs = [{ name: "move_to", value: "highest" }]
+
+ menu.with_item(label: I18n.t(:label_sort_highest),
+ tag: :button,
+ href: helpers.url_for(action: :move, id: enumeration),
+ # content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } },
+ form_arguments: { method: :put, inputs: form_inputs }) do |item|
+ item.with_leading_visual_icon(icon: "move-to-top")
+ end
+ end
+
+ def move_up_enumeration(menu)
+ form_inputs = [{ name: "move_to", value: "higher" }]
+
+ menu.with_item(label: I18n.t(:label_sort_higher),
+ tag: :button,
+ href: helpers.url_for(action: :move, id: enumeration),
+ # content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } },
+ form_arguments: { method: :put, inputs: form_inputs }) do |item|
+ item.with_leading_visual_icon(icon: "chevron-up")
+ end
+ end
+
+ def move_down_enumeration(menu)
+ form_inputs = [{ name: "move_to", value: "lower" }]
+
+ menu.with_item(label: I18n.t(:label_sort_lower),
+ tag: :button,
+ href: helpers.url_for(action: :move, id: enumeration),
+ # content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } },
+ form_arguments: { method: :put, inputs: form_inputs }) do |item|
+ item.with_leading_visual_icon(icon: "chevron-down")
+ end
+ end
+
+ def move_to_bottom_enumeration(menu)
+ form_inputs = [{ name: "move_to", value: "lowest" }]
+
+ menu.with_item(label: I18n.t(:label_sort_lowest),
+ tag: :button,
+ href: helpers.url_for(action: :move, id: enumeration),
+ # content_arguments: { data: { turbo_frame: ItemsComponent.wrapper_key } },
+ form_arguments: { method: :put, inputs: form_inputs }) do |item|
+ item.with_leading_visual_icon(icon: "move-to-bottom")
+ end
+ end
+
+ def deletion_enumeration(menu)
+ menu.with_item(label: I18n.t(:button_delete),
+ tag: :button,
+ scheme: :danger,
+ href: helpers.url_for(action: :destroy, id: enumeration),
+ form_arguments: { method: :delete }) do |item|
+ item.with_leading_visual_icon(icon: :trash)
+ end
+ end
+ end
+ end
+end
diff --git a/app/components/admin/enumerations/item_form.rb b/app/components/admin/enumerations/item_form.rb
new file mode 100644
index 00000000000..da9b0a7c1c6
--- /dev/null
+++ b/app/components/admin/enumerations/item_form.rb
@@ -0,0 +1,66 @@
+# 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 Admin
+ module Enumerations
+ class ItemForm < ApplicationForm
+ delegate :object, to: :@builder
+
+ form do |form|
+ form.text_field(
+ name: :name,
+ label: object.class.human_attribute_name(:name),
+ required: true,
+ input_width: :medium
+ )
+
+ if object.colored?
+ form.color_select_list(
+ label: attribute_name(:color_id),
+ name: :color_id,
+ caption: object.color_label,
+ input_width: :medium
+ )
+ end
+
+ form.check_box(
+ name: :active,
+ label: object.class.human_attribute_name(:active)
+ )
+
+ form.submit(
+ name: :submit,
+ label: I18n.t(:button_save),
+ scheme: :primary
+ )
+ end
+ end
+ end
+end
diff --git a/app/components/admin/enumerations/reassign_form.rb b/app/components/admin/enumerations/reassign_form.rb
new file mode 100644
index 00000000000..ddbee19bf2a
--- /dev/null
+++ b/app/components/admin/enumerations/reassign_form.rb
@@ -0,0 +1,67 @@
+# 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 Admin
+ module Enumerations
+ class ReassignForm < ApplicationForm
+ include OpenProject::StaticRouting::UrlHelpers
+
+ attr_reader :other_enumerations
+
+ def initialize(other_enumerations:)
+ super()
+
+ @other_enumerations = other_enumerations
+ end
+
+ form do |form|
+ form.select_list(
+ name: :reassign_to_id,
+ label: I18n.t(:text_enumeration_category_reassign_to),
+ required: true,
+ input_width: :large
+ ) do |select|
+ other_enumerations.each do |activity|
+ select.option(value: activity.id, label: activity.name)
+ end
+ end
+
+ form.group(layout: :horizontal) do |button_group|
+ button_group.button(name: :cancel,
+ tag: :a,
+ label: I18n.t(:button_cancel),
+ scheme: :default,
+ href: admin_settings_time_entry_activities_path)
+ button_group.submit(name: :submit, label: I18n.t(:button_apply), scheme: :primary)
+ end
+ end
+ end
+ end
+end
diff --git a/app/components/attribute_help_texts/index_page_header_component.html.erb b/app/components/attribute_help_texts/index_page_header_component.html.erb
index 602390526de..ae9aa78a362 100644
--- a/app/components/attribute_help_texts/index_page_header_component.html.erb
+++ b/app/components/attribute_help_texts/index_page_header_component.html.erb
@@ -31,12 +31,14 @@ See COPYRIGHT and LICENSE files for more details.
header.with_title { I18n.t(:"attribute_help_texts.label_plural") }
header.with_breadcrumbs(breadcrumb_items, selected_item_font_weight: :normal)
- header.with_tab_nav(label: nil) do |tab_nav|
- @tabs.each do |tab|
- tab_nav.with_tab(selected: currently_selected_tab == tab, href: tab[:path]) do |t|
- t.with_text { I18n.t(tab[:label]) }
+ if @tabs.present?
+ header.with_tab_nav(label: nil) do |tab_nav|
+ @tabs.each do |tab|
+ tab_nav.with_tab(selected: currently_selected_tab == tab, href: tab[:path]) do |t|
+ t.with_text { I18n.t(tab[:label]) }
+ end
end
end
- end if @tabs.present?
+ end
end
%>
diff --git a/app/components/attribute_help_texts/index_page_header_component.rb b/app/components/attribute_help_texts/index_page_header_component.rb
index 0e0637a472e..5c1615f05e6 100644
--- a/app/components/attribute_help_texts/index_page_header_component.rb
+++ b/app/components/attribute_help_texts/index_page_header_component.rb
@@ -39,9 +39,11 @@ class AttributeHelpTexts::IndexPageHeaderComponent < ApplicationComponent
end
def breadcrumb_items
- [{ href: admin_index_path, text: t("label_administration") },
- I18n.t("menus.breadcrumb.nested_element", section_header: t(:"attribute_help_texts.label_plural"),
- title: I18n.t(currently_selected_tab[:label].to_s)).html_safe]
+ [
+ { href: admin_index_path, text: t("label_administration") },
+ helpers.nested_breadcrumb_element(t(:"attribute_help_texts.label_plural"),
+ I18n.t(currently_selected_tab[:label].to_s))
+ ]
end
def currently_selected_tab
diff --git a/app/components/colors/edit_page_header_component.html.erb b/app/components/colors/edit_page_header_component.html.erb
index 55dde57ac10..d03fc0c8987 100644
--- a/app/components/colors/edit_page_header_component.html.erb
+++ b/app/components/colors/edit_page_header_component.html.erb
@@ -32,18 +32,20 @@ See COPYRIGHT and LICENSE files for more details.
header.with_breadcrumbs(breadcrumb_items)
if @color.persisted?
- header.with_action_button(tag: :a,
- scheme: :danger,
- mobile_icon: :trash,
- mobile_label: t(:button_delete),
- size: :medium,
- href: color_path(@color),
- aria: { label: I18n.t(:button_delete) },
- data: {
- confirm: I18n.t(:text_are_you_sure),
- method: :delete
- },
- title: I18n.t(:button_delete)) do |button|
+ header.with_action_button(
+ tag: :a,
+ scheme: :danger,
+ mobile_icon: :trash,
+ mobile_label: t(:button_delete),
+ size: :medium,
+ href: color_path(@color),
+ aria: { label: I18n.t(:button_delete) },
+ data: {
+ confirm: I18n.t(:text_are_you_sure),
+ method: :delete
+ },
+ title: I18n.t(:button_delete)
+ ) do |button|
button.with_leading_visual_icon(icon: :trash)
t(:button_delete)
end
diff --git a/app/components/components/on_off_status_component.html.erb b/app/components/components/on_off_status_component.html.erb
index 4a64e60e31f..0fc8e9bb298 100644
--- a/app/components/components/on_off_status_component.html.erb
+++ b/app/components/components/on_off_status_component.html.erb
@@ -32,7 +32,7 @@ See COPYRIGHT and LICENSE files for more details.
<% helpers.supported_export_formats.each do |key| %>
<%= link_to projects_path(format: key, **helpers.projects_query_params.except(:page, :per_page)),
- class: 'op-export-options--option-link' do %>
+ class: "op-export-options--option-link" do %>
<%= helpers.op_icon("icon-big icon-export-#{key}") %>
<%= t("export.format.#{key}") %>
<% end %>
diff --git a/app/components/projects/index_page_header_component.html.erb b/app/components/projects/index_page_header_component.html.erb
index 50579e86c01..e5dd6f2818c 100644
--- a/app/components/projects/index_page_header_component.html.erb
+++ b/app/components/projects/index_page_header_component.html.erb
@@ -1,16 +1,18 @@
-<%= component_wrapper(tag: 'turbo-frame') do %>
+<%= component_wrapper(tag: "turbo-frame") do %>
<%=
render(Primer::OpenProject::PageHeader.new(state: @state)) do |header|
- header.with_title(data: { 'test-selector': 'project-query-name' }) do |title|
- title.with_editable_form(model: query,
- update_path: @query.new_record? ? project_queries_path(projects_query_params) : project_query_path(@query, projects_query_params),
- method: @query.new_record? ? :post : :put,
- cancel_path: projects_path(**projects_query_params, **{ query_id: query.id }.compact),
- input_name: "name",
- label: ProjectQuery.human_attribute_name(:name),
- placeholder: I18n.t(:"projects.lists.new.placeholder"),
- scope: 'query',
- id: 'project-save-form')
+ header.with_title(data: { "test-selector": "project-query-name" }) do |title|
+ title.with_editable_form(
+ model: query,
+ update_path: @query.new_record? ? project_queries_path(projects_query_params) : project_query_path(@query, projects_query_params),
+ method: @query.new_record? ? :post : :put,
+ cancel_path: projects_path(**projects_query_params, **{ query_id: query.id }.compact),
+ input_name: "name",
+ label: ProjectQuery.human_attribute_name(:name),
+ placeholder: I18n.t(:"projects.lists.new.placeholder"),
+ scope: "query",
+ id: "project-save-form"
+ )
page_title
end
header.with_breadcrumbs(breadcrumb_items, selected_item_font_weight: current_breadcrumb_element == page_title ? :bold : :normal)
@@ -52,7 +54,7 @@
classes: "op-primer--star-icon",
tag: :a,
href: helpers.build_favorite_path(query, format: :html),
- data: { method: :delete, "test-selector": "project-query-unfavorite" },
+ data: { method: :delete, "test-selector": "project-query-unfavorite" }
)
else
header.with_action_icon_button(
@@ -61,7 +63,7 @@
label: t(:button_favorite),
tag: :a,
href: helpers.build_favorite_path(query, format: :html),
- data: { method: :post, "test-selector": "project-query-favorite" },
+ data: { method: :post, "test-selector": "project-query-favorite" }
)
end
end
@@ -78,8 +80,8 @@
) do |menu|
if can_rename?
menu.with_item(
- label: t('button_rename'),
- href: rename_project_query_path(query),
+ label: t("button_rename"),
+ href: rename_project_query_path(query)
) do |item|
item.with_leading_visual_icon(icon: :pencil)
end
@@ -88,12 +90,12 @@
if gantt_portfolio_project_ids.any?
menu.with_item(
tag: :a,
- label: t('projects.index.open_as_gantt'),
+ label: t("projects.index.open_as_gantt"),
href: gantt_portfolio_query_link,
- id: 'projects-index-open-as-gantt',
- content_arguments: { target: '_blank' }
+ id: "projects-index-open-as-gantt",
+ content_arguments: { target: "_blank" }
) do |item|
- item.with_leading_visual_icon(icon: 'op-view-timeline')
+ item.with_leading_visual_icon(icon: "op-view-timeline")
end
end
@@ -103,13 +105,13 @@
href: activities_path,
content_arguments: { rel: "nofollow" }
) do |item|
- item.with_leading_visual_icon(icon: 'tasklist')
+ item.with_leading_visual_icon(icon: "tasklist")
end
if can_save?
menu_save_item(
menu:,
- label: t('button_save'),
+ label: t("button_save"),
href: project_query_path(query, projects_query_params),
method: :patch
)
@@ -118,25 +120,25 @@
if may_save_as?
menu_save_item(
menu:,
- label: t('button_save_as'),
+ label: t("button_save_as"),
href: new_project_query_path(projects_query_params)
)
end
menu.with_item(
tag: :a,
- label: t('js.label_export'),
+ label: t("js.label_export"),
href: export_list_modal_projects_path(projects_query_params),
content_arguments: { data: { controller: "async-dialog" }, rel: "nofollow" }
) do |item|
- item.with_leading_visual_icon(icon: 'sign-out')
+ item.with_leading_visual_icon(icon: "sign-out")
end
menu.with_item(
tag: :a,
- label: t(:'queries.configure_view.heading'),
+ label: t(:"queries.configure_view.heading"),
href: configure_view_modal_project_queries_path(projects_query_params),
- content_arguments: { data: { controller: "async-dialog" }}
+ content_arguments: { data: { controller: "async-dialog" } }
) do |item|
item.with_leading_visual_icon(icon: :gear)
end
@@ -147,18 +149,17 @@
label: t(:button_delete),
scheme: :danger,
href: destroy_confirmation_modal_project_query_path(query.id),
- content_arguments: { data: { controller: "async-dialog" }}
+ content_arguments: { data: { controller: "async-dialog" } }
) do |item|
- item.with_leading_visual_icon(icon: 'trash')
+ item.with_leading_visual_icon(icon: "trash")
end
end
menu.with_item(
tag: :button,
- label: t('label_zen_mode'),
- content_arguments: { data: { controller: "projects-zen-mode", target: "projects-zen-mode.button", action: "click->projects-zen-mode#performAction" }
- }
+ label: t("label_zen_mode"),
+ content_arguments: { data: { controller: "projects-zen-mode", target: "projects-zen-mode.button", action: "click->projects-zen-mode#performAction" } }
) do |item|
- item.with_leading_visual_icon(icon: 'screen-full')
+ item.with_leading_visual_icon(icon: "screen-full")
end
end
end
diff --git a/app/components/projects/index_page_header_component.rb b/app/components/projects/index_page_header_component.rb
index 0e5902d8185..2e6fff5186a 100644
--- a/app/components/projects/index_page_header_component.rb
+++ b/app/components/projects/index_page_header_component.rb
@@ -122,7 +122,7 @@ class Projects::IndexPageHeaderComponent < ApplicationComponent
return page_title if query.name.blank?
if current_section && current_section.header.present?
- I18n.t("menus.breadcrumb.nested_element", section_header: current_section.header, title: query.name).html_safe
+ helpers.nested_breadcrumb_element(current_section.header, query.name)
else
page_title
end
diff --git a/app/components/projects/index_sub_header_component.html.erb b/app/components/projects/index_sub_header_component.html.erb
index 354a7e3b152..5e9557710bc 100644
--- a/app/components/projects/index_sub_header_component.html.erb
+++ b/app/components/projects/index_sub_header_component.html.erb
@@ -1,33 +1,39 @@
-<%= component_wrapper(tag: 'turbo-frame') do %>
+<%= component_wrapper(tag: "turbo-frame") do %>
<%= render(Primer::OpenProject::SubHeader.new(data: sub_header_data_attributes)) do |subheader|
- subheader.with_filter_input(name: "name_and_identifier",
- label: t('projects.index.search.label'),
- value: filter_input_value,
- placeholder: t('projects.index.search.placeholder'),
- leading_visual: {
- icon: :search,
- size: :small
- },
- clear_button_id: clear_button_id,
- data: filter_input_data_attributes)
+ subheader.with_filter_input(
+ name: "name_and_identifier",
+ label: t("projects.index.search.label"),
+ value: filter_input_value,
+ placeholder: t("projects.index.search.placeholder"),
+ leading_visual: {
+ icon: :search,
+ size: :small
+ },
+ clear_button_id: clear_button_id,
+ data: filter_input_data_attributes
+ )
- subheader.with_filter_component do
- render(Projects::ProjectFilterButtonComponent.new(query: @query, disabled: @disable_buttons))
- end
+ subheader.with_filter_component do
+ render(Projects::ProjectFilterButtonComponent.new(query: @query, disabled: @disable_buttons))
+ end
- subheader.with_action_button(tag: :a,
- href: new_project_path,
- scheme: :primary,
- disabled: @disable_buttons,
- size: :medium,
- aria: { label: I18n.t(:label_project_new) },
- data: { 'test-selector': 'project-new-button' }) do |button|
- button.with_leading_visual_icon(icon: :plus)
- Project.model_name.human
- end if @current_user.allowed_globally?(:add_project)
+ if @current_user.allowed_globally?(:add_project)
+ subheader.with_action_button(
+ tag: :a,
+ href: new_project_path,
+ scheme: :primary,
+ disabled: @disable_buttons,
+ size: :medium,
+ aria: { label: I18n.t(:label_project_new) },
+ data: { "test-selector": "project-new-button" }
+ ) do |button|
+ button.with_leading_visual_icon(icon: :plus)
+ Project.model_name.human
+ end
+ end
- subheader.with_bottom_pane_component(mt: 0) do
- render(Projects::ProjectsFiltersComponent.new(query: @query))
- end
- end %>
+ subheader.with_bottom_pane_component(mt: 0) do
+ render(Projects::ProjectsFiltersComponent.new(query: @query))
+ end
+ end %>
<% end %>
diff --git a/app/components/projects/life_cycle_type_component.html.erb b/app/components/projects/life_cycle_type_component.html.erb
new file mode 100644
index 00000000000..3f9a0f06e6f
--- /dev/null
+++ b/app/components/projects/life_cycle_type_component.html.erb
@@ -0,0 +1,8 @@
+<%= flex_layout(align_items: :center) do |type_container|
+ type_container.with_column(mr: 1, classes: icon_color_class) do
+ render Primer::Beta::Octicon.new(icon: icon)
+ end
+ type_container.with_column do
+ render(Primer::Beta::Text.new(**text_options)) { text }
+ end
+ end %>
diff --git a/app/components/projects/life_cycle_type_component.rb b/app/components/projects/life_cycle_type_component.rb
new file mode 100644
index 00000000000..453f5d90c5d
--- /dev/null
+++ b/app/components/projects/life_cycle_type_component.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 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 Projects
+ class LifeCycleTypeComponent < ApplicationComponent
+ include OpPrimer::ComponentHelpers
+
+ def text
+ model.model_name.human
+ end
+
+ def icon
+ case model
+ when Project::StageDefinition
+ :"git-commit"
+ when Project::GateDefinition
+ :diamond
+ else
+ raise NotImplementedError, "Unknown model #{model.class} to render a LifeCycleTypeComponent with"
+ end
+ end
+
+ def icon_color_class
+ helpers.hl_inline_class("life_cycle_step_definition", model)
+ end
+
+ def text_options
+ # The tag: :div is is a hack to fix the line height difference
+ # caused by font_size: :small. That line height difference
+ # would otherwise lead to the text being not on the same height as the icon
+ { color: :muted, font_size: :small, tag: :div }.merge(options)
+ end
+ end
+end
diff --git a/app/components/projects/row_component.html.erb b/app/components/projects/row_component.html.erb
index 20549168b15..cff17907e37 100644
--- a/app/components/projects/row_component.html.erb
+++ b/app/components/projects/row_component.html.erb
@@ -29,8 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
- <%= "class=\"#{row_css_class}\"".html_safe if row_css_class %>
->
+ <%= "class=\"#{row_css_class}\"".html_safe if row_css_class %>>
<% columns.each do |column| %>
<%= column_value(column) %>
diff --git a/app/components/projects/row_component.rb b/app/components/projects/row_component.rb
index 3f540eac0ec..66ff579a9d0 100644
--- a/app/components/projects/row_component.rb
+++ b/app/components/projects/row_component.rb
@@ -29,8 +29,9 @@
#++
module Projects
class RowComponent < ::RowComponent
- delegate :favored_project_ids, to: :table
delegate :identifier, to: :project
+ delegate :favored_project_ids, to: :table
+ delegate :project_life_cycle_step_by_definition, to: :table
def project
model.first
@@ -69,6 +70,8 @@ module Projects
def column_value(column)
if custom_field_column?(column)
custom_field_column(column)
+ elsif life_cycle_step_column?(column)
+ life_cycle_step_column(column)
else
send(column.attribute)
end
@@ -94,6 +97,16 @@ module Projects
end
end
+ def life_cycle_step_column(column)
+ return nil unless user_can_view_project_stages_and_gates?
+
+ life_cycle_step = project_life_cycle_step_by_definition(column.life_cycle_step_definition, project)
+
+ return nil if life_cycle_step.blank?
+
+ fmt_date_or_range(life_cycle_step.start_date, life_cycle_step.end_date)
+ end
+
def created_at
helpers.format_date(project.created_at)
end
@@ -370,12 +383,37 @@ module Projects
User.current.allowed_in_project?(:view_project_attributes, project)
end
+ def user_can_view_project_stages_and_gates?
+ User.current.allowed_in_project?(:view_project_stages_and_gates, project)
+ end
+
def custom_field_column?(column)
column.is_a?(::Queries::Projects::Selects::CustomField)
end
+ def life_cycle_step_column?(column)
+ column.is_a?(::Queries::Projects::Selects::LifeCycleStep)
+ end
+
def current_page
table.model.current_page.to_s
end
+
+ private
+
+ # If only the `start_date` is given, will return a formatted version of that date as string.
+ # When `end_date` is given as well, will return a representation of the date range from start to end.
+ # @example
+ # fmt_date_or_range(Date.new(2024, 12, 4))
+ # "04/12/2024"
+ #
+ # fmt_date_or_range(Date.new(2024, 12, 4), Date.new(2024, 12, 10))
+ # "04/12/2024 - 10/12/2024"
+ def fmt_date_or_range(start_date, end_date = nil)
+ [start_date, end_date]
+ .compact
+ .map { |d| helpers.format_date(d) }
+ .join(" - ")
+ end
end
end
diff --git a/app/components/projects/settings/index_page_header_component.html.erb b/app/components/projects/settings/index_page_header_component.html.erb
new file mode 100644
index 00000000000..c9d2e440817
--- /dev/null
+++ b/app/components/projects/settings/index_page_header_component.html.erb
@@ -0,0 +1,106 @@
+<%=
+ render Primer::OpenProject::PageHeader.new do |header|
+ header.with_title { t(:label_information_plural) }
+ header.with_breadcrumbs(
+ [
+ { href: project_overview_path(@project.id), text: @project.name },
+ { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+ t(:label_information_plural)
+ ]
+ )
+
+ if User.current.allowed_in_project?(:add_subprojects, @project)
+ header.with_action_button(
+ scheme: :primary,
+ mobile_icon: :plus,
+ mobile_label: t(:label_subproject_new),
+ aria: { label: t(:label_subproject_new) },
+ title: t(:label_subproject_new),
+ tag: :a,
+ href: new_project_path(parent_id: @project.id)
+ ) do |button|
+ button.with_leading_visual_icon(icon: :plus)
+ t(:label_subproject)
+ end
+ end
+
+ header.with_action_button(
+ tag: :a,
+ mobile_icon: :pencil,
+ mobile_label: t("projects.settings.change_identifier"),
+ size: :medium,
+ href: project_identifier_path(@project),
+ aria: { label: t("projects.settings.change_identifier") },
+ title: t("projects.settings.change_identifier")
+ ) do |button|
+ button.with_leading_visual_icon(icon: :pencil)
+ t("projects.settings.change_identifier")
+ end
+
+ header.with_action_menu(
+ menu_arguments: {
+ anchor_align: :end
+ },
+ button_arguments: {
+ icon: "op-kebab-vertical",
+ "aria-label": t(:label_more),
+ test_selector: "project-settings-more-menu"
+ }
+ ) do |menu|
+ if @project.copy_allowed?
+ menu.with_item(
+ label: t(:button_copy),
+ href: copy_project_path(@project),
+ content_arguments: {
+ data: { turbo: false },
+ test_selector: "project-settings--copy"
+ },
+ accesskey: helpers.accesskey(:copy)
+ ) do |item|
+ item.with_leading_visual_icon(icon: :copy)
+ end
+ end
+
+ if User.current.allowed_in_project?(:archive_project, @project)
+ menu.with_item(
+ tag: :a,
+ label: t(:button_archive),
+ href: project_archive_path(@project, status: "", name: @project.name),
+ content_arguments: {
+ data: { confirm: t("project.archive.are_you_sure", name: @project.name), method: :post },
+ test_selector: "project-settings--archive"
+ }
+ ) do |item|
+ item.with_leading_visual_icon(icon: "lock")
+ end
+ end
+ if User.current.admin?
+ label = @project.templated ? "remove_from_templates" : "make_template"
+ menu.with_item(
+ tag: :a,
+ label: t("project.template.#{label}"),
+ href: project_templated_path(@project),
+ content_arguments: {
+ data: { method: @project.templated ? :delete : :post },
+ test_selector: "project-settings--mark-template"
+ }
+ ) do |item|
+ item.with_leading_visual_icon(icon: @project.templated ? :"file-removed" : :"file-added")
+ end
+
+ menu.with_item(
+ tag: :a,
+ scheme: :danger,
+ label: t(:button_delete),
+ href: confirm_destroy_project_path(@project),
+ content_arguments: {
+ data: { turbo: false },
+ test_selector: "project-settings--delete"
+ }
+ ) do |item|
+ item.with_leading_visual_icon(icon: :trash)
+ end
+ end
+ end
+ end
+%>
diff --git a/app/components/projects/settings/index_page_header_component.rb b/app/components/projects/settings/index_page_header_component.rb
new file mode 100644
index 00000000000..a57128ce4f0
--- /dev/null
+++ b/app/components/projects/settings/index_page_header_component.rb
@@ -0,0 +1,39 @@
+# 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 Projects::Settings::IndexPageHeaderComponent < ApplicationComponent
+ include OpPrimer::ComponentHelpers
+
+ def initialize(project:)
+ super
+
+ @project = project
+ end
+end
diff --git a/app/components/projects/settings/life_cycle_steps/index_component.html.erb b/app/components/projects/settings/life_cycle_steps/index_component.html.erb
new file mode 100644
index 00000000000..4f9ce4fa6f7
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/index_component.html.erb
@@ -0,0 +1,98 @@
+<%=
+ flex_layout(data: wrapper_data_attributes) do |flex|
+ flex.with_row do
+ render(Primer::OpenProject::SubHeader.new) do |subheader|
+ subheader.with_filter_input(
+ name: "border-box-filter",
+ label: t("projects.settings.life_cycle.filter.label"),
+ visually_hide_label: true,
+ placeholder: t("projects.settings.life_cycle.filter.label"),
+ leading_visual: {
+ icon: :search,
+ size: :small
+ },
+ show_clear_button: true,
+ clear_button_id: clear_button_id,
+ data: {
+ action: "input->projects--settings--border-box-filter#filterLists",
+ "projects--settings--border-box-filter-target": "filter"
+ }
+ )
+ end
+ end
+
+ flex.with_row do
+ render(border_box_container(mb: 3, data: { test_selector: "project-life-cycle-administration" })) do |component|
+ component.with_header(font_weight: :bold, py: 2) do
+ flex_layout(justify_content: :space_between, align_items: :center) do |header_container|
+ header_container.with_column(py: 2) do
+ # adding py: 2 here to match the padding of the actions_container
+ # otherwise the header height changes when the actions gets hidden when filtering
+ render(Primer::Beta::Text.new(font_weight: :bold)) do
+ I18n.t("projects.settings.life_cycle.section_header")
+ end
+ end
+ header_container.with_column(flex_layout: true, justify_content: :flex_end) do |actions_container|
+ actions_container.with_column(data: { "projects--settings--border-box-filter-target": "hideWhenFiltering" }) do
+ render(
+ Primer::Beta::Button.new(
+ tag: :a,
+ href: enable_all_project_settings_life_cycle_steps_path(project_id: project),
+ scheme: :invisible,
+ font_weight: :bold,
+ color: :subtle,
+ "aria-label": t("projects.settings.actions.label_enable_all"),
+ data: { "turbo-method": :post, test_selector: "enable-all-life-cycle-steps" }
+ )
+ ) do |button|
+ button.with_leading_visual_icon(icon: "check-circle", color: :subtle)
+ t("projects.settings.actions.label_enable_all")
+ end
+ end
+ actions_container.with_column(data: { "projects--settings--border-box-filter-target": "hideWhenFiltering" }) do
+ render(
+ Primer::Beta::Button.new(
+ tag: :a,
+ href: disable_all_project_settings_life_cycle_steps_path(project_id: project),
+ scheme: :invisible,
+ font_weight: :bold,
+ color: :subtle,
+ "aria-label": t("projects.settings.actions.label_disable_all"),
+ data: { "turbo-method": :post, test_selector: "disable-all-life-cycle-steps" }
+ )
+ ) do |button|
+ button.with_leading_visual_icon(icon: "x-circle", color: :subtle)
+ t("projects.settings.actions.label_disable_all")
+ end
+ end
+ end
+ end
+ end
+ if life_cycle_definitions.empty?
+ component.with_row do
+ render(Primer::Beta::Text.new(color: :subtle)) { t("projects.settings.life_cycle.non_defined") }
+ end
+ else
+ life_cycle_definitions_and_step_active.each do |definition, active|
+ component.with_row(
+ data: { "projects--settings--border-box-filter-target": "searchItem" },
+ test_selector: "project-life-cycle-step-#{definition.id}"
+ ) do
+ render(Projects::Settings::LifeCycleSteps::StepComponent.new(definition:, active?: active))
+ end
+ end
+ end
+ end
+ end
+ flex.with_row do
+ render Primer::Beta::Text.new(
+ display: :none,
+ data: {
+ "projects--settings--border-box-filter-target": "noResultsText"
+ }
+ ) do
+ I18n.t("js.autocompleter.notFoundText")
+ end
+ end
+ end
+%>
diff --git a/app/components/projects/settings/life_cycle_steps/index_component.rb b/app/components/projects/settings/life_cycle_steps/index_component.rb
new file mode 100644
index 00000000000..bd1c174f1cc
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/index_component.rb
@@ -0,0 +1,64 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 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 Projects
+ module Settings
+ module LifeCycleSteps
+ class IndexComponent < ApplicationComponent
+ include ApplicationHelper
+ include OpPrimer::ComponentHelpers
+ include OpTurbo::Streamable
+
+ options :project,
+ :life_cycle_definitions
+
+ private
+
+ def life_cycle_definitions_and_step_active
+ active_ids = project.life_cycle_steps.where(active: true).pluck(:definition_id).to_set
+
+ life_cycle_definitions.all.map do |definition|
+ [definition, definition.id.in?(active_ids)]
+ end
+ end
+
+ def wrapper_data_attributes
+ {
+ controller: "projects--settings--border-box-filter",
+ "application-target": "dynamic",
+ "projects--settings--border-box-filter-clear-button-id-value": clear_button_id
+ }
+ end
+
+ def clear_button_id
+ "border-box-filter-clear-button"
+ end
+ end
+ end
+ end
+end
diff --git a/app/components/projects/settings/life_cycle_steps/index_page_header_component.html.erb b/app/components/projects/settings/life_cycle_steps/index_page_header_component.html.erb
new file mode 100644
index 00000000000..bce464dcb65
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/index_page_header_component.html.erb
@@ -0,0 +1,13 @@
+<%=
+ render Primer::OpenProject::PageHeader.new do |header|
+ header.with_title { t("projects.settings.life_cycle.header.title") }
+ header.with_description do
+ t(
+ "projects.settings.life_cycle.header.description_html",
+ overview_url: project_path(project),
+ admin_settings_url: admin_settings_project_life_cycle_step_definitions_path
+ )
+ end
+ header.with_breadcrumbs(breadcrumb_items)
+ end
+%>
diff --git a/app/components/projects/settings/life_cycle_steps/index_page_header_component.rb b/app/components/projects/settings/life_cycle_steps/index_page_header_component.rb
new file mode 100644
index 00000000000..8be423936db
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/index_page_header_component.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 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 Projects::Settings::LifeCycleSteps
+ class IndexPageHeaderComponent < ApplicationComponent
+ include ApplicationHelper
+
+ options :project
+
+ def breadcrumb_items
+ [{ href: project_overview_path(project), text: project.name },
+ { href: project_settings_general_path(project), text: I18n.t("label_project_settings") },
+ t("projects.settings.life_cycle.header.title")]
+ end
+ end
+end
diff --git a/app/components/projects/settings/life_cycle_steps/step_component.html.erb b/app/components/projects/settings/life_cycle_steps/step_component.html.erb
new file mode 100644
index 00000000000..77f5a03f3ea
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/step_component.html.erb
@@ -0,0 +1,34 @@
+<%=
+ flex_layout(
+ align_items: :center,
+ justify_content: :space_between
+ ) do |step_container|
+ step_container.with_column(flex_layout: true, mr: 2, classes: "min-width-0") do |title_container|
+ title_container.with_column(pt: 1, mr: 3, classes: "ellipsis") do
+ render(Primer::Beta::Text.new(classes: "filter-target-visible-text")) { definition.name }
+ end
+ title_container.with_column(pt: 1, classes: "no-wrap") do
+ render(Projects::LifeCycleTypeComponent.new(definition))
+ end
+ end
+ # py: 1 quick fix: prevents the row from bouncing as the toggle switch currently changes height while toggling
+ step_container.with_column(py: 1, mr: 2) do
+ # buggy currently:
+ # small variant + status_label_position: :start leads to a small bounce while toggling
+ # behavior can be seen on primer's viewbook as well -> https://view-components-storybook.eastus.cloudapp.azure.com/view-components/lookbook/inspect/primer/alpha/toggle_switch/small
+ # quick fix: don't display loading indicator which is causing the bounce
+ render(
+ Primer::Alpha::ToggleSwitch.new(
+ src: toggle_project_settings_life_cycle_step_path(id: definition.id),
+ csrf_token: form_authenticity_token,
+ data: { test_selector: "toggle-project-life-cycle-#{definition.id}" },
+ aria: { label: toggle_aria_label },
+ checked: active?,
+ size: :small,
+ status_label_position: :start,
+ classes: "op-primer-adjustments__toggle-switch--hidden-loading-indicator"
+ )
+ )
+ end
+ end
+%>
diff --git a/app/components/projects/settings/life_cycle_steps/step_component.rb b/app/components/projects/settings/life_cycle_steps/step_component.rb
new file mode 100644
index 00000000000..2dd0f59b647
--- /dev/null
+++ b/app/components/projects/settings/life_cycle_steps/step_component.rb
@@ -0,0 +1,46 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 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 Projects
+ module Settings
+ module LifeCycleSteps
+ class StepComponent < ApplicationComponent
+ include ApplicationHelper
+ include OpPrimer::ComponentHelpers
+ include OpTurbo::Streamable
+
+ options :definition,
+ :active?
+
+ def toggle_aria_label
+ I18n.t("projects.settings.life_cycle.step.use_in_project", step: definition.name)
+ end
+ end
+ end
+ end
+end
diff --git a/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.html.erb b/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.html.erb
index 374bb4ed064..7e00e30035c 100644
--- a/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.html.erb
+++ b/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.html.erb
@@ -1,15 +1,17 @@
<%=
component_wrapper do
- flex_layout(align_items: :center, justify_content: :space_between, classes: 'op-project-custom-field', data: {
- test_selector: "project-custom-field-#{@project_custom_field.id}"
- }) do |custom_field_container|
+ flex_layout(
+ align_items: :center, justify_content: :space_between, classes: "op-project-custom-field", data: {
+ test_selector: "project-custom-field-#{@project_custom_field.id}"
+ }
+ ) do |custom_field_container|
custom_field_container.with_column(flex_layout: true) do |title_container|
title_container.with_column(pt: 1, mr: 2) do
- render(Primer::Beta::Text.new) do
+ render(Primer::Beta::Text.new(classes: "filter-target-visible-text")) do
@project_custom_field.name
end
end
- title_container.with_column(pt: 1, mr: 2, data: { test_selector: "custom-field-type" } ) do
+ title_container.with_column(pt: 1, mr: 2, data: { test_selector: "custom-field-type" }) do
render(Primer::Beta::Text.new(font_size: :small, color: :subtle)) do
@project_custom_field.field_format.capitalize
end
@@ -28,22 +30,24 @@
# small variant + status_label_position: :start leads to a small bounce while toggling
# behavior can be seen on primer's viewbook as well -> https://view-components-storybook.eastus.cloudapp.azure.com/view-components/lookbook/inspect/primer/alpha/toggle_switch/small
# quick fix: don't display loading indicator which is causing the bounce
- render(Primer::Alpha::ToggleSwitch.new(
- src: toggle_project_settings_project_custom_fields_path(
- project_custom_field_project_mapping: {
- project_id: @project.id,
- custom_field_id: @project_custom_field.id
- }
- ),
- csrf_token: form_authenticity_token,
- data: { 'turbo-method': :put, 'turbo-stream': true,
- test_selector: "toggle-project-custom-field-mapping-#{@project_custom_field.id}" },
- checked: active_in_project?,
- enabled: !@project_custom_field.required?, # required fields cannot be disabled
- size: :small,
- status_label_position: :start,
- classes: "op-primer-adjustments__toggle-switch--hidden-loading-indicator",
- ))
+ render(
+ Primer::Alpha::ToggleSwitch.new(
+ src: toggle_project_settings_project_custom_fields_path(
+ project_custom_field_project_mapping: {
+ project_id: @project.id,
+ custom_field_id: @project_custom_field.id
+ }
+ ),
+ csrf_token: form_authenticity_token,
+ data: { "turbo-method": :put, "turbo-stream": true,
+ test_selector: "toggle-project-custom-field-mapping-#{@project_custom_field.id}" },
+ checked: active_in_project?,
+ enabled: !@project_custom_field.required?, # required fields cannot be disabled
+ size: :small,
+ status_label_position: :start,
+ classes: "op-primer-adjustments__toggle-switch--hidden-loading-indicator"
+ )
+ )
end
end
end
diff --git a/app/components/projects/settings/project_custom_field_sections/index_component.html.erb b/app/components/projects/settings/project_custom_field_sections/index_component.html.erb
index b4044ee9966..ef6c8033a65 100644
--- a/app/components/projects/settings/project_custom_field_sections/index_component.html.erb
+++ b/app/components/projects/settings/project_custom_field_sections/index_component.html.erb
@@ -3,29 +3,33 @@
flex_layout do |flex|
flex.with_row do
render(Primer::OpenProject::SubHeader.new) do |subheader|
- subheader.with_filter_input(name: "project-custom-fields-mapping-filter",
- label: t('projects.settings.project_custom_fields.filter.label'),
- visually_hide_label: true,
- placeholder: t('projects.settings.project_custom_fields.filter.label'),
- leading_visual: {
- icon: :search,
- size: :small
- },
- show_clear_button: true,
- clear_button_id: clear_button_id,
- data: {
- action: "input->projects--settings--project-custom-fields-mapping-filter#filterLists",
- "projects--settings--project-custom-fields-mapping-filter-target": "filter"
- })
+ subheader.with_filter_input(
+ name: "border-box-filter",
+ label: t("projects.settings.project_custom_fields.filter.label"),
+ visually_hide_label: true,
+ placeholder: t("projects.settings.project_custom_fields.filter.label"),
+ leading_visual: {
+ icon: :search,
+ size: :small
+ },
+ show_clear_button: true,
+ clear_button_id: clear_button_id,
+ data: {
+ action: "input->projects--settings--border-box-filter#filterLists",
+ "projects--settings--border-box-filter-target": "filter"
+ }
+ )
end
end
@project_custom_field_sections.each do |project_custom_field_section|
flex.with_row do
- render(Projects::Settings::ProjectCustomFieldSections::ShowComponent.new(
- project: @project,
- project_custom_field_section:
- ))
+ render(
+ Projects::Settings::ProjectCustomFieldSections::ShowComponent.new(
+ project: @project,
+ project_custom_field_section:
+ )
+ )
end
end
end
diff --git a/app/components/projects/settings/project_custom_field_sections/index_component.rb b/app/components/projects/settings/project_custom_field_sections/index_component.rb
index 25b8a86e8b7..b405aa381d3 100644
--- a/app/components/projects/settings/project_custom_field_sections/index_component.rb
+++ b/app/components/projects/settings/project_custom_field_sections/index_component.rb
@@ -45,14 +45,14 @@ module Projects
def wrapper_data_attributes
{
- controller: "projects--settings--project-custom-fields-mapping-filter",
+ controller: "projects--settings--border-box-filter",
"application-target": "dynamic",
- "projects--settings--project-custom-fields-mapping-filter-clear-button-id-value": clear_button_id
+ "projects--settings--border-box-filter-clear-button-id-value": clear_button_id
}
end
def clear_button_id
- "project-custom-fields-mapping-filter-clear-button"
+ "border-box-filter-clear-button"
end
end
end
diff --git a/app/components/projects/settings/project_custom_field_sections/index_page_header_component.html.erb b/app/components/projects/settings/project_custom_field_sections/index_page_header_component.html.erb
index 7cbbd5903e1..51fb1e74bcc 100644
--- a/app/components/projects/settings/project_custom_field_sections/index_page_header_component.html.erb
+++ b/app/components/projects/settings/project_custom_field_sections/index_page_header_component.html.erb
@@ -1,8 +1,11 @@
<%= render Primer::OpenProject::PageHeader.new do |header| %>
- <%= header.with_title(variant: :default) { t('projects.settings.project_custom_fields.header.title') } %>
- <%= header.with_description { t('projects.settings.project_custom_fields.header.description',
- overview_url: project_path(@project),
- admin_settings_url: admin_settings_project_custom_fields_path
- ).html_safe } %>
+ <%= header.with_title { t("projects.settings.project_custom_fields.header.title") } %>
+ <%= header.with_description do
+ t(
+ "projects.settings.project_custom_fields.header.description_html",
+ overview_url: project_path(project),
+ admin_settings_url: admin_settings_project_custom_fields_path
+ )
+ end %>
<%= header.with_breadcrumbs(breadcrumb_items) %>
<% end %>
diff --git a/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb b/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb
index 13014aae6aa..fe1b93434a1 100644
--- a/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb
+++ b/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb
@@ -33,14 +33,11 @@ module Projects::Settings::ProjectCustomFieldSections
class IndexPageHeaderComponent < ApplicationComponent
include ApplicationHelper
- def initialize(project: nil)
- super
- @project = project
- end
+ options :project
def breadcrumb_items
- [{ href: project_overview_path(@project.id), text: @project.name },
- { href: project_settings_general_path(@project.id), text: I18n.t("label_project_settings") },
+ [{ href: project_overview_path(project), text: project.name },
+ { href: project_settings_general_path(project), text: I18n.t("label_project_settings") },
t("settings.project_attributes.heading")]
end
end
diff --git a/app/components/projects/settings/project_custom_field_sections/show_component.html.erb b/app/components/projects/settings/project_custom_field_sections/show_component.html.erb
index 727d8901228..6d28ad1f449 100644
--- a/app/components/projects/settings/project_custom_field_sections/show_component.html.erb
+++ b/app/components/projects/settings/project_custom_field_sections/show_component.html.erb
@@ -1,11 +1,15 @@
<%=
component_wrapper do
- render(border_box_container(mb: 3, classes: 'op-project-custom-field-section', data: {
- test_selector: "project-custom-field-section-#{@project_custom_field_section.id}"
- })) do |component|
+ render(
+ border_box_container(
+ mb: 3, classes: "op-project-custom-field-section", data: {
+ test_selector: "project-custom-field-section-#{@project_custom_field_section.id}"
+ }
+ )
+ ) do |component|
component.with_header(font_weight: :bold, py: 2) do
flex_layout(justify_content: :space_between, align_items: :center) do |section_header_container|
- section_header_container.with_column(py: 2) do |content_container|
+ section_header_container.with_column(py: 2) do |_content_container|
# adding py: 2 here to match the padding of the actions_container
# otherwise the header height changes when the actions gets hidden when filtering
render(Primer::Beta::Text.new(font_weight: :bold)) do
@@ -13,42 +17,46 @@
end
end
section_header_container.with_column(flex_layout: true, justify_content: :flex_end) do |actions_container|
- actions_container.with_column(data: { 'projects--settings--project-custom-fields-mapping-filter-target': 'bulkActionContainer' }) do
- render(Primer::Beta::Button.new(
- tag: :a,
- href: enable_all_of_section_project_settings_project_custom_fields_path(
- project_custom_field_project_mapping: {
- project_id: @project.id,
- custom_field_section_id: @project_custom_field_section.id
- }
- ),
- scheme: :invisible,
- font_weight: :bold,
- color: :subtle,
- 'aria-label': t('projects.settings.project_custom_fields.actions.label_enable_all'),
- data: { 'turbo-method': :put, 'turbo-stream': true, test_selector: "enable-all-project-custom-field-mappings-#{@project_custom_field_section.id}" }
- )) do |button|
- button.with_leading_visual_icon(icon: 'check-circle', color: :subtle)
- t('projects.settings.project_custom_fields.actions.label_enable_all')
+ actions_container.with_column(data: { "projects--settings--border-box-filter-target": "hideWhenFiltering" }) do
+ render(
+ Primer::Beta::Button.new(
+ tag: :a,
+ href: enable_all_of_section_project_settings_project_custom_fields_path(
+ project_custom_field_project_mapping: {
+ project_id: @project.id,
+ custom_field_section_id: @project_custom_field_section.id
+ }
+ ),
+ scheme: :invisible,
+ font_weight: :bold,
+ color: :subtle,
+ "aria-label": t("projects.settings.actions.label_enable_all"),
+ data: { "turbo-method": :put, "turbo-stream": true, test_selector: "enable-all-project-custom-field-mappings-#{@project_custom_field_section.id}" }
+ )
+ ) do |button|
+ button.with_leading_visual_icon(icon: "check-circle", color: :subtle)
+ t("projects.settings.actions.label_enable_all")
end
end
- actions_container.with_column(data: { 'projects--settings--project-custom-fields-mapping-filter-target': 'bulkActionContainer' }) do
- render(Primer::Beta::Button.new(
- tag: :a,
- href: disable_all_of_section_project_settings_project_custom_fields_path(
- project_custom_field_project_mapping: {
- project_id: @project.id,
- custom_field_section_id: @project_custom_field_section.id
- }
- ),
- scheme: :invisible,
- font_weight: :bold,
- color: :subtle,
- 'aria-label': t('projects.settings.project_custom_fields.actions.label_disable_all'),
- data: { 'turbo-method': :put, 'turbo-stream': true, test_selector: "disable-all-project-custom-field-mappings-#{@project_custom_field_section.id}" }
- )) do |button|
- button.with_leading_visual_icon(icon: 'x-circle', color: :subtle)
- t('projects.settings.project_custom_fields.actions.label_disable_all')
+ actions_container.with_column(data: { "projects--settings--border-box-filter-target": "hideWhenFiltering" }) do
+ render(
+ Primer::Beta::Button.new(
+ tag: :a,
+ href: disable_all_of_section_project_settings_project_custom_fields_path(
+ project_custom_field_project_mapping: {
+ project_id: @project.id,
+ custom_field_section_id: @project_custom_field_section.id
+ }
+ ),
+ scheme: :invisible,
+ font_weight: :bold,
+ color: :subtle,
+ "aria-label": t("projects.settings.actions.label_disable_all"),
+ data: { "turbo-method": :put, "turbo-stream": true, test_selector: "disable-all-project-custom-field-mappings-#{@project_custom_field_section.id}" }
+ )
+ ) do |button|
+ button.with_leading_visual_icon(icon: "x-circle", color: :subtle)
+ t("projects.settings.actions.label_disable_all")
end
end
end
@@ -60,11 +68,13 @@
end
else
@project_custom_fields.each do |project_custom_field|
- component.with_row(data: { 'projects--settings--project-custom-fields-mapping-filter-target': 'searchItem' }) do
- render(Projects::Settings::ProjectCustomFieldSections::CustomFieldRowComponent.new(
- project: @project,
- project_custom_field:,
- ))
+ component.with_row(data: { "projects--settings--border-box-filter-target": "searchItem" }) do
+ render(
+ Projects::Settings::ProjectCustomFieldSections::CustomFieldRowComponent.new(
+ project: @project,
+ project_custom_field:
+ )
+ )
end
end
end
diff --git a/app/components/projects/table_component.html.erb b/app/components/projects/table_component.html.erb
index a114faeff84..6c317c51d2c 100644
--- a/app/components/projects/table_component.html.erb
+++ b/app/components/projects/table_component.html.erb
@@ -26,15 +26,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See COPYRIGHT and LICENSE files for more details.
++#%>
-<%= component_wrapper(tag: 'turbo-frame') do %>
+<%= component_wrapper(tag: "turbo-frame") do %>
-
>
+
>
<% columns.each do |column| %>
-
>
+
>
<% end %>
@@ -46,17 +46,17 @@ See COPYRIGHT and LICENSE files for more details.
<%= hidden_field_tag :sortBy, current_orders, data: { "sort-by-config-target" => "sortByField" } %>
<%= render(Primer::OpenProject::FlexLayout.new(data: { "sort-by-config-target" => "inputRowContainer" })) do |layout| %>
diff --git a/app/components/queries/sort_by_field_component.html.erb b/app/components/queries/sort_by_field_component.html.erb
index 21dfc7992af..543a4e70192 100644
--- a/app/components/queries/sort_by_field_component.html.erb
+++ b/app/components/queries/sort_by_field_component.html.erb
@@ -1,14 +1,14 @@
-<%= render(Primer::OpenProject::FlexLayout.new(test_selector: 'sort-by-field')) do |flex| %>
+<%= render(Primer::OpenProject::FlexLayout.new(test_selector: "sort-by-field")) do |flex| %>
<% flex.with_column(flex: 1) do %>
<%#- We are just using the classes of the primer component here, because when using the primer component, we cannot detach the input element from the form %>
<%#- The form="none" adds the input to a nonexistant form (as we do not have one with the ID="none" and thus the fields to not get appended to the query string %>
- <%= select_tag 'sort_field', select_options, prompt: "-", form: "none", class: "FormControl-select FormControl-medium FormControl--fullWidth", data: { action: "change->sort-by-config#fieldChanged"} %>
+ <%= select_tag "sort_field", select_options, prompt: "-", form: "none", class: "FormControl-select FormControl-medium FormControl--fullWidth", data: { action: "change->sort-by-config#fieldChanged" } %>
<% end %>
<% flex.with_column do %>
<%= render(Primer::Alpha::SegmentedControl.new("aria-label": "Sort order", hide_labels: true, ml: 3)) do |sort_buttons| %>
<%#- The segmented control actions need to be included here as well as they do the visual styling of the currently selected option, just setting our action would remove their action %>
- <% sort_buttons.with_item(icon: "sort-asc", label: "sort ascending", selected: order_asc?, data: { direction: 'asc', action: "click:segmented-control#select click->sort-by-config#fieldChanged"}) %>
- <% sort_buttons.with_item(icon: "sort-desc", label: "sort descending", selected: order_desc?, data: { direction: 'desc', action: "click:segmented-control#select click->sort-by-config#fieldChanged"}) %>
+ <% sort_buttons.with_item(icon: "sort-asc", label: "sort ascending", selected: order_asc?, data: { direction: "asc", action: "click:segmented-control#select click->sort-by-config#fieldChanged" }) %>
+ <% sort_buttons.with_item(icon: "sort-desc", label: "sort descending", selected: order_desc?, data: { direction: "desc", action: "click:segmented-control#select click->sort-by-config#fieldChanged" }) %>
<% end %>
<% end %>
<% end %>
diff --git a/app/components/row_component.html.erb b/app/components/row_component.html.erb
index 20549168b15..cff17907e37 100644
--- a/app/components/row_component.html.erb
+++ b/app/components/row_component.html.erb
@@ -29,8 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
- <%= "class=\"#{row_css_class}\"".html_safe if row_css_class %>
->
+ <%= "class=\"#{row_css_class}\"".html_safe if row_css_class %>>
<% columns.each do |column| %>
<%= column_value(column) %>
diff --git a/app/components/settings/numeric_setting_component.html.erb b/app/components/settings/numeric_setting_component.html.erb
index 2ee975c5ff0..bdcd764a53b 100644
--- a/app/components/settings/numeric_setting_component.html.erb
+++ b/app/components/settings/numeric_setting_component.html.erb
@@ -33,7 +33,7 @@ See COPYRIGHT and LICENSE files for more details.
name,
size: size,
unit: t("label_#{unit.singularize}_plural"),
- container_class: '-xslim',
+ container_class: "-xslim",
title: title
)
%>
diff --git a/app/components/settings/project_custom_field_sections/custom_field_row_component.html.erb b/app/components/settings/project_custom_field_sections/custom_field_row_component.html.erb
index 00ccbfbce0e..37916605dc1 100644
--- a/app/components/settings/project_custom_field_sections/custom_field_row_component.html.erb
+++ b/app/components/settings/project_custom_field_sections/custom_field_row_component.html.erb
@@ -3,15 +3,17 @@
flex_layout(justify_content: :space_between, align_items: :center) do |main_container|
main_container.with_column(flex_layout: true, align_items: :center) do |content_container|
content_container.with_column(mr: 2) do
- render(Primer::OpenProject::DragHandle.new(classes: 'handle'))
+ render(Primer::OpenProject::DragHandle.new(classes: "handle"))
end
content_container.with_column(mr: 2) do
- render(Primer::Beta::Link.new(
- href: edit_admin_settings_project_custom_field_path(@project_custom_field),
- underline: false,
- font_weight: :bold,
- data: { turbo: "false" }
- )) do
+ render(
+ Primer::Beta::Link.new(
+ href: edit_admin_settings_project_custom_field_path(@project_custom_field),
+ underline: false,
+ font_weight: :bold,
+ data: { turbo: "false" }
+ )
+ ) do
@project_custom_field.name
end
end
@@ -22,8 +24,10 @@
end
content_container.with_column(mr: 2) do
render(Primer::Beta::Text.new(font_size: :small)) do
- t("project.count",
- count: @project_custom_field.project_custom_field_project_mappings.size)
+ t(
+ "project.count",
+ count: @project_custom_field.project_custom_field_project_mappings.size
+ )
end
end
if @project_custom_field.required?
@@ -36,7 +40,7 @@
end
main_container.with_column do
render(Primer::Alpha::ActionMenu.new(data: { test_selector: "project-custom-field-action-menu" })) do |menu|
- menu.with_show_button(icon: "kebab-horizontal", 'aria-label': t("settings.project_attributes.label_project_custom_field_actions"), scheme: :invisible)
+ menu.with_show_button(icon: "kebab-horizontal", "aria-label": t("settings.project_attributes.label_project_custom_field_actions"), scheme: :invisible)
edit_action_item(menu)
move_actions(menu)
delete_action_item(menu)
diff --git a/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb b/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb
index a45d6a52cb2..084fbf2ddff 100644
--- a/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb
+++ b/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb
@@ -3,7 +3,7 @@
primer_form_with(**form_config) do |f|
component_collection do |collection|
collection.with_component(Primer::BaseComponent.new(tag: :div)) do
- flex_layout(my: 3) do |modal_body|
+ flex_layout(mb: 3) do |modal_body|
modal_body.with_row do
render(ProjectCustomFieldSections::NameForm.new(f))
end
@@ -12,7 +12,7 @@
collection.with_component(Primer::Alpha::Dialog::Footer.new) do
component_collection do |modal_footer|
- modal_footer.with_component(Primer::ButtonComponent.new(data: { 'close-dialog-id': "project-custom-field-section-dialog#{@project_custom_field_section.id}" })) do
+ modal_footer.with_component(Primer::ButtonComponent.new(data: { "close-dialog-id": "project-custom-field-section-dialog#{@project_custom_field_section.id}" })) do
t("button_cancel")
end
diff --git a/app/components/settings/project_custom_field_sections/index_component.html.erb b/app/components/settings/project_custom_field_sections/index_component.html.erb
index 2d26ddc97e8..9ab0747f129 100644
--- a/app/components/settings/project_custom_field_sections/index_component.html.erb
+++ b/app/components/settings/project_custom_field_sections/index_component.html.erb
@@ -1,7 +1,7 @@
<%=
component_wrapper(data: wrapper_data_attributes) do
if @project_custom_field_sections.any?
- flex_layout(classes: 'dragula-container', data: { 'allowed-drop-type': 'section' }.merge(drop_target_config) ) do |flex|
+ flex_layout(classes: "dragula-container", data: { "allowed-drop-type": "section" }.merge(drop_target_config)) do |flex|
@project_custom_field_sections.each do |section|
flex.with_row(
data: draggable_item_config(section)
diff --git a/app/components/settings/project_custom_field_sections/show_component.html.erb b/app/components/settings/project_custom_field_sections/show_component.html.erb
index d4e9da2b256..704d7e22a8d 100644
--- a/app/components/settings/project_custom_field_sections/show_component.html.erb
+++ b/app/components/settings/project_custom_field_sections/show_component.html.erb
@@ -5,7 +5,7 @@
flex_layout(justify_content: :space_between, align_items: :center) do |section_header_container|
section_header_container.with_column(flex_layout: true, align_items: :center) do |content_container|
content_container.with_column(mr: 2) do
- render(Primer::OpenProject::DragHandle.new(classes: 'handle'))
+ render(Primer::OpenProject::DragHandle.new(classes: "handle"))
end
content_container.with_column do
render(Primer::Beta::Text.new(font_weight: :bold)) do
@@ -16,7 +16,7 @@
section_header_container.with_column(flex_layout: true, justify_content: :flex_end) do |actions_container|
actions_container.with_column do
render(Primer::Alpha::ActionMenu.new(data: { test_selector: "project-custom-field-section-action-menu" })) do |menu|
- menu.with_show_button(icon: "kebab-horizontal", 'aria-label': t("settings.project_attributes.label_section_actions"), scheme: :invisible)
+ menu.with_show_button(icon: "kebab-horizontal", "aria-label": t("settings.project_attributes.label_section_actions"), scheme: :invisible)
edit_action_item(menu)
move_actions(menu)
if @project_custom_fields.empty?
@@ -27,10 +27,12 @@
end
end
actions_container.with_column do
- render(Primer::Alpha::Dialog.new(
- id: "project-custom-field-section-dialog#{@project_custom_field_section.id}", title: t('settings.project_attributes.label_new_section'),
- size: :medium_portrait
- )) do |dialog|
+ render(
+ Primer::Alpha::Dialog.new(
+ id: "project-custom-field-section-dialog#{@project_custom_field_section.id}", title: t("settings.project_attributes.label_new_section"),
+ size: :medium_portrait
+ )
+ ) do |_dialog|
render(Settings::ProjectCustomFieldSections::DialogBodyFormComponent.new(project_custom_field_section: @project_custom_field_section))
end
end
@@ -38,23 +40,25 @@
end
end
if @project_custom_fields.empty?
- component.with_row(data: { 'empty-list-item': true }) do
+ component.with_row(data: { "empty-list-item": true }) do
flex_layout(align_items: :center, justify_content: :space_between) do |empty_list_container|
empty_list_container.with_column(ml: 4, mr: 2) do
render(Primer::Beta::Text.new(color: :subtle)) { t("settings.project_attributes.label_no_project_custom_fields") }
end
empty_list_container.with_column do
- render(Primer::Beta::Button.new(
+ render(
+ Primer::Beta::Button.new(
tag: :a,
href: new_admin_settings_project_custom_field_path(
type: "ProjectCustomField", custom_field_section_id: @project_custom_field_section.id
),
scheme: :secondary,
data: { turbo: "false", test_selector: "new-project-custom-field-button" }
- )) do |button|
- button.with_leading_visual_icon(icon: :plus)
- t('settings.project_attributes.label_new_attribute')
- end
+ )
+ ) do |button|
+ button.with_leading_visual_icon(icon: :plus)
+ t("settings.project_attributes.label_new_attribute")
+ end
end
end
end
diff --git a/app/components/settings/project_custom_fields/edit_form_header_component.html.erb b/app/components/settings/project_custom_fields/edit_form_header_component.html.erb
index 808f78a5267..a8b6ed3bf0a 100644
--- a/app/components/settings/project_custom_fields/edit_form_header_component.html.erb
+++ b/app/components/settings/project_custom_fields/edit_form_header_component.html.erb
@@ -34,7 +34,7 @@ See COPYRIGHT and LICENSE files for more details.
header.with_tab_nav(label: nil, test_selector: :project_attribute_detail_header) do |tab_nav|
tab_nav.with_tab(
selected: project_custom_field_edit_selected?,
- href: edit_admin_settings_project_custom_field_path(@custom_field)
+ href: edit_admin_settings_project_custom_field_path(@custom_field)
) do |tab|
tab.with_text { t(:label_details) }
end
diff --git a/app/components/settings/project_custom_fields/header_component.html.erb b/app/components/settings/project_custom_fields/header_component.html.erb
index d05b23f37dd..cf7fe4fbae8 100644
--- a/app/components/settings/project_custom_fields/header_component.html.erb
+++ b/app/components/settings/project_custom_fields/header_component.html.erb
@@ -10,10 +10,10 @@
<%=
render Primer::OpenProject::SubHeader.new do |subheader|
subheader.with_action_component do
- render(Primer::Alpha::Dialog.new(id: "project-custom-field-section-dialog", title: t('settings.project_attributes.label_new_section'), size: :medium_portrait)) do |dialog|
- dialog.with_show_button('aria-label': t('settings.project_attributes.label_new_section')) do |button|
+ render(Primer::Alpha::Dialog.new(id: "project-custom-field-section-dialog", title: t("settings.project_attributes.label_new_section"), size: :medium_portrait)) do |dialog|
+ dialog.with_show_button("aria-label": t("settings.project_attributes.label_new_section")) do |button|
button.with_leading_visual_icon(icon: :plus)
- t('settings.project_attributes.label_new_section')
+ t("settings.project_attributes.label_new_section")
end
dialog.with_body do
render(Settings::ProjectCustomFieldSections::DialogBodyFormComponent.new)
@@ -21,16 +21,17 @@
end
end
- subheader.with_action_button(tag: :a,
- href: new_admin_settings_project_custom_field_path(type: "ProjectCustomField"),
- scheme: :primary,
- data: { turbo: "false", test_selector: "new-project-custom-field-button" },
- mobile_icon: :plus,
- mobile_label: t("settings.project_attributes.label_new_attribute")) do |button|
+ subheader.with_action_button(
+ tag: :a,
+ href: new_admin_settings_project_custom_field_path(type: "ProjectCustomField"),
+ scheme: :primary,
+ data: { turbo: "false", test_selector: "new-project-custom-field-button" },
+ mobile_icon: :plus,
+ mobile_label: t("settings.project_attributes.label_new_attribute")
+ ) do |button|
button.with_leading_visual_icon(icon: :plus)
t("settings.project_attributes.label_new_attribute")
end
-
end
%>
<% end %>
diff --git a/app/components/settings/project_custom_fields/new_form_header_component.html.erb b/app/components/settings/project_custom_fields/new_form_header_component.html.erb
index 1b0bcb9ccb5..23f18628b5a 100644
--- a/app/components/settings/project_custom_fields/new_form_header_component.html.erb
+++ b/app/components/settings/project_custom_fields/new_form_header_component.html.erb
@@ -29,8 +29,8 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render(Primer::OpenProject::PageHeader.new) do |header|
- header.with_title { t('settings.project_attributes.new.heading') }
- header.with_description { t('settings.project_attributes.new.description') }
+ header.with_title { t("settings.project_attributes.new.heading") }
+ header.with_description { t("settings.project_attributes.new.description") }
header.with_breadcrumbs(breadcrumb_items)
end
%>
diff --git a/app/components/settings/project_life_cycle_step_definitions/form_header_component.html.erb b/app/components/settings/project_life_cycle_step_definitions/form_header_component.html.erb
new file mode 100644
index 00000000000..5760eb16da6
--- /dev/null
+++ b/app/components/settings/project_life_cycle_step_definitions/form_header_component.html.erb
@@ -0,0 +1,34 @@
+<%#-- 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.
+
+++#%>
+
+<%= render Primer::OpenProject::PageHeader.new do |header|
+ header.with_title { t("settings.project_life_cycle_step_definitions.#{heading_scope}.heading") }
+ header.with_description { t("settings.project_life_cycle_step_definitions.new.description") }
+ header.with_breadcrumbs(breadcrumbs_items)
+ end %>
diff --git a/app/components/settings/project_life_cycle_step_definitions/form_header_component.rb b/app/components/settings/project_life_cycle_step_definitions/form_header_component.rb
new file mode 100644
index 00000000000..8fa4442ce8d
--- /dev/null
+++ b/app/components/settings/project_life_cycle_step_definitions/form_header_component.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 Settings
+ module ProjectLifeCycleStepDefinitions
+ class FormHeaderComponent < ApplicationComponent
+ options :heading_scope
+
+ def breadcrumbs_items
+ [
+ {
+ href: admin_index_path,
+ text: t("label_administration")
+ },
+ {
+ href: admin_settings_project_custom_fields_path,
+ text: t("label_project_plural")
+ },
+ {
+ href: admin_settings_project_life_cycle_step_definitions_path,
+ text: t("settings.project_life_cycle_step_definitions.heading")
+ },
+ t("settings.project_life_cycle_step_definitions.#{heading_scope}.heading")
+ ]
+ end
+ end
+ end
+end
diff --git a/app/components/settings/project_life_cycle_step_definitions/index_component.html.erb b/app/components/settings/project_life_cycle_step_definitions/index_component.html.erb
new file mode 100644
index 00000000000..316c0311822
--- /dev/null
+++ b/app/components/settings/project_life_cycle_step_definitions/index_component.html.erb
@@ -0,0 +1,132 @@
+<%#-- 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.
+
+++#%>
+
+<%=
+ component_wrapper do
+ flex_layout(data: wrapper_data_attributes) do |flex|
+ flex.with_row do
+ if allowed_to_customize_life_cycle?
+ render(Primer::OpenProject::SubHeader.new) do |subheader|
+ subheader.with_filter_input(
+ name: "border-box-filter",
+ label: t("settings.project_life_cycle_step_definitions.filter.label"),
+ visually_hide_label: true,
+ placeholder: t("settings.project_life_cycle_step_definitions.filter.label"),
+ leading_visual: {
+ icon: :search,
+ size: :small
+ },
+ show_clear_button: true,
+ data: {
+ action: "input->projects--settings--border-box-filter#filterLists",
+ "projects--settings--border-box-filter-target": "filter"
+ }
+ )
+ subheader.with_action_component do
+ render(
+ Primer::Alpha::ActionMenu.new(
+ anchor_align: :end
+ )
+ ) do |menu|
+ menu.with_show_button(
+ scheme: :primary,
+ aria: { label: I18n.t("settings.project_life_cycle_step_definitions.label_add_description") }
+ ) do |button|
+ button.with_leading_visual_icon(icon: :plus)
+ button.with_trailing_action_icon(icon: :"triangle-down")
+ I18n.t("settings.project_life_cycle_step_definitions.label_add")
+ end
+
+ menu.with_item(
+ label: I18n.t("settings.project_life_cycle_step_definitions.label_add_stage"),
+ href: new_stage_admin_settings_project_life_cycle_step_definitions_path
+ ) do |item|
+ item.with_leading_visual_icon(icon: "git-commit")
+ end
+
+ menu.with_item(
+ label: I18n.t("settings.project_life_cycle_step_definitions.label_add_gate"),
+ href: new_gate_admin_settings_project_life_cycle_step_definitions_path
+ ) do |item|
+ item.with_leading_visual_icon(icon: "diamond")
+ end
+ end
+ end
+ end
+ else
+ render EnterpriseEdition::BannerComponent.new(:customize_life_cycle, mb: 3)
+ end
+ end
+
+ flex.with_row do
+ render(border_box_container(mb: 3, data: drop_target_config)) do |component|
+ component.with_header(font_weight: :bold, py: 2) do
+ flex_layout(justify_content: :space_between, align_items: :center) do |header_container|
+ header_container.with_column do
+ render(Primer::Beta::Text.new(font_weight: :bold)) do
+ I18n.t("settings.project_life_cycle_step_definitions.section_header")
+ end
+ end
+ end
+ end
+ if definitions.empty?
+ component.with_row do
+ render(Primer::Beta::Text.new(color: :subtle)) do
+ t("settings.project_life_cycle_step_definitions.non_defined")
+ end
+ end
+ else
+ definitions.each do |definition|
+ component.with_row(
+ data: {
+ "projects--settings--border-box-filter-target": "searchItem",
+ test_selector: "project-life-cycle-step-definition",
+ **draggable_item_config(definition)
+ }
+ ) do
+ render(
+ Settings::ProjectLifeCycleStepDefinitions::RowComponent.new(
+ definition,
+ first?: definition == definitions.first,
+ last?: definition == definitions.last
+ )
+ )
+ end
+ end
+ end
+ end
+ end
+ flex.with_row(display: :none, data: { "projects--settings--border-box-filter-target": "noResultsText" }) do
+ render Primer::Beta::Text.new do
+ I18n.t("js.autocompleter.notFoundText")
+ end
+ end
+ end
+ end
+%>
diff --git a/app/components/settings/project_life_cycle_step_definitions/index_component.rb b/app/components/settings/project_life_cycle_step_definitions/index_component.rb
new file mode 100644
index 00000000000..f2e6d2b064b
--- /dev/null
+++ b/app/components/settings/project_life_cycle_step_definitions/index_component.rb
@@ -0,0 +1,65 @@
+# 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 Settings
+ module ProjectLifeCycleStepDefinitions
+ class IndexComponent < ApplicationComponent
+ include OpPrimer::ComponentHelpers
+ include OpTurbo::Streamable
+ include Projects::LifeCycleDefinitionHelper
+
+ options :definitions
+
+ private
+
+ def wrapper_data_attributes
+ {
+ controller: "projects--settings--border-box-filter generic-drag-and-drop",
+ "application-target": "dynamic"
+ }
+ end
+
+ def drop_target_config
+ {
+ "is-drag-and-drop-target": true,
+ "target-container-accessor": "& > ul",
+ "target-allowed-drag-type": "life-cycle-step-definition"
+ }
+ end
+
+ def draggable_item_config(definition)
+ {
+ "draggable-type": "life-cycle-step-definition",
+ "drop-url": drop_admin_settings_project_life_cycle_step_definition_path(definition)
+ }
+ end
+ end
+ end
+end
diff --git a/app/components/settings/project_life_cycle_step_definitions/index_header_component.html.erb b/app/components/settings/project_life_cycle_step_definitions/index_header_component.html.erb
new file mode 100644
index 00000000000..5d9996081ec
--- /dev/null
+++ b/app/components/settings/project_life_cycle_step_definitions/index_header_component.html.erb
@@ -0,0 +1,36 @@
+<%#-- 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.
+
+++#%>
+
+<%=
+ render Primer::OpenProject::PageHeader.new do |header|
+ header.with_title { t("settings.project_life_cycle_step_definitions.heading") }
+ header.with_description { t("settings.project_life_cycle_step_definitions.heading_description") }
+ header.with_breadcrumbs(breadcrumbs_items)
+ end
+%>
diff --git a/app/components/settings/project_life_cycle_step_definitions/index_header_component.rb b/app/components/settings/project_life_cycle_step_definitions/index_header_component.rb
new file mode 100644
index 00000000000..df21b4805b9
--- /dev/null
+++ b/app/components/settings/project_life_cycle_step_definitions/index_header_component.rb
@@ -0,0 +1,43 @@
+# 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 Settings
+ module ProjectLifeCycleStepDefinitions
+ class IndexHeaderComponent < ApplicationComponent
+ def breadcrumbs_items
+ [
+ { href: admin_index_path, text: t("label_administration") },
+ { href: admin_settings_project_custom_fields_path, text: t("label_project_plural") },
+ t("settings.project_life_cycle_step_definitions.heading")
+ ]
+ end
+ end
+ end
+end
diff --git a/app/components/settings/project_life_cycle_step_definitions/row_component.html.erb b/app/components/settings/project_life_cycle_step_definitions/row_component.html.erb
new file mode 100644
index 00000000000..5a0698e192a
--- /dev/null
+++ b/app/components/settings/project_life_cycle_step_definitions/row_component.html.erb
@@ -0,0 +1,105 @@
+<%#-- 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.
+
+++#%>
+
+<%=
+ flex_layout(align_items: :center, justify_content: :space_between) do |row_container|
+ row_container.with_column(flex_layout: true, classes: "gap-2 min-width-0") do |title_container|
+ if allowed_to_customize_life_cycle?
+ title_container.with_column do
+ render(
+ Primer::OpenProject::DragHandle.new(
+ data: { "projects--settings--border-box-filter-target": "hideWhenFiltering" }
+ )
+ )
+ end
+ end
+ title_container.with_column(classes: "ellipsis", test_selector: "project-life-cycle-step-definition-name") do
+ render(
+ if allowed_to_customize_life_cycle?
+ Primer::Beta::Link.new(
+ classes: "filter-target-visible-text",
+ href: edit_admin_settings_project_life_cycle_step_definition_path(definition),
+ font_weight: :bold
+ )
+ else
+ Primer::Beta::Text.new(
+ font_weight: :bold
+ )
+ end
+ ) do
+ definition.name
+ end
+ end
+ title_container.with_column do
+ render(Projects::LifeCycleTypeComponent.new(definition))
+ end
+ title_container.with_column(classes: "no-wrap") do
+ render(Primer::Beta::Text.new) { t("project.count", count: definition.project_count) }
+ end
+ end
+
+ if allowed_to_customize_life_cycle?
+ row_container.with_column do
+ render(Primer::Alpha::ActionMenu.new) do |menu|
+ menu.with_show_button(icon: "kebab-horizontal", "aria-label": t(:button_actions), scheme: :invisible)
+
+ menu.with_item(
+ label: t(:label_edit),
+ href: edit_admin_settings_project_life_cycle_step_definition_path(definition)
+ ) do |item|
+ item.with_leading_visual_icon(icon: :pencil)
+ end
+
+ unless first?
+ move_action(menu:, move_to: :highest, label: t("label_agenda_item_move_to_top"), icon: "move-to-top")
+ move_action(menu:, move_to: :higher, label: t("label_agenda_item_move_up"), icon: "chevron-up")
+ end
+ unless last?
+ move_action(menu:, move_to: :lower, label: t("label_agenda_item_move_down"), icon: "chevron-down")
+ move_action(menu:, move_to: :lowest, label: t("label_agenda_item_move_to_bottom"), icon: "move-to-bottom")
+ end
+
+ menu.with_item(
+ label: t(:text_destroy),
+ scheme: :danger,
+ href: admin_settings_project_life_cycle_step_definition_path(definition),
+ form_arguments: {
+ method: :delete,
+ data: {
+ confirm: t("text_are_you_sure_with_project_life_cycle_step")
+ }
+ }
+ ) do |item|
+ item.with_leading_visual_icon(icon: :trash)
+ end
+ end
+ end
+ end
+ end
+%>
diff --git a/app/components/settings/project_life_cycle_step_definitions/row_component.rb b/app/components/settings/project_life_cycle_step_definitions/row_component.rb
new file mode 100644
index 00000000000..1e6de58ad6a
--- /dev/null
+++ b/app/components/settings/project_life_cycle_step_definitions/row_component.rb
@@ -0,0 +1,60 @@
+# 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 Settings
+ module ProjectLifeCycleStepDefinitions
+ class RowComponent < ApplicationComponent
+ include OpPrimer::ComponentHelpers
+ include Projects::LifeCycleDefinitionHelper
+
+ alias_method :definition, :model
+
+ options :first?,
+ :last?
+
+ private
+
+ def move_action(menu:, move_to:, label:, icon:)
+ menu.with_item(
+ label:,
+ href: move_admin_settings_project_life_cycle_step_definition_path(definition, move_to:),
+ form_arguments: {
+ method: :patch
+ },
+ data: {
+ "projects--settings--border-box-filter-target": "hideWhenFiltering"
+ }
+ ) do |item|
+ item.with_leading_visual_icon(icon:)
+ end
+ end
+ end
+ end
+end
diff --git a/app/components/settings/text_setting_component.html.erb b/app/components/settings/text_setting_component.html.erb
index b03e90698f3..e8bfd0d0cad 100644
--- a/app/components/settings/text_setting_component.html.erb
+++ b/app/components/settings/text_setting_component.html.erb
@@ -31,7 +31,7 @@ See COPYRIGHT and LICENSE files for more details.
<%# Empty label for styling only %>
- <%= styled_label_tag "lang", '' %>
+ <%= styled_label_tag "lang", "" %>
<%=
styled_select_tag(
@@ -39,7 +39,7 @@ See COPYRIGHT and LICENSE files for more details.
options_for_select(helpers.lang_options_for_select(false), current_language.to_s),
id: "lang-for-#{name}",
class: "lang-select-switch",
- container_class: '-slim'
+ container_class: "-slim"
)
%>
@@ -60,15 +60,15 @@ See COPYRIGHT and LICENSE files for more details.
+<%= render(WorkPackages::Types::ExportTemplateListComponent.new(type: model)) %>
diff --git a/app/components/work_packages/types/export_configuration_component.rb b/app/components/work_packages/types/export_configuration_component.rb
new file mode 100644
index 00000000000..17f5ff5c67a
--- /dev/null
+++ b/app/components/work_packages/types/export_configuration_component.rb
@@ -0,0 +1,36 @@
+# 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 WorkPackages
+ module Types
+ class ExportConfigurationComponent < ApplicationComponent
+ end
+ end
+end
diff --git a/app/components/work_packages/types/export_template_list_component.html.erb b/app/components/work_packages/types/export_template_list_component.html.erb
new file mode 100644
index 00000000000..75c03fd5e32
--- /dev/null
+++ b/app/components/work_packages/types/export_template_list_component.html.erb
@@ -0,0 +1,88 @@
+<%#-- 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.
+
+++#%>
+
+<%=
+ component_wrapper(data: wrapper_data_attributes) do
+ render(border_box_container(mb: 3, data: drag_and_drop_target_config)) do |component|
+ component.with_header(font_weight: :bold, py: 2) do
+ flex_layout(justify_content: :space_between, align_items: :center) do |section_header_container|
+ section_header_container.with_column(py: 2) do
+ render(Primer::Beta::Text.new(font_weight: :bold)) do
+ I18n.t("types.edit.export_configuration.pdf_export_templates.label")
+ end
+ end
+ section_header_container.with_column(flex_layout: true, justify_content: :flex_end) do |actions_container|
+ actions_container.with_column do
+ render(
+ Primer::Beta::Button.new(
+ tag: :a,
+ href: enable_all_type_pdf_export_template_index_path(type_id: @type.id),
+ scheme: :invisible,
+ font_weight: :bold,
+ color: :subtle,
+ "aria-label": t("projects.settings.actions.label_enable_all"),
+ data: { "turbo-method": :put, "turbo-stream": true, test_selector: "enable-all-pdf-export-templates" }
+ )
+ ) do |button|
+ button.with_leading_visual_icon(icon: "check-circle", color: :subtle)
+ I18n.t("types.edit.export_configuration.pdf_export_templates.actions.label_enable_all")
+ end
+ end
+ actions_container.with_column do
+ render(
+ Primer::Beta::Button.new(
+ tag: :a,
+ href: disable_all_type_pdf_export_template_index_path(type_id: @type.id),
+ scheme: :invisible,
+ font_weight: :bold,
+ color: :subtle,
+ "aria-label": t("projects.settings.actions.label_disable_all"),
+ data: { "turbo-method": :put, "turbo-stream": true, test_selector: "disable-all-pdf-export-templates" }
+ )
+ ) do |button|
+ button.with_leading_visual_icon(icon: "x-circle", color: :subtle)
+ I18n.t("types.edit.export_configuration.pdf_export_templates.actions.label_disable_all")
+ end
+ end
+ end
+ end
+ end
+ @type.pdf_export_templates.list.each do |template|
+ component.with_row(data: draggable_item_config(template)) do
+ render(
+ WorkPackages::Types::ExportTemplateRowComponent.new(
+ type: @type,
+ template:
+ )
+ )
+ end
+ end
+ end
+ end
+%>
diff --git a/app/components/work_packages/types/export_template_list_component.rb b/app/components/work_packages/types/export_template_list_component.rb
new file mode 100644
index 00000000000..d8c98231e2b
--- /dev/null
+++ b/app/components/work_packages/types/export_template_list_component.rb
@@ -0,0 +1,70 @@
+# 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 WorkPackages
+ module Types
+ class ExportTemplateListComponent < ApplicationComponent
+ include ApplicationHelper
+ include OpPrimer::ComponentHelpers
+ include OpTurbo::Streamable
+
+ def initialize(type:)
+ super
+
+ @type = type
+ end
+
+ def wrapper_data_attributes
+ {
+ controller: "generic-drag-and-drop",
+ "application-target": "dynamic"
+ }
+ end
+
+ def drag_and_drop_target_config
+ {
+ "is-drag-and-drop-target": true,
+ "target-container-accessor": "& > ul",
+ "target-allowed-drag-type": "template",
+ test_selector: "pdf-export-template-rows"
+ }
+ end
+
+ def draggable_item_config(template)
+ {
+ "draggable-id": template.id,
+ "draggable-type": "template",
+ "drop-url": drop_type_pdf_export_template_path(type_id: @type.id, id: template.id),
+ test_selector: "pdf-export-template-row-#{template.id}"
+ }
+ end
+ end
+ end
+end
diff --git a/app/components/work_packages/types/export_template_row_component.html.erb b/app/components/work_packages/types/export_template_row_component.html.erb
new file mode 100644
index 00000000000..89278f32145
--- /dev/null
+++ b/app/components/work_packages/types/export_template_row_component.html.erb
@@ -0,0 +1,61 @@
+<%#-- 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.
+
+++#%>
+<%=
+ component_wrapper do
+ flex_layout(align_items: :center) do |item_information|
+ item_information.with_column(mr: 2) do
+ render(Primer::OpenProject::DragHandle.new(draggable: true))
+ end
+ item_information.with_column(flex: 1, flex_layout: true) do |title_container|
+ title_container.with_column(pt: 1, mr: 2) do
+ render(Primer::Beta::Text.new) do
+ @template.label
+ end
+ end
+ title_container.with_column(pt: 1, mr: 2) do
+ render(Primer::Beta::Text.new(font_size: :small, color: :subtle)) do
+ @template.caption
+ end
+ end
+ end
+ item_information.with_column(py: 1, mr: 2) do
+ render(Primer::Alpha::ToggleSwitch.new(
+ src: toggle_type_pdf_export_template_path(type_id: @type.id, id: @template.id),
+ csrf_token: form_authenticity_token,
+ data: { "turbo-method": :post, "turbo-stream": true },
+ checked: @template.enabled,
+ size: :small,
+ status_label_position: :start,
+ test_selector: "toggle-pdf-export-template-row-#{@template.id}",
+ classes: "op-primer-adjustments__toggle-switch--hidden-loading-indicator"
+ ))
+ end
+ end
+ end
+%>
diff --git a/app/components/work_packages/types/export_template_row_component.rb b/app/components/work_packages/types/export_template_row_component.rb
new file mode 100644
index 00000000000..07d9a9aaff2
--- /dev/null
+++ b/app/components/work_packages/types/export_template_row_component.rb
@@ -0,0 +1,45 @@
+# 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 WorkPackages
+ module Types
+ class ExportTemplateRowComponent < ApplicationComponent
+ include ApplicationHelper
+ include OpPrimer::ComponentHelpers
+ include OpTurbo::Streamable
+ def initialize(type:, template:)
+ super
+
+ @template = template
+ @type = type
+ end
+ end
+ end
+end
diff --git a/app/components/work_packages/types/pattern_input.html.erb b/app/components/work_packages/types/pattern_input.html.erb
new file mode 100644
index 00000000000..3cbe1035a35
--- /dev/null
+++ b/app/components/work_packages/types/pattern_input.html.erb
@@ -0,0 +1,95 @@
+<%#-- 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.
+
+++#%>
+
+<%=
+ render(
+ FormControl.new(
+ input: @input,
+ classes: "pattern-input",
+ "data-controller": "pattern-input",
+ "data-pattern-input-pattern-initial-value": @value,
+ "data-pattern-input-suggestions-initial-value": suggestions_for_stimulus
+ )
+ ) do
+%>
+ <%= content_tag(:div, **@field_wrap_arguments) do %>
+ <%= @input.builder.hidden_field(name, value: @value, data: { "pattern-input-target": "formInput" }) %>
+
+
+ <%= render(Primer::Beta::Label.new(tag: :span, scheme: :accent, "data-role": :token)) %>
+
+
+
+ <%= render(Primer::Alpha::ActionList::Heading.new(title: "__placeholder__", heading_level: 2)) %>
+
+
+
+ <%= render(Primer::Alpha::ActionList::Divider.new) %>
+
+
+
+ <%=
+ render(
+ Primer::Alpha::ActionList::Item.new(
+ list: suggestions_list_component,
+ label: "__placeholder__",
+ role: "menuitem",
+ data: {
+ prop: "__placeholder__",
+ action: "click->pattern-input#suggestions_select"
+ }
+ )
+ )
+ %>
+
+
+ <%=
+ render(
+ Primer::BaseComponent.new(
+ tag: :div,
+ contenteditable: true,
+ border: true, border_radius: 2, p: 1, classes: :input,
+ "data-pattern-input-target": "content",
+ data: {
+ action: "keydown->pattern-input#input_keydown
+ input->pattern-input#input_change
+ mouseup->pattern-input#input_mouseup
+ focus->pattern-input#input_focus
+ blur->pattern-input#input_blur"
+ }
+ )
+ )
+ %>
+ <%= render(Primer::BaseComponent.new(tag: :div, box_shadow: :medium, border_radius: 2)) do %>
+
+ <%= render(suggestions_list_component) %>
+
+ <% end %>
+ <% end %>
+<% end %>
diff --git a/app/components/work_packages/types/pattern_input.rb b/app/components/work_packages/types/pattern_input.rb
new file mode 100644
index 00000000000..2151e5f87e0
--- /dev/null
+++ b/app/components/work_packages/types/pattern_input.rb
@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2024 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 WorkPackages
+ module Types
+ class PatternInput < Primer::Forms::BaseComponent
+ prepend Primer::OpenProject::Forms::WrappedInput
+
+ delegate :name, to: :@input
+
+ def initialize(input:, value:, suggestions:)
+ super()
+ @input = input
+ @value = value
+ @suggestions = suggestions
+ end
+
+ def suggestions_for_stimulus
+ @suggestions_for_stimulus ||= @suggestions
+ .transform_keys { |key| key.to_s.humanize }
+ .to_json
+ end
+
+ def suggestions_list_component
+ @suggestions_list_component ||= Primer::Alpha::ActionList.new(
+ role: :list,
+ scheme: :inset,
+ ml: 0,
+ "data-pattern-input-target": "suggestions"
+ )
+ end
+ end
+ end
+end
diff --git a/app/components/work_packages/types/pattern_input.sass b/app/components/work_packages/types/pattern_input.sass
new file mode 100644
index 00000000000..ce3e1eb9fb4
--- /dev/null
+++ b/app/components/work_packages/types/pattern_input.sass
@@ -0,0 +1,9 @@
+.pattern-input
+ .input
+ white-space: pre-wrap
+
+ &:focus,
+ &:focus-visible
+ border-color: var(--focus-outlineColor) !important
+ box-shadow: inset 0 0 0 1px var(--focus-outlineColor)
+ outline: none
diff --git a/app/views/projects/settings/_form_toolbar.html.erb b/app/components/work_packages/types/settings_component.html.erb
similarity index 91%
rename from app/views/projects/settings/_form_toolbar.html.erb
rename to app/components/work_packages/types/settings_component.html.erb
index 0ec768f8942..f9c74101ee8 100644
--- a/app/views/projects/settings/_form_toolbar.html.erb
+++ b/app/components/work_packages/types/settings_component.html.erb
@@ -27,6 +27,8 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
-
- (<%= check_all_links form_name %>)
-
+<%=
+ primer_form_with(**form_options) do |f|
+ render(WorkPackages::Types::SettingsForm.new(f))
+ end
+%>
diff --git a/app/components/work_packages/types/settings_component.rb b/app/components/work_packages/types/settings_component.rb
new file mode 100644
index 00000000000..97699f45cf6
--- /dev/null
+++ b/app/components/work_packages/types/settings_component.rb
@@ -0,0 +1,63 @@
+# 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 WorkPackages
+ module Types
+ class SettingsComponent < ApplicationComponent
+ include OpPrimer::ComponentHelpers
+ include OpTurbo::Streamable
+
+ def initialize(model, copy_workflow_from: nil, **)
+ @copy_workflow_from = copy_workflow_from
+ super(model, **)
+ end
+
+ def form_options
+ if model.new_record?
+ create_form_options
+ else
+ update_form_options
+ end
+ end
+
+ private
+
+ attr_reader :copy_workflow_from
+
+ def create_form_options
+ { url: types_path, method: :post, model:, copy_workflow_from: }
+ end
+
+ def update_form_options
+ { url: update_tab_type_path(id: model.id, tab: :settings), method: :patch, model: }
+ end
+ end
+ end
+end
diff --git a/app/components/op_primer/flash_component.erb b/app/components/work_packages/types/subject_configuration_component.html.erb
similarity index 83%
rename from app/components/op_primer/flash_component.erb
rename to app/components/work_packages/types/subject_configuration_component.html.erb
index 2f2cb190f3a..6597b015094 100644
--- a/app/components/op_primer/flash_component.erb
+++ b/app/components/work_packages/types/subject_configuration_component.html.erb
@@ -28,15 +28,11 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
<%=
- render(Primer::BaseComponent.new(
- tag: :div,
- classes: "op-primer-flash--item",
- data: {
- "flash-target": "item",
- "autohide": @autohide,
- unique_key: @unique_key
- }.compact
- )) do
- render_parent
+ render(EnterpriseEdition::BannerComponent.new(:automatic_subject_generation, mb: 3))
+%>
+
+<%=
+ primer_form_with(**form_options) do |f|
+ render(WorkPackages::Types::SubjectConfigurationForm.new(f))
end
%>
diff --git a/app/components/work_packages/types/subject_configuration_component.rb b/app/components/work_packages/types/subject_configuration_component.rb
new file mode 100644
index 00000000000..b4688b84f77
--- /dev/null
+++ b/app/components/work_packages/types/subject_configuration_component.rb
@@ -0,0 +1,66 @@
+# 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 WorkPackages
+ module Types
+ class SubjectConfigurationComponent < ApplicationComponent
+ include OpPrimer::ComponentHelpers
+ include OpTurbo::Streamable
+
+ def form_options
+ form_model = subject_form_object
+
+ {
+ url: subject_configuration_type_path(id: model.id),
+ method: :put,
+ model: form_model,
+ data: {
+ application_target: "dynamic",
+ controller: "admin--subject-configuration",
+ admin__subject_configuration_hide_pattern_input_value: form_model.subject_configuration == :manual
+ }
+ }
+ end
+
+ private
+
+ def subject_form_object
+ subject_pattern = model.patterns.subject || ::Types::Pattern.new(blueprint: "", enabled: false)
+
+ ::Types::Forms::SubjectConfigurationFormModel.new(
+ subject_configuration: subject_pattern.enabled ? :generated : :manual,
+ pattern: subject_pattern.blueprint,
+ suggestions: ::Types::Patterns::TokenPropertyMapper.new.tokens_for_type(model),
+ validation_errors: model.errors
+ )
+ end
+ end
+ end
+end
diff --git a/app/components/workflows/page_header_component.html.erb b/app/components/workflows/page_header_component.html.erb
index 8ba1be2e573..0c989933946 100644
--- a/app/components/workflows/page_header_component.html.erb
+++ b/app/components/workflows/page_header_component.html.erb
@@ -32,24 +32,28 @@ See COPYRIGHT and LICENSE files for more details.
header.with_title { title }
header.with_breadcrumbs(breadcrumb_items)
- header.with_action_button(tag: :a,
- mobile_icon: :copy,
- mobile_label: t(:button_copy),
- size: :medium,
- href: copy_workflows_path,
- aria: { label: I18n.t(:button_copy) },
- title: I18n.t(:button_copy)) do |button|
+ header.with_action_button(
+ tag: :a,
+ mobile_icon: :copy,
+ mobile_label: t(:button_copy),
+ size: :medium,
+ href: copy_workflows_path,
+ aria: { label: I18n.t(:button_copy) },
+ title: I18n.t(:button_copy)
+ ) do |button|
button.with_leading_visual_icon(icon: :copy)
t(:button_copy)
end
- header.with_action_button(tag: :a,
- mobile_icon: :info,
- mobile_label: t(:label_workflow_summary),
- size: :medium,
- href: workflows_path,
- aria: { label: I18n.t(:label_workflow_summary) },
- title: I18n.t(:label_workflow_summary)) do |button|
+ header.with_action_button(
+ tag: :a,
+ mobile_icon: :info,
+ mobile_label: t(:label_workflow_summary),
+ size: :medium,
+ href: workflows_path,
+ aria: { label: I18n.t(:label_workflow_summary) },
+ title: I18n.t(:label_workflow_summary)
+ ) do |button|
button.with_leading_visual_icon(icon: :info)
t(:label_workflow_summary)
end
diff --git a/app/contracts/api_tokens/create_contract.rb b/app/contracts/api_tokens/create_contract.rb
index f9c3d93484f..b4835e55eb6 100644
--- a/app/contracts/api_tokens/create_contract.rb
+++ b/app/contracts/api_tokens/create_contract.rb
@@ -32,7 +32,7 @@ module APITokens
class CreateContract < BaseContract
attribute :token_name
- validates :token_name, presence: { message: I18n.t("my.access_token.errors.token_name_blank") }
+ validates :token_name, presence: { message: proc { I18n.t("my.access_token.errors.token_name_blank") } }
validate :token_name_is_unique, unless: :token_name_is_blank?
private
diff --git a/app/contracts/base_contract.rb b/app/contracts/base_contract.rb
index 6e91a78285c..cc9b288889c 100644
--- a/app/contracts/base_contract.rb
+++ b/app/contracts/base_contract.rb
@@ -283,11 +283,29 @@ class BaseContract < Disposable::Twin
end
end
- def with_merged_former_errors
+ def validate_and_merge_errors(contract)
+ # Duplicating errors beforehand, in case the other contract shares
+ # the errors with us (because by default contracts reuse the errors
+ # of the model they validate) to prevent that existing errors are cleaned
+ # during validation
former_errors = errors.dup
- yield
+ contract.validate
- errors.merge!(former_errors)
+ # Another side effect of sharing errors is that they may have already been added to
+ # our list of errors, after the validation was executed, so we manually filter out
+ # duplicates.
+ # To avoid looping over all the errors we just added (forever), we copy the errors of the
+ # contract into an array first
+ contract_errors = contract.errors.each.to_a
+ merge_errors_deduplicated(former_errors.chain(contract_errors))
+ end
+
+ def merge_errors_deduplicated(other_errors)
+ other_errors.each do |e|
+ # This is why we can't have nice things: https://github.com/rails/rails/issues/54483
+ options = e.options.except(*ActiveModel::Error::CALLBACKS_OPTIONS + ActiveModel::Error::MESSAGE_OPTIONS)
+ errors.add(e.attribute, e.type, **e.options) unless errors.added?(e.attribute, e.type, options)
+ end
end
end
diff --git a/app/contracts/composed_contract.rb b/app/contracts/composed_contract.rb
new file mode 100644
index 00000000000..200b9e01dc3
--- /dev/null
+++ b/app/contracts/composed_contract.rb
@@ -0,0 +1,94 @@
+# 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.
+#++
+
+##
+# A contract that allows to compose itself from other contracts like:
+#
+# class MyContract < ComposedContract
+# include_contract MyOtherContractA
+# include_contract MyOtherContractB
+# end
+#
+# This allows to run the smaller contracts separately, but also to have one contract
+# that validates the model as a whole. The composed contract will make sure that all attributes
+# defined as writable in one contract are also considered writable in other contracts.
+#
+# It's not possible to add validations to the composed contract directly. If you need additional validations,
+# extract them into a separate contract that you include in the composed contract.
+class ComposedContract
+ class << self
+ def included_contract_classes
+ @included_contract_classes ||= []
+ end
+
+ def include_contract(contract_class)
+ included_contract_classes << contract_class
+ end
+ end
+
+ attr_reader :errors, :model, :writable_attributes
+
+ def initialize(model, user, options: {})
+ @model = model
+ @user = user
+ @options = options
+
+ @errors = ActiveModel::Errors.new(model)
+ @writable_attributes = []
+ end
+
+ def validate
+ errors.clear
+ included_contracts.each do |subcontract|
+ subcontract.validate
+ errors.merge!(subcontract.errors)
+ end
+
+ errors.empty?
+ end
+
+ def valid?
+ validate
+ end
+
+ private
+
+ def included_contracts
+ @included_contracts ||= begin
+ contracts = self.class.included_contract_classes.map { |klass| klass.new(model, @user, options: @options) }
+ all_writable_attributes = (writable_attributes + contracts.flat_map(&:writable_attributes)).uniq
+ contracts.each do |subcontract|
+ subcontract.writable_attributes.append(*all_writable_attributes)
+ end
+
+ contracts
+ end
+ end
+end
diff --git a/app/contracts/custom_fields/hierarchy/update_item_contract.rb b/app/contracts/custom_fields/hierarchy/update_item_contract.rb
index 01c12c87340..614cd121ab7 100644
--- a/app/contracts/custom_fields/hierarchy/update_item_contract.rb
+++ b/app/contracts/custom_fields/hierarchy/update_item_contract.rb
@@ -52,6 +52,7 @@ module CustomFields
rule(:short) do
next if schema_error?(:item)
+ next unless key?
key.failure(:not_unique) if values[:item].siblings.exists?(short: value)
end
diff --git a/app/contracts/model_contract.rb b/app/contracts/model_contract.rb
index efa06281f33..35cdf5b58c6 100644
--- a/app/contracts/model_contract.rb
+++ b/app/contracts/model_contract.rb
@@ -48,7 +48,7 @@ class ModelContract < BaseContract
# This of course is only true if that contract validates the model and
# if the model has an errors object.
def valid?(context = nil)
- model.valid? if validate_model?
+ model.valid?(context) if validate_model?
contract_valid?(context, clear_errors: !validate_model?)
end
@@ -61,7 +61,8 @@ class ModelContract < BaseContract
# Clearing would then be done in the #valid? method by calling model.valid?
# * Checks for readonly attributes being changed
def contract_valid?(context = nil, clear_errors: false)
- current_context, self.validation_context = validation_context, context # rubocop:disable Style/ParallelAssignment
+ current_context = validation_context
+ self.validation_context = context
errors.clear if clear_errors
diff --git a/app/contracts/project_life_cycle_steps/base_contract.rb b/app/contracts/project_life_cycle_steps/base_contract.rb
new file mode 100644
index 00000000000..62ea58b5721
--- /dev/null
+++ b/app/contracts/project_life_cycle_steps/base_contract.rb
@@ -0,0 +1,85 @@
+#-- 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 ProjectLifeCycleSteps
+ class BaseContract < ::ModelContract
+ validate :select_custom_fields_permission
+ validate :consecutive_steps_have_increasing_dates
+
+ def valid?(context = :saving_life_cycle_steps) = super
+
+ def select_custom_fields_permission
+ return if user.allowed_in_project?(:edit_project_stages_and_gates, model)
+
+ errors.add :base, :error_unauthorized
+ end
+
+ def consecutive_steps_have_increasing_dates
+ # Filter out steps with missing dates before proceeding with comparison
+ filtered_steps = model.available_life_cycle_steps.select(&:start_date)
+
+ # Only proceed with comparisons if there are at least 2 valid steps
+ return if filtered_steps.size < 2
+
+ # Compare consecutive steps in pairs
+ filtered_steps.each_cons(2) do |previous_step, current_step|
+ if has_invalid_dates?(previous_step, current_step)
+ step = previous_step.is_a?(Project::Stage) ? "Stage" : "Gate"
+ field = current_step.is_a?(Project::Stage) ? :date_range : :date
+ model.errors.import(
+ current_step.errors.add(field, :non_continuous_dates, step:),
+ attribute: :"available_life_cycle_steps.#{field}"
+ )
+ end
+ end
+ end
+
+ private
+
+ def start_date_for(step)
+ step.start_date
+ end
+
+ def end_date_for(step)
+ case step
+ when Project::Gate
+ step.date
+ when Project::Stage
+ step.end_date || step.start_date # Use the start_date as fallback for single date stages
+ end
+ end
+
+ def has_invalid_dates?(previous_step, current_step)
+ if previous_step.instance_of?(current_step.class)
+ start_date_for(current_step) <= end_date_for(previous_step)
+ else
+ start_date_for(current_step) < end_date_for(previous_step)
+ end
+ end
+ end
+end
diff --git a/app/contracts/project_life_cycle_steps/update_contract.rb b/app/contracts/project_life_cycle_steps/update_contract.rb
new file mode 100644
index 00000000000..28b22227eaa
--- /dev/null
+++ b/app/contracts/project_life_cycle_steps/update_contract.rb
@@ -0,0 +1,32 @@
+#-- 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 ProjectLifeCycleSteps
+ class UpdateContract < BaseContract
+ end
+end
diff --git a/app/contracts/projects/base_contract.rb b/app/contracts/projects/base_contract.rb
index 8b8fa191161..3188d4f09f1 100644
--- a/app/contracts/projects/base_contract.rb
+++ b/app/contracts/projects/base_contract.rb
@@ -57,6 +57,8 @@ module Projects
validate :validate_user_allowed_to_manage
+ def valid?(context = :saving_custom_fields) = super
+
def assignable_parents
Project
.allowed_to(user, :add_subprojects)
@@ -142,9 +144,7 @@ module Projects
contract_klass = model.being_archived? ? ArchiveContract : UnarchiveContract
contract = contract_klass.new(model, user)
- with_merged_former_errors do
- contract.validate
- end
+ validate_and_merge_errors(contract)
end
end
end
diff --git a/app/contracts/relations/base_contract.rb b/app/contracts/relations/base_contract.rb
index 82c4d5edc2e..cf6d293eb68 100644
--- a/app/contracts/relations/base_contract.rb
+++ b/app/contracts/relations/base_contract.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -34,7 +36,7 @@ module Relations
attribute :from
attribute :to
- validate :manage_relations_permission?
+ validate :validate_user_allowed
validate :validate_from_exists
validate :validate_to_exists
validate :validate_nodes_relatable
@@ -47,16 +49,22 @@ module Relations
private
def validate_from_exists
- errors.add :from, :error_not_found unless visible_work_packages.exists? model.from_id
+ errors.add :from_id, :error_not_found unless visible_work_packages.exists? model.from_id
end
def validate_to_exists
- errors.add :to, :error_not_found unless visible_work_packages.exists? model.to_id
+ errors.add :to_id, :error_not_found unless visible_work_packages.exists? model.to_id
end
def validate_nodes_relatable
- if (model.from_id_changed? || model.to_id_changed?) &&
- WorkPackage.relatable(model.from, model.relation_type, ignored_relation: model).where(id: model.to_id).empty?
+ # when creating a relation from the work package relations tab and not selecting a WorkPackage
+ # the to_id is not set
+ # in this case we only want to show the "WorkPackage can't be blank" error instead of a
+ # misleading circular dependencies error
+ # the error is added by the `validate_from_exists` and `validate_to_exists` methods
+ return if to_id_or_from_id_nil?
+
+ if relation_changed? && circular_dependency?
errors.add :base, I18n.t(:"activerecord.errors.messages.circular_dependency")
end
end
@@ -67,12 +75,26 @@ module Relations
errors.add :relation_type, :inclusion
end
- def manage_relations_permission?
+ def validate_user_allowed
+ return if model.to_id.nil? || model.from_id.nil?
+
unless manage_relations?
errors.add :base, :error_unauthorized
end
end
+ def to_id_or_from_id_nil?
+ model.to_id.nil? || model.from_id.nil?
+ end
+
+ def relation_changed?
+ model.from_id_changed? || model.to_id_changed?
+ end
+
+ def circular_dependency?
+ WorkPackage.relatable(model.from, model.relation_type, ignored_relation: model).where(id: model.to_id).empty?
+ end
+
def visible_work_packages
::WorkPackage.visible(user)
end
diff --git a/app/contracts/relations/update_contract.rb b/app/contracts/relations/update_contract.rb
index 78be6df8ff6..401836b9d4a 100644
--- a/app/contracts/relations/update_contract.rb
+++ b/app/contracts/relations/update_contract.rb
@@ -34,11 +34,11 @@ module Relations
private
def from_immutable
- errors.add :from, :error_readonly if from_id_changed_and_not_swapped?
+ errors.add :from_id, :error_readonly if from_id_changed_and_not_swapped?
end
def to_immutable
- errors.add :to, :error_readonly if to_id_changed_and_not_swapped?
+ errors.add :to_id, :error_readonly if to_id_changed_and_not_swapped?
end
def from_id_changed_and_not_swapped?
diff --git a/app/contracts/reminders/base_contract.rb b/app/contracts/reminders/base_contract.rb
new file mode 100644
index 00000000000..6f2767ccf5c
--- /dev/null
+++ b/app/contracts/reminders/base_contract.rb
@@ -0,0 +1,91 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 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 Reminders
+ class BaseContract < ::ModelContract
+ MAX_NOTE_CHARS_LENGTH = 128
+
+ attribute :creator_id
+ attribute :remindable_id
+ attribute :remindable_type
+ attribute :remind_at
+ attribute :note
+
+ validate :validate_creator_exists
+ validate :validate_acting_user
+ validate :validate_remindable_exists
+ validate :validate_manage_reminders_permissions
+ validate :validate_remind_at_present
+ validate :validate_remind_at_is_in_future
+ validate :validate_note_length
+
+ def self.model = Reminder
+
+ private
+
+ def validate_creator_exists
+ errors.add :creator, :not_found unless User.exists?(model.creator_id)
+ end
+
+ def validate_acting_user
+ errors.add :creator, :invalid unless model.creator_id == user.id
+ end
+
+ def validate_remindable_exists
+ errors.add :remindable, :not_found if model.remindable.blank?
+ end
+
+ def validate_remind_at_present
+ errors.add :remind_at, :blank if model.remind_at.blank?
+ end
+
+ def validate_remind_at_is_in_future
+ if model.remind_at.present? && model.remind_at < Time.current
+ errors.add :remind_at, :datetime_must_be_in_future
+ end
+ end
+
+ def validate_note_length
+ if model.note.present? && model.note.length > MAX_NOTE_CHARS_LENGTH
+ errors.add :note, :too_long, count: MAX_NOTE_CHARS_LENGTH
+ end
+ end
+
+ def validate_manage_reminders_permissions
+ return if errors.added?(:remindable, :not_found)
+
+ unless can_manage_reminders?
+ errors.add :base, :error_unauthorized
+ end
+ end
+
+ def can_manage_reminders?
+ user.logged? && user.allowed_in_project?(:view_work_packages, model.remindable.project)
+ end
+ end
+end
diff --git a/app/contracts/reminders/create_contract.rb b/app/contracts/reminders/create_contract.rb
new file mode 100644
index 00000000000..6bc3c01eb76
--- /dev/null
+++ b/app/contracts/reminders/create_contract.rb
@@ -0,0 +1,32 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 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 Reminders
+ class CreateContract < BaseContract
+ end
+end
diff --git a/app/contracts/reminders/delete_contract.rb b/app/contracts/reminders/delete_contract.rb
new file mode 100644
index 00000000000..06895868e6c
--- /dev/null
+++ b/app/contracts/reminders/delete_contract.rb
@@ -0,0 +1,36 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 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 Reminders
+ class DeleteContract < ::DeleteContract
+ delete_permission -> {
+ # The user can delete the reminder if they created it
+ model.creator_id == user.id
+ }
+ end
+end
diff --git a/app/contracts/reminders/update_contract.rb b/app/contracts/reminders/update_contract.rb
new file mode 100644
index 00000000000..de462cfec17
--- /dev/null
+++ b/app/contracts/reminders/update_contract.rb
@@ -0,0 +1,41 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 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 Reminders
+ class UpdateContract < BaseContract
+ validate :unchangeable_attributes
+
+ private
+
+ def unchangeable_attributes
+ if model.remindable_changed? || model.creator_id_changed?
+ errors.add(:base, :unchangeable)
+ end
+ end
+ end
+end
diff --git a/app/contracts/types/base_contract.rb b/app/contracts/types/base_contract.rb
index 5f8c5b02db9..4f189e300fd 100644
--- a/app/contracts/types/base_contract.rb
+++ b/app/contracts/types/base_contract.rb
@@ -42,6 +42,7 @@ module Types
attribute :project_ids
attribute :description
attribute :attribute_groups
+ attribute :patterns
validate :validate_current_user_is_admin
validate :validate_attribute_group_names
diff --git a/app/contracts/views/base_contract.rb b/app/contracts/views/base_contract.rb
index 008a53b1ff6..12e506fd3b1 100644
--- a/app/contracts/views/base_contract.rb
+++ b/app/contracts/views/base_contract.rb
@@ -42,9 +42,7 @@ module Views
if (strategy_class = Constants::Views.contract_strategy(model.type))
strategy = strategy_class.new(model, user)
- with_merged_former_errors do
- strategy.valid?
- end
+ validate_and_merge_errors(strategy)
end
errors.empty?
diff --git a/app/contracts/work_packages/update_contract.rb b/app/contracts/work_packages/update_contract.rb
index b25158caed0..7d325f4bdc7 100644
--- a/app/contracts/work_packages/update_contract.rb
+++ b/app/contracts/work_packages/update_contract.rb
@@ -48,6 +48,10 @@ module WorkPackages
default_attribute_permission :edit_work_packages
attribute_permission :project_id, :move_work_packages
+ def can_set_parent?
+ @can.allowed?(model, :manage_subtasks)
+ end
+
private
def user_allowed_to_edit
diff --git a/app/controllers/admin/custom_fields/custom_field_projects_controller.rb b/app/controllers/admin/custom_fields/custom_field_projects_controller.rb
index 3d7dbcd3370..390ad5ddf7f 100644
--- a/app/controllers/admin/custom_fields/custom_field_projects_controller.rb
+++ b/app/controllers/admin/custom_fields/custom_field_projects_controller.rb
@@ -58,7 +58,7 @@ class Admin::CustomFields::CustomFieldProjectsController < ApplicationController
def create
create_service = ::CustomFields::CustomFieldProjects::BulkCreateService
- .new(user: current_user, projects: @projects, custom_field: @custom_field,
+ .new(user: current_user, projects: @projects, model: @custom_field,
include_sub_projects: include_sub_projects?)
.call
diff --git a/app/controllers/admin/custom_fields/hierarchy/items_controller.rb b/app/controllers/admin/custom_fields/hierarchy/items_controller.rb
index 2b27fba7eaf..731de1b0c88 100644
--- a/app/controllers/admin/custom_fields/hierarchy/items_controller.rb
+++ b/app/controllers/admin/custom_fields/hierarchy/items_controller.rb
@@ -104,7 +104,7 @@ module Admin
.delete_branch(item: @active_item)
.either(
->(_) { update_via_turbo_stream(component: ItemsComponent.new(item: @active_item.parent)) },
- ->(errors) { update_flash_message_via_turbo_stream(message: errors.full_messages, scheme: :danger) }
+ ->(errors) { render_error_flash_message_via_turbo_stream(message: errors.full_messages) }
)
respond_with_turbo_streams(&:html)
diff --git a/app/controllers/admin/settings/enumerations_controller_base.rb b/app/controllers/admin/settings/enumerations_controller_base.rb
new file mode 100644
index 00000000000..214e0ce9422
--- /dev/null
+++ b/app/controllers/admin/settings/enumerations_controller_base.rb
@@ -0,0 +1,154 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 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 Admin
+ module Settings
+ class EnumerationsControllerBase < ApplicationController
+ extend ActiveSupport::Concern
+ include OpTurbo::ComponentStream
+
+ before_action :require_admin
+ before_action :find_enumeration, only: %i[edit update destroy move reassign]
+ layout "admin"
+
+ helper_method :index_component_class
+
+ def index
+ @enumerations = enumeration_class.all
+ end
+
+ def new
+ @enumeration = enumeration_class.new
+ end
+
+ def edit; end
+
+ def create
+ @enumeration = enumeration_class.new(enumeration_permitted_params)
+
+ if @enumeration.save
+ flash[:notice] = I18n.t(:notice_successful_update)
+ redirect_to(action: :index)
+ else
+ render action: :new, status: :unprocessable_entity
+ end
+ end
+
+ def update
+ if @enumeration.update(enumeration_permitted_params)
+ flash[:notice] = I18n.t(:notice_successful_update)
+ redirect_to(action: :index)
+ else
+ render action: :edit, status: :unprocessable_entity
+ end
+ end
+
+ def destroy
+ if @enumeration.in_use?
+ handle_reassignment_on_deletion
+ elsif @enumeration.destroy
+ flash[:notice] = I18n.t(:notice_successful_delete)
+ redirect_to(action: :index)
+ else
+ flash.now[:error] = I18n.t(:error_can_not_delete_entry)
+ redirect_to(action: :index)
+ end
+ end
+
+ def move
+ if @enumeration.update(move_params)
+ render_success_flash_message_via_turbo_stream(
+ message: I18n.t(:enumeration_caption_order_changed)
+ )
+ else
+ render_error_flash_message_via_turbo_stream(
+ message: I18n.t(:enumeration_could_not_be_moved)
+ )
+ end
+
+ replace_via_turbo_stream(
+ component: index_component_class.new(enumerations: enumeration_class.all)
+ )
+
+ respond_with_turbo_streams
+ end
+
+ def reassign
+ @other_enumerations = enumeration_class.all - [@enumeration]
+ end
+
+ def default_breadcrumb; end
+
+ private
+
+ def move_params
+ move_to = params[:move_to]
+ position = Integer(params[:position], exception: false)
+
+ if move_to.in? %w(highest higher lower lowest)
+ { move_to: move_to }
+ elsif position
+ { position: position }
+ else
+ {}
+ end
+ end
+
+ def handle_reassignment_on_deletion
+ reassign_to_id = params.dig(:enumeration, :reassign_to_id)
+
+ if reassign_to_id.present?
+ reassign_to = enumeration_class.find_by(id: reassign_to_id)
+ @enumeration.destroy(reassign_to)
+ flash[:notice] = I18n.t(:notice_successful_delete)
+ redirect_to(action: :index)
+ else
+ redirect_to(action: :reassign, id: @enumeration.id)
+ end
+ end
+
+ def find_enumeration
+ @enumeration = enumeration_class.find(params[:id])
+ end
+
+ def enumeration_class
+ raise NotImplementedError
+ end
+
+ def enumeration_permitted_params
+ permitted_params.enumerations
+ end
+
+ def index_component_class
+ ::Admin::Enumerations::IndexComponent
+ end
+ end
+ end
+end
diff --git a/app/controllers/admin/settings/project_custom_fields_controller.rb b/app/controllers/admin/settings/project_custom_fields_controller.rb
index 4c2bfce929d..0786974f7b1 100644
--- a/app/controllers/admin/settings/project_custom_fields_controller.rb
+++ b/app/controllers/admin/settings/project_custom_fields_controller.rb
@@ -82,7 +82,7 @@ module Admin::Settings
def link
create_service = ProjectCustomFieldProjectMappings::BulkCreateService
- .new(user: current_user, projects: @projects, project_custom_field: @custom_field,
+ .new(user: current_user, projects: @projects, model: @custom_field,
include_sub_projects: include_sub_projects?)
.call
diff --git a/app/controllers/admin/settings/project_life_cycle_step_definitions_controller.rb b/app/controllers/admin/settings/project_life_cycle_step_definitions_controller.rb
new file mode 100644
index 00000000000..363e8038a7d
--- /dev/null
+++ b/app/controllers/admin/settings/project_life_cycle_step_definitions_controller.rb
@@ -0,0 +1,145 @@
+# 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 Admin::Settings
+ class ProjectLifeCycleStepDefinitionsController < ::Admin::SettingsController
+ include FlashMessagesOutputSafetyHelper
+ include OpTurbo::ComponentStream
+ include Projects::LifeCycleDefinitionHelper
+
+ menu_item :project_life_cycle_step_definitions_settings
+
+ before_action :check_feature_flag
+ before_action :require_enterprise_token, except: %i[index]
+
+ before_action :find_definitions, only: %i[index]
+ before_action :find_definition, only: %i[edit update destroy move drop]
+
+ def index; end
+
+ def new_stage
+ @definition = Project::StageDefinition.new
+
+ render :form
+ end
+
+ def new_gate
+ @definition = Project::GateDefinition.new
+
+ render :form
+ end
+
+ def edit
+ render :form
+ end
+
+ def create
+ @definition = Project::LifeCycleStepDefinition.new(definition_params)
+
+ if @definition.save
+ flash[:notice] = I18n.t(:notice_successful_create)
+ redirect_to action: :index, status: :see_other
+ else
+ render :form, status: :unprocessable_entity
+ end
+ end
+
+ def update
+ if @definition.update(definition_params)
+ flash[:notice] = I18n.t(:notice_successful_update)
+ redirect_to action: :index, status: :see_other
+ else
+ render :form, status: :unprocessable_entity
+ end
+ end
+
+ def destroy
+ if @definition.destroy
+ render_success_flash_message_via_turbo_stream(message: I18n.t(:notice_successful_delete))
+ else
+ render_error_flash_message_via_turbo_stream(message: join_flash_messages(@definition.errors.full_messages))
+ end
+
+ update_definitions_via_turbo_stream
+
+ respond_to_with_turbo_streams
+ end
+
+ def move
+ unless @definition.update(params.permit(:move_to))
+ render_error_flash_message_via_turbo_stream(message: join_flash_messages(@definition.errors.full_messages))
+ end
+
+ update_definitions_via_turbo_stream
+
+ respond_to_with_turbo_streams
+ end
+
+ def drop
+ unless @definition.update(params.permit(:position))
+ render_error_flash_message_via_turbo_stream(message: join_flash_messages(@definition.errors.full_messages))
+ end
+
+ update_definitions_via_turbo_stream
+
+ respond_to_with_turbo_streams
+ end
+
+ private
+
+ def check_feature_flag
+ render_404 unless OpenProject::FeatureDecisions.stages_and_gates_active?
+ end
+
+ def require_enterprise_token
+ render_402 unless allowed_to_customize_life_cycle?
+ end
+
+ def find_definitions
+ @definitions = Project::LifeCycleStepDefinition.with_project_count
+ end
+
+ def find_definition
+ @definition = Project::LifeCycleStepDefinition.find(params[:id])
+ end
+
+ def definition_params
+ params.require(:project_life_cycle_step_definition).permit(:type, :name, :color_id)
+ end
+
+ def update_definitions_via_turbo_stream
+ update_via_turbo_stream(
+ component: Settings::ProjectLifeCycleStepDefinitions::IndexComponent.new(
+ definitions: find_definitions
+ )
+ )
+ end
+ end
+end
diff --git a/app/controllers/admin/settings/work_package_priorities_controller.rb b/app/controllers/admin/settings/work_package_priorities_controller.rb
new file mode 100644
index 00000000000..83b46ad6e28
--- /dev/null
+++ b/app/controllers/admin/settings/work_package_priorities_controller.rb
@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 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 Admin::Settings
+ class WorkPackagePrioritiesController < EnumerationsControllerBase
+ menu_item :priorities
+
+ private
+
+ def enumeration_class
+ IssuePriority
+ end
+ end
+end
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 8a554ac032f..790cdd4504a 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -43,7 +43,7 @@ class AdminController < ApplicationController
condition = node.condition
name === :admin_overview ||
- (condition && !condition.call) ||
+ (condition && !condition.call(nil)) ||
hidden_admin_menu_items.include?(name.to_s)
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 609198f726f..657e26c1116 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -345,7 +345,7 @@ class ApplicationController < ActionController::Base
params[:back_url] || request.env["HTTP_REFERER"]
end
- def redirect_back_or_default(default, use_escaped = true)
+ def redirect_back_or_default(default, use_escaped: true, status: :found)
policy = RedirectPolicy.new(
params[:back_url],
hostname: request.host,
@@ -353,7 +353,7 @@ class ApplicationController < ActionController::Base
return_escaped: use_escaped
)
- redirect_to policy.redirect_url
+ redirect_to(policy.redirect_url, status:)
end
# Picks which layout to use based on the request
diff --git a/app/controllers/concerns/accounts/authorization.rb b/app/controllers/concerns/accounts/authorization.rb
index 3d4227a43de..93320f71eb1 100644
--- a/app/controllers/concerns/accounts/authorization.rb
+++ b/app/controllers/concerns/accounts/authorization.rb
@@ -196,5 +196,27 @@ module Accounts::Authorization
generally_allowed: authorization_ensured[:generally_allowed],
controller: self }
end
+
+ # Authorize on the given permission
+ def authorize_with_permission(permission, global: false, **args)
+ authorization_checked_by_default_action(**args.slice(:only, :except))
+
+ before_action(**args) do
+ do_authorize(permission, global:)
+ end
+ end
+
+ # Find a project based on params[:project_id]
+ # and authorize on a given permission
+ def load_and_authorize_with_permission_in_optional_project(permission, **args)
+ authorization_checked_by_default_action(**args.slice(:only, :except))
+
+ before_action(**args) do
+ @project = Project.find(params[:project_id]) if params[:project_id].present?
+ do_authorize(permission, global: params[:project_id].blank?)
+ rescue ActiveRecord::RecordNotFound
+ render_404
+ end
+ end
end
end
diff --git a/app/controllers/concerns/op_turbo/component_stream.rb b/app/controllers/concerns/op_turbo/component_stream.rb
index 6d3b3fa2716..ed75e2d0113 100644
--- a/app/controllers/concerns/op_turbo/component_stream.rb
+++ b/app/controllers/concerns/op_turbo/component_stream.rb
@@ -42,23 +42,24 @@ module OpTurbo
alias_method :respond_with_turbo_streams, :respond_to_with_turbo_streams
- def update_via_turbo_stream(component:, status: :ok)
- modify_via_turbo_stream(component:, action: :update, status:)
+ def update_via_turbo_stream(component:, status: :ok, method: nil)
+ modify_via_turbo_stream(component:, action: :update, status:, method:)
end
- def replace_via_turbo_stream(component:, status: :ok)
- modify_via_turbo_stream(component:, action: :replace, status:)
+ def replace_via_turbo_stream(component:, status: :ok, method: nil)
+ modify_via_turbo_stream(component:, action: :replace, status:, method:)
end
def remove_via_turbo_stream(component:, status: :ok)
modify_via_turbo_stream(component:, action: :remove, status:)
end
- def modify_via_turbo_stream(component:, action:, status:)
+ def modify_via_turbo_stream(component:, action:, status:, method: nil)
@turbo_status = status
turbo_streams << component.render_as_turbo_stream(
view_context:,
- action:
+ action:,
+ method:
)
end
@@ -74,11 +75,15 @@ module OpTurbo
turbo_streams << target_component.insert_as_turbo_stream(component:, view_context:, action: :before)
end
- def render_error_flash_message_via_turbo_stream(**kwargs)
- update_flash_message_via_turbo_stream(**kwargs.merge(scheme: :danger, icon: :stop))
+ def render_success_flash_message_via_turbo_stream(**)
+ render_flash_message_via_turbo_stream(**, scheme: :success)
end
- def update_flash_message_via_turbo_stream(message:, component: OpPrimer::FlashComponent, **)
+ def render_error_flash_message_via_turbo_stream(**)
+ render_flash_message_via_turbo_stream(**, scheme: :danger, icon: :stop)
+ end
+
+ def render_flash_message_via_turbo_stream(message:, component: OpPrimer::FlashComponent, **)
instance = component.new(**).with_content(message)
turbo_streams << instance.render_as_turbo_stream(view_context:, action: :flash)
end
@@ -89,6 +94,16 @@ module OpTurbo
.render_in(view_context)
end
+ def add_caption_to_input_element_via_turbo_stream(target, caption:, clean_other_captions: true)
+ turbo_streams << OpTurbo::StreamComponent
+ .new(action: :addInputCaption, target:, caption:, clean_other_captions:)
+ .render_in(view_context)
+ end
+
+ def close_dialog_via_turbo_stream(target)
+ turbo_streams << OpTurbo::StreamComponent.new(action: :closeDialog, target:).render_in(view_context)
+ end
+
def turbo_streams
@turbo_streams ||= []
end
diff --git a/app/controllers/concerns/projects/life_cycle_definition_helper.rb b/app/controllers/concerns/projects/life_cycle_definition_helper.rb
new file mode 100644
index 00000000000..76cc76672e3
--- /dev/null
+++ b/app/controllers/concerns/projects/life_cycle_definition_helper.rb
@@ -0,0 +1,37 @@
+# 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 Projects::LifeCycleDefinitionHelper
+ private
+
+ def allowed_to_customize_life_cycle?
+ EnterpriseToken.allows_to?(:customize_life_cycle)
+ end
+end
diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb
index 2beb4cfd0ff..c280ec2dfeb 100644
--- a/app/controllers/custom_fields_controller.rb
+++ b/app/controllers/custom_fields_controller.rb
@@ -30,14 +30,17 @@ class CustomFieldsController < ApplicationController
include CustomFields::SharedActions # share logic with ProjectCustomFieldsControlller
layout "admin"
+ # rubocop:disable Rails/LexicallyScopedActionFilter
before_action :require_admin
before_action :find_custom_field, only: %i(edit update destroy delete_option reorder_alphabetical)
before_action :prepare_custom_option_position, only: %i(update create)
before_action :find_custom_option, only: :delete_option
+ before_action :validate_enterprise_token, only: %i(create)
+ # rubocop:enable Rails/LexicallyScopedActionFilter
def index
# loading wp cfs exclicity to allow for eager loading
- @custom_fields_by_type = CustomField.all
+ @custom_fields_by_type = CustomField
.where.not(type: ["WorkPackageCustomField", "ProjectCustomField"])
.group_by { |f| f.class.name }
@@ -64,6 +67,12 @@ class CustomFieldsController < ApplicationController
false
end
+ def validate_enterprise_token
+ if params.dig(:custom_field, :field_format) == "hierarchy" && !EnterpriseToken.allows_to?(:custom_field_hierarchies)
+ render_403
+ end
+ end
+
def find_custom_field
@custom_field = CustomField.find(params[:id])
rescue ActiveRecord::RecordNotFound
diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb
deleted file mode 100644
index c1b2be5ec7d..00000000000
--- a/app/controllers/enumerations_controller.rb
+++ /dev/null
@@ -1,120 +0,0 @@
-#-- 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 EnumerationsController < ApplicationController
- layout "admin"
-
- before_action :require_admin
- before_action :find_enumeration, only: %i[edit update move destroy]
-
- include CustomFieldsHelper
-
- def index; end
-
- def new
- enum_class = enumeration_class(permitted_params.enumeration_type)
- if enum_class
- @enumeration = enum_class.new
- else
- render_400 # bad request
- end
- end
-
- def edit; end
-
- def create
- enum_params = permitted_params.enumerations
- type = permitted_params.enumeration_type
- @enumeration = (enumeration_class(type) || Enumeration).new do |e|
- e.attributes = enum_params
- end
-
- if @enumeration.save
- flash[:notice] = I18n.t(:notice_successful_create)
- redirect_to action: "index", type: @enumeration.type
- else
- render action: :new, status: :unprocessable_entity
- end
- end
-
- def update
- enum_params = permitted_params.enumerations
- type = permitted_params.enumeration_type
- @enumeration.type = enumeration_class(type).try(:name) || @enumeration.type
- if @enumeration.update enum_params
- flash[:notice] = I18n.t(:notice_successful_update)
- redirect_to enumerations_path(type: @enumeration.type)
- else
- render action: :edit, status: :unprocessable_entity
- end
- end
-
- def destroy
- if !@enumeration.in_use?
- # No associated objects
- @enumeration.destroy
- redirect_to action: "index"
- return
- elsif params[:reassign_to_id]
- if reassign_to = @enumeration.class.find_by(id: params[:reassign_to_id])
- @enumeration.destroy(reassign_to)
- redirect_to action: "index"
- return
- end
- end
- @enumerations = @enumeration.class.all - [@enumeration]
- end
-
- def move
- if @enumeration.update(permitted_params.enumerations_move)
- flash[:notice] = I18n.t(:notice_successful_update)
- redirect_to enumerations_path
- else
- flash.now[:error] = I18n.t(:error_type_could_not_be_saved)
- render action: :edit, status: :unprocessable_entity
- end
- end
-
- protected
-
- def show_local_breadcrumb
- false
- end
-
- def default_breadcrumb; end
-
- def find_enumeration
- @enumeration = Enumeration.find(params[:id])
- end
-
- ##
- # Find an enumeration class with the given name
- def enumeration_class(type)
- Enumeration.registered_subclasses.detect { |cls| cls.name == type }
- end
-end
diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 434b7686ffd..414248f8161 100644
--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -35,7 +35,6 @@ class ForumsController < ApplicationController
accept_key_auth :show
include SortHelper
- include WatchersHelper
include PaginationHelper
def index
diff --git a/app/controllers/projects/settings/life_cycle_steps_controller.rb b/app/controllers/projects/settings/life_cycle_steps_controller.rb
new file mode 100644
index 00000000000..c28a3b12ab9
--- /dev/null
+++ b/app/controllers/projects/settings/life_cycle_steps_controller.rb
@@ -0,0 +1,81 @@
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2010-2024 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 Projects::Settings::LifeCycleStepsController < Projects::SettingsController
+ include OpTurbo::ComponentStream
+
+ before_action :deny_access_on_feature_flag
+
+ before_action :load_life_cycle_definitions, only: %i[index enable_all disable_all]
+
+ menu_item :settings_life_cycle_steps
+
+ def index; end
+
+ def toggle
+ definition = Project::LifeCycleStepDefinition.where(id: params[:id])
+
+ upsert_steps(definition, active: params["value"])
+ end
+
+ def disable_all
+ upsert_steps(@life_cycle_definitions, active: false)
+
+ redirect_to action: :index
+ end
+
+ def enable_all
+ upsert_steps(@life_cycle_definitions, active: true)
+
+ redirect_to action: :index
+ end
+
+ private
+
+ def load_life_cycle_definitions
+ @life_cycle_definitions = Project::LifeCycleStepDefinition.order(position: :asc)
+ end
+
+ def deny_access_on_feature_flag
+ deny_access(not_found: true) unless OpenProject::FeatureDecisions.stages_and_gates_active?
+ end
+
+ def upsert_steps(definitions, active:)
+ Project::LifeCycleStep.upsert_all(
+ definitions.map do |definition|
+ {
+ project_id: @project.id,
+ definition_id: definition.id,
+ active:,
+ type: definition.step_class
+ }
+ end,
+ unique_by: %i[project_id definition_id]
+ )
+ end
+end
diff --git a/app/controllers/sys_controller.rb b/app/controllers/sys_controller.rb
index b12087027fe..95e9132540a 100644
--- a/app/controllers/sys_controller.rb
+++ b/app/controllers/sys_controller.rb
@@ -43,6 +43,24 @@ class SysController < ActionController::Base
end
end
+ def fetch_changesets
+ projects = []
+ if params[:id]
+ projects << Project.active.has_module(:repository).find_by!(identifier: params[:id])
+ else
+ projects = Project.active.has_module(:repository)
+ .includes(:repository).references(:repositories)
+ end
+ projects.each do |project|
+ if project.repository
+ project.repository.fetch_changesets
+ end
+ end
+ head :ok
+ rescue ActiveRecord::RecordNotFound
+ head :not_found
+ end
+
private
def authorized?(project, user)
diff --git a/app/controllers/types_controller.rb b/app/controllers/types_controller.rb
index 8534e384390..b7f5af4f812 100644
--- a/app/controllers/types_controller.rb
+++ b/app/controllers/types_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -51,28 +53,22 @@ class TypesController < ApplicationController
if params[:tab].blank?
redirect_to tab: :settings
else
- type = ::Type
- .includes(:projects,
- :custom_fields)
- .find(params[:id])
-
+ type = ::Type.includes(:projects, :custom_fields).find(params[:id])
render_edit_tab(type)
end
end
- def create # rubocop:disable Metrics/AbcSize
+ def create
CreateTypeService
.new(current_user)
- .call(permitted_type_params, copy_workflow_from: params[:copy_workflow_from]) do |call|
+ .call(permitted_type_params, copy_workflow_from: params.dig(:type, :copy_workflow_from)) do |call|
@type = call.result
call.on_success do
redirect_to_type_tab_path(@type, t(:notice_successful_create))
end
- call.on_failure do |result|
- flash[:error] = result.errors.full_messages.join("\n")
- load_projects_and_types
+ call.on_failure do
render action: :new, status: :unprocessable_entity
end
end
@@ -82,14 +78,8 @@ class TypesController < ApplicationController
UpdateTypeService
.new(@type, current_user)
.call(permitted_type_params) do |call|
- call.on_success do
- redirect_to_type_tab_path(@type, t(:notice_successful_update))
- end
-
- call.on_failure do |result|
- flash[:error] = result.errors.full_messages.join("\n")
- render_edit_tab(@type)
- end
+ call.on_success { redirect_to_type_tab_path(@type, t(:notice_successful_update)) }
+ call.on_failure { render_edit_tab(@type, status: :unprocessable_entity) }
end
end
@@ -135,16 +125,15 @@ class TypesController < ApplicationController
def redirect_to_type_tab_path(type, notice)
tab = params["tab"] || "settings"
- redirect_to(edit_type_tab_path(type, tab:),
- notice:)
+ redirect_to(edit_tab_type_path(type, tab:), notice:, status: :see_other)
end
- def render_edit_tab(type)
+ def render_edit_tab(type, status: :ok)
@tab = params[:tab]
@projects = Project.all
@type = type
- render action: :edit, status: :unprocessable_entity
+ render action: :edit, status:
end
def show_local_breadcrumb
diff --git a/app/controllers/users/hover_card_controller.rb b/app/controllers/users/hover_card_controller.rb
new file mode 100644
index 00000000000..714c09a9658
--- /dev/null
+++ b/app/controllers/users/hover_card_controller.rb
@@ -0,0 +1,37 @@
+# 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 Users::HoverCardController < ApplicationController
+ no_authorization_required! :show
+
+ def show
+ @id = params[:id]
+ render layout: nil
+ end
+end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d667d29e9c4..c257e1949e4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -148,17 +150,17 @@ class UsersController < ApplicationController
render_400 unless %i(activate lock unlock).include? @status_change
end
- def change_status
+ def change_status # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity
if @user.id == current_user.id
# user is not allowed to change own status
- redirect_back_or_default(action: "edit", id: @user)
+ redirect_back_or_default({ action: "edit", id: @user })
return
end
if (params[:unlock] || params[:activate]) && user_limit_reached?
show_user_limit_error!
- return redirect_back_or_default(action: "edit", id: @user)
+ return redirect_back_or_default({ action: "edit", id: @user })
end
if params[:unlock]
@@ -184,10 +186,10 @@ class UsersController < ApplicationController
flash[:error] = I18n.t("user.error_status_change_failed",
errors: @user.errors.full_messages.join(", "))
end
- redirect_back_or_default(action: "edit", id: @user)
+ redirect_back_or_default({ action: "edit", id: @user })
end
- def resend_invitation
+ def resend_invitation # rubocop:disable Metrics/AbcSize
status = Principal.statuses[:invited]
@user.update status: status if @user.status != status
@@ -286,7 +288,7 @@ class UsersController < ApplicationController
false
end
- def build_user_update_params
+ def build_user_update_params # rubocop:disable Metrics/AbcSize
pref_params = permitted_params.pref.to_h
update_params = permitted_params
.user_create_as_admin(@user.uses_external_authentication?, @user.change_password_allowed?)
@@ -303,10 +305,8 @@ class UsersController < ApplicationController
force_password_change: true
)
elsif set_password? params
- update_params.merge!(
- password: params[:user][:password],
- password_confirmation: params[:user][:password_confirmation]
- )
+ update_params[:password] = params[:user][:password]
+ update_params[:password_confirmation] = params[:user][:password_confirmation]
end
update_params
diff --git a/app/controllers/wiki_menu_items_controller.rb b/app/controllers/wiki_menu_items_controller.rb
index 51ad5b23af8..5a6950474d1 100644
--- a/app/controllers/wiki_menu_items_controller.rb
+++ b/app/controllers/wiki_menu_items_controller.rb
@@ -101,7 +101,7 @@ class WikiMenuItemsController < ApplicationController
flash[:notice] = t(:notice_successful_update)
end
- redirect_back_or_default(action: "edit", id: @page)
+ redirect_back_or_default({ action: "edit", id: @page })
else
respond_to do |format|
format.html do
diff --git a/app/controllers/work_package_children_relations_controller.rb b/app/controllers/work_package_children_relations_controller.rb
new file mode 100644
index 00000000000..603ca0abbc7
--- /dev/null
+++ b/app/controllers/work_package_children_relations_controller.rb
@@ -0,0 +1,122 @@
+# 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 WorkPackageChildrenRelationsController < ApplicationController
+ include OpTurbo::ComponentStream
+ include OpTurbo::DialogStreamHelper
+
+ before_action :set_work_package
+
+ before_action :authorize # Short-circuit early if not authorized
+
+ def new
+ component = WorkPackageRelationsTab::AddWorkPackageChildDialogComponent
+ .new(work_package: @work_package)
+ respond_with_dialog(component)
+ end
+
+ def create
+ service_result = create_service_result
+
+ if service_result.failure?
+ update_via_turbo_stream(
+ component: WorkPackageRelationsTab::AddWorkPackageChildFormComponent.new(work_package: @work_package,
+ child: service_result.result,
+ base_errors: base_errors(service_result.errors)),
+ status: :bad_request
+ )
+ end
+
+ respond_with_relations_tab_update(service_result, relation_to_scroll_to: service_result.result)
+ end
+
+ def destroy
+ child = WorkPackage.find(params[:id])
+ service_result = set_relation(child:, parent: nil)
+
+ respond_with_relations_tab_update(service_result)
+ end
+
+ private
+
+ def create_service_result
+ if params[:work_package][:id].present?
+ child = WorkPackage.find(params[:work_package][:id])
+ set_relation(child:, parent: @work_package)
+ else
+ child = WorkPackage.new
+ child.errors.add(:id, :blank)
+ ServiceResult.failure(result: child)
+ end
+ end
+
+ def set_relation(child:, parent:)
+ if allowed_to_set_parent?(child)
+ WorkPackages::UpdateService.new(user: current_user, model: child)
+ .call(parent:)
+ else
+ child.errors.add(:id, :cannot_add_child_because_of_lack_of_permission)
+ ServiceResult.failure(result: child)
+ end
+ end
+
+ def allowed_to_set_parent?(child)
+ contract = WorkPackages::UpdateContract.new(child, current_user)
+ contract.can_set_parent?
+ end
+
+ def respond_with_relations_tab_update(service_result, **)
+ if service_result.success?
+ @work_package.reload
+ component = WorkPackageRelationsTab::IndexComponent.new(work_package: @work_package, **)
+ replace_via_turbo_stream(component:)
+ render_success_flash_message_via_turbo_stream(message: I18n.t(:notice_successful_update))
+
+ respond_with_turbo_streams
+ else
+ respond_with_turbo_streams(status: :unprocessable_entity)
+ end
+ end
+
+ def set_work_package
+ @work_package = WorkPackage.find(params[:work_package_id])
+ @project = @work_package.project
+ end
+
+ def base_errors(errors)
+ if errors[:base].present?
+ errors[:base]
+ elsif errors[:id].present?
+ nil
+ else
+ errors.full_messages
+ end
+ end
+end
diff --git a/app/controllers/work_package_relations_controller.rb b/app/controllers/work_package_relations_controller.rb
new file mode 100644
index 00000000000..e949dec1758
--- /dev/null
+++ b/app/controllers/work_package_relations_controller.rb
@@ -0,0 +1,137 @@
+# 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 WorkPackageRelationsController < ApplicationController
+ include OpTurbo::ComponentStream
+ include OpTurbo::DialogStreamHelper
+
+ before_action :set_work_package
+ before_action :set_relation, except: %i[new create]
+ before_action :authorize
+
+ def new
+ @relation = @work_package.relations.build(
+ from: @work_package,
+ relation_type: params[:relation_type]
+ )
+
+ respond_with_dialog(
+ WorkPackageRelationsTab::WorkPackageRelationDialogComponent
+ .new(work_package: @work_package, relation: @relation)
+ )
+ end
+
+ def edit
+ respond_with_dialog(
+ WorkPackageRelationsTab::WorkPackageRelationDialogComponent
+ .new(work_package: @work_package, relation: @relation)
+ )
+ end
+
+ def create
+ service_result = Relations::CreateService.new(user: current_user)
+ .call(create_relation_params)
+
+ if service_result.failure?
+ update_via_turbo_stream(
+ component: WorkPackageRelationsTab::WorkPackageRelationFormComponent.new(work_package: @work_package,
+ relation: service_result.result,
+ base_errors: service_result.errors[:base]),
+ status: :bad_request
+ )
+ end
+
+ respond_with_relations_tab_update(service_result, relation_to_scroll_to: service_result.result)
+ end
+
+ def update
+ service_result = Relations::UpdateService
+ .new(user: current_user,
+ model: @relation)
+ .call(update_relation_params)
+
+ respond_with_relations_tab_update(service_result)
+
+ if service_result.failure?
+ update_via_turbo_stream(
+ component: WorkPackageRelationsTab::WorkPackageRelationFormComponent.new(work_package: @work_package,
+ relation: service_result.result,
+ base_errors: service_result.errors[:base]),
+ status: :bad_request
+ )
+ end
+ end
+
+ def destroy
+ service_result = Relations::DeleteService.new(user: current_user, model: @relation).call
+
+ respond_with_relations_tab_update(service_result)
+ end
+
+ private
+
+ def respond_with_relations_tab_update(service_result, **)
+ if service_result.success?
+ @work_package.reload
+ component = WorkPackageRelationsTab::IndexComponent.new(work_package: @work_package, **)
+ replace_via_turbo_stream(component:)
+ render_success_flash_message_via_turbo_stream(message: I18n.t(:notice_successful_update))
+
+ respond_with_turbo_streams
+ else
+ respond_with_turbo_streams(status: :unprocessable_entity)
+ end
+ end
+
+ def set_work_package
+ @work_package = WorkPackage.find(params[:work_package_id])
+ end
+
+ def set_relation
+ @relation = @work_package.relations.find(params[:id])
+ end
+
+ def create_relation_params
+ if params[:relation][:from_id].present?
+ params.require(:relation)
+ .permit(:relation_type, :from_id, :description, :lag)
+ .merge(to_id: @work_package.id)
+ else
+ params.require(:relation)
+ .permit(:relation_type, :to_id, :description, :lag)
+ .merge(from_id: @work_package.id)
+ end
+ end
+
+ def update_relation_params
+ params.require(:relation)
+ .permit(:description, :lag)
+ end
+end
diff --git a/app/controllers/work_package_relations_tab_controller.rb b/app/controllers/work_package_relations_tab_controller.rb
new file mode 100644
index 00000000000..097b4b8296e
--- /dev/null
+++ b/app/controllers/work_package_relations_tab_controller.rb
@@ -0,0 +1,57 @@
+#-- 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 WorkPackageRelationsTabController < ApplicationController
+ include OpTurbo::ComponentStream
+
+ before_action :set_work_package
+ before_action :authorize_global
+
+ def index
+ component = WorkPackageRelationsTab::IndexComponent.new(work_package: @work_package)
+
+ respond_to do |format|
+ format.html do
+ render(component, layout: false)
+ end
+ format.turbo_stream do
+ replace_via_turbo_stream(component:)
+ render turbo_stream: turbo_streams
+ end
+ end
+ end
+
+ private
+
+ def set_work_package
+ @work_package = WorkPackage.find(params[:work_package_id])
+ @project = @work_package.project # required for authorization via before_action
+ rescue ActiveRecord::RecordNotFound
+ render_404
+ end
+end
diff --git a/app/controllers/work_packages/activities_tab_controller.rb b/app/controllers/work_packages/activities_tab_controller.rb
index 93ac7ba6cde..2b824dc6b5e 100644
--- a/app/controllers/work_packages/activities_tab_controller.rb
+++ b/app/controllers/work_packages/activities_tab_controller.rb
@@ -43,7 +43,8 @@ class WorkPackages::ActivitiesTabController < ApplicationController
WorkPackages::ActivitiesTab::IndexComponent.new(
work_package: @work_package,
filter: @filter,
- last_server_timestamp: get_current_server_timestamp
+ last_server_timestamp: get_current_server_timestamp,
+ deferred: ActiveRecord::Type::Boolean.new.cast(params[:deferred])
),
layout: false
)
@@ -374,6 +375,7 @@ class WorkPackages::ActivitiesTabController < ApplicationController
# alternative approach in order to bypass the notification join issue in relation with the sequence_version query
Notification
.where(journal_id: journals.pluck(:id))
+ .where(recipient_id: User.current.id)
.where("notifications.updated_at > ?", last_update_timestamp)
.find_each do |notification|
update_item_show_component(
diff --git a/app/controllers/work_packages/bulk_controller.rb b/app/controllers/work_packages/bulk_controller.rb
index f2938d63a95..54b072003da 100644
--- a/app/controllers/work_packages/bulk_controller.rb
+++ b/app/controllers/work_packages/bulk_controller.rb
@@ -48,7 +48,7 @@ class WorkPackages::BulkController < ApplicationController
if @call.success?
flash[:notice] = t(:notice_successful_update)
- redirect_back_or_default(controller: "/work_packages", action: :index, project_id: @project)
+ redirect_back_or_default({ controller: "/work_packages", action: :index, project_id: @project })
else
flash[:error] = bulk_error_message(@work_packages, @call)
setup_edit
diff --git a/app/controllers/work_packages/dialogs_controller.rb b/app/controllers/work_packages/dialogs_controller.rb
new file mode 100644
index 00000000000..d3fdd1fbc93
--- /dev/null
+++ b/app/controllers/work_packages/dialogs_controller.rb
@@ -0,0 +1,105 @@
+# 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 WorkPackages::DialogsController < ApplicationController
+ include OpTurbo::ComponentStream
+ include OpTurbo::DialogStreamHelper
+ layout false
+
+ before_action :find_project_by_project_id
+ before_action :build_work_package, only: %i[new]
+
+ authorize_with_permission :add_work_packages
+
+ def new
+ respond_with_dialog WorkPackages::Dialogs::CreateDialogComponent.new(work_package: @work_package, project: @project)
+ end
+
+ def create
+ call = WorkPackages::CreateService.new(user: current_user).call(create_params)
+
+ if call.success?
+ flash[:notice] = I18n.t("work_package_relations_tab.relations.label_new_child_created")
+ redirect_back fallback_location: project_work_package_path(@project, call.result), status: :see_other
+ else
+ form_component = WorkPackages::Dialogs::CreateFormComponent.new(work_package: call.result, project: @project)
+ update_via_turbo_stream(component: form_component, status: :bad_request)
+
+ respond_with_turbo_streams
+ end
+ end
+
+ def refresh_form
+ call = WorkPackages::SetAttributesService.new(
+ user: current_user,
+ model: WorkPackage.new,
+ contract_class: EmptyContract
+ ).call(create_params)
+
+ form_component = WorkPackages::Dialogs::CreateFormComponent.new(work_package: call.result, project: @project)
+ update_via_turbo_stream(component: form_component)
+
+ respond_with_turbo_streams
+ end
+
+ private
+
+ def build_work_package
+ initial = WorkPackage.new(project: @project)
+
+ call = WorkPackages::SetAttributesService
+ .new(model: initial, user: current_user, contract_class: WorkPackages::CreateContract)
+ .call(new_params.reverse_merge(default_params(initial)))
+
+ # We ignore errors here, as we only want to build the work package
+ @work_package = call.result
+ @work_package.errors.clear
+ @work_package.custom_values.each { |cv| cv.errors.clear }
+ end
+
+ def new_params
+ params.permit(*PermittedParams.permitted_attributes[:new_work_package])
+ end
+
+ def create_params
+ permitted_params.update_work_package.merge(project: @project)
+ end
+
+ def default_params(work_package)
+ contract = WorkPackages::CreateContract.new(work_package, current_user)
+
+ {
+ type: contract.assignable_types.first,
+ project: @project
+ }
+ end
+
+ def default_breadcrumb; end
+end
diff --git a/app/controllers/work_packages/reminders_controller.rb b/app/controllers/work_packages/reminders_controller.rb
new file mode 100644
index 00000000000..0b4796824ab
--- /dev/null
+++ b/app/controllers/work_packages/reminders_controller.rb
@@ -0,0 +1,198 @@
+# 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 WorkPackages::RemindersController < ApplicationController
+ include OpTurbo::ComponentStream
+ layout false
+ before_action :find_work_package
+ before_action :build_or_find_reminder, only: %i[modal_body create]
+ before_action :find_reminder, only: %i[update destroy]
+
+ before_action :authorize
+
+ def modal_body
+ render modal_component_class.new(
+ remindable: @work_package,
+ reminder: @reminder
+ )
+ end
+
+ def create
+ service_result = Reminders::CreateService.new(user: current_user)
+ .call(reminder_params)
+
+ if service_result.success?
+ render_success_flash_message_via_turbo_stream(message: I18n.t("work_package.reminders.success_creation_message"))
+ respond_with_turbo_streams
+ else
+ prepare_errors_from_result(service_result)
+
+ replace_via_turbo_stream(
+ component: modal_component_class.new(
+ remindable: @work_package,
+ reminder: @reminder,
+ errors: @errors
+ )
+ )
+
+ respond_with_turbo_streams(status: :unprocessable_entity)
+ end
+ end
+
+ def update
+ service_result = Reminders::UpdateService.new(user: current_user,
+ model: @reminder)
+ .call(reminder_params)
+
+ if service_result.success?
+ render_success_flash_message_via_turbo_stream(message: I18n.t("work_package.reminders.success_update_message"))
+ respond_with_turbo_streams
+ else
+ prepare_errors_from_result(service_result)
+
+ replace_via_turbo_stream(
+ component: modal_component_class.new(
+ remindable: @work_package,
+ reminder: @reminder,
+ errors: @errors
+ )
+ )
+
+ respond_with_turbo_streams(status: :unprocessable_entity)
+ end
+ end
+
+ def destroy
+ service_result = Reminders::DeleteService.new(user: current_user,
+ model: @reminder)
+ .call
+
+ if service_result.success?
+ render_success_flash_message_via_turbo_stream(message: I18n.t("work_package.reminders.success_deletion_message"))
+ respond_with_turbo_streams
+ else
+ render_error_flash_message_via_turbo_stream(message: service_result.errors.full_messages)
+ respond_with_turbo_streams(status: :unprocessable_entity)
+ end
+ end
+
+ private
+
+ def modal_component_class
+ WorkPackages::Reminder::ModalBodyComponent
+ end
+
+ def find_work_package
+ @work_package = WorkPackage.visible.find(params[:work_package_id])
+ end
+
+ # At the form level, we split the date and time into two form fields.
+ # In order to be a bit more informative of which field is causing
+ # the remind_at attribute to be in the past/invalid, we need to
+ # remap the error attribute to the appropriate field.
+ def prepare_errors_from_result(service_result)
+ # We set the reminder here for "create" case
+ # as the record comes from the service.
+ @reminder = service_result.result
+ @errors = service_result.errors
+
+ case @errors.find { |error| error.attribute == :remind_at }&.type
+ when :blank
+ handle_blank_error
+ when :datetime_must_be_in_future
+ handle_future_error
+ end
+
+ @errors.delete(:remind_at)
+ end
+
+ def handle_blank_error
+ @errors.add(:remind_at_date, :blank) if remind_at_date.blank?
+ @errors.add(:remind_at_time, :blank) if remind_at_time.blank?
+ end
+
+ def handle_future_error
+ @errors.add(:remind_at_date, :datetime_must_be_in_future) if @reminder.remind_at.to_date < today_in_user_time_zone
+ @errors.add(:remind_at_time, :datetime_must_be_in_future) if @reminder.remind_at < now_in_user_time_zone
+ end
+
+ def now_in_user_time_zone
+ @now_in_user_time_zone ||= Time.current
+ .in_time_zone(User.current.time_zone)
+ end
+
+ def today_in_user_time_zone
+ @today_in_user_time_zone ||= now_in_user_time_zone.to_date
+ end
+
+ # We assume for now that there is only one reminder per work package
+ def build_or_find_reminder
+ @reminder = @work_package.reminders
+ .upcoming_and_visible_to(User.current)
+ .last || @work_package.reminders.build
+ end
+
+ def find_reminder
+ @reminder = @work_package.reminders
+ .upcoming_and_visible_to(User.current)
+ .find(params[:id])
+ rescue ActiveRecord::RecordNotFound
+ render_error_flash_message_via_turbo_stream(message: I18n.t(:error_reminder_not_found))
+ respond_with_turbo_streams(status: :not_found)
+ false
+ end
+
+ def reminder_params
+ params.require(:reminder)
+ .permit(%i[remind_at_date remind_at_time note])
+ .tap do |initial_params|
+ date = initial_params.delete(:remind_at_date)
+ time = initial_params.delete(:remind_at_time)
+
+ initial_params[:remind_at] = build_remind_at_from_params(date, time)
+ initial_params[:remindable] = @work_package
+ initial_params[:creator] = User.current
+ end
+ end
+
+ def build_remind_at_from_params(remind_at_date, remind_at_time)
+ if remind_at_date.present? && remind_at_time.present?
+ DateTime.parse("#{remind_at_date} #{User.current.time_zone.parse(remind_at_time)}")
+ end
+ end
+
+ def remind_at_date
+ params[:reminder][:remind_at_date]
+ end
+
+ def remind_at_time
+ params[:reminder][:remind_at_time]
+ end
+end
diff --git a/app/controllers/work_packages/split_view_controller.rb b/app/controllers/work_packages/split_view_controller.rb
index 4a5a9057d95..5e9389ebc26 100644
--- a/app/controllers/work_packages/split_view_controller.rb
+++ b/app/controllers/work_packages/split_view_controller.rb
@@ -30,8 +30,8 @@ require "rack/utils"
class WorkPackages::SplitViewController < ApplicationController
# Authorization is checked in the find_work_package action
- no_authorization_required! :update_counter
- before_action :find_work_package, only: %i[update_counter]
+ no_authorization_required! :update_counter, :get_relations_counter
+ before_action :find_work_package
def update_counter
respond_to do |format|
@@ -45,6 +45,10 @@ class WorkPackages::SplitViewController < ApplicationController
end
end
+ def get_relations_counter
+ render json: { count: WorkPackageRelationsTab::RelationsMediator.new(work_package: @work_package).all_relations_count }
+ end
+
private
def find_work_package
diff --git a/app/controllers/work_packages/types/pdf_export_template_controller.rb b/app/controllers/work_packages/types/pdf_export_template_controller.rb
new file mode 100644
index 00000000000..f39133f8456
--- /dev/null
+++ b/app/controllers/work_packages/types/pdf_export_template_controller.rb
@@ -0,0 +1,93 @@
+# 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 WorkPackages
+ module Types
+ class PdfExportTemplateController < ApplicationController
+ include OpTurbo::ComponentStream
+ before_action :require_admin
+ before_action :find_type, only: %i[toggle drop enable_all disable_all]
+ before_action :find_template, only: %i[toggle drop]
+
+ def enable_all
+ return render_404_turbo_stream if @type.nil?
+
+ @type.pdf_export_templates.enable_all
+ @type.save!
+ respond_section_with_turbo_streams
+ end
+
+ def disable_all
+ return render_404_turbo_stream if @type.nil?
+
+ @type.pdf_export_templates.disable_all
+ @type.save!
+ respond_section_with_turbo_streams
+ end
+
+ def toggle
+ return render_404_turbo_stream if @template.nil?
+
+ @type.pdf_export_templates.toggle(@template.id)
+ @type.save!
+ respond_with_turbo_streams
+ end
+
+ def drop
+ return render_404_turbo_stream if @template.nil?
+
+ @type.pdf_export_templates.move(@template.id, params[:position].to_i - 1) # drop index starts at 1
+ @type.save!
+ respond_to_with_turbo_streams
+ end
+
+ protected
+
+ def respond_section_with_turbo_streams
+ replace_via_turbo_stream(
+ component: ::WorkPackages::Types::ExportTemplateListComponent.new(type: @type)
+ )
+ respond_to_with_turbo_streams
+ end
+
+ def render_404_turbo_stream
+ render_error_flash_message_via_turbo_stream(message: t(:notice_file_not_found))
+ end
+
+ def find_type
+ @type = ::Type.find(params[:type_id])
+ end
+
+ def find_template
+ @template = @type.pdf_export_templates.find(params[:id])
+ end
+ end
+ end
+end
diff --git a/app/controllers/work_packages/types/subject_configuration_tab_controller.rb b/app/controllers/work_packages/types/subject_configuration_tab_controller.rb
new file mode 100644
index 00000000000..f39837b1c27
--- /dev/null
+++ b/app/controllers/work_packages/types/subject_configuration_tab_controller.rb
@@ -0,0 +1,93 @@
+# 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 WorkPackages
+ module Types
+ class SubjectConfigurationTabController < ApplicationController
+ layout "admin"
+
+ before_action :require_admin
+ before_action :find_type, only: %i[update_subject_configuration]
+
+ def update_subject_configuration
+ form_params = params.require(:types_forms_subject_configuration_form_model)
+ .permit(:subject_configuration, :pattern)
+ .to_h
+
+ UpdateTypeService.new(@type, current_user)
+ .call({ patterns: pattern_collection_update(form_params) }) do |call|
+ call.on_success do
+ redirect_to tab_path, notice: I18n.t(:notice_successful_update)
+ end
+
+ call.on_failure do
+ params[:tab] = "subject_configuration"
+ render template: "types/edit", status: :unprocessable_entity
+ end
+ end
+ end
+
+ private
+
+ def find_type
+ @type = ::Type.find(params[:id])
+ end
+
+ def tab_path = edit_tab_type_path(id: @type.id, tab: :subject_configuration)
+
+ def pattern_collection_update(form_params)
+ patterns = @type.patterns.to_h.symbolize_keys
+
+ subject_pattern =
+ case form_params
+ in { subject_configuration: "generated", pattern: String => blueprint }
+ { subject: { blueprint:, enabled: true } }
+ in { subject_configuration: "manual", pattern: String => blueprint }
+ if blueprint.empty?
+ # Submitting the form with an empty blueprint and manual subject configuration will
+ # remove the subject pattern from the collection
+ nil
+ else
+ { subject: { blueprint:, enabled: false } }
+ end
+ else
+ nil
+ end
+
+ if subject_pattern.nil?
+ patterns.delete(:subject)
+ patterns
+ else
+ patterns.merge(subject_pattern)
+ end
+ end
+ end
+ end
+end
diff --git a/app/controllers/work_packages_controller.rb b/app/controllers/work_packages_controller.rb
index c17fec99524..5040331d917 100644
--- a/app/controllers/work_packages_controller.rb
+++ b/app/controllers/work_packages_controller.rb
@@ -37,13 +37,13 @@ class WorkPackagesController < ApplicationController
accept_key_auth :index, :show
before_action :authorize_on_work_package,
- :project, only: :show
+ :project, only: %i[show generate_pdf_dialog generate_pdf]
before_action :load_and_authorize_in_optional_project,
:check_allowed_export,
:protect_from_unauthorized_export, only: %i[index export_dialog]
before_action :authorize, only: :show_conflict_flash_message
- authorization_checked! :index, :show, :export_dialog
+ authorization_checked! :index, :show, :export_dialog, :generate_pdf_dialog, :generate_pdf
before_action :load_and_validate_query, only: :index, unless: -> { request.format.html? }
before_action :load_work_packages, only: :index, if: -> { request.format.atom? }
@@ -93,10 +93,32 @@ class WorkPackagesController < ApplicationController
respond_with_dialog WorkPackages::Exports::ModalDialogComponent.new(query: @query, project: @project, title: params[:title])
end
+ def generate_pdf_dialog
+ respond_with_dialog WorkPackages::Exports::Generate::ModalDialogComponent.new(work_package: work_package, params: params)
+ end
+
+ def generate_pdf
+ export = work_package_exporter.export!
+ send_data(export.content, type: export.mime_type, filename: export.title)
+ rescue ::Exports::ExportError => e
+ flash[:error] = e.message
+ redirect_back(fallback_location: work_package_path(work_package))
+ end
+
+ def work_package_exporter
+ case params[:template]
+ when "contract"
+ WorkPackage::PDFExport::DocumentGenerator.new(work_package, params)
+ else
+ # when "attributes"
+ WorkPackage::PDFExport::WorkPackageToPdf.new(work_package, params)
+ end
+ end
+
def show_conflict_flash_message
scheme = params[:scheme]&.to_sym || :danger
- update_flash_message_via_turbo_stream(
+ render_flash_message_via_turbo_stream(
component: WorkPackages::UpdateConflictComponent,
scheme:,
message: I18n.t("notice_locking_conflict_#{scheme}"),
diff --git a/app/forms/application_form.rb b/app/forms/application_form.rb
index cb52b5b980f..2fe86546d08 100644
--- a/app/forms/application_form.rb
+++ b/app/forms/application_form.rb
@@ -40,6 +40,11 @@ class ApplicationForm < Primer::Forms::Base
Rails.application.routes.url_helpers
end
+ # @return [ActionView::Base] the view helper instance
+ def helpers
+ @view_context.helpers
+ end
+
# @return [ActiveRecord::Base] the model instance given to the form builder
def model
@builder.object
diff --git a/app/forms/custom_fields/custom_field_rendering.rb b/app/forms/custom_fields/custom_field_rendering.rb
new file mode 100644
index 00000000000..7acd5f4ccb3
--- /dev/null
+++ b/app/forms/custom_fields/custom_field_rendering.rb
@@ -0,0 +1,112 @@
+# 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::CustomFieldRendering
+ include ActiveSupport::Concern
+
+ def render_custom_fields(form:)
+ custom_fields.each do |custom_field|
+ form.fields_for(:custom_field_values) do |builder|
+ custom_field_input(builder, custom_field)
+ end
+ end
+ end
+
+ # override if you want to pass more attributes
+ def additional_custom_field_input_arguments
+ {}
+ end
+
+ def custom_fields
+ raise NotImplementedError, "#custom_fields method needs to be overwritten and provide all custom fields we want to show"
+ end
+
+ private
+
+ def custom_field_input(builder, custom_field)
+ if custom_field.multi_value?
+ multi_value_custom_field_input(builder, custom_field)
+ else
+ single_value_custom_field_input(builder, custom_field)
+ end
+ end
+
+ def form_arguments(custom_field)
+ {
+ custom_field: custom_field,
+ object: model
+ }.merge(additional_custom_field_input_arguments)
+ end
+
+ # TBD: transform inputs called below to primer form dsl instead of form classes?
+ # TODOS:
+ # - initial values for user inputs are not displayed
+ # - allow/disallow-non-open version setting is not yet respected in the version selector
+ # - rich text editor is not yet supported
+ # - hierarchy should not use a flat list
+
+ def single_value_custom_field_input(builder, custom_field)
+ form_args = form_arguments(custom_field)
+
+ case custom_field.field_format
+ when "string", "link"
+ CustomFields::Inputs::String.new(builder, **form_args)
+ when "text"
+ CustomFields::Inputs::Text.new(builder, **form_args)
+ when "int"
+ CustomFields::Inputs::Int.new(builder, **form_args)
+ when "float"
+ CustomFields::Inputs::Float.new(builder, **form_args)
+ when "hierarchy", "list"
+ CustomFields::Inputs::SingleSelectList.new(builder, **form_args)
+ when "date"
+ CustomFields::Inputs::Date.new(builder, **form_args)
+ when "bool"
+ CustomFields::Inputs::Bool.new(builder, **form_args)
+ when "user"
+ CustomFields::Inputs::SingleUserSelectList.new(builder, **form_args)
+ when "version"
+ CustomFields::Inputs::SingleVersionSelectList.new(builder, **form_args)
+ end
+ end
+
+ def multi_value_custom_field_input(builder, custom_field)
+ form_args = form_arguments(custom_field)
+
+ case custom_field.field_format
+ when "hierarchy", "list"
+ CustomFields::Inputs::MultiSelectList.new(builder, **form_args)
+ when "user"
+ CustomFields::Inputs::MultiUserSelectList.new(builder, **form_args)
+ when "version"
+ CustomFields::Inputs::MultiVersionSelectList.new(builder, **form_args)
+ end
+ end
+end
diff --git a/app/forms/custom_fields/details_form.rb b/app/forms/custom_fields/details_form.rb
index 096d55ced7d..a73381e8cd3 100644
--- a/app/forms/custom_fields/details_form.rb
+++ b/app/forms/custom_fields/details_form.rb
@@ -61,12 +61,6 @@ module CustomFields
caption: I18n.t("custom_fields.instructions.is_filter")
)
- details_form.check_box(
- name: :searchable,
- label: I18n.t("activerecord.attributes.custom_field.searchable"),
- caption: I18n.t("custom_fields.instructions.searchable")
- )
-
details_form.submit(name: :submit, label: I18n.t(:button_save), scheme: :default)
end
end
diff --git a/app/forms/custom_fields/hierarchy/item_form.rb b/app/forms/custom_fields/hierarchy/item_form.rb
index 96f66e73aa7..be2e5185feb 100644
--- a/app/forms/custom_fields/hierarchy/item_form.rb
+++ b/app/forms/custom_fields/hierarchy/item_form.rb
@@ -39,6 +39,7 @@ module CustomFields
value: @target_item.label,
visually_hide_label: true,
required: true,
+ autofocus: true,
placeholder: I18n.t("custom_fields.admin.items.placeholder.label"),
validation_message: validation_message_for(:label)
)
@@ -55,7 +56,7 @@ module CustomFields
)
end
- item_form.group(layout: :horizontal) do |button_group|
+ item_form.group(layout: :horizontal, align_self: :end) do |button_group|
button_group.button(name: :cancel,
tag: :a,
label: I18n.t(:button_cancel),
diff --git a/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb b/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb
index db2fa302c4d..e1b677dc42b 100644
--- a/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb
+++ b/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb
@@ -40,6 +40,7 @@ class CustomFields::Inputs::Base::Autocomplete::MultiValueInput < CustomFields::
{
multiple: true,
decorated: decorated?,
+ focusDirectly: false,
append_to:
}
end
diff --git a/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb b/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb
index 3a9bf73dd15..5f678025d26 100644
--- a/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb
+++ b/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb
@@ -40,6 +40,7 @@ class CustomFields::Inputs::Base::Autocomplete::SingleValueInput < CustomFields:
{
multiple: false,
decorated: decorated?,
+ focusDirectly: false,
append_to:
}
end
diff --git a/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb b/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb
index e2d17241aed..9f01f53464c 100644
--- a/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb
+++ b/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -51,10 +53,17 @@ module CustomFields::Inputs::Base::Autocomplete::UserQueryUtils
end
def filters
- [
+ filters = [
{ name: "type", operator: "=", values: ["User", "Group", "PlaceholderUser"] },
- { name: "member", operator: "=", values: [@object.id.to_s] },
{ name: "status", operator: "!", values: [Principal.statuses["locked"].to_s] }
]
+
+ if @object.is_a?(Project)
+ filters << { name: "member", operator: "=", values: [@object.id.to_s] }
+ elsif @object.respond_to?(:project_id)
+ filters << { name: "member", operator: "=", values: [@object.project_id.to_s] }
+ end
+
+ filters
end
end
diff --git a/app/forms/custom_fields/inputs/base/input.rb b/app/forms/custom_fields/inputs/base/input.rb
index 6e30709cc0f..2e160a5a6f5 100644
--- a/app/forms/custom_fields/inputs/base/input.rb
+++ b/app/forms/custom_fields/inputs/base/input.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -32,6 +34,8 @@ class CustomFields::Inputs::Base::Input < ApplicationForm
attr_reader :options
def initialize(custom_field:, object:, **options)
+ super()
+
@custom_field = custom_field
@object = object
@options = options
diff --git a/app/forms/custom_fields/inputs/multi_select_list.rb b/app/forms/custom_fields/inputs/multi_select_list.rb
index 832ddb524b4..a6245fcc235 100644
--- a/app/forms/custom_fields/inputs/multi_select_list.rb
+++ b/app/forms/custom_fields/inputs/multi_select_list.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -31,17 +33,19 @@ class CustomFields::Inputs::MultiSelectList < CustomFields::Inputs::Base::Autoco
# autocompleter does not set key with blank value if nothing is selected or input is cleared
# in order to let acts_as_customizable handle the clearing of the value, we need to set the value to blank via a hidden field
# which sends blank if autocompleter is cleared
- custom_value_form.hidden(**input_attributes.merge(
+ custom_value_form.hidden(
+ **input_attributes,
scope_name_to_model: false,
- name: "#{@object.class.name.downcase}[custom_field_values][#{input_attributes[:name]}][]",
+ name: "#{@object.model_name.element}[custom_field_values][#{input_attributes[:name]}][]",
value:
- ))
+ )
custom_value_form.autocompleter(**input_attributes) do |list|
- @custom_field.custom_options.each do |custom_option|
+ list_items.each do |item|
list.option(
- label: custom_option.value, value: custom_option.id,
- selected: selected?(custom_option)
+ label: item.fetch(:label),
+ value: item.fetch(:value),
+ selected: item.fetch(:selected)
)
end
end
@@ -53,6 +57,33 @@ class CustomFields::Inputs::MultiSelectList < CustomFields::Inputs::Base::Autoco
true
end
+ def list_items
+ case @custom_field.field_format
+ when "hierarchy"
+ hierarchy_items.map do |item|
+ {
+ label: item.ancestry_path,
+ value: item.id,
+ selected: @custom_values.pluck(:value).map(&:to_i).include?(item.id)
+ }
+ end
+ else
+ @custom_field.custom_options.map do |custom_option|
+ {
+ label: custom_option.value,
+ value: custom_option.id,
+ selected: selected?(custom_option)
+ }
+ end
+ end
+ end
+
+ def hierarchy_items
+ CustomFields::Hierarchy::HierarchicalItemService.new
+ .get_descendants(item: @custom_field.hierarchy_root, include_self: false)
+ .value_or([])
+ end
+
def selected?(custom_option)
if @custom_values.any?
@custom_values.pluck(:value).map { |value| value&.to_i }.include?(custom_option.id)
diff --git a/app/forms/custom_fields/inputs/multi_user_select_list.rb b/app/forms/custom_fields/inputs/multi_user_select_list.rb
index f086b8b8948..0e93c3b920a 100644
--- a/app/forms/custom_fields/inputs/multi_user_select_list.rb
+++ b/app/forms/custom_fields/inputs/multi_user_select_list.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -33,11 +35,12 @@ class CustomFields::Inputs::MultiUserSelectList < CustomFields::Inputs::Base::Au
# autocompleter does not set key with blank value if nothing is selected or input is cleared
# in order to let acts_as_customizable handle the clearing of the value, we need to set the value to blank via a hidden field
# which sends blank if autocompleter is cleared
- custom_value_form.hidden(**input_attributes.merge(
+ custom_value_form.hidden(
+ **input_attributes,
scope_name_to_model: false,
- name: "#{@object.class.name.downcase}[custom_field_values][#{input_attributes[:name]}][]",
+ name: "#{@object.model_name.element}[custom_field_values][#{input_attributes[:name]}][]",
value:
- ))
+ )
custom_value_form.autocompleter(**input_attributes)
end
diff --git a/app/forms/custom_fields/inputs/multi_version_select_list.rb b/app/forms/custom_fields/inputs/multi_version_select_list.rb
index f03ce7672f6..9d6c65f3f91 100644
--- a/app/forms/custom_fields/inputs/multi_version_select_list.rb
+++ b/app/forms/custom_fields/inputs/multi_version_select_list.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -28,23 +30,24 @@
class CustomFields::Inputs::MultiVersionSelectList < CustomFields::Inputs::Base::Autocomplete::MultiValueInput
include AssignableCustomFieldValues
-
- delegate :assignable_versions, to: :@object
+ include CustomFields::Inputs::VersionSelect
form do |custom_value_form|
# autocompleter does not set key with blank value if nothing is selected or input is cleared
# in order to let acts_as_customizable handle the clearing of the value, we need to set the value to blank via a hidden field
# which sends blank if autocompleter is cleared
- custom_value_form.hidden(**input_attributes.merge(
+ custom_value_form.hidden(
+ **input_attributes,
scope_name_to_model: false,
- name: "#{@object.class.name.downcase}[custom_field_values][#{input_attributes[:name]}][]",
+ name: "#{@object.model_name.element}[custom_field_values][#{input_attributes[:name]}][]",
value:
- ))
+ )
- custom_value_form.autocompleter(**input_attributes) do |list|
+ custom_value_form.autocompleter(**version_input_attributes) do |list|
assignable_custom_field_values(@custom_field).each do |version|
list.option(
- label: version.name, value: version.id,
+ label: version.name,
+ value: version.id,
selected: selected?(version)
)
end
diff --git a/app/forms/custom_fields/inputs/single_select_list.rb b/app/forms/custom_fields/inputs/single_select_list.rb
index 6b86c9c3a61..2eb3711d0f7 100644
--- a/app/forms/custom_fields/inputs/single_select_list.rb
+++ b/app/forms/custom_fields/inputs/single_select_list.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -34,10 +36,11 @@ class CustomFields::Inputs::SingleSelectList < CustomFields::Inputs::Base::Autoc
custom_value_form.hidden(**input_attributes.merge(value: ""))
custom_value_form.autocompleter(**input_attributes) do |list|
- @custom_value.custom_field.custom_options.each do |custom_option|
+ list_items.each do |item|
list.option(
- label: custom_option.value, value: custom_option.id,
- selected: selected?(custom_option)
+ label: item.fetch(:label),
+ value: item.fetch(:value),
+ selected: item.fetch(:selected)
)
end
end
@@ -49,6 +52,33 @@ class CustomFields::Inputs::SingleSelectList < CustomFields::Inputs::Base::Autoc
true
end
+ def list_items
+ case @custom_field.field_format
+ when "hierarchy"
+ hierarchy_items.map do |item|
+ {
+ label: item.ancestry_path,
+ value: item.id,
+ selected: item.id == @custom_value.value&.to_i
+ }
+ end
+ else
+ @custom_field.custom_options.map do |custom_option|
+ {
+ label: custom_option.value,
+ value: custom_option.id,
+ selected: selected?(custom_option)
+ }
+ end
+ end
+ end
+
+ def hierarchy_items
+ CustomFields::Hierarchy::HierarchicalItemService.new
+ .get_descendants(item: @custom_field.hierarchy_root, include_self: false)
+ .value_or([])
+ end
+
def selected?(custom_option)
custom_option.id == @custom_value.value&.to_i || custom_option.id == @custom_field.default_value&.to_i
end
diff --git a/app/forms/custom_fields/inputs/single_version_select_list.rb b/app/forms/custom_fields/inputs/single_version_select_list.rb
index 870929858e7..d2649566f83 100644
--- a/app/forms/custom_fields/inputs/single_version_select_list.rb
+++ b/app/forms/custom_fields/inputs/single_version_select_list.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -28,16 +30,15 @@
class CustomFields::Inputs::SingleVersionSelectList < CustomFields::Inputs::Base::Autocomplete::SingleValueInput
include AssignableCustomFieldValues
-
- delegate :assignable_versions, to: :@object
+ include CustomFields::Inputs::VersionSelect
form do |custom_value_form|
# autocompleter does not set key with blank value if nothing is selected or input is cleared
# in order to let acts_as_customizable handle the clearing of the value, we need to set the value to blank via a hidden field
# which sends blank if autocompleter is cleared
- custom_value_form.hidden(**input_attributes.merge(value: ""))
+ custom_value_form.hidden(**input_attributes, value: "")
- custom_value_form.autocompleter(**input_attributes) do |list|
+ custom_value_form.autocompleter(**version_input_attributes) do |list|
assignable_custom_field_values(@custom_field).each do |version|
list.option(
label: version.name, value: version.id,
diff --git a/app/forms/custom_fields/inputs/version_select.rb b/app/forms/custom_fields/inputs/version_select.rb
new file mode 100644
index 00000000000..8ae754b7b1f
--- /dev/null
+++ b/app/forms/custom_fields/inputs/version_select.rb
@@ -0,0 +1,64 @@
+# 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 Inputs
+ module VersionSelect
+ protected
+
+ def version_input_attributes
+ input_attributes.deep_merge(additional_attributes)
+ end
+
+ def additional_attributes
+ if @object.blank? || (@object.respond_to?(:project) && @object.project.blank?)
+ {
+ autocomplete_options: {
+ disabled: true,
+ placeholder: I18n.t("custom_fields.placeholder_version_select")
+ }
+ }
+ else
+ {}
+ end
+ end
+
+ def assignable_versions(only_open:)
+ if @object.is_a?(Project)
+ @object.assignable_versions(only_open: only_open)
+ elsif @object.respond_to?(:project) && @object.project.present?
+ @object.project.assignable_versions(only_open: only_open)
+ else
+ Version.none
+ end
+ end
+ end
+ end
+end
diff --git a/app/forms/projects/custom_fields/custom_field_mapping_form.rb b/app/forms/projects/custom_fields/custom_field_mapping_form.rb
index f637ea05993..1a3f71f3dbe 100644
--- a/app/forms/projects/custom_fields/custom_field_mapping_form.rb
+++ b/app/forms/projects/custom_fields/custom_field_mapping_form.rb
@@ -31,8 +31,7 @@ module Projects::CustomFields
include OpPrimer::ComponentHelpers
form do |form|
- form.group(layout: :vertical) do |group|
- group.project_autocompleter(
+ form.project_autocompleter(
name: :id,
label: Project.model_name.human,
visually_hide_label: true,
@@ -48,13 +47,12 @@ module Projects::CustomFields
}
)
- group.check_box(
+ form.check_box(
name: :include_sub_projects,
label: I18n.t(:label_include_sub_projects),
checked: false,
label_arguments: { class: "no-wrap" }
)
- end
end
def initialize(project_mapping:)
diff --git a/app/forms/projects/custom_fields/form.rb b/app/forms/projects/custom_fields/form.rb
index 23dd7431657..cd34b56779f 100644
--- a/app/forms/projects/custom_fields/form.rb
+++ b/app/forms/projects/custom_fields/form.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -27,12 +29,10 @@
#++
module Projects::CustomFields
class Form < ApplicationForm
+ include CustomFields::CustomFieldRendering
+
form do |custom_fields_form|
- custom_fields.each do |custom_field|
- custom_fields_form.fields_for(:custom_field_values) do |builder|
- custom_field_input(builder, custom_field)
- end
- end
+ render_custom_fields(form: custom_fields_form)
end
def initialize(project:, custom_field_section: nil, custom_field: nil, wrapper_id: nil)
@@ -48,6 +48,11 @@ module Projects::CustomFields
end
end
+ # override since we want to add the model with @project
+ def additional_custom_field_input_arguments
+ { model: @project, wrapper_id: @wrapper_id }
+ end
+
private
def custom_fields
@@ -62,57 +67,5 @@ module Projects::CustomFields
@project.available_custom_fields
end
end
-
- def custom_field_input(builder, custom_field)
- if custom_field.multi_value?
- multi_value_custom_field_input(builder, custom_field)
- else
- single_value_custom_field_input(builder, custom_field)
- end
- end
-
- # TBD: transform inputs called below to primer form dsl instead of form classes?
- # TODOS:
- # - initial values for user inputs are not displayed
- # - allow/disallow-non-open version setting is not yet respected in the version selector
- # - rich text editor is not yet supported
-
- def single_value_custom_field_input(builder, custom_field)
- form_args = { custom_field:, object: @project, wrapper_id: @wrapper_id }
-
- case custom_field.field_format
- when "string", "link"
- CustomFields::Inputs::String.new(builder, **form_args)
- when "text"
- CustomFields::Inputs::Text.new(builder, **form_args)
- when "int"
- CustomFields::Inputs::Int.new(builder, **form_args)
- when "float"
- CustomFields::Inputs::Float.new(builder, **form_args)
- when "list"
- CustomFields::Inputs::SingleSelectList.new(builder, **form_args)
- when "date"
- CustomFields::Inputs::Date.new(builder, **form_args)
- when "bool"
- CustomFields::Inputs::Bool.new(builder, **form_args)
- when "user"
- CustomFields::Inputs::SingleUserSelectList.new(builder, **form_args)
- when "version"
- CustomFields::Inputs::SingleVersionSelectList.new(builder, **form_args)
- end
- end
-
- def multi_value_custom_field_input(builder, custom_field)
- form_args = { custom_field:, object: @project, wrapper_id: @wrapper_id }
-
- case custom_field.field_format
- when "list"
- CustomFields::Inputs::MultiSelectList.new(builder, **form_args)
- when "user"
- CustomFields::Inputs::MultiUserSelectList.new(builder, **form_args)
- when "version"
- CustomFields::Inputs::MultiVersionSelectList.new(builder, **form_args)
- end
- end
end
end
diff --git a/app/forms/projects/life_cycle_step_definitions/form.rb b/app/forms/projects/life_cycle_step_definitions/form.rb
new file mode 100644
index 00000000000..8ed13372050
--- /dev/null
+++ b/app/forms/projects/life_cycle_step_definitions/form.rb
@@ -0,0 +1,61 @@
+# 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 Projects::LifeCycleStepDefinitions
+ class Form < ApplicationForm
+ form do |f|
+ f.hidden(name: :type) unless model.persisted?
+
+ f.text_field(
+ label: attribute_name(:name),
+ name: :name,
+ required: true,
+ input_width: :medium
+ )
+
+ f.color_select_list(
+ label: attribute_name(:color),
+ name: :color,
+ required: true,
+ input_width: :medium
+ )
+
+ f.submit(
+ scheme: :primary,
+ name: :submit,
+ label: submit_label
+ )
+ end
+
+ def submit_label
+ I18n.t(model.persisted? ? :button_update : :button_create)
+ end
+ end
+end
diff --git a/app/forms/projects/life_cycles/form.rb b/app/forms/projects/life_cycles/form.rb
new file mode 100644
index 00000000000..06a7ec6212d
--- /dev/null
+++ b/app/forms/projects/life_cycles/form.rb
@@ -0,0 +1,104 @@
+#-- 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 Projects::LifeCycles
+ class Form < ApplicationForm
+ form do |f|
+ life_cycle_input(f)
+ end
+
+ private
+
+ def life_cycle_input(form)
+ case model
+ when Project::Stage
+ multi_value_life_cycle_input(form)
+ when Project::Gate
+ single_value_life_cycle_input(form)
+ else
+ raise NotImplementedError, "Unknown life cycle definition type #{model.class.name}"
+ end
+ end
+
+ def qa_field_name
+ "life-cycle-step-#{model.id}"
+ end
+
+ def base_input_attributes
+ {
+ label: "#{icon} #{text}".html_safe, # rubocop:disable Rails/OutputSafety
+ leading_visual: { icon: :calendar },
+ datepicker_options: {
+ inDialog: ProjectLifeCycles::Sections::EditDialogComponent::DIALOG_ID,
+ data: { action: "change->overview--project-life-cycles-form#previewForm" }
+ },
+ wrapper_data_attributes: {
+ "qa-field-name": qa_field_name
+ }
+ }
+ end
+
+ def single_value_life_cycle_input(form)
+ input_attributes = { name: :date, value: model.date }
+
+ form.single_date_picker **base_input_attributes, **input_attributes
+ end
+
+ def multi_value_life_cycle_input(form)
+ value = [model.start_date, model.end_date].compact.join(" - ")
+
+ input_attributes = { name: :date_range, value: }
+ if model.working_days_count
+ input_attributes[:caption] =
+ I18n.t("project_stage.working_days_count", count: model.working_days_count)
+ end
+
+ form.range_date_picker **base_input_attributes, **input_attributes
+ end
+
+ def text
+ model.name
+ end
+
+ def icon
+ icon_name = case model
+ when Project::Stage
+ :"git-commit"
+ when Project::Gate
+ :diamond
+ else
+ raise NotImplementedError, "Unknown model #{model.class} to render a LifeCycleForm with"
+ end
+
+ render Primer::Beta::Octicon.new(icon: icon_name, classes: icon_color_class)
+ end
+
+ def icon_color_class
+ helpers.hl_inline_class("life_cycle_step_definition", model.definition)
+ end
+ end
+end
diff --git a/app/forms/shares/invitee.rb b/app/forms/shares/invitee.rb
index e8eb8f8407d..d9bc3704304 100644
--- a/app/forms/shares/invitee.rb
+++ b/app/forms/shares/invitee.rb
@@ -51,7 +51,9 @@ module Shares
multiple: true,
focusDirectly: true,
appendToComponent: true,
- disabled: @disabled
+ disabled: @disabled,
+ isOpenedInModal: true,
+ hoverCards: true
}
)
end
diff --git a/app/forms/statuses/form.rb b/app/forms/statuses/form.rb
index 522755be2aa..c8b3c46490e 100644
--- a/app/forms/statuses/form.rb
+++ b/app/forms/statuses/form.rb
@@ -106,7 +106,8 @@ module Statuses
statuses_form.color_select_list(
label: attribute_name(:color_id),
name: :color_id,
- caption: I18n.t("statuses.edit.status_color_text")
+ caption: I18n.t("statuses.edit.status_color_text"),
+ input_width: :medium
)
statuses_form.submit(
diff --git a/app/forms/work_packages/activities_tab/journals/submit.rb b/app/forms/work_packages/activities_tab/journals/submit.rb
index 08bce83ed9e..defd84b26d5 100644
--- a/app/forms/work_packages/activities_tab/journals/submit.rb
+++ b/app/forms/work_packages/activities_tab/journals/submit.rb
@@ -28,7 +28,7 @@
module WorkPackages::ActivitiesTab::Journals
class Submit < ApplicationForm
form do |notes_form|
- notes_form.submit(name: :submit, label: "Save", scheme: :primary,
+ notes_form.submit(name: :submit, label: I18n.t("button_save"), scheme: :primary,
data: { test_selector: "op-submit-work-package-journal-form" })
end
end
diff --git a/app/forms/work_packages/dialogs/create_form.rb b/app/forms/work_packages/dialogs/create_form.rb
new file mode 100644
index 00000000000..0c5e9fd8cf7
--- /dev/null
+++ b/app/forms/work_packages/dialogs/create_form.rb
@@ -0,0 +1,124 @@
+# 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 WorkPackages::Dialogs
+ class CreateForm < ApplicationForm
+ include CustomFields::CustomFieldRendering
+
+ attr_reader :work_package, :wrapper_id, :contract
+
+ def initialize(work_package:, wrapper_id:)
+ super()
+
+ @work_package = work_package
+ @schema = API::V3::WorkPackages::Schema::SpecificWorkPackageSchema.new(work_package:)
+ @wrapper_id = wrapper_id
+ @contract = WorkPackages::CreateContract.new(work_package, User.current)
+ end
+
+ form do |f|
+ f.autocompleter(
+ name: :type_id,
+ required: true,
+ include_blank: false,
+ input_width: :small,
+ label: Type.model_name.human,
+ visually_hide_label: true,
+ autocomplete_options: {
+ multiple: false,
+ decorated: true,
+ clearable: false,
+ focusDirectly: false,
+ hiddenFieldAction: "change->work-packages--create-dialog#refreshForm",
+ append_to: wrapper_id,
+ data: { test_selector: "work_package_create_dialog_type" }
+ }
+ ) do |select|
+ contract
+ .assignable_types
+ .pluck(:id, :name)
+ .map do |value, label|
+ select.option(label:,
+ value:,
+ classes: "__hl_inline_type_#{value}",
+ selected: work_package.type_id == value)
+ end
+ end
+
+ f.text_field(
+ name: :subject,
+ label: WorkPackage.human_attribute_name(:subject),
+ required: true,
+ autofocus: autofocus_subject?,
+ input_width: :large,
+ disabled: !@schema.writable?(:subject)
+ )
+
+ f.rich_text_area(
+ name: :description,
+ label: WorkPackage.human_attribute_name(:description),
+ rich_text_options: {
+ resource: work_package,
+ showAttachments: false
+ },
+ disabled: !@schema.writable?(:description)
+ )
+
+ render_custom_fields(form: f)
+
+ # Keep hidden fields for relevant changes
+ work_package.changes
+ .slice(*writable_attributes)
+ .except(:description, :subject, :type_id)
+ .each do |attribute, value|
+ f.hidden(name: attribute, value:)
+ end
+ end
+
+ def additional_custom_field_input_arguments
+ { wrapper_id: }
+ end
+
+ def autofocus_subject?
+ work_package.errors.empty? && work_package.custom_values.all? { |cv| cv.errors.empty? }
+ end
+
+ private
+
+ def custom_fields
+ @custom_fields ||= work_package.available_custom_fields.select(&:required?)
+ end
+
+ def writable_attributes
+ contract = WorkPackages::CreateContract.new(work_package, User.current)
+ contract.writable_attributes
+ end
+ end
+end
diff --git a/app/forms/work_packages/reminder/note.rb b/app/forms/work_packages/reminder/note.rb
new file mode 100644
index 00000000000..35d27858371
--- /dev/null
+++ b/app/forms/work_packages/reminder/note.rb
@@ -0,0 +1,45 @@
+#-- 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 WorkPackages::Reminder::Note < ApplicationForm
+ form do |reminder_form|
+ reminder_form.text_field(
+ name: :note,
+ required: false,
+ label: WorkPackage.human_attribute_name(:note),
+ placeholder: @placeholder,
+ visually_hide_label: false
+ )
+ end
+
+ def initialize
+ super
+
+ @placeholder = I18n.t("work_package.reminders.note_placeholder")
+ end
+end
diff --git a/modules/meeting/app/forms/meeting/start_date.rb b/app/forms/work_packages/reminder/remind_at_date.rb
similarity index 85%
rename from modules/meeting/app/forms/meeting/start_date.rb
rename to app/forms/work_packages/reminder/remind_at_date.rb
index ff582453537..68c0e01f2b4 100644
--- a/modules/meeting/app/forms/meeting/start_date.rb
+++ b/app/forms/work_packages/reminder/remind_at_date.rb
@@ -26,14 +26,14 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-class Meeting::StartDate < ApplicationForm
- form do |meeting_form|
- meeting_form.text_field(
- name: :start_date,
+class WorkPackages::Reminder::RemindAtDate < ApplicationForm
+ form do |reminder_form|
+ reminder_form.text_field(
+ name: :remind_at_date,
type: "date",
value: @initial_value,
- placeholder: Meeting.human_attribute_name(:start_date),
- label: Meeting.human_attribute_name(:start_date),
+ placeholder: I18n.t(:label_date),
+ label: I18n.t(:label_date),
leading_visual: { icon: :calendar },
required: true,
autofocus: false
@@ -41,6 +41,8 @@ class Meeting::StartDate < ApplicationForm
end
def initialize(initial_value: DateTime.now.strftime("%Y-%m-%d"))
+ super()
+
@initial_value = initial_value
end
end
diff --git a/modules/meeting/app/forms/meeting/start_time.rb b/app/forms/work_packages/reminder/remind_at_time.rb
similarity index 85%
rename from modules/meeting/app/forms/meeting/start_time.rb
rename to app/forms/work_packages/reminder/remind_at_time.rb
index 36b43092839..221b9ab2761 100644
--- a/modules/meeting/app/forms/meeting/start_time.rb
+++ b/app/forms/work_packages/reminder/remind_at_time.rb
@@ -26,23 +26,26 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-class Meeting::StartTime < ApplicationForm
+class WorkPackages::Reminder::RemindAtTime < ApplicationForm
include Redmine::I18n
- form do |meeting_form|
- meeting_form.text_field(
- name: :start_time_hour,
+ form do |reminder_form|
+ reminder_form.text_field(
+ name: :remind_at_time,
type: "time",
value: @initial_value,
- placeholder: Meeting.human_attribute_name(:start_time),
- label: Meeting.human_attribute_name(:start_time),
+ placeholder: I18n.t(:label_time),
+ label: I18n.t(:label_time),
leading_visual: { icon: :clock },
required: true,
+ autofocus: false,
caption: formatted_time_zone_offset
)
end
def initialize(initial_value: DateTime.now.strftime("%H:%M"))
+ super()
+
@initial_value = initial_value
end
end
diff --git a/app/forms/work_packages/types/settings_form.rb b/app/forms/work_packages/types/settings_form.rb
new file mode 100644
index 00000000000..dca2d61dce3
--- /dev/null
+++ b/app/forms/work_packages/types/settings_form.rb
@@ -0,0 +1,116 @@
+# 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 WorkPackages
+ module Types
+ class SettingsForm < ApplicationForm
+ form do |settings_form|
+ settings_form.text_field(
+ name: :name,
+ label: label(:name),
+ placeholder: I18n.t(:label_name),
+ input_width: :large,
+ required: true,
+ disabled: model.is_standard?
+ )
+
+ settings_form.color_select_list(
+ name: :color_id,
+ label: Color.model_name.human,
+ caption: I18n.t("types.edit.settings.type_color_text"),
+ input_width: :large
+ )
+
+ if show_work_flow_copy?
+ settings_form.select_list(
+ name: :copy_workflow_from,
+ label: I18n.t(:label_copy_workflow_from),
+ include_blank: true,
+ input_width: :large
+ ) do |other_types|
+ work_package_types.each do |type|
+ other_types.option(
+ value: type.id,
+ label: type.name,
+ selected: type.id == prefilled_copy_workflow_from
+ )
+ end
+ end
+ end
+
+ settings_form.rich_text_area(
+ name: :description,
+ label: label(:description),
+ input_width: :large,
+ rich_text_options: { showAttachments: false }
+ )
+
+ settings_form.check_box(
+ name: :is_milestone,
+ label: label(:is_milestone)
+ )
+
+ settings_form.check_box(
+ name: :is_in_roadmap,
+ label: label(:is_in_roadmap)
+ )
+
+ settings_form.check_box(
+ name: :is_default,
+ label: label(:is_default)
+ )
+
+ settings_form.submit(
+ name: :submit,
+ label: I18n.t(:button_save),
+ scheme: :primary
+ )
+ end
+
+ private
+
+ def label(attribute)
+ model.class.human_attribute_name(attribute)
+ end
+
+ def show_work_flow_copy?
+ model.new_record?
+ end
+
+ def work_package_types
+ Type.all
+ end
+
+ def prefilled_copy_workflow_from
+ @builder.options[:copy_workflow_from]
+ end
+ end
+ end
+end
diff --git a/app/forms/work_packages/types/subject_configuration_form.rb b/app/forms/work_packages/types/subject_configuration_form.rb
new file mode 100644
index 00000000000..6e1f5c4f6d2
--- /dev/null
+++ b/app/forms/work_packages/types/subject_configuration_form.rb
@@ -0,0 +1,88 @@
+# 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 WorkPackages
+ module Types
+ class SubjectConfigurationForm < ApplicationForm
+ form do |subject_form|
+ subject_form.radio_button_group(name: :subject_configuration) do |group|
+ group.radio_button(
+ value: :manual,
+ checked: subject_configuration_manual?,
+ label: I18n.t("types.edit.subject_configuration.manually_editable_subjects.label"),
+ caption: I18n.t("types.edit.subject_configuration.manually_editable_subjects.caption"),
+ data: { action: "admin--subject-configuration#hidePatternInput" }
+ )
+ group.radio_button(
+ value: :generated,
+ checked: !subject_configuration_manual?,
+ label: I18n.t("types.edit.subject_configuration.automatically_generated_subjects.label"),
+ caption: I18n.t("types.edit.subject_configuration.automatically_generated_subjects.caption"),
+ disabled: !enterprise? && subject_configuration_manual?,
+ data: { action: "admin--subject-configuration#showPatternInput" }
+ )
+ end
+
+ subject_form.group(data: { "admin--subject-configuration-target": "patternInput" }) do |toggleable_group|
+ toggleable_group.pattern_input(
+ name: :pattern,
+ value: model.pattern,
+ input_width: :large,
+ suggestions: model.suggestions,
+ label: I18n.t("types.edit.subject_configuration.pattern.label"),
+ caption: I18n.t("types.edit.subject_configuration.pattern.caption"),
+ required: true,
+ validation_message: validation_message_for(:patterns)
+ )
+ end
+
+ subject_form.submit(
+ name: :submit,
+ label: I18n.t(:button_save),
+ scheme: :primary
+ )
+ end
+
+ private
+
+ def subject_configuration_manual?
+ model.subject_configuration == :manual
+ end
+
+ def enterprise?
+ EnterpriseToken.allows_to?(:work_package_subject_generation)
+ end
+
+ def validation_message_for(attribute)
+ model.validation_errors.messages_for(attribute).to_sentence.presence
+ end
+ end
+ end
+end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 50e94f05785..cf7d5b1e665 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -124,7 +126,7 @@ module ApplicationHelper
end
def project_nested_ul(projects, &)
- s = ""
+ s = +""
if projects.any?
ancestors = []
Project.project_tree(projects) do |project, _level|
@@ -189,13 +191,10 @@ module ApplicationHelper
I18n.t(label, author: link_to_user(author), age: time_tag(created)).html_safe
end
- def authoring_at(created, author)
+ def authoring_at(creation_date, author)
return if author.nil?
- I18n.t(:"js.label_added_time_by",
- author: html_escape(author.name),
- age: created,
- authorLink: user_path(author)).html_safe
+ I18n.t(:label_added_by_on, author: link_to_user(author), date: creation_date).html_safe
end
def time_tag(time)
@@ -293,7 +292,7 @@ module ApplicationHelper
def body_data_attributes(local_assigns)
{
- controller: "application",
+ controller: "application hover-card-trigger",
relative_url_root: root_path,
overflowing_identifier: ".__overflowing_body",
rendered_at: Time.zone.now.iso8601,
@@ -431,8 +430,8 @@ module ApplicationHelper
def initial_menu_classes(side_displayed, show_decoration)
classes = "can-hide-navigation"
- classes << " nosidebar" unless side_displayed
- classes << " nomenus" unless show_decoration
+ classes += " nosidebar" unless side_displayed
+ classes += " nomenus" unless show_decoration
classes
end
diff --git a/app/helpers/breadcrumb_helper.rb b/app/helpers/breadcrumb_helper.rb
index 39b3cf28b13..48d65d53682 100644
--- a/app/helpers/breadcrumb_helper.rb
+++ b/app/helpers/breadcrumb_helper.rb
@@ -41,6 +41,14 @@ module BreadcrumbHelper
end
end
+ def nested_breadcrumb_element(section_header, title)
+ output = "".html_safe
+ output << "#{section_header}: "
+ output << content_tag(:strong, title)
+
+ output
+ end
+
def breadcrumb_paths(*args)
if args.empty?
@breadcrumb_paths ||= [default_breadcrumb]
diff --git a/app/helpers/colors_helper.rb b/app/helpers/colors_helper.rb
index ac61eaa323f..8fb9da6e0be 100644
--- a/app/helpers/colors_helper.rb
+++ b/app/helpers/colors_helper.rb
@@ -27,6 +27,8 @@
#++
module ColorsHelper
+ include Primer::JoinStyleArgumentsHelper
+
def options_for_colors(colored_thing)
colors = []
Color.find_each do |c|
@@ -49,39 +51,54 @@ module ColorsHelper
##
def color_css
Color.find_each do |color|
- set_background_colors_for class_name: ".__hl_inline_color_#{color.id}_dot::before", hexcode: color.hexcode
- set_foreground_colors_for class_name: ".__hl_inline_color_#{color.id}_text", hexcode: color.hexcode
+ set_background_colors_for(class_name: ".#{hl_inline_class('color', color)}_dot::before", color:)
+ set_foreground_colors_for(class_name: ".#{hl_inline_class('color', color)}_text", color:)
end
end
#
# Styles to display the color of attributes (type, status etc.) for example in the WP view
##
- def resource_color_css(name, scope)
+ def resource_color_css(name, scope, inline_foreground: false)
scope.includes(:color).find_each do |entry|
color = entry.color
if color.nil?
- concat ".__hl_inline_#{name}_#{entry.id}::before { display: none }\n"
+ concat ".#{hl_inline_class(name, entry)}::before { display: none }\n"
next
end
- if name === "type"
- set_foreground_colors_for class_name: ".__hl_inline_#{name}_#{entry.id}", hexcode: color.hexcode
+ if inline_foreground
+ set_foreground_colors_for(class_name: ".#{hl_inline_class(name, entry)}", color:)
else
- set_background_colors_for class_name: ".__hl_inline_#{name}_#{entry.id}::before", hexcode: color.hexcode
+ set_background_colors_for(class_name: ".#{hl_inline_class(name, entry)}::before", color:)
end
- set_background_colors_for class_name: ".__hl_background_#{name}_#{entry.id}", hexcode: color.hexcode
+ set_background_colors_for(class_name: ".#{hl_background_class(name, entry)}", color:)
end
end
+ def hl_inline_class(name, model)
+ "__hl_inline_#{name}_#{model.id}"
+ end
+
+ def hl_background_class(name, model)
+ "__hl_background_#{name}_#{model.id}"
+ end
+
def icon_for_color(color, options = {})
return unless color
+ return if color.hexcode.blank?
- options.merge! class: "color--preview " + options[:class].to_s,
+ style = join_style_arguments(
+ "background-color: #{color.hexcode}",
+ "border-color: #{color.darken(0.5)}50",
+ options[:style]
+ )
+
+ options.merge!(class: "color--preview #{options[:class]}",
title: color.name,
- style: "background-color: #{color.hexcode};" + options[:style].to_s
+ style:)
content_tag(:span, " ", options)
end
@@ -90,10 +107,10 @@ module ColorsHelper
DesignColor.find_by(variable:)&.hexcode
end
- def set_background_colors_for(class_name:, hexcode:)
+ def set_background_colors_for(class_name:, color:)
mode = User.current.pref.theme.split("_", 2)[0]
- concat "#{class_name} { #{default_color_styles(hexcode)} }"
+ concat "#{class_name} { #{default_color_styles(color.hexcode)} }"
if mode == "dark"
concat "#{class_name} { #{default_variables_dark} }"
concat "#{class_name} { #{highlighted_background_dark} }"
@@ -103,10 +120,10 @@ module ColorsHelper
end
end
- def set_foreground_colors_for(class_name:, hexcode:)
+ def set_foreground_colors_for(class_name:, color:)
mode = User.current.pref.theme.split("_", 2)[0]
- concat "#{class_name} { #{default_color_styles(hexcode)} }"
+ concat "#{class_name} { #{default_color_styles(color.hexcode)} }"
if mode == "dark"
concat "#{class_name} { #{default_variables_dark} }"
concat "#{class_name} { #{highlighted_foreground_dark} }"
@@ -153,11 +170,11 @@ module ColorsHelper
background: rgb(var(--color-r), var(--color-g), var(--color-b)) !important;"
mode = User.current.pref.theme
- if mode == "light_high_contrast"
- style += "border: 1px solid hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - 75) * 1%), 1) !important;"
- else
- style += "border: 1px solid hsl(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - 15) * 1%)) !important;"
- end
+ style += if mode == "light_high_contrast"
+ "border: 1px solid hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - 75) * 1%), 1) !important;"
+ else
+ "border: 1px solid hsl(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - 15) * 1%)) !important;"
+ end
style
end
diff --git a/app/helpers/conversion_helper.rb b/app/helpers/conversion_helper.rb
new file mode 100644
index 00000000000..e4ed37cee0e
--- /dev/null
+++ b/app/helpers/conversion_helper.rb
@@ -0,0 +1,39 @@
+# 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 ConversionHelper
+ include Dry::Monads[:maybe]
+
+ def maybe_integer(value)
+ Some(Integer(value || "", 10))
+ rescue ArgumentError
+ None()
+ end
+end
diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index 9a7607bb245..122cd405541 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -172,6 +172,19 @@ module CustomFieldsHelper
options_for_select(base_options + custom_field.possible_values_options(project)),
id: field_id,
multiple: custom_field.multi_value?)
+ when "hierarchy"
+ base_options = [[I18n.t(:label_no_change_option), ""]]
+ result = CustomFields::Hierarchy::HierarchicalItemService.new
+ .get_descendants(item: custom_field.hierarchy_root, include_self: false)
+ .either(
+ ->(items) { items },
+ ->(_) { [] }
+ )
+ options = base_options + result.map do |item|
+ label = item.short.present? ? "#{item.label} (#{item.short})" : item.label
+ [label, item.id]
+ end
+ styled_select_tag(field_name, options_for_select(options), id: field_id, multiple: custom_field.multi_value?)
else
styled_text_field_tag(field_name, "", id: field_id)
end
@@ -191,14 +204,7 @@ module CustomFieldsHelper
# Return an array of custom field formats which can be used in select_tag
def custom_field_formats_for_select(custom_field)
- hierarchy_if_deactivated = lambda do |format|
- format.name == "hierarchy" && !OpenProject::FeatureDecisions.custom_field_of_type_hierarchy_active?
- end
-
OpenProject::CustomFieldFormat.all_for_field(custom_field)
- .sort_by(&:order)
- .reject { |format| format.label.nil? }
- .reject(&hierarchy_if_deactivated)
.map do |custom_field_format|
[label_for_custom_field_format(custom_field_format.name), custom_field_format.name]
end
@@ -211,7 +217,7 @@ module CustomFieldsHelper
label = format.label.is_a?(Proc) ? format.label.call : I18n.t(format.label)
show_enterprise_text = format_string == "hierarchy" && !EnterpriseToken.allows_to?(:custom_field_hierarchies)
- suffix = show_enterprise_text ? " (#{I18n.t(:label_enterprise_addon)})" : ""
+ suffix = show_enterprise_text ? " (#{I18n.t(:"ee.upsale.title")})" : ""
"#{label}#{suffix}"
end
diff --git a/app/helpers/errors_helper.rb b/app/helpers/errors_helper.rb
index 561164407ee..1de153afb78 100644
--- a/app/helpers/errors_helper.rb
+++ b/app/helpers/errors_helper.rb
@@ -33,6 +33,12 @@ module ErrorsHelper
false
end
+ def render_402(options = {}) # rubocop:disable Naming/VariableNumber
+ unset_template_magic
+ render_error({ message: :notice_requires_enterprise_token, status: 402 }.merge(options))
+ false
+ end
+
def render_403(options = {}) # rubocop:disable Naming/VariableNumber
unset_template_magic
render_error({ message: :notice_not_authorized, status: 403 }.merge(options))
diff --git a/app/helpers/highlighting_helper.rb b/app/helpers/highlighting_helper.rb
index eadd74133eb..0760f745f17 100644
--- a/app/helpers/highlighting_helper.rb
+++ b/app/helpers/highlighting_helper.rb
@@ -4,6 +4,6 @@ module HighlightingHelper
end
def highlight_css_updated_at
- ApplicationRecord.most_recently_changed Status, IssuePriority, Type, UserPreference
+ ApplicationRecord.most_recently_changed Status, IssuePriority, Type, UserPreference, Project::LifeCycleStepDefinition
end
end
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 85217057380..821798a5cec 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -38,7 +38,8 @@ module JournalsHelper
in ["users", user_id]
user_url(user_id)
in ["work_packages", work_package_id]
- work_package_url(work_package_id)
+ # Sometimes the parameter provided is erroneous (having an extra ') for unknown reasons.
+ work_package_url(work_package_id.chomp("'"))
else
nil
end
diff --git a/app/helpers/mail_notification_helper.rb b/app/helpers/mail_notification_helper.rb
index 7219b8b3507..4ad335ede1c 100644
--- a/app/helpers/mail_notification_helper.rb
+++ b/app/helpers/mail_notification_helper.rb
@@ -47,6 +47,6 @@ module MailNotificationHelper
def status_colors(status)
color_id = selected_color(status)
- Color.find(color_id).color_styles.map { |k, v| "#{k}:#{v};" }.join(" ") if color_id
+ Color.find(color_id).color_styles_css if color_id
end
end
diff --git a/app/helpers/pagination_helper.rb b/app/helpers/pagination_helper.rb
index 28e9f79f3c8..8950755b21c 100644
--- a/app/helpers/pagination_helper.rb
+++ b/app/helpers/pagination_helper.rb
@@ -29,6 +29,10 @@
require "will_paginate"
module PaginationHelper
+ SHOW_MORE_DEFAULT_LIMIT = 5
+ SHOW_MORE_DEFAULT_INCREMENT = 20
+ SHOW_MORE_MAX_LIMIT = 1000
+
def pagination_links_full(paginator, options = {})
return unless paginator.total_entries > 0
@@ -109,7 +113,7 @@ module PaginationHelper
# * page
# parameters.
# Prefers page over the other two and
- # calculates page in it's absence based on limit and offset.
+ # calculates page in its absence based on limit and offset.
# Return 1 if all else fails.
def page_param(options = params)
page = if options[:page]
@@ -151,6 +155,24 @@ module PaginationHelper
end
end
+ ##
+ # For "Show more" paginated links, we want to load an initial number of items (defaulting to 5)
+ # unless a higher number is provided. These values do not correspond to the per_page_options
+ def show_more_limit_param(options = params, initial_limit: SHOW_MORE_DEFAULT_LIMIT)
+ limit = options[:limit].to_i
+ if limit.zero?
+ initial_limit
+ else
+ [limit, SHOW_MORE_MAX_LIMIT].min
+ end
+ end
+
+ ##
+ # Paginate an AR relation for the "show more" pagination functionality
+ def show_more_pagination(paginator, options = params)
+ paginator.paginate(page: 1, per_page: show_more_limit_param(options))
+ end
+
class LinkRenderer < ::WillPaginate::ActionView::LinkRenderer
def to_html
pagination.inject("") do |html, item|
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index c01a2c1bc15..2a733586906 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -73,8 +73,7 @@ module ProjectsHelper
def selected_projects_columns_options
Setting
.enabled_projects_columns
- .map { |c| projects_columns_options.find { |o| o[:id].to_s == c } }
- .compact
+ .filter_map { |c| projects_columns_options.find { |o| o[:id].to_s == c } }
end
def protected_projects_columns_options
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 5abcabc4a49..5ffc8c1fbee 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -124,13 +124,19 @@ module SearchHelper
def attachment_fulltexts(event)
only_if_tsv_supported(event) do
- Attachment.where(id: event.attachment_ids).pluck(:fulltext).join(" ")
+ # The compact is important here as the fulltext can be nil.
+ # A nil value in combination with another journal would lead to
+ # [nil, "The fulltext of the attachment"].join to be in US-ASCII encoding
+ # instead of the expected UTF-8.
+ # When this is then passed into Commonmarker, that will raise an error.
+ # https://community.openproject.org/wp/61110
+ Attachment.where(id: event.attachment_ids).pluck(:fulltext).compact.join
end
end
def attachment_filenames(event)
only_if_tsv_supported(event) do
- event.attachments&.map(&:filename)&.join(" ")
+ event.attachments.map(&:filename).join
end
end
diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb
index 3ec0eadd99e..8a5bc7dfafc 100644
--- a/app/helpers/sort_helper.rb
+++ b/app/helpers/sort_helper.rb
@@ -331,8 +331,8 @@ module SortHelper
# This is a more specific version of #sort_header_tag.
# For "filter by" to work properly, you must pass a Hash for `filter_column_mapping`.
def sort_header_with_action_menu(column, all_columns, filter_column_mapping = {}, allowed_params: nil, **options)
- with_sort_header_options(column, allowed_params:, **options) do |col, cap, default_order, **opts|
- action_menu(col, all_columns, cap, default_order, filter_column_mapping, **opts)
+ with_sort_header_options(column.attribute, allowed_params:, **options) do |_col, cap, default_order, **opts|
+ action_menu(column, all_columns, cap, default_order, filter_column_mapping, **opts)
end
end
@@ -381,6 +381,9 @@ module SortHelper
def find_filter_for_column(column, filter_mapping)
col = column.to_s
+ # Temporarily disabled filters for stages and gates columns for now. Remove this line for #59183
+ return nil if column.start_with?("lcsd_")
+
filter_mapping.fetch(col, col)
end
@@ -389,9 +392,10 @@ module SortHelper
# Some of the method arguments are only needed for specific actions.
def action_menu(column, table_columns, caption, default_order, filter_column_mapping = {},
allowed_params: nil, **html_options)
- caption ||= column.to_s.humanize
+ attribute = column.attribute
+ caption ||= attribute.to_s.humanize
- filter = find_filter_for_column(column, filter_column_mapping)
+ filter = find_filter_for_column(attribute, filter_column_mapping)
sortable = html_options.delete(:sortable)
# `param` is not needed in the `content_arguments`, but should remain in the `html_options`.
@@ -399,26 +403,32 @@ module SortHelper
# the action menu.
content_args = html_options.merge(rel: :nofollow, param: nil)
- render Primer::Alpha::ActionMenu.new(menu_id: "menu-#{column}") do |menu|
- action_button(menu, caption, favorite: column == :favored)
+ render Primer::Alpha::ActionMenu.new(menu_id: "menu-#{attribute}") do |menu|
+ action_button(menu, column, caption, favorite: column == :favored)
# Some columns are not sortable or do not offer a suitable filter. Omit those actions for them.
- sort_actions(menu, column, default_order, content_args:, allowed_params:, **html_options) if sortable
- filter_action(menu, column, filter, content_args:) if filter
+ sort_actions(menu, attribute, default_order, content_args:, allowed_params:, **html_options) if sortable
+ filter_action(menu, attribute, filter, content_args:) if filter
- move_column_actions(menu, column, table_columns, content_args:, allowed_params:, **html_options)
- add_and_remove_column_actions(menu, column, table_columns, content_args:, allowed_params:, **html_options)
+ move_column_actions(menu, attribute, table_columns, content_args:, allowed_params:, **html_options)
+ add_and_remove_column_actions(menu, attribute, table_columns, content_args:, allowed_params:, **html_options)
end
end
- def action_button(menu, caption, favorite: false)
+ def action_button(menu, column, caption, favorite: false)
+ additional_menu_classes = ["generic-table--action-menu-button",
+ column.respond_to?(:action_menu_classes) ? column.action_menu_classes : nil]
+ .compact
+ .join(" ")
+
menu.with_show_button(scheme: :link, color: :default, text_transform: :uppercase,
underline: false, display: :inline_flex,
- classes: "generic-table--action-menu-button") do |button|
+ classes: additional_menu_classes) do |button|
if favorite
# This column only shows an icon, no text.
render Primer::Beta::Octicon.new(icon: "star-fill", color: :subtle, "aria-label": I18n.t(:label_favorite))
else
+ button.with_leading_visual_icon(**column.visual_icon) if column.respond_to?(:visual_icon)
button.with_trailing_action_icon(icon: :"triangle-down")
h(caption).to_s
diff --git a/app/helpers/tabs_helper.rb b/app/helpers/tabs_helper.rb
index 6305516475a..bbb1ed2e6c6 100644
--- a/app/helpers/tabs_helper.rb
+++ b/app/helpers/tabs_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
diff --git a/app/helpers/types_helper.rb b/app/helpers/types_helper.rb
index fcac23fc709..f4458d04870 100644
--- a/app/helpers/types_helper.rb
+++ b/app/helpers/types_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -27,29 +29,51 @@
#++
module ::TypesHelper
+ # rubocop:disable Rails/HelperInstanceVariable
def types_tabs
- [
+ tabs = [
{
name: "settings",
- partial: "types/form/settings",
- path: edit_type_tab_path(id: @type.id, tab: :settings),
- label: "types.edit.settings"
+ path: edit_tab_type_path(id: @type.id, tab: :settings),
+ label: "types.edit.settings.tab",
+ view_component: WorkPackages::Types::SettingsComponent
},
{
name: "form_configuration",
partial: "types/form/form_configuration",
- path: edit_type_tab_path(id: @type.id, tab: :form_configuration),
- label: "types.edit.form_configuration"
+ path: edit_tab_type_path(id: @type.id, tab: :form_configuration),
+ label: "types.edit.form_configuration.tab"
},
{
name: "projects",
partial: "types/form/projects",
- path: edit_type_tab_path(id: @type.id, tab: :projects),
- label: "types.edit.projects"
+ path: edit_tab_type_path(id: @type.id, tab: :projects),
+ label: "types.edit.projects.tab"
+ },
+ {
+ name: "export_configuration",
+ path: edit_tab_type_path(id: @type.id, tab: :export_configuration),
+ label: "types.edit.export_configuration.tab",
+ view_component: WorkPackages::Types::ExportConfigurationComponent
}
]
+
+ if OpenProject::FeatureDecisions.generate_work_package_subjects_active?
+ subject_configuration_tab = {
+ name: "subject_configuration",
+ path: edit_tab_type_path(id: @type.id, tab: :subject_configuration),
+ label: "types.edit.subject_configuration.tab",
+ view_component: WorkPackages::Types::SubjectConfigurationComponent
+ }
+
+ tabs.insert(2, subject_configuration_tab)
+ end
+
+ tabs
end
+ # rubocop:enable Rails/HelperInstanceVariable
+
def icon_for_type(type)
return unless type
@@ -95,8 +119,8 @@ module ::TypesHelper
return nil unless group.group_type == :attribute
group.attributes
- .select { |key| inactive.delete(key) }
- .map! { |key| attr_form_map(key, available[key]) }
+ .select { |key| inactive.delete(key) }
+ .map! { |key| attr_form_map(key, available[key]) }
end
def query_to_query_props(group)
diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index 22e7fb2743b..198d7703705 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -30,25 +30,85 @@ module WatchersHelper
# Create a link to watch/unwatch object
#
# * :replace - a string or array of strings with css selectors that will be updated, whenever the watcher status is changed
- def watcher_link(object, user, options = { replace: ".watcher_link", class: "watcher_link" })
- options = options.with_indifferent_access
- raise ArgumentError, "Missing :replace option in options hash" if options["replace"].blank?
+ def watcher_link(object, user, options = {})
+ options = { replace: ".watcher_link", class: "watcher_link" }.merge(options)
- return "" unless user&.logged? && object.respond_to?(:watched_by?)
+ return "" unless valid_watcher_conditions?(object, user, options)
watched = object.watched_by?(user)
- html_options = options
- path = send(:"#{(watched ? 'unwatch' : 'watch')}_path", object_type: object.class.to_s.underscore.pluralize,
- object_id: object.id,
- replace: options.delete("replace"))
- html_options[:class] = html_options[:class].to_s + " button"
+ path = watcher_path(object, watched, options)
+
+ html_options = prepare_html_options(watched, options)
+
+ link_to_watcher_button(watched, path, html_options)
+ end
+
+ def watcher_action_button(container, object)
+ watcher_button_args = watcher_button_arguments(object, User.current)
+ return if watcher_button_args.nil?
+
+ container.with_action_button(**watcher_button_args) do |button|
+ button.with_leading_visual_icon(icon: watcher_button_args[:mobile_icon])
+ watcher_button_args[:mobile_label]
+ end
+ end
+
+ def watcher_button_arguments(object, user)
+ return nil unless user&.logged? && object.respond_to?(:watched_by?)
+
+ watched = object.watched_by?(user)
+
+ path = send(:"#{(watched ? 'unwatch' : 'watch')}_path",
+ object_type: object.class.to_s.underscore.pluralize,
+ object_id: object.id)
method = watched ? :delete : :post
label = watched ? I18n.t(:button_unwatch) : I18n.t(:button_watch)
- link_to(content_tag(:i, "", class: watched ? "button--icon icon-watched" : " button--icon icon-unwatched") + " " +
- content_tag(:span, label, class: "button--text"), path, html_options.merge(method:))
+ {
+ tag: :a,
+ href: path,
+ scheme: :default,
+ aria: { label: label },
+ data: {
+ method:
+ },
+ mobile_icon: watched ? "eye-closed" : "eye",
+ mobile_label: label
+ }
+ end
+
+ private
+
+ def valid_watcher_conditions?(object, user, options)
+ raise ArgumentError, "Missing :replace option in options hash" if options[:replace].blank?
+
+ user&.logged? && object.respond_to?(:watched_by?)
+ end
+
+ def watcher_path(object, watched, options)
+ action = watched ? "unwatch" : "watch"
+ send(:"#{action}_path", object_type: object.class.to_s.underscore.pluralize, object_id: object.id, replace: options[:replace])
+ end
+
+ def prepare_html_options(watched, options)
+ options.merge(
+ class: "#{options[:class]} button",
+ method: watched ? :delete : :post
+ )
+ end
+
+ def link_to_watcher_button(watched, path, html_options)
+ label = watched ? I18n.t(:button_unwatch) : I18n.t(:button_watch)
+ icon_class = watched ? "icon-watched" : "icon-unwatched"
+
+ link_to(
+ content_tag(:i, "", class: "button--icon #{icon_class}") +
+ content_tag(:span, label, class: "button--text"),
+ path,
+ html_options
+ )
end
end
diff --git a/app/helpers/wiki_pages/at_version.rb b/app/helpers/wiki_pages/at_version.rb
index aaeec457ad3..d42ae92c868 100644
--- a/app/helpers/wiki_pages/at_version.rb
+++ b/app/helpers/wiki_pages/at_version.rb
@@ -29,7 +29,7 @@
# The class represents a wiki page at a specific version.
# It is implemented as somewhat of a mix between a decorator and a view model. It simplifies
# both the controller as well as the view. The controller will only have to provide a single object
-# to the view and the view can serve all it's data needs from that one object.
+# to the view and the view can serve all its data needs from that one object.
#
# In case more objects like this are generated, a separate folder under e.g. app/view_models or app/decorators
# should be introduced.
diff --git a/app/helpers/work_packages_helper.rb b/app/helpers/work_packages_helper.rb
index 2d37bcad6da..0744c4502f6 100644
--- a/app/helpers/work_packages_helper.rb
+++ b/app/helpers/work_packages_helper.rb
@@ -157,6 +157,23 @@ module WorkPackagesHelper
end
end
+ def work_package_dates_icon(work_package)
+ work_package.schedule_manually ? :pin : :calendar
+ end
+
+ def work_package_formatted_dates(work_package)
+ start_date = work_package.start_date ? format_date(work_package.start_date) : nil
+ due_date = work_package.due_date ? format_date(work_package.due_date) : nil
+
+ # If both dates are missing, return just one dash
+ return "-" if start_date.nil? && due_date.nil?
+
+ return start_date if start_date == due_date
+
+ # Return the formatted date range (start_date - due_date)
+ "#{start_date} - #{due_date}"
+ end
+
def send_notification_option(checked = false)
content_tag(:label, for: "send_notification", class: "form--label-with-check-box") do
(content_tag "span", class: "form--check-box-container" do
diff --git a/app/mailers/reminders/notification_mailer.rb b/app/mailers/reminders/notification_mailer.rb
new file mode 100644
index 00000000000..e193727ebef
--- /dev/null
+++ b/app/mailers/reminders/notification_mailer.rb
@@ -0,0 +1,82 @@
+#-- 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 Reminders::NotificationMailer < ApplicationMailer
+ include MailNotificationHelper
+ include Redmine::I18n
+
+ helper :mail_notification
+ helper_method :reminder_summary_text,
+ :reminder_timestamp_text,
+ :reminder_note_text,
+ :work_package_subject_text_wrapper,
+ :text_email_wrapper
+
+ def reminder_notification(notification)
+ @notification = notification
+ @user = notification.recipient
+ @work_package = notification.resource
+ @reminder = notification.reminder
+
+ open_project_headers User: notification.recipient.name
+ message_id "reminder", notification.recipient
+
+ send_localized_mail(notification.recipient) do
+ "#{Setting.app_title} - #{email_subject_suffix}"
+ end
+ end
+
+ private
+
+ def email_subject_suffix
+ note = @reminder.note.presence || @work_package.subject
+ I18n.t(:"mail.reminder_notifications.subject", note:)
+ end
+
+ def reminder_summary_text
+ I18n.t(:"mail.reminder_notifications.heading")
+ end
+
+ def reminder_timestamp_text
+ "#{format_time(@notification.created_at)}."
+ end
+
+ def reminder_note_text
+ return if @reminder.note.blank?
+
+ I18n.t(:"mail.reminder_notifications.note", note: @reminder.note)
+ end
+
+ def work_package_subject_text_wrapper
+ "=" * ("# #{@work_package.id}#{@work_package.subject}".length + 4)
+ end
+
+ def text_email_wrapper
+ "-" * 100
+ end
+end
diff --git a/app/menus/notifications/menu.rb b/app/menus/notifications/menu.rb
index cc6961c823e..a4fd9781af4 100644
--- a/app/menus/notifications/menu.rb
+++ b/app/menus/notifications/menu.rb
@@ -63,7 +63,7 @@ module Notifications
end
def reason_filters
- %w[mentioned assigned responsible watched dateAlert shared].map do |reason|
+ %w[mentioned assigned responsible watched dateAlert reminder shared].map do |reason|
count = unread_by_reason[reason]
menu_item(title: I18n.t("notifications.reasons.#{reason}"),
icon_key: reason,
@@ -128,7 +128,8 @@ module Notifications
"responsible" => :"op-person-accountable",
"watched" => :eye,
"shared" => :"share-android",
- "dateAlert" => :"op-calendar-alert"
+ "dateAlert" => :"op-calendar-alert",
+ "reminder" => :"op-alarm"
}
end
diff --git a/app/menus/submenu.rb b/app/menus/submenu.rb
index 8909c15f32f..6bd27e89a4a 100644
--- a/app/menus/submenu.rb
+++ b/app/menus/submenu.rb
@@ -29,7 +29,7 @@ class Submenu
include Rails.application.routes.url_helpers
attr_reader :view_type, :project, :params
- def initialize(view_type:, project: nil, params: nil)
+ def initialize(view_type:, params:, project: nil)
@view_type = view_type
@project = project
@params = params
@@ -108,12 +108,13 @@ class Submenu
{ query_id: id }
end
- def menu_item(title:, icon_key: nil, count: nil, show_enterprise_icon: false, query_params: {})
+ def menu_item(title:, icon_key: nil, count: nil, show_enterprise_icon: false,
+ query_params: {}, selected: selected?(query_params))
OpenProject::Menu::MenuItem.new(title:,
href: query_path(query_params),
icon: icon_map.fetch(icon_key, icon_key),
count:,
- selected: selected?(query_params),
+ selected:,
favored: favored?(query_params),
show_enterprise_icon:)
end
@@ -144,4 +145,8 @@ class Submenu
def query_path(query_params)
raise NotImplementedError
end
+
+ def url_helpers
+ @url_helpers ||= OpenProject::StaticRouting::StaticRouter.new.url_helpers
+ end
end
diff --git a/app/models/application_record.rb b/app/models/application_record.rb
index 40fbed060ce..17cb76e7a91 100644
--- a/app/models/application_record.rb
+++ b/app/models/application_record.rb
@@ -34,22 +34,18 @@ class ApplicationRecord < ActiveRecord::Base
def self.most_recently_changed(*record_classes)
queries = record_classes.map do |clz|
column_name = clz.send(:timestamp_attributes_for_update_in_model)&.first || "updated_at"
- "(SELECT MAX(#{column_name}) AS max_updated_at FROM #{clz.table_name})"
+ table = clz.arel_table
+ table.project(table[column_name].maximum.as("max_updated_at")).to_sql
end
.join(" UNION ")
- union_query = <<~SQL
- SELECT MAX(union_query.max_updated_at)
+ union_query = <<~SQL.squish
+ SELECT MAX(max_updated_at)
FROM (#{queries})
AS union_query
SQL
- ActiveRecord::Base
- .connection
- .select_all(union_query)
- .rows
- &.first # first result row
- &.first # max column
+ ActiveRecord::Base.connection.select_value(union_query)
end
def self.skip_optimistic_locking(&)
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 2b962ae3107..affdb569f12 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -163,8 +163,12 @@ class Attachment < ApplicationRecord
content_type == "application/pdf"
end
+ def is_html?
+ content_type == "text/html"
+ end
+
def is_text?
- content_type.match?(/\Atext\/.+/)
+ content_type.match?(/\Atext\/.+/) && !is_html?
end
def is_diff?
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 6c8309923e0..64289111dae 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -187,7 +187,7 @@ class Changeset < ApplicationRecord
@next ||= Changeset.where(["id > ? AND repository_id = ?", id, repository_id]).order(Arel.sql("id ASC")).first
end
- # Creates a new Change from it's common parameters
+ # Creates a new Change from its common parameters
def create_change(change)
Change.create(changeset: self,
action: change[:action],
diff --git a/app/models/color.rb b/app/models/color.rb
index 9a47108bb0c..89f5f6c8a2f 100644
--- a/app/models/color.rb
+++ b/app/models/color.rb
@@ -35,6 +35,7 @@ class Color < ApplicationRecord
class_name: "Type",
dependent: :nullify
+ after_initialize :normalize_hexcode
before_validation :normalize_hexcode
validates :name, :hexcode, presence: true
diff --git a/app/models/colors/hex_color.rb b/app/models/colors/hex_color.rb
index 7825f306f1b..30baf4b3d34 100644
--- a/app/models/colors/hex_color.rb
+++ b/app/models/colors/hex_color.rb
@@ -8,6 +8,10 @@ module Colors
{ color: contrasting_font_color(light: light_color, dark: dark_color), "background-color": hexcode }
end
+ def color_styles_css
+ color_styles.map { |k, v| "#{k}: #{v};" }.join(" ")
+ end
+
def contrasting_font_color(light: "#FFFFFF", dark: "#333333")
bright? ? dark : light
end
diff --git a/app/models/concerns/reactable.rb b/app/models/concerns/reactable.rb
index 9e3fb6e8c64..1c93cdde758 100644
--- a/app/models/concerns/reactable.rb
+++ b/app/models/concerns/reactable.rb
@@ -83,7 +83,7 @@ module Reactable
"users.firstname"
when :lastname_firstname
"concat_ws(' ', users.lastname, users.firstname)"
- when :lastname_coma_firstname
+ when :lastname_comma_firstname
"concat_ws(', ', users.lastname, users.firstname)"
when :lastname_n_firstname
"concat_ws('', users.lastname, users.firstname)"
diff --git a/app/models/concerns/remindable.rb b/app/models/concerns/remindable.rb
new file mode 100644
index 00000000000..d55e65bf912
--- /dev/null
+++ b/app/models/concerns/remindable.rb
@@ -0,0 +1,35 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 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 Remindable
+ extend ActiveSupport::Concern
+
+ included do
+ has_many :reminders, as: :remindable, dependent: :destroy
+ end
+end
diff --git a/app/models/custom_actions/actions/base.rb b/app/models/custom_actions/actions/base.rb
index 8b64662449b..4995d3c9371 100644
--- a/app/models/custom_actions/actions/base.rb
+++ b/app/models/custom_actions/actions/base.rb
@@ -43,6 +43,12 @@ class CustomActions::Actions::Base
raise NotImplementedError
end
+ def value_objects
+ values.map do |value|
+ allowed_values.find { |v| v[:value] == value }
+ end
+ end
+
def type
raise NotImplementedError
end
diff --git a/app/models/custom_actions/actions/custom_field.rb b/app/models/custom_actions/actions/custom_field.rb
index c1b0a82eba8..374b3406218 100644
--- a/app/models/custom_actions/actions/custom_field.rb
+++ b/app/models/custom_actions/actions/custom_field.rb
@@ -49,7 +49,7 @@ class CustomActions::Actions::CustomField < CustomActions::Actions::Base
def self.all
WorkPackageCustomField
- .order(:name)
+ .usable_as_custom_action
.map do |cf|
create_subclass(cf)
end
diff --git a/app/models/custom_actions/conditions/base.rb b/app/models/custom_actions/conditions/base.rb
index 93828f8d388..ddd0a58fdd3 100644
--- a/app/models/custom_actions/conditions/base.rb
+++ b/app/models/custom_actions/conditions/base.rb
@@ -45,6 +45,12 @@ class CustomActions::Conditions::Base
.map { |value, label| { value:, label: } }
end
+ def value_objects
+ values.map do |value|
+ allowed_values.find { |v| v[:value] == value }
+ end
+ end
+
def human_name
WorkPackage.human_attribute_name(self.class.key)
end
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 9fc37427bde..426aebfd36a 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -66,7 +66,7 @@ class CustomField < ApplicationRecord
errors.add(:name, :taken) if name.in?(taken_names)
end
- validates :field_format, inclusion: { in: OpenProject::CustomFieldFormat.available_formats }
+ validates :field_format, inclusion: { in: -> { OpenProject::CustomFieldFormat.available_formats } }
validate :validate_default_value
validate :validate_regex
@@ -296,7 +296,7 @@ class CustomField < ApplicationRecord
end
def multi_value_possible?
- version? || user? || list? || field_format_hierarchy?
+ OpenProject::CustomFieldFormat.find_by(name: field_format)&.multi_value_possible?
end
def allow_non_open_versions_possible?
@@ -305,7 +305,7 @@ class CustomField < ApplicationRecord
##
# Overrides cache key so that a custom field's representation
- # is updated correctly when it's mutli_value attribute changes.
+ # is updated correctly when its multi_value attribute changes.
def cache_key
tag = multi_value? ? "mv" : "sv"
@@ -326,12 +326,18 @@ class CustomField < ApplicationRecord
def possible_user_values_options(obj)
mapped_with_deduced_project(obj) do |project|
- if project&.persisted?
- project.principals
- else
- Principal
- .in_visible_project_or_me(User.current)
- end
+ scope = if project&.persisted?
+ project.principals
+ else
+ Principal
+ .in_visible_project_or_me(User.current)
+ end
+
+ user_format_columns = User::USER_FORMATS_STRUCTURE[Setting.user_format].map(&:to_s)
+ # Always include lastname if not already included, as Groups always need a lastname (alias for name)
+ user_format_columns << "lastname" unless user_format_columns.include?("lastname")
+
+ scope.select(*user_format_columns, "id", "type")
end
end
diff --git a/app/models/custom_field/hierarchy/hierarchy_item_adapter.rb b/app/models/custom_field/hierarchy/hierarchy_item_adapter.rb
new file mode 100644
index 00000000000..14cd4053bc7
--- /dev/null
+++ b/app/models/custom_field/hierarchy/hierarchy_item_adapter.rb
@@ -0,0 +1,41 @@
+# 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 CustomField::Hierarchy::HierarchyItemAdapter
+ delegate :id, :label, :short, :to_s, to: :item
+
+ def initialize(item:) = @item = item
+
+ def name = @item.label
+
+ private
+
+ attr_accessor :item
+end
diff --git a/app/models/custom_field/hierarchy/item.rb b/app/models/custom_field/hierarchy/item.rb
index dcb12cc2759..3490e7009ef 100644
--- a/app/models/custom_field/hierarchy/item.rb
+++ b/app/models/custom_field/hierarchy/item.rb
@@ -35,4 +35,10 @@ class CustomField::Hierarchy::Item < ApplicationRecord
has_closure_tree order: "sort_order", numeric_order: true, dont_order_roots: true, dependent: :destroy
scope :including_children, -> { includes(children: :children) }
+
+ def to_s = short.nil? ? label : "#{label} (#{short})"
+
+ def ancestry_path
+ self_and_ancestors.filter_map(&:to_s).reverse.join(" / ")
+ end
end
diff --git a/app/models/custom_field/order_statements.rb b/app/models/custom_field/order_statements.rb
index 86984954fee..945e22fa02f 100644
--- a/app/models/custom_field/order_statements.rb
+++ b/app/models/custom_field/order_statements.rb
@@ -31,7 +31,7 @@ module CustomField::OrderStatements
# value of the custom field.
def order_statement
case field_format
- when "string", "date", "bool", "link", "int", "float", "list", "user", "version"
+ when "string", "date", "bool", "link", "int", "float", "list", "user", "version", "hierarchy"
"cf_order_#{id}.value"
end
end
@@ -52,6 +52,8 @@ module CustomField::OrderStatements
join_for_order_by_user_sql
when "version"
join_for_order_by_version_sql
+ when "hierarchy"
+ join_for_order_by_hierarchy_sql
end
end
@@ -73,7 +75,7 @@ module CustomField::OrderStatements
# Returns the expression to use in SELECT clause if it differs from one used
# to group by
def group_by_select_statement
- return unless field_format == "list"
+ return unless field_format == "list" || field_format == "hierarchy"
# MIN needed to not add this column to group by, ANY_VALUE can be used when
# minimum required PostgreSQL becomes 16
@@ -90,7 +92,7 @@ module CustomField::OrderStatements
private
- def can_be_used_for_grouping? = field_format.in?(%w[list date bool int float string link])
+ def can_be_used_for_grouping? = field_format.in?(%w[list date bool int float string link hierarchy])
# Template for all the join statements.
#
@@ -167,4 +169,13 @@ module CustomField::OrderStatements
multi_value:
)
end
+
+ def join_for_order_by_hierarchy_sql
+ join_for_order_sql(
+ value: multi_value? ? "ARRAY_AGG(item.position_cache ORDER BY item.position_cache)" : "item.position_cache",
+ add_select: "#{multi_value? ? "ARRAY_TO_STRING(ARRAY_AGG(cv.value ORDER BY item.position_cache), '.')" : 'cv.value'} ids",
+ join: "INNER JOIN #{CustomField::Hierarchy::Item.quoted_table_name} item ON item.id = cv.value::bigint",
+ multi_value:
+ )
+ end
end
diff --git a/app/models/custom_style.rb b/app/models/custom_style.rb
index 8e0603b2e17..6155a03d988 100644
--- a/app/models/custom_style.rb
+++ b/app/models/custom_style.rb
@@ -35,7 +35,11 @@ class CustomStyle < ApplicationRecord
image = send(name)
image&.remove!
- update_columns(name => nil, updated_at: Time.zone.now)
+ if new_record?
+ send(:"#{name}=", nil)
+ else
+ update_columns(name => nil, updated_at: Time.zone.now)
+ end
end
end
end
diff --git a/app/models/custom_value/hierarchy_strategy.rb b/app/models/custom_value/hierarchy_strategy.rb
index 86d63d5145b..2ce05be7336 100644
--- a/app/models/custom_value/hierarchy_strategy.rb
+++ b/app/models/custom_value/hierarchy_strategy.rb
@@ -48,6 +48,8 @@ class CustomValue::HierarchyStrategy < CustomValue::ARObjectStrategy
item = CustomField::Hierarchy::Item.find_by(id: value.to_s)
if item.nil?
"#{value} #{I18n.t(:label_not_found)}"
+ elsif item.short.present?
+ "#{item.label} (#{item.short})"
else
item.label
end
diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
index da80df87146..d6c653771df 100644
--- a/app/models/enumeration.rb
+++ b/app/models/enumeration.rb
@@ -48,24 +48,15 @@ class Enumeration < ApplicationRecord
scope :shared, -> { where(project_id: nil) }
scope :active, -> { where(active: true) }
- # let all child classes have Enumeration as it's model name
- # used to not having to create another route for every subclass of Enumeration
- def self.inherited(child)
- child.instance_eval do
- def model_name
- Enumeration.model_name
- end
- end
- super
- end
-
def self.colored?
false
end
+ delegate :colored?, to: :class
+
def self.default
# Creates a fake default scope so Enumeration.default will check
- # it's type. STI subclasses will automatically add their own
+ # its type. STI subclasses will automatically add their own
# types to the finder.
if descends_from_active_record?
where(is_default: true, type: "Enumeration").first
@@ -75,6 +66,11 @@ class Enumeration < ApplicationRecord
end
end
+ # boolean to define if the enumeration can set a default
+ def self.can_have_default_value?
+ true
+ end
+
# Destroys enumerations in a single transaction
# It ensures, that the transactions can be safely transferred to each
# entry's parent
@@ -178,8 +174,3 @@ class Enumeration < ApplicationRecord
raise "Can't delete enumeration" if in_use?
end
end
-
-# Force load the subclasses in development mode
-%w(time_entry_activity issue_priority).each do |enum_subclass|
- require enum_subclass
-end
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 04f66834916..95da1c3ed52 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -177,6 +177,16 @@ class Journal < ApplicationRecord
cause_type.present?
end
+ def has_unread_notifications_for_user?(user)
+ # we optionally set the instance variable @unread_notifications in the ActivityEagerLoadingWrapper
+ # in order to avoid N+1 queries
+ if instance_variable_defined?(:@unread_notifications)
+ @unread_notifications&.any? { |notification| notification.recipient_id == user.id }
+ else
+ notifications.where(read_ian: false, recipient_id: user.id).any?
+ end
+ end
+
private
def has_file_links?
diff --git a/app/models/journal/base_journal.rb b/app/models/journal/base_journal.rb
index ea9cd0fa094..826b7c62767 100644
--- a/app/models/journal/base_journal.rb
+++ b/app/models/journal/base_journal.rb
@@ -37,7 +37,7 @@ class Journal::BaseJournal < ApplicationRecord
end
def self.journaled_attributes
- @journaled_attributes ||= column_names.map(&:to_sym) - excluded_attributes
+ @journaled_attributes ||= columns.reject(&:virtual?).map { |col| col.name.to_sym } - excluded_attributes
end
def self.excluded_attributes
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 3525d0d6ba2..9951bbfb90f 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -355,7 +355,10 @@ class MailHandler < ActionMailer::Base
end
def human_attr_translations(attr)
- keys = [attr.to_s.humanize]
+ keys = [
+ attr.to_s,
+ attr.to_s.humanize
+ ]
[user&.language, Setting.default_language].compact_blank.each do |lang|
keys << all_attribute_translations(lang)[attr]
diff --git a/app/models/notification.rb b/app/models/notification.rb
index c0e5f7a0e2e..e21493cc10d 100644
--- a/app/models/notification.rb
+++ b/app/models/notification.rb
@@ -40,7 +40,8 @@ class Notification < ApplicationRecord
responsible: 9,
date_alert_start_date: 10,
date_alert_due_date: 11,
- shared: 12
+ shared: 12,
+ reminder: 13
}.freeze
enum :reason, REASONS, prefix: true
@@ -50,6 +51,9 @@ class Notification < ApplicationRecord
belongs_to :journal
belongs_to :resource, polymorphic: true
+ has_one :reminder_notification, dependent: :destroy
+ has_one :reminder, through: :reminder_notification
+
include Scopes::Scoped
scopes :unsent_reminders_before,
:mail_reminder_unsent,
diff --git a/app/models/oauth_client.rb b/app/models/oauth_client.rb
index 3b25763d6b0..60b01ed552f 100644
--- a/app/models/oauth_client.rb
+++ b/app/models/oauth_client.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -29,6 +31,7 @@
class OAuthClient < ApplicationRecord
belongs_to :integration, polymorphic: true
has_many :remote_identities, dependent: :destroy
+ has_many :oauth_client_tokens, dependent: :destroy
def redirect_uri
File.join(Rails.application.root_url, "oauth_clients", client_id, "callback")
diff --git a/app/models/permitted_params.rb b/app/models/permitted_params.rb
index ba22823578b..d145da84d56 100644
--- a/app/models/permitted_params.rb
+++ b/app/models/permitted_params.rb
@@ -290,6 +290,12 @@ class PermittedParams
whitelist.merge(custom_field_values(:project))
end
+ def project_life_cycles
+ params.require(:project).permit(
+ available_life_cycle_steps_attributes: %i[id date date_range]
+ )
+ end
+
def project_custom_field_project_mapping
params.require(:project_custom_field_project_mapping)
.permit(*self.class.permitted_attributes[:project_custom_field_project_mapping])
diff --git a/app/models/principal.rb b/app/models/principal.rb
index e8d1a444872..4706cde6a2f 100644
--- a/app/models/principal.rb
+++ b/app/models/principal.rb
@@ -176,6 +176,11 @@ class Principal < ApplicationRecord
false
end
+ # Returns true if usr or current user is allowed to view the user
+ def visible?(usr = User.current)
+ User.visible(usr).exists?(id: id)
+ end
+
def <=>(other)
if instance_of?(other.class)
to_s.downcase <=> other.to_s.downcase
diff --git a/app/models/principals/scopes/ordered_by_name.rb b/app/models/principals/scopes/ordered_by_name.rb
index 39f8f004c5e..b4699410607 100644
--- a/app/models/principals/scopes/ordered_by_name.rb
+++ b/app/models/principals/scopes/ordered_by_name.rb
@@ -57,7 +57,7 @@ module Principals::Scopes
"concat_ws(' ', users.firstname, users.lastname)"
when :firstname
"users.firstname"
- when :lastname_firstname, :lastname_coma_firstname, :lastname_n_firstname
+ when :lastname_firstname, :lastname_comma_firstname, :lastname_n_firstname
"concat_ws(' ', users.lastname, users.firstname)"
when :username
"users.login"
diff --git a/app/models/project.rb b/app/models/project.rb
index f2078192f3c..6703dfa9c37 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -86,14 +86,45 @@ class Project < ApplicationRecord
has_many :notification_settings, dependent: :destroy
has_many :project_storages, dependent: :destroy, class_name: "Storages::ProjectStorage"
has_many :storages, through: :project_storages
+ has_many :life_cycle_steps, class_name: "Project::LifeCycleStep", dependent: :destroy
+ has_many :available_life_cycle_steps,
+ -> { visible.eager_load(:definition).order(position: :asc) },
+ class_name: "Project::LifeCycleStep",
+ inverse_of: :project,
+ dependent: :destroy
+
+ has_many :recurring_meetings, dependent: :destroy
+
+ accepts_nested_attributes_for :available_life_cycle_steps
+ validates_associated :available_life_cycle_steps, on: :saving_life_cycle_steps
store_attribute :settings, :deactivate_work_package_attachments, :boolean
acts_as_favorable
- acts_as_customizable # extended in Projects::CustomFields in order to support sections
+ acts_as_customizable validate_on: :saving_custom_fields
+ # extended in Projects::CustomFields in order to support sections
# and project-level activation of custom fields
+ # Override the `validation_context` getter to include the `default_validation_context` when the
+ # context is `:saving_custom_fields`. This is required, because the `acts_as_url` plugin from
+ # `stringex` defines a callback on the `:create` context for initialising the `identifier` field.
+ # Providing a custom context while creating the project, will not execute the callbacks on the
+ # `:create` or `:update` contexts, meaning the identifier will not get initialised.
+ # In order to initialise the identifier, the `default_validation_context` (`:create`, or `:update`)
+ # should be included when validating via the `:saving_custom_fields`. This way every create
+ # or update callback will also be executed alongside the `:saving_custom_fields` callbacks.
+ # This problem does not affect the contextless callbacks, they are always executed.
+
+ def validation_context
+ case Array(@validation_context)
+ in [*, :saving_custom_fields, *] => context
+ context << default_validation_context
+ else
+ @validation_context
+ end
+ end
+
acts_as_searchable columns: %W(#{table_name}.name #{table_name}.identifier #{table_name}.description),
date_column: "#{table_name}.created_at",
project_key: "id",
diff --git a/app/models/project/gate.rb b/app/models/project/gate.rb
new file mode 100644
index 00000000000..8c49a5360c5
--- /dev/null
+++ b/app/models/project/gate.rb
@@ -0,0 +1,45 @@
+#-- 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 Project::Gate < Project::LifeCycleStep
+ alias_attribute :date, :start_date
+
+ # This ensures the type cannot be changed after initialising the class.
+ validates :type, inclusion: { in: %w[Project::Gate], message: :must_be_a_gate }
+ validate :end_date_not_allowed
+
+ def end_date_not_allowed
+ if end_date.present?
+ errors.add(:base, :end_date_not_allowed)
+ end
+ end
+
+ def not_set?
+ date.blank?
+ end
+end
diff --git a/app/models/project/gate_definition.rb b/app/models/project/gate_definition.rb
new file mode 100644
index 00000000000..a0cfef69352
--- /dev/null
+++ b/app/models/project/gate_definition.rb
@@ -0,0 +1,39 @@
+#-- 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 Project::GateDefinition < Project::LifeCycleStepDefinition
+ has_many :gates, # Alias for life_cycle_steps
+ class_name: "Project::Gate",
+ foreign_key: :definition_id,
+ inverse_of: :definition,
+ dependent: :destroy
+
+ def step_class
+ Project::Gate
+ end
+end
diff --git a/app/models/project/life_cycle_step.rb b/app/models/project/life_cycle_step.rb
new file mode 100644
index 00000000000..e703c0b26b7
--- /dev/null
+++ b/app/models/project/life_cycle_step.rb
@@ -0,0 +1,62 @@
+#-- 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 Project::LifeCycleStep < ApplicationRecord
+ belongs_to :project, optional: false, inverse_of: :available_life_cycle_steps
+ belongs_to :definition,
+ optional: false,
+ class_name: "Project::LifeCycleStepDefinition"
+ has_many :work_packages, inverse_of: :project_life_cycle_step, dependent: :nullify
+
+ delegate :name, :position, to: :definition
+
+ attr_readonly :definition_id, :type
+
+ validates :type, inclusion: { in: %w[Project::Stage Project::Gate], message: :must_be_a_stage_or_gate }
+ validate :validate_type_and_class_name_are_identical
+
+ scope :active, -> { where(active: true) }
+
+ class << self
+ def visible(user = User.current)
+ allowed_projects = Project.allowed_to(user, :view_project_stages_and_gates)
+ active.where(project: allowed_projects)
+ end
+ end
+
+ def validate_type_and_class_name_are_identical
+ if type != self.class.name
+ errors.add(:type, :type_and_class_name_mismatch)
+ end
+ end
+
+ def column_name
+ # The id of the associated definition is relevant for displaying the correct column headers
+ "lcsd_#{definition_id}"
+ end
+end
diff --git a/app/models/project/life_cycle_step_definition.rb b/app/models/project/life_cycle_step_definition.rb
new file mode 100644
index 00000000000..031e72d4ee5
--- /dev/null
+++ b/app/models/project/life_cycle_step_definition.rb
@@ -0,0 +1,67 @@
+#-- 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 Project::LifeCycleStepDefinition < ApplicationRecord
+ include ::Scopes::Scoped
+
+ has_many :life_cycle_steps,
+ class_name: "Project::LifeCycleStep",
+ foreign_key: :definition_id,
+ inverse_of: :definition,
+ dependent: :destroy
+ has_many :projects, through: :life_cycle_steps
+ belongs_to :color, optional: false
+
+ validates :name, presence: true, uniqueness: true
+ validates :type, inclusion: { in: %w[Project::StageDefinition Project::GateDefinition], message: :must_be_a_stage_or_gate }
+ validate :validate_type_and_class_name_are_identical
+
+ attr_readonly :type
+
+ acts_as_list
+
+ default_scope { order(:position) }
+
+ scopes :with_project_count
+
+ def step_class
+ raise NotImplementedError
+ end
+
+ def column_name
+ "lcsd_#{id}"
+ end
+
+ private
+
+ def validate_type_and_class_name_are_identical
+ if type != self.class.name
+ errors.add(:type, :type_and_class_name_mismatch)
+ end
+ end
+end
diff --git a/app/models/project/life_cycle_step_definitions/scopes/with_project_count.rb b/app/models/project/life_cycle_step_definitions/scopes/with_project_count.rb
new file mode 100644
index 00000000000..e4448a90187
--- /dev/null
+++ b/app/models/project/life_cycle_step_definitions/scopes/with_project_count.rb
@@ -0,0 +1,50 @@
+# 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 Project::LifeCycleStepDefinitions::Scopes
+ module WithProjectCount
+ extend ActiveSupport::Concern
+
+ class_methods do
+ def with_project_count
+ project_counts = Project::LifeCycleStep
+ .where(active: true)
+ .group(:definition_id)
+ .select(:definition_id, "COUNT(project_id) AS count")
+
+ Project::LifeCycleStepDefinition
+ .with(project_counts:)
+ .joins("LEFT OUTER JOIN project_counts ON #{quoted_table_name}.id = project_counts.definition_id")
+ .select("#{quoted_table_name}.*")
+ .select("COALESCE(project_counts.count, 0) AS project_count")
+ end
+ end
+ end
+end
diff --git a/app/models/project/stage.rb b/app/models/project/stage.rb
new file mode 100644
index 00000000000..2ee54f26cd3
--- /dev/null
+++ b/app/models/project/stage.rb
@@ -0,0 +1,64 @@
+#-- 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 Project::Stage < Project::LifeCycleStep
+ # This ensures the type cannot be changed after initialising the class.
+ validates :type, inclusion: { in: %w[Project::Stage], message: :must_be_a_stage }
+ validate :validate_date_range
+
+ def working_days_count
+ return nil if not_set?
+
+ Day.working.from_range(from: start_date, to: end_date).count
+ end
+
+ def date_range=(param)
+ self.start_date, self.end_date = param.split(" - ")
+ self.end_date ||= start_date # Allow single dates as range
+ end
+
+ def not_set?
+ start_date.blank? || end_date.blank?
+ end
+
+ def range_set?
+ !not_set?
+ end
+
+ def range_incomplete?
+ start_date.blank? ^ end_date.blank?
+ end
+
+ def validate_date_range
+ if range_incomplete?
+ errors.add(:date_range, :incomplete)
+ elsif range_set? && (start_date > end_date)
+ errors.add(:date_range, :start_date_must_be_before_end_date)
+ end
+ end
+end
diff --git a/app/models/project/stage_definition.rb b/app/models/project/stage_definition.rb
new file mode 100644
index 00000000000..f373d13cd64
--- /dev/null
+++ b/app/models/project/stage_definition.rb
@@ -0,0 +1,39 @@
+#-- 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 Project::StageDefinition < Project::LifeCycleStepDefinition
+ has_many :stages, # Alias for life_cycle_steps
+ class_name: "Project::Stage",
+ foreign_key: :definition_id,
+ inverse_of: :definition,
+ dependent: :destroy
+
+ def step_class
+ Project::Stage
+ end
+end
diff --git a/app/models/projects.rb b/app/models/projects.rb
new file mode 100644
index 00000000000..27b2504bd99
--- /dev/null
+++ b/app/models/projects.rb
@@ -0,0 +1,5 @@
+module Projects
+ def self.table_name_prefix
+ "projects_"
+ end
+end
diff --git a/app/models/queries/filters.rb b/app/models/queries/filters.rb
index 293f2469f20..503c69862db 100644
--- a/app/models/queries/filters.rb
+++ b/app/models/queries/filters.rb
@@ -40,7 +40,8 @@ module Queries::Filters
search: Queries::Filters::Strategies::Search,
float: Queries::Filters::Strategies::Float,
inexistent: Queries::Filters::Strategies::Inexistent,
- empty_value: Queries::Filters::Strategies::EmptyValue
+ empty_value: Queries::Filters::Strategies::EmptyValue,
+ hierarchy: Queries::Filters::Strategies::Hierarchy
}.freeze
##
diff --git a/app/models/queries/filters/shared/any_user_name_attribute_filter.rb b/app/models/queries/filters/shared/any_user_name_attribute_filter.rb
index d4ff4d16194..c0b59570989 100644
--- a/app/models/queries/filters/shared/any_user_name_attribute_filter.rb
+++ b/app/models/queries/filters/shared/any_user_name_attribute_filter.rb
@@ -47,6 +47,10 @@ module Queries::Filters::Shared::AnyUserNameAttributeFilter
User.current.allowed_globally?(:view_user_email)
end
+ def human_name
+ I18n.t(:label_filter_any_name_attribute)
+ end
+
private
def sql_concat_name
diff --git a/app/models/queries/filters/shared/custom_field_filter.rb b/app/models/queries/filters/shared/custom_field_filter.rb
index 1e3cea7c7d5..45a9c3831e5 100644
--- a/app/models/queries/filters/shared/custom_field_filter.rb
+++ b/app/models/queries/filters/shared/custom_field_filter.rb
@@ -70,29 +70,12 @@ module Queries::Filters::Shared::CustomFieldFilter
##
# Create a filter instance for the given custom field
def from_custom_field!(custom_field:, **)
- constant_name = subfilter_module(custom_field)
- clazz = "::Queries::Filters::Shared::CustomFields::#{constant_name}".constantize
- clazz.create!(custom_field:, custom_field_context:, **)
+ subfilter_class(custom_field).create!(custom_field:, custom_field_context:, **)
rescue NameError => e
Rails.logger.error "Failed to constantize custom field filter for #{name}. #{e}"
raise ::Queries::Filters::InvalidError
end
- ##
- # Get the subfilter class name for the given custom field
- def subfilter_module(custom_field)
- case custom_field.field_format
- when "user"
- :User
- when "list", "version"
- :ListOptional
- when "bool"
- :Bool
- else
- :Base
- end
- end
-
def all_custom_fields
key = ["Queries::Filters::Shared::CustomFieldFilter",
custom_field_context.custom_field_class,
@@ -102,5 +85,22 @@ module Queries::Filters::Shared::CustomFieldFilter
custom_field_context.custom_field_class.all.to_a
end
end
+
+ private
+
+ def subfilter_class(custom_field)
+ case custom_field.field_format
+ when "user"
+ ::Queries::Filters::Shared::CustomFields::User
+ when "list", "version"
+ ::Queries::Filters::Shared::CustomFields::ListOptional
+ when "hierarchy"
+ ::Queries::Filters::Shared::CustomFields::Hierarchy
+ when "bool"
+ ::Queries::Filters::Shared::CustomFields::Bool
+ else
+ ::Queries::Filters::Shared::CustomFields::Base
+ end
+ end
end
end
diff --git a/app/models/queries/filters/shared/custom_fields/base.rb b/app/models/queries/filters/shared/custom_fields/base.rb
index 1a6bc559cf7..07cf1b0cb30 100644
--- a/app/models/queries/filters/shared/custom_fields/base.rb
+++ b/app/models/queries/filters/shared/custom_fields/base.rb
@@ -89,6 +89,8 @@ module Queries::Filters::Shared
:text
when "date"
:date
+ when "hierarchy"
+ :hierarchy
else
:string
end
diff --git a/app/models/queries/filters/shared/custom_fields/hierarchy.rb b/app/models/queries/filters/shared/custom_fields/hierarchy.rb
new file mode 100644
index 00000000000..c29e545b9be
--- /dev/null
+++ b/app/models/queries/filters/shared/custom_fields/hierarchy.rb
@@ -0,0 +1,49 @@
+# 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 Queries
+ module Filters
+ module Shared
+ module CustomFields
+ class Hierarchy < Base
+ def ar_object_filter?
+ true
+ end
+
+ def value_objects
+ CustomField::Hierarchy::Item
+ .where(id: @values)
+ .map { |item| CustomField::Hierarchy::HierarchyItemAdapter.new(item:) }
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/queries/filters/shared/user_name_filter.rb b/app/models/queries/filters/shared/user_name_filter.rb
index 2de87015a13..c457df1a380 100644
--- a/app/models/queries/filters/shared/user_name_filter.rb
+++ b/app/models/queries/filters/shared/user_name_filter.rb
@@ -71,7 +71,7 @@ module Queries::Filters::Shared::UserNameFilter
"LOWER(CONCAT(users.firstname, ' ', users.lastname))"
when :firstname
"LOWER(users.firstname)"
- when :lastname_firstname, :lastname_coma_firstname
+ when :lastname_firstname, :lastname_comma_firstname
"LOWER(CONCAT(users.lastname, CONCAT(' ', users.firstname)))"
when :lastname_n_firstname
"LOWER(CONCAT(users.lastname, users.firstname))"
diff --git a/app/models/queries/filters/strategies/hierarchy.rb b/app/models/queries/filters/strategies/hierarchy.rb
new file mode 100644
index 00000000000..158ff5ab0c6
--- /dev/null
+++ b/app/models/queries/filters/strategies/hierarchy.rb
@@ -0,0 +1,46 @@
+# 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 Queries
+ module Filters
+ module Strategies
+ class Hierarchy < BaseStrategy
+ self.supported_operators = %w[= ! eq_with_descendants]
+ self.default_operator = "="
+
+ def operator_map
+ super.dup.tap do |super_value|
+ super_value["eq_with_descendants"] = ::Queries::Operators::CustomFields::Hierarchies::EqualsWithDescendants
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/queries/filters/strategies/huge_list.rb b/app/models/queries/filters/strategies/huge_list.rb
index 83ab9ac173b..12ae9014a3a 100644
--- a/app/models/queries/filters/strategies/huge_list.rb
+++ b/app/models/queries/filters/strategies/huge_list.rb
@@ -33,10 +33,18 @@ module Queries::Filters::Strategies
def validate
unique_values = values.uniq
- allowed_and_desired_values = allowed_values_subset & unique_values
- if allowed_and_desired_values.sort != unique_values.sort
- errors.add(:values, :inclusion)
+ case allowed_values_subset
+ when ActiveRecord::Relation
+ unless allowed_values_subset.exists?(id: values)
+ errors.add(:values, :inclusion)
+ end
+ else
+ allowed_and_desired_values = allowed_values_subset & unique_values
+
+ if allowed_and_desired_values.sort != unique_values.sort
+ errors.add(:values, :inclusion)
+ end
end
end
diff --git a/app/models/queries/filters/strategies/integer_list_optional.rb b/app/models/queries/filters/strategies/integer_list_optional.rb
index df55d434c6c..f7a0ff61c3d 100644
--- a/app/models/queries/filters/strategies/integer_list_optional.rb
+++ b/app/models/queries/filters/strategies/integer_list_optional.rb
@@ -33,6 +33,7 @@ module Queries::Filters::Strategies
def operator_map
super_value = super.dup
super_value["="] = ::Queries::Operators::EqualsOr
+ super_value["*"] = ::Queries::Operators::All
super_value
end
diff --git a/app/models/queries/members/filters/blocked_filter.rb b/app/models/queries/members/filters/blocked_filter.rb
index ea71a3f97ad..e0205772f6f 100644
--- a/app/models/queries/members/filters/blocked_filter.rb
+++ b/app/models/queries/members/filters/blocked_filter.rb
@@ -29,6 +29,10 @@
class Queries::Members::Filters::BlockedFilter < Queries::Members::Filters::MemberFilter
include Queries::Filters::Shared::UserBlockedFilter
+ def human_name
+ I18n.t(:status_blocked)
+ end
+
def joins
:principal
end
diff --git a/app/models/queries/operators/custom_fields/hierarchies/equals_with_descendants.rb b/app/models/queries/operators/custom_fields/hierarchies/equals_with_descendants.rb
new file mode 100644
index 00000000000..941df671456
--- /dev/null
+++ b/app/models/queries/operators/custom_fields/hierarchies/equals_with_descendants.rb
@@ -0,0 +1,49 @@
+#-- 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 Queries
+ module Operators
+ module CustomFields
+ module Hierarchies
+ class EqualsWithDescendants < Base
+ label "equals_with_descendants"
+ set_symbol "eq_with_descendants"
+
+ def self.sql_for_field(values, db_table, db_field)
+ items = CustomField::Hierarchy::Item.find(values)
+ service = ::CustomFields::Hierarchy::HierarchicalItemService.new
+
+ actual_values = items.map { |item| service.get_descendants(item:).value! }.flatten.map(&:id).uniq
+
+ Equals.sql_for_field(actual_values, db_table, db_field)
+ end
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb b/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb
index 2b1bab0a046..a5d6d0ff847 100644
--- a/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb
+++ b/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb
@@ -31,8 +31,11 @@
class Queries::Principals::Filters::MentionableOnWorkPackageFilter <
Queries::Principals::Filters::PrincipalFilter
def allowed_values
- # We don't care for the first value as we do not display the values visibly
- @allowed_values ||= ::WorkPackage.visible.pluck(:id).map { |id| [id, id.to_s] }
+ raise NotImplementedError, "There would be too many candidates"
+ end
+
+ def allowed_values_subset
+ @allowed_values_subset ||= ::WorkPackage.visible
end
def type
@@ -43,6 +46,10 @@ class Queries::Principals::Filters::MentionableOnWorkPackageFilter <
:mentionable_on_work_package
end
+ def human_name
+ "mentionable" # intenral use
+ end
+
def apply_to(query_scope)
case operator
when "="
@@ -54,6 +61,10 @@ class Queries::Principals::Filters::MentionableOnWorkPackageFilter <
private
+ def type_strategy
+ @type_strategy ||= Queries::Filters::Strategies::HugeList.new(self)
+ end
+
def principals_with_a_membership
visible_scope.where(id: work_package_members.select(:user_id))
.or(visible_scope.where(id: project_members.select(:user_id)))
diff --git a/app/models/queries/projects.rb b/app/models/queries/projects.rb
index bb25098c532..147e04f4b33 100644
--- a/app/models/queries/projects.rb
+++ b/app/models/queries/projects.rb
@@ -54,6 +54,7 @@ module Queries::Projects
order Orders::LatestActivityAtOrder
order Orders::RequiredDiskSpaceOrder
order Orders::CustomFieldOrder
+ order Orders::LifeCycleStepOrder
order Orders::ProjectStatusOrder
order Orders::NameOrder
order Orders::TypeaheadOrder
@@ -62,6 +63,7 @@ module Queries::Projects
select Selects::CustomField
select Selects::Default
select Selects::LatestActivityAt
+ select Selects::LifeCycleStep
select Selects::RequiredDiskSpace
select Selects::Status
select Selects::Favored
diff --git a/app/models/queries/projects/filters/user_action_filter.rb b/app/models/queries/projects/filters/user_action_filter.rb
index fa1c2929102..f0ecfdd60ef 100644
--- a/app/models/queries/projects/filters/user_action_filter.rb
+++ b/app/models/queries/projects/filters/user_action_filter.rb
@@ -35,6 +35,10 @@ class Queries::Projects::Filters::UserActionFilter < Queries::Projects::Filters:
:list_all
end
+ def human_name
+ "User action" # API only
+ end
+
def where
operator = if operator_class <= ::Queries::Operators::Equals || operator_class <= ::Queries::Operators::EqualsAll
"IN"
diff --git a/app/models/queries/projects/orders/life_cycle_step_order.rb b/app/models/queries/projects/orders/life_cycle_step_order.rb
new file mode 100644
index 00000000000..7234a0fac86
--- /dev/null
+++ b/app/models/queries/projects/orders/life_cycle_step_order.rb
@@ -0,0 +1,111 @@
+# 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 Queries::Projects::Orders::LifeCycleStepOrder < Queries::Orders::Base
+ self.model = Project
+
+ validates :life_cycle_step_definition, presence: { message: I18n.t(:"activerecord.errors.messages.does_not_exist") }
+
+ def self.key
+ /\Alcsd_(\d+)\z/
+ end
+
+ def life_cycle_step_definition
+ return @life_cycle_step_definition if defined?(@life_cycle_step_definition)
+
+ @life_cycle_step_definition = Project::LifeCycleStepDefinition.find_by(id: attribute[/\Alcsd_(\d+)\z/, 1])
+ end
+
+ def available?
+ life_cycle_step_definition.present? &&
+ OpenProject::FeatureDecisions.stages_and_gates_active? &&
+ User.current.allowed_in_any_project?(:view_project_stages_and_gates)
+ end
+
+ private
+
+ def joins
+ join = <<~SQL.squish
+ LEFT JOIN (
+ SELECT steps.*, steps.definition_id as def_id
+ FROM project_life_cycle_steps steps
+ WHERE
+ steps.active = true
+ AND steps.definition_id = :definition_id
+ AND steps.project_id IN (#{viewable_project_ids.to_sql})
+ ) #{subquery_table_name} ON #{subquery_table_name}.project_id = projects.id
+ SQL
+
+ ActiveRecord::Base.sanitize_sql([join, { definition_id: life_cycle_step_definition.id }])
+ end
+
+ # Since we can combine multiple queries with their respective ORDER BY clauses, we need to make sure
+ # that the names of our tables are unique. It suffices to include the definition id into the name as there can only
+ # ever be one order statement per definition.
+ def subquery_table_name
+ definition_id = life_cycle_step_definition.id
+
+ :"life_cycle_steps_subquery_#{definition_id}"
+ end
+
+ def order(scope)
+ with_raise_on_invalid do
+ scope.where(order_condition)
+ .order(*order_by_start_and_end_date)
+ end
+ end
+
+ # Ensure that only life cycle columns viewable to the current user are considered
+ # for ordering the query result.
+ def viewable_project_ids
+ Project.allowed_to(User.current, :view_project_stages_and_gates).select(:id)
+ end
+
+ def order_condition
+ # To avoid SQL injection warnings, we use Arel to build the condition.
+ # Note that this SQL query uses the subquery defined in `joins`.
+ steps_table = Arel::Table.new(subquery_table_name.to_s)
+
+ # WHERE subquery_table_name.def_id = life_cycle_step_definition.id OR subquery_table_name.def_id IS NULL
+ steps_table[:def_id]
+ .eq(life_cycle_step_definition.id)
+ .or(steps_table[:def_id].eq(nil))
+ end
+
+ def order_by_start_and_end_date
+ steps_table = Arel::Table.new(subquery_table_name.to_s)
+
+ # Even though a gate does not define an end_date, this code still works.
+ [
+ steps_table[:start_date].send(direction),
+ steps_table[:end_date].send(direction)
+ ]
+ end
+end
diff --git a/app/models/queries/projects/selects/life_cycle_step.rb b/app/models/queries/projects/selects/life_cycle_step.rb
new file mode 100644
index 00000000000..16b14d901aa
--- /dev/null
+++ b/app/models/queries/projects/selects/life_cycle_step.rb
@@ -0,0 +1,91 @@
+# 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 Queries::Projects::Selects::LifeCycleStep < Queries::Selects::Base
+ KEY = /\Alcsd_(\d+)\z/
+
+ def self.key
+ KEY
+ end
+
+ def self.all_available
+ return [] unless available?
+
+ Project::LifeCycleStepDefinition
+ .pluck(:id)
+ .map { |id| new(:"lcsd_#{id}") }
+ end
+
+ def caption
+ life_cycle_step_definition.name
+ end
+
+ def life_cycle_step_definition
+ return @life_cycle_step_definition if defined?(@life_cycle_step_definition)
+
+ @life_cycle_step_definition = Project::LifeCycleStepDefinition
+ .find_by(id: attribute[KEY, 1])
+ end
+
+ def self.available?
+ OpenProject::FeatureDecisions.stages_and_gates_active? &&
+ User.current.allowed_in_any_project?(:view_project_stages_and_gates)
+ end
+
+ def available?
+ life_cycle_step_definition.present?
+ end
+
+ def visual_icon
+ # Show the proper icon for the definition with the correct color.
+ icon = case life_cycle_step_definition
+ when Project::StageDefinition
+ :"git-commit"
+ when Project::GateDefinition
+ :diamond
+ else
+ raise "Unknown life cycle definition for: #{life_cycle_step_definition}"
+ end
+
+ classes = helpers.hl_inline_class("life_cycle_step_definition", life_cycle_step_definition)
+
+ { icon:, classes: }
+ end
+
+ def action_menu_classes
+ "leading-visual-icon-header"
+ end
+
+ private
+
+ def helpers
+ @helpers ||= Object.new.extend(ColorsHelper)
+ end
+end
diff --git a/app/models/queries/relations/filters/involved_filter.rb b/app/models/queries/relations/filters/involved_filter.rb
index d999dd8cdea..b8d326d5d97 100644
--- a/app/models/queries/relations/filters/involved_filter.rb
+++ b/app/models/queries/relations/filters/involved_filter.rb
@@ -45,6 +45,10 @@ module Queries
:involved
end
+ def human_name
+ "Involved" # API only
+ end
+
private
def visibility_checked_sql(operator_string, values, visible_sql)
diff --git a/app/models/queries/roles/filters/allows_becoming_assignee_filter.rb b/app/models/queries/roles/filters/allows_becoming_assignee_filter.rb
index 116790569ef..627de046e37 100644
--- a/app/models/queries/roles/filters/allows_becoming_assignee_filter.rb
+++ b/app/models/queries/roles/filters/allows_becoming_assignee_filter.rb
@@ -34,6 +34,10 @@ class Queries::Roles::Filters::AllowsBecomingAssigneeFilter <
:list
end
+ def human_name
+ "Allows becoming assignee" # internal filter
+ end
+
def where
permission_ids = if values.first == OpenProject::Database::DB_VALUE_TRUE
assignable_permissions
diff --git a/app/models/queries/roles/filters/grantable_filter.rb b/app/models/queries/roles/filters/grantable_filter.rb
index c39075a9656..3b46ee1914f 100644
--- a/app/models/queries/roles/filters/grantable_filter.rb
+++ b/app/models/queries/roles/filters/grantable_filter.rb
@@ -32,6 +32,10 @@ class Queries::Roles::Filters::GrantableFilter < Queries::Roles::Filters::RoleFi
:list
end
+ def human_name
+ I18n.t(:label_role_grantable)
+ end
+
def where
db_values = if values.first == OpenProject::Database::DB_VALUE_TRUE
[Role::NON_BUILTIN]
diff --git a/app/models/queries/work_packages/filter/blocked_filter.rb b/app/models/queries/work_packages/filter/blocked_filter.rb
index e644d230cc0..d1f0644c846 100644
--- a/app/models/queries/work_packages/filter/blocked_filter.rb
+++ b/app/models/queries/work_packages/filter/blocked_filter.rb
@@ -36,6 +36,10 @@ class Queries::WorkPackages::Filter::BlockedFilter <
::Relation::TYPE_BLOCKED
end
+ def human_name
+ I18n.t("work_package_relations_tab.relations.label_blocked_by_singular")
+ end
+
private
def relation_filter
diff --git a/app/models/queries/work_packages/filter/blocks_filter.rb b/app/models/queries/work_packages/filter/blocks_filter.rb
index 8439c4116ee..671712f43e6 100644
--- a/app/models/queries/work_packages/filter/blocks_filter.rb
+++ b/app/models/queries/work_packages/filter/blocks_filter.rb
@@ -36,6 +36,10 @@ class Queries::WorkPackages::Filter::BlocksFilter <
::Relation::TYPE_BLOCKS
end
+ def human_name
+ I18n.t("work_package_relations_tab.relations.label_blocks_singular")
+ end
+
private
def relation_filter
diff --git a/app/models/queries/work_packages/filter/duplicated_filter.rb b/app/models/queries/work_packages/filter/duplicated_filter.rb
index 10d27a0c531..e7a7ccc9cc1 100644
--- a/app/models/queries/work_packages/filter/duplicated_filter.rb
+++ b/app/models/queries/work_packages/filter/duplicated_filter.rb
@@ -36,6 +36,10 @@ class Queries::WorkPackages::Filter::DuplicatedFilter <
::Relation::TYPE_DUPLICATED
end
+ def human_name
+ I18n.t("work_package_relations_tab.relations.label_duplicated_plural")
+ end
+
private
def relation_filter
diff --git a/app/models/queries/work_packages/filter/duplicates_filter.rb b/app/models/queries/work_packages/filter/duplicates_filter.rb
index c8949c409be..e44ad9fd6ab 100644
--- a/app/models/queries/work_packages/filter/duplicates_filter.rb
+++ b/app/models/queries/work_packages/filter/duplicates_filter.rb
@@ -36,6 +36,10 @@ class Queries::WorkPackages::Filter::DuplicatesFilter <
::Relation::TYPE_DUPLICATES
end
+ def human_name
+ I18n.t("work_package_relations_tab.relations.label_duplicates_singular")
+ end
+
private
def relation_filter
diff --git a/app/models/queries/work_packages/filter/follows_filter.rb b/app/models/queries/work_packages/filter/follows_filter.rb
index 28d5c4669a1..5a3ae71f9e9 100644
--- a/app/models/queries/work_packages/filter/follows_filter.rb
+++ b/app/models/queries/work_packages/filter/follows_filter.rb
@@ -36,6 +36,10 @@ class Queries::WorkPackages::Filter::FollowsFilter <
::Relation::TYPE_FOLLOWS
end
+ def human_name
+ I18n.t(:label_follows)
+ end
+
private
def relation_filter
diff --git a/app/models/queries/work_packages/filter/includes_filter.rb b/app/models/queries/work_packages/filter/includes_filter.rb
index a3e91c8694a..874a638822f 100644
--- a/app/models/queries/work_packages/filter/includes_filter.rb
+++ b/app/models/queries/work_packages/filter/includes_filter.rb
@@ -36,6 +36,10 @@ class Queries::WorkPackages::Filter::IncludesFilter <
::Relation::TYPE_INCLUDES
end
+ def human_name
+ I18n.t(:label_includes)
+ end
+
private
def relation_filter
diff --git a/app/models/queries/work_packages/filter/manual_sort_filter.rb b/app/models/queries/work_packages/filter/manual_sort_filter.rb
index 79e526d466b..8b64aaf0feb 100644
--- a/app/models/queries/work_packages/filter/manual_sort_filter.rb
+++ b/app/models/queries/work_packages/filter/manual_sort_filter.rb
@@ -53,6 +53,10 @@ class Queries::WorkPackages::Filter::ManualSortFilter <
:manual_sort
end
+ def human_name
+ I18n.t("activerecord.attributes.query.manual_sorting")
+ end
+
def ar_object_filter?
true
end
diff --git a/app/models/queries/work_packages/filter/partof_filter.rb b/app/models/queries/work_packages/filter/partof_filter.rb
index 603819970c7..a39ec3c8795 100644
--- a/app/models/queries/work_packages/filter/partof_filter.rb
+++ b/app/models/queries/work_packages/filter/partof_filter.rb
@@ -36,6 +36,10 @@ class Queries::WorkPackages::Filter::PartofFilter <
::Relation::TYPE_PARTOF
end
+ def human_name
+ I18n.t("work_package_relations_tab.relations.label_partof_singular")
+ end
+
private
def relation_filter
diff --git a/app/models/queries/work_packages/filter/precedes_filter.rb b/app/models/queries/work_packages/filter/precedes_filter.rb
index 56613d792be..e1a010951a3 100644
--- a/app/models/queries/work_packages/filter/precedes_filter.rb
+++ b/app/models/queries/work_packages/filter/precedes_filter.rb
@@ -36,6 +36,10 @@ class Queries::WorkPackages::Filter::PrecedesFilter <
::Relation::TYPE_PRECEDES
end
+ def human_name
+ I18n.t(:label_precedes)
+ end
+
private
def relation_filter
diff --git a/app/models/queries/work_packages/filter/relates_filter.rb b/app/models/queries/work_packages/filter/relates_filter.rb
index b69f2ac7a02..4c9aaa6697e 100644
--- a/app/models/queries/work_packages/filter/relates_filter.rb
+++ b/app/models/queries/work_packages/filter/relates_filter.rb
@@ -35,4 +35,8 @@ class Queries::WorkPackages::Filter::RelatesFilter <
def relation_type
::Relation::TYPE_RELATES
end
+
+ def human_name
+ I18n.t(:label_relates)
+ end
end
diff --git a/app/models/queries/work_packages/filter/requires_filter.rb b/app/models/queries/work_packages/filter/requires_filter.rb
index 2ea1ff17fad..ce0b31ddaf0 100644
--- a/app/models/queries/work_packages/filter/requires_filter.rb
+++ b/app/models/queries/work_packages/filter/requires_filter.rb
@@ -36,6 +36,10 @@ class Queries::WorkPackages::Filter::RequiresFilter <
::Relation::TYPE_REQUIRES
end
+ def human_name
+ I18n.t(:label_requires)
+ end
+
private
def relation_filter
diff --git a/app/models/queries/work_packages/filter/role_filter.rb b/app/models/queries/work_packages/filter/role_filter.rb
index 16ddd8583c8..d320b76943a 100644
--- a/app/models/queries/work_packages/filter/role_filter.rb
+++ b/app/models/queries/work_packages/filter/role_filter.rb
@@ -67,7 +67,9 @@ class Queries::WorkPackages::Filter::RoleFilter < Queries::WorkPackages::Filter:
private
def roles
- ::Role.givable
+ Role
+ .includes(:role_permissions)
+ .where(role_permissions: { permission: "work_package_assigned" })
end
def operator_for_filtering
diff --git a/app/models/queries/work_packages/selects/work_package_select.rb b/app/models/queries/work_packages/selects/work_package_select.rb
index 9b960351836..4ad2e9669ad 100644
--- a/app/models/queries/work_packages/selects/work_package_select.rb
+++ b/app/models/queries/work_packages/selects/work_package_select.rb
@@ -139,7 +139,12 @@ class Queries::WorkPackages::Selects::WorkPackageSelect
end
def caption
- WorkPackage.human_attribute_name(name)
+ case name.to_s
+ when "manual_sorting"
+ Query.human_attribute_name(name)
+ else
+ WorkPackage.human_attribute_name(name)
+ end
end
protected
diff --git a/app/models/query/results/group_by.rb b/app/models/query/results/group_by.rb
index c3097fdb03e..6ee9d9ef280 100644
--- a/app/models/query/results/group_by.rb
+++ b/app/models/query/results/group_by.rb
@@ -89,21 +89,55 @@ module ::Query::Results::GroupBy
if custom_field.list?
transform_list_custom_field_keys(custom_field, groups)
+ elsif custom_field.field_format_hierarchy?
+ transform_hierarchy_custom_field_keys(custom_field, groups)
else
transform_single_custom_field_keys(custom_field, groups)
end
end
+ def transform_hierarchy_custom_field_keys(custom_field, groups)
+ items = hierarchy_items_for_keys(custom_field, groups)
+
+ groups.transform_keys do |key|
+ if custom_field.multi_value?
+ Array(key&.split(".")).map { |subkey| items[subkey].first }
+ else
+ items[key] || []
+ end
+ end
+ end
+
+ # rubocop:disable Metrics/AbcSize
+ def hierarchy_items_for_keys(custom_field, groups)
+ keys = groups.keys.map { |k| k ? k.split(".") : [] }.flatten.uniq
+
+ CustomFields::Hierarchy::HierarchicalItemService
+ .new
+ .get_descendants(item: custom_field.hierarchy_root, include_self: false)
+ .fmap do |list|
+ list.filter_map { |item| CustomField::Hierarchy::HierarchyItemAdapter.new(item:) if keys.include?(item.id.to_s) }
+ .group_by { |item| item.id.to_s }
+ end
+ .either(
+ ->(list) { list },
+ ->(error) do
+ msg = "#{I18n.t('api_v3.errors.code_500')} #{error}"
+ raise ::API::Errors::InternalError.new(msg)
+ end
+ )
+ end
+
+ # rubocop:enable Metrics/AbcSize
+
def transform_list_custom_field_keys(custom_field, groups)
options = custom_options_for_keys(custom_field, groups)
groups.transform_keys do |key|
if custom_field.multi_value?
- (key ? key.split(".") : []).map do |subkey|
- options[subkey].first
- end
+ Array(key&.split(".")).map.map { |subkey| options[subkey].first }
else
- options[key] ? options[key].first : nil
+ options[key]&.first
end
end
end
@@ -111,7 +145,7 @@ module ::Query::Results::GroupBy
def custom_options_for_keys(custom_field, groups)
keys = groups.keys.map { |k| k ? k.split(".") : [] }
# Because of multi select cfs we might end up having overlapping groups
- # (e.g group "1" and group "1.3" and group "3" which represent concatenated ids).
+ # (e.g. group "1" and group "1.3" and group "3" which represent concatenated ids).
# This can result in us having ids in the keys array multiple times (e.g. ["1", "1", "3", "3"]).
# If we were to use the keys array with duplicates to find the actual custom options,
# AR would throw an error as the number of records returned does not match the number
diff --git a/app/models/relation.rb b/app/models/relation.rb
index f57f195fb1f..1cad5d0bc23 100644
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -30,32 +32,40 @@ class Relation < ApplicationRecord
belongs_to :from, class_name: "WorkPackage"
belongs_to :to, class_name: "WorkPackage"
- TYPE_RELATES = "relates".freeze
- TYPE_DUPLICATES = "duplicates".freeze
- TYPE_DUPLICATED = "duplicated".freeze
- TYPE_BLOCKS = "blocks".freeze
- TYPE_BLOCKED = "blocked".freeze
- TYPE_PRECEDES = "precedes".freeze
- TYPE_FOLLOWS = "follows".freeze
- TYPE_INCLUDES = "includes".freeze
- TYPE_PARTOF = "partof".freeze
- TYPE_REQUIRES = "requires".freeze
- TYPE_REQUIRED = "required".freeze
+ TYPE_RELATES = "relates"
+ TYPE_PRECEDES = "precedes"
+ TYPE_FOLLOWS = "follows"
+ TYPE_BLOCKS = "blocks"
+ TYPE_BLOCKED = "blocked"
+ TYPE_DUPLICATES = "duplicates"
+ TYPE_DUPLICATED = "duplicated"
+ TYPE_INCLUDES = "includes"
+ TYPE_PARTOF = "partof"
+ TYPE_REQUIRES = "requires"
+ TYPE_REQUIRED = "required"
# The parent/child relation is maintained separately
# (in WorkPackage and WorkPackageHierarchy) and a relation cannot
# have the type 'parent' but this is abstracted to simplify the code.
- TYPE_PARENT = "parent".freeze
- TYPE_CHILD = "child".freeze
+ TYPE_PARENT = "parent"
+ TYPE_CHILD = "child"
TYPES = {
TYPE_RELATES => {
name: :label_relates_to, sym_name: :label_relates_to, order: 1, sym: TYPE_RELATES
},
+ TYPE_FOLLOWS => {
+ name: :label_follows, sym_name: :label_precedes, order: 7,
+ sym: TYPE_PRECEDES
+ },
+ TYPE_PRECEDES => {
+ name: :label_precedes, sym_name: :label_follows, order: 6,
+ sym: TYPE_FOLLOWS, reverse: TYPE_FOLLOWS
+ },
TYPE_DUPLICATES => {
- name: :label_duplicates, sym_name: :label_duplicated_by, order: 2, sym: TYPE_DUPLICATED
+ name: :label_duplicates, sym_name: :label_duplicated_by, order: 6, sym: TYPE_DUPLICATED
},
TYPE_DUPLICATED => {
- name: :label_duplicated_by, sym_name: :label_duplicates, order: 3,
+ name: :label_duplicated_by, sym_name: :label_duplicates, order: 7,
sym: TYPE_DUPLICATES, reverse: TYPE_DUPLICATES
},
TYPE_BLOCKS => {
@@ -65,14 +75,6 @@ class Relation < ApplicationRecord
name: :label_blocked_by, sym_name: :label_blocks, order: 5,
sym: TYPE_BLOCKS, reverse: TYPE_BLOCKS
},
- TYPE_PRECEDES => {
- name: :label_precedes, sym_name: :label_follows, order: 6,
- sym: TYPE_FOLLOWS, reverse: TYPE_FOLLOWS
- },
- TYPE_FOLLOWS => {
- name: :label_follows, sym_name: :label_precedes, order: 7,
- sym: TYPE_PRECEDES
- },
TYPE_INCLUDES => {
name: :label_includes, sym_name: :label_part_of, order: 8,
sym: TYPE_PARTOF
@@ -103,7 +105,11 @@ class Relation < ApplicationRecord
scope :follows_with_lag,
-> { follows.where("lag > 0") }
- validates :lag, numericality: { allow_nil: true }
+ validates :lag, numericality: {
+ allow_nil: true,
+ less_than_or_equal_to: 2_147_483_647,
+ greater_than_or_equal_to: 0
+ }
validates :to, uniqueness: { scope: :from }
diff --git a/app/models/relations/scopes/visible.rb b/app/models/relations/scopes/visible.rb
index e2522cc1fdb..fdcb4821698 100644
--- a/app/models/relations/scopes/visible.rb
+++ b/app/models/relations/scopes/visible.rb
@@ -34,10 +34,25 @@ module Relations::Scopes
# Returns all relationships visible to the user. The relationships have to be:
# * Start (from_id) on a work package visible to the user (view_work_packages in the work package's project)
# * End (to_id) on a work package visible to the user (view_work_packages in the work package's project)
+ #
+ # In some cases, the resulting SQL query as is might not run in a performant matter. This happens in
+ # cases where there are a lot of work packages and relations. PostgreSql then sometimes chooses to use a
+ # full table scan on work_packages expecting a lot of results.
+ # Then, the query can be optimized by providing a +work_package_focus_scope+ which is used as a subquery
+ # on work_packages on the id column. This is beneficial if not all work packages are to be
+ # considered but only a subset. As this directly excludes work packages, it can also be used
+ # the wrong way.
# @param [User] user
- def visible(user = User.current)
- where(from_id: WorkPackage.visible(user))
- .where(to_id: WorkPackage.visible(user))
+ # @param [ActiveRecord::Relation, Arel::SelectManager] work_package_focus_scope
+ def visible(user = User.current, work_package_focus_scope: nil)
+ visible_work_packages = WorkPackage.visible(user)
+
+ wp_arel = work_package_focus_scope.respond_to?(:arel) ? work_package_focus_scope.arel : work_package_focus_scope
+ visible_work_packages = visible_work_packages.where(WorkPackage.arel_table[:id].in(wp_arel)) if wp_arel
+
+ with(visible_work_packages:)
+ .where(from_id: WorkPackage.from("visible_work_packages #{WorkPackage.table_name}").select(:id))
+ .where(to_id: WorkPackage.from("visible_work_packages #{WorkPackage.table_name}").select(:id))
end
end
end
diff --git a/app/models/reminder.rb b/app/models/reminder.rb
new file mode 100644
index 00000000000..9b6213dd2a1
--- /dev/null
+++ b/app/models/reminder.rb
@@ -0,0 +1,63 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 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 Reminder < ApplicationRecord
+ belongs_to :remindable, polymorphic: true
+ belongs_to :creator, class_name: "User"
+
+ has_many :reminder_notifications, dependent: :destroy
+ has_many :notifications, through: :reminder_notifications
+
+ # Currently, reminders are personal, meaning
+ # they are only visible to the user who created them.
+ def self.visible(user)
+ where(creator: user)
+ end
+
+ def self.upcoming_and_visible_to(user)
+ visible(user)
+ .where(completed_at: nil)
+ .where.missing(:reminder_notifications)
+ end
+
+ def unread_notifications?
+ unread_notifications.exists?
+ end
+
+ def unread_notifications
+ notifications.where(read_ian: [false, nil])
+ end
+
+ def completed?
+ completed_at.present?
+ end
+
+ def scheduled?
+ job_id.present? && !completed?
+ end
+end
diff --git a/app/models/reminder_notification.rb b/app/models/reminder_notification.rb
new file mode 100644
index 00000000000..aae31fac943
--- /dev/null
+++ b/app/models/reminder_notification.rb
@@ -0,0 +1,32 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 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 ReminderNotification < ApplicationRecord
+ belongs_to :reminder
+ belongs_to :notification
+end
diff --git a/app/models/sessions/user_session.rb b/app/models/sessions/user_session.rb
index 1a0d40e751d..0f81c8d3029 100644
--- a/app/models/sessions/user_session.rb
+++ b/app/models/sessions/user_session.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -33,6 +35,8 @@ module Sessions
class UserSession < ::ApplicationRecord
self.table_name = "sessions"
+ belongs_to :user
+
scope :for_user, ->(user) do
user_id = user.is_a?(User) ? user.id : user.to_i
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 654e2452751..4ee805e1410 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -335,12 +335,14 @@ class Setting < ApplicationRecord
def self.deserialize(name, value)
definition = Settings::Definition[name]
- if definition.serialized? && value.is_a?(String)
+ if definition.nil?
+ nil
+ elsif definition.serialized? && value.is_a?(String)
deserialize_hash(value)
elsif value != "".freeze && !value.nil?
read_formatted_setting(value, definition.format)
- else
- definition.format == :string ? value : nil
+ elsif definition.format == :string
+ value
end
end
diff --git a/app/models/setting/aliases.rb b/app/models/setting/aliases.rb
index 98aa5bbbf4f..154aabab71d 100644
--- a/app/models/setting/aliases.rb
+++ b/app/models/setting/aliases.rb
@@ -51,5 +51,13 @@ class Setting
def optional_port_from_host_name
Setting.host_name&.split(":")&.[](1)
end
+
+ ##
+ # Get the names of working days
+ # @return [Array] the names of the working days
+ def working_day_names
+ weekdays = %i[monday tuesday wednesday thursday friday saturday sunday]
+ Setting.working_days.map { |day| weekdays[day - 1] }
+ end
end
end
diff --git a/app/models/type.rb b/app/models/type.rb
index 2c7deb92807..6c3020bf00a 100644
--- a/app/models/type.rb
+++ b/app/models/type.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -34,8 +36,15 @@ class Type < ApplicationRecord
include ::Scopes::Scoped
+ attribute :patterns, Types::Patterns::CollectionType.new
+
+ store_attribute :pdf_export_templates_config, :export_templates_disabled, :json
+ store_attribute :pdf_export_templates_config, :export_templates_order, :json
+
before_destroy :check_integrity
+ belongs_to :color, optional: true, class_name: "Color"
+
has_many :work_packages
has_many :workflows, dependent: :delete_all do
def copy_from_type(source_type)
@@ -50,29 +59,19 @@ class Type < ApplicationRecord
join_table: "#{table_name_prefix}custom_fields_types#{table_name_suffix}",
association_foreign_key: "custom_field_id"
- belongs_to :color,
- optional: true,
- class_name: "Color"
-
acts_as_list
- validates :name,
- presence: true,
- uniqueness: { case_sensitive: false },
- length: { maximum: 255 }
-
+ validates :name, presence: true, uniqueness: { case_sensitive: false }, length: { maximum: 255 }
validates :is_default, :is_milestone, inclusion: { in: [true, false] }
scopes :milestone
default_scope { order("position ASC") }
- scope :without_standard, -> {
- where(is_standard: false)
- .order(:position)
- }
+ scope :without_standard, -> { where(is_standard: false).order(:position) }
+ scope :default, -> { where(is_default: true) }
- def to_s; name end
+ delegate :to_s, to: :name
def <=>(other)
name <=> other.name
@@ -87,26 +86,20 @@ class Type < ApplicationRecord
end
def self.standard_type
- ::Type.where(is_standard: true).first
- end
-
- def self.default
- ::Type.where(is_default: true)
+ where(is_standard: true).first
end
def self.enabled_in(project)
- ::Type.includes(:projects).where(projects: { id: project })
+ includes(:projects).where(projects: { id: project })
end
def statuses(include_default: false)
if new_record?
Status.none
elsif include_default
- ::Type
- .statuses([id])
- .or(Status.where_default)
+ self.class.statuses([id]).or(Status.where_default)
else
- ::Type.statuses([id])
+ self.class.statuses([id])
end
end
@@ -114,9 +107,24 @@ class Type < ApplicationRecord
object.types.include?(self)
end
+ def replacement_pattern_defined_for?(attribute)
+ enabled_patterns.key?(attribute)
+ end
+
+ def enabled_patterns
+ patterns.all_enabled
+ end
+
+ def pdf_export_templates
+ @pdf_export_templates ||= ::Type::PdfExportTemplates.new(self)
+ end
+
private
def check_integrity
- raise "Can't delete type" if WorkPackage.where(type_id: id).any?
+ throw :abort if is_standard?
+ throw :abort if WorkPackage.exists?(type_id: id)
+
+ true
end
end
diff --git a/app/models/type/pdf_export_templates.rb b/app/models/type/pdf_export_templates.rb
new file mode 100644
index 00000000000..96dce81c6ca
--- /dev/null
+++ b/app/models/type/pdf_export_templates.rb
@@ -0,0 +1,93 @@
+# 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 Type::PdfExportTemplates
+ Template = Data.define(:id, :label, :caption, :enabled)
+
+ def initialize(type)
+ @type = type
+ end
+
+ def list
+ disabled = @type.export_templates_disabled || []
+ templates = built_in_templates.map do |built_in_template|
+ Template.new(**built_in_template, enabled: disabled.exclude?(built_in_template[:id]))
+ end
+ order = @type.export_templates_order || []
+ return templates if order.empty?
+
+ indexes = order.each_with_index.to_a.to_h
+ templates.sort_by { |template| indexes[template.id] }
+ end
+
+ def list_enabled
+ list.filter(&:enabled)
+ end
+
+ def find(template_id)
+ built_in_template = built_in_templates.find { |t| t[:id] == template_id }
+ if built_in_template
+ disabled = @type.export_templates_disabled || []
+ Template.new(**built_in_template, enabled: disabled.exclude?(built_in_template[:id]))
+ end
+ end
+
+ def enable_all
+ @type.export_templates_disabled = []
+ end
+
+ def disable_all
+ @type.export_templates_disabled = built_in_templates.pluck(:id)
+ end
+
+ def toggle(template_id)
+ disabled = @type.export_templates_disabled || []
+ if disabled.include?(template_id)
+ disabled.delete(template_id)
+ else
+ disabled.push(template_id)
+ end
+ @type.export_templates_disabled = disabled
+ end
+
+ def move(template_id, position)
+ ordered_template_ids = list.map(&:id)
+ prev_index = ordered_template_ids.find_index(template_id)
+ ordered_template_ids.delete_at(prev_index) unless prev_index.nil?
+ ordered_template_ids.insert(position, template_id)
+ @type.export_templates_order = ordered_template_ids
+ end
+
+ private
+
+ def built_in_templates
+ ::WorkPackage::PDFExport::Templates::TEMPLATES
+ end
+end
diff --git a/app/models/types/forms/subject_configuration_form_model.rb b/app/models/types/forms/subject_configuration_form_model.rb
new file mode 100644
index 00000000000..3a8a53cff94
--- /dev/null
+++ b/app/models/types/forms/subject_configuration_form_model.rb
@@ -0,0 +1,46 @@
+# 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 Types
+ module Forms
+ class SubjectConfigurationFormModel
+ extend ActiveModel::Naming
+
+ attr_reader :subject_configuration, :pattern, :suggestions, :validation_errors
+
+ def initialize(subject_configuration:, pattern:, suggestions:, validation_errors: {})
+ @subject_configuration = subject_configuration
+ @pattern = pattern
+ @suggestions = suggestions
+ @validation_errors = validation_errors
+ end
+ end
+ end
+end
diff --git a/app/models/types/pattern.rb b/app/models/types/pattern.rb
new file mode 100644
index 00000000000..8efe8eac5c4
--- /dev/null
+++ b/app/models/types/pattern.rb
@@ -0,0 +1,43 @@
+# 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 Types
+ Pattern = Data.define(:blueprint, :enabled) do
+ def enabled? = !!enabled
+
+ def resolve(work_package)
+ PatternResolver.new(blueprint).resolve(work_package)
+ end
+
+ def to_h
+ super.stringify_keys
+ end
+ end
+end
diff --git a/app/models/types/pattern_resolver.rb b/app/models/types/pattern_resolver.rb
new file mode 100644
index 00000000000..905b5484b4f
--- /dev/null
+++ b/app/models/types/pattern_resolver.rb
@@ -0,0 +1,67 @@
+# 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 Types
+ class PatternResolver
+ TOKEN_REGEX = /{{[0-9A-Za-z_]+}}/
+ private_constant :TOKEN_REGEX
+
+ def initialize(pattern)
+ @mapper = Patterns::TokenPropertyMapper.new
+ @pattern = pattern
+ @tokens = pattern.scan(TOKEN_REGEX).map { |token| Patterns::Token.build(token) }
+ end
+
+ def resolve(work_package)
+ @tokens.inject(@pattern) do |pattern, token|
+ pattern.gsub(token.pattern, get_value(work_package, token))
+ end
+ end
+
+ private
+
+ def get_value(work_package, token)
+ context = token.context == :work_package ? work_package : work_package.public_send(token.context)
+
+ stringify(@mapper[token.context_key].call(context))
+ end
+
+ def stringify(value)
+ case value
+ when Date, Time, DateTime
+ value.strftime("%Y-%m-%d")
+ when NilClass
+ "NA"
+ else
+ value.to_s
+ end
+ end
+ end
+end
diff --git a/app/models/types/patterns/collection.rb b/app/models/types/patterns/collection.rb
new file mode 100644
index 00000000000..cc94bad0907
--- /dev/null
+++ b/app/models/types/patterns/collection.rb
@@ -0,0 +1,66 @@
+# 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 Types
+ module Patterns
+ Collection = Data.define(:patterns) do
+ extend Dry::Monads[:result]
+ private_class_method :new
+
+ def self.empty
+ new(patterns: {})
+ end
+
+ def self.build(patterns:, contract: CollectionContract.new)
+ contract.call(patterns).to_monad.fmap { |success| new(success.to_h) }
+ rescue ArgumentError => e
+ Failure(e)
+ end
+
+ def initialize(patterns:)
+ transformed = patterns.transform_values { Pattern.new(**_1) }.freeze
+
+ super(patterns: transformed)
+ end
+
+ def subject
+ patterns[:subject]
+ end
+
+ def all_enabled
+ patterns.select { |_, pattern| pattern.enabled? }
+ end
+
+ def to_h
+ patterns.stringify_keys.transform_values(&:to_h)
+ end
+ end
+ end
+end
diff --git a/app/models/types/patterns/collection_contract.rb b/app/models/types/patterns/collection_contract.rb
new file mode 100644
index 00000000000..74f06b8a2da
--- /dev/null
+++ b/app/models/types/patterns/collection_contract.rb
@@ -0,0 +1,44 @@
+# 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 Types
+ module Patterns
+ class CollectionContract < Dry::Validation::Contract
+ config.messages.backend = :i18n
+
+ params do
+ optional(:subject).hash do
+ required(:blueprint).filled(:string)
+ required(:enabled).filled(:bool)
+ end
+ end
+ end
+ end
+end
diff --git a/app/models/types/patterns/collection_type.rb b/app/models/types/patterns/collection_type.rb
new file mode 100644
index 00000000000..f7c84b23416
--- /dev/null
+++ b/app/models/types/patterns/collection_type.rb
@@ -0,0 +1,58 @@
+# 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 Types
+ module Patterns
+ class CollectionType < ActiveModel::Type::Value
+ def assert_valid_value(value)
+ cast(value)
+ end
+
+ def cast(value)
+ return value if value.is_a?(Collection)
+
+ Collection.build(patterns: value).value_or { Collection.empty }
+ end
+
+ def serialize(pattern)
+ return super if pattern.nil?
+
+ YAML.dump(pattern.to_h)
+ end
+
+ def deserialize(value)
+ return Collection.empty if value.blank?
+
+ data = YAML.safe_load(value)
+ cast(data)
+ end
+ end
+ end
+end
diff --git a/modules/meeting/app/seeders/meetings/demo_data/meeting_seeder.rb b/app/models/types/patterns/token.rb
similarity index 67%
rename from modules/meeting/app/seeders/meetings/demo_data/meeting_seeder.rb
rename to app/models/types/patterns/token.rb
index ffab1b2ba05..e17f87e58fd 100644
--- a/modules/meeting/app/seeders/meetings/demo_data/meeting_seeder.rb
+++ b/app/models/types/patterns/token.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -26,30 +28,30 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module Meetings
- module DemoData
- class MeetingSeeder < ::BasicData::ModelSeeder
- self.model_class = StructuredMeeting
- self.seed_data_model_key = "meetings"
+module Types
+ module Patterns
+ Token = Data.define(:pattern, :key) do
+ private_class_method :new
- attr_reader :project
-
- def initialize(project, seed_data)
- super(seed_data)
- @project = project
+ def self.build(pattern)
+ new(pattern, pattern.tr("{}", "").to_sym)
end
- def model_attributes(meeting_data)
- {
- title: meeting_data["title"],
- author: seed_data.find_reference(meeting_data["author"]),
- duration: minutes_to_hours(meeting_data["duration"]),
- project:
- }
+ def custom_field? = key.to_s.include?("custom_field")
+
+ def context_key
+ return key unless custom_field?
+
+ key.to_s.gsub("#{context}_", "").to_sym
end
- def minutes_to_hours(duration)
- duration && (duration / 60.0)
+ def context
+ return :work_package unless custom_field?
+
+ context = key.to_s.gsub(/_?custom_field_\d+/, "")
+ return :work_package if context.blank?
+
+ context.to_sym
end
end
end
diff --git a/app/models/types/patterns/token_property_mapper.rb b/app/models/types/patterns/token_property_mapper.rb
new file mode 100644
index 00000000000..fe9e3bb6086
--- /dev/null
+++ b/app/models/types/patterns/token_property_mapper.rb
@@ -0,0 +1,119 @@
+# 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 Types
+ module Patterns
+ class TokenPropertyMapper
+ DEFAULT_FUNCTION = ->(key, context) { context.public_send(key.to_sym) }.curry
+
+ TOKEN_PROPERTY_MAP = IceNine.deep_freeze(
+ {
+ accountable: { fn: ->(wp) { wp.responsible&.name }, label: -> { WorkPackage.human_attribute_name(:responsible) } },
+ assignee: { fn: ->(wp) { wp.assigned_to&.name }, label: -> { WorkPackage.human_attribute_name(:assigned_to) } },
+ author: { fn: ->(wp) { wp.author&.name }, label: -> { WorkPackage.human_attribute_name(:author) } },
+ category: { fn: ->(wp) { wp.category&.name }, label: -> { WorkPackage.human_attribute_name(:category) } },
+ creation_date: { fn: ->(wp) { wp.created_at }, label: -> { WorkPackage.human_attribute_name(:created_at) } },
+ estimated_time: { fn: ->(wp) { wp.estimated_hours }, label: -> { WorkPackage.human_attribute_name(:estimated_hours) } },
+ finish_date: { fn: ->(wp) { wp.due_date }, label: -> { WorkPackage.human_attribute_name(:due_date) } },
+ parent: { fn: ->(wp) { wp.parent&.id }, label: -> { WorkPackage.human_attribute_name(:parent) } },
+ parent_author: { fn: ->(wp) { wp.parent&.author&.name }, label: -> { WorkPackage.human_attribute_name(:author) } },
+ parent_category: { fn: ->(wp) { wp.parent&.category&.name },
+ label: -> { WorkPackage.human_attribute_name(:category) } },
+ parent_creation_date: { fn: ->(wp) { wp.parent&.created_at },
+ label: -> { WorkPackage.human_attribute_name(:created_at) } },
+ parent_estimated_time: { fn: ->(wp) { wp.parent&.estimated_hours },
+ label: -> { WorkPackage.human_attribute_name(:estimated_hours) } },
+ parent_finish_date: { fn: ->(wp) { wp.parent&.due_date },
+ label: -> { WorkPackage.human_attribute_name(:due_date) } },
+ parent_priority: { fn: ->(wp) { wp.parent&.priority }, label: -> { WorkPackage.human_attribute_name(:priority) } },
+ priority: { fn: ->(wp) { wp.priority }, label: -> { WorkPackage.human_attribute_name(:priority) } },
+ project: { fn: ->(wp) { wp.project_id }, label: -> { WorkPackage.human_attribute_name(:project) } },
+ project_active: { fn: ->(wp) { wp.project&.active? }, label: -> { Project.human_attribute_name(:active) } },
+ project_name: { fn: ->(wp) { wp.project&.name }, label: -> { Project.human_attribute_name(:name) } },
+ project_status: { fn: ->(wp) { wp.project&.status_code }, label: -> { Project.human_attribute_name(:status_code) } },
+ project_parent: { fn: ->(wp) { wp.project&.parent_id }, label: -> { Project.human_attribute_name(:parent) } },
+ project_public: { fn: ->(wp) { wp.project&.public? }, label: -> { Project.human_attribute_name(:public) } },
+ start_date: { fn: ->(wp) { wp.start_date }, label: -> { WorkPackage.human_attribute_name(:start_date) } },
+ status: { fn: ->(wp) { wp.status&.name }, label: -> { WorkPackage.human_attribute_name(:status) } },
+ type: { fn: ->(wp) { wp.type&.name }, label: -> { WorkPackage.human_attribute_name(:type) } }
+ }
+ )
+
+ def fetch(key)
+ TOKEN_PROPERTY_MAP.dig(key, :fn) || DEFAULT_FUNCTION.call(key)
+ end
+
+ alias :[] :fetch
+
+ def tokens_for_type(type)
+ base = default_tokens
+ base[:work_package].merge!(tokenize(work_package_cfs_for(type)))
+ base[:project].merge!(tokenize(project_attributes, "project_"))
+ base[:parent].merge!(tokenize(all_work_package_cfs, "parent_"))
+
+ base.transform_values { _1.sort_by(&:last).to_h }
+ end
+
+ private
+
+ def default_tokens
+ TOKEN_PROPERTY_MAP.keys.each_with_object({ project: {}, work_package: {}, parent: {} }) do |key, obj|
+ label = TOKEN_PROPERTY_MAP.dig(key, :label).call
+
+ case key.to_s
+ when /^project_/
+ obj[:project][key] = label
+ when /^parent_/
+ obj[:parent][key] = label
+ else
+ obj[:work_package][key] = label
+ end
+ end
+ end
+
+ def tokenize(custom_field_scope, prefix = nil)
+ custom_field_scope.pluck(:name, :id).to_h { |name, id| [:"#{prefix}custom_field_#{id}", name] }
+ end
+
+ def work_package_cfs_for(type)
+ all_work_package_cfs.merge(type.custom_fields)
+ end
+
+ def all_work_package_cfs
+ WorkPackageCustomField.where(multi_value: false).where.not(field_format: %w[text bool link empty]).order(:name)
+ end
+
+ def project_attributes
+ ProjectCustomField.where.not(field_format: %w[text bool link empty])
+ .where(admin_only: false, multi_value: false).order(:name)
+ end
+ end
+ end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 4b3d3317572..1df475276b9 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -36,7 +36,7 @@ class User < Principal
firstname: [:firstname],
lastname_firstname: %i[lastname firstname],
lastname_n_firstname: %i[lastname firstname],
- lastname_coma_firstname: %i[lastname firstname],
+ lastname_comma_firstname: %i[lastname firstname],
username: [:login]
}.freeze
@@ -91,6 +91,8 @@ class User < Principal
inverse_of: :user,
dependent: :destroy
+ has_many :emoji_reactions, dependent: :destroy
+ has_many :reminders, foreign_key: "creator_id", dependent: :destroy, inverse_of: :creator
has_many :remote_identities, dependent: :destroy
# Users blocked via brute force prevention
@@ -295,7 +297,7 @@ class User < Principal
when :firstname_lastname then "#{firstname} #{lastname}"
when :lastname_firstname then "#{lastname} #{firstname}"
when :lastname_n_firstname then "#{lastname}#{firstname}"
- when :lastname_coma_firstname then "#{lastname}, #{firstname}"
+ when :lastname_comma_firstname then "#{lastname}, #{firstname}"
when :firstname then firstname
when :username then login
@@ -304,16 +306,16 @@ class User < Principal
end
end
- # Return user's authentication provider for display
def authentication_provider
- return if identity_url.blank?
+ return nil if identity_url.blank?
- identity_url.split(":", 2).first
+ slug = identity_url.split(":", 2).first
+ AuthProvider.find_by(slug:)
end
# Return user's authentication provider for display
def human_authentication_provider
- authentication_provider&.titleize
+ authentication_provider&.display_name
end
##
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 041f930fe20..0e90fe646d1 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -140,7 +140,7 @@ class UserPreference < ApplicationRecord
end
def immediate_reminders
- super.presence || { mentioned: true }.with_indifferent_access
+ super.presence || { mentioned: true, personal_reminder: true }.with_indifferent_access
end
def pause_reminders
diff --git a/app/models/users/scopes/having_reminder_mail_to_send.rb b/app/models/users/scopes/having_reminder_mail_to_send.rb
index f9170672bf0..3ba8f050556 100644
--- a/app/models/users/scopes/having_reminder_mail_to_send.rb
+++ b/app/models/users/scopes/having_reminder_mail_to_send.rb
@@ -183,8 +183,13 @@ module Users::Scopes
# The last quarter is the one smaller than the latest time. But needs to be at least equal to the first quarter.
last_quarter = [first_quarter, latest_time.change(min: latest_time.min / 15 * 15)].max
- (first_quarter.to_i..last_quarter.to_i)
- .step(15.minutes)
+ quarters = if first_quarter == last_quarter
+ [first_quarter]
+ else
+ (first_quarter.to_i..last_quarter.to_i).step(15.minutes)
+ end
+
+ quarters
.map do |time|
Time.zone.at(time)
end
diff --git a/app/models/work_package.rb b/app/models/work_package.rb
index e02d14aa81d..9e1a6eb3441 100644
--- a/app/models/work_package.rb
+++ b/app/models/work_package.rb
@@ -41,6 +41,7 @@ class WorkPackage < ApplicationRecord
include WorkPackages::Relations
include ::Scopes::Scoped
include HasMembers
+ include Remindable
include OpenProject::Journal::AttachmentHelper
@@ -54,6 +55,7 @@ class WorkPackage < ApplicationRecord
belongs_to :assigned_to, class_name: "Principal", optional: true
belongs_to :responsible, class_name: "Principal", optional: true
belongs_to :version, optional: true
+ belongs_to :project_life_cycle_step, class_name: "Project::LifeCycleStep", optional: true
belongs_to :priority, class_name: "IssuePriority"
belongs_to :category, class_name: "Category", optional: true
@@ -240,11 +242,6 @@ class WorkPackage < ApplicationRecord
.exists?
end
- def visible_relations(user)
- relations
- .visible(user)
- end
-
def add_time_entry(attributes = {})
attributes.reverse_merge!(
project:,
@@ -302,7 +299,7 @@ class WorkPackage < ApplicationRecord
end
def done_ratio
- if WorkPackage.status_based_mode? && status && status.default_done_ratio
+ if WorkPackage.status_based_mode? && status&.default_done_ratio
status.default_done_ratio
else
read_attribute(:done_ratio)
@@ -377,7 +374,7 @@ class WorkPackage < ApplicationRecord
# Set the done_ratio using the status if that setting is set. This will keep the done_ratios
# even if the user turns off the setting later
def update_done_ratio_from_status
- if WorkPackage.status_based_mode? && status && status.default_done_ratio
+ if WorkPackage.status_based_mode? && status&.default_done_ratio
self.done_ratio = status.default_done_ratio
end
end
@@ -631,7 +628,7 @@ class WorkPackage < ApplicationRecord
# Default assignment based on category
def default_assign
- if assigned_to.nil? && category && category.assigned_to
+ if assigned_to.nil? && category&.assigned_to
self.assigned_to = category.assigned_to
end
end
diff --git a/app/models/work_package/exports/formatters/costs.rb b/app/models/work_package/exports/formatters/costs.rb
index 9133f3cfe02..310f864aff4 100644
--- a/app/models/work_package/exports/formatters/costs.rb
+++ b/app/models/work_package/exports/formatters/costs.rb
@@ -38,8 +38,8 @@ module WorkPackage::Exports
def number_format_string
# [$CUR] makes sure we have an actually working currency format with arbitrary currencies
- curr = "[$CUR]".gsub "CUR", ERB::Util.h(Setting.plugin_costs["costs_currency"])
- format = ERB::Util.h Setting.plugin_costs["costs_currency_format"]
+ curr = "[$CUR]".gsub "CUR", ERB::Util.h(Setting.costs_currency)
+ format = ERB::Util.h Setting.costs_currency_format
number = "#,##0.00"
format.gsub("%n", number).gsub("%u", curr)
diff --git a/app/models/work_package/pdf_export/attachments.rb b/app/models/work_package/pdf_export/common/attachments.rb
similarity index 66%
rename from app/models/work_package/pdf_export/attachments.rb
rename to app/models/work_package/pdf_export/common/attachments.rb
index 7caf55ec025..2a1574f8618 100644
--- a/app/models/work_package/pdf_export/attachments.rb
+++ b/app/models/work_package/pdf_export/common/attachments.rb
@@ -28,7 +28,7 @@
require "mini_magick"
-module WorkPackage::PDFExport::Attachments
+module WorkPackage::PDFExport::Common::Attachments
def resize_image(file_path)
tmp_file = Tempfile.new(["temp_image", File.extname(file_path)])
@resized_images = [] if @resized_images.nil?
@@ -51,4 +51,27 @@ module WorkPackage::PDFExport::Attachments
@resized_images&.each(&:close!)
@resized_images = []
end
+
+ def attachment_image_local_file(attachment)
+ attachment.file.local_file
+ rescue StandardError => e
+ Rails.logger.error "Failed to access attachment #{attachment.id} file: #{e}"
+ nil # return nil as if the id was wrong and the attachment obj has not been found
+ end
+
+ def attachment_image_filepath(work_package, src)
+ # images are embedded into markup with the api-path as img.src
+ attachment = attachment_by_api_content_src(work_package, src)
+ return nil if attachment.nil? || !pdf_embeddable?(attachment.content_type)
+
+ local_file = attachment_image_local_file(attachment)
+ return nil if local_file.nil?
+
+ resize_image(local_file.path)
+ end
+
+ def attachment_by_api_content_src(work_package, src)
+ # find attachment by api-path
+ work_package.attachments.find { |a| api_url_helpers.attachment_content(a.id) == src }
+ end
end
diff --git a/app/models/work_package/pdf_export/common.rb b/app/models/work_package/pdf_export/common/common.rb
similarity index 79%
rename from app/models/work_package/pdf_export/common.rb
rename to app/models/work_package/pdf_export/common/common.rb
index e9ccb01a6a1..5d2ccd6cd78 100644
--- a/app/models/work_package/pdf_export/common.rb
+++ b/app/models/work_package/pdf_export/common/common.rb
@@ -26,7 +26,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::Common
+module WorkPackage::PDFExport::Common::Common
include Redmine::I18n
include ActionView::Helpers::TextHelper
include ActionView::Helpers::NumberHelper
@@ -35,8 +35,8 @@ module WorkPackage::PDFExport::Common
private
- def get_pdf(_language)
- ::WorkPackage::PDFExport::View.new(current_language)
+ def get_pdf
+ ::WorkPackage::PDFExport::Common::View.new(current_language)
end
def field_value(work_package, attribute)
@@ -76,51 +76,11 @@ module WorkPackage::PDFExport::Common
pdf.move_down(opts[:bottom_margin]) if opts.key?(:bottom_margin)
end
- def write_optional_page_break
- space_from_bottom = pdf.y - pdf.bounds.bottom
- if space_from_bottom < styles.page_break_threshold
- pdf.start_new_page
- end
- end
-
- def get_column_value(work_package, column_name)
- formatter = formatter_for(column_name, :pdf)
- formatter.format(work_package)
- end
-
- def get_column_value_cell(work_package, column_name)
- value = get_column_value(work_package, column_name)
- return get_id_column_cell(work_package, value) if column_name == :id
- return get_subject_column_cell(work_package, value) if wants_report? && column_name == :subject
-
- escape_tags(value)
- end
-
- def get_formatted_value(value, column_name)
- return "" if value.nil?
-
- formatter = formatter_for(column_name, :pdf)
- formatter.format_value(value, {})
- end
-
def escape_tags(value)
# only disable html tags, but do not replace html entities
value.to_s.gsub("<", "<").gsub(">", ">")
end
- def get_id_column_cell(work_package, value)
- href = url_helpers.work_package_url(work_package)
- make_link_href_cell(href, value)
- end
-
- def get_subject_column_cell(work_package, value)
- make_link_anchor(work_package.id, escape_tags(value))
- end
-
- def make_link_href_cell(href, caption)
- "#{caption}"
- end
-
def make_link_anchor(anchor, caption)
"#{caption}"
end
@@ -192,6 +152,13 @@ module WorkPackage::PDFExport::Common
measure_text_height(line, text_style)
end
+ def ellipsis_if_longer(text, available_width, text_style)
+ title_text_width = measure_text_width(text, text_style)
+ return text if title_text_width < available_width
+
+ truncate_ellipsis(text, available_width, text_style)
+ end
+
def truncate_ellipsis(text, available_width, text_style)
line = text.dup
while line.present? && (measure_text_width("#{line}...", text_style) > available_width)
@@ -266,35 +233,16 @@ module WorkPackage::PDFExport::Common
end
end
- def get_total_sums
- query.display_sums? ? (query.results.all_total_sums || {}) : {}
- end
-
- def get_group_sums(group)
- @group_sums ||= query.results.all_group_sums
- @group_sums[group] || {}
- end
-
- def get_groups
- query.results.work_package_count_by_group
- .select { |_, count| count > 0 }
- .map { |group, _| group }
- end
-
- def wants_report?
- options[:pdf_export_type] == "report"
- end
-
- def wants_gantt?
- options[:pdf_export_type] == "gantt"
- end
-
def with_cover?
false
end
- def with_sums_table?
- query.display_sums?
+ def hyphenation_enabled
+ ActiveModel::Type::Boolean.new.cast(options[:hyphenation])
+ end
+
+ def hyphenation_language
+ options[:hyphenation_language] if hyphenation_enabled
end
def build_pdf_filename(base)
@@ -306,7 +254,24 @@ module WorkPackage::PDFExport::Common
DateTime.now.strftime("%Y-%m-%d_%H-%M")
end
+ def footer_date
+ format_time(Time.zone.now)
+ end
+
def current_page_nr
pdf.page_number + @page_count - (with_cover? ? 1 : 0)
end
+
+ def write_horizontal_line(y_position, height, color)
+ draw_horizontal_line(
+ y_position,
+ pdf.bounds.left, pdf.bounds.right,
+ height, color
+ )
+ end
+
+ def start_new_page_if_needed
+ is_first_on_page = pdf.bounds.absolute_top - pdf.y < 10
+ pdf.start_new_page unless is_first_on_page
+ end
end
diff --git a/app/models/work_package/pdf_export/common/logo.rb b/app/models/work_package/pdf_export/common/logo.rb
new file mode 100644
index 00000000000..fe4cc81b6f2
--- /dev/null
+++ b/app/models/work_package/pdf_export/common/logo.rb
@@ -0,0 +1,51 @@
+# 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 WorkPackage::PDFExport::Common::Logo
+ def logo_image
+ image_obj, image_info = pdf.build_image_object(logo_image_filename)
+ [image_obj, image_info]
+ end
+
+ def logo_image_filename
+ custom_logo_image_filename || Rails.root.join("app/assets/images/logo_openproject.png")
+ end
+
+ def custom_logo_image_filename
+ return unless CustomStyle.current.present? &&
+ CustomStyle.current.export_logo.present? && CustomStyle.current.export_logo.local_file.present?
+
+ image_file = CustomStyle.current.export_logo.local_file.path
+ content_type = OpenProject::ContentTypeDetector.new(image_file).detect
+ return unless pdf_embeddable?(content_type)
+
+ image_file
+ end
+end
diff --git a/app/models/work_package/pdf_export/markdown_field.rb b/app/models/work_package/pdf_export/common/macro.rb
similarity index 84%
rename from app/models/work_package/pdf_export/markdown_field.rb
rename to app/models/work_package/pdf_export/common/macro.rb
index 53ccd93dc8b..bb2a73b914d 100644
--- a/app/models/work_package/pdf_export/markdown_field.rb
+++ b/app/models/work_package/pdf_export/common/macro.rb
@@ -26,28 +26,15 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::MarkdownField
- include WorkPackage::PDFExport::Markdown
+module WorkPackage::PDFExport::Common::Macro
PREFORMATTED_BLOCKS = %w(pre code).freeze
- def write_markdown_field!(work_package, markdown, label)
- return if markdown.blank?
-
- write_optional_page_break
- with_margin(styles.wp_markdown_label_margins) do
- pdf.formatted_text([styles.wp_markdown_label.merge({ text: label })])
- end
- with_margin(styles.wp_markdown_margins) do
- write_markdown! work_package, apply_markdown_field_macros(markdown, work_package)
- end
- end
-
- private
-
def apply_markdown_field_macros(markdown, work_package)
apply_macros(markdown, work_package, WorkPackage::Exports::Macros::Attributes)
end
+ private
+
def apply_macros(markdown, work_package, formatter)
return markdown unless formatter.applicable?(markdown)
diff --git a/app/models/work_package/pdf_export/view.rb b/app/models/work_package/pdf_export/common/view.rb
similarity index 98%
rename from app/models/work_package/pdf_export/view.rb
rename to app/models/work_package/pdf_export/common/view.rb
index 86f9c4418c6..8adc723fc04 100644
--- a/app/models/work_package/pdf_export/view.rb
+++ b/app/models/work_package/pdf_export/common/view.rb
@@ -26,7 +26,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-class WorkPackage::PDFExport::View
+class WorkPackage::PDFExport::Common::View
include Prawn::View
include Redmine::I18n
diff --git a/app/models/work_package/pdf_export/document_generator.rb b/app/models/work_package/pdf_export/document_generator.rb
new file mode 100644
index 00000000000..1a635337a67
--- /dev/null
+++ b/app/models/work_package/pdf_export/document_generator.rb
@@ -0,0 +1,90 @@
+# 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 WorkPackage::PDFExport::DocumentGenerator < Exports::Exporter
+ include WorkPackage::PDFExport::Common::Common
+ include WorkPackage::PDFExport::Common::Attachments
+ include WorkPackage::PDFExport::Common::Logo
+ include WorkPackage::PDFExport::Common::Macro
+ include WorkPackage::PDFExport::Generator::Generator
+
+ attr_accessor :pdf
+
+ self.model = WorkPackage
+
+ alias :work_package :object
+
+ def self.key
+ :generate_pdf
+ end
+
+ def initialize(work_package, _options = {})
+ super
+
+ setup_page!
+ end
+
+ def setup_page!
+ self.pdf = get_pdf
+ end
+
+ def export!
+ render_doc
+ success(pdf.render)
+ rescue StandardError => e
+ Rails.logger.error "Failed to generate PDF export: #{e.message}:\n#{e.backtrace.join("\n")}"
+ error(I18n.t(:error_pdf_failed_to_export, error: e.message))
+ end
+
+ def render_doc
+ generate_doc!(
+ apply_markdown_field_macros(work_package.description || "", work_package),
+ "contracts.yml"
+ )
+ end
+
+ def heading
+ options[:header_text_right]
+ end
+
+ def footer_title
+ options[:footer_text_center]
+ end
+
+ def title
+ # ____.pdf
+ build_pdf_filename([work_package.project, work_package.type,
+ "##{work_package.id}", work_package.subject].join("_"))
+ end
+
+ def with_images?
+ true
+ end
+end
diff --git a/app/models/work_package/pdf_export/cover.rb b/app/models/work_package/pdf_export/export/cover.rb
similarity index 78%
rename from app/models/work_package/pdf_export/cover.rb
rename to app/models/work_package/pdf_export/export/cover.rb
index ebac1df6b50..a91eed6ead2 100644
--- a/app/models/work_package/pdf_export/cover.rb
+++ b/app/models/work_package/pdf_export/export/cover.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -26,7 +28,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::Cover
+module WorkPackage::PDFExport::Export::Cover
def write_cover_page!
write_cover_logo
write_cover_hr
@@ -38,17 +40,34 @@ module WorkPackage::PDFExport::Cover
def write_cover_hero
max_width = pdf.bounds.width - styles.cover_hero_padding[:right_padding]
float_top = write_background_image
- float_top -= write_hero_title(float_top, max_width) if project
+ float_top -= write_hero_title(float_top, max_width)
float_top -= write_hero_heading(float_top, max_width)
- write_hero_subheading(float_top, max_width) unless User.current.nil?
+ float_top -= write_hero_dates(float_top, max_width)
+ write_hero_subheading(float_top, max_width)
end
def available_title_height(current_y)
current_y -
- styles.cover_hero_title_max_height -
- styles.cover_hero_title_spacing -
- styles.cover_hero_heading_spacing -
- styles.cover_hero_subheading_max_height
+ cover_hero_title_max_height -
+ cover_hero_heading_max_height -
+ cover_hero_dates_max_height -
+ cover_hero_subheading_max_height
+ end
+
+ def cover_hero_title_max_height
+ cover_page_title&.then { styles.cover_hero_title_max_height + styles.cover_hero_title_spacing } || 0
+ end
+
+ def cover_hero_heading_max_height
+ cover_page_heading&.then { styles.cover_hero_heading_spacing } || 0
+ end
+
+ def cover_hero_dates_max_height
+ cover_page_dates&.then { styles.cover_hero_dates_max_height } || 0
+ end
+
+ def cover_hero_subheading_max_height
+ cover_page_title&.then { styles.cover_hero_title_max_height + styles.cover_hero_title_spacing } || 0
end
def write_cover_hr
@@ -79,27 +98,44 @@ module WorkPackage::PDFExport::Cover
end
def write_hero_title(top, width)
+ return 0 if cover_page_title.blank?
+
write_hero_text(
top:, width:,
- text: project.name,
+ text: cover_page_title,
text_style: styles.cover_hero_title,
height: styles.cover_hero_title_max_height
) + styles.cover_hero_title_spacing
end
def write_hero_heading(top, width)
+ return 0 if cover_page_heading.blank?
+
write_hero_text(
top:, width:,
- text: heading,
+ text: cover_page_heading,
text_style: styles.cover_hero_heading,
height: available_title_height(top)
) + styles.cover_hero_heading_spacing
end
- def write_hero_subheading(top, width)
+ def write_hero_dates(top, width)
+ return 0 if cover_page_dates.blank?
+
write_hero_text(
top:, width:,
- text: User.current.name,
+ text: cover_page_dates,
+ text_style: styles.cover_hero_dates,
+ height: styles.cover_hero_dates_max_height
+ ) + styles.cover_hero_dates_spacing
+ end
+
+ def write_hero_subheading(top, width)
+ return 0 if cover_page_subheading.blank?
+
+ write_hero_text(
+ top:, width:,
+ text: cover_page_subheading,
text_style: styles.cover_hero_subheading,
height: styles.cover_hero_subheading_max_height
)
diff --git a/app/models/work_package/pdf_export/export/export_common.rb b/app/models/work_package/pdf_export/export/export_common.rb
new file mode 100644
index 00000000000..64671d55746
--- /dev/null
+++ b/app/models/work_package/pdf_export/export/export_common.rb
@@ -0,0 +1,98 @@
+# 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 WorkPackage::PDFExport::Export::ExportCommon
+ def write_optional_page_break
+ space_from_bottom = pdf.y - pdf.bounds.bottom
+ if space_from_bottom < styles.page_break_threshold
+ pdf.start_new_page
+ end
+ end
+
+ def make_link_href_cell(href, caption)
+ "#{caption}"
+ end
+
+ def get_column_value_cell(work_package, column_name)
+ value = get_column_value(work_package, column_name)
+ return get_id_column_cell(work_package, value) if column_name == :id
+ return get_subject_column_cell(work_package, value) if wants_report? && column_name == :subject
+
+ escape_tags(value)
+ end
+
+ def get_id_column_cell(work_package, value)
+ href = url_helpers.work_package_url(work_package)
+ make_link_href_cell(href, value)
+ end
+
+ def get_subject_column_cell(work_package, value)
+ make_link_anchor(work_package.id, escape_tags(value))
+ end
+
+ def get_column_value(work_package, column_name)
+ formatter = formatter_for(column_name, :pdf)
+ formatter.format(work_package)
+ end
+
+ def get_formatted_value(value, column_name)
+ return "" if value.nil?
+
+ formatter = formatter_for(column_name, :pdf)
+ formatter.format_value(value, {})
+ end
+
+ def with_sums_table?
+ query.display_sums?
+ end
+
+ def wants_report?
+ options[:pdf_export_type] == "report"
+ end
+
+ def wants_gantt?
+ options[:pdf_export_type] == "gantt"
+ end
+
+ def get_total_sums
+ query.display_sums? ? (query.results.all_total_sums || {}) : {}
+ end
+
+ def get_group_sums(group)
+ @group_sums ||= query.results.all_group_sums
+ @group_sums[group] || {}
+ end
+
+ def get_groups
+ query.results.work_package_count_by_group
+ .select { |_, count| count > 0 }
+ .map { |group, _| group }
+ end
+end
diff --git a/app/models/work_package/pdf_export/gantt.rb b/app/models/work_package/pdf_export/export/gantt.rb
similarity index 98%
rename from app/models/work_package/pdf_export/gantt.rb
rename to app/models/work_package/pdf_export/export/gantt.rb
index 778f286168f..a395b4ce071 100644
--- a/app/models/work_package/pdf_export/gantt.rb
+++ b/app/models/work_package/pdf_export/export/gantt.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -43,7 +45,7 @@
# 1. Build the data classes, do the layout, measuring, etc.
# 2. Paint the Gantt chart into the PDF
-module WorkPackage::PDFExport::Gantt
+module WorkPackage::PDFExport::Export::Gantt
GANTT_DAY_COLUMN_WIDTHS = [64, 32, 24, 18].freeze
GANTT_COLUMN_WIDTHS = [128, 64, 32, 24].freeze
GANTT_COLUMN_WIDTHS_NAMES = %w[very_wide wide medium narrow].freeze
diff --git a/app/models/work_package/pdf_export/gantt/gantt_builder.rb b/app/models/work_package/pdf_export/export/gantt/gantt_builder.rb
similarity index 99%
rename from app/models/work_package/pdf_export/gantt/gantt_builder.rb
rename to app/models/work_package/pdf_export/export/gantt/gantt_builder.rb
index 334697cfbe7..1af1b7ee16a 100644
--- a/app/models/work_package/pdf_export/gantt/gantt_builder.rb
+++ b/app/models/work_package/pdf_export/export/gantt/gantt_builder.rb
@@ -26,7 +26,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::Gantt
+module WorkPackage::PDFExport::Export::Gantt
class GanttBuilder
include Redmine::I18n
BAR_CELL_PADDING = 5.to_f
diff --git a/app/models/work_package/pdf_export/gantt/gantt_builder_days.rb b/app/models/work_package/pdf_export/export/gantt/gantt_builder_days.rb
similarity index 97%
rename from app/models/work_package/pdf_export/gantt/gantt_builder_days.rb
rename to app/models/work_package/pdf_export/export/gantt/gantt_builder_days.rb
index 829e2f8bb41..465a4f9515b 100644
--- a/app/models/work_package/pdf_export/gantt/gantt_builder_days.rb
+++ b/app/models/work_package/pdf_export/export/gantt/gantt_builder_days.rb
@@ -26,7 +26,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::Gantt
+module WorkPackage::PDFExport::Export::Gantt
class GanttBuilderDays < GanttBuilder
def build_column_dates_range(range)
range.to_a
diff --git a/app/models/work_package/pdf_export/gantt/gantt_builder_months.rb b/app/models/work_package/pdf_export/export/gantt/gantt_builder_months.rb
similarity index 98%
rename from app/models/work_package/pdf_export/gantt/gantt_builder_months.rb
rename to app/models/work_package/pdf_export/export/gantt/gantt_builder_months.rb
index 2505a1d2de5..fe8b8f252d8 100644
--- a/app/models/work_package/pdf_export/gantt/gantt_builder_months.rb
+++ b/app/models/work_package/pdf_export/export/gantt/gantt_builder_months.rb
@@ -26,7 +26,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::Gantt
+module WorkPackage::PDFExport::Export::Gantt
class GanttBuilderMonths < GanttBuilder
def build_column_dates_range(range)
range
diff --git a/app/models/work_package/pdf_export/gantt/gantt_builder_quarters.rb b/app/models/work_package/pdf_export/export/gantt/gantt_builder_quarters.rb
similarity index 98%
rename from app/models/work_package/pdf_export/gantt/gantt_builder_quarters.rb
rename to app/models/work_package/pdf_export/export/gantt/gantt_builder_quarters.rb
index c6767403b3f..664f02d2048 100644
--- a/app/models/work_package/pdf_export/gantt/gantt_builder_quarters.rb
+++ b/app/models/work_package/pdf_export/export/gantt/gantt_builder_quarters.rb
@@ -26,7 +26,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::Gantt
+module WorkPackage::PDFExport::Export::Gantt
class GanttBuilderQuarters < GanttBuilder
def build_column_dates_range(range)
range
diff --git a/app/models/work_package/pdf_export/gantt/gantt_builder_weeks.rb b/app/models/work_package/pdf_export/export/gantt/gantt_builder_weeks.rb
similarity index 98%
rename from app/models/work_package/pdf_export/gantt/gantt_builder_weeks.rb
rename to app/models/work_package/pdf_export/export/gantt/gantt_builder_weeks.rb
index f0cc8750a42..337f04977d6 100644
--- a/app/models/work_package/pdf_export/gantt/gantt_builder_weeks.rb
+++ b/app/models/work_package/pdf_export/export/gantt/gantt_builder_weeks.rb
@@ -26,7 +26,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::Gantt
+module WorkPackage::PDFExport::Export::Gantt
class GanttBuilderWeeks < GanttBuilder
def build_column_dates_range(range)
range
diff --git a/app/models/work_package/pdf_export/gantt/gantt_painter.rb b/app/models/work_package/pdf_export/export/gantt/gantt_painter.rb
similarity index 99%
rename from app/models/work_package/pdf_export/gantt/gantt_painter.rb
rename to app/models/work_package/pdf_export/export/gantt/gantt_painter.rb
index 952b08b505b..4247900974b 100644
--- a/app/models/work_package/pdf_export/gantt/gantt_painter.rb
+++ b/app/models/work_package/pdf_export/export/gantt/gantt_painter.rb
@@ -26,7 +26,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::Gantt
+module WorkPackage::PDFExport::Export::Gantt
class GanttPainter
GANTT_GRID_COLOR = "9b9ea3".freeze
GANTT_LINE_COLOR = "2b8bd5".freeze
diff --git a/app/models/work_package/pdf_export/markdown.rb b/app/models/work_package/pdf_export/export/markdown.rb
similarity index 75%
rename from app/models/work_package/pdf_export/markdown.rb
rename to app/models/work_package/pdf_export/export/markdown.rb
index a875f800bf8..f5c05888521 100644
--- a/app/models/work_package/pdf_export/markdown.rb
+++ b/app/models/work_package/pdf_export/export/markdown.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -28,16 +30,16 @@
require "md_to_pdf/core"
-module WorkPackage::PDFExport::Markdown
- class MD2PDF
+module WorkPackage::PDFExport::Export::Markdown
+ class MD2PDFExport
include MarkdownToPDF::Core
include MarkdownToPDF::Parser
- def initialize(styling_yml, pdf)
+ def initialize(styling_yml, pdf, hyphenation_language)
@styles = MarkdownToPDF::Styles.new(styling_yml)
init_options({ auto_generate_header_ids: false })
pdf_init_md2pdf_fonts(pdf)
- # @hyphens = Hyphen.new('en', false)
+ @hyphens = Hyphen.new(hyphenation_language, true) if hyphenation_language.present?
end
def draw_markdown(markdown, pdf, image_loader)
@@ -58,7 +60,9 @@ module WorkPackage::PDFExport::Markdown
end
def hyphenate(text)
- text # @hyphens.hyphenate(text)
+ return text if @hyphens.nil?
+
+ @hyphens.hyphenate(text)
end
def handle_mention_html_tag(tag, node, opts)
@@ -96,35 +100,10 @@ module WorkPackage::PDFExport::Markdown
end
end
- def write_markdown!(work_package, markdown)
- md2pdf = MD2PDF.new(styles.wp_markdown_styling_yml, pdf)
+ def write_markdown!(work_package, markdown, styling_yml)
+ md2pdf = MD2PDFExport.new(styling_yml, pdf, hyphenation_language)
md2pdf.draw_markdown(markdown, pdf, ->(src) {
with_images? ? attachment_image_filepath(work_package, src) : nil
})
end
-
- private
-
- def attachment_image_local_file(attachment)
- attachment.file.local_file
- rescue StandardError => e
- Rails.logger.error "Failed to access attachment #{attachment.id} file: #{e}"
- nil # return nil as if the id was wrong and the attachment obj has not been found
- end
-
- def attachment_image_filepath(work_package, src)
- # images are embedded into markup with the api-path as img.src
- attachment = attachment_by_api_content_src(work_package, src)
- return nil if attachment.nil? || !pdf_embeddable?(attachment.content_type)
-
- local_file = attachment_image_local_file(attachment)
- return nil if local_file.nil?
-
- resize_image(local_file.path)
- end
-
- def attachment_by_api_content_src(work_package, src)
- # find attachment by api-path
- work_package.attachments.detect { |a| api_url_helpers.attachment_content(a.id) == src }
- end
end
diff --git a/app/models/work_package/pdf_export/export/markdown_field.rb b/app/models/work_package/pdf_export/export/markdown_field.rb
new file mode 100644
index 00000000000..02c097089ac
--- /dev/null
+++ b/app/models/work_package/pdf_export/export/markdown_field.rb
@@ -0,0 +1,60 @@
+# 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 WorkPackage::PDFExport::Export::MarkdownField
+ include WorkPackage::PDFExport::Export::Markdown
+ include WorkPackage::PDFExport::Common::Macro
+
+ def write_markdown_field!(work_package, markdown, label)
+ return if markdown.blank?
+
+ write_optional_page_break
+ write_markdown_field_label(label)
+ write_markdown_field_value(work_package, markdown)
+ end
+
+ private
+
+ def write_markdown_field_label(label)
+ with_margin(styles.wp_markdown_label_margins) do
+ pdf.formatted_text([styles.wp_markdown_label.merge({ text: label })])
+ end
+ end
+
+ def write_markdown_field_value(work_package, markdown)
+ with_margin(styles.wp_markdown_margins) do
+ write_markdown!(
+ work_package,
+ apply_markdown_field_macros(markdown, work_package),
+ styles.wp_markdown_styling_yml
+ )
+ end
+ end
+end
diff --git a/app/models/work_package/pdf_export/overview_table.rb b/app/models/work_package/pdf_export/export/overview_table.rb
similarity index 98%
rename from app/models/work_package/pdf_export/overview_table.rb
rename to app/models/work_package/pdf_export/export/overview_table.rb
index c4468466511..10405fb87c6 100644
--- a/app/models/work_package/pdf_export/overview_table.rb
+++ b/app/models/work_package/pdf_export/export/overview_table.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -26,7 +28,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::OverviewTable
+module WorkPackage::PDFExport::Export::OverviewTable
def write_work_packages_overview!(work_packages)
if query.grouped?
write_grouped!(work_packages)
diff --git a/app/models/work_package/pdf_export/page.rb b/app/models/work_package/pdf_export/export/page.rb
similarity index 79%
rename from app/models/work_package/pdf_export/page.rb
rename to app/models/work_package/pdf_export/export/page.rb
index 571efcfaf76..c82ac189acb 100644
--- a/app/models/work_package/pdf_export/page.rb
+++ b/app/models/work_package/pdf_export/export/page.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -26,7 +28,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::Page
+module WorkPackage::PDFExport::Export::Page
MAX_NR_OF_PDF_FOOTER_LINES = 3
def configure_page_size!(layout)
@@ -68,24 +70,6 @@ module WorkPackage::PDFExport::Page
[image_obj, image_info, scale]
end
- def logo_image
- image_file = custom_logo_image
- image_file = Rails.root.join("app/assets/images/logo_openproject.png") if image_file.nil?
- image_obj, image_info = pdf.build_image_object(image_file)
- [image_obj, image_info]
- end
-
- def custom_logo_image
- return unless CustomStyle.current.present? &&
- CustomStyle.current.export_logo.present? && CustomStyle.current.export_logo.local_file.present?
-
- image_file = CustomStyle.current.export_logo.local_file.path
- content_type = OpenProject::ContentTypeDetector.new(image_file).detect
- return unless pdf_embeddable?(content_type)
-
- image_file
- end
-
def write_title!
pdf.title = heading
with_margin(styles.page_heading_margins) do
@@ -112,24 +96,30 @@ module WorkPackage::PDFExport::Page
text_style = styles.page_footer
spacing = styles.page_footer_horizontal_spacing
page_nr_x, page_nr_width = draw_text_centered(footer_page_nr, text_style, top)
+ draw_footer_on_page_left(page_nr_x, text_style, spacing, top)
+ draw_footer_on_page_right(page_nr_x, page_nr_width, text_style, spacing, top)
+ end
+
+ def draw_footer_on_page_right(page_nr_x, page_nr_width, text_style, spacing, top)
+ if footer_title.present?
+ draw_text_multiline_right(
+ text: footer_title, max_left: page_nr_x + page_nr_width + spacing,
+ text_style:, top:, max_lines: MAX_NR_OF_PDF_FOOTER_LINES
+ )
+ end
+ end
+
+ def draw_footer_on_page_left(page_nr_x, text_style, spacing, top)
draw_text_multiline_left(
text: footer_date, max_left: page_nr_x - spacing,
text_style:, top:, max_lines: MAX_NR_OF_PDF_FOOTER_LINES
)
- draw_text_multiline_right(
- text: footer_title, max_left: page_nr_x + page_nr_width + spacing,
- text_style:, top:, max_lines: MAX_NR_OF_PDF_FOOTER_LINES
- )
end
def footer_page_nr
current_page_nr.to_s + total_page_nr_text
end
- def footer_date
- format_time(Time.zone.now)
- end
-
def total_page_nr_text
if @total_page_nr
"/#{@total_page_nr - (with_cover? ? 1 : 0)}"
diff --git a/app/models/work_package/pdf_export/schema.json b/app/models/work_package/pdf_export/export/schema.json
similarity index 94%
rename from app/models/work_package/pdf_export/schema.json
rename to app/models/work_package/pdf_export/export/schema.json
index 50c64700b44..db8e42a305d 100644
--- a/app/models/work_package/pdf_export/schema.json
+++ b/app/models/work_package/pdf_export/export/schema.json
@@ -193,6 +193,42 @@
}
]
},
+ "dates" : {
+ "title" : "The dates block in the hero",
+ "type" : "object",
+ "x-example" : {
+ "heading" : {
+ "spacing" : 10,
+ "max_height" : 20,
+ "size" : 32,
+ "color" : "414d5f",
+ "styles" : [
+ "bold"
+ ]
+ }
+ },
+ "properties" : {
+ "max_height" : {
+ "title" : "Maximum height of the block",
+ "examples" : [
+ 30
+ ],
+ "$ref" : "#/$defs/measurement"
+ },
+ "spacing" : {
+ "title" : "Minimum spacing between dates and subheading",
+ "examples" : [
+ 10
+ ],
+ "$ref" : "#/$defs/measurement"
+ }
+ },
+ "allOf" : [
+ {
+ "$ref" : "#/$defs/font"
+ }
+ ]
+ },
"subheading" : {
"title" : "The last block in the hero",
"type" : "object",
@@ -733,6 +769,45 @@
}
]
},
+ "html_table" : {
+ "type" : "object",
+ "title" : "HTML table",
+ "x-example" : {
+ "table" : {
+ "auto_width" : true,
+ "header" : {
+ "background_color" : "F0F0F0",
+ "no_repeating" : true,
+ "size" : 12
+ },
+ "cell" : {
+ "background_color" : "000FFF",
+ "size" : 10
+ }
+ }
+ },
+ "properties" : {
+ "auto_width" : {
+ "title" : "Automatic column widths",
+ "description" : "Table columns should fit the content, equal spacing of columns if value is `false`",
+ "type" : "boolean"
+ },
+ "header" : {
+ "$ref" : "#/$defs/table_header"
+ },
+ "cell" : {
+ "$ref" : "#/$defs/table_cell"
+ }
+ },
+ "allOf" : [
+ {
+ "$ref" : "#/$defs/margin"
+ },
+ {
+ "$ref" : "#/$defs/border"
+ }
+ ]
+ },
"headless_table" : {
"type" : "object",
"title" : "Markdown headless table",
@@ -1518,7 +1593,7 @@
"x-example" : {
"ordered_list_point" : {
"template" : ".",
- "alphabetical" : false,
+ "list_style_type" : "decimal",
"spacing" : "0.75mm",
"spanning" : true
}
@@ -1527,10 +1602,22 @@
"spacing" : {
"$ref" : "#/$defs/measurement"
},
- "alphabetical" : {
- "title" : "Alphabetical bullet points",
- "description" : "Convert the list item number into a character, eg. `a.` `b.` `c.`",
- "type" : "boolean"
+ "alphabetical": {
+ "title": "Alphabetical bullet points",
+ "description": "(deprecated; use list_style_type) Convert the list item number into a character, eg. `a.` `b.` `c.`",
+ "type": "boolean"
+ },
+ "list_style_type": {
+ "title": "List style type",
+ "description": "The style of the list bullet points, eg. `decimal`, `lower-latin`, `upper-roman`",
+ "type": "string",
+ "enum": [
+ "decimal",
+ "lower-latin",
+ "lower-roman",
+ "upper-latin",
+ "upper-roman"
+ ]
},
"spanning" : {
"title" : "Spanning",
@@ -1630,6 +1717,12 @@
"allOf" : [
{
"$ref" : "#/$defs/font"
+ },
+ {
+ "$ref" : "#/$defs/padding"
+ },
+ {
+ "$ref" : "#/$defs/border"
}
]
},
diff --git a/app/models/work_package/pdf_export/standard.yml b/app/models/work_package/pdf_export/export/standard.yml
similarity index 89%
rename from app/models/work_package/pdf_export/standard.yml
rename to app/models/work_package/pdf_export/export/standard.yml
index 915d6dd37c2..90bb690fe34 100644
--- a/app/models/work_package/pdf_export/standard.yml
+++ b/app/models/work_package/pdf_export/export/standard.yml
@@ -138,6 +138,16 @@ work_package:
spacing: 1
ordered_list_point:
spacing: 4
+ spanning: true
+ list_style_type: decimal
+ ordered_list_point_2:
+ list_style_type: lower-latin
+ ordered_list_point_3:
+ list_style_type: lower-roman
+ ordered_list_point_4:
+ list_style_type: upper-latin
+ ordered_list_point_5:
+ list_style_type: upper-roman
task_list:
spacing: 1
task_list_point:
@@ -192,6 +202,17 @@ work_package:
size: 8
border_width: 0.25
padding: 5
+ html_table:
+ auto_width: true
+ margin_top: 4
+ margin_bottom: 4
+ header:
+ size: 9
+ styles: [ "bold" ]
+ cell:
+ size: 8
+ border_width: 0.25
+ padding: 5
alerts:
NOTE:
border_color: '0969da'
@@ -275,9 +296,14 @@ cover:
styles:
- bold
size: 16
+ dates:
+ spacing: 4
+ max_height: 16
+ color: '414d5f'
+ size: 10
+ styles:
+ - bold
subheading:
max_height: 30
color: '414d5f'
- styles:
- - italic
size: 10
diff --git a/app/models/work_package/pdf_export/style.rb b/app/models/work_package/pdf_export/export/style.rb
similarity index 95%
rename from app/models/work_package/pdf_export/style.rb
rename to app/models/work_package/pdf_export/export/style.rb
index 349bc977d67..8e419713890 100644
--- a/app/models/work_package/pdf_export/style.rb
+++ b/app/models/work_package/pdf_export/export/style.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -26,7 +28,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::Style
+module WorkPackage::PDFExport::Export::Style
include MarkdownToPDF::StyleValidation
class PDFStyles
@@ -251,6 +253,18 @@ module WorkPackage::PDFExport::Style
resolve_pt(@styles.dig(:cover, :hero, :heading, :spacing), 0)
end
+ def cover_hero_dates
+ resolve_font(@styles.dig(:cover, :hero, :dates))
+ end
+
+ def cover_hero_dates_spacing
+ resolve_pt(@styles.dig(:cover, :hero, :dates, :spacing), 0)
+ end
+
+ def cover_hero_dates_max_height
+ resolve_pt(@styles.dig(:cover, :hero, :dates, :max_height), 0)
+ end
+
def cover_hero_subheading
resolve_font(@styles.dig(:cover, :hero, :subheading))
end
@@ -308,7 +322,6 @@ module WorkPackage::PDFExport::Style
end
def styles_asset_path
- # TODO: where to put & load yml & json file
File.dirname(File.expand_path(__FILE__))
end
end
diff --git a/app/models/work_package/pdf_export/sums_table.rb b/app/models/work_package/pdf_export/export/sums_table.rb
similarity index 97%
rename from app/models/work_package/pdf_export/sums_table.rb
rename to app/models/work_package/pdf_export/export/sums_table.rb
index c34c08ad4eb..59c22e467c9 100644
--- a/app/models/work_package/pdf_export/sums_table.rb
+++ b/app/models/work_package/pdf_export/export/sums_table.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -26,7 +28,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::SumsTable
+module WorkPackage::PDFExport::Export::SumsTable
def write_work_packages_sums!(_work_packages)
return unless has_summable_column?
diff --git a/app/models/work_package/pdf_export/table_of_contents.rb b/app/models/work_package/pdf_export/export/table_of_contents.rb
similarity index 98%
rename from app/models/work_package/pdf_export/table_of_contents.rb
rename to app/models/work_package/pdf_export/export/table_of_contents.rb
index 8d763bb21d0..2e6094626a4 100644
--- a/app/models/work_package/pdf_export/table_of_contents.rb
+++ b/app/models/work_package/pdf_export/export/table_of_contents.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -26,7 +28,7 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::TableOfContents
+module WorkPackage::PDFExport::Export::TableOfContents
def write_work_packages_toc!(work_packages, id_wp_meta_map)
toc_list = build_toc_data_list work_packages, id_wp_meta_map
with_margin(styles.toc_margins) do
diff --git a/app/models/work_package/pdf_export/work_package_detail.rb b/app/models/work_package/pdf_export/export/work_package_detail.rb
similarity index 98%
rename from app/models/work_package/pdf_export/work_package_detail.rb
rename to app/models/work_package/pdf_export/export/work_package_detail.rb
index 24ad8fa359b..f54b179a08c 100644
--- a/app/models/work_package/pdf_export/work_package_detail.rb
+++ b/app/models/work_package/pdf_export/export/work_package_detail.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -26,8 +28,8 @@
# See COPYRIGHT and LICENSE files for more details.
#++
-module WorkPackage::PDFExport::WorkPackageDetail
- include WorkPackage::PDFExport::MarkdownField
+module WorkPackage::PDFExport::Export::WorkPackageDetail
+ include WorkPackage::PDFExport::Export::MarkdownField
def write_work_packages_details!(work_packages, id_wp_meta_map)
work_packages.each do |work_package|
diff --git a/app/models/work_package/pdf_export/generator/contracts.yml b/app/models/work_package/pdf_export/generator/contracts.yml
new file mode 100644
index 00000000000..1559578f0bd
--- /dev/null
+++ b/app/models/work_package/pdf_export/generator/contracts.yml
@@ -0,0 +1,257 @@
+page:
+ font: 'NotoSans'
+ size: 11
+ character-spacing: 0
+ styles: []
+ color: '000000'
+ page-size: 'A4'
+ page-layout: 'portrait'
+ margin-left: 20mm
+ margin-right: 20mm
+ margin-top: 40mm
+ margin-bottom: 35mm
+ leading: 6
+
+page-footer:
+ filter-pages: [ ]
+ align: "left"
+ offset: -51
+ size: 8
+
+page-footer-2:
+ filter-pages: [ ]
+ align: "center"
+ offset: -51
+ size: 8
+
+page-footer-3:
+ filter-pages: [ ]
+ align: "right"
+ offset: -51
+ size: 8
+
+page-header:
+ filter-pages: [ ]
+ align: "right"
+ size: 8
+ leading: 4
+ offset: -61
+
+page-logo:
+ filter-pages: [ ]
+ align: "left"
+ max-width: 40mm
+ offset: -70
+
+paragraph:
+ align: 'justify'
+ padding-bottom: 3mm
+
+link:
+ color: '1b69b6'
+
+unordered-list:
+ spacing: 3mm
+ padding-bottom: 3mm
+
+unordered-list-point:
+ sign: "•"
+ spacing: 0.75mm
+
+ordered-list:
+ spacing: 3mm
+ padding-bottom: 3mm
+
+ordered_list_point:
+ spanning: true
+ list_style_type: decimal
+
+ordered-list-point-1:
+ template: '()'
+
+ordered_list_point_2:
+ template: ')'
+ list_style_type: lower-latin
+
+ordered_list_point_3:
+ list_style_type: lower-roman
+
+ordered_list_point_4:
+ list_style_type: upper-latin
+
+ordered_list_point_5:
+ list_style_type: upper-roman
+
+hrule:
+ margin-top: 2mm
+ margin-bottom: 4mm
+ line-width: 1
+
+header:
+ styles: [ 'bold' ]
+ padding-top: 2mm
+ padding-bottom: 2mm
+
+header-1:
+ size: 18
+ padding-top: 6mm
+header-2:
+ size: 14
+ padding-top: 5mm
+header-3:
+ size: 12
+ padding-top: 4mm
+header-4:
+ size: 11
+ padding-top: 3mm
+header-5:
+ size: 10
+header-6:
+ size: 10
+header-7:
+ size: 10
+header-8:
+ size: 10
+
+table:
+ margin-top: 2mm
+ margin-bottom: 4mm
+ header:
+ styles: [ 'bold' ]
+ background-color: 'F0F0F0'
+ size: 10
+ cell:
+ padding: 1mm
+ size: 9
+
+html_table:
+ margin-top: 2mm
+ margin-bottom: 4mm
+ header:
+ styles: [ 'bold' ]
+ background-color: 'F0F0F0'
+ size: 10
+ cell:
+ padding: 1mm
+ size: 9
+
+blockquote:
+ background-color: 'f4f9ff'
+ size: 11
+ styles: [ 'italic' ]
+ color: '0f3b66'
+ border-color: 'b8d6f4'
+ border-width: 1
+ no-border-right: true
+ no-border-left: false
+ no-border-bottom: true
+ no-border-top: true
+ padding: 8mm
+ padding-left: 4mm
+ padding-right: 4mm
+ margin-top: 2mm
+ margin-bottom: 2mm
+
+alerts:
+ NOTE:
+ border_color: '0969da'
+ alert_color: '0969da'
+ padding: '4mm'
+ size: 10
+ styles: []
+ border_width: 2
+ no_border_right: true
+ no_border_left: false
+ no_border_bottom: true
+ no_border_top: true
+ TIP:
+ border_color: '1a7f37'
+ alert_color: '1a7f37'
+ padding: '4mm'
+ size: 10
+ styles: [ ]
+ border_width: 2
+ no_border_right: true
+ no_border_left: false
+ no_border_bottom: true
+ no_border_top: true
+ IMPORTANT:
+ border_color: '8250df'
+ alert_color: '8250df'
+ padding: '4mm'
+ size: 10
+ styles: [ ]
+ border_width: 2
+ no_border_right: true
+ no_border_left: false
+ no_border_bottom: true
+ no_border_top: true
+ WARNING:
+ border_color: 'bf8700'
+ alert_color: 'bf8700'
+ padding: '4mm'
+ size: 10
+ styles: [ ]
+ border_width: 2
+ no_border_right: true
+ no_border_left: false
+ no_border_bottom: true
+ no_border_top: true
+ CAUTION:
+ border_color: 'd1242f'
+ alert_color: 'd1242f'
+ size: 10
+ styles: [ ]
+ padding: '4mm'
+ border_width: 2
+ no_border_right: true
+ no_border_left: false
+ no_border_bottom: true
+ no_border_top: true
+
+code:
+ font: 'SpaceMono'
+ color: '880000'
+
+codeblock:
+ background-color: 'F5F5F5'
+ font: 'SpaceMono'
+ size: 8
+ color: '880000'
+ padding: 3mm
+ margin-top: 2mm
+ margin-bottom: 2mm
+
+image:
+ margin-bottom: 3mm
+ align: "center"
+ caption:
+ size: 8
+ align: "center"
+
+image-classes:
+ small:
+ max-width: 10mm
+ left:
+ margin: 0
+ align: "left"
+ center:
+ margin: 0
+ align: "center"
+ right:
+ margin: 0
+ align: "right"
+
+footnote-definition:
+ point:
+ size: 13
+ styles: [ 'superscript' ]
+ color: '000000'
+
+footnote-reference:
+ size: 13
+ styles: [ 'superscript' ]
+ color: '000088'
+
+fields-default:
+ pdf_hyphenation: true
diff --git a/app/models/work_package/pdf_export/generator/generator.rb b/app/models/work_package/pdf_export/generator/generator.rb
new file mode 100644
index 00000000000..921178f4f29
--- /dev/null
+++ b/app/models/work_package/pdf_export/generator/generator.rb
@@ -0,0 +1,168 @@
+# 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.
+#++
+
+require "md_to_pdf/core"
+require "md_to_pdf/hyphen"
+
+module WorkPackage::PDFExport::Generator::Generator
+ class MD2PDFGenerator
+ include MarkdownToPDF::Core
+ include MarkdownToPDF::Parser
+ include MarkdownToPDF::StyleSchema
+
+ def initialize(styling_yml)
+ symbol_yml = symbolize(styling_yml)
+ validate_schema!(symbol_yml, styles_schema)
+ @styles = MarkdownToPDF::Styles.new(symbol_yml)
+ init_options({ auto_generate_header_ids: false })
+ end
+
+ def init_pdf(pdf)
+ @pdf = pdf
+ init_pdf_page_styles(pdf)
+ pdf_init_md2pdf_fonts(pdf)
+ end
+
+ def init_pdf_page_styles(pdf)
+ page_style = @styles.page
+ page_margins = opts_margin(page_style)
+ pdf.options[:page_layout] = (page_style[:page_layout] || "portrait").to_sym
+ pdf.options[:page_size] = page_style[:page_size]
+ %i[top_margin left_margin bottom_margin right_margin].each do |margin|
+ pdf.options[margin] = page_margins[margin]
+ end
+ end
+
+ def generate!(markdown, options, image_loader)
+ @image_loader = image_loader
+ fields = {}
+ .merge(@styles.default_fields)
+ .merge(options)
+ doc = parse_frontmatter_markdown(markdown, fields)
+ @hyphens = Hyphen.new(options[:language], true) if options[:language].present?
+ render_doc(doc)
+ end
+
+ def render_doc(doc)
+ style = @styles.page
+ opts = pdf_root_options(style)
+ root = doc[:root]
+ draw_node(root, opts, true)
+ draw_footnotes(opts)
+ repeating_page_footer(doc, opts)
+ repeating_page_header(doc, opts)
+ repeating_page_logo(doc[:logo], root, opts)
+ end
+
+ def image_url_to_local_file(url, _node = nil)
+ return nil if url.blank? || @image_loader.nil?
+
+ @image_loader.call(url)
+ end
+
+ def hyphenate(text)
+ return text if @hyphens.nil?
+
+ @hyphens.hyphenate(text)
+ end
+
+ def handle_mention_html_tag(tag, node, opts)
+ if tag.text.blank?
+ #
+ #
+ text = tag.attr("data-text")
+ if text.present? && !node.next.respond_to?(:string_content) && node.next.string_content != text
+ return [text_hash(text, opts)]
+ end
+ end
+ # @Some User
+ []
+ end
+
+ def handle_unknown_inline_html_tag(tag, node, opts)
+ result = if tag.name == "mention"
+ handle_mention_html_tag(tag, node, opts)
+ else
+ # unknown/unsupported html tags eg. hi are ignored
+ # but scanned for supported or text children
+ data_inlinehtml_tag(tag, node, opts)
+ end
+ [result, opts]
+ end
+
+ def handle_unknown_html_tag(_tag, _node, opts)
+ # unknown/unsupported html tags eg. hi are ignored
+ # but scanned for supported or text children [true, ...]
+ [true, opts]
+ end
+
+ def warn(text, element, node)
+ Rails.logger.warn "PDF-Export: #{text}\nGot #{element} at #{node.source_position.inspect}\n\n"
+ end
+ end
+
+ def generate_doc!(markdown, styling_file)
+ md2pdf = MD2PDFGenerator.new(md_to_pdf_styling(styling_file))
+ md2pdf.init_pdf(pdf)
+ md2pdf.generate!(markdown, md_to_pdf_options, ->(src) {
+ if src == logo_image_filename
+ logo_image_filename
+ else
+ attachment_image_filepath(work_package, src)
+ end
+ })
+ end
+
+ private
+
+ def md_to_pdf_styling(styling_file)
+ styling = YAML::load_file(File.join(styling_asset_path, styling_file))
+ # overwrite the paper size if it is set in the options
+ styling["page"]["page-size"] = options[:paper_size] if options[:paper_size].present?
+ styling
+ end
+
+ def md_to_pdf_options
+ # rubocop:disable Naming/VariableNumber
+ {
+ language: hyphenation_language,
+ pdf_footer: footer_date,
+ pdf_footer_2: footer_title,
+ pdf_footer_3: I18n.t("pdf_generator.page_nr_footer", page: "", total: ""),
+ pdf_header_logo: logo_image_filename,
+ pdf_header: heading
+ }.compact
+ # rubocop:enable Naming/VariableNumber
+ end
+
+ def styling_asset_path
+ File.dirname(File.expand_path(__FILE__))
+ end
+end
diff --git a/app/models/work_package/pdf_export/templates.rb b/app/models/work_package/pdf_export/templates.rb
new file mode 100644
index 00000000000..d99c887e679
--- /dev/null
+++ b/app/models/work_package/pdf_export/templates.rb
@@ -0,0 +1,44 @@
+# 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 WorkPackage::PDFExport::Templates
+ TEMPLATES = [
+ {
+ id: "attributes",
+ label: I18n.t("pdf_generator.template_attributes.label"),
+ caption: I18n.t("pdf_generator.template_attributes.caption")
+ },
+ {
+ id: "contract",
+ label: I18n.t("pdf_generator.template_contract.label"),
+ caption: I18n.t("pdf_generator.template_contract.caption")
+ }
+ ].freeze
+end
diff --git a/app/models/work_package/pdf_export/work_package_list_to_pdf.rb b/app/models/work_package/pdf_export/work_package_list_to_pdf.rb
index cf346d0f91c..676de311df4 100644
--- a/app/models/work_package/pdf_export/work_package_list_to_pdf.rb
+++ b/app/models/work_package/pdf_export/work_package_list_to_pdf.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -40,16 +42,20 @@
require "open3"
class WorkPackage::PDFExport::WorkPackageListToPdf < WorkPackage::Exports::QueryExporter
- include WorkPackage::PDFExport::Common
- include WorkPackage::PDFExport::Attachments
- include WorkPackage::PDFExport::OverviewTable
- include WorkPackage::PDFExport::SumsTable
- include WorkPackage::PDFExport::WorkPackageDetail
- include WorkPackage::PDFExport::TableOfContents
- include WorkPackage::PDFExport::Page
- include WorkPackage::PDFExport::Gantt
- include WorkPackage::PDFExport::Style
- include WorkPackage::PDFExport::Cover
+ include WorkPackage::PDFExport::Common::Common
+ include WorkPackage::PDFExport::Common::Logo
+ include WorkPackage::PDFExport::Common::Attachments
+ include WorkPackage::PDFExport::Export::ExportCommon
+ include WorkPackage::PDFExport::Export::WorkPackageDetail
+ include WorkPackage::PDFExport::Export::Page
+ include WorkPackage::PDFExport::Export::Style
+ include WorkPackage::PDFExport::Export::OverviewTable
+ include WorkPackage::PDFExport::Export::SumsTable
+ include WorkPackage::PDFExport::Export::WorkPackageDetail
+ include WorkPackage::PDFExport::Export::TableOfContents
+ include WorkPackage::PDFExport::Export::Style
+ include WorkPackage::PDFExport::Export::Cover
+ include WorkPackage::PDFExport::Export::Gantt
attr_accessor :pdf,
:options
@@ -67,20 +73,26 @@ class WorkPackage::PDFExport::WorkPackageListToPdf < WorkPackage::Exports::Query
setup_page!
end
+ def get_columns
+ return [] if query.column_names.empty? && wants_report?
+
+ super
+ end
+
def export!
file = render_work_packages query.results.work_packages
success(file)
rescue Prawn::Errors::CannotFit
error(I18n.t(:error_pdf_export_too_many_columns))
rescue StandardError => e
- Rails.logger.error { "Failed to generate PDF export: #{e}." }
- error(I18n.t(:error_pdf_failed_to_export, error: e.message[0..300]))
+ Rails.logger.error "Failed to generate PDF export: #{e.message}:\n#{e.backtrace.join("\n")}"
+ error(I18n.t(:error_pdf_failed_to_export, error: e.message))
end
private
def setup_page!
- self.pdf = get_pdf(current_language)
+ self.pdf = get_pdf
configure_page_size!(wants_report? ? :portrait : :landscape)
end
@@ -105,6 +117,22 @@ class WorkPackage::PDFExport::WorkPackageListToPdf < WorkPackage::Exports::Query
wants_report?
end
+ def cover_page_title
+ project&.name
+ end
+
+ def cover_page_heading
+ heading
+ end
+
+ def cover_page_subheading
+ User.current&.name
+ end
+
+ def cover_page_dates
+ nil
+ end
+
def render_work_packages_pdfs(work_packages, filename)
write_cover_page! if with_cover?
if wants_gantt?
diff --git a/app/models/work_package/pdf_export/work_package_to_pdf.rb b/app/models/work_package/pdf_export/work_package_to_pdf.rb
index 9f85c9d9572..57947f58631 100644
--- a/app/models/work_package/pdf_export/work_package_to_pdf.rb
+++ b/app/models/work_package/pdf_export/work_package_to_pdf.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -27,11 +29,13 @@
#++
class WorkPackage::PDFExport::WorkPackageToPdf < Exports::Exporter
- include WorkPackage::PDFExport::Common
- include WorkPackage::PDFExport::Attachments
- include WorkPackage::PDFExport::WorkPackageDetail
- include WorkPackage::PDFExport::Page
- include WorkPackage::PDFExport::Style
+ include WorkPackage::PDFExport::Common::Common
+ include WorkPackage::PDFExport::Common::Logo
+ include WorkPackage::PDFExport::Common::Attachments
+ include WorkPackage::PDFExport::Export::ExportCommon
+ include WorkPackage::PDFExport::Export::WorkPackageDetail
+ include WorkPackage::PDFExport::Export::Page
+ include WorkPackage::PDFExport::Export::Style
attr_accessor :pdf, :columns
@@ -54,12 +58,12 @@ class WorkPackage::PDFExport::WorkPackageToPdf < Exports::Exporter
render_work_package
success(pdf.render)
rescue StandardError => e
- Rails.logger.error { "Failed to generated PDF export: #{e} #{e.message}}." }
+ Rails.logger.error "Failed to generate PDF export: #{e.message}:\n#{e.backtrace.join("\n")}"
error(I18n.t(:error_pdf_failed_to_export, error: e.message))
end
def setup_page!
- self.pdf = get_pdf(current_language)
+ self.pdf = get_pdf
@page_count = 0
configure_page_size!(:portrait)
end
@@ -76,7 +80,7 @@ class WorkPackage::PDFExport::WorkPackageToPdf < Exports::Exporter
end
def footer_title
- work_package.project.name
+ options[:footer_text_right]
end
def title
diff --git a/app/models/work_package_custom_field.rb b/app/models/work_package_custom_field.rb
index 1b1a68fe5bc..5af119827e6 100644
--- a/app/models/work_package_custom_field.rb
+++ b/app/models/work_package_custom_field.rb
@@ -49,6 +49,11 @@ class WorkPackageCustomField < CustomField
end
}
+ scope :usable_as_custom_action, -> {
+ where.not(field_format: %w[hierarchy])
+ .order(:name)
+ }
+
def self.summable
where(field_format: %w[int float])
end
diff --git a/app/models/work_packages/relations.rb b/app/models/work_packages/relations.rb
index 12dc4d3da50..d28b23f159f 100644
--- a/app/models/work_packages/relations.rb
+++ b/app/models/work_packages/relations.rb
@@ -29,14 +29,23 @@ module WorkPackages::Relations
included do
# All relations of the work package in both directions.
- # Mostly used to have the relations destroyed upon destruction of the work package.
# rubocop:disable Rails/InverseOf
has_many :relations,
->(work_package) {
unscope(:where)
.of_work_package(work_package)
},
- dependent: :destroy
+ dependent: :destroy do
+ def visible(user = User.current)
+ # The work_package_focus_scope in here is used to improve performance by reducing the number of
+ # work packages that have to be checked for whether they are visible.
+ # Since the method looks for relations on the current work package, only work packages
+ # that are on either end of a relation with the current work package need to be considered.
+ # The number should be quite small compared to the total number of work packages.
+ merge(Relation.visible(user,
+ work_package_focus_scope: Arel::Nodes::UnionAll.new(select(:from_id).arel, select(:to_id).arel)))
+ end
+ end
# rubocop:enable Rails/InverseOf
# Relations where the current work package follows another one.
diff --git a/app/models/work_packages/scopes/directly_related.rb b/app/models/work_packages/scopes/directly_related.rb
index b29b99cbdfa..4e351cfebb7 100644
--- a/app/models/work_packages/scopes/directly_related.rb
+++ b/app/models/work_packages/scopes/directly_related.rb
@@ -34,8 +34,10 @@ module WorkPackages::Scopes
def directly_related(work_package, ignored_relation: nil)
relations_without_ignored = ignored_relation ? Relation.where.not(id: ignored_relation.id) : Relation.all
- where(id: relations_without_ignored.where(from_id: work_package).select(:to_id))
- .or(where(id: relations_without_ignored.where(to_id: work_package).select(:from_id)))
+ from_id_relations = relations_without_ignored.where(from_id: work_package).select(:to_id)
+ to_id_relations = relations_without_ignored.where(to_id: work_package).select(:from_id)
+
+ where(arel_table[:id].in(Arel::Nodes::UnionAll.new(from_id_relations.arel, to_id_relations.arel)))
end
end
end
diff --git a/app/models/work_packages/scopes/for_scheduling.rb b/app/models/work_packages/scopes/for_scheduling.rb
index 686d6895eb8..63310f8419c 100644
--- a/app/models/work_packages/scopes/for_scheduling.rb
+++ b/app/models/work_packages/scopes/for_scheduling.rb
@@ -43,7 +43,7 @@ module WorkPackages::Scopes
# stop on that path if the work package evaluated to be added is either:
#
# * itself scheduled manually
- # * having all of it's children scheduled manually
+ # * having all of its children scheduled manually
#
# The children themselves are scheduled manually if all of their children
# are scheduled manually which repeats itself down to the leaf work
diff --git a/app/models/work_packages/scopes/involving_user.rb b/app/models/work_packages/scopes/involving_user.rb
index da00ea9a04b..0eb82d7131d 100644
--- a/app/models/work_packages/scopes/involving_user.rb
+++ b/app/models/work_packages/scopes/involving_user.rb
@@ -36,19 +36,45 @@ module WorkPackages::Scopes
# for, or watcher, via a group or themself
#
# @param user User the user involved in work packages.
- def involving_user(user)
- WorkPackage.left_joins(:watchers)
- .where(watchers: { user: })
- .or(WorkPackage.where(assigned_to: user))
- .or(WorkPackage.where(assigned_to: group_having(user)))
- .or(WorkPackage.where(responsible: user))
- .or(WorkPackage.where(responsible: group_having(user)))
+ def involving_user(user) # rubocop:disable Metrics/AbcSize
+ # Using CTEs and UNION for performance reasons
+ # The alternative would be the simpler:
+ # ```
+ # WorkPackage
+ # .left_joins(:watchers)
+ # .where(watchers: { user: })
+ # .or(WorkPackage.where(assigned_to: user))
+ # .or(WorkPackage.where(assigned_to: group_having(user)))
+ # .or(WorkPackage.where(responsible: user))
+ # .or(WorkPackage.where(responsible: group_having(user)))
+ # ```
+ # That however prevents indices from being used because of the or clauses on different columns.
+ watched = WorkPackage
+ .left_joins(:watchers)
+ .where(watchers: { user: })
+ .select(:id)
+ assigned = WorkPackage
+ .where("assigned_to_id IN (SELECT * FROM user_and_groups)")
+ .select(:id)
+ responsible = WorkPackage
+ .where("responsible_id IN (SELECT * FROM user_and_groups)")
+ .select(:id)
+
+ watched_and_assigned_and_responsible = Arel::Nodes::Union.new(watched.arel,
+ Arel::Nodes::Union.new(assigned.arel,
+ responsible.arel))
+
+ WorkPackage
+ .with(user_and_groups: user_and_groups_union(user))
+ .where(arel_table[:id].in(watched_and_assigned_and_responsible))
end
private
- def group_having(user)
- GroupUser.select(:group_id).where(user_id: user.id)
+ def user_and_groups_union(user)
+ in_group = GroupUser.select("group_id").where(["user_id = ?", user.id]).arel # rubocop:disable Rails/WhereEquals
+
+ Arel.sql("#{in_group.to_sql} UNION SELECT #{user.id}")
end
end
end
diff --git a/app/models/work_packages/scopes/relatable.rb b/app/models/work_packages/scopes/relatable.rb
index d78d1cdc1c7..3d9d1eddaa0 100644
--- a/app/models/work_packages/scopes/relatable.rb
+++ b/app/models/work_packages/scopes/relatable.rb
@@ -202,11 +202,11 @@ module WorkPackages::Scopes
if relation_type == Relation::TYPE_RELATES
# Bypassing the recursive query in this case as only children and parent needs to be excluded.
# Using this more complicated statement since
- # where.not(parent:id: work_package.id)
+ # where.not(parent_id: work_package.id)
# will lead to
# "parent_id != 123" which excludes
# work packages having parent_id NULL.
- where.not(id: where(id: work_package.parent_id).or(where(parent_id: work_package.id)).select(:id))
+ where.not(id: unscoped.where(id: work_package.parent_id).or(unscoped.where(parent_id: work_package.id)).select(:id))
else
sql = <<~SQL.squish
WITH
diff --git a/app/seeders/basic_data/color_seeder.rb b/app/seeders/basic_data/color_seeder.rb
index 225c372b704..760ec3ed6cf 100644
--- a/app/seeders/basic_data/color_seeder.rb
+++ b/app/seeders/basic_data/color_seeder.rb
@@ -29,6 +29,7 @@ module BasicData
class ColorSeeder < ModelSeeder
self.model_class = Color
self.seed_data_model_key = "colors"
+ self.attribute_names_for_lookups = %i[name]
def model_attributes(color_data)
{
diff --git a/app/seeders/basic_data/life_cycle_color_seeder.rb b/app/seeders/basic_data/life_cycle_color_seeder.rb
new file mode 100644
index 00000000000..835dd00cb2d
--- /dev/null
+++ b/app/seeders/basic_data/life_cycle_color_seeder.rb
@@ -0,0 +1,44 @@
+#-- 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 BasicData
+ class LifeCycleColorSeeder < ColorSeeder
+ self.seed_data_model_key = "life_cycle_colors"
+
+ def applicable?
+ missing_color_names.any?
+ end
+
+ private
+
+ def missing_color_names
+ color_names = models_data.pluck("name")
+ color_names - Color.where(name: color_names).pluck(:name)
+ end
+ end
+end
diff --git a/app/seeders/basic_data/life_cycle_step_definition_seeder.rb b/app/seeders/basic_data/life_cycle_step_definition_seeder.rb
new file mode 100644
index 00000000000..54166f73101
--- /dev/null
+++ b/app/seeders/basic_data/life_cycle_step_definition_seeder.rb
@@ -0,0 +1,46 @@
+#-- 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 BasicData
+ class LifeCycleStepDefinitionSeeder < ModelSeeder
+ self.model_class = Project::LifeCycleStepDefinition
+ self.seed_data_model_key = "life_cycles"
+ self.needs = [
+ BasicData::LifeCycleColorSeeder
+ ]
+
+ self.attribute_names_for_lookups = %i[name type]
+
+ def model_attributes(life_cyle_data)
+ {
+ name: life_cyle_data["name"],
+ type: life_cyle_data["type"],
+ color_id: color_id(life_cyle_data["color_name"])
+ }
+ end
+ end
+end
diff --git a/app/seeders/basic_data/model_seeder.rb b/app/seeders/basic_data/model_seeder.rb
index 97951880419..37e7a4e57f8 100644
--- a/app/seeders/basic_data/model_seeder.rb
+++ b/app/seeders/basic_data/model_seeder.rb
@@ -39,13 +39,21 @@ module BasicData
def seed_data!
model_class.transaction do
+ prepare!
models_data.each do |model_data|
- model = model_class.create!(model_attributes(model_data))
- seed_data.store_reference(model_data["reference"], model)
+ create_model!(model_data)
end
end
end
+ def prepare!; end
+
+ def create_model!(model_data)
+ model_class
+ .create!(model_attributes(model_data))
+ .tap { |model| seed_data.store_reference(model_data["reference"], model) }
+ end
+
def mapped_models_data
models_data.each_with_object({}) do |model_data, models|
models[model_data["reference"]] = model_attributes(model_data)
diff --git a/app/seeders/common.yml b/app/seeders/common.yml
index bd7e4a71f8b..ee89fb7b137 100644
--- a/app/seeders/common.yml
+++ b/app/seeders/common.yml
@@ -70,6 +70,23 @@ colors:
t_name: Black
hexcode: "#000000"
+life_cycle_colors:
+ - reference: :default_color_pm2_orange
+ t_name: PM2 Orange
+ hexcode: "#F7983A"
+ - reference: :default_color_pm2_purple
+ t_name: PM2 Purple
+ hexcode: "#682D91"
+ - reference: :default_color_pm2_red
+ t_name: PM2 Red
+ hexcode: "#F05823"
+ - reference: :default_color_pm2_magenta
+ t_name: PM2 Magenta
+ hexcode: "#EC038A"
+ - reference: :default_color_pm2_green_yellow
+ t_name: PM2 Green Yellow
+ hexcode: "#B1D13A"
+
document_categories:
- t_name: Documentation
position: 1
diff --git a/app/seeders/demo_data/project_seeder.rb b/app/seeders/demo_data/project_seeder.rb
index cb7f1fb6619..5b4090e6e43 100644
--- a/app/seeders/demo_data/project_seeder.rb
+++ b/app/seeders/demo_data/project_seeder.rb
@@ -55,7 +55,7 @@ module DemoData
DemoData::WikiSeeder,
DemoData::WorkPackageSeeder,
DemoData::WorkPackageBoardSeeder,
- ::Meetings::DemoData::MeetingSeeder,
+ ::Meetings::DemoData::MeetingSeriesSeeder,
::Meetings::DemoData::MeetingAgendaItemsSeeder
]
end
diff --git a/app/seeders/env_data/custom_design_seeder.rb b/app/seeders/env_data/custom_design_seeder.rb
new file mode 100644
index 00000000000..82bd3fa0720
--- /dev/null
+++ b/app/seeders/env_data/custom_design_seeder.rb
@@ -0,0 +1,146 @@
+# 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 EnvData
+ class CustomDesignSeeder < Seeder
+ def seed_data!
+ custom_style = CustomStyle.current || CustomStyle.create!
+
+ print_status " ↳ Setting custom design colors" do
+ seed_colors
+ seed_export_color(custom_style)
+ end
+
+ print_status " ↳ Setting custom logos" do
+ seed_logos(custom_style)
+ end
+
+ custom_style.save!
+ end
+
+ def applicable?
+ Setting.seed_design.present?
+ end
+
+ private
+
+ def seed_logos(custom_style)
+ CustomStyle.uploaders.each_key do |key|
+ data = Setting.seed_design[key.to_s]
+
+ if data.blank?
+ custom_style.public_send(:"remove_#{key}")
+ elsif data.match?(/^https?:\/\//)
+ seed_remote_url(custom_style, key, data)
+ else
+ io = Base64StringIO.new(data, key.to_s)
+ custom_style.public_send(:"#{key}=", io)
+ end
+ end
+ end
+
+ def seed_colors
+ OpenProject::CustomStyles::Design.customizable_variables.each do |variable|
+ key = variable.to_s.underscore
+ value = Setting.seed_design[key]
+
+ if value.blank?
+ DesignColor.where(variable:).delete_all
+ else
+ design_color = DesignColor.find_or_initialize_by(variable:)
+ design_color.hexcode = value
+ design_color.save!
+ end
+ end
+ end
+
+ def seed_export_color(custom_style)
+ value = Setting.seed_design["export_cover_text_color"]
+ custom_style.export_cover_text_color = value.presence
+ end
+
+ def seed_remote_url(custom_style, key, url)
+ response = HTTPX.get(url)
+ raise "Failed to set #{key} from #{url}: #{response}" unless response.status == 200
+
+ build_attachable_file(key.to_s, response.body.to_s) do |file|
+ custom_style.public_send(:"#{key}=", file)
+ custom_style.save!
+ end
+ end
+
+ def build_attachable_file(file_name, data)
+ Tempfile.open(file_name) do |tempfile|
+ tempfile.binmode
+ tempfile.write(data)
+ tempfile.rewind
+
+ content_type = OpenProject::ContentTypeDetector.new(tempfile.path).detect
+ mime_type = MIME::Types[content_type].last
+ raise ArgumentError, "Unknown mime type: #{content_type}" if mime_type.nil?
+
+ file = OpenProject::Files.build_uploaded_file(tempfile,
+ content_type,
+ file_name: "#{file_name}.#{mime_type.preferred_extension}")
+
+ yield(file)
+ end
+ end
+
+ class Base64StringIO < StringIO
+ attr_reader :filename
+
+ def initialize(data_url, base_name)
+ metadata, encoded = data_url.split(",")
+
+ if metadata.blank? || encoded.blank? || !metadata.start_with?("data:")
+ raise ArgumentError, "Expected data URL, got #{data_url}"
+ end
+
+ @filename = "#{base_name}.#{extension(metadata)}"
+ bytes = ::Base64.strict_decode64(encoded)
+
+ super(bytes)
+ end
+
+ def original_filename
+ filename
+ end
+
+ def extension(metadata)
+ content_type = metadata.match(%r{data:([^;]+)})&.captures&.first
+ raise ArgumentError, "Failed to parse content type from metadata: #{metadata}" if content_type.nil?
+
+ mime_type = MIME::Types[content_type].last
+ raise ArgumentError, "Unknown mime type: #{content_type}" if mime_type.nil?
+
+ mime_type.preferred_extension
+ end
+ end
+ end
+end
diff --git a/app/seeders/env_data/token_seeder.rb b/app/seeders/env_data/token_seeder.rb
new file mode 100644
index 00000000000..36ed8740ca3
--- /dev/null
+++ b/app/seeders/env_data/token_seeder.rb
@@ -0,0 +1,45 @@
+# 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 EnvData
+ class TokenSeeder < Seeder
+ def seed_data!
+ Rails.logger.debug "*** Seeding Enterprise support token from ENV"
+
+ token = Setting.seed_enterprise_token
+ if token.present?
+ EnterpriseToken.create! encoded_token: token.gsub("\\n", "\n")
+ end
+ end
+
+ def applicable?
+ !EnterpriseToken.exists?
+ end
+ end
+end
diff --git a/app/seeders/env_data_seeder.rb b/app/seeders/env_data_seeder.rb
index bbda615cb62..a8ca8e16b5c 100644
--- a/app/seeders/env_data_seeder.rb
+++ b/app/seeders/env_data_seeder.rb
@@ -27,7 +27,9 @@
class EnvDataSeeder < CompositeSeeder
def data_seeder_classes
[
- EnvData::LdapSeeder
+ EnvData::CustomDesignSeeder,
+ EnvData::LdapSeeder,
+ EnvData::TokenSeeder
]
end
diff --git a/app/seeders/root_seeder.rb b/app/seeders/root_seeder.rb
index f1a150e4723..0958652ca40 100644
--- a/app/seeders/root_seeder.rb
+++ b/app/seeders/root_seeder.rb
@@ -75,6 +75,11 @@ class RootSeeder < Seeder
seed_development_data if seed_development_data?
seed_plugins_data
seed_env_data
+ cleanup_seed_data
+ end
+
+ def cleanup_seed_data
+ admin_user.lock! if Setting.seed_admin_user_locked?
end
def seed_development_data?
diff --git a/app/seeders/source/seed_data.rb b/app/seeders/source/seed_data.rb
index f3813a98e8c..55d0e9829ae 100644
--- a/app/seeders/source/seed_data.rb
+++ b/app/seeders/source/seed_data.rb
@@ -61,6 +61,9 @@ class Source::SeedData
else
references = [reference, *fallbacks].map(&:inspect)
message = "Nothing registered with #{'reference'.pluralize(references.count)} #{references.to_sentence(locale: false)}"
+ if Rails.env.local?
+ message += "\nPerhaps you forgot to add the `attribute_names_for_lookups` for your seeder?"
+ end
raise ArgumentError, message
end
end
diff --git a/app/seeders/standard.yml b/app/seeders/standard.yml
index a177de92970..0e00dea26de 100644
--- a/app/seeders/standard.yml
+++ b/app/seeders/standard.yml
@@ -26,6 +26,36 @@
# See COPYRIGHT and LICENSE files for more details.
#++
+life_cycles:
+ - reference: :default_life_cycle_initiating
+ t_name: Initiating
+ type: Project::StageDefinition
+ color_name: :default_color_pm2_orange
+ - reference: :default_life_cycle_ready_for_planning
+ t_name: Ready for Planning
+ type: Project::GateDefinition
+ color_name: :default_color_pm2_purple
+ - reference: :default_life_cycle_planning
+ t_name: Planning
+ type: Project::StageDefinition
+ color_name: :default_color_pm2_red
+ - reference: :default_life_cycle_ready_for_executing
+ t_name: Ready for Executing
+ type: Project::GateDefinition
+ color_name: :default_color_pm2_purple
+ - reference: :default_life_cycle_executing
+ t_name: Executing
+ type: Project::StageDefinition
+ color_name: :default_color_pm2_magenta
+ - reference: :default_life_cycle_ready_for_closing
+ t_name: Ready for Closing
+ type: Project::GateDefinition
+ color_name: :default_color_pm2_purple
+ - reference: :default_life_cycle_closing
+ t_name: Closing
+ type: Project::StageDefinition
+ color_name: :default_color_pm2_green_yellow
+
priorities:
- reference: :default_priority_low
t_name: Low
diff --git a/app/seeders/standard/basic_data_seeder.rb b/app/seeders/standard/basic_data_seeder.rb
index 5c6c06c8ee2..d77525b74a1 100644
--- a/app/seeders/standard/basic_data_seeder.rb
+++ b/app/seeders/standard/basic_data_seeder.rb
@@ -37,6 +37,8 @@ module Standard
::BasicData::TimeEntryActivitySeeder,
::BasicData::ColorSeeder,
::BasicData::ColorSchemeSeeder,
+ ::BasicData::LifeCycleColorSeeder,
+ ::BasicData::LifeCycleStepDefinitionSeeder,
::BasicData::WorkflowSeeder,
::BasicData::PrioritySeeder,
::BasicData::SettingSeeder,
diff --git a/app/services/add_work_package_note_service.rb b/app/services/add_work_package_note_service.rb
index d0bf6ff79b6..69bb8054f41 100644
--- a/app/services/add_work_package_note_service.rb
+++ b/app/services/add_work_package_note_service.rb
@@ -32,6 +32,8 @@
class AddWorkPackageNoteService
include Contracted
+ include Shared::ServiceContext
+
attr_accessor :user, :work_package
def initialize(user:, work_package:)
@@ -41,7 +43,7 @@ class AddWorkPackageNoteService
end
def call(notes, send_notifications: nil)
- Journal::NotificationConfiguration.with send_notifications do
+ in_context(work_package, send_notifications:) do
work_package.add_journal(user:, notes:)
success, errors = validate_and_yield(work_package, user) do
diff --git a/app/services/authentication/omniauth_service.rb b/app/services/authentication/omniauth_service.rb
index 47f18d60069..bade473d323 100644
--- a/app/services/authentication/omniauth_service.rb
+++ b/app/services/authentication/omniauth_service.rb
@@ -159,13 +159,11 @@ module Authentication
end
##
- # Allow to map existing users with an Omniauth source if the login
- # already exists, and no existing auth source or omniauth provider is
- # linked
+ # Allow to map existing users with an Omniauth source if the login already exists
def remap_existing_user
return unless Setting.oauth_allow_remapping_of_existing_users?
- User.not_builtin.find_by_login(user_attributes[:login]) # rubocop:disable Rails/DynamicFindBy
+ User.not_builtin.find_by_login(user_attributes[:login])
end
##
@@ -285,7 +283,7 @@ module Authentication
# Try to provide some context of the auth_hash in case of errors
def auth_uid
hash = auth_hash || {}
- hash.dig(:info, :uid) || hash.dig(:uid) || "unknown"
+ hash.dig(:info, :uid) || hash[:uid] || "unknown"
end
end
end
diff --git a/app/services/authorization/enterprise_service.rb b/app/services/authorization/enterprise_service.rb
index 4e419b03d20..e070d85775c 100644
--- a/app/services/authorization/enterprise_service.rb
+++ b/app/services/authorization/enterprise_service.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -35,6 +37,7 @@ class Authorization::EnterpriseService
conditional_highlighting
custom_actions
custom_field_hierarchies
+ customize_life_cycle
date_alerts
define_custom_style
edit_attribute_groups
@@ -51,6 +54,7 @@ class Authorization::EnterpriseService
virus_scanning
work_package_query_relation_columns
work_package_sharing
+ work_package_subject_generation
].freeze
def initialize(token)
diff --git a/app/services/base_type_service.rb b/app/services/base_type_service.rb
index 36750ca1a46..8ba1b086bda 100644
--- a/app/services/base_type_service.rb
+++ b/app/services/base_type_service.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -71,13 +73,14 @@ class BaseTypeService
def set_params_and_validate(params)
# Only set attribute groups when it exists
# (Regression #28400)
- set_attribute_groups(params) unless params[:attribute_groups].nil?
+ set_attribute_groups(params) if params[:attribute_groups]
# This should go before `set_scalar_params` call to get the
# project_ids, custom_field_ids diffs from the type and the params.
# For determining the active custom fields for the type, it is necessary
# to know whether the type is a milestone or not.
set_milestone_param(params) unless params[:is_milestone].nil?
+
set_active_custom_fields
set_active_custom_fields_for_project_ids(params[:project_ids]) if params[:project_ids].present?
@@ -92,7 +95,7 @@ class BaseTypeService
end
def set_scalar_params(params)
- type.attributes = params.except(:attribute_groups)
+ type.attributes = params.except(:attribute_groups, :subject_configuration, :subject_pattern)
end
def set_attribute_groups(params)
diff --git a/app/services/bulk_services/project_mappings/base_create_service.rb b/app/services/bulk_services/project_mappings/base_create_service.rb
new file mode 100644
index 00000000000..03d7c209301
--- /dev/null
+++ b/app/services/bulk_services/project_mappings/base_create_service.rb
@@ -0,0 +1,131 @@
+# 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 BulkServices
+ module ProjectMappings
+ class BaseCreateService < ::BaseServices::BaseCallable
+ attr_reader :mapping_context
+
+ delegate :incoming_projects, :mapping_model_class, to: :mapping_context
+
+ def initialize(user:, mapping_context: nil)
+ super()
+ @user = user
+ @mapping_context = mapping_context
+ end
+
+ def perform(params = {})
+ service_call = validate_permissions
+ service_call = validate_contract(service_call, params) if service_call.success?
+ service_call = perform_bulk_create(service_call) if service_call.success?
+ service_call = after_perform(service_call, params) if service_call.success?
+
+ service_call
+ end
+
+ private
+
+ def validate_permissions
+ return ServiceResult.failure(errors: I18n.t(:label_not_found)) if incoming_projects.empty?
+
+ if @user.allowed_in_project?(permission, incoming_projects)
+ ServiceResult.success
+ else
+ ServiceResult.failure(errors: I18n.t("activerecord.errors.messages.error_unauthorized"))
+ end
+ end
+
+ def validate_contract(service_call, params)
+ extra_attributes = attributes_from_params(params)
+ mapping_attributes_for_all_projects = mapping_context.mapping_attributes_for_all_projects(extra_attributes)
+ set_attributes_results = mapping_attributes_for_all_projects.map do |mapping_attributes|
+ set_attributes(mapping_attributes)
+ end
+
+ if (failures = set_attributes_results.select(&:failure?)).any?
+ service_call.success = false
+ service_call.errors = failures.map(&:errors)
+ end
+
+ service_call.result = set_attributes_results.map(&:result)
+
+ service_call
+ end
+
+ # override in subclasses to pass additional parameters to the `SetAttributesService`.
+ def attributes_from_params(_params)
+ {}
+ end
+
+ def perform_bulk_create(service_call)
+ mapping_model_class.insert_all(
+ service_call.result.map { |model| model.attributes.compact },
+ unique_by: [:project_id, model_foreign_key_id.to_sym]
+ )
+
+ service_call
+ end
+
+ def after_perform(service_call, _params)
+ service_call # Subclasses can override this method to add additional logic
+ end
+
+ def set_attributes(params)
+ attributes_service_class
+ .new(user: @user,
+ model: mapping_model_class.new,
+ contract_class: default_contract_class)
+ .call(params)
+ end
+
+ # @return [Symbol] the permission required to create the mapping
+ def permission
+ raise NotImplementedError
+ end
+
+ # @return [Symbol] the column name of the mapping
+ def model_foreign_key_id
+ raise NotImplementedError
+ end
+
+ def attributes_service_class
+ "#{namespace}::SetAttributesService".constantize
+ end
+
+ def default_contract_class
+ "#{namespace}::UpdateContract".constantize
+ end
+
+ def namespace
+ self.class.name.deconstantize.pluralize
+ end
+ end
+ end
+end
diff --git a/app/services/bulk_services/project_mappings/mapping_context.rb b/app/services/bulk_services/project_mappings/mapping_context.rb
new file mode 100644
index 00000000000..318e81d18b9
--- /dev/null
+++ b/app/services/bulk_services/project_mappings/mapping_context.rb
@@ -0,0 +1,85 @@
+# 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.
+#++
+
+# Gives the projects to map and the attributes to be used for the mapping.
+module BulkServices
+ module ProjectMappings
+ class MappingContext < MappingContextBase
+ attr_reader :model,
+ :projects,
+ :model_foreign_key_id,
+ :include_sub_projects
+
+ def initialize(mapping_model_class:,
+ model:,
+ projects:,
+ model_foreign_key_id:,
+ include_sub_projects: false)
+ super(mapping_model_class:)
+ @model = model
+ @projects = projects
+ @model_foreign_key_id = model_foreign_key_id
+ @include_sub_projects = include_sub_projects
+ end
+
+ def mapping_attributes_for_all_projects(extra_attributes)
+ project_ids_to_map.map do |project_id|
+ {
+ project_id:,
+ model_foreign_key_id => model.id
+ }.merge(extra_attributes)
+ end
+ end
+
+ def incoming_projects
+ projects.each_with_object(Set.new) do |project, projects_set|
+ next unless project.active?
+
+ projects_set << project
+ projects_set.merge(project.active_subprojects.to_a) if include_sub_projects
+ end.to_a
+ end
+
+ private
+
+ def project_ids_to_map
+ project_ids = incoming_projects.pluck(:id)
+ project_ids - project_ids_already_mapped(project_ids)
+ end
+
+ def project_ids_already_mapped(project_ids)
+ mapping_model_class.where(
+ model_foreign_key_id => @model.id,
+ project_id: project_ids
+ ).pluck(:project_id)
+ end
+ end
+ end
+end
diff --git a/app/services/bulk_services/project_mappings/mapping_context_base.rb b/app/services/bulk_services/project_mappings/mapping_context_base.rb
new file mode 100644
index 00000000000..9a27261df03
--- /dev/null
+++ b/app/services/bulk_services/project_mappings/mapping_context_base.rb
@@ -0,0 +1,50 @@
+# 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.
+#++
+
+# Gives the projects to map and the attributes to be used for the mapping.
+module BulkServices
+ module ProjectMappings
+ class MappingContextBase
+ attr_reader :mapping_model_class
+
+ def initialize(mapping_model_class:)
+ @mapping_model_class = mapping_model_class
+ end
+
+ def mapping_attributes_for_all_projects(params)
+ raise NotImplementedError, "This method must be implemented in a subclass"
+ end
+
+ def incoming_projects
+ raise NotImplementedError, "This method must be implemented in a subclass"
+ end
+ end
+ end
+end
diff --git a/app/services/concerns/reminders/service_helpers.rb b/app/services/concerns/reminders/service_helpers.rb
new file mode 100644
index 00000000000..b6e27e2d446
--- /dev/null
+++ b/app/services/concerns/reminders/service_helpers.rb
@@ -0,0 +1,57 @@
+#-- 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 Reminders
+ module ServiceHelpers
+ extend ActiveSupport::Concern
+
+ def reschedule_reminder(reminder)
+ destroy_scheduled_reminder_job(reminder)
+ mark_unread_notifications_as_read_for(reminder)
+ schedule_new_reminder_job(reminder)
+ end
+
+ def schedule_new_reminder_job(reminder)
+ job = Reminders::ScheduleReminderJob.schedule(reminder)
+ reminder.update_columns(job_id: job.job_id)
+ end
+
+ def destroy_scheduled_reminder_job(reminder)
+ return unless reminder.scheduled?
+ return unless job = GoodJob::Job.find_by(id: reminder.job_id)
+
+ job.destroy unless job.finished?
+ end
+
+ def mark_unread_notifications_as_read_for(reminder)
+ return unless reminder.unread_notifications?
+
+ reminder.unread_notifications.update_all(read_ian: true, updated_at: Time.zone.now)
+ end
+ end
+end
diff --git a/app/services/custom_fields/custom_field_projects/bulk_create_service.rb b/app/services/custom_fields/custom_field_projects/bulk_create_service.rb
index 3b452006ce6..7dd66c4c3e1 100644
--- a/app/services/custom_fields/custom_field_projects/bulk_create_service.rb
+++ b/app/services/custom_fields/custom_field_projects/bulk_create_service.rb
@@ -30,96 +30,20 @@
module CustomFields
module CustomFieldProjects
- class BulkCreateService < ::BaseServices::BaseCallable
- def initialize(user:, projects:, custom_field:, include_sub_projects: false)
- super()
- @user = user
- @projects = projects
- @custom_field = custom_field
- @include_sub_projects = include_sub_projects
- end
-
- def perform
- service_call = validate_permissions
- service_call = validate_contract(service_call, incoming_mapping_ids) if service_call.success?
- service_call = perform_bulk_create(service_call) if service_call.success?
-
- service_call
- end
-
- private
-
- def validate_permissions(permission: :select_custom_fields)
- return ServiceResult.failure(errors: I18n.t(:label_not_found)) if incoming_projects.empty?
-
- if @user.allowed_in_project?(permission, incoming_projects)
- ServiceResult.success
- else
- ServiceResult.failure(errors: I18n.t("activerecord.errors.messages.error_unauthorized"))
- end
- end
-
- def validate_contract(service_call, project_ids)
- set_attributes_results = project_ids.map do |id|
- set_attributes(project_id: id, custom_field_id: @custom_field.id)
- end
-
- if (failures = set_attributes_results.select(&:failure?)).any?
- service_call.success = false
- service_call.errors = failures.map(&:errors)
- else
- service_call.result = set_attributes_results.map(&:result)
- end
-
- service_call
- end
-
- def perform_bulk_create(service_call)
- custom_field_project_mapping_class.insert_all(
- service_call.result.map { |model| model.attributes.slice("project_id", "custom_field_id") },
- unique_by: %i[project_id custom_field_id]
+ class BulkCreateService < ::BulkServices::ProjectMappings::BaseCreateService
+ def initialize(user:, projects:, model:, include_sub_projects: false)
+ mapping_context = ::BulkServices::ProjectMappings::MappingContext.new(
+ mapping_model_class: CustomFieldsProject,
+ model:,
+ projects:,
+ model_foreign_key_id:,
+ include_sub_projects:
)
-
- service_call
+ super(user:, mapping_context:)
end
- def incoming_mapping_ids
- project_ids = incoming_projects.pluck(:id)
- project_ids - existing_project_mappings(project_ids)
- end
-
- def incoming_projects
- @projects.each_with_object(Set.new) do |project, projects_set|
- next unless project.active?
-
- projects_set << project
- projects_set.merge(project.active_subprojects.to_a) if @include_sub_projects
- end.to_a
- end
-
- def existing_project_mappings(project_ids)
- custom_field_project_mapping_class.where(
- custom_field_id: @custom_field.id,
- project_id: project_ids
- ).pluck(:project_id)
- end
-
- def set_attributes(params)
- attributes_service_class
- .new(user: @user,
- model: instance(params),
- contract_class: default_contract_class,
- contract_options: {})
- .call(params)
- end
-
- def instance(params)
- custom_field_project_mapping_class.new(params)
- end
-
- def attributes_service_class = CustomFields::CustomFieldProjects::SetAttributesService
- def default_contract_class = CustomFields::CustomFieldProjects::UpdateContract
- def custom_field_project_mapping_class = CustomFieldsProject
+ def permission = :select_custom_fields
+ def model_foreign_key_id = :custom_field_id
end
end
end
diff --git a/app/services/custom_fields/hierarchy/hierarchical_item_service.rb b/app/services/custom_fields/hierarchy/hierarchical_item_service.rb
index 49b5f882da1..2123063571b 100644
--- a/app/services/custom_fields/hierarchy/hierarchical_item_service.rb
+++ b/app/services/custom_fields/hierarchy/hierarchical_item_service.rb
@@ -88,12 +88,27 @@ module CustomFields
Success(item.self_and_ancestors.reverse)
end
+ # Gets all descendant nodes in a tree starting from the item/node.
+ # @param item [CustomField::Hierarchy::Item] the node
+ # @param include_self [Boolean] flag
+ # @return [Success(Array)]
+ def get_descendants(item:, include_self: true)
+ if include_self
+ Success(item.self_and_descendants)
+ else
+ Success(item.descendants)
+ end
+ end
+
# Move an item/node to a new parent item/node
# @param item [CustomField::Hierarchy::Item] the parent of the node
# @param new_parent [CustomField::Hierarchy::Item] the new parent of the node
# @return [Success(CustomField::Hierarchy::Item)]
def move_item(item:, new_parent:)
- Success(new_parent.append_child(item))
+ updated_item = new_parent.append_child(item)
+ update_position_cache(new_parent.root)
+
+ Success(updated_item)
end
# Reorder the item along its siblings.
@@ -104,7 +119,6 @@ module CustomFields
return Success() if item.siblings.empty?
new_sort_order = [0, new_sort_order.to_i].max
-
return Success() if item.sort_order == new_sort_order
update_item_order(item:, new_sort_order:)
@@ -117,6 +131,10 @@ module CustomFields
raise NotImplementedError
end
+ # Returns a hash of Item => { Item => [Item] }
+ # @param item [CustomField::Hierarchy::Item] the start node
+ # @param depth [Integer] limits the max depth of the hash. see {ClosureTree#hash_tree}
+ # @return [Success({CustomField::Hierarchy::Item => Array, Hash})]
def hashed_subtree(item:, depth:)
if depth >= 0
Success(item.hash_tree(limit_depth: depth + 1))
@@ -125,6 +143,10 @@ module CustomFields
end
end
+ # Checks if an item is a descendant of another node
+ # @param item [CustomField::Hierarchy::Item] the item to be tested
+ # @param parent [CustomField::Hierarchy::Item] the node to be checked against
+ # @return [Success, Failure]
def descendant_of?(item:, parent:)
item.descendant_of?(parent) ? Success() : Failure()
end
@@ -135,6 +157,7 @@ module CustomFields
item = CustomField::Hierarchy::Item.create(custom_field: custom_field)
return Failure(item.errors) if item.new_record?
+ update_position_cache(item)
Success(item)
end
@@ -145,7 +168,8 @@ module CustomFields
item = validation[:parent].children.create(**attributes)
return Failure(item.errors) if item.new_record?
- Success(item)
+ update_position_cache(item.root)
+ Success(item.reload)
end
def update_item_attributes(item:, attributes:)
@@ -164,6 +188,37 @@ module CustomFields
target_item = item.siblings.last
target_item.append_sibling(item)
end
+
+ update_position_cache(item.root)
+ end
+
+ def update_position_cache(root)
+ sql = <<-SQL.squish
+ UPDATE hierarchical_items
+ SET position_cache = subquery.position
+ FROM (
+ SELECT hi.id
+ , SUM((1 + COALESCE(anc.sort_order, 0)) *
+ POWER(count_max.total_descendants, count_max.max_gens - depths.generations)) AS position
+ FROM hierarchical_items hi
+ INNER JOIN hierarchical_item_hierarchies hih ON hi.id = hih.descendant_id
+ JOIN hierarchical_item_hierarchies anc_h ON anc_h.descendant_id = hih.descendant_id
+ JOIN hierarchical_items anc ON anc.id = anc_h.ancestor_id
+ JOIN hierarchical_item_hierarchies depths ON depths.ancestor_id = #{root.id} AND depths.descendant_id = anc.id
+ , (
+ SELECT COUNT(1) AS total_descendants, MAX(generations) + 1 AS max_gens
+ FROM hierarchical_items hi
+ INNER JOIN hierarchical_item_hierarchies hih ON hi.id = hih.ancestor_id
+ WHERE ancestor_id = #{root.id}
+ ) count_max
+ WHERE hih.ancestor_id = #{root.id}
+ GROUP BY hi.id) as subquery
+ WHERE hierarchical_items.id = subquery.id;
+ SQL
+
+ OpenProject::Mutex.with_advisory_lock(CustomField::Hierarchy::Item, "position_update_anc_#{root.id}") do
+ CustomField::Hierarchy::Item.connection.exec_update(sql)
+ end
end
end
end
diff --git a/app/services/duration_converter.rb b/app/services/duration_converter.rb
index e2efe5a771e..65b023af851 100644
--- a/app/services/duration_converter.rb
+++ b/app/services/duration_converter.rb
@@ -96,7 +96,7 @@ class DurationConverter
false
end
- def output(duration_in_hours)
+ def output(duration_in_hours, format: default_format)
return duration_in_hours if duration_in_hours.nil?
seconds = (duration_in_hours * 3600).to_i
@@ -111,7 +111,9 @@ class DurationConverter
def parseable?(duration_string)
if number = Integer(duration_string, 10, exception: false) || Float(duration_string, exception: false)
- number >= 0
+ # ruby 3.4 started being able to parse strings like "1." as 1.0.
+ # However, that does not work with ChronicDuration.
+ number >= 0 && !duration_string.ends_with?(".")
else
begin
do_parse(duration_string)
@@ -142,7 +144,7 @@ class DurationConverter
**duration_length_options) / 3600.to_f
end
- def format
+ def default_format
Setting.duration_format == "days_and_hours" ? :days_and_hours : :hours_only
end
diff --git a/app/services/ldap/base_service.rb b/app/services/ldap/base_service.rb
index a2afb8b3642..00ce75cb121 100644
--- a/app/services/ldap/base_service.rb
+++ b/app/services/ldap/base_service.rb
@@ -124,7 +124,7 @@ module Ldap
filter: ldap.login_filter(login),
attributes: ldap.search_attributes
)
- .map { |entry| ldap.get_user_attributes_from_ldap_entry(entry).except(:dn) }
+ &.map { |entry| ldap.get_user_attributes_from_ldap_entry(entry).except(:dn) } || []
end
def new_ldap_connection
diff --git a/app/services/notifications/create_from_model_service.rb b/app/services/notifications/create_from_model_service.rb
index 36c9e844134..0613b821920 100644
--- a/app/services/notifications/create_from_model_service.rb
+++ b/app/services/notifications/create_from_model_service.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -253,7 +255,7 @@ class Notifications::CreateFromModelService
# * only lines added
# * excluding quoted lines
def text_for_mentions
- potential_text = ""
+ potential_text = +""
potential_text << journal.notes if journal.try(:notes)
%i[description subject].each do |field|
diff --git a/app/services/oauth_clients/connection_manager.rb b/app/services/oauth_clients/connection_manager.rb
index e1faa40dd4e..e18b5b5ff59 100644
--- a/app/services/oauth_clients/connection_manager.rb
+++ b/app/services/oauth_clients/connection_manager.rb
@@ -103,14 +103,24 @@ module OAuthClients
else
rack_access_token = service_result.result
OAuthClientToken.transaction do
- oauth_client_token = create_client_token(rack_access_token)
-
+ oauth_client_token = OAuthClientToken.new(
+ user: @user,
+ oauth_client: @oauth_client,
+ access_token: rack_access_token.access_token,
+ token_type: rack_access_token.token_type, # :bearer
+ refresh_token: rack_access_token.refresh_token,
+ expires_in: rack_access_token.raw_attributes[:expires_in],
+ scope: rack_access_token.scope
+ )
oauth_client_token.save!
- RemoteIdentities::CreateService.call(user: @user, oauth_config: @config, oauth_token: rack_access_token)
- .on_failure { raise ActiveRecord::Rollback }
+
+ RemoteIdentities::CreateService
+ .call(user: @user, oauth_config: @config, oauth_client_token:)
+ .on_failure { raise ActiveRecord::Rollback }
end
- ServiceResult.new(success: oauth_client_token.errors.empty?, result: oauth_client_token,
+ ServiceResult.new(success: oauth_client_token.errors.empty?,
+ result: oauth_client_token,
errors: oauth_client_token.errors)
end
end
@@ -136,20 +146,6 @@ module OAuthClients
private
- # @param rack_access_token [Rack::OAuth2::Token] - rack token to be used as a base
- # @return [OAuthClientToken]
- def create_client_token(rack_access_token)
- OAuthClientToken.new(
- user: @user,
- oauth_client: @oauth_client,
- access_token: rack_access_token.access_token,
- token_type: rack_access_token.token_type, # :bearer
- refresh_token: rack_access_token.refresh_token,
- expires_in: rack_access_token.raw_attributes[:expires_in],
- scope: rack_access_token.scope
- )
- end
-
# Check if a OAuthClientToken already exists and return nil otherwise.
# Don't handle the case of an expired token.
def get_existing_token
diff --git a/app/services/principals/replace_references_service.rb b/app/services/principals/replace_references_service.rb
index e1c0810a49c..a3b7af255f8 100644
--- a/app/services/principals/replace_references_service.rb
+++ b/app/services/principals/replace_references_service.rb
@@ -30,6 +30,25 @@
# No data is to be removed.
module Principals
class ReplaceReferencesService
+ class << self
+ attr_reader :replacements, :foreign_keys
+
+ def add_replacements(attributes_by_class_name)
+ attributes_by_class_name.each do |class_name, attributes|
+ Array(attributes).each { |attribute| add_replacement(class_name, attribute) }
+ end
+ end
+
+ def add_replacement(class_name, attribute)
+ @replacements ||= {}
+ @replacements[class_name] ||= Set.new
+ @replacements[class_name] << attribute
+
+ @foreign_keys ||= Set.new
+ @foreign_keys << attribute.to_s
+ end
+ end
+
def call(from:, to:)
rewrite_active_models(from, to)
rewrite_custom_value(from, to)
@@ -42,14 +61,10 @@ module Principals
private
def rewrite_active_models(from, to)
- rewrite_author(from, to)
- rewrite_user(from, to)
- rewrite_assigned_to(from, to)
- rewrite_responsible(from, to)
- rewrite_actor(from, to)
- rewrite_owner(from, to)
- rewrite_logged_by(from, to)
- rewrite_presenter(from, to)
+ self.class.replacements.each do |class_name, attributes|
+ klass = class_name.constantize
+ attributes.each { |attribute| rewrite(klass, attribute, from, to) }
+ end
end
def rewrite_custom_value(from, to)
@@ -61,7 +76,7 @@ module Principals
def rewrite_default_journals(from, to)
journal_classes.each do |klass|
- foreign_keys.each do |foreign_key|
+ self.class.foreign_keys.each do |foreign_key|
if klass.column_names.include? foreign_key
rewrite(klass, foreign_key, from, to)
end
@@ -77,81 +92,10 @@ module Principals
.update_all(value: to.id.to_s)
end
- def rewrite_author(from, to)
- [WorkPackage,
- Attachment,
- WikiPage,
- News,
- Comment,
- Message,
- Budget,
- MeetingAgenda,
- MeetingMinutes,
- MeetingAgendaItem].each do |klass|
- rewrite(klass, :author_id, from, to)
- end
- end
-
- def rewrite_user(from, to)
- [TimeEntry,
- CostEntry,
- ::Query,
- Changeset,
- CostQuery,
- MeetingParticipant].each do |klass|
- rewrite(klass, :user_id, from, to)
- end
- end
-
- def rewrite_actor(from, to)
- [::Notification].each do |klass|
- rewrite(klass, :actor_id, from, to)
- end
- end
-
- def rewrite_owner(from, to)
- [::Doorkeeper::Application].each do |klass|
- rewrite(klass, :owner_id, from, to)
- end
- end
-
- def rewrite_assigned_to(from, to)
- [WorkPackage].each do |klass|
- rewrite(klass, :assigned_to_id, from, to)
- end
- end
-
- def rewrite_responsible(from, to)
- [WorkPackage].each do |klass|
- rewrite(klass, :responsible_id, from, to)
- end
- end
-
- def rewrite_logged_by(from, to)
- [
- TimeEntry,
- CostEntry
- ].each do |klass|
- rewrite(klass, :logged_by_id, from, to)
- end
- end
-
- def rewrite_presenter(from, to)
- [
- MeetingAgendaItem
- ].each do |klass|
- rewrite(klass, :presenter_id, from, to)
- end
- end
-
def journal_classes
[Journal] + Journal::BaseJournal.subclasses
end
- def foreign_keys
- %w[author_id user_id assigned_to_id responsible_id logged_by_id presenter_id]
- end
-
def rewrite(klass, attribute, from, to)
klass.where(attribute => from.id).update_all(attribute => to.id)
end
diff --git a/app/services/project_custom_field_project_mappings/bulk_create_service.rb b/app/services/project_custom_field_project_mappings/bulk_create_service.rb
index 432112326ac..19bbd7594ba 100644
--- a/app/services/project_custom_field_project_mappings/bulk_create_service.rb
+++ b/app/services/project_custom_field_project_mappings/bulk_create_service.rb
@@ -29,19 +29,21 @@
#++
module ProjectCustomFieldProjectMappings
- class BulkCreateService < ::CustomFields::CustomFieldProjects::BulkCreateService
- def initialize(user:, projects:, project_custom_field:, include_sub_projects: false)
- super(user:, projects:, custom_field: project_custom_field, include_sub_projects:)
+ class BulkCreateService < ::BulkServices::ProjectMappings::BaseCreateService
+ def initialize(user:, projects:, model:, include_sub_projects: false)
+ mapping_context = ::BulkServices::ProjectMappings::MappingContext.new(
+ mapping_model_class: ProjectCustomFieldProjectMapping,
+ model:,
+ projects:,
+ model_foreign_key_id:,
+ include_sub_projects:
+ )
+ super(user:, mapping_context:)
end
private
- def validate_permissions(permission: :select_project_custom_fields)
- super
- end
-
- def attributes_service_class = ProjectCustomFieldProjectMappings::SetAttributesService
- def default_contract_class = ProjectCustomFieldProjectMappings::UpdateContract
- def custom_field_project_mapping_class = ProjectCustomFieldProjectMapping
+ def permission = :select_project_custom_fields
+ def model_foreign_key_id = :custom_field_id
end
end
diff --git a/app/services/project_life_cycle_steps/preview_attributes_service.rb b/app/services/project_life_cycle_steps/preview_attributes_service.rb
new file mode 100644
index 00000000000..0070cabfe24
--- /dev/null
+++ b/app/services/project_life_cycle_steps/preview_attributes_service.rb
@@ -0,0 +1,47 @@
+#-- 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 ProjectLifeCycleSteps
+ class PreviewAttributesService < ::BaseServices::SetAttributes
+ def perform(*)
+ super.tap do |service_call|
+ clear_unchanged_fields(service_call)
+ end
+ end
+
+ private
+
+ def clear_unchanged_fields(service_call)
+ service_call
+ .result
+ .available_life_cycle_steps
+ .select(&:not_set?)
+ .each { _1.errors.clear }
+ end
+ end
+end
diff --git a/app/services/project_life_cycle_steps/set_attributes_service.rb b/app/services/project_life_cycle_steps/set_attributes_service.rb
new file mode 100644
index 00000000000..c1603d42603
--- /dev/null
+++ b/app/services/project_life_cycle_steps/set_attributes_service.rb
@@ -0,0 +1,32 @@
+#-- 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 ProjectLifeCycleSteps
+ class SetAttributesService < ::BaseServices::SetAttributes
+ end
+end
diff --git a/app/services/project_life_cycle_steps/update_service.rb b/app/services/project_life_cycle_steps/update_service.rb
new file mode 100644
index 00000000000..a8a5a33aa92
--- /dev/null
+++ b/app/services/project_life_cycle_steps/update_service.rb
@@ -0,0 +1,32 @@
+#-- 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 ProjectLifeCycleSteps
+ class UpdateService < ::BaseServices::Update
+ end
+end
diff --git a/app/services/reminders/create_service.rb b/app/services/reminders/create_service.rb
new file mode 100644
index 00000000000..340f980a289
--- /dev/null
+++ b/app/services/reminders/create_service.rb
@@ -0,0 +1,39 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 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 Reminders
+ class CreateService < ::BaseServices::Create
+ include Reminders::ServiceHelpers
+
+ def after_perform(service_call)
+ schedule_new_reminder_job(service_call.result)
+
+ service_call
+ end
+ end
+end
diff --git a/app/services/reminders/delete_service.rb b/app/services/reminders/delete_service.rb
new file mode 100644
index 00000000000..8250ffe12f8
--- /dev/null
+++ b/app/services/reminders/delete_service.rb
@@ -0,0 +1,39 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 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 Reminders
+ class DeleteService < ::BaseServices::Delete
+ include Reminders::ServiceHelpers
+
+ def destroy(reminder)
+ destroy_scheduled_reminder_job(reminder)
+ mark_unread_notifications_as_read_for(reminder)
+ reminder.update(completed_at: Time.zone.now)
+ end
+ end
+end
diff --git a/app/services/reminders/set_attributes_service.rb b/app/services/reminders/set_attributes_service.rb
new file mode 100644
index 00000000000..c1cbff56aa6
--- /dev/null
+++ b/app/services/reminders/set_attributes_service.rb
@@ -0,0 +1,32 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 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 Reminders
+ class SetAttributesService < ::BaseServices::SetAttributes
+ end
+end
diff --git a/app/services/reminders/update_service.rb b/app/services/reminders/update_service.rb
new file mode 100644
index 00000000000..9a1bd002e1c
--- /dev/null
+++ b/app/services/reminders/update_service.rb
@@ -0,0 +1,47 @@
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) 2012-2024 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 Reminders
+ class UpdateService < ::BaseServices::Update
+ include Reminders::ServiceHelpers
+
+ def after_perform(service_call)
+ reschedule_reminder(service_call.result) if remind_at_changed?
+
+ service_call
+ end
+
+ private
+
+ def remind_at_changed?
+ # For some reason reminder.remind_at_changed? returns false
+ # so we assume a change if remind_at is present in the params (would have passed contract validation)
+ params[:remind_at].present?
+ end
+ end
+end
diff --git a/app/services/remote_identities/create_service.rb b/app/services/remote_identities/create_service.rb
index 21d3dae439d..3542a8f9925 100644
--- a/app/services/remote_identities/create_service.rb
+++ b/app/services/remote_identities/create_service.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -30,21 +32,21 @@ module RemoteIdentities
class CreateService
attr_reader :user, :model
- def self.call(user:, oauth_config:, oauth_token:)
- new(user:, oauth_config:, oauth_token:).call
+ def self.call(user:, oauth_config:, oauth_client_token:)
+ new(user:, oauth_config:, oauth_client_token:).call
end
- def initialize(user:, oauth_config:, oauth_token:)
+ def initialize(user:, oauth_config:, oauth_client_token:)
@user = user
@oauth_config = oauth_config
- @oauth_token = oauth_token
+ @oauth_client_token = oauth_client_token
@model = RemoteIdentity.find_or_initialize_by(user:, oauth_client: oauth_config.oauth_client)
@result = ServiceResult.success(result: @model, errors: @model.errors)
end
def call
- @model.origin_user_id = @oauth_config.extract_origin_user_id(@oauth_token)
+ @model.origin_user_id = @oauth_config.extract_origin_user_id(@oauth_client_token)
if @model.save
emit_event(@oauth_config.oauth_client.integration)
else
diff --git a/app/services/service_result.rb b/app/services/service_result.rb
index 950a140f5d4..e06ed7a838c 100644
--- a/app/services/service_result.rb
+++ b/app/services/service_result.rb
@@ -83,7 +83,7 @@ class ServiceResult
self.result = result
self.state = state
- initialize_errors(errors)
+ initialize_errors(errors, result)
@message = message
@message_type = message_type
@@ -223,15 +223,23 @@ class ServiceResult
@state ||= ::Shared::ServiceState.build
end
- private
-
- def initialize_errors(errors)
- self.errors = errors || new_errors_with_result
+ ##
+ # Required as we create an errors object bound to this ServiceResult.
+ # calling `errors#full_messages` will call `human_attribute_name` here.
+ def self.human_attribute_name(*)
+ ApplicationRecord.human_attribute_name(*)
end
- def new_errors_with_result
- ActiveModel::Errors.new(self).tap do |errors|
- errors.merge!(result) if result.try(:errors).present?
+ private
+
+ def initialize_errors(errors, provided_result)
+ self.errors = errors || new_errors_with_result(provided_result)
+ end
+
+ def new_errors_with_result(provided_result)
+ base = provided_result.respond_to?(:errors) ? provided_result : self
+ ActiveModel::Errors.new(base).tap do |errors|
+ errors.merge!(provided_result) if base != self
end
end
diff --git a/app/services/sessions/clear_old_sessions_service.rb b/app/services/sessions/clear_old_sessions_service.rb
new file mode 100644
index 00000000000..95b7a8846c5
--- /dev/null
+++ b/app/services/sessions/clear_old_sessions_service.rb
@@ -0,0 +1,39 @@
+#-- 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 Sessions
+ class ClearOldSessionsService
+ class << self
+ ##
+ # Drop all sessions for the given user
+ def call!(days_ago: 30)
+ # sessions expire after 30 days of inactivity by default
+ ActiveRecord::SessionStore::Session.where("updated_at < ?", days_ago.days.ago).delete_all
+ end
+ end
+ end
+end
diff --git a/app/services/update_type_service.rb b/app/services/update_type_service.rb
index be475bdf48e..cfb28450dfe 100644
--- a/app/services/update_type_service.rb
+++ b/app/services/update_type_service.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -35,4 +37,40 @@ class UpdateTypeService < BaseTypeService
super(params, {})
end
+
+ private
+
+ def set_params_and_validate(params)
+ # Set patterns includes a data validation before assigning the value to the attribute.
+ # A validation failure should return a service call failure.
+ if params[:patterns].present?
+ validate_enterprise_action(params[:patterns])
+ set_patterns(params[:patterns])
+ return [false, type.errors] if type.errors.any?
+ end
+
+ super
+ end
+
+ def validate_enterprise_action(patterns)
+ change_from_manual_to_generated = !type.patterns.subject&.enabled? && patterns.dig(:subject, :enabled)
+ action = :work_package_subject_generation
+
+ if change_from_manual_to_generated && !EnterpriseToken.allows_to?(action)
+ type.errors.add(:patterns, :error_enterprise_only, action: action.to_s.titleize)
+ end
+ end
+
+ def set_patterns(patterns)
+ Types::Patterns::Collection
+ .build(patterns:)
+ .either(
+ ->(collection) { type.patterns = collection },
+ ->(result) do
+ result.errors(full: true).messages.each do |message|
+ type.errors.add(:patterns, message.text)
+ end
+ end
+ )
+ end
end
diff --git a/app/services/users/register_user_service.rb b/app/services/users/register_user_service.rb
index 3ab6efc7baa..b498044d593 100644
--- a/app/services/users/register_user_service.rb
+++ b/app/services/users/register_user_service.rb
@@ -137,7 +137,7 @@ module Users
end
def provider_name(user)
- user.authentication_provider&.downcase
+ user.authentication_provider&.slug&.downcase
end
def register_by_email_activation
diff --git a/app/services/work_packages/create_service.rb b/app/services/work_packages/create_service.rb
index 600c0f5d0eb..69961b847cd 100644
--- a/app/services/work_packages/create_service.rb
+++ b/app/services/work_packages/create_service.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -30,17 +32,15 @@ class WorkPackages::CreateService < BaseServices::BaseCallable
include ::WorkPackages::Shared::UpdateAncestors
include ::Shared::ServiceContext
- attr_accessor :user,
- :contract_class
+ attr_reader :user, :contract_class
def initialize(user:, contract_class: WorkPackages::CreateContract)
- self.user = user
- self.contract_class = contract_class
+ super()
+ @user = user
+ @contract_class = contract_class
end
- def perform(work_package: WorkPackage.new,
- send_notifications: nil,
- **attributes)
+ def perform(work_package: WorkPackage.new, send_notifications: nil, **attributes)
in_user_context(send_notifications:) do
create(attributes, work_package)
end
@@ -55,8 +55,8 @@ class WorkPackages::CreateService < BaseServices::BaseCallable
if result.success
work_package.attachments = work_package.attachments_replacements if work_package.attachments_replacements
work_package.save
- else
- false
+
+ set_templated_subject(work_package)
end
if result.success?
@@ -67,25 +67,24 @@ class WorkPackages::CreateService < BaseServices::BaseCallable
end
set_user_as_watcher(work_package)
- else
- result.success = false
end
result
end
- def set_attributes(attributes, wp)
- attributes_service_class
- .new(user:,
- model: wp,
- contract_class:)
- .call(attributes)
+ def set_templated_subject(work_package)
+ return true unless work_package.type&.replacement_pattern_defined_for?(:subject)
+
+ work_package.subject = work_package.type.enabled_patterns[:subject].resolve(work_package)
+ work_package.save
+ end
+
+ def set_attributes(attributes, work_package)
+ attributes_service_class.new(user:, model: work_package, contract_class:).call(attributes)
end
def reschedule_related(work_package)
- result = WorkPackages::SetScheduleService
- .new(user:, work_package:)
- .call
+ result = WorkPackages::SetScheduleService.new(user:, work_package:).call
result.self_and_dependent.each do |r|
unless r.result.save
@@ -100,9 +99,7 @@ class WorkPackages::CreateService < BaseServices::BaseCallable
def set_user_as_watcher(work_package)
# We don't care if it fails here. If it does
# the user simply does not become watcher
- Services::CreateWatcher
- .new(work_package, user)
- .run(send_notifications: false)
+ Services::CreateWatcher.new(work_package, user).run(send_notifications: false)
end
def attributes_service_class
diff --git a/app/services/work_packages/set_attributes_service.rb b/app/services/work_packages/set_attributes_service.rb
index cd1118d965a..b7fe5d9312f 100644
--- a/app/services/work_packages/set_attributes_service.rb
+++ b/app/services/work_packages/set_attributes_service.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -43,6 +45,13 @@ class WorkPackages::SetAttributesService < BaseServices::SetAttributes
end
set_custom_attributes(attributes)
+ mark_templated_subject
+ end
+
+ def mark_templated_subject
+ if work_package.type&.replacement_pattern_defined_for?(:subject)
+ work_package.subject = I18n.t("work_packages.templated_subject_hint", type: work_package.type.name)
+ end
end
def set_static_attributes(attributes)
@@ -298,15 +307,14 @@ class WorkPackages::SetAttributesService < BaseServices::SetAttributes
def set_version_to_nil
if work_package.version &&
- work_package.project &&
- work_package.project.shared_versions.exclude?(work_package.version)
+ work_package.project&.shared_versions&.exclude?(work_package.version)
work_package.version = nil
end
end
def set_parent_to_nil
if !Setting.cross_project_work_package_relations? &&
- !work_package.parent_changed?
+ !work_package.parent_changed?
work_package.parent = nil
end
@@ -368,7 +376,7 @@ class WorkPackages::SetAttributesService < BaseServices::SetAttributes
def new_start_date_from_parent
return unless work_package.parent_id_changed? &&
- work_package.parent
+ work_package.parent
work_package.parent.soonest_start
end
diff --git a/app/services/work_packages/update_service.rb b/app/services/work_packages/update_service.rb
index 4788e737423..bed33bd2214 100644
--- a/app/services/work_packages/update_service.rb
+++ b/app/services/work_packages/update_service.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
#-- copyright
# OpenProject is an open source project management software.
# Copyright (C) the OpenProject GmbH
@@ -39,7 +41,14 @@ class WorkPackages::UpdateService < BaseServices::Update
private
+ def set_templated_attributes
+ model.type.enabled_patterns.each do |key, pattern|
+ model.public_send(:"#{key}=", pattern.resolve(model))
+ end
+ end
+
def after_perform(service_call)
+ set_templated_attributes
update_related_work_packages(service_call)
cleanup(service_call.result)
diff --git a/app/views/account/_auth_providers.html.erb b/app/views/account/_auth_providers.html.erb
index f399507f033..056390f26cc 100644
--- a/app/views/account/_auth_providers.html.erb
+++ b/app/views/account/_auth_providers.html.erb
@@ -37,15 +37,15 @@ See COPYRIGHT and LICENSE files for more details.
# * http://stackoverflow.com/questions/13112430/find-loaded-providers-for-omniauth
auth_provider_html = call_hook :view_account_login_auth_provider
no_pwd = OpenProject::Configuration.disable_password_login?
-pclass = no_pwd ? 'no-pwd' : ''
-wclass = local_assigns[:wide] ? 'wide' : ''
+pclass = no_pwd ? "no-pwd" : ""
+wclass = local_assigns[:wide] ? "wide" : ""
%>
<% if auth_provider_html.strip != '' %>
diff --git a/app/views/account/_login.html.erb b/app/views/account/_login.html.erb
index 802e4f29077..698cd87df3d 100644
--- a/app/views/account/_login.html.erb
+++ b/app/views/account/_login.html.erb
@@ -28,46 +28,48 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
<% if Setting.lost_password? %>
- <%= link_to t(:label_password_lost), {controller: '/account', action: 'lost_password'} %>
+ <%= link_to t(:label_password_lost), { controller: "/account", action: "lost_password" } %>
<% end %>
<% if Setting::Autologin.enabled? && Setting::SelfRegistration.enabled? %>
<%# show here if autologin is enabled, otherwise below login field %>
- <%= ' '.html_safe if Setting.lost_password? %>
+ <%= " ".html_safe if Setting.lost_password? %>
<%= link_to t(:label_register),
- account_register_path,
- title: t(:label_register) %>
+ account_register_path,
+ title: t(:label_register) %>
<% end %>
@@ -77,10 +79,10 @@ See COPYRIGHT and LICENSE files for more details.
+ value="<%= t(:button_login) %>" class="button -primary button_no-margin" tabindex="1">
- <%= render partial: 'account/auth_providers' %>
+ <%= render partial: "account/auth_providers" %>
<% end %>
diff --git a/app/views/account/_omniauth_login.html.erb b/app/views/account/_omniauth_login.html.erb
index 8e15ba11647..69cdef53a79 100644
--- a/app/views/account/_omniauth_login.html.erb
+++ b/app/views/account/_omniauth_login.html.erb
@@ -28,5 +28,5 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
diff --git a/app/views/admin/backups/show.html.erb b/app/views/admin/backups/show.html.erb
index b1bcd6f8846..cd098e289e1 100644
--- a/app/views/admin/backups/show.html.erb
+++ b/app/views/admin/backups/show.html.erb
@@ -41,14 +41,14 @@ See COPYRIGHT and LICENSE files for more details.
- <% Token::Backup.all.includes(:user).each do |token| %>
+ <% Token::Backup.includes(:user).each do |token| %>
- Starting with OpenProject 12.0, PostgreSQL 13 is required to use OpenProject.
-
- We have prepared #{static_link_to(:postgres_13_upgrade, label: 'upgrade guides for all installation methods')}.
- You can perform the upgrade ahead of the release at any time by following the guides.
-
+ if OpenProject::Database.version_deprecated?
+ value = <<~STR.html_safe
+
+ Starting with OpenProject 12.0, PostgreSQL 13 is required to use OpenProject.
+
+ We have prepared #{static_link_to(:postgres_13_upgrade, label: 'upgrade guides for all installation methods')}.
+ You can perform the upgrade ahead of the release at any time by following the guides.
+
STR
- component.with_attribute(key: 'Deprecation warning', value:)
- end
+ component.with_attribute(key: "Deprecation warning", value:)
+ end
-
- if (updated_on = OpenProject::VERSION.updated_on).present?
- component.with_attribute(key: t(:label_last_change_on), value: format_time(updated_on))
- end
-end %>
+ if (updated_on = OpenProject::VERSION.updated_on).present?
+ component.with_attribute(key: t(:label_last_change_on), value: format_time(updated_on))
+ end
+ end %>
<%= render(AttributeGroups::AttributeGroupComponent.new) do |component|
- component.with_header(title: I18n.t(:label_system))
+ component.with_header(title: I18n.t(:label_system))
- @checklist.each do |label, result|
- aria_label = result ? t(:general_text_Yes) : t(:general_text_No)
- icon = result ? 'check-circle-fill' : 'circle'
- value = render Primer::Beta::Octicon.new(icon:, "aria-label": aria_label)
- component.with_attribute(key: I18n.t(label), value:)
- end
-end %>
+ @checklist.each do |label, result|
+ aria_label = result ? t(:general_text_Yes) : t(:general_text_No)
+ icon = result ? "check-circle-fill" : "circle"
+ value = render Primer::Beta::Octicon.new(icon:, "aria-label": aria_label)
+ component.with_attribute(key: I18n.t(label), value:)
+ end
+ end %>
<% @storage_information.each_with_index do |(_, entries), i| %>
<%=
render(AttributeGroups::AttributeGroupComponent.new) do |component|
component.with_header(title: t(:label_storage_group, identifier: i + 1))
- component.with_attribute(key: t(:label_storage_for),
- value: safe_join(entries[:labels], ' '.html_safe))
+ component.with_attribute(
+ key: t(:label_storage_for),
+ value: safe_join(entries[:labels], " ".html_safe)
+ )
- component.with_attribute(key: t(:label_storage_free_space),
- value: number_to_human_size(entries[:data][:free], precision: 2))
+ component.with_attribute(
+ key: t(:label_storage_free_space),
+ value: number_to_human_size(entries[:data][:free], precision: 2)
+ )
value = number_to_human_size(entries[:data][:used], precision: 2)
value += "(#{entries[:data][:percent_used].round(2)})"
component.with_attribute(key: t(:label_storage_used_space), value:)
- end %>
+ end
+ %>
<% end %>
<%= call_hook(:view_admin_info_bottom) %>
diff --git a/app/views/admin/plugins.html.erb b/app/views/admin/plugins.html.erb
index 9d431a89396..25ded5c46fe 100644
--- a/app/views/admin/plugins.html.erb
+++ b/app/views/admin/plugins.html.erb
@@ -31,8 +31,10 @@ See COPYRIGHT and LICENSE files for more details.
<%=
render(Primer::OpenProject::PageHeader.new) do |header|
header.with_title { t(:label_plugins) }
- header.with_breadcrumbs([{ href: admin_index_path, text: t(:label_administration) },
- t(:label_plugins) ])
+ header.with_breadcrumbs(
+ [{ href: admin_index_path, text: t(:label_administration) },
+ t(:label_plugins)]
+ )
end
%>
@@ -50,7 +52,7 @@ See COPYRIGHT and LICENSE files for more details.
- <%= render partial: 'av_form', locals: { selected: Setting.antivirus_scan_mode } %>
- <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %>
+ <%= render partial: "av_form", locals: { selected: Setting.antivirus_scan_mode } %>
+ <%= styled_button_tag t(:button_save), class: "-primary -with-icon icon-checkmark" %>
<% end %>
diff --git a/app/views/admin/settings/virus_scanning_settings/upsale.html.erb b/app/views/admin/settings/virus_scanning_settings/upsale.html.erb
index 77f09925ecc..e40998cbf55 100644
--- a/app/views/admin/settings/virus_scanning_settings/upsale.html.erb
+++ b/app/views/admin/settings/virus_scanning_settings/upsale.html.erb
@@ -27,11 +27,11 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
-<% html_title t(:label_administration), t('settings.antivirus.title') %>
+<% html_title t(:label_administration), t("settings.antivirus.title") %>
-<%= render template: 'common/upsale',
+<%= render template: "common/upsale",
locals: {
- feature_title: t('settings.antivirus.title'),
- feature_description: t('settings.antivirus.upsale.description'),
- feature_reference: 'antivirus_scanning'
+ feature_title: t("settings.antivirus.title"),
+ feature_description: t("settings.antivirus.upsale.description"),
+ feature_reference: "antivirus_scanning"
} %>
diff --git a/app/views/admin/settings/work_package_priorities/edit.html.erb b/app/views/admin/settings/work_package_priorities/edit.html.erb
new file mode 100644
index 00000000000..48ae3a3131b
--- /dev/null
+++ b/app/views/admin/settings/work_package_priorities/edit.html.erb
@@ -0,0 +1,48 @@
+<%#-- 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.v
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<% priorities_label = IssuePriority.model_name.human(count: :other) %>
+<% html_title t(:label_administration), priorities_label %>
+
+<%=
+ render(Primer::OpenProject::PageHeader.new) do |header|
+ header.with_title { @enumeration.name }
+ header.with_breadcrumbs(
+ [
+ { href: admin_index_path, text: t("label_administration") },
+ { href: admin_settings_work_packages_general_path, text: t(:label_work_package_plural) },
+ { href: url_for(action: :index), text: @enumeration.class.model_name.human(count: :other) },
+ @enumeration.name
+ ]
+ )
+ end
+%>
+
+<%= primer_form_with(model: @enumeration, url: url_for(action: :update, id: @enumeration)) do |f| %>
+ <%= render(Admin::Enumerations::ItemForm.new(f)) %>
+<% end %>
diff --git a/app/views/admin/settings/work_package_priorities/index.html.erb b/app/views/admin/settings/work_package_priorities/index.html.erb
new file mode 100644
index 00000000000..85786b9e843
--- /dev/null
+++ b/app/views/admin/settings/work_package_priorities/index.html.erb
@@ -0,0 +1,46 @@
+<%#-- 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.
+
+++#%>
+
+<% priorities_label = IssuePriority.model_name.human(count: :other) %>
+<% html_title t(:label_administration), priorities_label %>
+
+<%=
+ render(Primer::OpenProject::PageHeader.new) do |header|
+ header.with_title { priorities_label }
+ header.with_breadcrumbs(
+ [
+ { href: admin_index_path, text: t("label_administration") },
+ { href: admin_settings_work_packages_general_path, text: t(:label_work_package_plural) },
+ priorities_label
+ ]
+ )
+ end
+%>
+
+<%= render(index_component_class.new(enumerations: @enumerations)) %>
diff --git a/app/views/admin/settings/work_package_priorities/new.html.erb b/app/views/admin/settings/work_package_priorities/new.html.erb
new file mode 100644
index 00000000000..31a3b54415f
--- /dev/null
+++ b/app/views/admin/settings/work_package_priorities/new.html.erb
@@ -0,0 +1,46 @@
+<%#-- 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.v
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<% html_title t(:label_administration), I18n.t("projects.settings.work_package_priorities.new_label") %>
+
+<%=
+ render(Primer::OpenProject::PageHeader.new) do |header|
+ header.with_title { I18n.t("projects.settings.work_package_priorities.new_label") }
+ header.with_breadcrumbs(
+ [
+ { href: admin_index_path, text: t("label_administration") },
+ { href: admin_settings_work_package_priorities_path, text: IssuePriority.model_name.human(count: :other) },
+ I18n.t("projects.settings.work_package_priorities.new_label")
+ ]
+ )
+ end
+%>
+
+<%= primer_form_with(model: @enumeration, scope: :enumeration, url: url_for(action: :create)) do |f| %>
+ <%= render(Admin::Enumerations::ItemForm.new(f)) %>
+<% end %>
diff --git a/app/views/admin/settings/work_package_priorities/reassign.html.erb b/app/views/admin/settings/work_package_priorities/reassign.html.erb
new file mode 100644
index 00000000000..c8ec79750eb
--- /dev/null
+++ b/app/views/admin/settings/work_package_priorities/reassign.html.erb
@@ -0,0 +1,48 @@
+<%#-- 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.v
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<% priorities_label = IssuePriority.model_name.human(count: :other) %>
+<% html_title t(:label_administration), priorities_label %>
+
+<%=
+ render(Primer::OpenProject::PageHeader.new) do |header|
+ header.with_title { @enumeration.name }
+ header.with_breadcrumbs(
+ [
+ { href: admin_index_path, text: t("label_administration") },
+ { href: admin_settings_work_packages_general_path, text: t(:label_work_package_plural) },
+ { href: url_for(action: :index), text: @enumeration.class.model_name.human(count: :other) },
+ @enumeration.name
+ ]
+ )
+ end
+%>
+
+<%= primer_form_with(model: @enumeration, scope: :enumeration, url: url_for(action: :destroy, id: @enumeration), method: :delete) do |f| %>
+ <%= render(Admin::Enumerations::ReassignForm.new(f, other_enumerations: @other_enumerations)) %>
+<% end %>
diff --git a/app/views/admin/settings/work_packages_general/_enterprise_feature_hint.html.erb b/app/views/admin/settings/work_packages_general/_enterprise_feature_hint.html.erb
index 0072914c652..0dfed0a1db9 100644
--- a/app/views/admin/settings/work_packages_general/_enterprise_feature_hint.html.erb
+++ b/app/views/admin/settings/work_packages_general/_enterprise_feature_hint.html.erb
@@ -1,12 +1,12 @@
<% unless EnterpriseToken.allows_to?(ee_feature) %>
<% end -%>
@@ -79,7 +79,7 @@ See COPYRIGHT and LICENSE files for more details.
<%= line.nb_line_left %>
<%= line.nb_line_right %>
-
<%=to_utf8_for_attachments line.html_line %>
+
<%= to_utf8_for_attachments line.html_line %>
<% end -%>
diff --git a/app/views/common/_favicons.html.erb b/app/views/common/_favicons.html.erb
index 606ada14ec6..577efde303c 100644
--- a/app/views/common/_favicons.html.erb
+++ b/app/views/common/_favicons.html.erb
@@ -5,7 +5,7 @@
<% unless apply_custom_touch_icon? %>
<%# In the future we can add more sizes should we see 404 errors in the logs. %>
<%= favicon_link_tag OpenProject::CustomStyles::Design.apple_touch_icon_asset_path,
- rel: 'apple-touch-icon',
- type: 'image/png',
- sizes: '120x120' %>
+ rel: "apple-touch-icon",
+ type: "image/png",
+ sizes: "120x120" %>
<% end %>
diff --git a/app/views/common/_no_results.html.erb b/app/views/common/_no_results.html.erb
index 75c75f71264..59c13b87d74 100644
--- a/app/views/common/_no_results.html.erb
+++ b/app/views/common/_no_results.html.erb
@@ -27,7 +27,7 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
- <%= op_icon('icon-info1') %>
+ <%= op_icon("icon-info1") %>
<%= title_text %>
diff --git a/app/views/common/_tabs.html.erb b/app/views/common/_tabs.html.erb
index d451fb41ac0..532d369af58 100644
--- a/app/views/common/_tabs.html.erb
+++ b/app/views/common/_tabs.html.erb
@@ -32,7 +32,7 @@ See COPYRIGHT and LICENSE files for more details.
<% end %>
-<%= content_tag 'div',
- render(partial: selected_tab[:partial], locals: { f: f, tab: selected_tab } ),
+<%= content_tag "div",
+ render(partial: selected_tab[:partial], locals: { f: f, tab: selected_tab }),
id: "tab-content-#{selected_tab[:name]}",
- class: 'tab-content' %>
+ class: "tab-content" %>
diff --git a/app/views/common/error.html.erb b/app/views/common/error.html.erb
index ea265ef425a..c5d521ab212 100644
--- a/app/views/common/error.html.erb
+++ b/app/views/common/error.html.erb
@@ -27,6 +27,6 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
-<%= call_hook(:view_common_error_details, { params: params, project: ((defined? @project) ? @project : nil) }) %>
+<%= call_hook(:view_common_error_details, { params: params, project: (defined?(@project) ? @project : nil) }) %>
<% html_title h(status) %>
diff --git a/app/views/common/list_attachments.json.erb b/app/views/common/list_attachments.json.erb
index 2c600e32a3b..f8f26dad3fb 100644
--- a/app/views/common/list_attachments.json.erb
+++ b/app/views/common/list_attachments.json.erb
@@ -28,10 +28,10 @@ See COPYRIGHT and LICENSE files for more details.
++#%>
<%= attachments.select { |a| a.readable? and a.visible? }
- .map { |a| { content_type: CGI::escape_html(a.content_type),
- filename: CGI::escape_html(a.filename),
- description: CGI::escape_html(a.description),
- url: url_for(controller: '/attachments', action: 'show', id: a, filename: a.filename),
- is_image: !!a.image? # doing the !! as image? for whatever reason returns null or a number
- }
- }.to_json.html_safe %>
+ .map do |a|
+ { content_type: CGI::escape_html(a.content_type),
+ filename: CGI::escape_html(a.filename),
+ description: CGI::escape_html(a.description),
+ url: url_for(controller: "/attachments", action: "show", id: a, filename: a.filename),
+ is_image: !!a.image? } # doing the !! as image? for whatever reason returns null or a number
+ end.to_json.html_safe %>
diff --git a/app/views/common/upsale.html.erb b/app/views/common/upsale.html.erb
index 227ee9e63f1..0ec58904a67 100644
--- a/app/views/common/upsale.html.erb
+++ b/app/views/common/upsale.html.erb
@@ -12,11 +12,11 @@