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

Merge branch 'dev' into integration

Browse Source
This commit is contained in:
Tim Chamberlain
2025-07-08 11:06:41 -05:00
parent bf0db7526a ab4be1d5af
commit 8c963eaaf0
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qqq/components/forms/ChipTextField.tsx
View File

@ -123,7 +123,15 @@ function ChipTextField({...props})
setChips(chipData); setChips(chipData);
chipsRef.current = chipData; chipsRef.current = chipData;
determineChipColors(); determineChipColors();
}, [JSON.stringify(chipData)]);
if (chipType !== "pvs")
{
const currentChipValidity = chips.map((chip, i) =>
(chipType !== "number" || !Number.isNaN(Number(chips[i])))
);
setChipValidity(currentChipValidity);
}
}, [JSON.stringify(chipData), chips]);
useEffect(() => useEffect(() =>
{ {

6
src/qqq/components/query/FilterCriteriaPaster.tsx
View File

@ -298,6 +298,10 @@ function FilterCriteriaPaster({table, field, type, onSave}: Props): JSX.Element
let regex = new RegExp(currentDelimiterCharacter); let regex = new RegExp(currentDelimiterCharacter);
let parts = inputText.split(regex); let parts = inputText.split(regex);
let chipData = [] as string[]; let chipData = [] as string[];
/////////////////////////////////////////////////////////////////
// use a map to keep track of the counts for each unique value //
/////////////////////////////////////////////////////////////////
const uniqueValuesMap: { [key: string]: number } = {}; const uniqueValuesMap: { [key: string]: number } = {};
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
@ -338,7 +342,7 @@ function FilterCriteriaPaster({table, field, type, onSave}: Props): JSX.Element
if (type === "number") if (type === "number")
{ {
let suffix = invalidCount === 1 ? " value is not a number" : " values are not numbers"; let suffix = invalidCount === 1 ? " value is not a number" : " values are not numbers";
setErrorText(invalidCount + suffix + "numbers and will not be added to the filter"); setErrorText(invalidCount + suffix + " and will not be added to the filter");
} }
else if (type === "pvs") else if (type === "pvs")
{ {