mysql param types, async search, bugfix

react/shared/elements/data-table.js

@@ -6,7 +6,7 @@ import "./data-table.css";
 import {LocaleContext} from "../locale";
 import clsx from "clsx";
 import {Box, IconButton} from "@mui/material";
-import {formatDateTime} from "../util";
+import {formatDate, formatDateTime} from "../util";
 import CachedIcon from "@material-ui/icons/Cached";
 
 
@@ -23,31 +23,35 @@ export function DataTable(props) {
     const [doFetchData, setFetchData] = useState(false);
     const [sortAscending, setSortAscending] = useState(["asc","ascending"].includes(defaultSortOrder?.toLowerCase));
     const [sortColumn, setSortColumn] = useState(defaultSortColumn || null);
-    const sortable = props.hasOwnProperty("sortable") ? !!props.sortable : true;
+    const sortable = !!fetchData && (props.hasOwnProperty("sortable") ? !!props.sortable : true);
     const onRowClick = onClick || (() => {});
 
     const onFetchData = useCallback((force = false) => {
-        if (doFetchData || force) {
-            setFetchData(false);
-            const orderBy = columns[sortColumn]?.field || null;
-            const sortOrder = sortAscending ? "asc" : "desc";
-            fetchData(pagination.getPage(), pagination.getPageSize(), orderBy, sortOrder);
+        if (fetchData) {
+            if (doFetchData || force) {
+                setFetchData(false);
+                const orderBy = columns[sortColumn]?.field || null;
+                const sortOrder = sortAscending ? "asc" : "desc";
+                fetchData(pagination.getPage(), pagination.getPageSize(), orderBy, sortOrder);
+            }
         }
-    }, [doFetchData, columns, sortColumn, sortAscending, pagination]);
+    }, [fetchData, doFetchData, columns, sortColumn, sortAscending, pagination]);
 
     // pagination changed?
     useEffect(() => {
-        let forceFetch = false;
-        if (pagination.getPageSize() < pagination.getTotal()) {
-            // page size is smaller than the total count
-            forceFetch = true;
-        } else if (data?.length && pagination.getPageSize() >= data.length && data.length < pagination.getTotal()) {
-            // page size is greater than the current visible count but there were hidden rows before
-            forceFetch = true;
-        }
+        if (pagination) {
+            let forceFetch = false;
+            if (pagination.getPageSize() < pagination.getTotal()) {
+                // page size is smaller than the total count
+                forceFetch = true;
+            } else if (data?.length && pagination.getPageSize() >= data.length && data.length < pagination.getTotal()) {
+                // page size is greater than the current visible count but there were hidden rows before
+                forceFetch = true;
+            }
 
-        onFetchData(forceFetch);
-    }, [pagination.data.pageSize, pagination.data.current]);
+            onFetchData(forceFetch);
+        }
+    }, [pagination?.data?.pageSize, pagination?.data?.current]);
 
     // sorting changed
     useEffect(() => {
@@ -112,12 +116,17 @@ export function DataTable(props) {
     }
 
     return <Box position={"relative"}>
-            <h3>
-                <IconButton onClick={() => onFetchData(true)}>
-                    <CachedIcon/>
-                </IconButton>
-                {title}
-            </h3>
+            {title ?
+                <h3>
+                    {fetchData ?
+                        <IconButton onClick={() => onFetchData(true)}>
+                            <CachedIcon/>
+                        </IconButton>
+                        : <></>
+                    }
+                    {title}
+                </h3> : <></>
+            }
             <Table className={clsx("data-table", className)} size="small" {...other}>
                 <TableHead>
                     <TableRow>
@@ -128,7 +137,7 @@ export function DataTable(props) {
                     { rows }
                 </TableBody>
             </Table>
-        {pagination.renderPagination(L, numRows)}
+        {pagination && pagination.renderPagination(L, numRows)}
     </Box>
 }
 
@@ -210,6 +219,17 @@ export class DateTimeColumn extends DataColumn {
     }
 }
 
+export class DateColumn extends DataColumn {
+    constructor(label, field = null, params = {}) {
+        super(label, field, params);
+    }
+
+    renderData(L, entry, index) {
+        let date = super.renderData(L, entry);
+        return formatDate(L, date);
+    }
+}
+
 export class BoolColumn extends DataColumn {
     constructor(label, field = null, params = {}) {
         super(label, field, params);

react/shared/elements/dialog.jsx

@@ -1,4 +1,4 @@
-import React, {useState} from "react";
+import React, {useEffect, useState} from "react";
 import {
     Box,
     Button,
@@ -20,11 +20,21 @@ export default function Dialog(props) {
 
     const [inputData, setInputData] = useState({});
 
+    useEffect(() => {
+        if (props.inputs) {
+            let initialData = {};
+            for (const input of props.inputs) {
+                initialData[input.name] = input.value || "";
+            }
+            setInputData(initialData);
+        }
+    }, [props.inputs]);
+
     let buttons = [];
     for (const [index, name] of options.entries()) {
         buttons.push(
             <Button variant={"outlined"} size={"small"} key={"button-" + name}
-                    onClick={() => { onClose(); onOption(index, inputData); }}>
+                    onClick={() => { onClose(); onOption(index, inputData); setInputData({}); }}>
                 {name}
             </Button>
         )
@@ -40,6 +50,7 @@ export default function Dialog(props) {
             case 'text':
                 inputElements.push(<TextField
                     {...inputProps}
+                    sx={{marginTop: 1}}
                     size={"small"} fullWidth={true}
                     key={"input-" + input.name}
                     value={inputData[input.name] || ""}