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

CE-969: fixed flex wrapping on advanced queries, recursive calls to 'clean values' and 'prep subquery for backend'

Browse Source
This commit is contained in:
Tim Chamberlain
2024-03-18 19:39:19 -05:00
parent e34811354f
commit edab918763
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -410,7 +410,7 @@ const BasicAndAdvancedQueryControls = forwardRef((props: BasicAndAdvancedQueryCo
let counter = 0; let counter = 0;
return ( return (
<Box display="flex" flexWrap="wrap" fontSize="0.875rem"> <React.Fragment>
{thisQueryFilter.criteria?.map((criteria, i) => {thisQueryFilter.criteria?.map((criteria, i) =>
{ {
const {criteriaIsValid} = validateCriteria(criteria, null); const {criteriaIsValid} = validateCriteria(criteria, null);
@ -446,7 +446,7 @@ const BasicAndAdvancedQueryControls = forwardRef((props: BasicAndAdvancedQueryCo
</React.Fragment> </React.Fragment>
); );
}))} }))}
</Box> </React.Fragment>
); );
}; };
@ -821,8 +821,10 @@ const BasicAndAdvancedQueryControls = forwardRef((props: BasicAndAdvancedQueryCo
pb={"0.125rem"} pb={"0.125rem"}
boxShadow={"inset 0px 0px 4px 2px #EFEFED"} boxShadow={"inset 0px 0px 4px 2px #EFEFED"}
> >
<Box display="flex" flexWrap="wrap" fontSize="0.875rem">
{queryToAdvancedString(queryFilter)} {queryToAdvancedString(queryFilter)}
</Box> </Box>
</Box>
} }
</Box> </Box>
</Box> </Box>

12
src/qqq/pages/records/query/RecordQuery.tsx
View File

@ -447,9 +447,19 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
} }
} }
} }
/////////////////////////////////////////
// recursively prep subfilters as well //
/////////////////////////////////////////
let subFilters = [] as QQueryFilter[];
for (let j = 0; j < sourceFilter?.subFilters?.length; j++)
{
subFilters.push(prepQueryFilterForBackend(sourceFilter.subFilters[j]));
}
filterForBackend.subFilters = subFilters;
filterForBackend.skip = pageNumber * rowsPerPage; filterForBackend.skip = pageNumber * rowsPerPage;
filterForBackend.limit = rowsPerPage; filterForBackend.limit = rowsPerPage;
return filterForBackend; return filterForBackend;
}; };

8
src/qqq/utils/qqq/FilterUtils.tsx
View File

@ -159,6 +159,14 @@ class FilterUtils
criteria.values = values; criteria.values = values;
} }
////////////////////////////////////////////////
// recursively clean values in any subfilters //
////////////////////////////////////////////////
for (let j = 0; j < queryFilter?.subFilters?.length; j++)
{
await FilterUtils.cleanupValuesInFilerFromQueryString(qController, tableMetaData, queryFilter.subFilters[j]);
}
} }