matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor notifications again, this time with OrderedMap, fixes #433

Browse Source
This commit is contained in:
Alex Gleason
2020-09-23 18:57:10 -05:00
parent 9c0793d1f3
commit f183094f82
4 changed files with 119 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/soapbox/features/notifications/index.js
View File

@ -30,7 +30,7 @@ const getNotifications = createSelector([
state => getSettings(state).getIn(['notifications', 'quickFilter', 'show']),
state => getSettings(state).getIn(['notifications', 'quickFilter', 'active']),
state => ImmutableList(getSettings(state).getIn(['notifications', 'shows']).filter(item => !item).keys()),
state => state.getIn(['notifications', 'items']),
state => state.getIn(['notifications', 'items']).toList(),
], (showFilterBar, allowedType, excludedTypes, notifications) => {
if (!showFilterBar || allowedType === 'all') {
// used if user changed the notification settings after loading the notifications from the server
@ -55,7 +55,7 @@ export default @connect(mapStateToProps)
class Notifications extends React.PureComponent {
static propTypes = {
notifications: ImmutablePropTypes.orderedSet.isRequired,
notifications: ImmutablePropTypes.list.isRequired,
showFilterBar: PropTypes.bool.isRequired,
dispatch: PropTypes.func.isRequired,
intl: PropTypes.object.isRequired,
@ -142,8 +142,6 @@ class Notifications extends React.PureComponent {
} else if (notifications.size > 0 || hasMore) {
scrollableContent = notifications.map((item, index) => item === null ? (
<LoadGap
// FIXME: This won't work, can't get OrderedSet by index
// https://github.com/immutable-js/immutable-js/issues/1790
key={'gap:' + notifications.getIn([index + 1, 'id'])}
disabled={isLoading}
maxId={index > 0 ? notifications.getIn([index - 1, 'id']) : null}