Merge branch 'opf:dev' into dev

soft-cloud-dev · Aug 21, 2024 · 5127001 · 5127001
2 parents 4efa975 + 6fe005d
commit 5127001
Show file tree

Hide file tree

Showing 986 changed files with 5,943 additions and 4,099 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -22,6 +22,9 @@ browserslist
 !/docs/api/apiv3/tags
 !/docs/api/apiv3/components
 
+# Allow factories in case we use lookbook
+!/spec/factories
+
 extra
 features
 help

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,6 +1,9 @@
-<!-- Contributors: Please check our [PR guide](https://www.openproject.org/docs/development/code-review-guidelines/#preparing-your-pull-request) before opening a PR. -->
+# Ticket
+<!-- Provide the link to respective work package -->
+
+<!-- Contributors: Please check our PR guide: https://www.openproject.org/docs/development/code-review-guidelines/#preparing-your-pull-request before opening a PR. -->
 
-<!-- Reviewers: Please check our [Review guide](https://www.openproject.org/docs/development/code-review-guidelines/#reviewing) -->
+<!-- Reviewers: Please check our Review guide: https://www.openproject.org/docs/development/code-review-guidelines/#reviewing -->
 
 # What are you trying to accomplish?
 <!-- Provide a description of the changes. -->
@@ -13,9 +16,6 @@
      List any tradeoffs you made to take on or pay down tech debt.
      Describe any alternative approaches you considered and why you discarded them. -->
 
-# Ticket
-<!-- Provide the link to respective work package -->
-
 # Merge checklist
 
 - [ ] Added/updated tests

diff --git a/.github/workflows/i18n-tasks.yml b/.github/workflows/i18n-tasks.yml
@@ -0,0 +1,44 @@
+name: i18n-inconsistency-check
+
+on:
+  push:
+    branches:
+      - dev
+      - release/*
+    paths-ignore:
+      - 'docs/**'
+      - 'help/**'
+  pull_request:
+    types: [opened, reopened, synchronize]
+    paths-ignore:
+      - 'docs/**'
+      - 'help/**'
+      - 'packaging/**'
+      - '.pkgr.yml'
+
+permissions:
+  contents: read
+
+jobs:
+  i18n-tasks:
+    permissions:
+      contents: read
+    if: github.repository == 'opf/openproject'
+    name: I18n inconsistency check
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+
+      - name: Setup i18n-tasks
+        run: |
+          gem install i18n-tasks
+
+      - name: Run inconsistent translations check
+        run: |
+          i18n-tasks \
+            check-consistent-interpolations \
+            --config config/i18n-tasks-all-files.yml
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -211,6 +211,15 @@ Rails/DynamicFindBy:
   Whitelist:
     - find_by_login
 
+# Allow reorder to prevent find each cop triggering
+Rails/FindEach:
+  AllowedMethods:
+    - order
+    - reorder
+    - limit
+    - select
+    - lock
+
 # We have config.active_record.belongs_to_required_by_default = false ,
 # which means, we do have to declare presence validators on belongs_to relations.
 Rails/RedundantPresenceValidationOnBelongsTo:

diff --git a/Gemfile b/Gemfile
@@ -212,6 +212,7 @@ gem "validate_url"
 gem "dry-auto_inject"
 gem "dry-container"
 gem "dry-monads"
+gem "dry-validation"
 
 # ActiveRecord extension which adds typecasting to store accessors
 gem "store_attribute", "~> 1.0"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -342,16 +342,16 @@ GEM
       activerecord (>= 4.0.0, < 7.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.963.0)
-    aws-sdk-core (3.201.4)
+    aws-partitions (1.964.0)
+    aws-sdk-core (3.201.5)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-sigv4 (~> 1.9)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.88.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.157.0)
+    aws-sdk-s3 (1.158.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -470,12 +470,16 @@ GEM
     dry-auto_inject (1.0.1)
       dry-core (~> 1.0)
       zeitwerk (~> 2.6)
+    dry-configurable (1.2.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
     dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
     dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
     dry-inflector (1.1.0)
+    dry-initializer (3.1.1)
     dry-logic (1.5.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
@@ -484,13 +488,27 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
+    dry-schema (1.13.4)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
     dry-types (1.7.2)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
       dry-logic (~> 1.4)
       zeitwerk (~> 2.6)
+    dry-validation (1.10.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-schema (>= 1.12, < 2)
+      zeitwerk (~> 2.6)
     dumb_delegator (1.0.0)
     em-http-request (1.1.7)
       addressable (>= 2.3.4)
@@ -561,7 +579,7 @@ GEM
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
     front_matter_parser (1.0.1)
-    fugit (1.11.0)
+    fugit (1.11.1)
       et-orbi (~> 1, >= 1.2.11)
       raabro (~> 1.4)
     fuubar (2.5.1)
@@ -680,7 +698,7 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    lefthook (1.7.12)
+    lefthook (1.7.14)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -722,7 +740,7 @@ GEM
       net-pop
       net-smtp
     marcel (1.0.4)
-    markly (0.10.0)
+    markly (0.12.1)
     matrix (0.4.2)
     messagebird-rest (1.4.2)
     meta-tags (2.22.0)
@@ -734,7 +752,7 @@ GEM
     mini_magick (5.0.1)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.25.0)
+    minitest (5.25.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
     mustermann (3.0.2)
@@ -972,7 +990,7 @@ GEM
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.3)
+    rspec-rails (6.1.4)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -1032,7 +1050,7 @@ GEM
     rubyzip (2.3.2)
     safety_net_attestation (0.4.0)
       jwt (~> 2.0)
-    sanitize (6.1.2)
+    sanitize (6.1.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     secure_headers (6.5.0)
@@ -1046,7 +1064,7 @@ GEM
       websocket (~> 1.0)
     semantic (1.6.1)
     shoulda-context (2.0.0)
-    shoulda-matchers (6.3.1)
+    shoulda-matchers (6.4.0)
       activesupport (>= 5.2.0)
     signet (0.19.0)
       addressable (~> 2.8)
@@ -1123,7 +1141,8 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    vcr (6.2.0)
+    vcr (6.3.0)
+      base64
     view_component (3.13.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
@@ -1216,6 +1235,7 @@ DEPENDENCIES
   dry-auto_inject
   dry-container
   dry-monads
+  dry-validation
   email_validator (~> 2.2.3)
   equivalent-xml (~> 0.6)
   erb_lint

diff --git a/app/components/_index.sass b/app/components/_index.sass
@@ -7,5 +7,4 @@
 @import "open_project/common/submenu_component"
 @import "filter/filters_component"
 @import "projects/row_component"
-@import "settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component"
 @import "op_primer/border_box_table_component"
diff --git a/app/components/admin/attachments_settings_header_component.html.erb b/app/components/admin/attachments_settings_header_component.html.erb
@@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details.
 
 <% helpers.html_title t(:label_administration), @title %>
 
-<%= render(Primer::OpenProject::PageHeader.new(border_bottom: 0)) do |header|
+<%= 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") },

diff --git a/app/components/filter/filter_component.html.erb b/app/components/filter/filter_component.html.erb
@@ -113,15 +113,5 @@
         <%= submit_tag t('button_apply'), class: 'button -small -primary', name: nil %>
       </li>
     </ul>
-    <% unless EnterpriseToken.allows_to?(:custom_fields_in_projects_list)%>
-      <%=
-        helpers.angular_component_tag 'op-enterprise-banner',
-                                      inputs: {
-                                        collapsible: true,
-                                        textMessage: t('ee.upsale.project_filters.description_html'),
-                                        moreInfoLink: OpenProject::Static::Links.links[:enterprise_docs][:custom_field_projects][:href],
-                                      }
-      %>
-    <% end %>
   </fieldset>
 <% end %>
diff --git a/app/components/individual_principal_base_filter_component.rb b/app/components/individual_principal_base_filter_component.rb
@@ -8,7 +8,7 @@
 # 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-2017 Jean-Philippe Lang
+# 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

diff --git a/app/components/my/access_token/access_token_created_dialog_component.html.erb b/app/components/my/access_token/access_token_created_dialog_component.html.erb
@@ -1,6 +1,6 @@
 <%#-- copyright
 OpenProject is an open source project management software.
-Copyright (C) 2012-2024 the OpenProject GmbH
+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.

diff --git a/app/components/my/access_token/access_token_created_dialog_component.rb b/app/components/my/access_token/access_token_created_dialog_component.rb
@@ -1,6 +1,6 @@
 #-- copyright
 # OpenProject is an open source project management software.
-# Copyright (C) 2012-2024 the OpenProject GmbH
+# 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.

diff --git a/app/components/my/access_token/api/row_component.rb b/app/components/my/access_token/api/row_component.rb
@@ -2,7 +2,7 @@
 
 #-- copyright
 # OpenProject is an open source project management software.
-# Copyright (C) 2012-2023 the OpenProject GmbH
+# 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.

diff --git a/app/components/my/access_token/api/table_component.rb b/app/components/my/access_token/api/table_component.rb
@@ -2,7 +2,7 @@
 
 #-- copyright
 # OpenProject is an open source project management software.
-# Copyright (C) 2012-2023 the OpenProject GmbH
+# 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.

diff --git a/app/components/my/access_token/api_tokens_section_component.html.erb b/app/components/my/access_token/api_tokens_section_component.html.erb
@@ -1,6 +1,6 @@
 <%#-- copyright
 OpenProject is an open source project management software.
-Copyright (C) 2012-2024 the OpenProject GmbH
+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.

diff --git a/app/components/my/access_token/api_tokens_section_component.rb b/app/components/my/access_token/api_tokens_section_component.rb
@@ -1,6 +1,6 @@
 #-- copyright
 # OpenProject is an open source project management software.
-# Copyright (C) 2012-2024 the OpenProject GmbH
+# 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.

diff --git a/app/components/placeholder_users/placeholder_user_filter_component.rb b/app/components/placeholder_users/placeholder_user_filter_component.rb
@@ -6,7 +6,7 @@
 # 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-2017 Jean-Philippe Lang
+# 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

diff --git a/app/components/placeholder_users/row_component.rb b/app/components/placeholder_users/row_component.rb
@@ -6,7 +6,7 @@
 # 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-2017 Jean-Philippe Lang
+# 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

diff --git a/app/components/placeholder_users/table_component.rb b/app/components/placeholder_users/table_component.rb
@@ -6,7 +6,7 @@
 # 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-2017 Jean-Philippe Lang
+# 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

diff --git a/app/components/projects/index_page_header_component.rb b/app/components/projects/index_page_header_component.rb
@@ -65,9 +65,8 @@ def gantt_portfolio_project_ids
     @gantt_portfolio_project_ids ||= @query
                                      .results
                                      .where(active: true)
-                                     .select(:id)
-                                     .uniq
                                      .pluck(:id)
+                                     .uniq
   end
 
   def page_title