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

Merge pull request #20 from Kingsrook/feature/CTLE-434-oms-update-business-logic

Browse Source 
Feature/ctle 434 oms update business logic
This commit is contained in:
darin.kelkhoff
2023-06-02 09:48:10 -05:00
committed by GitHub
parent 6d1aa54d53 2bfb4a8faf
commit 4c5adf1807
7 changed files with 332 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/qqq/components/forms/EntityForm.tsx
View File

@ -41,6 +41,7 @@ import QDynamicForm from "qqq/components/forms/DynamicForm";
import DynamicFormUtils from "qqq/components/forms/DynamicFormUtils";
import MDTypography from "qqq/components/legacy/MDTypography";
import QRecordSidebar from "qqq/components/misc/RecordSidebar";
import HtmlUtils from "qqq/utils/HtmlUtils";
import Client from "qqq/utils/qqq/Client";
import TableUtils from "qqq/utils/qqq/TableUtils";
import ValueUtils from "qqq/utils/qqq/ValueUtils";
@ -82,7 +83,6 @@ function EntityForm(props: Props): JSX.Element
const [warningContent, setWarningContent] = useState("");
const [asyncLoadInited, setAsyncLoadInited] = useState(false);
const [formValues, setFormValues] = useState({} as { [key: string]: string });
const [tableMetaData, setTableMetaData] = useState(null as QTableMetaData);
const [record, setRecord] = useState(null as QRecord);
const [tableSections, setTableSections] = useState(null as QTableSection[]);
@ -185,8 +185,6 @@ function EntityForm(props: Props): JSX.Element
initialValues[key] = record.values.get(key);
});
//? safe to delete? setFormValues(formValues);
if (!tableMetaData.capabilities.has(Capability.TABLE_UPDATE))
{
setNotAllowedError("Records may not be edited in this table");
@ -416,8 +414,8 @@ function EntityForm(props: Props): JSX.Element
}
else
{
const path = `${location.pathname.replace(/\/edit$/, "")}?updateSuccess=true`;
navigate(path);
const path = location.pathname.replace(/\/edit$/, "");
navigate(path, {state: {updateSuccess: true}});
}
})
.catch((error) =>
@ -427,12 +425,13 @@ function EntityForm(props: Props): JSX.Element
if(error.message.toLowerCase().startsWith("warning"))
{
const path = `${location.pathname.replace(/\/edit$/, "")}?updateSuccess=true&warning=${encodeURIComponent(error.message)}`;
navigate(path);
const path = location.pathname.replace(/\/edit$/, "");
navigate(path, {state: {updateSuccess: true, warning: error.message}});
}
else
{
setAlertContent(error.message);
HtmlUtils.autoScroll(0);
}
});
}
@ -448,20 +447,22 @@ function EntityForm(props: Props): JSX.Element
}
else
{
const path = `${location.pathname.replace(/create$/, record.values.get(tableMetaData.primaryKeyField))}?createSuccess=true`;
navigate(path);
const path = location.pathname.replace(/create$/, record.values.get(tableMetaData.primaryKeyField));
navigate(path, {state: {createSuccess: true}});
}
})
.catch((error) =>
{
if(error.message.toLowerCase().startsWith("warning"))
{
const path = `${location.pathname.replace(/create$/, record.values.get(tableMetaData.primaryKeyField))}?createSuccess=true&warning=${encodeURIComponent(error.message)}`;
const path = location.pathname.replace(/create$/, record.values.get(tableMetaData.primaryKeyField));
navigate(path);
navigate(path, {state: {createSuccess: true, warning: error.message}});
}
else
{
setAlertContent(error.message);
HtmlUtils.autoScroll(0);
}
});
}
@ -499,12 +500,12 @@ function EntityForm(props: Props): JSX.Element
<Grid item xs={12}>
{alertContent ? (
<Box mb={3}>
<Alert severity="error">{alertContent}</Alert>
<Alert severity="error" onClose={() => setAlertContent(null)}>{alertContent}</Alert>
</Box>
) : ("")}
{warningContent ? (
<Box mb={3}>
<Alert severity="warning">{warningContent}</Alert>
<Alert severity="warning" onClose={() => setWarningContent(null)}>{warningContent}</Alert>
</Box>
) : ("")}
</Grid>

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

@ -96,12 +96,31 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
const tableName = table.name;
const [searchParams] = useSearchParams();
const [showSuccessfullyDeletedAlert, setShowSuccessfullyDeletedAlert] = useState(searchParams.has("deleteSuccess"));
const [showSuccessfullyDeletedAlert, setShowSuccessfullyDeletedAlert] = useState(false);
const [warningAlert, setWarningAlert] = useState(null as string);
const [successAlert, setSuccessAlert] = useState(null as string);
const location = useLocation();
const navigate = useNavigate();
if(location.state)
{
let state: any = location.state;
if(state["deleteSuccess"])
{
setShowSuccessfullyDeletedAlert(true);
delete state["deleteSuccess"];
}
if(state["warning"])
{
setWarningAlert(state["warning"]);
delete state["warning"];
}
window.history.replaceState(state, "");
}
const pathParts = location.pathname.replace(/\/+$/, "").split("/");
////////////////////////////////////////////
@ -1736,23 +1755,20 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
)}
{
(tableLabel && showSuccessfullyDeletedAlert) ? (
<Alert color="success" sx={{mb: 3}} onClose={() =>
{
setShowSuccessfullyDeletedAlert(false);
}}>
{`${tableLabel} successfully deleted`}
</Alert>
<Alert color="success" sx={{mb: 3}} onClose={() => setShowSuccessfullyDeletedAlert(false)}>{`${tableLabel} successfully deleted`}</Alert>
) : null
}
{
(successAlert) ? (
<Collapse in={Boolean(successAlert)}>
<Alert color="success" sx={{mb: 3}} onClose={() =>
{
setSuccessAlert(null);
}}>
{successAlert}
</Alert>
<Alert color="success" sx={{mb: 3}} onClose={() => setSuccessAlert(null)}>{successAlert}</Alert>
</Collapse>
) : null
}
{
(warningAlert) ? (
<Collapse in={Boolean(warningAlert)}>
<Alert color="warning" sx={{mb: 3}} onClose={() => setWarningAlert(null)}>{warningAlert}</Alert>
</Collapse>
) : null
}

65
src/qqq/pages/records/view/RecordView.tsx
View File

@ -43,7 +43,7 @@ import Menu from "@mui/material/Menu";
import MenuItem from "@mui/material/MenuItem";
import Modal from "@mui/material/Modal";
import React, {useContext, useEffect, useState} from "react";
import {useLocation, useNavigate, useParams, useSearchParams} from "react-router-dom";
import {useLocation, useNavigate, useParams} from "react-router-dom";
import QContext from "QContext";
import AuditBody from "qqq/components/audits/AuditBody";
import {QActionsMenuButton, QCancelButton, QDeleteButton, QEditButton} from "qqq/components/buttons/DefaultButtons";
@ -53,6 +53,7 @@ import DashboardWidgets from "qqq/components/widgets/DashboardWidgets";
import BaseLayout from "qqq/layouts/BaseLayout";
import ProcessRun from "qqq/pages/processes/ProcessRun";
import HistoryUtils from "qqq/utils/HistoryUtils";
import HtmlUtils from "qqq/utils/HtmlUtils";
import Client from "qqq/utils/qqq/Client";
import ProcessUtils from "qqq/utils/qqq/ProcessUtils";
import TableUtils from "qqq/utils/qqq/TableUtils";
@ -97,10 +98,10 @@ function RecordView({table, launchProcess}: Props): JSX.Element
const [tableProcesses, setTableProcesses] = useState([] as QProcessMetaData[]);
const [allTableProcesses, setAllTableProcesses] = useState([] as QProcessMetaData[]);
const [actionsMenu, setActionsMenu] = useState(null);
const [notFoundMessage, setNotFoundMessage] = useState(null);
const [notFoundMessage, setNotFoundMessage] = useState(null as string);
const [errorMessage, setErrorMessage] = useState(null as string)
const [successMessage, setSuccessMessage] = useState(null as string);
const [warningMessage, setWarningMessage] = useState(null as string);
const [searchParams] = useSearchParams();
const {setPageHeader} = useContext(QContext);
const [activeModalProcess, setActiveModalProcess] = useState(null as QProcessMetaData);
const [reloadCounter, setReloadCounter] = useState(0);
@ -116,6 +117,7 @@ function RecordView({table, launchProcess}: Props): JSX.Element
{
setSuccessMessage(null);
setNotFoundMessage(null);
setErrorMessage(null);
setAsyncLoadInited(false);
setTableMetaData(null);
setRecord(null);
@ -423,14 +425,26 @@ function RecordView({table, launchProcess}: Props): JSX.Element
setSectionFieldElements(sectionFieldElements);
setNonT1TableSections(nonT1TableSections);
if (searchParams.get("createSuccess") || searchParams.get("updateSuccess"))
if(location.state)
{
setSuccessMessage(`${tableMetaData.label} successfully ${searchParams.get("createSuccess") ? "created" : "updated"}`);
}
if (searchParams.get("warning"))
{
setWarningMessage(searchParams.get("warning"));
let state: any = location.state;
if (state["createSuccess"] || state["updateSuccess"])
{
setSuccessMessage(`${tableMetaData.label} successfully ${state["createSuccess"] ? "created" : "updated"}`);
}
if (state["warning"])
{
setWarningMessage(state["warning"]);
}
delete state["createSuccess"]
delete state["updateSuccess"]
delete state["warning"]
window.history.replaceState(state, "");
}
})();
}
@ -452,8 +466,25 @@ function RecordView({table, launchProcess}: Props): JSX.Element
await qController.delete(tableName, id)
.then(() =>
{
const path = `${pathParts.slice(0, -1).join("/")}?deleteSuccess=true`;
navigate(path);
const path = pathParts.slice(0, -1).join("/");
navigate(path, {state: {deleteSuccess: true}});
})
.catch((error) =>
{
setDeleteConfirmationOpen(false);
console.log("Caught:");
console.log(error);
if(error.message.toLowerCase().startsWith("warning"))
{
const path = pathParts.slice(0, -1).join("/");
navigate(path, {state: {deleteSuccess: true, warning: error.message}});
}
else
{
setErrorMessage(error.message);
HtmlUtils.autoScroll(0);
}
});
})();
};
@ -648,7 +679,7 @@ function RecordView({table, launchProcess}: Props): JSX.Element
<Box pb={3}>
{
successMessage ?
<Alert color="success" sx={{mb: 3}} onClose={() =>
<Alert color="success" sx={{mb: 3}} onClose={() =>
{
setSuccessMessage(null);
}}>
@ -666,6 +697,16 @@ function RecordView({table, launchProcess}: Props): JSX.Element
</Alert>
: ("")
}
{
errorMessage ?
<Alert color="error" sx={{mb: 3}} onClose={() =>
{
setErrorMessage(null);
}}>
{errorMessage}
</Alert>
: ("")
}
<Grid container spacing={3}>
<Grid item xs={12} lg={3}>