diff --git a/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx b/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx index d345f851a..13eb2591c 100644 --- a/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx +++ b/src/FilterLists.Web.V2/src/modules/allListsTable/AllListsTable.tsx @@ -34,10 +34,6 @@ export class AllListsTable extends React.Component<{}, State> { window.addEventListener('resize', this.updatePageSize); } - componentWillUnmount() { - window.removeEventListener('resize', this.updatePageSize); - } - private fetchData() { fetch("/api/v1/lists") .then(response => response.json()) @@ -59,26 +55,12 @@ export class AllListsTable extends React.Component<{}, State> { }); } - private tagSorter = (a: number[], b: number[], tags: Tag[]): number => { - return a - ? b - ? a.length === b.length - ? tags.filter((t: Tag) => a.indexOf(t.id) > -1).map((t: Tag) => t.name).join().toLowerCase() > tags.filter((t: Tag) => b.indexOf(t.id) > -1).map((t: Tag) => t.name).join().toLowerCase() - ? 1 - : -1 - : a.length > b.length - ? -1 - : 1 - : -1 - : 1; - }; - render() { return ( dataSource={this.state.lists} rowKey={record => record.id.toString()} - loading={this.state.lists.length === 0 ? true : false} + loading={this.state.lists.length ? false : true} size="small" pagination={{ size: "small", @@ -130,4 +112,22 @@ export class AllListsTable extends React.Component<{}, State> { ); } + + private tagSorter = (a: number[], b: number[], tags: Tag[]): number => { + return a + ? b + ? a.length === b.length + ? tags.filter((t: Tag) => a.indexOf(t.id) > -1).map((t: Tag) => t.name).join().toLowerCase() > tags.filter((t: Tag) => b.indexOf(t.id) > -1).map((t: Tag) => t.name).join().toLowerCase() + ? 1 + : -1 + : a.length > b.length + ? -1 + : 1 + : -1 + : 1; + }; + + componentWillUnmount() { + window.removeEventListener('resize', this.updatePageSize); + } } \ No newline at end of file