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

FIX: Ensure topic steam is loaded before rendering the map (#28031)

This commit is contained in:
Jan Cernik 2024-07-23 01:16:58 -03:00 committed by GitHub
parent e020888b0a
commit a4692609e4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
app/assets/javascripts/discourse/app/components/topic-map/index.gjs
View File

@ -12,26 +12,26 @@ const TopicMap = <template>
@postStream={{@postStream}}
/>
</section>
{{/unless}}
<section class="topic-map__additional-contents toggle-summary">
<PluginOutlet
@name="topic-map-expanded-after"
@defaultGlimmer={{true}}
@outletArgs={{hash topic=@model postStream=@postStream}}
/>
</section>
{{#if @showPMMap}}
<section class="topic-map__private-message-map">
<PrivateMessageMap
@topicDetails={{@topicDetails}}
@showInvite={{@showInvite}}
@removeAllowedGroup={{@removeAllowedGroup}}
@removeAllowedUser={{@removeAllowedUser}}
<section class="topic-map__additional-contents toggle-summary">
<PluginOutlet
@name="topic-map-expanded-after"
@defaultGlimmer={{true}}
@outletArgs={{hash topic=@model postStream=@postStream}}
/>
</section>
{{/if}}
{{#if @showPMMap}}
<section class="topic-map__private-message-map">
<PrivateMessageMap
@topicDetails={{@topicDetails}}
@showInvite={{@showInvite}}
@removeAllowedGroup={{@removeAllowedGroup}}
@removeAllowedUser={{@removeAllowedUser}}
/>
</section>
{{/if}}
{{/unless}}
</template>;
export default TopicMap;

6
app/assets/javascripts/discourse/app/controllers/topic.js
View File

@ -240,9 +240,9 @@ export default Controller.extend(bufferedProperty("model"), {
return Category.findById(categoryId)?.minimumRequiredTags || 0;
},
@discourseComputed("model.posts_count")
showBottomTopicMap(postsCount) {
return postsCount > MIN_POSTS_COUNT;
@discourseComputed("model.posts_count", "model.postStream.loadingFilter")
showBottomTopicMap(postsCount, loading) {
return !loading && postsCount > MIN_POSTS_COUNT;
},
_removeDeleteOnOwnerReplyBookmarks() {