[pull] dev from opf:dev

.git-blame-ignore-revs

@@ -5,8 +5,9 @@
 21a696ef9b170e14ad2daf53364a4c2113822c2f
 # Update copyright information for 2024
 c795874f7f281297bbd3bad2fdb58b24cb4ce624
-# switch to double quotes
+# rubocop autocorrections
 f3c99ee5dded81ad55f2b6f3706216d5fa765677
 5c72ea0046a6b5230bf456f55a296ed6fd579535
 9e4934cd0a468f46d8f0fc0f11ebc2d4216f789c
 6678cab48d443b5782fa93b171d62093819ee4fc
+fa5d03eae00bc8931f99598a74ffd76e0cbca3da

.github/workflows/rubocop-core.yml

@@ -9,14 +9,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Fetch all commits for PR branch plus head commit of base branch
-        run: |
-          # fetch all commits of the PR branch
-          git fetch --shallow-exclude "${{ github.base_ref }}" origin "${{ github.ref }}"
-          # fix for "fatal: error in object: unshallow"
-          git repack -d
-          # fetch head commit of base branch
-          git fetch --deepen 1 origin "${{ github.ref }}"
+        with:
+          fetch-depth: 2 # we are comparing PR merge head with base
       - uses: ruby/setup-ruby@v1
       - uses: opf/action-rubocop@master
         with:

Gemfile

@@ -384,6 +384,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-octicons", "~>19.12.0"
-gem "openproject-octicons_helper", "~>19.12.0"
-gem "openproject-primer_view_components", "~>0.31.0"
+gem "openproject-octicons", "~>19.13.0"
+gem "openproject-octicons_helper", "~>19.13.0"
+gem "openproject-primer_view_components", "~>0.32.1"

Gemfile.lock

@@ -670,7 +670,7 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    lefthook (1.6.12)
+    lefthook (1.6.14)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -767,12 +767,12 @@ GEM
       validate_email
       validate_url
       webfinger (~> 2.0)
-    openproject-octicons (19.12.0)
-    openproject-octicons_helper (19.12.0)
+    openproject-octicons (19.13.0)
+    openproject-octicons_helper (19.13.0)
       actionview
-      openproject-octicons (= 19.12.0)
+      openproject-octicons (= 19.13.0)
       railties
-    openproject-primer_view_components (0.31.0)
+    openproject-primer_view_components (0.32.1)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.12.0)
@@ -790,7 +790,7 @@ GEM
     parallel (1.24.0)
     parallel_tests (4.7.1)
       parallel
-    parser (3.3.1.0)
+    parser (3.3.2.0)
       ast (~> 2.4.1)
       racc
     pdf-core (0.9.0)
@@ -967,7 +967,7 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.13.1)
-    rubocop (1.64.0)
+    rubocop (1.64.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -1262,10 +1262,10 @@ DEPENDENCIES
   openproject-job_status!
   openproject-ldap_groups!
   openproject-meeting!
-  openproject-octicons (~> 19.12.0)
-  openproject-octicons_helper (~> 19.12.0)
+  openproject-octicons (~> 19.13.0)
+  openproject-octicons_helper (~> 19.13.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.31.0)
+  openproject-primer_view_components (~> 0.32.1)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!

app/components/admin/attachments_settings_header_component.html.erb

@@ -29,25 +29,23 @@ 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| %>
-  <% 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")]) %>
-<% end %>
-
-<%= render(Primer::Alpha::TabNav.new(label: "label")) do |component|
-  component.with_tab(selected: @selected == 1, href: admin_settings_attachments_path) do |tab|
-    tab.with_text { t("settings.general") }
-  end
-  component.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?)
-    component.with_tab(selected: @selected == 3, href: admin_quarantined_attachments_path) do |tab|
-      tab.with_text { t(:"antivirus_scan.quarantined_attachments.title") }
+<%= render(Primer::OpenProject::PageHeader.new(border_bottom: 0)) 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") }
+      end
     end
   end
-end
-%>
+end %>

app/components/members/table_component.rb

@@ -43,7 +43,7 @@ class TableComponent < ::TableComponent # rubocop:disable OpenProject/AddPreview
     sortable_columns :name, :mail, :status
 
     def apply_sort(model)
-      apply_member_scopes super(model)
+      apply_member_scopes super
     end
 
     def apply_member_scopes(model)

app/components/members/user_filter_component.rb

@@ -128,7 +128,7 @@ def filter_shares(query, role_id)
       end
 
       def apply_filters(params, query)
-        super(params, query)
+        super
         filter_shares(query, params[:shared_role_id]) if params.key?(:shared_role_id)
 
         query

app/components/projects/configure_view_modal_component.html.erb

@@ -10,12 +10,11 @@
     <%= primer_form_with(
           url: projects_path,
           id: QUERY_FORM_ID,
-          method: :get,
-          data: {
-            controller: "params-from-query",
-            'application-target': "dynamic",
-            'params-from-query-allowed-value': '["filters", "query_id", "page", "per_page"]'
-          }) do |form| %>
+          method: :get
+        ) do |form| %>
+      <% helpers.projects_query_params.except(:columns, :sortBy).each do |name, value| %>
+        <%= hidden_field_tag name, value %>
+      <% end %>
       <%= render(Primer::Alpha::TabPanels.new(label: "label")) do |tab_panel| %>
         <% tab_panel.with_tab(selected: true, id: "tab-selects") do |tab| %>
           <% tab.with_text { I18n.t("label_columns") } %>

app/components/projects/export_list_modal_component.html.erb

@@ -2,14 +2,10 @@
                                      id: MODAL_ID)) do |d| %>
   <% d.with_header(variant: :large) %>
   <% d.with_body do %>
-    <ul class="op-export-options"
-        data-controller="params-from-query"
-        data-application-target="dynamic"
-        data-params-from-query-all-anchors-value="true"
-        data-params-from-query-allowed-value='["query_id", "filters", "sortBy", "columns"]'>
+    <ul class="op-export-options">
       <% helpers.supported_export_formats.each do |key| %>
         <li class="op-export-options--option">
-          <%= link_to url_for(action: 'index', format: key),
+          <%= link_to projects_path(format: key, **helpers.projects_query_params.except(:page, :per_page)),
                       class: 'op-export-options--option-link' do %>
             <%= helpers.op_icon("icon-big icon-export-#{key}") %>
             <span class="op-export-options--option-label"><%= t("export.format.#{key}") %></span>

app/components/projects/index_page_header_component.html.erb

@@ -9,15 +9,15 @@
           header:,
           message: t("lists.can_be_saved"),
           label: t("button_save"),
-          href: projects_query_path(query),
+          href: projects_query_path(query, projects_query_params),
           method: :patch
         )
       elsif can_save_as?
         header_save_action(
           header:,
           message: t("lists.can_be_saved_as"),
           label: t("button_save_as"),
-          href: new_projects_query_path
+          href: new_projects_query_path(projects_query_params)
         )
       end
 
@@ -59,11 +59,20 @@
         end
 
         if can_save?
-          menu_save_item(menu:, label: t('button_save'), href: projects_query_path(query), method: :patch)
+          menu_save_item(
+            menu:,
+            label: t('button_save'),
+            href: projects_query_path(query, projects_query_params),
+            method: :patch
+          )
         end
 
         if may_save_as?
-          menu_save_item(menu:, label: t('button_save_as'), href: new_projects_query_path)
+          menu_save_item(
+            menu:,
+            label: t('button_save_as'),
+            href: new_projects_query_path(projects_query_params)
+          )
         end
 
         menu.with_item(
@@ -123,15 +132,15 @@
     render(Primer::OpenProject::PageHeader.new) do |header|
       header.with_title(data: { 'test-selector': 'project-query-name'}) do
         primer_form_with(model: query,
-                         url: @query.new_record? ? projects_queries_path : projects_query_path(@query),
+                         url: @query.new_record? ? projects_queries_path(projects_query_params) : projects_query_path(@query, projects_query_params),
                          scope: 'query',
-                         data: {
-                           controller: "params-from-query",
-                           'application-target': "dynamic",
-                           'params-from-query-allowed-value': '["filters", "columns", "query_id", "sortBy"]'
-                         },
                          id: 'project-save-form') do |f|
-          render(Queries::Projects::Form.new(f, query:))
+          render(
+            Queries::Projects::Form.new(
+              f,
+              cancel_url: projects_path(**projects_query_params, **{ query_id: query.id }.compact)
+            )
+          )
         end
       end
       header.with_breadcrumbs(breadcrumb_items)

app/components/projects/index_page_header_component.rb

@@ -39,6 +39,8 @@ class Projects::IndexPageHeaderComponent < ApplicationComponent
 
   STATE_OPTIONS = %i[show edit rename].freeze
 
+  delegate :projects_query_params, to: :helpers
+
   def initialize(current_user:, query:, params:, state: :show)
     super
 
@@ -136,12 +138,7 @@ def header_save_action(header:, message:, label:, href:, method: nil)
       mobile_icon: nil, # Do not show on mobile as it is already part of the menu
       mobile_label: nil,
       href:,
-      data: {
-        method:,
-        controller: "params-from-query",
-        "application-target": "dynamic",
-        "params-from-query-allowed-value": '["filters", "columns", "sortBy", "query_id"]'
-      }.compact
+      data: { method: }
     ) do
       render(
         Primer::Beta::Octicon.new(
@@ -159,12 +156,7 @@ def menu_save_item(menu:, label:, href:, method: nil)
       label:,
       href:,
       content_arguments: {
-        data: {
-          method:,
-          controller: "params-from-query",
-          "application-target": "dynamic",
-          "params-from-query-allowed-value": '["filters", "columns", "sortBy", "query_id"]'
-        }.compact
+        data: { method: }
       }
     ) do |item|
       item.with_leading_visual_icon(icon: :"op-save")

app/components/projects/row_component.rb

@@ -227,7 +227,7 @@ def action_menu
                          label:,
                          test_selector: "project-list-row--action-menu-item",
                          content_arguments: button_options) do |item|
-            item.with_leading_visual_icon(icon:)
+            item.with_leading_visual_icon(icon:) if icon
           end
         end
       end

app/components/projects/table_component.html.erb

@@ -44,11 +44,7 @@ See COPYRIGHT and LICENSE files for more details.
               <% if column.attribute == :hierarchy %>
                 <th id="project-table--hierarchy-header">
                   <div class="generic-table--sort-header-outer generic-table--sort-header-outer_no-highlighting">
-                    <div class="generic-table--sort-header"
-                         data-controller="params-from-query"
-                         data-application-target="dynamic"
-                         data-params-from-query-all-anchors-value="true"
-                         data-params-from-query-allowed-value='["query_id", "per_page", "filters", "columns"]'>
+                    <div class="generic-table--sort-header">
                       <%= content_tag :a,
                                       helpers.op_icon("icon-hierarchy"),
                                       href: href_only_when_not_sort_lft,
@@ -102,10 +98,5 @@ See COPYRIGHT and LICENSE files for more details.
 </div>
 
 <% if paginated? %>
-  <div data-controller="params-from-query"
-       data-application-target="dynamic"
-       data-params-from-query-all-anchors-value="true"
-       data-params-from-query-allowed-value='["query_id", "columns"]'>
-    <%= helpers.pagination_links_full model, { blocked_url_params: [:query_id, :columns] } %>
-  </div>
+  <%= helpers.pagination_links_full model, allowed_params: %i[query_id filters columns sortBy] %>
 <% end %>