diff --git a/ui/src/components/DataTable.jsx b/ui/src/components/DataTable.jsx index 19487706ed..c720a50cb3 100644 --- a/ui/src/components/DataTable.jsx +++ b/ui/src/components/DataTable.jsx @@ -42,7 +42,8 @@ export default function DataTable(props) { // If no defaultColumns passed - use all columns const defaultColumns = useMemo( - () => props.defaultShowColumns || props.columns.map((col) => getColumnId(col)), + () => + props.defaultShowColumns || props.columns.map((col) => getColumnId(col)), [props.defaultShowColumns, props.columns] ); diff --git a/ui/src/components/Dropdown.jsx b/ui/src/components/Dropdown.jsx index 058c9f4901..f687c6d09e 100644 --- a/ui/src/components/Dropdown.jsx +++ b/ui/src/components/Dropdown.jsx @@ -4,12 +4,21 @@ import Autocomplete from "@material-ui/lab/Autocomplete"; import FormControl from "@material-ui/core/FormControl"; import InputLabel from "@material-ui/core/InputLabel"; -export default function ({ label, className, style, error, helperText, ...props }) { +export default function ({ + label, + className, + style, + error, + helperText, + ...props +}) { return ( {label && {label}} } + renderInput={(params) => ( + + )} {...props} /> diff --git a/ui/src/components/formik/FormikCronEditor.jsx b/ui/src/components/formik/FormikCronEditor.jsx index ed462e15dc..e0a5abde5a 100644 --- a/ui/src/components/formik/FormikCronEditor.jsx +++ b/ui/src/components/formik/FormikCronEditor.jsx @@ -1,20 +1,22 @@ import React from "react"; import { InputLabel } from "@material-ui/core"; import { useField } from "formik"; -import Cron from 'react-cron-generator' +import Cron from "react-cron-generator"; -import './cron.css'; +import "./cron.css"; export default function (props) { - const [field, /*meta*/, helper] = useField(props); - + const [field /*meta*/, , helper] = useField(props); + return (
- Cron Expression - helper.setValue(value)} - showResultText={true} - showResultCron={true} - /> + Cron Expression + helper.setValue(value)} + showResultText={true} + showResultCron={true} + />
); } diff --git a/ui/src/components/formik/FormikInput.jsx b/ui/src/components/formik/FormikInput.jsx index 36ea0cff35..93c344df27 100644 --- a/ui/src/components/formik/FormikInput.jsx +++ b/ui/src/components/formik/FormikInput.jsx @@ -1,11 +1,10 @@ import React from "react"; -import { TextField} from "@material-ui/core"; +import { TextField } from "@material-ui/core"; import { useField } from "formik"; - export default function (props) { const [field, meta] = useField(props); - + return ( {meta.touched && meta.error ? ( - {meta.error} + + {meta.error} + ) : null} ); } - - diff --git a/ui/src/components/formik/FormikSwitch.jsx b/ui/src/components/formik/FormikSwitch.jsx index d428b2280f..7abe1337f6 100644 --- a/ui/src/components/formik/FormikSwitch.jsx +++ b/ui/src/components/formik/FormikSwitch.jsx @@ -2,19 +2,18 @@ import React from "react"; import { Switch, InputLabel } from "@material-ui/core"; import { useField } from "formik"; - export default function ({ label, ...props }) { - const [field, /*meta*/, helper] = useField(props); + const [field /*meta*/, , helper] = useField(props); return (
- {label} - helper.setValue(e.target.checked)} - {...props} - /> + {label} + helper.setValue(e.target.checked)} + {...props} + />
); } diff --git a/ui/src/components/formik/FromikDropdown.jsx b/ui/src/components/formik/FromikDropdown.jsx index 9b360c25ad..71a9a2f12c 100644 --- a/ui/src/components/formik/FromikDropdown.jsx +++ b/ui/src/components/formik/FromikDropdown.jsx @@ -2,11 +2,18 @@ import React from "react"; import { useField } from "formik"; import { Dropdown } from ".."; - export default function (props) { const [field, meta, helper] = useField(props); const touchedError = meta.touched && meta.error; - return <> - helper.setValue(value)} {...props} error={touchedError} helperText={touchedError}/> - + return ( + <> + helper.setValue(value)} + {...props} + error={touchedError} + helperText={touchedError} + /> + + ); } diff --git a/ui/src/components/formik/cron.css b/ui/src/components/formik/cron.css index 676a90edae..3e764b4c19 100644 --- a/ui/src/components/formik/cron.css +++ b/ui/src/components/formik/cron.css @@ -10,7 +10,8 @@ list-style: none; } -.nav-tabs .nav-item.show .nav-link, .nav-tabs .nav-link.active { +.nav-tabs .nav-item.show .nav-link, +.nav-tabs .nav-link.active { color: #495057; background-color: #fff; border-color: #dee2e6 #dee2e6 #fff; @@ -52,4 +53,4 @@ .cron_builder .row { display: flex; flex-direction: row; -} \ No newline at end of file +} diff --git a/ui/src/pages/execution/RightPanel.jsx b/ui/src/pages/execution/RightPanel.jsx index 7687a15fd1..66efa3e253 100644 --- a/ui/src/pages/execution/RightPanel.jsx +++ b/ui/src/pages/execution/RightPanel.jsx @@ -1,5 +1,12 @@ import React, { useState, useEffect } from "react"; -import { Tabs, Tab, Paper, ReactJson, Dropdown, Banner } from "../../components"; +import { + Tabs, + Tab, + Paper, + ReactJson, + Dropdown, + Banner, +} from "../../components"; import TaskSummary from "./TaskSummary"; import TaskLogs from "./TaskLogs"; @@ -14,7 +21,7 @@ const useStyles = makeStyles((theme) => ({ dfSelect: { padding: 15, backgroundColor: "#efefef", - } + }, })); export default function RightPanel({ @@ -122,16 +129,20 @@ export default function RightPanel({ title="Task Input" /> )} - {tabIndex === 2 && (<> - {taskResult.externalOutputPayloadStoragePath && - - This task has externalized output. Please reference externalOutputPayloadStoragePath for the storage location. - } - + {tabIndex === 2 && ( + <> + {taskResult.externalOutputPayloadStoragePath && ( + + This task has externalized output. Please reference{" "} + externalOutputPayloadStoragePath for the storage + location. + + )} + )} {tabIndex === 3 && } diff --git a/ui/src/pages/execution/TaskLogs.jsx b/ui/src/pages/execution/TaskLogs.jsx index fed2824792..dd5e89142f 100644 --- a/ui/src/pages/execution/TaskLogs.jsx +++ b/ui/src/pages/execution/TaskLogs.jsx @@ -13,8 +13,17 @@ export default function TaskLogs({ task }) { diff --git a/ui/src/pages/kitchensink/KitchenSink.jsx b/ui/src/pages/kitchensink/KitchenSink.jsx index 12e392c1f2..c5f899d170 100644 --- a/ui/src/pages/kitchensink/KitchenSink.jsx +++ b/ui/src/pages/kitchensink/KitchenSink.jsx @@ -29,7 +29,7 @@ import { Button, } from "../../components"; import ZoomInIcon from "@material-ui/icons/ZoomIn"; -import * as Yup from 'yup'; +import * as Yup from "yup"; import EnhancedTable from "./EnhancedTable"; import DataTableDemo from "./DataTableDemo"; import top100Films from "./sampleMovieData"; @@ -40,7 +40,6 @@ import clsx from "clsx"; import FormikInput from "../../components/formik/FormikInput"; import FormikJsonInput from "../../components/formik/FormikJsonInput"; - const useStyles = makeStyles(sharedStyles); export default function KitchenSink() { @@ -98,33 +97,32 @@ const FormikSection = () => { Formik setFormState(values)} + .min(15, "Must be 15 characters or more") + .required("Required"), + })} + onSubmit={(values) => setFormState(values)} >
- - - - + + + +
- -
{JSON.stringify(formState)}
-
+ +
{JSON.stringify(formState)}
+
); }; - const ToolbarSection = () => { return ( @@ -448,4 +446,4 @@ const Selects = () => { /> ); -}; \ No newline at end of file +}; diff --git a/ui/src/pages/styles.js b/ui/src/pages/styles.js index 79598b5908..4286eadc73 100644 --- a/ui/src/pages/styles.js +++ b/ui/src/pages/styles.js @@ -15,7 +15,7 @@ export default { zIndex: 1, }, paddingBottom: { - paddingBottom: 25 + paddingBottom: 25, }, tabContent: { padding: 30, @@ -26,6 +26,6 @@ export default { justifyContent: "flex-end", }, field: { - marginBottom: 15 - } + marginBottom: 15, + }, }; diff --git a/ui/src/plugins/CustomAppBarButtons.jsx b/ui/src/plugins/CustomAppBarButtons.jsx index 30fcf6676b..724086256c 100644 --- a/ui/src/plugins/CustomAppBarButtons.jsx +++ b/ui/src/plugins/CustomAppBarButtons.jsx @@ -1,4 +1,3 @@ export default function CustomAppBarButtons() { - return <> - + return <>; } diff --git a/ui/src/plugins/CustomRoutes.jsx b/ui/src/plugins/CustomRoutes.jsx index 8e9e63d541..6c70322b48 100644 --- a/ui/src/plugins/CustomRoutes.jsx +++ b/ui/src/plugins/CustomRoutes.jsx @@ -1,4 +1,3 @@ -export default function CustomRoutes(){ -return <> - -} \ No newline at end of file +export default function CustomRoutes() { + return <>; +} diff --git a/ui/src/schema/task.js b/ui/src/schema/task.js index 364b52babd..89dd464d61 100644 --- a/ui/src/schema/task.js +++ b/ui/src/schema/task.js @@ -17,4 +17,4 @@ export const NEW_TASK_TEMPLATE = { export function configureMonaco(monaco) { // No-op -} \ No newline at end of file +} diff --git a/ui/src/theme/theme.js b/ui/src/theme/theme.js index 81e03ecda8..9d2cbd7c2c 100644 --- a/ui/src/theme/theme.js +++ b/ui/src/theme/theme.js @@ -130,7 +130,7 @@ const baseThemeOptions = { caption: { fontSize: fontSizes.fontSize2, lineHeight: lineHeights.lineHeight1, - fontWeight: fontWeights.fontWeight1 + fontWeight: fontWeights.fontWeight1, }, button: { fontSize: fontSizes.fontSize2, @@ -268,8 +268,8 @@ const overrides = { }, }, containedPrimary: { - color: `${colors.white} !important` - } + color: `${colors.white} !important`, + }, }, MuiCheckbox: { root: {