Put "Media Only" option in column settings instead of content area headline (#7801)
* Action/reducer for changing column settings takes a path and a value instead of a javascript object * Settings menu version and column headline version working simultaneously * remove column headline entirely * remove css for headlines that aren't possible now * Remove commented out code from unfruitful attempt at this feature * Give direct timeline its own column settings bc it doesn't have a media only option * Fix typo in public timeline code that was preventing per-column settings from working properly * Fix codeclimate issues * Missing semicolons * Use redux state to set onlyMedia, let that do the update instead of a callback. Consequently, unpinned setting works without history modification * Unused importmaster
chr v1.x
6 years ago
committed by
Eugen Rochko
parent
f972815f1b
commit
4f42238c29
@ -1,59 +0,0 @@ |
||||
import PropTypes from 'prop-types'; |
||||
import React, { Component, Fragment } from 'react'; |
||||
import { FormattedMessage } from 'react-intl'; |
||||
import { NavLink } from 'react-router-dom'; |
||||
|
||||
export default class SectionHeadline extends Component { |
||||
|
||||
static propTypes = { |
||||
timelineId: PropTypes.string.isRequired, |
||||
to: PropTypes.string.isRequired, |
||||
pinned: PropTypes.bool.isRequired, |
||||
onlyMedia: PropTypes.bool.isRequired, |
||||
onClick: PropTypes.func, |
||||
}; |
||||
|
||||
shouldComponentUpdate (nextProps) { |
||||
return ( |
||||
this.props.onlyMedia !== nextProps.onlyMedia || |
||||
this.props.pinned !== nextProps.pinned || |
||||
this.props.to !== nextProps.to || |
||||
this.props.timelineId !== nextProps.timelineId |
||||
); |
||||
} |
||||
|
||||
handleClick = e => { |
||||
const { onClick } = this.props; |
||||
|
||||
if (typeof onClick === 'function') { |
||||
e.preventDefault(); |
||||
|
||||
onClick.call(this, e); |
||||
} |
||||
} |
||||
|
||||
render () { |
||||
const { timelineId, to, pinned, onlyMedia } = this.props; |
||||
|
||||
return ( |
||||
<div className={`${timelineId}-timeline__section-headline`}> |
||||
{pinned ? ( |
||||
<Fragment> |
||||
<a href={to} className={!onlyMedia ? 'active' : undefined} onClick={this.handleClick}> |
||||
<FormattedMessage id='timeline.posts' defaultMessage='Toots' /> |
||||
</a> |
||||
<a href={`${to}/media`} className={onlyMedia ? 'active' : undefined} onClick={this.handleClick}> |
||||
<FormattedMessage id='timeline.media' defaultMessage='Media' /> |
||||
</a> |
||||
</Fragment> |
||||
) : ( |
||||
<Fragment> |
||||
<NavLink exact to={to} replace><FormattedMessage id='timeline.posts' defaultMessage='Toots' /></NavLink> |
||||
<NavLink exact to={`${to}/media`} replace><FormattedMessage id='timeline.media' defaultMessage='Media' /></NavLink> |
||||
</Fragment> |
||||
)} |
||||
</div> |
||||
); |
||||
} |
||||
|
||||
} |
||||
@ -1,17 +1,28 @@ |
||||
import { connect } from 'react-redux'; |
||||
import ColumnSettings from '../components/column_settings'; |
||||
import { changeSetting } from '../../../actions/settings'; |
||||
import { changeColumnParams } from '../../../actions/columns'; |
||||
|
||||
const mapStateToProps = state => ({ |
||||
settings: state.getIn(['settings', 'community']), |
||||
}); |
||||
const mapStateToProps = (state, { columnId }) => { |
||||
const uuid = columnId; |
||||
const columns = state.getIn(['settings', 'columns']); |
||||
const index = columns.findIndex(c => c.get('uuid') === uuid); |
||||
|
||||
const mapDispatchToProps = dispatch => ({ |
||||
return { |
||||
settings: (uuid && index >= 0) ? columns.get(index).get('params') : state.getIn(['settings', 'community']), |
||||
}; |
||||
}; |
||||
|
||||
onChange (key, checked) { |
||||
dispatch(changeSetting(['community', ...key], checked)); |
||||
}, |
||||
|
||||
}); |
||||
const mapDispatchToProps = (dispatch, { columnId }) => { |
||||
return { |
||||
onChange (key, checked) { |
||||
if (columnId) { |
||||
dispatch(changeColumnParams(columnId, key, checked)); |
||||
} else { |
||||
dispatch(changeSetting(['community', ...key], checked)); |
||||
} |
||||
}, |
||||
}; |
||||
}; |
||||
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings); |
||||
|
||||
@ -0,0 +1,35 @@ |
||||
import React from 'react'; |
||||
import PropTypes from 'prop-types'; |
||||
import ImmutablePropTypes from 'react-immutable-proptypes'; |
||||
import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; |
||||
import SettingText from '../../../components/setting_text'; |
||||
|
||||
const messages = defineMessages({ |
||||
filter_regex: { id: 'home.column_settings.filter_regex', defaultMessage: 'Filter out by regular expressions' }, |
||||
settings: { id: 'home.settings', defaultMessage: 'Column settings' }, |
||||
}); |
||||
|
||||
@injectIntl |
||||
export default class ColumnSettings extends React.PureComponent { |
||||
|
||||
static propTypes = { |
||||
settings: ImmutablePropTypes.map.isRequired, |
||||
onChange: PropTypes.func.isRequired, |
||||
intl: PropTypes.object.isRequired, |
||||
}; |
||||
|
||||
render () { |
||||
const { settings, onChange, intl } = this.props; |
||||
|
||||
return ( |
||||
<div> |
||||
<span className='column-settings__section'><FormattedMessage id='home.column_settings.advanced' defaultMessage='Advanced' /></span> |
||||
|
||||
<div className='column-settings__row'> |
||||
<SettingText settings={settings} settingKey={['regex', 'body']} onChange={onChange} label={intl.formatMessage(messages.filter_regex)} /> |
||||
</div> |
||||
</div> |
||||
); |
||||
} |
||||
|
||||
} |
||||
@ -1,17 +1,28 @@ |
||||
import { connect } from 'react-redux'; |
||||
import ColumnSettings from '../../community_timeline/components/column_settings'; |
||||
import { changeSetting } from '../../../actions/settings'; |
||||
import { changeColumnParams } from '../../../actions/columns'; |
||||
|
||||
const mapStateToProps = state => ({ |
||||
settings: state.getIn(['settings', 'public']), |
||||
}); |
||||
const mapStateToProps = (state, { columnId }) => { |
||||
const uuid = columnId; |
||||
const columns = state.getIn(['settings', 'columns']); |
||||
const index = columns.findIndex(c => c.get('uuid') === uuid); |
||||
|
||||
const mapDispatchToProps = dispatch => ({ |
||||
return { |
||||
settings: (uuid && index >= 0) ? columns.get(index).get('params') : state.getIn(['settings', 'public']), |
||||
}; |
||||
}; |
||||
|
||||
onChange (key, checked) { |
||||
dispatch(changeSetting(['public', ...key], checked)); |
||||
}, |
||||
|
||||
}); |
||||
const mapDispatchToProps = (dispatch, { columnId }) => { |
||||
return { |
||||
onChange (key, checked) { |
||||
if (columnId) { |
||||
dispatch(changeColumnParams(columnId, key, checked)); |
||||
} else { |
||||
dispatch(changeSetting(['public', ...key], checked)); |
||||
} |
||||
}, |
||||
}; |
||||
}; |
||||
|
||||
export default connect(mapStateToProps, mapDispatchToProps)(ColumnSettings); |
||||
|
||||
Loading…
Reference in new issue