Fix modal processes when selecting all records

This commit is contained in:
2022-10-20 16:28:08 -05:00
parent 3160e1e912
commit 0a9577eb4a
2 changed files with 15 additions and 6 deletions

View File

@ -235,6 +235,7 @@ function EntityList({table, launchProcess}: Props): JSX.Element
const [activeModalProcess, setActiveModalProcess] = useState(null as QProcessMetaData); const [activeModalProcess, setActiveModalProcess] = useState(null as QProcessMetaData);
const [launchingProcess, setLaunchingProcess] = useState(launchProcess); const [launchingProcess, setLaunchingProcess] = useState(launchProcess);
const [recordIdsForProcess, setRecordIdsForProcess] = useState(null as string | QQueryFilter)
const instance = useRef({timer: null}); const instance = useRef({timer: null});
@ -893,6 +894,19 @@ function EntityList({table, launchProcess}: Props): JSX.Element
const openModalProcess = (process: QProcessMetaData = null) => const openModalProcess = (process: QProcessMetaData = null) =>
{ {
if (selectFullFilterState === "filter")
{
setRecordIdsForProcess(buildQFilter(filterModel));
}
else if (selectedIds.length > 0)
{
setRecordIdsForProcess(selectedIds.join(","));
}
else
{
setRecordIdsForProcess("");
}
navigate(`${process.name}${getRecordsQueryString()}`); navigate(`${process.name}${getRecordsQueryString()}`);
closeActionsMenu(); closeActionsMenu();
}; };
@ -1255,7 +1269,7 @@ function EntityList({table, launchProcess}: Props): JSX.Element
activeModalProcess && activeModalProcess &&
<Modal open={activeModalProcess !== null} onClose={(event, reason) => closeModalProcess(event, reason)}> <Modal open={activeModalProcess !== null} onClose={(event, reason) => closeModalProcess(event, reason)}>
<div className="modalProcess"> <div className="modalProcess">
<ProcessRun process={activeModalProcess} isModal={true} recordIds={getRecordIdsForProcess()} closeModalHandler={closeModalProcess} /> <ProcessRun process={activeModalProcess} isModal={true} recordIds={recordIdsForProcess} closeModalHandler={closeModalProcess} />
</div> </div>
</Modal> </Modal>
} }

View File

@ -33,8 +33,6 @@ interface Props
function ReportRun({report}: Props): JSX.Element function ReportRun({report}: Props): JSX.Element
{ {
// const reportNameParam = useParams().reportName;
// const processName = process === null ? processNameParam : process.name;
const [metaData, setMetaData] = useState(null as QInstance); const [metaData, setMetaData] = useState(null as QInstance);
const {pageHeader, setPageHeader} = useContext(QContext); const {pageHeader, setPageHeader} = useContext(QContext);
@ -53,10 +51,7 @@ function ReportRun({report}: Props): JSX.Element
if (metaData) if (metaData)
{ {
setPageHeader(report.label); setPageHeader(report.label);
console.log(`Report Process name is ${report.processName}`);
const process = metaData.processes.get(report.processName); const process = metaData.processes.get(report.processName);
console.log(`Process is ${process.name}`);
const defaultProcessValues = {reportName: report.name}; const defaultProcessValues = {reportName: report.name};
return (<ProcessRun process={process} defaultProcessValues={defaultProcessValues} />); return (<ProcessRun process={process} defaultProcessValues={defaultProcessValues} />);
} }