scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-28 01:56:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4751 from picklesrus/timeout-mute

Browse source 
Fix isMuted so it doesn't do an extra unit conversion.
This commit is contained in:
picklesrus 2020-12-14 20:22:43 -05:00 committed by GitHub
commit 299058cd9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 56 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/views/preview/comment/compose-comment.jsx
View file

@ -48,7 +48,7 @@ class ComposeComment extends React.Component {
error: null,
appealId: null,
muteOpen: false,
muteExpiresAt: this.props.muteStatus.muteExpiresAt * 1000 // convert to ms
muteExpiresAtMs: this.props.muteStatus.muteExpiresAt * 1000 // convert to ms
};
}
handleInput (event) {
@ -78,10 +78,10 @@ class ComposeComment extends React.Component {
}
if (body.rejected && this.state.status === ComposeStatus.SUBMITTING) {
let muteOpen = false;
let muteExpiresAt = 0;
let muteExpiresAtMs = 0;
let rejectedStatus = ComposeStatus.REJECTED;
if (body.status && body.status.mute_status) {
muteExpiresAt = body.status.mute_status.muteExpiresAt * 1000; // convert to ms
muteExpiresAtMs = body.status.mute_status.muteExpiresAt * 1000; // convert to ms
rejectedStatus = ComposeStatus.REJECTED_MUTE;
if (this.shouldShowMuteModal(body.status.mute_status.offenses)) {
muteOpen = true;
@ -93,7 +93,7 @@ class ComposeComment extends React.Component {
error: body.rejected,
appealId: body.appealId,
muteOpen: muteOpen,
muteExpiresAt: muteExpiresAt
muteExpiresAtMs: muteExpiresAtMs
});
return;
}
@ -118,7 +118,7 @@ class ComposeComment extends React.Component {
}
isMuted () {
return this.state.muteExpiresAt * 1000 > Date.now();
return this.state.muteExpiresAtMs > Date.now();
}
handleMuteClose () {
@ -189,7 +189,7 @@ class ComposeComment extends React.Component {
id="comments.muted.duration"
values={{
inDuration:
formatTime.formatRelativeTime(this.state.muteExpiresAt, window._locale)
formatTime.formatRelativeTime(this.state.muteExpiresAtMs, window._locale)
}}
/> <FormattedMessage id="comments.muted.commentingPaused" />
</p>
@ -205,7 +205,6 @@ class ComposeComment extends React.Component {
</a>
)}}
/>
</p>
</CommentingStatus>
</FlexRow>
@ -288,7 +287,7 @@ class ComposeComment extends React.Component {
className="mod-mute"
muteModalMessages={this.getMuteMessageInfo()}
shouldCloseOnOverlayClick={false}
timeMuted={formatTime.formatRelativeTime(this.state.muteExpiresAt, window._locale)}
timeMuted={formatTime.formatRelativeTime(this.state.muteExpiresAtMs, window._locale)}
onRequestClose={this.handleMuteClose}
/>
) : null}

57
test/unit/components/compose-comment.test.jsx
View file

@ -14,7 +14,7 @@ describe('Compose Comment test', () => {
}
});
let store;
let defaultStore;
beforeEach(() => {
const mockFormat = {
format: jest.fn()
@ -24,7 +24,7 @@ describe('Compose Comment test', () => {
.mockImplementation(() => mockFormat);
mockFormat.format.mockReturnValue('');
store = mockStore({
defaultStore = mockStore({
session: {
session: {
user: {},
@ -36,7 +36,10 @@ describe('Compose Comment test', () => {
});
});
const getComposeCommentWrapper = props => {
const getComposeCommentWrapper = (props, store) => {
if (!store) {
store = defaultStore;
}
const wrapper = shallowWithIntl(
<ComposeComment
{...defaultProps()}
@ -45,7 +48,7 @@ describe('Compose Comment test', () => {
/>
, {context: {store}}
);
return wrapper.dive(); // unwrap redux connect(injectIntl(JoinFlow))
return wrapper.dive(); // unwrap redux connect(injectIntl(ComposeComment))
};
test('Modal & Comment status do not show ', () => {
@ -82,7 +85,7 @@ describe('Compose Comment test', () => {
global.Date.now = () => 0;
const component = getComposeCommentWrapper({});
const commentInstance = component.instance();
commentInstance.setState({muteExpiresAt: 100});
commentInstance.setState({muteExpiresAtMs: 100});
component.update();
// Compose box should be hidden if muted unless they got muted due to a comment they just posted.
expect(component.find('FlexRow.compose-comment').exists()).toEqual(false);
@ -90,6 +93,34 @@ describe('Compose Comment test', () => {
expect(component.find('CommentingStatus').exists()).toEqual(true);
global.Date.now = realDateNow;
});
test('Comment Status initialized properly when muted', () => {
const realDateNow = Date.now.bind(global.Date);
global.Date.now = () => 0;
const mutedStore = mockStore({
session: {
session: {
user: {},
permissions: {
mute_status: {
muteExpiresAt: 5,
offenses: []
}
}
}
}
});
const component = getComposeCommentWrapper({}, mutedStore);
const commentInstance = component.instance();
// Check conversion to ms from seconds is done at init time.
expect(commentInstance.state.muteExpiresAtMs).toEqual(5 * 1000);
// Compose box should be hidden if muted unless they got muted due to a comment they just posted.
expect(component.find('FlexRow.compose-comment').exists()).toEqual(false);
expect(component.find('MuteModal').exists()).toEqual(false);
expect(component.find('CommentingStatus').exists()).toEqual(true);
global.Date.now = realDateNow;
});
test('Comment Status shows when user just submitted a comment that got them muted', () => {
const realDateNow = Date.now.bind(global.Date);
global.Date.now = () => 0;
@ -97,7 +128,7 @@ describe('Compose Comment test', () => {
const commentInstance = component.instance();
commentInstance.setState({
status: 'REJECTED_MUTE',
muteExpiresAt: 100
muteExpiresAtMs: 100
});
component.update();
expect(component.find('FlexRow.compose-comment').exists()).toEqual(true);
@ -139,6 +170,16 @@ describe('Compose Comment test', () => {
test('Mute Modal shows when muteOpen is true ', () => {
const realDateNow = Date.now.bind(global.Date);
global.Date.now = () => 0;
const store = mockStore({
session: {
session: {
user: {},
permissions: {
mute_status: {}
}
}
}
});
const component = mountWithIntl(
<ComposeComment
{...defaultProps()}
@ -203,7 +244,7 @@ describe('Compose Comment test', () => {
global.Date.now = () => 0; // Set "now" to 0 for easier testing.
const commentInstance = getComposeCommentWrapper({}).instance();
commentInstance.setState({muteExpiresAt: 100});
commentInstance.setState({muteExpiresAtMs: 100});
expect(commentInstance.isMuted()).toBe(true);
global.Date.now = realDateNow;
});
@ -213,7 +254,7 @@ describe('Compose Comment test', () => {
global.Date.now = () => 0;
const commentInstance = getComposeCommentWrapper({}).instance();
commentInstance.setState({muteExpiresAt: -100});
commentInstance.setState({muteExpiresAtMs: -100});
expect(commentInstance.isMuted()).toBe(false);
global.Date.now = realDateNow;
});