Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Regression: Validate empty fields for Message template #25250

Merged
merged 8 commits into from
Apr 27, 2022
Merged

Regression: Validate empty fields for Message template #25250

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9fc89a1
Remove null values from messa list
gabriellsh Apr 20, 2022
c153eef
fix order
gabriellsh Apr 20, 2022
de6196a
Fix
gabriellsh Apr 20, 2022
d79c1f6
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into remo…
gabriellsh Apr 20, 2022
04823ed
Fix type
gabriellsh Apr 20, 2022
07e2e01
review
gabriellsh Apr 20, 2022
e4bcdda
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into remo…
gabriellsh Apr 25, 2022
b2d902f
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into remo…
gabriellsh Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion apps/meteor/client/views/room/MessageList/hooks/useMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,20 @@ const options = {
},
};

// In a previous version of the app, some values were being set to null.
// This is a workaround to remove those null values.
// A migration script should be created to remove this code.
const nullValuesList = ['editedBy', 'editedAt', 'emoji', 'avatar', 'alias', 'customFields', 'groupable', 'attachments', 'reactions'];

const removePossibleNullValues = (message: any): IMessage => {
gabriellsh marked this conversation as resolved.
Show resolved Hide resolved
nullValuesList.forEach((key) => {
if (message[key] === null) {
delete message[key];
}
});
return message;
};

export const useMessages = ({ rid }: { rid: IRoom['_id'] }): IMessage[] => {
const showInMainThread = useUserPreference<boolean>('showMessageInMainThread', false);
// const hideSettings = !!useSetting('Hide_System_Messages');
Expand All @@ -35,5 +49,5 @@ export const useMessages = ({ rid }: { rid: IRoom['_id'] }): IMessage[] => {
// query.t = { $nin: Array.from(hideMessagesOfType.values()) };
// }

return useReactiveValue<IMessage[]>(useCallback(() => ChatMessage.find(query, options).fetch(), [query]));
return useReactiveValue<IMessage[]>(useCallback(() => ChatMessage.find(query, options).fetch().map(removePossibleNullValues), [query]));
};