coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Document history event headings (#2433)

Browse Source 
* fix: Document history events from last year but within 12 months shown as 'this year'
fix: Events older than a year have repeated headings

* lint
This commit is contained in:
Tom Moor
2021-08-12 18:24:13 -04:00
committed by GitHub
parent 4cbae1cf7d
commit 77db0c2e95
5 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/components/PaginatedList.js
View File

@ -2,10 +2,11 @@
import ArrowKeyNavigation from "boundless-arrow-key-navigation";
import { isEqual } from "lodash";
import { observable, action } from "mobx";
import { observer } from "mobx-react";
import { observer, inject } from "mobx-react";
import * as React from "react";
import { withTranslation, type TFunction } from "react-i18next";
import { Waypoint } from "react-waypoint";
import AuthStore from "stores/AuthStore";
import { DEFAULT_PAGINATION_LIMIT } from "stores/BaseStore";
import DelayedMount from "components/DelayedMount";
import PlaceholderList from "components/List/Placeholder";
@ -17,6 +18,7 @@ type Props = {
heading?: React.Node,
empty?: React.Node,
items: any[],
auth: AuthStore,
renderItem: (any, index: number) => React.Node,
renderHeading?: (name: React.Element<any> | string) => React.Node,
t: TFunction,
@ -105,7 +107,7 @@ class PaginatedList extends React.Component<Props> {
};
render() {
const { items, heading, empty, renderHeading } = this.props;
const { items, heading, auth, empty, renderHeading } = this.props;
let previousHeading = "";
const showLoading =
@ -137,7 +139,11 @@ class PaginatedList extends React.Component<Props> {
// Get what a heading would look like for this item
const currentDate =
item.updatedAt || item.createdAt || previousHeading;
const currentHeading = dateToHeading(currentDate, this.props.t);
const currentHeading = dateToHeading(
currentDate,
this.props.t,
auth.user?.language
);
// If the heading is different to any previous heading then we
// should render it, otherwise the item can go under the previous
@ -173,4 +179,4 @@ class PaginatedList extends React.Component<Props> {
export const Component = PaginatedList;
export default withTranslation()<PaginatedList>(PaginatedList);
export default withTranslation()<PaginatedList>(inject("auth")(PaginatedList));