prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

support Software column sorting

Browse source 
closes #536
This commit is contained in:
Collin M. Barrett 2018-09-29 14:53:15 -05:00
parent 6b2d6e40db
commit 349bd97b6d
2 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Languages.tsx
View file

@ -43,9 +43,9 @@ const sortMethod = (a: number[], b: number[], languages: ILanguage[]) => {
if (a && a.length > 0) {
if (b && b.length > 0) {
const aLanguageNames =
languages.filter((l: ILanguage) => l.id === a[0]).map((l: ILanguage) => l.name).join();
languages.filter((l: ILanguage) => a.indexOf(l.id) > -1).map((l: ILanguage) => l.name).join();
const bLanguageNames =
languages.filter((l: ILanguage) => l.id === b[0]).map((l: ILanguage) => l.name).join();
languages.filter((l: ILanguage) => b.indexOf(l.id) > -1).map((l: ILanguage) => l.name).join();
return aLanguageNames.toLowerCase() > bLanguageNames.toLowerCase() ? 1 : -1;
} else {
return -1;

50
src/FilterLists.Web/ClientApp/modules/home/components/listsTable/columns/Software.tsx
View file

@ -3,17 +3,20 @@ import { Column, Filter } from "react-table";
import { IColumnVisibility, ISoftware } from "../../../interfaces";
import { SoftwareIcon } from "../../softwareIcon";
export const Software = (columnVisibility: IColumnVisibility[], software: ISoftware[]) => ({
Header: "Software",
accessor: "syntaxId",
filterable: true,
filterMethod: (f: Filter, r: any[]) => filterMethod(f, r, software),
Filter: ({ filter, onChange }: any) => Filter({ onChange, filter }, software),
sortable: false,
Cell: (c: any) => Cell(c.value, software),
width: 155,
show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Software")[0].visible
} as Column);
export const Software = (columnVisibility: IColumnVisibility[], software: ISoftware[]) => {
const softwareSorted = software.sort((a, b) => a.name.localeCompare(b.name));
return ({
Header: "Software",
accessor: "syntaxId",
filterable: true,
filterMethod: (f: Filter, r: any[]) => filterMethod(f, r, softwareSorted),
Filter: ({ filter, onChange }: any) => Filter({ onChange, filter }, softwareSorted),
sortMethod: (a: number, b: number) => sortMethod(a, b, softwareSorted),
Cell: (c: any) => Cell(c.value, software),
width: 155,
show: columnVisibility.filter((c: IColumnVisibility) => c.column === "Software")[0].visible
} as Column);
};
const filterMethod = (f: Filter, r: any[], software: ISoftware[]): boolean => {
const isAny = f.value === "any";
@ -30,11 +33,32 @@ const Filter = (props: any, software: ISoftware[]) =>
value={props.filter ? props.filter.value : "any"}>
<option value="any">Any</option>
{software.length > 0
? software.sort((a, b) => a.name.localeCompare(b.name)).map(
(s: ISoftware, i: number) => <option value={s.id} key={i}>{s.name}</option>)
? software.map((s: ISoftware, i: number) => <option value={s.id} key={i}>{s.name}</option>)
: null}
</select>;
const sortMethod = (a: number, b: number, software: ISoftware[]) => {
if (a) {
if (b) {
const aSoftwareNames =
software.filter((s: ISoftware) => s.syntaxIds.indexOf(a) > -1).map((s: ISoftware) => s.name);
const bSoftwareNames =
software.filter((s: ISoftware) => s.syntaxIds.indexOf(b) > -1).map((s: ISoftware) => s.name);
if (aSoftwareNames.length === bSoftwareNames.length) {
return aSoftwareNames.join().toLowerCase() > bSoftwareNames.join().toLowerCase() ? 1 : -1;
} else if (aSoftwareNames.length > bSoftwareNames.length) {
return -1;
} else {
return 1;
}
} else {
return -1;
}
} else {
return 1;
}
};
const Cell = (listSyntaxId: number, software: ISoftware[]) =>
listSyntaxId
? software.filter((s: ISoftware) => s.syntaxIds.indexOf(listSyntaxId) > -1)