QRunIO/qqq-frontend-material-dashboard
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq-frontend-material-dashboard.git synced 2025-07-18 05:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Checkpoint

Browse Source
This commit is contained in:
darin.kelkhoff
2023-06-05 08:08:22 -05:00
parent 000eb24262
commit 1328597f70
3 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/qqq/components/query/CustomFilterPanel.tsx
View File

@ -31,10 +31,11 @@ import React, {forwardRef, useReducer} from "react";
import {FilterCriteriaRow} from "qqq/components/query/FilterCriteriaRow";
declare module "@mui/x-data-grid"
{
///////////////////////////////////////////////////////////////////////
// this lets these props be passed in via <DataGrid componentsProps> //
///////////////////////////////////////////////////////////////////////
interface FilterPanelPropsOverrides
{
tableMetaData: QTableMetaData;

11
src/qqq/components/query/FilterCriteriaRow.tsx
View File

@ -308,13 +308,13 @@ export function FilterCriteriaRow({id, index, tableMetaData, criteria, booleanOp
updateCriteria(criteria, false);
};
////////////////////////////////////////
// event handler for value text field //
////////////////////////////////////////
//////////////////////////////////////////////////
// event handler for value field (of all types) //
//////////////////////////////////////////////////
const handleValueChange = (event: React.ChangeEvent | SyntheticEvent, valueIndex: number | "all" = 0, newValue?: any) =>
{
// @ts-ignore
const value = newValue ? newValue : event.target.value
const value = newValue ? newValue : event ? event.target.value : null;
if(!criteria.values)
{
@ -489,7 +489,8 @@ export function FilterCriteriaRow({id, index, tableMetaData, criteria, booleanOp
<FilterCriteriaRowValues
operatorOption={operatorSelectedValue}
criteria={{id: id, ...criteria}}
fieldType={field?.type}
field={field}
table={fieldTable}
valueChangeHandler={(event, valueIndex, newValue) => handleValueChange(event, valueIndex, newValue)}
/>
</Box>

46
src/qqq/components/query/FilterCriteriaRowValues.tsx
View File

@ -20,12 +20,14 @@
*/
import {QFieldMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldMetaData";
import {QFieldType} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QFieldType";
import {Chip} from "@mui/material";
import {QTableMetaData} from "@kingsrook/qqq-frontend-core/lib/model/metaData/QTableMetaData";
import Autocomplete from "@mui/material/Autocomplete";
import Box from "@mui/material/Box";
import TextField from "@mui/material/TextField";
import React, {SyntheticEvent} from "react";
import DynamicSelect from "qqq/components/forms/DynamicSelect";
import {QFilterCriteriaWithId} from "qqq/components/query/CustomFilterPanel";
import {OperatorOption, ValueMode} from "qqq/components/query/FilterCriteriaRow";
@ -33,14 +35,15 @@ interface Props
{
operatorOption: OperatorOption;
criteria: QFilterCriteriaWithId;
fieldType?: QFieldType;
field: QFieldMetaData;
table: QTableMetaData;
valueChangeHandler: (event: React.ChangeEvent | SyntheticEvent, valueIndex?: number | "all", newValue?: any) => void;
}
FilterCriteriaRowValues.defaultProps = {
};
function FilterCriteriaRowValues({operatorOption, criteria, fieldType, valueChangeHandler}: Props): JSX.Element
function FilterCriteriaRowValues({operatorOption, criteria, field, table, valueChangeHandler}: Props): JSX.Element
{
if(!operatorOption)
{
@ -52,16 +55,16 @@ function FilterCriteriaRowValues({operatorOption, criteria, fieldType, valueChan
let type = "search"
const inputLabelProps: any = {};
if(fieldType == QFieldType.INTEGER)
if(field.type == QFieldType.INTEGER)
{
type = "number";
}
else if(fieldType == QFieldType.DATE)
else if(field.type == QFieldType.DATE)
{
type = "date";
inputLabelProps.shrink = true;
}
else if(fieldType == QFieldType.DATE_TIME)
else if(field.type == QFieldType.DATE_TIME)
{
type = "datetime-local";
inputLabelProps.shrink = true;
@ -117,10 +120,37 @@ function FilterCriteriaRowValues({operatorOption, criteria, fieldType, valueChan
value={values}
onChange={(event, value) => valueChangeHandler(event, "all", value)}
/>
// todo - need the Paste button
case ValueMode.PVS_SINGLE:
break;
let selectedPossibleValue = null;
if(criteria.values && criteria.values.length > 0)
{
selectedPossibleValue = criteria.values[0];
}
return <Box mb={-1.5}>
<DynamicSelect
tableName={table.name}
fieldName={field.name}
fieldLabel="Value"
initialValue={selectedPossibleValue?.id}
initialDisplayValue={selectedPossibleValue?.label}
inForm={false}
onChange={(value: any) => valueChangeHandler(null, 0, value)}
/>
</Box>
case ValueMode.PVS_MULTI:
break;
// todo - values not sticking when re-opening filter panel
return <Box mb={-1.5}>
<DynamicSelect
tableName={table.name}
fieldName={field.name}
isMultiple
fieldLabel="Values"
initialValues={criteria.values || []}
inForm={false}
onChange={(value: any) => valueChangeHandler(null, "all", value)}
/>
</Box>
}
return (<br />);