github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-19 11:33:52 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Correctly display group unread indicator in gjs (#30302)

Browse Source
This commit is contained in:
Jarek Radosz 2024-12-16 20:50:49 +01:00 committed by GitHub
parent 03bb43f746
commit e03121c55b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/components/topic-list/unread-indicator.gjs
View File

@ -26,12 +26,8 @@ export default class UnreadIndicator extends Component {
return `/private-messages/unread-indicator/${this.args.topic.id}`; return `/private-messages/unread-indicator/${this.args.topic.id}`;
} }
get isUnread() {
return typeof this.args.topic.get("unread_by_group_member") !== "undefined";
}
<template> <template>
{{~#if this.isUnread~}} {{~#if @topic.unread_by_group_member~}}
&nbsp;<span &nbsp;<span
title={{i18n "topic.unread_indicator"}} title={{i18n "topic.unread_indicator"}}
class="badge badge-notification unread-indicator" class="badge badge-notification unread-indicator"

25
app/assets/javascripts/discourse/tests/integration/components/topic-list-item-test.gjs
View File

@ -1,6 +1,7 @@
import { render } from "@ember/test-helpers"; import { render } from "@ember/test-helpers";
import { module, test } from "qunit"; import { module, test } from "qunit";
import TopicListItem from "discourse/components/topic-list/item"; import TopicListItem from "discourse/components/topic-list/item";
import TopicList from "discourse/components/topic-list/list";
import HbrTopicListItem from "discourse/components/topic-list-item"; import HbrTopicListItem from "discourse/components/topic-list-item";
import { withPluginApi } from "discourse/lib/plugin-api"; import { withPluginApi } from "discourse/lib/plugin-api";
import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { setupRenderingTest } from "discourse/tests/helpers/component-test";
@ -58,4 +59,28 @@ module("Integration | Component | topic-list-item", function (hooks) {
.dom(".topic-list-item[data-topic-id='1235']") .dom(".topic-list-item[data-topic-id='1235']")
.doesNotHaveClass("bar"); .doesNotHaveClass("bar");
}); });
test("shows unread-by-group-member indicator", async function (assert) {
const store = this.owner.lookup("service:store");
const topics = [
store.createRecord("topic", { id: 1234 }),
store.createRecord("topic", {
id: 1235,
unread_by_group_member: true,
}),
store.createRecord("topic", {
id: 1236,
unread_by_group_member: false,
}),
];
await render(<template><TopicList @topics={{topics}} /></template>);
assert
.dom(".badge.badge-notification.unread-indicator")
.exists({ count: 1 });
assert
.dom(".topic-list-item[data-topic-id='1235'] .unread-indicator")
.exists();
});
}); });