mirror of
https://github.com/Kingsrook/qqq-frontend-material-dashboard.git
synced 2025-07-19 05:40:44 +00:00
CE-1115 pre-QA commit on saved report UI, including:
- redo pivots so editing is in a modal - add form validations - field rules for clearing one field when another changes
This commit is contained in:
@ -105,8 +105,13 @@ const qController = Client.getInstance();
|
||||
** function to produce standard version of the screen while we're "loading"
|
||||
** like the main table meta data etc.
|
||||
*******************************************************************************/
|
||||
const getLoadingScreen = () =>
|
||||
const getLoadingScreen = (isModal: boolean) =>
|
||||
{
|
||||
if(isModal)
|
||||
{
|
||||
return (<Box> </Box>);
|
||||
}
|
||||
|
||||
return (<BaseLayout>
|
||||
|
||||
</BaseLayout>);
|
||||
@ -2549,7 +2554,7 @@ const RecordQuery = forwardRef(({table, usage, isModal}: Props, ref) =>
|
||||
promptForTableVariantSelection();
|
||||
}
|
||||
|
||||
return (getLoadingScreen());
|
||||
return (getLoadingScreen(isModal));
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
@ -2583,7 +2588,7 @@ const RecordQuery = forwardRef(({table, usage, isModal}: Props, ref) =>
|
||||
setRows([]);
|
||||
setIsFirstRenderAfterChangingTables(true);
|
||||
|
||||
return (getLoadingScreen());
|
||||
return (getLoadingScreen(isModal));
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////
|
||||
@ -2627,7 +2632,7 @@ const RecordQuery = forwardRef(({table, usage, isModal}: Props, ref) =>
|
||||
if (pageState != "ready")
|
||||
{
|
||||
console.log(`page state is ${pageState}... no-op while those complete async's run...`);
|
||||
return (getLoadingScreen());
|
||||
return (getLoadingScreen(isModal));
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////
|
||||
@ -2636,7 +2641,7 @@ const RecordQuery = forwardRef(({table, usage, isModal}: Props, ref) =>
|
||||
///////////////////////////////////////////////////////////////////////////////////////////
|
||||
if (!tableMetaData)
|
||||
{
|
||||
return (getLoadingScreen());
|
||||
return (getLoadingScreen(isModal));
|
||||
}
|
||||
|
||||
let savedViewsComponent = null;
|
||||
|
Reference in New Issue
Block a user