Merged feature/CE-1179-add-user-defined-inputs-to into feature/CE-1068-add-basic-functionality-of

This commit is contained in:
2024-04-30 10:29:57 -05:00
13 changed files with 294 additions and 159 deletions

View File

@ -109,7 +109,7 @@ const qController = Client.getInstance();
*******************************************************************************/
const getLoadingScreen = (isModal: boolean) =>
{
if(isModal)
if (isModal)
{
return (<Box>&nbsp;</Box>);
}
@ -151,7 +151,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
*******************************************************************************/
function localStorageSet(key: string, value: string)
{
if(mayWriteLocalStorage)
if (mayWriteLocalStorage)
{
localStorage.setItem(key, value);
}
@ -163,7 +163,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
*******************************************************************************/
function localStorageRemove(key: string)
{
if(mayWriteLocalStorage)
if (mayWriteLocalStorage)
{
localStorage.removeItem(key);
}
@ -176,7 +176,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
{
return view;
}
}
};
});
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -256,7 +256,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
defaultView.mode = defaultMode;
}
if(firstRender)
if (firstRender)
{
/////////////////////////////////////////////////////////////////////////
// allow a caller to send in an initial filter & set of columns. //
@ -408,7 +408,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
//////////////////////////////////////////////////////////////////
// we use our own header - so clear out the context page header //
//////////////////////////////////////////////////////////////////
if(!isModal)
if (!isModal)
{
setPageHeader(null);
}
@ -486,7 +486,6 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
};
/*******************************************************************************
**
*******************************************************************************/
@ -711,7 +710,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
{
if (localStorage.getItem(currentSavedViewLocalStorageKey))
{
if(usage == "queryScreen")
if (usage == "queryScreen")
{
currentSavedViewId = Number.parseInt(localStorage.getItem(currentSavedViewLocalStorageKey));
navigate(`${metaData.getTablePathByName(tableName)}/savedView/${currentSavedViewId}`);
@ -750,13 +749,13 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
const viewForLocalStorage: RecordQueryView = JSON.parse(viewAsJSON);
if (viewForLocalStorage?.queryFilter?.criteria?.length > 0)
{
FilterUtils.stripAwayIncompleteCriteria(viewForLocalStorage.queryFilter)
FilterUtils.stripAwayIncompleteCriteria(viewForLocalStorage.queryFilter);
}
localStorageSet(viewLocalStorageKey, JSON.stringify(viewForLocalStorage));
}
catch(e)
catch (e)
{
console.log("Error storing view in local storage: " + e)
console.log("Error storing view in local storage: " + e);
}
};
@ -939,7 +938,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
console.log(`Issuing query: ${thisQueryId}`);
if (tableMetaData.capabilities.has(Capability.TABLE_COUNT))
{
if(clearOutCount)
if (clearOutCount)
{
setTotalRecords(null);
setDistinctRecords(null);
@ -1437,7 +1436,6 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
return (selectedIds.length);
};
/*******************************************************************************
** get a query-string to put on the url to indicate what records are going into
** a process.
@ -2527,7 +2525,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
{
const currentSavedViewId = Number.parseInt(localStorage.getItem(currentSavedViewLocalStorageKey));
console.log(`returning to previously active saved view ${currentSavedViewId}`);
if(usage == "queryScreen")
if (usage == "queryScreen")
{
navigate(`${metaData.getTablePathByName(tableName)}/savedView/${currentSavedViewId}`);
}
@ -2770,7 +2768,7 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
spaceAboveGrid += 60;
}
if(isModal)
if (isModal)
{
spaceAboveGrid += 130;
}
@ -2976,15 +2974,15 @@ const RecordQuery = forwardRef(({table, usage, isModal, initialQueryFilter, init
</React.Fragment>
);
if(isModal)
if (isModal)
{
return body;
}
return (
<BaseLayout>{body}</BaseLayout>
)
})
);
});
RecordQuery.defaultProps = {