Finish UI
This commit is contained in:
@@ -342,6 +342,18 @@ export const CarUpdatesProvider = ({ children }) => {
|
|||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const addSUMSVersionRxSwins = async (sums_version, data, token) => {
|
||||||
|
try {
|
||||||
|
setBusy(true);
|
||||||
|
const result = await api.addSUMSVersionRxSwins(sums_version, data, token);
|
||||||
|
if (result.error)
|
||||||
|
throw new Error(`Add software version rxswin error. ${result.message}`);
|
||||||
|
return result;
|
||||||
|
} finally {
|
||||||
|
setBusy(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<CarUpdatesContext.Provider
|
<CarUpdatesContext.Provider
|
||||||
value={{
|
value={{
|
||||||
@@ -363,6 +375,7 @@ export const CarUpdatesProvider = ({ children }) => {
|
|||||||
updateSUMSVersion,
|
updateSUMSVersion,
|
||||||
getSUMSVersionRxSwins,
|
getSUMSVersionRxSwins,
|
||||||
deleteSUMSVersionRxSwins,
|
deleteSUMSVersionRxSwins,
|
||||||
|
addSUMSVersionRxSwins,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
|
|||||||
@@ -155,5 +155,6 @@ export const useCarUpdatesContext = () => ({
|
|||||||
getSUMSVersions: jest.fn(() => sumsVersions),
|
getSUMSVersions: jest.fn(() => sumsVersions),
|
||||||
getSUMSVersionRxSwins: jest.fn(() => sumsVersionRxSwins),
|
getSUMSVersionRxSwins: jest.fn(() => sumsVersionRxSwins),
|
||||||
deleteSUMSVersionRxSwins: jest.fn(),
|
deleteSUMSVersionRxSwins: jest.fn(),
|
||||||
|
addSUMSVersionRxSwins: jest.fn(),
|
||||||
updateSUMSVersion: jest.fn(),
|
updateSUMSVersion: jest.fn(),
|
||||||
});
|
});
|
||||||
@@ -42,6 +42,7 @@ const SuppliersList = React.lazy(() => import("../Suppliers/List"));
|
|||||||
const SupplierDetails = React.lazy(() => import("../Suppliers/Details"));
|
const SupplierDetails = React.lazy(() => import("../Suppliers/Details"));
|
||||||
const Datascope = React.lazy(() => import("../Dashboard"));
|
const Datascope = React.lazy(() => import("../Dashboard"));
|
||||||
const SumsRxSwin = React.lazy(() => import("../SUMS"));
|
const SumsRxSwin = React.lazy(() => import("../SUMS"));
|
||||||
|
const SumsRxSwinAdd = React.lazy(() => import("../SUMS/Add"));
|
||||||
const DashboardCustom = React.lazy(() => import("../DashboardCustom"));
|
const DashboardCustom = React.lazy(() => import("../DashboardCustom"));
|
||||||
|
|
||||||
const SiteRoutes = () => {
|
const SiteRoutes = () => {
|
||||||
@@ -315,6 +316,15 @@ const SiteRoutes = () => {
|
|||||||
rolesPerGroup={Permissions.FiskerMagnaCreate}
|
rolesPerGroup={Permissions.FiskerMagnaCreate}
|
||||||
providers={providers}
|
providers={providers}
|
||||||
/>
|
/>
|
||||||
|
<AuthRoute
|
||||||
|
path="/sums-rxswin-add/:sums_version"
|
||||||
|
render={() => <SumsRxSwinAdd />}
|
||||||
|
type={TYPES.PROTECTED}
|
||||||
|
token={token}
|
||||||
|
groups={groups}
|
||||||
|
rolesPerGroup={Permissions.FiskerMagnaCreate}
|
||||||
|
providers={providers}
|
||||||
|
/>
|
||||||
<PageNotFound />
|
<PageNotFound />
|
||||||
</Switch>
|
</Switch>
|
||||||
</Suspense>
|
</Suspense>
|
||||||
|
|||||||
120
src/components/SUMS/Add/index.jsx
Normal file
120
src/components/SUMS/Add/index.jsx
Normal file
@@ -0,0 +1,120 @@
|
|||||||
|
import {
|
||||||
|
Button,
|
||||||
|
TextField
|
||||||
|
} from "@material-ui/core";
|
||||||
|
import { useParams } from "react-router";
|
||||||
|
import React, { useEffect, useState } from "react";
|
||||||
|
import { Redirect } from "react-router";
|
||||||
|
import { logger } from "../../../services/monitoring";
|
||||||
|
import { useStatusContext } from "../../Contexts/StatusContext";
|
||||||
|
import {
|
||||||
|
CarUpdatesProvider,
|
||||||
|
useCarUpdatesContext
|
||||||
|
} from "../../Contexts/CarUpdatesContext";
|
||||||
|
import { useUserContext } from "../../Contexts/UserContext";
|
||||||
|
import useStyles from "../../useStyles";
|
||||||
|
|
||||||
|
const MainForm = () => {
|
||||||
|
const { addSUMSVersionRxSwins, busy } = useCarUpdatesContext();
|
||||||
|
const {
|
||||||
|
token: {
|
||||||
|
idToken: { jwtToken: token },
|
||||||
|
},
|
||||||
|
} = useUserContext();
|
||||||
|
const classes = useStyles();
|
||||||
|
const [redirect, setRedirect] = useState(null);
|
||||||
|
const { sums_version } = useParams();
|
||||||
|
const { setMessage, setTitle, setSitePath } = useStatusContext();
|
||||||
|
const [rxswin, setRxswin] = useState("");
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setTitle(`Add RXSWIN to SUMS Version ${sums_version}`);
|
||||||
|
setSitePath([
|
||||||
|
{
|
||||||
|
label: `SUMS Version ${sums_version}`,
|
||||||
|
link: `/sums/${sums_version}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: `SUMS Version ${sums_version}`,
|
||||||
|
link: `/sums-rxswin-add/${sums_version}`,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: `Add RXSWIN`,
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const onRxswinChange = (event) => {
|
||||||
|
setRxswin(event.target.value);
|
||||||
|
}
|
||||||
|
|
||||||
|
const onSubmit = async (event) => {
|
||||||
|
try {
|
||||||
|
event.preventDefault();
|
||||||
|
|
||||||
|
const data = {
|
||||||
|
"swversion_rxswins": [
|
||||||
|
{
|
||||||
|
"version": sums_version,
|
||||||
|
"rxswin": rxswin,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
};
|
||||||
|
|
||||||
|
const result = await addSUMSVersionRxSwins(sums_version, data, token);
|
||||||
|
if (!result || result.error) return;
|
||||||
|
|
||||||
|
setMessage(`Added ${rxswin}`);
|
||||||
|
setRedirect(`/sums/${sums_version}`);
|
||||||
|
} catch (e) {
|
||||||
|
setMessage(e.message);
|
||||||
|
logger.warn(e.stack);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if (redirect && redirect.length > 0) {
|
||||||
|
return <Redirect to={redirect} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className={classes.paper}>
|
||||||
|
<form className={classes.form} noValidate action="{onSubmit}">
|
||||||
|
<TextField
|
||||||
|
id="rxswin"
|
||||||
|
name="rxswin"
|
||||||
|
label="RX Software Identification Number (RXSWIN)"
|
||||||
|
variant="outlined"
|
||||||
|
margin="normal"
|
||||||
|
inputProps={{
|
||||||
|
maxLength: "255",
|
||||||
|
}}
|
||||||
|
required
|
||||||
|
fullWidth
|
||||||
|
value={rxswin}
|
||||||
|
onChange={onRxswinChange}
|
||||||
|
type="text"
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
type="submit"
|
||||||
|
disabled={busy}
|
||||||
|
fullWidth
|
||||||
|
variant="contained"
|
||||||
|
color="primary"
|
||||||
|
className={classes.submit}
|
||||||
|
onClick={onSubmit}
|
||||||
|
>
|
||||||
|
{busy ? "Submitting..." : "Submit"}
|
||||||
|
</Button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const SumsRxSwinAdd = () => (
|
||||||
|
<CarUpdatesProvider>
|
||||||
|
<MainForm />
|
||||||
|
</CarUpdatesProvider>
|
||||||
|
);
|
||||||
|
|
||||||
|
export default SumsRxSwinAdd;
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import {
|
import {
|
||||||
|
Grid,
|
||||||
IconButton,
|
IconButton,
|
||||||
Table,
|
Table,
|
||||||
TableBody,
|
TableBody,
|
||||||
@@ -7,7 +8,10 @@ import {
|
|||||||
TablePagination,
|
TablePagination,
|
||||||
TableRow,
|
TableRow,
|
||||||
} from "@material-ui/core";
|
} from "@material-ui/core";
|
||||||
|
import AddCircleIcon from "@material-ui/icons/AddCircle";
|
||||||
import DeleteIcon from "@material-ui/icons/Delete";
|
import DeleteIcon from "@material-ui/icons/Delete";
|
||||||
|
import clsx from "clsx";
|
||||||
|
import { LocalDateTimeString } from "../../utils/dates";
|
||||||
import { logger } from "../../services/monitoring";
|
import { logger } from "../../services/monitoring";
|
||||||
import React, { useEffect, useState } from "react";
|
import React, { useEffect, useState } from "react";
|
||||||
import { useParams } from "react-router";
|
import { useParams } from "react-router";
|
||||||
@@ -17,6 +21,7 @@ import {
|
|||||||
} from "../Contexts/CarUpdatesContext";
|
} from "../Contexts/CarUpdatesContext";
|
||||||
import { useStatusContext } from "../Contexts/StatusContext";
|
import { useStatusContext } from "../Contexts/StatusContext";
|
||||||
import { useUserContext } from "../Contexts/UserContext";
|
import { useUserContext } from "../Contexts/UserContext";
|
||||||
|
import { Link } from "react-router-dom";
|
||||||
import TableHeaderSortable from "../Table/HeaderSortable";
|
import TableHeaderSortable from "../Table/HeaderSortable";
|
||||||
import { useLocalStorage } from "../useLocalStorage";
|
import { useLocalStorage } from "../useLocalStorage";
|
||||||
import DeleteConfirmation from "../DeleteConfirmation";
|
import DeleteConfirmation from "../DeleteConfirmation";
|
||||||
@@ -26,12 +31,12 @@ import { RoleWrap } from "../Controls/RoleWrap";
|
|||||||
|
|
||||||
const tableColumns = [
|
const tableColumns = [
|
||||||
{
|
{
|
||||||
id: "sums_version",
|
id: "sums_rxswin",
|
||||||
label: "SUMS Version",
|
label: "RXSWIN (RX Software Identification Number)",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: "sums_rxswin",
|
id: "created_at",
|
||||||
label: "RXSwin Version",
|
label: "Created",
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -59,7 +64,18 @@ const MainForm = () => {
|
|||||||
groups,
|
groups,
|
||||||
providers,
|
providers,
|
||||||
} = useUserContext();
|
} = useUserContext();
|
||||||
const { setMessage } = useStatusContext();
|
const { setMessage, setTitle, setSitePath } = useStatusContext();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setTitle(`SUMS Version ${sums_version}`);
|
||||||
|
setSitePath([
|
||||||
|
{
|
||||||
|
label: `SUMS Version ${sums_version}`,
|
||||||
|
link: `/sums/${sums_version}`,
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
|
}, []);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
(async () => {
|
(async () => {
|
||||||
@@ -122,6 +138,13 @@ const MainForm = () => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
|
<Grid container className={classes.root} spacing={2}>
|
||||||
|
<Grid item md={4} className={clsx(classes.textJustifyAlign, classes.actionsBar)}>
|
||||||
|
<Link to={`/sums-rxswin-add/${sums_version}`} className={classes.labelInline}>
|
||||||
|
<AddCircleIcon fontSize="large" />
|
||||||
|
</Link>
|
||||||
|
</Grid>
|
||||||
|
</Grid>
|
||||||
<Table>
|
<Table>
|
||||||
<TableHeaderSortable
|
<TableHeaderSortable
|
||||||
classes={classes}
|
classes={classes}
|
||||||
@@ -134,10 +157,10 @@ const MainForm = () => {
|
|||||||
{versionRxSwins.map((row, index) => (
|
{versionRxSwins.map((row, index) => (
|
||||||
<TableRow key={index}>
|
<TableRow key={index}>
|
||||||
<TableCell align="center">
|
<TableCell align="center">
|
||||||
{row.version}
|
{row.rxswin}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell align="center">
|
<TableCell align="center">
|
||||||
{row.rxswin}
|
{LocalDateTimeString(row.created)}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell>
|
<TableCell>
|
||||||
<RoleWrap
|
<RoleWrap
|
||||||
|
|||||||
@@ -146,7 +146,19 @@ const updatesAPI = {
|
|||||||
})
|
})
|
||||||
.then(fetchRespHandler)
|
.then(fetchRespHandler)
|
||||||
.catch(errorHandler);
|
.catch(errorHandler);
|
||||||
}
|
},
|
||||||
|
|
||||||
|
addSUMSVersionRxSwins: async (sums_version, data, token) =>
|
||||||
|
fetch(`${API_ENDPOINT}/manifest/sums/${sums_version}/rxswins`, {
|
||||||
|
method: "POST",
|
||||||
|
headers: Object.assign(
|
||||||
|
{ "Content-Type": "application/json" },
|
||||||
|
getAuthHeaderOptions(token)
|
||||||
|
),
|
||||||
|
body: JSON.stringify(data),
|
||||||
|
})
|
||||||
|
.then(fetchRespHandler)
|
||||||
|
.catch(errorHandler),
|
||||||
};
|
};
|
||||||
|
|
||||||
export default updatesAPI;
|
export default updatesAPI;
|
||||||
Reference in New Issue
Block a user