kp-forks · pull · Jun 29, 2024 · Jun 18, 2024 · Jun 19, 2024 · Jun 20, 2024
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -11,3 +11,4 @@ f3c99ee5dded81ad55f2b6f3706216d5fa765677
 9e4934cd0a468f46d8f0fc0f11ebc2d4216f789c
 6678cab48d443b5782fa93b171d62093819ee4fc
 fa5d03eae00bc8931f99598a74ffd76e0cbca3da
+b10e6d718cc49e3574837d97fab268e3ecb3fcbd
diff --git a/.github/workflows/rubocop-core.yml b/.github/workflows/rubocop-core.yml
@@ -8,14 +8,20 @@ jobs:
     name: rubocop
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 2 # we are comparing PR merge head with base
+      - uses: actions/checkout@v4
+      - name: Fetch head commit of base branch
+        run: git fetch --depth 1 origin ${{ github.event.pull_request.base.sha }}
       - uses: ruby/setup-ruby@v1
       - uses: opf/action-rubocop@master
         with:
           github_token: ${{ secrets.github_token }}
           rubocop_version: gemfile
-          rubocop_extensions: rubocop-inflector:gemfile rubocop-performance:gemfile rubocop-rails:gemfile rubocop-rspec:gemfile
+          rubocop_extensions: >
+            rubocop-capybara:gemfile
+            rubocop-factory_bot:gemfile
+            rubocop-performance:gemfile
+            rubocop-rails:gemfile
+            rubocop-rspec:gemfile
+            rubocop-rspec_rails:gemfile
           reporter: github-pr-check
           only_changed: true
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
@@ -23,7 +23,11 @@ jobs:
   all:
     name: Units + Features
     if: github.repository == 'opf/openproject'
-    runs-on: runs-on,runner=32cpu-linux-x64,run-id=${{ github.run_id }}
+    runs-on:
+      labels:
+        - runs-on
+        - runner=32cpu-linux-x64
+        - run-id=${{ github.run_id }}
     timeout-minutes: 40
     env:
       DOCKER_BUILDKIT: 1

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -199,6 +199,10 @@ RSpec/DescribeClass:
     - 'spec/features/**/*.rb'
     - 'modules/*/spec/features/**/*.rb'
 
+# Allow number HTTP status codes in specs
+RSpecRails/HttpStatus:
+  Enabled: false
+
 # dynamic finders cop clashes with capybara ID cop
 Rails/DynamicFindBy:
   Enabled: true
@@ -236,10 +240,6 @@ RSpec/DescribeMethod:
 RSpec/SpecFilePathFormat:
   IgnoreMethods: true
 
-# Disable deprecated cop
-RSpec/FilePath:
-  Enabled: false
-
 # Prevent  "fit" or similar to be committed
 RSpec/Focus:
   Enabled: true

diff --git a/Gemfile b/Gemfile
@@ -158,7 +158,7 @@ gem "structured_warnings", "~> 0.4.0"
 gem "airbrake", "~> 13.0.0", require: false
 
 gem "markly", "~> 0.10" # another markdown parser like commonmarker, but with AST support used in PDF export
-gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "8772c791a21819751c0d111be903b3b44ef7d862"
+gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "32603f09a249999a00e8ca23eb17215b46a26c0f"
 gem "prawn", "~> 2.4"
 gem "ttfunk", "~> 1.7.0" # remove after https://github.com/prawnpdf/prawn/issues/1346 resolved.
 
@@ -210,6 +210,7 @@ gem "validate_url"
 
 # Storages support code
 gem "dry-container"
+gem "dry-monads"
 
 # ActiveRecord extension which adds typecasting to store accessors
 gem "store_attribute", "~> 1.0"
@@ -349,7 +350,7 @@ end
 gem "bootsnap", "~> 1.18.0", require: false
 
 # API gems
-gem "grape", "~> 2.0.0"
+gem "grape", "~> 2.1.0"
 gem "grape_logging", "~> 1.8.4"
 gem "roar", "~> 1.2.0"
 
@@ -390,4 +391,4 @@ end
 
 gem "openproject-octicons", "~>19.14.1"
 gem "openproject-octicons_helper", "~>19.14.1"
-gem "openproject-primer_view_components", "~>0.34.0"
+gem "openproject-primer_view_components", "~>0.35.2"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,16 +8,16 @@ GIT
 
 GIT
   remote: https://github.com/opf/md-to-pdf
-  revision: 8772c791a21819751c0d111be903b3b44ef7d862
-  ref: 8772c791a21819751c0d111be903b3b44ef7d862
+  revision: 32603f09a249999a00e8ca23eb17215b46a26c0f
+  ref: 32603f09a249999a00e8ca23eb17215b46a26c0f
   specs:
-    md_to_pdf (0.0.27)
+    md_to_pdf (0.1.1)
       color_conversion (~> 0.1)
       front_matter_parser (~> 1.0)
       json-schema (~> 4.3)
       markly (~> 0.10)
       matrix (~> 0.4)
-      nokogiri (~> 1.1)
+      nokogiri (~> 1.16)
       prawn (~> 2.4)
       prawn-table (~> 0.2)
       text-hyphen (~> 1.5)
@@ -323,8 +323,8 @@ GEM
       activesupport (>= 6.1)
     acts_as_tree (2.9.1)
       activerecord (>= 3.0.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     aes_key_wrap (1.1.0)
     afm (0.2.2)
     airbrake (13.0.4)
@@ -342,17 +342,17 @@ GEM
       activerecord (>= 4.0.0, < 7.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.945.0)
-    aws-sdk-core (3.197.1)
+    aws-partitions (1.947.0)
+    aws-sdk-core (3.199.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.85.0)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-kms (1.87.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.152.3)
-      aws-sdk-core (~> 3, >= 3.197.0)
+    aws-sdk-s3 (1.154.0)
+      aws-sdk-core (~> 3, >= 3.199.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sdk-sns (1.77.0)
@@ -438,9 +438,9 @@ GEM
     css_parser (1.17.1)
       addressable
     csv (3.3.0)
-    cuprite (0.15)
+    cuprite (0.15.1)
       capybara (~> 3.0)
-      ferrum (~> 0.14.0)
+      ferrum (~> 0.15.0)
     daemons (1.4.1)
     dalli (3.2.8)
     date (3.3.4)
@@ -459,7 +459,7 @@ GEM
     disposable (0.6.3)
       declarative (>= 0.0.9, < 1.0.0)
       representable (>= 3.1.1, < 4)
-    doorkeeper (5.7.0)
+    doorkeeper (5.7.1)
       railties (>= 5)
     dotenv (3.1.2)
     dotenv-rails (3.1.2)
@@ -476,6 +476,10 @@ GEM
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0, < 2)
       zeitwerk (~> 2.6)
+    dry-monads (1.6.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
     dry-types (1.7.2)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
@@ -525,11 +529,11 @@ GEM
     faraday-net_http (3.1.0)
       net-http
     fastimage (2.3.1)
-    ferrum (0.14)
+    ferrum (0.15)
       addressable (~> 2.5)
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
-      websocket-driver (>= 0.6, < 0.8)
+      websocket-driver (~> 0.7)
     ffi (1.17.0)
     flamegraph (0.9.5)
     fog-aws (3.23.0)
@@ -591,13 +595,12 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grape (2.0.0)
-      activesupport (>= 5)
-      builder
+    grape (2.1.0)
+      activesupport (>= 6)
       dry-types (>= 1.1)
-      mustermann-grape (~> 1.0.0)
-      rack (>= 1.3.0)
-      rack-accept
+      mustermann-grape (~> 1.1.0)
+      rack (>= 2)
+      zeitwerk
     grape_logging (1.8.4)
       grape
       rack
@@ -670,7 +673,7 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    lefthook (1.6.17)
+    lefthook (1.6.18)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -694,7 +697,7 @@ GEM
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lookbook (2.3.1)
+    lookbook (2.3.2)
       activemodel
       css_parser
       htmlbeautifier (~> 1.3)
@@ -729,7 +732,7 @@ GEM
     multi_json (1.15.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    mustermann-grape (1.0.2)
+    mustermann-grape (1.1.0)
       mustermann (>= 1.0.0)
     mutex_m (0.2.0)
     net-http (0.4.1)
@@ -773,7 +776,7 @@ GEM
       actionview
       openproject-octicons (= 19.14.1)
       railties
-    openproject-primer_view_components (0.34.0)
+    openproject-primer_view_components (0.35.2)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.12.0)
@@ -829,7 +832,7 @@ GEM
       pry (>= 0.12.0)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.5)
+    public_suffix (6.0.0)
     puffing-billy (4.0.0)
       addressable (~> 2.5)
       em-http-request (~> 1.1, >= 1.1.0)
@@ -845,8 +848,6 @@ GEM
     raabro (1.4.0)
     racc (1.8.0)
     rack (2.2.9)
-    rack-accept (0.4.5)
-      rack (>= 0.4)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
     rack-cors (2.0.2)
@@ -1195,6 +1196,7 @@ DEPENDENCIES
   doorkeeper (~> 5.7.0)
   dotenv-rails
   dry-container
+  dry-monads
   email_validator (~> 2.2.3)
   equivalent-xml (~> 0.6)
   erb_lint
@@ -1211,7 +1213,7 @@ DEPENDENCIES
   good_job (= 3.26.2)
   google-apis-gmail_v1
   googleauth
-  grape (~> 2.0.0)
+  grape (~> 2.1.0)
   grape_logging (~> 1.8.4)
   grids!
   html-pipeline (~> 2.14.0)
@@ -1262,7 +1264,7 @@ DEPENDENCIES
   openproject-octicons (~> 19.14.1)
   openproject-octicons_helper (~> 19.14.1)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.34.0)
+  openproject-primer_view_components (~> 0.35.2)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!

diff --git a/app/components/_index.sass b/app/components/_index.sass
@@ -1,5 +1,5 @@
-@import "work_packages/share/modal_body_component"
-@import "work_packages/share/invite_user_form_component"
+@import "shares/modal_body_component"
+@import "shares/invite_user_form_component"
 @import "work_packages/progress/modal_body_component"
 @import "open_project/common/attribute_component"
 @import "filter/filters_component"

diff --git a/app/components/admin/attachments_settings_header_component.rb b/app/components/admin/attachments_settings_header_component.rb
@@ -31,7 +31,8 @@
 module Admin
   class AttachmentsSettingsHeaderComponent < ApplicationComponent
     def initialize(title:, selected:)
-      raise 'selected must 1, 2 or 3' if [1, 2, 3].exclude?(selected)
+      raise "selected must 1, 2 or 3" if [1, 2, 3].exclude?(selected)
+
       @title = title
       @selected = selected
     end

diff --git a/app/components/members/index_page_header_component.rb b/app/components/members/index_page_header_component.rb
@@ -31,7 +31,6 @@
 class Members::IndexPageHeaderComponent < ApplicationComponent
   include OpPrimer::ComponentHelpers
   include ApplicationHelper
-  include Menus::MembersHelper
 
   def initialize(project: nil)
     super
@@ -77,7 +76,7 @@ def current_query
     query_name = nil
     menu_header = nil
 
-    first_level_menu_items.find do |section|
+    Members::Menu.new(project: @project, params:).menu_items.find do |section|
       section.children.find do |menu_query|
         if !!menu_query.selected
           query_name = menu_query.title

diff --git a/app/components/members/user_filter_component.rb b/app/components/members/user_filter_component.rb
@@ -103,11 +103,11 @@ def builtin_share_roles
       def mapped_shared_role_name(role)
         case role.builtin
         when Role::BUILTIN_WORK_PACKAGE_VIEWER
-          I18n.t("work_package.sharing.permissions.view")
+          I18n.t("work_package.permissions.view")
         when Role::BUILTIN_WORK_PACKAGE_COMMENTER
-          I18n.t("work_package.sharing.permissions.comment")
+          I18n.t("work_package.permissions.comment")
         when Role::BUILTIN_WORK_PACKAGE_EDITOR
-          I18n.t("work_package.sharing.permissions.edit")
+          I18n.t("work_package.permissions.edit")
         else
           role.name
         end

diff --git a/app/components/open_project/common/submenu_component.html.erb b/app/components/open_project/common/submenu_component.html.erb
@@ -31,7 +31,7 @@
           <% top_level_sidebar_menu_items.first.children.each do |menu_item| %>
             <li class="op-sidemenu--item" data-filter--filter-list-target="searchItem">
               <% selected = menu_item.selected ? 'selected' : '' %>
-              <a class="op-sidemenu--item-action <%= selected %>" href="<%= menu_item.href %>">
+              <a class="op-sidemenu--item-action <%= selected %>" href="<%= menu_item.href %>" data-test-selector="op-sidemenu--item-action">
                 <span class="op-sidemenu--item-title"><%= menu_item.title %></span>
               </a>
             </li>
@@ -60,7 +60,7 @@
           <% menu_item.children.each do |child_item| %>
             <li class="op-sidemenu--item" data-filter--filter-list-target="searchItem">
               <% selected = child_item.selected ? 'selected' : '' %>
-              <a class="op-sidemenu--item-action <%= selected %>" href="<%= child_item.href %>">
+              <a class="op-sidemenu--item-action <%= selected %>" href="<%= child_item.href %>" data-test-selector="op-sidemenu--item-action">
                 <span class="op-sidemenu--item-title"><%= child_item.title %></span>
               </a>
             </li>
@@ -75,9 +75,14 @@
       <%= render Primer::Beta::Button.new(scheme: :primary,
                                           tag: :a,
                                           href: @create_btn_options[:href],
+                                          test_selector: "#{@create_btn_options[:module_key]}--create-button",
                                           classes: "op-sidebar--footer-action") do |button|
         button.with_leading_visual_icon(icon: "plus")
-        @create_btn_options[:text]
+        if @create_btn_options[:btn_text].present?
+          @create_btn_options[:btn_text]
+        else
+          I18n.t("label_#{@create_btn_options[:module_key]}")
+        end
       end %>
     </div>
   <% end %>

diff --git a/app/components/projects/delete_list_modal_component.html.erb b/app/components/projects/delete_list_modal_component.html.erb
@@ -4,13 +4,12 @@
                                      data: { 'test-selector': MODAL_ID })) do |d| %>
   <% d.with_header(variant: :large, mb: 2) %>
   <% d.with_body { t(:'projects.lists.delete_modal.text') } %>
-
   <% d.with_footer do %>
     <%= render(Primer::Beta::Button.new(data: { "close-dialog-id": MODAL_ID })) { I18n.t(:button_cancel) } %>
-    <%= form_with(url: projects_query_path(query),
+    <%= form_with(url: project_query_path(query),
                   method: :delete) do %>
       <%= render(Primer::Beta::Button.new(scheme: :danger,
                                           type: :submit)) { I18n.t(:button_delete) } %>
-      <% end %>
+    <% end %>
   <% end %>
 <% end %>