Skip to content

Commit

Permalink
Migrate thread template to component
Browse files Browse the repository at this point in the history
  • Loading branch information
tassoevan committed Dec 15, 2022
1 parent a4fd9bc commit 7dba7b8
Show file tree
Hide file tree
Showing 10 changed files with 347 additions and 411 deletions.
22 changes: 0 additions & 22 deletions apps/meteor/app/threads/client/flextab/thread.html

This file was deleted.

316 changes: 0 additions & 316 deletions apps/meteor/app/threads/client/flextab/thread.ts

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/app/threads/client/flextab/threads.ts

This file was deleted.

3 changes: 1 addition & 2 deletions apps/meteor/app/threads/client/index.ts
@@ -1,6 +1,5 @@
import './flextab/threadlist';
import './flextab/thread.ts';
import './flextab/threads.ts';
import './messageAction/follow';
import './messageAction/unfollow';
import './messageAction/replyInThread';
import './threads.css';
Expand Up @@ -5,16 +5,16 @@ import { Template } from 'meteor/templating';
import type { ReactElement } from 'react';
import React, { memo, useCallback, useRef } from 'react';

import { ChatMessage } from '../../../../../app/models/client';
import { Messages } from '../../../../../app/models/client';
import { useReactiveValue } from '../../../../hooks/useReactiveValue';
import { useMessageContext } from './useMessageContext';
import { useRoomMessageContext } from './useRoomMessageContext';

type LegacyMessageTemplateListProps = {
room: IRoom;
};

const LegacyMessageTemplateList = ({ room }: LegacyMessageTemplateListProps): ReactElement => {
const messageContext = useMessageContext(room);
const roomMessageContext = useRoomMessageContext(room);

const hideSystemMessages = useSetting('Hide_System_Messages') as MessageTypesValues[];

Expand Down Expand Up @@ -43,7 +43,7 @@ const LegacyMessageTemplateList = ({ room }: LegacyMessageTemplateListProps): Re
},
};

return ChatMessage.find(query, options).fetch();
return Messages.find(query, options).fetch();
}, [hideSystemMessages, room._id, room.sysMes]),
);

Expand All @@ -59,7 +59,7 @@ const LegacyMessageTemplateList = ({ room }: LegacyMessageTemplateListProps): Re
index,
shouldCollapseReplies: false,
msg: message,
...messageContext,
...roomMessageContext,
}),
node.parentElement,
node,
Expand All @@ -76,7 +76,7 @@ const LegacyMessageTemplateList = ({ room }: LegacyMessageTemplateListProps): Re
viewsRef.current.delete(message._id);
}
},
[messageContext],
[roomMessageContext],
);

return (
Expand Down

0 comments on commit 7dba7b8

Please sign in to comment.