[pull] dev from opf:dev

Gemfile

@@ -409,4 +409,4 @@ end
 
 gem "openproject-octicons", "~>19.20.0 "
 gem "openproject-octicons_helper", "~>19.20.0 "
-gem "openproject-primer_view_components", "~>0.54.0"
+gem "openproject-primer_view_components", "~>0.54.1"

Gemfile.lock

@@ -854,7 +854,7 @@ GEM
       actionview
       openproject-octicons (= 19.20.0)
       railties
-    openproject-primer_view_components (0.54.0)
+    openproject-primer_view_components (0.54.1)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.20.0)
@@ -1380,7 +1380,7 @@ DEPENDENCIES
   openproject-octicons (~> 19.20.0)
   openproject-octicons_helper (~> 19.20.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.54.0)
+  openproject-primer_view_components (~> 0.54.1)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!

frontend/package.json

@@ -100,11 +100,11 @@
     "@ngneat/content-loader": "^7.0.0",
     "@ngx-formly/core": "^6.1.4",
     "@openproject/octicons-angular": "^19.20.0",
-    "@openproject/primer-view-components": "^0.54.0",
+    "@openproject/primer-view-components": "^0.54.1",
     "@openproject/reactivestates": "^3.0.1",
     "@primer/css": "^21.5.0",
     "@primer/primitives": "^9.1.2",
-    "@primer/view-components": "npm:@openproject/primer-view-components@^0.54.0",
+    "@primer/view-components": "npm:@openproject/primer-view-components@^0.54.1",
     "@types/hotwired__turbo": "^8.0.1",
     "@uirouter/angular": "^13.0.0",
     "@uirouter/core": "^6.1.0",

modules/meeting/app/forms/recurring_meeting/specific_date.rb

@@ -33,8 +33,7 @@ class RecurringMeeting::SpecificDate < ApplicationForm
       name: :end_date,
       type: "date",
       value: @value,
-      placeholder: Meeting.human_attribute_name(:end_date),
-      label: Meeting.human_attribute_name(:end_date),
+      label: I18n.t("activerecord.attributes.recurring_meeting.end_date"),
       required: false,
       autofocus: false
     )

modules/meeting/config/locales/en.yml

@@ -68,6 +68,7 @@ en:
         start_time: "Start time"
         start_time_hour: "Start time"
         end_after: "Meeting series ends"
+        end_date: "End date"
         iterations: "Occurrences"
     errors:
       messages:

modules/storages/app/views/storages/project_settings/_project_folder_form.html.erb

@@ -139,7 +139,7 @@ See COPYRIGHT and LICENSE files for more details.
                                 "project-storage-form-target": "loginButton"
                               } %>
     <span
-      data-project-storage-form-target="selectedFolderText">...</span>
+      data-project-storage-form-target="selectedFolderText" data-test-selector="selected-folder-name">...</span>
   </div>
   <% if @errors&.any? { |error| error.attribute == :project_folder_id } %>
     <%= content_tag :span,

modules/storages/spec/features/manage_project_storage_spec.rb

@@ -110,10 +110,16 @@
     # by default automatic have to be chosen if storage has automatic management enabled
     expect(page).to have_checked_field("New folder with automatically managed permissions")
 
+    # The js needs to be initialized before the stimulus controller will work.
+    # Otherwise, the folder selector will not show up.
+    # For unknown reasons, this takes longer than expected.
+    sleep(1)
     page.find_by_id("storages_project_storage_project_folder_mode_manual").click
 
+    expect(page).to have_test_selector("selected-folder-name", text: "No selected folder")
+
     # Select project folder
-    expect(page).to have_text("No selected folder")
+    expect(page).to have_test_selector("selected-folder-name", text: "No selected folder")
     page.click_on("Select folder")
     location_picker.expect_open
     using_wait_time(20) do
@@ -124,7 +130,7 @@
     location_picker.confirm
 
     # Add storage
-    expect(page).to have_text("Folder1")
+    expect(page).to have_test_selector("selected-folder-name", text: "Folder1")
     page.click_on("Add")
 
     expect_and_dismiss_flash(message: "Successful creation.")
@@ -147,7 +153,7 @@
 
     # Change the project folder mode to inactive, project folder is hidden but retained
     page.find_by_id("storages_project_storage_project_folder_mode_inactive").click
-    expect(page).to have_no_text("Folder1")
+    expect(page).not_to have_test_selector("selected-folder-name", text: "Folder1")
     page.click_on("Save")
 
     expect_and_dismiss_flash(message: "Successful update.")