pitchum/debianize-mobilizon
pitchum/debianize-mobilizon
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Merge branch 'fix-my-events-pagination' into 'master'

Browse Source 
Fix MyEvents pagination

See merge request framasoft/mobilizon!508
This commit is contained in:
Thomas Citharel 2020-07-06 18:46:31 +02:00
commit f90aa92ebb
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
js/src/views/Event/MyEvents.vue
View File

@ -169,13 +169,24 @@ export default class MyEvents extends Vue {
drafts: IEvent[] = []; drafts: IEvent[] = [];
static monthlyParticipations(participations: IParticipant[]): Map<string, Participant[]> { static monthlyParticipations(
participations: IParticipant[],
revertSort: boolean = false
): Map<string, Participant[]> {
const res = participations.filter( const res = participations.filter(
({ event, role }) => event.beginsOn != null && role !== ParticipantRole.REJECTED ({ event, role }) => event.beginsOn != null && role !== ParticipantRole.REJECTED
); );
res.sort( if (revertSort) {
(a: IParticipant, b: IParticipant) => a.event.beginsOn.getTime() - b.event.beginsOn.getTime() res.sort(
); (a: IParticipant, b: IParticipant) =>
b.event.beginsOn.getTime() - a.event.beginsOn.getTime()
);
} else {
res.sort(
(a: IParticipant, b: IParticipant) =>
a.event.beginsOn.getTime() - b.event.beginsOn.getTime()
);
}
return res.reduce((acc: Map<string, IParticipant[]>, participation: IParticipant) => { return res.reduce((acc: Map<string, IParticipant[]>, participation: IParticipant) => {
const month = new Date(participation.event.beginsOn).toLocaleDateString(undefined, { const month = new Date(participation.event.beginsOn).toLocaleDateString(undefined, {
year: "numeric", year: "numeric",
@ -193,7 +204,7 @@ export default class MyEvents extends Vue {
} }
get monthlyPastParticipations(): Map<string, Participant[]> { get monthlyPastParticipations(): Map<string, Participant[]> {
return MyEvents.monthlyParticipations(this.pastParticipations); return MyEvents.monthlyParticipations(this.pastParticipations, true);
} }
loadMoreFutureParticipations() { loadMoreFutureParticipations() {
@ -206,13 +217,19 @@ export default class MyEvents extends Vue {
}, },
// Transform the previous result with new data // Transform the previous result with new data
updateQuery: (previousResult, { fetchMoreResult }) => { updateQuery: (previousResult, { fetchMoreResult }) => {
const oldParticipations = previousResult.loggedUser.participations;
const newParticipations = fetchMoreResult.loggedUser.participations; const newParticipations = fetchMoreResult.loggedUser.participations;
this.hasMoreFutureParticipations = newParticipations.length === this.limit; this.hasMoreFutureParticipations =
newParticipations.total === oldParticipations.length + newParticipations.length;
return { return {
loggedUser: { loggedUser: {
__typename: previousResult.loggedUser.__typename, __typename: previousResult.loggedUser.__typename,
participations: [...previousResult.loggedUser.participations, ...newParticipations], participations: {
__typename: newParticipations.__typename,
total: newParticipations.total,
elements: [...oldParticipations.elements, ...newParticipations.elements],
},
}, },
}; };
}, },
@ -229,13 +246,19 @@ export default class MyEvents extends Vue {
}, },
// Transform the previous result with new data // Transform the previous result with new data
updateQuery: (previousResult, { fetchMoreResult }) => { updateQuery: (previousResult, { fetchMoreResult }) => {
const oldParticipations = previousResult.loggedUser.participations;
const newParticipations = fetchMoreResult.loggedUser.participations; const newParticipations = fetchMoreResult.loggedUser.participations;
this.hasMorePastParticipations = newParticipations.length === this.limit; this.hasMorePastParticipations =
newParticipations.total === oldParticipations.length + newParticipations.length;
return { return {
loggedUser: { loggedUser: {
__typename: previousResult.loggedUser.__typename, __typename: previousResult.loggedUser.__typename,
participations: [...previousResult.loggedUser.participations, ...newParticipations], participations: {
__typename: newParticipations.__typename,
total: newParticipations.total,
elements: [...oldParticipations.elements, ...newParticipations.elements],
},
}, },
}; };
}, },