Ensure currentChannel set (#4288)
This commit is contained in:
parent
ee5d336190
commit
94bdd8e430
2 changed files with 22 additions and 1 deletions
|
|
@ -48,7 +48,7 @@ export function mapStateToProps(state, ownProps) {
|
|||
|
||||
let canPost = true;
|
||||
let useChannelMentions = true;
|
||||
if (isMinimumServerVersion(state.entities.general.serverVersion, 5, 22)) {
|
||||
if (currentChannel && isMinimumServerVersion(state.entities.general.serverVersion, 5, 22)) {
|
||||
canPost = haveIChannelPermission(
|
||||
state,
|
||||
{
|
||||
|
|
|
|||
|
|
@ -101,4 +101,25 @@ describe('mapStateToProps', () => {
|
|||
default: true,
|
||||
});
|
||||
});
|
||||
|
||||
test('haveIChannelPermission is not called when isMinimumServerVersion is 5.22v but currentChannel is null', () => {
|
||||
channelSelectors.getCurrentChannel = jest.fn().mockReturnValue(null);
|
||||
|
||||
const state = {...baseState};
|
||||
state.entities.general.serverVersion = '5.22';
|
||||
|
||||
mapStateToProps(state, baseOwnProps);
|
||||
expect(isMinimumServerVersion(state.entities.general.serverVersion, 5, 22)).toBe(true);
|
||||
|
||||
expect(roleSelectors.haveIChannelPermission).not.toHaveBeenCalledWith(state, {
|
||||
channel: undefined,
|
||||
team: undefined,
|
||||
permission: Permissions.CREATE_POST,
|
||||
});
|
||||
|
||||
expect(roleSelectors.haveIChannelPermission).not.toHaveBeenCalledWith(state, {
|
||||
channel: undefined,
|
||||
permission: Permissions.USE_CHANNEL_MENTIONS,
|
||||
});
|
||||
});
|
||||
});
|
||||
Loading…
Reference in a new issue