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

Merge pull request #4721 from picklesrus/comment-status

Browse source 
Show the comment status box on project page loads if the user is muted.
This commit is contained in:
picklesrus 2020-12-09 11:40:38 -05:00 committed by GitHub
commit 287426c379
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 96 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,7 +47,8 @@ class ComposeComment extends React.Component {
status: ComposeStatus.EDITING, status: ComposeStatus.EDITING,
error: null, error: null,
appealId: null, appealId: null,
muteOpen: false muteOpen: false,
muteExpiresAt: this.props.muteStatus.muteExpiresAt * 1000 // convert to ms
}; };
} }
handleInput (event) { handleInput (event) {
@ -185,6 +186,7 @@ class ComposeComment extends React.Component {
</CommentingStatus> </CommentingStatus>
</FlexRow> </FlexRow>
) : null } ) : null }
{!this.isMuted() || (this.isMuted() && this.state.status === ComposeStatus.REJECTED_MUTE) ? (
<div <div
className={classNames('flex-row', className={classNames('flex-row',
'comment', 'comment',
@ -252,6 +254,8 @@ class ComposeComment extends React.Component {
</FlexRow> </FlexRow>
</Formsy> </Formsy>
</FlexRow> </FlexRow>
</div>
) : null }
{this.state.muteOpen ? ( {this.state.muteOpen ? (
<MuteModal <MuteModal
isOpen isOpen
@ -263,7 +267,6 @@ class ComposeComment extends React.Component {
onRequestClose={this.handleMuteClose} onRequestClose={this.handleMuteClose}
/> />
) : null} ) : null}
</div>
</React.Fragment> </React.Fragment>
); );
} }
@ -271,6 +274,10 @@ class ComposeComment extends React.Component {
ComposeComment.propTypes = { ComposeComment.propTypes = {
commenteeId: PropTypes.number, commenteeId: PropTypes.number,
muteStatus: PropTypes.shape({
offenses: PropTypes.array,
muteExpiresAt: PropTypes.number
}),
onAddComment: PropTypes.func, onAddComment: PropTypes.func,
onCancel: PropTypes.func, onCancel: PropTypes.func,
parentId: PropTypes.number, parentId: PropTypes.number,
@ -284,6 +291,9 @@ ComposeComment.propTypes = {
}; };
const mapStateToProps = state => ({ const mapStateToProps = state => ({
muteStatus: state.session.session.permissions.mute_status ?
state.session.session.permissions.mute_status :
{muteExpiresAt: 0, offenses: []},
user: state.session.session.user user: state.session.session.user
}); });

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

@ -26,9 +26,11 @@ describe('Compose Comment test', () => {
store = mockStore({ store = mockStore({
session: { session: {
session: { session: {
user: {} user: {},
permissions: {
mute_status: {}
}
} }
} }
}); });
}); });
@ -74,14 +76,15 @@ describe('Compose Comment test', () => {
expect(component.find('FlexRow.compose-error-row').exists()).toEqual(false); expect(component.find('FlexRow.compose-error-row').exists()).toEqual(false);
}); });
test('Comment Status shows when mute expiration in the future ', () => { test('Comment Status shows but compose box does not when mute expiration in the future ', () => {
const realDateNow = Date.now.bind(global.Date); const realDateNow = Date.now.bind(global.Date);
global.Date.now = () => 0; global.Date.now = () => 0;
const component = getComposeCommentWrapper({}); const component = getComposeCommentWrapper({});
const commentInstance = component.instance(); const commentInstance = component.instance();
commentInstance.setState({muteExpiresAt: 100}); commentInstance.setState({muteExpiresAt: 100});
component.update(); component.update();
expect(component.find('FlexRow.compose-comment').exists()).toEqual(true); // 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('MuteModal').exists()).toEqual(false);
expect(component.find('CommentingStatus').exists()).toEqual(true); expect(component.find('CommentingStatus').exists()).toEqual(true);
global.Date.now = realDateNow; global.Date.now = realDateNow;
@ -99,7 +102,7 @@ describe('Compose Comment test', () => {
expect(component.find('FlexRow.compose-comment').exists()).toEqual(true); expect(component.find('FlexRow.compose-comment').exists()).toEqual(true);
expect(component.find('MuteModal').exists()).toEqual(false); expect(component.find('MuteModal').exists()).toEqual(false);
expect(component.find('CommentingStatus').exists()).toEqual(true); expect(component.find('CommentingStatus').exists()).toEqual(true);
// Compose box is disabled // Compose box exists but is disabled
expect(component.find('InplaceInput.compose-input').exists()).toEqual(true); expect(component.find('InplaceInput.compose-input').exists()).toEqual(true);
expect(component.find('InplaceInput.compose-input').props().disabled).toBe(true); expect(component.find('InplaceInput.compose-input').props().disabled).toBe(true);
global.Date.now = realDateNow; global.Date.now = realDateNow;