random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated group sorting in frontend

Browse Source 
• Updated:
- group sorting in frontend
This commit is contained in:
mgabdev
2020-08-06 23:19:18 -05:00
parent 6328b21186
commit f9f2744a63
10 changed files with 161 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
app/javascript/gabsocial/features/group_collection_timeline.js
View File

@@ -1,14 +1,17 @@
import { Fragment } from 'react'
import { injectIntl, defineMessages } from 'react-intl'
import { me } from '../initial_state'
import { GROUP_TIMELINE_SORTING_TYPE_TOP } from '../constants'
import { connectGroupCollectionStream } from '../actions/streaming'
import { expandGroupCollectionTimeline } from '../actions/timelines'
import StatusList from '../components/status_list'
import GroupSortBlock from '../components/group_sort_block'
const messages = defineMessages({
empty: { id: 'empty_column.group_collection_timeline', defaultMessage: 'There are no gabs to display.' },
})
const mapStateToProps = (state) = ({
const mapStateToProps = (state) => ({
sortByValue: state.getIn(['group_lists', 'sortByValue']),
sortByTopValue: state.getIn(['group_lists', 'sortByTopValue']),
})
@@ -27,15 +30,29 @@ class GroupCollectionTimeline extends PureComponent {
}
componentDidMount() {
const { collectionType, dispatch } = this.props
const {
collectionType,
dispatch,
sortByValue,
sortByTopValue,
} = this.props
dispatch(expandGroupCollectionTimeline(collectionType))
const sortBy = sortByValue === GROUP_TIMELINE_SORTING_TYPE_TOP ? `${sortByValue}_${sortByTopValue}` : sortByValue
const options = { sortBy }
dispatch(expandGroupCollectionTimeline(collectionType, options))
if (!!me) {
this.disconnect = dispatch(connectGroupCollectionStream(collectionType))
}
}
componentDidUpdate(prevProps) {
if (prevProps.sortByValue !== this.props.sortByValue || prevProps.sortByTopValue !== this.props.sortByTopValue) {
this.handleLoadMore()
}
}
componentWillUnmount() {
if (this.disconnect && !!me) {
this.disconnect()
@@ -44,8 +61,16 @@ class GroupCollectionTimeline extends PureComponent {
}
handleLoadMore = (maxId) => {
const { collectionType } = this.props
this.props.dispatch(expandGroupCollectionTimeline(collectionType, { maxId }))
const {
collectionType,
sortByValue,
sortByTopValue,
} = this.props
const sortBy = sortByValue === GROUP_TIMELINE_SORTING_TYPE_TOP ? `${sortByValue}_${sortByTopValue}` : sortByValue
const options = { sortBy, maxId }
this.props.dispatch(expandGroupCollectionTimeline(collectionType, options))
}
render() {
@@ -55,12 +80,15 @@ class GroupCollectionTimeline extends PureComponent {
} = this.props
return (
<StatusList
scrollKey={`group-collection-timeline-${collectionType}`}
timelineId={`group:collection:${collectionType}`}
onLoadMore={this.handleLoadMore}
emptyMessage={intl.formatMessage(messages.empty)}
/>
<Fragment>
<GroupSortBlock collectionType={collectionType} />
<StatusList
scrollKey={`group-collection-timeline-${collectionType}`}
timelineId={`group:collection:${collectionType}`}
onLoadMore={this.handleLoadMore}
emptyMessage={intl.formatMessage(messages.empty)}
/>
</Fragment>
)
}