diff --git a/app/components/work_packages/activities_tab/journals/item_component.html.erb b/app/components/work_packages/activities_tab/journals/item_component.html.erb index 46e88201e3c8..7ea180f1a7ae 100644 --- a/app/components/work_packages/activities_tab/journals/item_component.html.erb +++ b/app/components/work_packages/activities_tab/journals/item_component.html.erb @@ -30,6 +30,16 @@ classes: "work-packages-activities-tab-journals-item-component--user-name ellipsis hidden-for-mobile") do truncated_user_name(journal.user) end + if journal.initial? + header_start_container.with_column( + mr: 1, + classes: "work-packages-activities-tab-journals-item-component-details--journal-type hidden-for-mobile" + ) do + render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mt: 1)) do + I18n.t("activities.work_packages.activity_tab.created_on") + end + end + end header_start_container.with_column(mr: 1, classes: "hidden-for-mobile") do render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mt: 1)) { format_time(journal.updated_at) } end diff --git a/spec/features/activities/work_package/activities_spec.rb b/spec/features/activities/work_package/activities_spec.rb index 9bf18426720a..51adef83a422 100644 --- a/spec/features/activities/work_package/activities_spec.rb +++ b/spec/features/activities/work_package/activities_spec.rb @@ -375,7 +375,7 @@ version: 2) # the comment is shown without browser reload - wait_for { page }.to have_test_selector("op-journal-notes-body", text: "First comment by member") + activity_tab.expect_journal_notes(text: "First comment by member") # simulate comments made within the polling interval create(:work_package_journal, user: member, notes: "Second comment by member", journable: work_package, version: 3) @@ -393,7 +393,7 @@ first_journal.update!(notes: "First comment by member updated") # properly updates the comment when the comment is updated - wait(delay: 0.5).for { page }.to have_test_selector("op-journal-notes-body", text: "First comment by member updated") + activity_tab.expect_journal_notes(text: "First comment by member updated") end end diff --git a/spec/support/components/work_packages/activities.rb b/spec/support/components/work_packages/activities.rb index 7bc79b6a1238..80f0f9c2a271 100644 --- a/spec/support/components/work_packages/activities.rb +++ b/spec/support/components/work_packages/activities.rb @@ -98,7 +98,7 @@ def expect_no_journal_notes_header(text: nil) end def expect_journal_notes(text: nil) - expect(page).to have_test_selector("op-journal-notes-body", text:) + expect(page).to have_test_selector("op-journal-notes-body", text:, wait: 10) end def expect_notification_bubble