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

QQQ-30: fixes from yesterday's review

Browse Source
This commit is contained in:
Tim Chamberlain
2022-07-13 12:39:59 -05:00
parent 61986b435b
commit cca8a9f718
12 changed files with 972 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/qqq/components/EntityForm/index.tsx
View File

@ -1,5 +1,5 @@
// react components
import { useParams } from "react-router-dom";
import { useParams, useSearchParams } from "react-router-dom";
import React, { useReducer, useState } from "react";
// misc components
@ -18,13 +18,13 @@ import Grid from "@mui/material/Grid";
import { Alert } from "@mui/material";
// Material Dashboard 2 PRO React TS components
import MDAlert from "components/MDAlert";
import MDBox from "components/MDBox";
import MDTypography from "components/MDTypography";
import MDButton from "../../../components/MDButton";
// Declaring props types for EntityForm
interface Props {
interface Props
{
id?: string;
}
@ -36,6 +36,7 @@ function EntityForm({ id }: Props): JSX.Element
const [validations, setValidations] = useState({});
const [initialValues, setInitialValues] = useState({} as { [key: string]: string });
const [formFields, setFormFields] = useState({});
const [alertContent, setAlertContent] = useState("");
const [asyncLoadInited, setAsyncLoadInited] = useState(false);
@ -46,7 +47,10 @@ function EntityForm({ id }: Props): JSX.Element
function getDynamicStepContent(formData: any): JSX.Element
{
const {
formFields, values, errors, touched,
formFields,
values,
errors,
touched,
} = formData;
if (!Object.keys(formFields).length)
@ -85,10 +89,14 @@ function EntityForm({ id }: Props): JSX.Element
setFormValues(formValues);
}
const { dynamicFormFields, formValidations } = DynamicFormUtils.getFormData(fieldArray);
const {
dynamicFormFields,
formValidations,
} = DynamicFormUtils.getFormData(fieldArray);
setInitialValues(initialValues);
setFormFields(dynamicFormFields);
setValidations(Yup.object().shape(formValidations));
setValidations(Yup.object()
.shape(formValidations));
forceUpdate();
})();
@ -107,7 +115,7 @@ function EntityForm({ id }: Props): JSX.Element
{
window.location.href = `/${tableName}/${record.values.get(
tableMetaData.primaryKeyField,
)}`;
)}?updateSuccess=true`;
})
.catch((error) =>
{
@ -122,7 +130,7 @@ function EntityForm({ id }: Props): JSX.Element
{
window.location.href = `/${tableName}/${record.values.get(
tableMetaData.primaryKeyField,
)}`;
)}?createSuccess=true`;
})
.catch((error) =>
{
@ -158,7 +166,10 @@ function EntityForm({ id }: Props): JSX.Element
onSubmit={handleSubmit}
>
{({
values, errors, touched, isSubmitting,
values,
errors,
touched,
isSubmitting,
}) => (
<Form id={formId} autoComplete="off">
<MDBox p={3} width="100%">

13
src/qqq/components/Footer/index.tsx
View File

@ -73,13 +73,7 @@ function Footer({ company, links }: Props): JSX.Element
&copy;
{" "}
{new Date().getFullYear()}
, made with
<MDBox fontSize={size.md} color="text" mb={-0.5} mx={0.25}>
<Icon color="inherit" fontSize="inherit">
favorite
</Icon>
</MDBox>
by
,
<Link href={href} target="_blank">
<MDTypography variant="button" fontWeight="medium">
&nbsp;
@ -87,7 +81,6 @@ function Footer({ company, links }: Props): JSX.Element
&nbsp;
</MDTypography>
</Link>
for a better web.
</MDBox>
<MDBox
component="ul"
@ -114,8 +107,8 @@ function Footer({ company, links }: Props): JSX.Element
// Declaring default props for Footer
Footer.defaultProps = {
company: { href: "https://www.kingsrook.com/", name: "Kingsrook" },
links: [{ href: "https://www.kingsrook.com/", name: "Kingsrook" }],
company: { href: "https://www.nutrifreshservices.com/", name: "Nutrifresh Services" },
links: [],
};
export default Footer;