CE-793 - pre-code-review cleanups

This commit is contained in:
2024-01-30 09:56:31 -06:00
parent e7995c98cc
commit 6c75ce281e
2 changed files with 10 additions and 5 deletions

View File

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

View File

@ -1134,7 +1134,7 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
setRowsPerPage(view.rowsPerPage ?? defaultRowsPerPage);
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 //
@ -1227,10 +1227,11 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
/*******************************************************************************
** 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;
doSetView(view)
@ -1501,10 +1502,14 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
// go back to a default query filter for the table //
/////////////////////////////////////////////////////
doSetQueryFilter(new QQueryFilter());
// todo not i think doSetQuickFilterFieldNames(getDefaultQuickFilterFieldNames(tableMetaData));
const queryColumns = QQueryColumns.buildDefaultForTable(tableMetaData);
doSetQueryColumns(queryColumns)
/////////////////////////////////////////////////////
// also reset the (user-added) quick-filter fields //
/////////////////////////////////////////////////////
doSetQuickFilterFieldNames([]);
}
}