midsuit
/
prasi-lib
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix sorting table list

This commit is contained in:
rizky 2024-07-16 22:40:43 -07:00
parent 2ae5e5e90b
commit 56207c33fd
2 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
comps/list/TableList.tsx
View File

@ -28,6 +28,7 @@ import { filterWhere } from "../filter/parser/filter-where";
import { getFilter } from "../filter/utils/get-filter"; import { getFilter } from "../filter/utils/get-filter";
import { Skeleton } from "../ui/skeleton"; import { Skeleton } from "../ui/skeleton";
import { sortTree } from "./utils/sort-tree"; import { sortTree } from "./utils/sort-tree";
import { set } from "lib/utils/set";
type OnRowClick = (arg: { type OnRowClick = (arg: {
row: any; row: any;
@ -151,40 +152,46 @@ export const TableList: FC<TableListProp> = ({
local.sort.columns = cols; local.sort.columns = cols;
local.paging.skip = 0; local.paging.skip = 0;
if (cols.length > 0) { if (cols.length > 0) {
const { columnKey, direction } = cols[0]; let { columnKey, direction } = cols[0];
let should_set = true; if (columnKey.includes(".")) {
const gf = JSON.stringify(gen_fields); let root: any = {};
const fields = fields_map.get(gf); set(root, columnKey, direction === "ASC" ? "asc" : "desc");
local.sort.orderBy = root;
} else {
let should_set = true;
const gf = JSON.stringify(gen_fields);
const fields = fields_map.get(gf);
if (fields) { if (fields) {
const rel = fields?.find((e) => e.name === columnKey); const rel = fields?.find((e) => e.name === columnKey);
if (rel && rel.checked) { if (rel && rel.checked) {
should_set = false; should_set = false;
if (rel.type === "has-many") { if (rel.type === "has-many") {
local.sort.orderBy = {
[columnKey]: {
_count: direction === "ASC" ? "asc" : "desc",
},
};
} else {
const field = rel.checked.find((e) => !e.is_pk);
if (field) {
local.sort.orderBy = { local.sort.orderBy = {
[columnKey]: { [columnKey]: {
[field.name]: direction === "ASC" ? "asc" : "desc", _count: direction === "ASC" ? "asc" : "desc",
}, },
}; };
} else {
const field = rel.checked.find((e) => !e.is_pk);
if (field) {
local.sort.orderBy = {
[columnKey]: {
[field.name]: direction === "ASC" ? "asc" : "desc",
},
};
}
} }
} }
} }
}
if (should_set) { if (should_set) {
local.sort.orderBy = { local.sort.orderBy = {
[columnKey]: direction === "ASC" ? "asc" : "desc", [columnKey]: direction === "ASC" ? "asc" : "desc",
}; };
}
} }
} else { } else {
local.sort.orderBy = null; local.sort.orderBy = null;
@ -417,7 +424,7 @@ export const TableList: FC<TableListProp> = ({
row={props.row} row={props.row}
col={{ col={{
name: props.column.key, name: props.column.key,
value: props.row[props.column.key], value: get(props.row, props.column.key),
depth: props.row.__depth || 0, depth: props.row.__depth || 0,
}} }}
rows={local.data} rows={local.data}
@ -448,7 +455,7 @@ export const TableList: FC<TableListProp> = ({
row={props.row} row={props.row}
col={{ col={{
name: props.column.key, name: props.column.key,
value: props.row[props.column.key], value: get(props.row, props.column.key),
depth: props.row.__depth || 0, depth: props.row.__depth || 0,
}} }}
rows={local.data} rows={local.data}

3
preset/login/utils/logout.ts
View File

@ -25,7 +25,6 @@ export const logout = (url_login?: string) => {
localStorage.removeItem("user" + id_site); localStorage.removeItem("user" + id_site);
} }
if (url_login !== getPathname()) { if (url_login !== getPathname()) {
console.log(url_login, getPathname()); location.href = `${getBasename()}${url_login}`;
// location.href = `${getBasename()}${url_login}`;
} }
}; };