diff --git a/app/assets/javascripts/discourse/app/components/bookmark-list.gjs b/app/assets/javascripts/discourse/app/components/bookmark-list.gjs
index 17ff2685874..b7b6711e6a3 100644
--- a/app/assets/javascripts/discourse/app/components/bookmark-list.gjs
+++ b/app/assets/javascripts/discourse/app/components/bookmark-list.gjs
@@ -14,6 +14,7 @@ import FlatButton from "discourse/components/flat-button";
import LoadMore from "discourse/components/load-more";
import BookmarkModal from "discourse/components/modal/bookmark";
import PluginOutlet from "discourse/components/plugin-outlet";
+import ActivityCell from "discourse/components/topic-list/item/activity-cell";
import TopicStatus from "discourse/components/topic-status";
import avatar from "discourse/helpers/avatar";
import categoryLink from "discourse/helpers/category-link";
@@ -22,7 +23,6 @@ import icon from "discourse/helpers/d-icon";
import discourseTags from "discourse/helpers/discourse-tags";
import formatDate from "discourse/helpers/format-date";
import htmlSafe from "discourse/helpers/html-safe";
-import raw from "discourse/helpers/raw";
import topicLink from "discourse/helpers/topic-link";
import { ajax } from "discourse/lib/ajax";
import { BookmarkFormData } from "discourse/lib/bookmark-form-data";
@@ -401,12 +401,7 @@ export default class BookmarkList extends Component {
{{formatDate bookmark.updated_at format="tiny"}} |
- {{raw
- "list/activity-column"
- topic=bookmark
- class="num post-metadata"
- tagName="td"
- }}
+
{{/if}}
- {{raw "topic-status" topic=this.topic}}
+
{{htmlSafe
this.topic.fancyTitle
}}
diff --git a/app/assets/javascripts/discourse/app/components/latest-topic-list-item.gjs b/app/assets/javascripts/discourse/app/components/latest-topic-list-item.gjs
index c10c710e428..5e94aa7a46c 100644
--- a/app/assets/javascripts/discourse/app/components/latest-topic-list-item.gjs
+++ b/app/assets/javascripts/discourse/app/components/latest-topic-list-item.gjs
@@ -5,18 +5,19 @@ import {
classNameBindings,
} from "@ember-decorators/component";
import PluginOutlet from "discourse/components/plugin-outlet";
+import ItemRepliesCell from "discourse/components/topic-list/item/replies-cell";
import {
navigateToTopic,
showEntrance,
} from "discourse/components/topic-list-item";
import TopicPostBadges from "discourse/components/topic-post-badges";
+import TopicStatus from "discourse/components/topic-status";
import UserAvatarFlair from "discourse/components/user-avatar-flair";
import UserLink from "discourse/components/user-link";
import avatar from "discourse/helpers/avatar";
import categoryLink from "discourse/helpers/category-link";
import discourseTags from "discourse/helpers/discourse-tags";
import formatDate from "discourse/helpers/format-date";
-import raw from "discourse/helpers/raw";
import topicFeaturedLink from "discourse/helpers/topic-featured-link";
import topicLink from "discourse/helpers/topic-link";
import discourseComputed from "discourse/lib/decorators";
@@ -85,7 +86,7 @@ export default class LatestTopicListItem extends Component {
- {{raw "topic-status" topic=this.topic}}
+
{{topicLink this.topic}}
{{~#if this.topic.featured_link}}
{{topicFeaturedLink this.topic}}
@@ -114,7 +115,7 @@ export default class LatestTopicListItem extends Component {
@connectorTagName="div"
@outletArgs={{hash topic=this.topic}}
/>
- {{raw "list/posts-count-column" topic=this.topic tagName="div"}}
+
- {{raw "topic-status" topic=this.topic}}
+
{{topicLink this.topic}}
{{#if this.topic.unseen}}
@@ -26,10 +27,8 @@ export default class MobileCategoryTopic extends Component {
>{{formatAge this.topic.last_posted_at}}
|
- {{raw
- "list/post-count-or-badges"
- topic=this.topic
- postBadgesEnabled="true"
- }} |
+
+
+ |
}
diff --git a/app/assets/javascripts/discourse/app/components/search-result-entry.gjs b/app/assets/javascripts/discourse/app/components/search-result-entry.gjs
index b02e39dfb93..1dfbf186521 100644
--- a/app/assets/javascripts/discourse/app/components/search-result-entry.gjs
+++ b/app/assets/javascripts/discourse/app/components/search-result-entry.gjs
@@ -11,13 +11,13 @@ import {
} from "@ember-decorators/component";
import HighlightSearch from "discourse/components/highlight-search";
import PluginOutlet from "discourse/components/plugin-outlet";
+import TopicStatus from "discourse/components/topic-status";
import TrackSelected from "discourse/components/track-selected";
import avatar from "discourse/helpers/avatar";
import categoryLink from "discourse/helpers/category-link";
import icon from "discourse/helpers/d-icon";
import discourseTags from "discourse/helpers/discourse-tags";
import formatDate from "discourse/helpers/format-date";
-import raw from "discourse/helpers/raw";
import { wantsNewWindow } from "discourse/lib/intercept-click";
import { logSearchLinkClick } from "discourse/lib/search";
@@ -75,11 +75,12 @@ export default class SearchResultEntry extends Component {
role="heading"
aria-level="2"
>
- {{raw
- "topic-status"
- topic=this.post.topic
- showPrivateMessageIcon=true
- }}
+
+
{{#if this.post.useTopicTitleHeadline}}
{{htmlSafe this.post.topicTitleHeadline}}
diff --git a/app/assets/javascripts/discourse/app/components/topic-list/item/activity-cell.gjs b/app/assets/javascripts/discourse/app/components/topic-list/item/activity-cell.gjs
index 24ca28fb741..08d4b236a9e 100644
--- a/app/assets/javascripts/discourse/app/components/topic-list/item/activity-cell.gjs
+++ b/app/assets/javascripts/discourse/app/components/topic-list/item/activity-cell.gjs
@@ -12,6 +12,7 @@ const ActivityCell =
"activity num topic-list-data"
(coldAgeClass @topic.createdAt startDate=@topic.bumpedAt class="")
}}
+ ...attributes
>
{{~! no whitespace ~}}
diff --git a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
index ca8c4919a75..d544fa3f349 100644
--- a/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
+++ b/app/assets/javascripts/discourse/tests/acceptance/search-full-test.js
@@ -126,7 +126,7 @@ acceptance("Search - Full Page", function (needs) {
assert.dom(".fps-topic").exists({ count: 1 }, "has one post");
assert
- .dom(".topic-status .personal_message")
+ .dom(".topic-status .d-icon-envelope")
.exists({ count: 1 }, "shows the right icon");
assert
|