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

CE-793 - pre-code-review cleanups

Browse Source
This commit is contained in:
darin.kelkhoff
2024-01-30 09:56:31 -06:00
parent e7995c98cc
commit 6c75ce281e
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -550,7 +550,7 @@ const BasicAndAdvancedQueryControls = forwardRef((props: BasicAndAdvancedQueryCo
handleFieldChange={(e, newValue, reason) => addQuickFilterField(newValue, reason)} handleFieldChange={(e, newValue, reason) => addQuickFilterField(newValue, reason)}
autoFocus={true} autoFocus={true}
forceOpen={Boolean(addQuickFilterMenu)} forceOpen={Boolean(addQuickFilterMenu)}
hiddenFieldNames={[...defaultQuickFilterFieldNames, ...quickFilterFieldNames]} hiddenFieldNames={[...(defaultQuickFilterFieldNames??[]), ...(quickFilterFieldNames??[])]}
/> />
</Box> </Box>
</Menu> </Menu>

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

@ -1134,7 +1134,7 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
setRowsPerPage(view.rowsPerPage ?? defaultRowsPerPage); setRowsPerPage(view.rowsPerPage ?? defaultRowsPerPage);
setMode(view.mode ?? defaultMode); setMode(view.mode ?? defaultMode);
setQuickFilterFieldNames(view.quickFilterFieldNames) // todo not i think ?? getDefaultQuickFilterFieldNames(tableMetaData)); setQuickFilterFieldNames(view.quickFilterFieldNames ?? []) // todo not i think ?? getDefaultQuickFilterFieldNames(tableMetaData));
////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////
// do this last - in case anything in the view got modified in any of those other doSet methods // // do this last - in case anything in the view got modified in any of those other doSet methods //
@ -1227,10 +1227,11 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
/******************************************************************************* /*******************************************************************************
** Event handler from BasicAndAdvancedQueryControls for when quickFilterFields change ** Event handler from BasicAndAdvancedQueryControls for when quickFilterFields change
** or other times we need to change them (e.g., activating a view)
*******************************************************************************/ *******************************************************************************/
const doSetQuickFilterFieldNames = (names: string[]) => const doSetQuickFilterFieldNames = (names: string[]): void =>
{ {
setQuickFilterFieldNames([...names]); setQuickFilterFieldNames([...(names ?? [])]);
view.quickFilterFieldNames = names; view.quickFilterFieldNames = names;
doSetView(view) doSetView(view)
@ -1501,10 +1502,14 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
// go back to a default query filter for the table // // go back to a default query filter for the table //
///////////////////////////////////////////////////// /////////////////////////////////////////////////////
doSetQueryFilter(new QQueryFilter()); doSetQueryFilter(new QQueryFilter());
// todo not i think doSetQuickFilterFieldNames(getDefaultQuickFilterFieldNames(tableMetaData));
const queryColumns = QQueryColumns.buildDefaultForTable(tableMetaData); const queryColumns = QQueryColumns.buildDefaultForTable(tableMetaData);
doSetQueryColumns(queryColumns) doSetQueryColumns(queryColumns)
/////////////////////////////////////////////////////
// also reset the (user-added) quick-filter fields //
/////////////////////////////////////////////////////
doSetQuickFilterFieldNames([]);
} }
} }