mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Revert "MM-56201, MM-56280: Suppress typing and emoji events (#25794)" (#26281)

Просмотр исходного кода 
This reverts commit f5ee5463e4.
Этот коммит содержится в:
Agniva De Sarker
2024-02-22 19:56:56 +05:30
коммит произвёл GitHub
родитель 726d7494b6
Коммит 6808a1c733
23 изменённых файлов: 186 добавлений и 469 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

13
webapp/channels/src/actions/views/rhs.test.ts
Просмотреть файл

@@ -11,6 +11,7 @@ import type {UserProfile} from '@mattermost/types/users';
import type {IDMappedObjects} from '@mattermost/types/utilities';
import {SearchTypes} from 'mattermost-redux/action_types';
import * as PostActions from 'mattermost-redux/actions/posts';
import * as SearchActions from 'mattermost-redux/actions/search';
import {trackEvent} from 'actions/telemetry_actions.jsx';
@@ -170,6 +171,15 @@ describe('rhs view actions', () => {
root_id: 'root123',
} as Post;
test('it dispatches PostActions.getPostThread correctly', () => {
store.dispatch(selectPostFromRightHandSideSearch(post));
const compareStore = mockStore(initialState);
compareStore.dispatch(PostActions.getPostThread(post.root_id));
expect(store.getActions()[0]).toEqual(compareStore.getActions()[0]);
});
describe(`it dispatches ${ActionTypes.SELECT_POST} correctly`, () => {
it('with mocked date', async () => {
store = mockStore({
@@ -192,7 +202,7 @@ describe('rhs view actions', () => {
timestamp: POST_CREATED_TIME,
};
expect(store.getActions()[0]).toEqual(action);
expect(store.getActions()[1]).toEqual(action);
});
});
});
@@ -782,6 +792,7 @@ describe('rhs view actions', () => {
await store.dispatch(openAtPrevious({selectedPostId: previousSelectedPost.id, previousRhsState: previousState}));
const compareStore = mockStore(initialState);
compareStore.dispatch(PostActions.getPostThread(previousSelectedPost.root_id));
compareStore.dispatch({
type: ActionTypes.SELECT_POST,
postId: previousSelectedPost.root_id,

2
webapp/channels/src/actions/views/rhs.ts
Просмотреть файл

@@ -9,6 +9,7 @@ import type {Post} from '@mattermost/types/posts';
import {SearchTypes} from 'mattermost-redux/action_types';
import {getChannel} from 'mattermost-redux/actions/channels';
import * as PostActions from 'mattermost-redux/actions/posts';
import {getPostsByIds, getPost as fetchPost} from 'mattermost-redux/actions/posts';
import {
clearSearch,
@@ -39,6 +40,7 @@ import type {RhsState} from 'types/store/rhs';
function selectPostFromRightHandSideSearchWithPreviousState(post: Post, previousRhsState?: RhsState): ActionFuncAsync<boolean, GlobalState> {
return async (dispatch, getState) => {
const postRootId = post.root_id || post.id;
await dispatch(PostActions.getPostThread(postRootId));
const state = getState();
dispatch({

3
webapp/channels/src/components/channel_view/__snapshots__/channel_view.test.tsx.snap
Просмотреть файл

@@ -13,7 +13,6 @@ exports[`components/channel_view Should match snapshot if channel is archived 1`
channelIsArchived={true}
deactivatedChannel={false}
enableOnboardingFlow={true}
enableWebSocketEventScope={false}
goToLastViewedChannel={[MockFunction]}
history={Object {}}
isCloud={false}
@@ -70,7 +69,6 @@ exports[`components/channel_view Should match snapshot if channel is deactivated
channelIsArchived={false}
deactivatedChannel={true}
enableOnboardingFlow={true}
enableWebSocketEventScope={false}
goToLastViewedChannel={[MockFunction]}
history={Object {}}
isCloud={false}
@@ -126,7 +124,6 @@ exports[`components/channel_view Should match snapshot with base props 1`] = `
channelIsArchived={false}
deactivatedChannel={false}
enableOnboardingFlow={true}
enableWebSocketEventScope={false}
goToLastViewedChannel={[MockFunction]}
history={Object {}}
isCloud={false}

1
webapp/channels/src/components/channel_view/channel_view.test.tsx
Просмотреть файл

@@ -24,7 +24,6 @@ describe('components/channel_view', () => {
isCloud: false,
goToLastViewedChannel: jest.fn(),
isFirstAdmin: false,
enableWebSocketEventScope: false,
};
it('Should match snapshot with base props', () => {

2
webapp/channels/src/components/channel_view/channel_view.tsx
Просмотреть файл

@@ -89,7 +89,7 @@ export default class ChannelView extends React.PureComponent<Props, State> {
componentDidUpdate(prevProps: Props) {
// TODO: debounce
if (prevProps.channelId !== this.props.channelId && this.props.enableWebSocketEventScope) {
if (prevProps.channelId !== this.props.channelId) {
WebSocketClient.updateActiveChannel(this.props.channelId);
}
if (prevProps.channelId !== this.props.channelId || prevProps.channelIsArchived !== this.props.channelIsArchived) {

2
webapp/channels/src/components/channel_view/index.ts
Просмотреть файл

@@ -29,7 +29,6 @@ function mapStateToProps(state: GlobalState) {
const viewArchivedChannels = config.ExperimentalViewArchivedChannels === 'true';
const enableOnboardingFlow = config.EnableOnboardingFlow === 'true';
const enableWebSocketEventScope = config.FeatureFlagWebSocketEventScope === 'true';
return {
channelId: channel ? channel.id : '',
@@ -40,7 +39,6 @@ function mapStateToProps(state: GlobalState) {
isCloud: getLicense(state).Cloud === 'true',
teamUrl: getCurrentRelativeTeamUrl(state),
isFirstAdmin: isFirstAdmin(state),
enableWebSocketEventScope,
};
}

2
webapp/channels/src/components/team_sidebar/index.ts
Просмотреть файл

@@ -38,7 +38,6 @@ function mapStateToProps(state: GlobalState) {
const products = state.plugins.components.Product || [];
const [unreadTeamsSet, mentionsInTeamMap, teamHasUrgentMap] = getTeamsUnreadStatuses(state);
const enableWebSocketEventScope = config.FeatureFlagWebSocketEventScope === 'true';
return {
currentTeamId: getCurrentTeamId(state),
@@ -52,7 +51,6 @@ function mapStateToProps(state: GlobalState) {
unreadTeamsSet,
mentionsInTeamMap,
teamHasUrgentMap,
enableWebSocketEventScope,
};
}

2
webapp/channels/src/components/team_sidebar/team_sidebar.tsx
Просмотреть файл

@@ -149,7 +149,7 @@ export default class TeamSidebar extends React.PureComponent<Props, State> {
componentDidUpdate(prevProps: Props) {
// TODO: debounce
if (prevProps.currentTeamId !== this.props.currentTeamId && this.props.enableWebSocketEventScope) {
if (prevProps.currentTeamId !== this.props.currentTeamId) {
WebSocketClient.updateActiveTeam(this.props.currentTeamId);
}
}

5
webapp/channels/src/components/threading/thread_viewer/index.ts
Просмотреть файл

@@ -6,7 +6,6 @@ import {bindActionCreators} from 'redux';
import type {Dispatch} from 'redux';
import type {Channel} from '@mattermost/types/channels';
import type {ClientConfig} from '@mattermost/types/config';
import type {UserThread} from '@mattermost/types/threads';
import {fetchRHSAppsBindings} from 'mattermost-redux/actions/apps';
@@ -14,7 +13,6 @@ import {getNewestPostThread, getPostThread} from 'mattermost-redux/actions/posts
import {getThread as fetchThread, updateThreadRead} from 'mattermost-redux/actions/threads';
import {appsEnabled} from 'mattermost-redux/selectors/entities/apps';
import {makeGetChannel} from 'mattermost-redux/selectors/entities/channels';
import {getConfig} from 'mattermost-redux/selectors/entities/general';
import {getPost, makeGetPostIdsForThread} from 'mattermost-redux/selectors/entities/posts';
import {isCollapsedThreadsEnabled} from 'mattermost-redux/selectors/entities/preferences';
import {getCurrentTeamId} from 'mattermost-redux/selectors/entities/teams';
@@ -45,8 +43,6 @@ function makeMapStateToProps() {
const socketStatus = getSocketStatus(state);
const highlightedPostId = getHighlightedPostId(state);
const selectedPostFocusedAt = getSelectedPostFocussedAt(state);
const config: Partial<ClientConfig> = getConfig(state);
const enableWebSocketEventScope = config.FeatureFlagWebSocketEventScope === 'true';
let postIds: string[] = [];
let userThread: UserThread | null = null;
@@ -70,7 +66,6 @@ function makeMapStateToProps() {
channel,
highlightedPostId,
selectedPostFocusedAt,
enableWebSocketEventScope,
};
};
}

1
webapp/channels/src/components/threading/thread_viewer/thread_viewer.test.tsx
Просмотреть файл

@@ -68,7 +68,6 @@ describe('components/threading/ThreadViewer', () => {
appsEnabled: true,
rootPostId: post.id,
isThreadView: true,
enableWebSocketEventScope: false,
};
test('should match snapshot', async () => {

13
webapp/channels/src/components/threading/thread_viewer/thread_viewer.tsx
Просмотреть файл

@@ -53,7 +53,6 @@ export type Props = Attrs & {
inputPlaceholder?: string;
rootPostId: string;
fromSuppressed?: boolean;
enableWebSocketEventScope: boolean;
};
type State = {
@@ -82,9 +81,7 @@ export default class ThreadViewer extends React.PureComponent<Props, State> {
}
public componentWillUnmount() {
if (this.props.enableWebSocketEventScope) {
WebSocketClient.updateActiveThread(this.props.isThreadView, '');
}
WebSocketClient.updateActiveThread(this.props.isThreadView, '');
}
public componentDidUpdate(prevProps: Props) {
@@ -173,7 +170,11 @@ export default class ThreadViewer extends React.PureComponent<Props, State> {
// scrolls to either bottom or new messages line
private onInit = async (reconnected = false): Promise<void> => {
this.setState({isLoading: !reconnected});
await this.props.actions.getPostThread(this.props.selected?.id || this.props.rootPostId, !reconnected);
if (reconnected || this.morePostsToFetch()) {
await this.props.actions.getPostThread(this.props.selected?.id || this.props.rootPostId, !reconnected);
} else {
await this.props.actions.getNewestPostThread(this.props.selected?.id || this.props.rootPostId);
}
if (
this.props.isCollapsedThreadsEnabled &&
@@ -182,7 +183,7 @@ export default class ThreadViewer extends React.PureComponent<Props, State> {
await this.fetchThread();
}
if (this.props.channel && this.props.enableWebSocketEventScope) {
if (this.props.channel) {
WebSocketClient.updateActiveThread(this.props.isThreadView, this.props.channel?.id);
}
this.setState({isLoading: false});

2
webapp/channels/src/packages/mattermost-redux/src/action_types/posts.ts
Просмотреть файл

@@ -41,8 +41,6 @@ export default keyMirror({
POST_DELETED: null,
POST_REMOVED: null,
POST_PINNED_CHANGED: null,
RECEIVED_FOCUSED_POST: null,
RECEIVED_EDIT_POST: null,
RECEIVED_REACTION: null,

152
webapp/channels/src/packages/mattermost-redux/src/actions/posts.test.ts
Просмотреть файл

@@ -1131,115 +1131,87 @@ describe('Actions.Posts', () => {
expect(state.entities.teams.myMembers[teamId].mention_count).toBe(1);
});
describe('pinPost', () => {
test('should update post and channel stats', async () => {
nock(Client4.getBaseRoute()).
get(`/channels/${TestHelper.basicChannel!.id}/stats?exclude_files_count=true`).
reply(200, {channel_id: TestHelper.basicChannel!.id, member_count: 1, pinnedpost_count: 0});
await store.dispatch(getChannelStats(TestHelper.basicChannel!.id));
it('pinPost', async () => {
const {dispatch, getState} = store;
const post = TestHelper.fakePostWithId(TestHelper.basicChannel!.id);
store.dispatch(Actions.receivedPost(post));
nock(Client4.getBaseRoute()).
get(`/channels/${TestHelper.basicChannel!.id}/stats?exclude_files_count=true`).
reply(200, {channel_id: TestHelper.basicChannel!.id, member_count: 1, pinnedpost_count: 0});
nock(Client4.getBaseRoute()).
post(`/posts/${post.id}/pin`).
reply(200, OK_RESPONSE);
await dispatch(getChannelStats(TestHelper.basicChannel!.id));
const result = await store.dispatch(Actions.pinPost(post.id));
expect(result.error).toBeUndefined();
nock(Client4.getBaseRoute()).
post('/posts').
reply(201, TestHelper.fakePostWithId(TestHelper.basicChannel!.id));
const post1 = await Client4.createPost(
TestHelper.fakePost(TestHelper.basicChannel!.id),
);
const state = store.getState();
expect(state.entities.posts.posts[post.id].is_pinned).toBe(true);
expect(state.entities.channels.stats[TestHelper.basicChannel!.id].pinnedpost_count).toBe(1);
});
const postList = {order: [post1.id], posts: {}} as PostList;
postList.posts[post1.id] = post1;
test('MM-14115 should not clobber reactions on pinned post', async () => {
const post = TestHelper.getPostMock({
id: TestHelper.generateId(),
metadata: {
embeds: [],
emojis: [],
files: [],
images: {},
reactions: [
TestHelper.getReactionMock({emoji_name: 'test'}),
],
},
});
nock(Client4.getBaseRoute()).
get(`/posts/${post1.id}/thread?skipFetchThreads=false&collapsedThreads=true&collapsedThreadsExtended=false&direction=down&perPage=60`).
reply(200, postList);
await dispatch(Actions.getPostThread(post1.id));
store.dispatch(Actions.receivedPost(post));
nock(Client4.getBaseRoute()).
post(`/posts/${post1.id}/pin`).
reply(200, OK_RESPONSE);
await dispatch(Actions.pinPost(post1.id));
let state = store.getState();
expect(state.entities.posts.posts[post.id].is_pinned).toBe(false);
expect(Object.keys(state.entities.posts.reactions[post.id])).toHaveLength(1);
const state = getState();
const {stats} = state.entities.channels;
const post = state.entities.posts.posts[post1.id];
const pinnedPostCount = stats[TestHelper.basicChannel!.id].pinnedpost_count;
nock(Client4.getBaseRoute()).
post(`/posts/${post.id}/pin`).
reply(200, OK_RESPONSE);
const result = await store.dispatch(Actions.pinPost(post.id));
expect(result.error).toBeUndefined();
state = store.getState();
expect(state.entities.posts.posts[post.id].is_pinned).toBe(true);
expect(Object.keys(state.entities.posts.reactions[post.id])).toHaveLength(1);
});
expect(post).toBeTruthy();
expect(post.is_pinned === true).toBeTruthy();
expect(pinnedPostCount === 1).toBeTruthy();
});
describe('unpinPost', () => {
test('should update post and channel stats', async () => {
nock(Client4.getBaseRoute()).
get(`/channels/${TestHelper.basicChannel!.id}/stats?exclude_files_count=true`).
reply(200, {channel_id: TestHelper.basicChannel!.id, member_count: 1, pinnedpost_count: 1});
await store.dispatch(getChannelStats(TestHelper.basicChannel!.id));
it('unpinPost', async () => {
const {dispatch, getState} = store;
const post = TestHelper.fakePostWithId(TestHelper.basicChannel!.id);
store.dispatch(Actions.receivedPost(post));
nock(Client4.getBaseRoute()).
get(`/channels/${TestHelper.basicChannel!.id}/stats?exclude_files_count=true`).
reply(200, {channel_id: TestHelper.basicChannel!.id, member_count: 1, pinnedpost_count: 0});
nock(Client4.getBaseRoute()).
post(`/posts/${post.id}/unpin`).
reply(200, OK_RESPONSE);
await dispatch(getChannelStats(TestHelper.basicChannel!.id));
const result = await store.dispatch(Actions.unpinPost(post.id));
expect(result.error).toBeUndefined();
nock(Client4.getBaseRoute()).
post('/posts').
reply(201, TestHelper.fakePostWithId(TestHelper.basicChannel!.id));
const post1 = await Client4.createPost(
TestHelper.fakePost(TestHelper.basicChannel!.id),
);
const state = store.getState();
expect(state.entities.posts.posts[post.id].is_pinned).toBe(false);
expect(state.entities.channels.stats[TestHelper.basicChannel!.id].pinnedpost_count).toBe(0);
});
const postList = {order: [post1.id], posts: {}} as PostList;
postList.posts[post1.id] = post1;
test('MM-14115 should not clobber reactions on pinned post', async () => {
const post = TestHelper.getPostMock({
id: TestHelper.generateId(),
is_pinned: true,
metadata: {
embeds: [],
emojis: [],
files: [],
images: {},
reactions: [
TestHelper.getReactionMock({emoji_name: 'test'}),
],
},
});
nock(Client4.getBaseRoute()).
get(`/posts/${post1.id}/thread?skipFetchThreads=false&collapsedThreads=true&collapsedThreadsExtended=false&direction=down&perPage=60`).
reply(200, postList);
await dispatch(Actions.getPostThread(post1.id));
store.dispatch(Actions.receivedPost(post));
nock(Client4.getBaseRoute()).
post(`/posts/${post1.id}/pin`).
reply(200, OK_RESPONSE);
await dispatch(Actions.pinPost(post1.id));
let state = store.getState();
expect(state.entities.posts.posts[post.id].is_pinned).toBe(true);
expect(Object.keys(state.entities.posts.reactions[post.id])).toHaveLength(1);
nock(Client4.getBaseRoute()).
post(`/posts/${post1.id}/unpin`).
reply(200, OK_RESPONSE);
await dispatch(Actions.unpinPost(post1.id));
nock(Client4.getBaseRoute()).
post(`/posts/${post.id}/unpin`).
reply(200, OK_RESPONSE);
const state = getState();
const {stats} = state.entities.channels;
const post = state.entities.posts.posts[post1.id];
const pinnedPostCount = stats[TestHelper.basicChannel!.id].pinnedpost_count;
const result = await store.dispatch(Actions.unpinPost(post.id));
expect(result.error).toBeUndefined();
state = store.getState();
expect(state.entities.posts.posts[post.id].is_pinned).toBe(false);
expect(Object.keys(state.entities.posts.reactions[post.id])).toHaveLength(1);
});
expect(post).toBeTruthy();
expect(post.is_pinned === false).toBeTruthy();
expect(pinnedPostCount === 0).toBeTruthy();
});
it('addReaction', async () => {

21
webapp/channels/src/packages/mattermost-redux/src/actions/posts.ts
Просмотреть файл

@@ -137,15 +137,6 @@ export function postRemoved(post: Post) {
};
}
export function postPinnedChanged(postId: string, isPinned: boolean, updateAt = Date.now()) {
return {
type: PostTypes.POST_PINNED_CHANGED,
postId,
isPinned,
updateAt,
};
}
export function getPost(postId: string): ActionFuncAsync<Post> {
return async (dispatch, getState) => {
let post;
@@ -534,7 +525,11 @@ export function pinPost(postId: string): ActionFuncAsync {
const post = PostSelectors.getPost(state, postId);
if (post) {
actions.push(
postPinnedChanged(postId, true, Date.now()),
receivedPost({
...post,
is_pinned: true,
update_at: Date.now(),
}, isCollapsedThreadsEnabled(state)),
{
type: ChannelTypes.INCREMENT_PINNED_POST_COUNT,
id: post.channel_id,
@@ -582,7 +577,11 @@ export function unpinPost(postId: string): ActionFuncAsync {
const post = PostSelectors.getPost(state, postId);
if (post) {
actions.push(
postPinnedChanged(postId, false, Date.now()),
receivedPost({
...post,
is_pinned: false,
update_at: Date.now(),
}, isCollapsedThreadsEnabled(state)),
decrementPinnedPostCount(post.channel_id),
);
}

247
webapp/channels/src/packages/mattermost-redux/src/reducers/entities/posts.test.ts
Просмотреть файл

@@ -3615,116 +3615,79 @@ describe('reactions', () => {
PostTypes.RECEIVED_POST,
]) {
describe(`single post received (${actionType})`, () => {
it('should not store anything for a post first received without metadata', () => {
// This shouldn't occur based on our type definitions, but it is possible
const post = TestHelper.getPostMock({
id: 'post',
});
(post as any).metadata = undefined;
it('no post metadata', () => {
const state = deepFreeze({});
const action = {
type: actionType,
data: post,
};
const nextState = reducers.reactions(state, action);
expect(nextState).toBe(state);
});
it('should not change stored state for a post received without metadata', () => {
// This shouldn't occur based on our type definitions, but it is possible
const post = TestHelper.getPostMock({
id: 'post',
});
(post as any).metadata = undefined;
const state = deepFreeze({
post: {
'user-taco': TestHelper.getReactionMock({user_id: 'user', emoji_name: 'taco'}),
data: {
id: 'post',
},
});
const action = {
type: actionType,
data: post,
};
const nextState = reducers.reactions(state, action);
expect(nextState).toBe(state);
expect(nextState).toEqual(state);
});
it('should store when a post is first received without reactions', () => {
const post = TestHelper.getPostMock({
id: 'post',
});
post.metadata.reactions = undefined;
it('no reactions in post metadata', () => {
const state = deepFreeze({});
const action = {
type: actionType,
data: post,
data: {
id: 'post',
metadata: {reactions: []},
},
};
const nextState = reducers.reactions(state, action);
expect(nextState).not.toBe(state);
expect(nextState).not.toEqual(state);
expect(nextState).toEqual({
post: {},
});
});
it('should remove existing reactions when a post is received without reactions', () => {
const post = TestHelper.getPostMock({
id: 'post',
});
post.metadata.reactions = undefined;
const state = deepFreeze({
post: {
'user-taco': TestHelper.getReactionMock({user_id: 'abcd', emoji_name: '+1'}),
},
});
it('should not clobber reactions when metadata empty', () => {
const state = deepFreeze({post: {name: 'smiley', post_id: 'post'}});
const action = {
type: actionType,
data: post,
data: {
id: 'post',
metadata: {},
},
};
const nextState = reducers.reactions(state, action);
expect(nextState).not.toBe(state);
expect(nextState).toEqual({
post: {},
post: {name: 'smiley', post_id: 'post'},
});
});
it('should save reactions', () => {
const reactions = [
TestHelper.getReactionMock({user_id: 'abcd', emoji_name: '+1'}),
TestHelper.getReactionMock({user_id: 'efgh', emoji_name: '+1'}),
TestHelper.getReactionMock({user_id: 'abcd', emoji_name: '-1'}),
];
const state = deepFreeze({});
const action = {
type: actionType,
data: TestHelper.getPostMock({
data: {
id: 'post',
metadata: {
reactions,
reactions: [
{user_id: 'abcd', emoji_name: '+1'},
{user_id: 'efgh', emoji_name: '+1'},
{user_id: 'abcd', emoji_name: '-1'},
],
},
}),
},
};
const nextState = reducers.reactions(state, action);
expect(nextState).not.toBe(state);
expect(nextState).not.toEqual(state);
expect(nextState).toEqual({
post: {
'abcd-+1': reactions[0],
'efgh-+1': reactions[1],
'abcd--1': reactions[2],
'abcd-+1': {user_id: 'abcd', emoji_name: '+1'},
'efgh-+1': {user_id: 'efgh', emoji_name: '+1'},
'abcd--1': {user_id: 'abcd', emoji_name: '-1'},
},
});
});
@@ -3733,10 +3696,10 @@ describe('reactions', () => {
const state = deepFreeze({});
const action = {
type: actionType,
data: TestHelper.getPostMock({
data: {
id: 'post',
delete_at: 1571366424287,
}),
delete_at: '1571366424287',
},
};
const nextState = reducers.reactions(state, action);
@@ -3747,218 +3710,150 @@ describe('reactions', () => {
}
describe('receiving multiple posts', () => {
it('should not store anything for a post first received without metadata', () => {
// This shouldn't occur based on our type definitions, but it is possible
const post = TestHelper.getPostMock({
id: 'post',
});
(post as any).metadata = undefined;
it('no post metadata', () => {
const state = deepFreeze({});
const action = {
type: PostTypes.RECEIVED_POSTS,
data: {
posts: {
post,
post: {
id: 'post',
},
},
},
};
const nextState = reducers.reactions(state, action);
expect(state).toBe(nextState);
expect(nextState).toEqual(state);
});
it('should not change stored state for a post received without metadata', () => {
// This shouldn't occur based on our type definitions, but it is possible
const post = TestHelper.getPostMock({
id: 'post',
});
(post as any).metadata = undefined;
const state = deepFreeze({
post: {
'user-taco': TestHelper.getReactionMock({user_id: 'abcd', emoji_name: '+1'}),
},
});
const action = {
type: PostTypes.RECEIVED_POSTS,
data: {
posts: {
post,
},
},
};
const nextState = reducers.reactions(state, action);
expect(state).toBe(nextState);
});
it('should store when a post is first received without reactions', () => {
const post = TestHelper.getPostMock({
id: 'post',
});
post.metadata.reactions = undefined;
it('no reactions in post metadata', () => {
const state = deepFreeze({});
const action = {
type: PostTypes.RECEIVED_POSTS,
data: {
posts: {
post,
post: {
id: 'post',
metadata: {reactions: []},
},
},
},
};
const nextState = reducers.reactions(state, action);
expect(nextState).not.toBe(state);
expect(nextState).toEqual({
post: {},
});
});
it('should remove existing reactions when a post is received without reactions', () => {
const post = TestHelper.getPostMock({
id: 'post',
});
post.metadata.reactions = undefined;
const state = deepFreeze({
post: {
'user-taco': TestHelper.getReactionMock({user_id: 'abcd', emoji_name: '+1'}),
},
});
const action = {
type: PostTypes.RECEIVED_POSTS,
data: {
posts: {
post,
},
},
};
const nextState = reducers.reactions(state, action);
expect(nextState).not.toBe(state);
expect(nextState).not.toEqual(state);
expect(nextState).toEqual({
post: {},
});
});
it('should save reactions', () => {
const reactions = [
TestHelper.getReactionMock({user_id: 'abcd', emoji_name: '+1'}),
TestHelper.getReactionMock({user_id: 'efgh', emoji_name: '+1'}),
TestHelper.getReactionMock({user_id: 'abcd', emoji_name: '-1'}),
];
const state = deepFreeze({});
const action = {
type: PostTypes.RECEIVED_POSTS,
data: {
posts: {
post: TestHelper.getPostMock({
post: {
id: 'post',
metadata: {
reactions,
reactions: [
{user_id: 'abcd', emoji_name: '+1'},
{user_id: 'efgh', emoji_name: '+1'},
{user_id: 'abcd', emoji_name: '-1'},
],
},
}),
},
},
},
};
const nextState = reducers.reactions(state, action);
expect(nextState).not.toBe(state);
expect(nextState).not.toEqual(state);
expect(nextState).toEqual({
post: {
'abcd-+1': reactions[0],
'efgh-+1': reactions[1],
'abcd--1': reactions[2],
'abcd-+1': {user_id: 'abcd', emoji_name: '+1'},
'efgh-+1': {user_id: 'efgh', emoji_name: '+1'},
'abcd--1': {user_id: 'abcd', emoji_name: '-1'},
},
});
});
it('should save reactions for multiple posts', () => {
const reaction1 = TestHelper.getReactionMock({user_id: 'abcd', emoji_name: '+1'});
const reaction2 = TestHelper.getReactionMock({user_id: 'abcd', emoji_name: '-1'});
const state = deepFreeze({});
const action = {
type: PostTypes.RECEIVED_POSTS,
data: {
posts: {
post1: TestHelper.getPostMock({
post1: {
id: 'post1',
metadata: {
reactions: [
reaction1,
{user_id: 'abcd', emoji_name: '+1'},
],
},
}),
post2: TestHelper.getPostMock({
},
post2: {
id: 'post2',
metadata: {
reactions: [
reaction2,
{user_id: 'abcd', emoji_name: '-1'},
],
},
}),
},
},
},
};
const nextState = reducers.reactions(state, action);
expect(nextState).not.toBe(state);
expect(nextState).not.toEqual(state);
expect(nextState).toEqual({
post1: {
'abcd-+1': reaction1,
'abcd-+1': {user_id: 'abcd', emoji_name: '+1'},
},
post2: {
'abcd--1': reaction2,
'abcd--1': {user_id: 'abcd', emoji_name: '-1'},
},
});
});
it('should save reactions for multiple posts except deleted posts', () => {
const reaction1 = TestHelper.getReactionMock({user_id: 'abcd', emoji_name: '+1'});
const reaction2 = TestHelper.getReactionMock({user_id: 'abcd', emoji_name: '-1'});
const state = deepFreeze({});
const action = {
type: PostTypes.RECEIVED_POSTS,
data: {
posts: {
post1: TestHelper.getPostMock({
post1: {
id: 'post1',
metadata: {
reactions: [
reaction1,
{user_id: 'abcd', emoji_name: '+1'},
],
},
}),
post2: TestHelper.getPostMock({
},
post2: {
id: 'post2',
delete_at: 1571366424287,
delete_at: '1571366424287',
metadata: {
reactions: [
reaction2,
{user_id: 'abcd', emoji_name: '-1'},
],
},
}),
},
},
},
};
const nextState = reducers.reactions(state, action);
expect(nextState).not.toBe(state);
expect(nextState).not.toEqual(state);
expect(nextState).toEqual({
post1: {
'abcd-+1': reaction1,
'abcd-+1': {user_id: 'abcd', emoji_name: '+1'},
},
});
});

23
webapp/channels/src/packages/mattermost-redux/src/reducers/entities/posts.ts
Просмотреть файл

@@ -158,7 +158,7 @@ export function nextPostsReplies(state: {[x in Post['id']]: number} = {}, action
}
}
export function handlePosts(state: IDMappedObjects<Post> = {}, action: AnyAction) {
export function handlePosts(state: RelationOneToOne<Post, Post> = {}, action: AnyAction) {
switch (action.type) {
case PostTypes.RECEIVED_POST:
case PostTypes.RECEIVED_NEW_POST: {
@@ -263,23 +263,6 @@ export function handlePosts(state: IDMappedObjects<Post> = {}, action: AnyAction
return nextState;
}
case PostTypes.POST_PINNED_CHANGED: {
const {postId, isPinned, updateAt} = action;
if (!state[postId]) {
return state;
}
return {
...state,
[postId]: {
...state[postId],
is_pinned: isPinned,
last_update_at: updateAt,
},
};
}
case ChannelTypes.RECEIVED_CHANNEL_DELETED:
case ChannelTypes.DELETE_CHANNEL_SUCCESS:
case ChannelTypes.LEAVE_CHANNEL: {
@@ -1307,8 +1290,8 @@ export function acknowledgements(state: RelationOneToOne<Post, Record<UserProfil
}
}
function storeReactionsForPost(state: RelationOneToOne<Post, Record<string, Reaction>>, post: Post) {
if (!post.metadata || post.delete_at > 0) {
function storeReactionsForPost(state: any, post: Post) {
if (!post.metadata || !post.metadata.reactions || post.delete_at > 0) {
return state;
}

11
webapp/channels/src/packages/mattermost-redux/test/test_helper.ts
Просмотреть файл

@@ -12,7 +12,6 @@ import type {FileInfo} from '@mattermost/types/files';
import type {Group} from '@mattermost/types/groups';
import type {Command, DialogElement, OAuthApp} from '@mattermost/types/integrations';
import type {Post, PostMetadata} from '@mattermost/types/posts';
import type {Reaction} from '@mattermost/types/reactions';
import type {Role} from '@mattermost/types/roles';
import type {Scheme} from '@mattermost/types/schemes';
import type {Team, TeamMembership} from '@mattermost/types/teams';
@@ -724,16 +723,6 @@ class TestHelper {
};
}
getReactionMock(override: Partial<Reaction> = {}): Reaction {
return {
user_id: '',
post_id: '',
emoji_name: '',
create_at: 0,
...override,
};
}
mockLogin = () => {
const clientBaseRoute = this.basicClient4!.getBaseRoute();
nock(clientBaseRoute).

12
webapp/channels/src/utils/test_helper.ts
Просмотреть файл

@@ -319,7 +319,7 @@ export class TestHelper {
return Object.assign({}, defaultOutgoingWebhook, override);
}
public static getPostMock(override: Omit<Partial<Post>, 'metadata'> & {metadata?: Partial<Post['metadata']>} = {}): Post {
public static getPostMock(override: Partial<Post> = {}): Post {
const defaultPost: Post = {
edit_at: 0,
original_id: '',
@@ -345,15 +345,7 @@ export class TestHelper {
update_at: 0,
user_id: 'user_id',
};
return {
...defaultPost,
...override,
metadata: {
...defaultPost.metadata,
...override.metadata,
},
};
return Object.assign({}, defaultPost, override);
}
public static getFileInfoMock(override: Partial<FileInfo> = {}): FileInfo {

1
webapp/platform/types/src/config.ts
Просмотреть файл

@@ -121,7 +121,6 @@ export type ClientConfig = {
FileLevel: string;
FeatureFlagAppsEnabled: string;
FeatureFlagCallsEnabled: string;
FeatureFlagWebSocketEventScope: string;
ForgotPasswordLink: string;
GiphySdkKey: string;
GoogleDeveloperKey: string;

2
webapp/platform/types/src/posts.ts
Просмотреть файл

@@ -66,7 +66,7 @@ export type PostMetadata = {
emojis: CustomEmoji[];
files: FileInfo[];
images: Record<string, PostImage>;
reactions?: Reaction[];
reactions: Reaction[];
priority?: PostPriorityMetadata;
acknowledgements?: PostAcknowledgement[];
};