[pull] dev from opf:dev

.github/workflows/create-merge-release-into-dev-pr.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
     - id: find_latest_release
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.OPENPROJECT_CI_GH_TOKEN }}
         GITHUB_REPOSITORY: ${{ github.repository }}
       run: |
         BRANCH=$(curl -H "Authorization: token $GITHUB_TOKEN" \
@@ -107,4 +107,4 @@ jobs:
             fi
           fi
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.OPENPROJECT_CI_GH_TOKEN }}

.github/workflows/docker.yml

@@ -18,7 +18,7 @@ permissions:
   contents: read # to fetch code (actions/checkout)
 
 env:
-  REGISTRY_IMAGE: openproject/community
+  REGISTRY_IMAGE: openproject/openproject
 
 jobs:
   extract_version:

Gemfile

@@ -381,6 +381,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-octicons", "~>19.9.0"
-gem "openproject-octicons_helper", "~>19.9.0"
+gem "openproject-octicons", "~>19.10.0"
+gem "openproject-octicons_helper", "~>19.10.0"
 gem "openproject-primer_view_components", "~>0.28.1"

Gemfile.lock

@@ -338,7 +338,7 @@ GEM
     airbrake-ruby (6.2.2)
       rbtree3 (~> 0.6)
     android_key_attestation (0.3.0)
-    appsignal (3.6.4)
+    appsignal (3.6.5)
       rack
     ast (2.4.2)
     attr_required (1.0.2)
@@ -348,17 +348,17 @@ GEM
       activerecord (>= 4.0.0, < 7.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.914.0)
-    aws-sdk-core (3.192.0)
+    aws-partitions (1.916.0)
+    aws-sdk-core (3.192.1)
       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.78.0)
+    aws-sdk-kms (1.79.0)
       aws-sdk-core (~> 3, >= 3.191.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.146.1)
-      aws-sdk-core (~> 3, >= 3.191.0)
+    aws-sdk-s3 (1.147.0)
+      aws-sdk-core (~> 3, >= 3.192.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sdk-sns (1.72.0)
@@ -723,7 +723,7 @@ GEM
     messagebird-rest (1.4.2)
     meta-tags (2.21.0)
       actionpack (>= 6.0.0, < 7.2)
-    method_source (1.0.0)
+    method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0305)
@@ -773,10 +773,10 @@ GEM
       validate_email
       validate_url
       webfinger (~> 2.0)
-    openproject-octicons (19.9.0)
-    openproject-octicons_helper (19.9.0)
+    openproject-octicons (19.10.0)
+    openproject-octicons_helper (19.10.0)
       actionview
-      openproject-octicons (= 19.9.0)
+      openproject-octicons (= 19.10.0)
       railties
     openproject-primer_view_components (0.28.1)
       actionview (>= 5.0.0)
@@ -1119,7 +1119,7 @@ GEM
       activemodel (>= 3.0.0)
       public_suffix
     vcr (6.2.0)
-    view_component (3.12.0)
+    view_component (3.12.1)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -1271,8 +1271,8 @@ DEPENDENCIES
   openproject-job_status!
   openproject-ldap_groups!
   openproject-meeting!
-  openproject-octicons (~> 19.9.0)
-  openproject-octicons_helper (~> 19.9.0)
+  openproject-octicons (~> 19.10.0)
+  openproject-octicons_helper (~> 19.10.0)
   openproject-openid_connect!
   openproject-primer_view_components (~> 0.28.1)
   openproject-recaptcha!

app/components/filters_component.rb

@@ -58,11 +58,7 @@ def allowed_filters
   end
 
   def filters_count
-    @filters_count ||= query
-                          .filters
-                          .map(&:class)
-                          .uniq
-                          .count
+    @filters_count ||= query.filters.count
   end
 
   protected

app/components/members/row_component.rb

@@ -226,6 +226,7 @@ def delete_action_options
     def view_work_package_shares_action_options
       {
         scheme: :default,
+        tag: :a,
         icon: "op-view-list",
         label: I18n.t(:button_view_shared_work_packages),
         href: shared_work_packages_url

app/components/projects/row_component.html.erb

@@ -37,19 +37,8 @@ See COPYRIGHT and LICENSE files for more details.
     </td>
   <% end %>
   <td class="buttons">
-    <% if more_menu_items.any?  %>
-      <ul class="project-actions">
-        <li aria-haspopup="true" title="<%= I18n.t(:label_open_menu) %>" class="drop-down">
-          <a class="icon icon-show-more-horizontal context-menu--icon" title="<%= t(:label_open_menu) %>" href></a>
-          <ul style="display:none;" class="menu-drop-down-container">
-            <% more_menu_items.each do |item| %>
-              <li>
-                <%= link_to(*item) %>
-              </li>
-            <% end %>
-          </ul>
-        </li>
-      </ul>
+    <% button_links.each do |link| %>
+      <%= link %>
     <% end %>
   </td>
-</tr>
+</tr>

app/components/projects/row_component.rb

@@ -179,6 +179,40 @@ def additional_css_class(column)
       end
     end
 
+    def button_links
+      return [] if more_menu_items.empty?
+
+      if more_menu_items.one?
+        more_menu_items.first => {label:, **button_options}
+
+        [render(Primer::Beta::IconButton.new(**button_options,
+                                             size: :small,
+                                             tag: :a,
+                                             scheme: button_options[:scheme] == :default ? :invisible : button_options[:scheme],
+                                             "aria-label": label,
+                                             test_selector: "project-list-row--single-action"))]
+      else
+        [
+          render(Primer::Alpha::ActionMenu.new(test_selector: "project-list-row--action-menu")) do |menu|
+            menu.with_show_button(scheme: :invisible,
+                                  size: :small,
+                                  icon: :"kebab-horizontal",
+                                  "aria-label": t(:label_open_menu),
+                                  tooltip_direction: :w)
+            more_menu_items.each do |action_options|
+              action_options => {scheme:, label:, icon:, **button_options}
+              menu.with_item(scheme:,
+                             label:,
+                             test_selector: "project-list-row--action-menu-item",
+                             content_arguments: button_options) do |item|
+                item.with_leading_visual_icon(icon:)
+              end
+            end
+          end
+        ]
+      end
+    end
+
     def more_menu_items
       @more_menu_items ||= [more_menu_subproject_item,
                             more_menu_settings_item,
@@ -191,70 +225,84 @@ def more_menu_items
 
     def more_menu_subproject_item
       if User.current.allowed_in_project?(:add_subprojects, project)
-        [t(:label_subproject_new),
-         new_project_path(parent_id: project.id),
-         { class: "icon-context icon-add",
-           title: t(:label_subproject_new) }]
+        {
+          scheme: :default,
+          icon: :plus,
+          label: I18n.t(:label_subproject_new),
+          href: new_project_path(parent_id: project.id)
+        }
       end
     end
 
     def more_menu_settings_item
       if User.current.allowed_in_project?({ controller: "/projects/settings/general", action: "show", project_id: project.id },
                                           project)
-        [t(:label_project_settings),
-         project_settings_general_path(project),
-         { class: "icon-context icon-settings",
-           title: t(:label_project_settings) }]
+        {
+          scheme: :default,
+          icon: :gear,
+          label: I18n.t(:label_project_settings),
+          href: project_settings_general_path(project)
+        }
       end
     end
 
     def more_menu_activity_item
       if User.current.allowed_in_project?(:view_project_activity, project)
-        [
-          t(:label_project_activity),
-          project_activity_index_path(project, event_types: ["project_attributes"]),
-          { class: "icon-context icon-checkmark",
-            title: t(:label_project_activity) }
-        ]
+        {
+          scheme: :default,
+          icon: :check,
+          label: I18n.t(:label_project_activity),
+          href: project_activity_index_path(project, event_types: ["project_attributes"]),
+        }
       end
     end
 
     def more_menu_archive_item
       if User.current.allowed_in_project?(:archive_project, project) && project.active?
-        [t(:button_archive),
-         project_archive_path(project, status: params[:status]),
-         { data: { confirm: t("project.archive.are_you_sure", name: project.name) },
-           method: :post,
-           class: "icon-context icon-locked",
-           title: t(:button_archive) }]
+        {
+          scheme: :default,
+          icon: :lock,
+          label: I18n.t(:button_archive),
+          href: project_archive_path(project, status: params[:status]),
+          data: {
+            confirm: t("project.archive.are_you_sure", name: project.name),
+            method: :post
+          },
+        }
       end
     end
 
     def more_menu_unarchive_item
       if User.current.admin? && project.archived? && (project.parent.nil? || project.parent.active?)
-        [t(:button_unarchive),
-         project_archive_path(project, status: params[:status]),
-         { method: :delete,
-           class: "icon-context icon-unlocked",
-           title: t(:button_unarchive) }]
+        {
+          scheme: :default,
+          icon: :unlock,
+          label: I18n.t(:button_unarchive),
+          href: project_archive_path(project, status: params[:status]),
+          data: { method: :delete }
+        }
       end
     end
 
     def more_menu_copy_item
       if User.current.allowed_in_project?(:copy_projects, project) && !project.archived?
-        [t(:button_copy),
-         copy_project_path(project),
-         { class: "icon-context icon-copy",
-           title: t(:button_copy) }]
+        {
+          scheme: :default,
+          icon: :copy,
+          label: I18n.t(:button_copy),
+          href: copy_project_path(project),
+        }
       end
     end
 
     def more_menu_delete_item
       if User.current.admin
-        [t(:button_delete),
-         confirm_destroy_project_path(project),
-         { class: "icon-context icon-delete",
-           title: t(:button_delete) }]
+        {
+          scheme: :danger,
+          icon: :trash,
+          label: I18n.t(:button_delete),
+          href: confirm_destroy_project_path(project),
+        }
       end
     end