toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

MM-22375: Remove mark as unread post option in archived channels (#3922)

Browse source 
* Remove mark as unread post option for archived channels and revise tests

* revised tests
This commit is contained in:
ami9000 2020-02-26 15:40:53 -08:00 committed by GitHub
parent 655bca6711
commit b46996a841
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/screens/post_options/index.js
View file

@ -45,8 +45,8 @@ export function makeMapStateToProps() {
const reactions = getReactionsForPostSelector(state, post.id);
const channelIsArchived = channel.delete_at !== 0;
const {serverVersion} = state.entities.general;
const canMarkAsUnread = isMinimumServerVersion(serverVersion, 5, 18);
let canMarkAsUnread = true;
let canAddReaction = true;
let canReply = true;
let canCopyPermalink = true;
@ -107,6 +107,10 @@ export function makeMapStateToProps() {
canAddReaction = false;
}
if (!isMinimumServerVersion(serverVersion, 5, 18) || channelIsArchived) {
canMarkAsUnread = false;
}
return {
...getDimensions(state),
canAddReaction,

46
app/screens/post_options/index.test.js
View file

@ -9,6 +9,9 @@ import * as commonSelectors from 'mattermost-redux/selectors/entities/common';
import * as teamSelectors from 'mattermost-redux/selectors/entities/teams';
import * as deviceSelectors from 'app/selectors/device';
import * as preferencesSelectors from 'mattermost-redux/selectors/entities/preferences';
import {isMinimumServerVersion} from 'mattermost-redux/utils/helpers';
jest.mock('mattermost-redux/utils/post_utils');
channelSelectors.getChannel = jest.fn();
channelSelectors.getCurrentChannelId = jest.fn();
@ -69,13 +72,27 @@ describe('makeMapStateToProps', () => {
expect(props.canFlag).toBe(true);
});
test('canMarkAsUnread is true when isMinimumServerVersion is 5.18v', () => {
test('canMarkAsUnread is true when isMinimumServerVersion is 5.18v and channel not archived', () => {
channelSelectors.getChannel = jest.fn().mockReturnValueOnce({
delete_at: 0,
});
const mapStateToProps = makeMapStateToProps();
const props = mapStateToProps(baseState, baseOwnProps);
expect(isMinimumServerVersion(baseState.entities.general.serverVersion, 5, 18)).toBe(true);
expect(props.canMarkAsUnread).toBe(true);
});
test('canMarkAsUnread is false when isMinimumServerVersion is not 5.18v', () => {
test('canMarkAsUnread is false when isMinimumServerVersion is 5.18v and channel is archived', () => {
channelSelectors.getChannel = jest.fn().mockReturnValueOnce({
delete_at: 1,
});
const mapStateToProps = makeMapStateToProps();
const props = mapStateToProps(baseState, baseOwnProps);
expect(isMinimumServerVersion(baseState.entities.general.serverVersion, 5, 18)).toBe(true);
expect(props.canMarkAsUnread).toBe(false);
});
test('canMarkAsUnread is false when isMinimumServerVersion is not 5.18v and channel is not archived', () => {
const state = {
entities: {
...baseState.entities,
@ -85,8 +102,33 @@ describe('makeMapStateToProps', () => {
},
};
channelSelectors.getChannel = jest.fn().mockReturnValueOnce({
delete_at: 0,
});
const mapStateToProps = makeMapStateToProps();
const props = mapStateToProps(state, baseOwnProps);
expect(isMinimumServerVersion(state.entities.general.serverVersion, 5, 18)).toBe(false);
expect(props.canMarkAsUnread).toBe(false);
});
test('canMarkAsUnread is false when isMinimumServerVersion is not 5.18v and channel is archived', () => {
const state = {
entities: {
...baseState.entities,
general: {
serverVersion: '5.17',
},
},
};
channelSelectors.getChannel = jest.fn().mockReturnValueOnce({
delete_at: 1,
});
const mapStateToProps = makeMapStateToProps();
const props = mapStateToProps(state, baseOwnProps);
expect(isMinimumServerVersion(state.entities.general.serverVersion, 5, 18)).toBe(false);
expect(props.canMarkAsUnread).toBe(false);
});
});