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

26
app/javascript/gabsocial/components/popover/group_timeline_sort_options_popover.js
View File

@@ -1,4 +1,5 @@
import { defineMessages, injectIntl } from 'react-intl'
import isObject from 'lodash.isobject'
import { closePopover } from '../../actions/popover'
import { setGroupTimelineSort } from '../../actions/groups'
import {
@@ -23,8 +24,8 @@ const mapStateToProps = (state) => ({
})
const mapDispatchToProps = (dispatch) => ({
onSort(sort) {
dispatch(setGroupTimelineSort(sort))
onSort(sort, options) {
dispatch(setGroupTimelineSort(sort, options))
dispatch(closePopover())
},
onClosePopover: () => dispatch(closePopover()),
@@ -41,10 +42,11 @@ class GroupTimelineSortOptionsPopover extends PureComponent {
isXS: PropTypes.bool,
onClosePopover: PropTypes.func.isRequired,
onSort: PropTypes.func.isRequired,
options: PropTypes.object.isRequired,
}
handleOnClick = (type) => {
this.props.onSort(type)
this.props.onSort(type, this.props.options)
}
handleOnClosePopover = () => {
@@ -56,8 +58,11 @@ class GroupTimelineSortOptionsPopover extends PureComponent {
sorting,
intl,
isXS,
options,
} = this.props
const isFeaturedTimeline = isObject(options) && options.collectionType === 'featured'
const items = [
{
hideArrow: true,
@@ -65,22 +70,25 @@ class GroupTimelineSortOptionsPopover extends PureComponent {
title: intl.formatMessage(messages.topTitle),
subtitle: intl.formatMessage(messages.topSubtitle),
onClick: () => this.handleOnClick(GROUP_TIMELINE_SORTING_TYPE_TOP),
},
{
}
]
if (!isFeaturedTimeline) {
items.push({
hideArrow: true,
isActive: sorting === GROUP_TIMELINE_SORTING_TYPE_NEWEST,
title: intl.formatMessage(messages.newTitle),
subtitle: intl.formatMessage(messages.newSubtitle),
onClick: () => this.handleOnClick(GROUP_TIMELINE_SORTING_TYPE_NEWEST),
},
{
})
items.push({
hideArrow: true,
isActive: sorting === GROUP_TIMELINE_SORTING_TYPE_RECENT_ACTIVITY,
title: intl.formatMessage(messages.recentTitle),
subtitle: intl.formatMessage(messages.recentSubtitle),
onClick: () => this.handleOnClick(GROUP_TIMELINE_SORTING_TYPE_RECENT_ACTIVITY),
},
]
})
}
return (
<PopoverLayout

7
app/javascript/gabsocial/components/popover/group_timeline_sort_top_options_popover.js
View File

@@ -24,8 +24,8 @@ const mapStateToProps = (state) => ({
})
const mapDispatchToProps = (dispatch) => ({
onSort(sort) {
dispatch(setGroupTimelineTopSort(sort))
onSort(sort, options) {
dispatch(setGroupTimelineTopSort(sort, options))
dispatch(closePopover())
},
onClosePopover: () => dispatch(closePopover()),
@@ -42,10 +42,11 @@ class GroupTimelineSortTopOptionsPopover extends PureComponent {
isXS: PropTypes.bool,
onClosePopover: PropTypes.func.isRequired,
onSort: PropTypes.func.isRequired,
options: PropTypes.object.isRequired,
}
handleOnClick = (type) => {
this.props.onSort(type)
this.props.onSort(type, this.props.options)
}
handleOnClosePopover = () => {