IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adding support for thread viewer to not have a root post fetched. (#25502)

Browse Source 
* Adding support for thread viewer to not have a root post fetched.

* Fix type
This commit is contained in:
Christopher Speller 2023-11-22 11:40:14 -08:00 committed by GitHub
parent f67f0bd220
commit 5862213fd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webapp/channels/src/components/threading/thread_viewer/thread_viewer.test.tsx
View File

@ -66,6 +66,7 @@ describe('components/threading/ThreadViewer', () => {
isCollapsedThreadsEnabled: false,
postIds: [post.id],
appsEnabled: true,
rootPostId: post.id,
};
test('should match snapshot', async () => {
@ -102,6 +103,18 @@ describe('components/threading/ThreadViewer', () => {
}).not.toThrowError("Cannot read property 'reply_count' of undefined");
});
test('should not break if root post is ID only', () => {
const props = {
...baseProps,
rootPostId: post.id,
selected: undefined,
};
expect(() => {
shallow(<ThreadViewer {...props}/>);
}).not.toThrowError("Cannot read property 'reply_count' of undefined");
});
test('should call fetchThread when no thread on mount', (done) => {
const {actions} = baseProps;

17
webapp/channels/src/components/threading/thread_viewer/thread_viewer.tsx
View File

@ -30,7 +30,7 @@ export type Props = Attrs & {
appsEnabled: boolean;
userThread?: UserThread | null;
channel: Channel | null;
selected: Post | FakePost;
selected?: Post | FakePost;
currentUserId: string;
currentTeamId: string;
socketConnectionStatus: boolean;
@ -49,6 +49,7 @@ export type Props = Attrs & {
selectedPostFocusedAt?: number;
isThreadView?: boolean;
inputPlaceholder?: string;
rootPostId: string;
};
type State = {
@ -72,7 +73,7 @@ export default class ThreadViewer extends React.PureComponent<Props, State> {
this.onInit();
if (this.props.appsEnabled) {
this.props.actions.fetchRHSAppsBindings(this.props.channel?.id || '', this.props.selected.id);
this.props.actions.fetchRHSAppsBindings(this.props.channel?.id || '', this.props.selected?.id || this.props.rootPostId);
}
}
@ -83,7 +84,7 @@ export default class ThreadViewer extends React.PureComponent<Props, State> {
return;
}
const selectedChanged = this.props.selected.id !== prevProps.selected.id;
const selectedChanged = this.props.selected.id !== prevProps.selected?.id;
if (reconnected || selectedChanged) {
this.onInit(reconnected);
@ -97,7 +98,7 @@ export default class ThreadViewer extends React.PureComponent<Props, State> {
}
if (this.props.appsEnabled && (
this.props.channel?.id !== prevProps.channel?.id || this.props.selected.id !== prevProps.selected.id
this.props.channel?.id !== prevProps.channel?.id || this.props.selected.id !== prevProps.selected?.id
)) {
this.props.actions.fetchRHSAppsBindings(this.props.channel?.id || '', this.props.selected.id);
}
@ -105,7 +106,7 @@ export default class ThreadViewer extends React.PureComponent<Props, State> {
public morePostsToFetch(): boolean {
const replyCount = this.getReplyCount();
return this.props.selected && this.props.postIds.length < (replyCount + 1);
return Boolean(this.props.selected) && this.props.postIds.length < (replyCount + 1);
}
public getReplyCount(): number {
@ -150,7 +151,7 @@ export default class ThreadViewer extends React.PureComponent<Props, State> {
this.props.actions.updateThreadRead(
this.props.currentUserId,
this.props.currentTeamId,
this.props.selected.id,
this.props.selected?.id || this.props.rootPostId,
Date.now(),
);
}
@ -163,9 +164,9 @@ export default class ThreadViewer extends React.PureComponent<Props, State> {
private onInit = async (reconnected = false): Promise<void> => {
this.setState({isLoading: !reconnected});
if (reconnected || this.morePostsToFetch()) {
await this.props.actions.getPostThread(this.props.selected.id, !reconnected);
await this.props.actions.getPostThread(this.props.selected?.id || this.props.rootPostId, !reconnected);
} else {
await this.props.actions.getNewestPostThread(this.props.selected.id);
await this.props.actions.getNewestPostThread(this.props.selected?.id || this.props.rootPostId);
}
if (