Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: Add missing outlet args to glimmer topic list components (#27838)

This commit is contained in:
Jarek Radosz 2024-07-10 17:10:19 +02:00 committed by GitHub
parent 318dad23c4
commit 8fa61410aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 62 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/app/components/topic-list/activity-column.gjs
View File

@ -1,4 +1,5 @@
import Component from "@glimmer/component";
import { hash } from "@ember/helper";
import { service } from "@ember/service";
import { htmlSafe } from "@ember/template";
import PluginOutlet from "discourse/components/plugin-outlet";
@ -29,6 +30,7 @@ export default class ActivityColumn extends Component {
>{{! no whitespace
}}<PluginOutlet
@name="topic-list-before-relative-date"
@outletArgs={{hash topic=@topic}}
/>
{{~formatDate @topic.bumpedAt format="tiny" noTitle="true"~}}
</a>

6
app/assets/javascripts/discourse/app/components/topic-list/posts-count-column.gjs
View File

@ -1,4 +1,5 @@
import Component from "@glimmer/component";
import { hash } from "@ember/helper";
import { service } from "@ember/service";
import PluginOutlet from "discourse/components/plugin-outlet";
import TopicEntrance from "discourse/components/topic-list/topic-entrance";
@ -59,7 +60,10 @@ export default class PostsCountColumn extends Component {
@title={{this.title}}
@triggerClass="btn-link posts-map badge-posts {{this.likesHeat}}"
>
<PluginOutlet @name="topic-list-before-reply-count" />
<PluginOutlet
@name="topic-list-before-reply-count"
@outletArgs={{hash topic=@topic}}
/>
{{number @topic.replyCount noTitle="true"}}
</TopicEntrance>
</this.wrapperElement>

71
app/assets/javascripts/discourse/app/components/topic-list/topic-list-item.gjs
View File

@ -284,7 +284,7 @@ export default class TopicListItem extends Component {
@outletArgs={{hash topic=@topic}}
/>
{{#if this.site.desktopView}}
<PluginOutlet @name="topic-list-before-columns" />
{{! TODO: column DAG "topic-list-before-columns" }}
{{#if @bulkSelectEnabled}}
<td class="bulk-select topic-list-data">
@ -301,11 +301,17 @@ export default class TopicListItem extends Component {
{{/if}}
<td class="main-link clearfix topic-list-data" colspan="1">
<PluginOutlet @name="topic-list-before-link" />
<PluginOutlet
@name="topic-list-before-link"
@outletArgs={{hash topic=@topic}}
/>
<span class="link-top-line">
{{~! no whitespace ~}}
<PluginOutlet @name="topic-list-before-status" />
<PluginOutlet
@name="topic-list-before-status"
@outletArgs={{hash topic=@topic}}
/>
{{~! no whitespace ~}}
<TopicStatus @topic={{@topic}} />
{{~! no whitespace ~}}
@ -319,7 +325,10 @@ export default class TopicListItem extends Component {
&nbsp;
{{~topicFeaturedLink @topic}}
{{~/if~}}
<PluginOutlet @name="topic-list-after-title" />
<PluginOutlet
@name="topic-list-after-title"
@outletArgs={{hash topic=@topic}}
/>
{{~! no whitespace ~}}
<UnreadIndicator
@includeUnreadIndicator={{this.includeUnreadIndicator}}
@ -339,7 +348,10 @@ export default class TopicListItem extends Component {
<div class="link-bottom-line">
{{#unless @hideCategory}}
{{#unless @topic.isPinnedUncategorized}}
<PluginOutlet @name="topic-list-before-category" />
<PluginOutlet
@name="topic-list-before-category"
@outletArgs={{hash topic=@topic}}
/>
{{categoryLink @topic.category}}
{{/unless}}
{{/unless}}
@ -362,10 +374,16 @@ export default class TopicListItem extends Component {
<TopicExcerpt @topic={{@topic}} />
{{/if}}
<PluginOutlet @name="topic-list-main-link-bottom" />
<PluginOutlet
@name="topic-list-main-link-bottom"
@outletArgs={{hash topic=@topic}}
/>
</td>
<PluginOutlet @name="topic-list-after-main-link" />
<PluginOutlet
@name="topic-list-after-main-link"
@outletArgs={{hash topic=@topic}}
/>
{{#if @showPosters}}
<PostersColumn @posters={{@topic.featuredUsers}} />
@ -396,16 +414,19 @@ export default class TopicListItem extends Component {
{{/if}}
<td class={{concatClass "num views topic-list-data" @topic.viewsHeat}}>
<PluginOutlet @name="topic-list-before-view-count" />
<PluginOutlet
@name="topic-list-before-view-count"
@outletArgs={{hash topic=@topic}}
/>
{{number @topic.views numberKey="views_long"}}
</td>
<ActivityColumn @topic={{@topic}} class="num topic-list-data" />
<PluginOutlet @name="topic-list-after-columns" />
{{! TODO: column DAG "topic-list-after-columns" }}
{{else}}
<td class="topic-list-data">
<PluginOutlet @name="topic-list-before-columns" />
{{! TODO: column DAG "topic-list-before-columns" }}
<div class="pull-left">
{{#if @bulkSelectEnabled}}
@ -430,11 +451,17 @@ export default class TopicListItem extends Component {
<div class="topic-item-metadata right">
{{~! no whitespace ~}}
<PluginOutlet @name="topic-list-before-link" />
<PluginOutlet
@name="topic-list-before-link"
@outletArgs={{hash topic=@topic}}
/>
<div class="main-link">
{{~! no whitespace ~}}
<PluginOutlet @name="topic-list-before-status" />
<PluginOutlet
@name="topic-list-before-status"
@outletArgs={{hash topic=@topic}}
/>
{{~! no whitespace ~}}
<TopicStatus @topic={{@topic}} />
{{~! no whitespace ~}}
@ -448,7 +475,10 @@ export default class TopicListItem extends Component {
&nbsp;
{{~topicFeaturedLink @topic}}
{{~/if~}}
<PluginOutlet @name="topic-list-after-title" />
<PluginOutlet
@name="topic-list-after-title"
@outletArgs={{hash topic=@topic}}
/>
{{~#if @topic.unseen~}}
<span class="topic-post-badges">&nbsp;<span
class="badge-notification new-topic"
@ -457,10 +487,16 @@ export default class TopicListItem extends Component {
{{~#if this.expandPinned~}}
<TopicExcerpt @topic={{@topic}} />
{{~/if~}}
<PluginOutlet @name="topic-list-main-link-bottom" />
<PluginOutlet
@name="topic-list-main-link-bottom"
@outletArgs={{hash topic=@topic}}
/>
</div>
{{~! no whitespace ~}}
<PluginOutlet @name="topic-list-after-main-link" />
<PluginOutlet
@name="topic-list-after-main-link"
@outletArgs={{hash topic=@topic}}
/>
<div class="pull-right">
<PostCountOrBadges
@ -472,7 +508,10 @@ export default class TopicListItem extends Component {
<div class="topic-item-stats clearfix">
<span class="topic-item-stats__category-tags">
{{#unless @hideCategory}}
<PluginOutlet @name="topic-list-before-category" />
<PluginOutlet
@name="topic-list-before-category"
@outletArgs={{hash topic=@topic}}
/>
{{categoryLink @topic.category}}
{{/unless}}