partial: first codemod

This commit is contained in:
Rafael Taranto 2025-04-15 12:09:45 +01:00
parent 58f53d92a8
commit 86e3401cc8
30 changed files with 335 additions and 323 deletions

View file

@ -6,8 +6,9 @@ import {
StylesProvider, StylesProvider,
jssPreset, jssPreset,
MuiThemeProvider, MuiThemeProvider,
makeStyles StyledEngineProvider,
} from '@mui/material/styles' makeStyles,
} from '@mui/material/styles';
import { create } from 'jss' import { create } from 'jss'
import extendJss from 'jss-plugin-extend' import extendJss from 'jss-plugin-extend'
import React, { useContext, useState } from 'react' import React, { useContext, useState } from 'react'
@ -153,15 +154,17 @@ const App = () => {
<Router> <Router>
<ApolloProvider> <ApolloProvider>
<StylesProvider jss={jss}> <StylesProvider jss={jss}>
<StyledEngineProvider injectFirst>
<MuiThemeProvider theme={theme}> <MuiThemeProvider theme={theme}>
<CssBaseline /> <CssBaseline />
<Main /> <Main />
</MuiThemeProvider> </MuiThemeProvider>
</StyledEngineProvider>
</StylesProvider> </StylesProvider>
</ApolloProvider> </ApolloProvider>
</Router> </Router>
</AppContext.Provider> </AppContext.Provider>
) );
} }
export default App export default App

View file

@ -86,7 +86,8 @@ const BooleanPropertiesTable = memo(
) : ( ) : (
<IconButton <IconButton
className={classes.transparentButton} className={classes.transparentButton}
onClick={() => setEditing(true)}> onClick={() => setEditing(true)}
size="large">
{disabled ? <EditIconDisabled /> : <EditIcon />} {disabled ? <EditIconDisabled /> : <EditIcon />}
</IconButton> </IconButton>
)} )}
@ -121,11 +122,11 @@ const BooleanPropertiesTable = memo(
</TableBody> </TableBody>
</Table> </Table>
</Form> </Form>
) );
}} }}
</Formik> </Formik>
</div> </div>
) );
} }
) )

View file

@ -77,7 +77,8 @@ const ActionCol = ({ disabled, editing }) => {
<IconButton <IconButton
disabled={disableEdit} disabled={disableEdit}
className={classes.editButton} className={classes.editButton}
onClick={() => onEdit && onEdit(values.id)}> onClick={() => onEdit && onEdit(values.id)}
size="large">
{disableEdit ? <DisabledEditIcon /> : <EditIcon />} {disableEdit ? <DisabledEditIcon /> : <EditIcon />}
</IconButton> </IconButton>
</Td> </Td>
@ -88,7 +89,8 @@ const ActionCol = ({ disabled, editing }) => {
disabled={disabled} disabled={disabled}
onClick={() => { onClick={() => {
setDeleteDialog(true) setDeleteDialog(true)
}}> }}
size="large">
{disabled ? <DisabledDeleteIcon /> : <DeleteIcon />} {disabled ? <DisabledDeleteIcon /> : <DeleteIcon />}
</IconButton> </IconButton>
<DeleteDialog <DeleteDialog
@ -114,7 +116,7 @@ const ActionCol = ({ disabled, editing }) => {
</Td> </Td>
)} )}
</> </>
) );
} }
const ECol = ({ editing, focus, config, extraPaddingRight, extraPadding }) => { const ECol = ({ editing, focus, config, extraPaddingRight, extraPadding }) => {

View file

@ -114,7 +114,7 @@ const Autocomplete = ({
<Box <Box
width={18} width={18}
height={18} height={18}
borderRadius={6} borderRadius="6px"
bgcolor={warningColors[props.warning]} bgcolor={warningColors[props.warning]}
/> />
) )
@ -134,7 +134,7 @@ const Autocomplete = ({
) )
}} }}
/> />
) );
} }
export default Autocomplete export default Autocomplete

View file

@ -33,7 +33,7 @@ const SingleRowTable = ({
<THead> <THead>
<Th className={classes.head}> <Th className={classes.head}>
{title} {title}
<IconButton onClick={onEdit} className={classes.button}> <IconButton onClick={onEdit} className={classes.button} size="large">
<EditIcon /> <EditIcon />
</IconButton> </IconButton>
</Th> </Th>
@ -62,7 +62,7 @@ const SingleRowTable = ({
</TBody> </TBody>
</Table> </Table>
</> </>
) );
} }
export default SingleRowTable export default SingleRowTable

View file

@ -252,7 +252,7 @@ const AddMachine = memo(({ close, onPaired }) => {
<div className={classes.wrapper}> <div className={classes.wrapper}>
<div className={classes.headerDiv}> <div className={classes.headerDiv}>
<Title>Add Machine</Title> <Title>Add Machine</Title>
<IconButton disableRipple={true} onClick={close}> <IconButton disableRipple={true} onClick={close} size="large">
<SvgIcon color="error"> <SvgIcon color="error">
<CloseIcon /> <CloseIcon />
</SvgIcon> </SvgIcon>
@ -279,7 +279,7 @@ const AddMachine = memo(({ close, onPaired }) => {
</DialogContent> </DialogContent>
</Dialog> </Dialog>
</div> </div>
) );
}) })
export default AddMachine export default AddMachine

View file

@ -15,13 +15,13 @@ const Login = () => {
spacing={0} spacing={0}
direction="column" direction="column"
alignItems="center" alignItems="center"
justify="center" justifyContent="center"
className={classes.welcomeBackground}> className={classes.welcomeBackground}>
<Grid> <Grid>
<LoginCard /> <LoginCard />
</Grid> </Grid>
</Grid> </Grid>
) );
} }
export default Login export default Login

View file

@ -131,7 +131,7 @@ const Register = () => {
spacing={0} spacing={0}
direction="column" direction="column"
alignItems="center" alignItems="center"
justify="center" justifyContent="center"
className={classes.welcomeBackground}> className={classes.welcomeBackground}>
<Grid> <Grid>
<div> <div>
@ -214,7 +214,7 @@ const Register = () => {
</div> </div>
</Grid> </Grid>
</Grid> </Grid>
) );
} }
export default Register export default Register

View file

@ -121,7 +121,7 @@ const Reset2FA = () => {
spacing={0} spacing={0}
direction="column" direction="column"
alignItems="center" alignItems="center"
justify="center" justifyContent="center"
className={classes.welcomeBackground}> className={classes.welcomeBackground}>
<Grid> <Grid>
<div> <div>
@ -205,7 +205,7 @@ const Reset2FA = () => {
</div> </div>
</Grid> </Grid>
</Grid> </Grid>
) );
} }
export default Reset2FA export default Reset2FA

View file

@ -96,7 +96,7 @@ const ResetPassword = () => {
spacing={0} spacing={0}
direction="column" direction="column"
alignItems="center" alignItems="center"
justify="center" justifyContent="center"
className={classes.welcomeBackground}> className={classes.welcomeBackground}>
<Grid> <Grid>
<div> <div>
@ -164,7 +164,7 @@ const ResetPassword = () => {
</div> </div>
</Grid> </Grid>
</Grid> </Grid>
) );
} }
export default ResetPassword export default ResetPassword

View file

@ -64,7 +64,8 @@ const BlacklistAdvanced = ({
view: it => ( view: it => (
<IconButton <IconButton
className={classes.deleteButton} className={classes.deleteButton}
onClick={() => setSelectedMessage(it)}> onClick={() => setSelectedMessage(it)}
size="large">
<EditIcon /> <EditIcon />
</IconButton> </IconButton>
) )
@ -81,7 +82,8 @@ const BlacklistAdvanced = ({
disabled={ disabled={
!R.isNil(R.path(['allowToggle'], it)) && !R.isNil(R.path(['allowToggle'], it)) &&
!R.path(['allowToggle'], it) !R.path(['allowToggle'], it)
}> }
size="large">
{R.path(['allowToggle'], it) ? ( {R.path(['allowToggle'], it) ? (
<DeleteIcon /> <DeleteIcon />
) : ( ) : (

View file

@ -49,7 +49,8 @@ const BlacklistTable = ({
onClick={() => { onClick={() => {
setDeleteDialog(true) setDeleteDialog(true)
setToBeDeleted(it) setToBeDeleted(it)
}}> }}
size="large">
<DeleteIcon /> <DeleteIcon />
</IconButton> </IconButton>
) )

View file

@ -317,7 +317,7 @@ const ManualDataEntry = ({ selectedValues, customInfoRequirementOptions }) => {
fullWidth fullWidth
label={`Available requests`} label={`Available requests`}
className={classes.picker} className={classes.picker}
getOptionSelected={R.eqProps('code')} isOptionEqualToValue={R.eqProps('code')}
labelProp={'display'} labelProp={'display'}
options={customInfoRequirementOptions} options={customInfoRequirementOptions}
onChange={(evt, it) => {}} onChange={(evt, it) => {}}
@ -343,7 +343,7 @@ const ManualDataEntry = ({ selectedValues, customInfoRequirementOptions }) => {
}></Upload> }></Upload>
)} )}
</> </>
) );
} }
const customElements = { const customElements = {

View file

@ -144,7 +144,8 @@ const IndividualDiscounts = () => {
onClick={() => { onClick={() => {
setDeleteDialog(true) setDeleteDialog(true)
setToBeDeleted({ variables: { discountId: t.id } }) setToBeDeleted({ variables: { discountId: t.id } })
}}> }}
size="large">
<DeleteIcon /> <DeleteIcon />
</IconButton> </IconButton>
) )

View file

@ -120,7 +120,8 @@ const PromoCodes = () => {
onClick={() => { onClick={() => {
setDeleteDialog(true) setDeleteDialog(true)
setToBeDeleted({ variables: { codeId: t.id } }) setToBeDeleted({ variables: { codeId: t.id } })
}}> }}
size="large">
<DeleteIcon /> <DeleteIcon />
</IconButton> </IconButton>
) )

View file

@ -200,9 +200,7 @@ const CashCassettes = () => {
/> />
) )
return ( return (!dataLoading && (<>
!dataLoading && (
<>
<TitleSection <TitleSection
title="Cash boxes & cassettes" title="Cash boxes & cassettes"
buttons={[ buttons={[
@ -258,7 +256,8 @@ const CashCassettes = () => {
)} )}
<IconButton <IconButton
onClick={() => setEditingSchema(true)} onClick={() => setEditingSchema(true)}
className={classes.button}> className={classes.button}
size="large">
<EditIcon /> <EditIcon />
</IconButton> </IconButton>
</Box> </Box>
@ -349,9 +348,7 @@ const CashCassettes = () => {
</DialogActions> </DialogActions>
</Modal> </Modal>
)} )}
</> </>));
)
)
} }
export default CashCassettes export default CashCassettes

View file

@ -132,10 +132,11 @@ const getElements = (
onClick={() => { onClick={() => {
!R.isNil(setMachineId) && setMachineId(m.id ?? m.deviceId) !R.isNil(setMachineId) && setMachineId(m.id ?? m.deviceId)
setWizard(true) setWizard(true)
}}> }}
size="large">
<EditIcon /> <EditIcon />
</IconButton> </IconButton>
) );
} }
} }
] ]

View file

@ -20,7 +20,8 @@ const Header = ({ title, editing, disabled, setEditing }) => {
<IconButton <IconButton
onClick={() => setEditing(true)} onClick={() => setEditing(true)}
className={classes.button} className={classes.button}
disabled={disabled}> disabled={disabled}
size="large">
{disabled ? <DisabledEditIcon /> : <EditIcon />} {disabled ? <DisabledEditIcon /> : <EditIcon />}
</IconButton> </IconButton>
)} )}
@ -35,7 +36,7 @@ const Header = ({ title, editing, disabled, setEditing }) => {
</div> </div>
)} )}
</div> </div>
) );
} }
export default Header export default Header

View file

@ -221,7 +221,8 @@ const ContactInfo = ({ wizard }) => {
{!editing && ( {!editing && (
<IconButton <IconButton
className={classes.transparentButton} className={classes.transparentButton}
onClick={() => setEditing(true)}> onClick={() => setEditing(true)}
size="large">
<EditIcon /> <EditIcon />
</IconButton> </IconButton>
)} )}
@ -311,7 +312,7 @@ const ContactInfo = ({ wizard }) => {
</div> </div>
)} )}
</> </>
) );
} }
export default ContactInfo export default ContactInfo

View file

@ -180,7 +180,8 @@ const SMSNotices = () => {
setPreviewOpen(false) setPreviewOpen(false)
setSelectedSMS(it) setSelectedSMS(it)
setShowModal(true) setShowModal(true)
}}> }}
size="large">
<EditIcon /> <EditIcon />
</IconButton> </IconButton>
) )
@ -221,7 +222,8 @@ const SMSNotices = () => {
R.equals(selectedSMS, it) R.equals(selectedSMS, it)
? setPreviewOpen(!previewOpen) ? setPreviewOpen(!previewOpen)
: setPreviewOpen(true) : setPreviewOpen(true)
}}> }}
size="large">
{R.equals(selectedSMS, it) && previewOpen ? ( {R.equals(selectedSMS, it) && previewOpen ? (
<ExpandIconOpen /> <ExpandIconOpen />
) : ( ) : (

View file

@ -233,7 +233,8 @@ const TermsConditions = () => {
{!editing && ( {!editing && (
<IconButton <IconButton
className={classes.transparentButton} className={classes.transparentButton}
onClick={() => setEditing(true)}> onClick={() => setEditing(true)}
size="large">
<EditIcon /> <EditIcon />
</IconButton> </IconButton>
)} )}
@ -287,7 +288,7 @@ const TermsConditions = () => {
)} )}
</Formik> </Formik>
</> </>
) );
} }
export default TermsConditions export default TermsConditions

View file

@ -144,6 +144,6 @@ export default {
environment: Yup.string('The environment must be a string') environment: Yup.string('The environment must be a string')
.matches(/(prod|test)/) .matches(/(prod|test)/)
.required('The environment is required') .required('The environment is required')
}) });
} }
} }

View file

@ -57,6 +57,6 @@ export default {
endpoint: Yup.string('The endpoint must be a string') endpoint: Yup.string('The endpoint must be a string')
.max(100, 'The endpoint is too long') .max(100, 'The endpoint is too long')
.required('The endpoint is required') .required('The endpoint is required')
}) });
} }
} }

View file

@ -98,7 +98,8 @@ const SessionManagement = () => {
<IconButton <IconButton
onClick={() => { onClick={() => {
deleteSession({ variables: { sid: s.sid } }) deleteSession({ variables: { sid: s.sid } })
}}> }}
size="large">
<DeleteIcon /> <DeleteIcon />
</IconButton> </IconButton>
) )

View file

@ -71,7 +71,7 @@ const CopyToClipboard = ({
</> </>
)} )}
</div> </div>
) );
} }
export default CopyToClipboard export default CopyToClipboard

View file

@ -178,9 +178,7 @@ const CustomInfoRequests = ({
</> </>
) )
return ( return (!configLoading && (<>
!configLoading && (
<>
{customRequests.length > 0 && ( {customRequests.length > 0 && (
<DataTable <DataTable
emptyText="No custom info requests so far" emptyText="No custom info requests so far"
@ -218,10 +216,11 @@ const CustomInfoRequests = ({
onClick={() => { onClick={() => {
setToBeEdited(it) setToBeEdited(it)
return toggleWizard() return toggleWizard()
}}> }}
size="large">
<EditIcon /> <EditIcon />
</IconButton> </IconButton>
) );
} }
}, },
{ {
@ -235,10 +234,11 @@ const CustomInfoRequests = ({
onClick={() => { onClick={() => {
setToBeDeleted(it.id) setToBeDeleted(it.id)
return setDeleteDialog(true) return setDeleteDialog(true)
}}> }}
size="large">
<DeleteIcon /> <DeleteIcon />
</IconButton> </IconButton>
) );
} }
} }
]} ]}
@ -278,7 +278,6 @@ const CustomInfoRequests = ({
existingRequirements={customRequests} existingRequirements={customRequests}
/> />
)} )}
<DeleteDialog <DeleteDialog
errorMessage={hasError ? 'Failed to delete' : ''} errorMessage={hasError ? 'Failed to delete' : ''}
open={deleteDialog} open={deleteDialog}
@ -290,9 +289,7 @@ const CustomInfoRequests = ({
extraMessage={detailedDeleteMsg} extraMessage={detailedDeleteMsg}
onConfirmed={() => handleDelete(toBeDeleted)} onConfirmed={() => handleDelete(toBeDeleted)}
/> />
</> </>));
)
)
} }
export default CustomInfoRequests export default CustomInfoRequests

View file

@ -63,7 +63,7 @@ const getOverridesSchema = (values, customInfoRequests) => {
.label('Automation') .label('Automation')
.matches(/(Manual|Automatic)/) .matches(/(Manual|Automatic)/)
.required() .required()
}) });
} }
const getDefaultSettings = () => { const getDefaultSettings = () => {

View file

@ -165,7 +165,7 @@ const WizardStep = ({
fullWidth fullWidth
label={`Select ${displayName}`} label={`Select ${displayName}`}
className={classes.picker} className={classes.picker}
getOptionSelected={R.eqProps('code')} isOptionEqualToValue={R.eqProps('code')}
labelProp={'display'} labelProp={'display'}
options={unfilled} options={unfilled}
onChange={(evt, it) => { onChange={(evt, it) => {
@ -194,7 +194,7 @@ const WizardStep = ({
</div> </div>
)} )}
</> </>
) );
} }
export default WizardStep export default WizardStep

View file

@ -52,13 +52,13 @@ function Footer({ currentStep, steps, subtitle, text, exImage, open, start }) {
variant={'persistent'} variant={'persistent'}
classes={{ paperAnchorDockedBottom: classes.drawer }}> classes={{ paperAnchorDockedBottom: classes.drawer }}>
<div className={classnames(wrapperClassNames)}> <div className={classnames(wrapperClassNames)}>
<Grid container direction="row" justify="center" alignItems="baseline"> <Grid container direction="row" justifyContent="center" alignItems="baseline">
<Grid <Grid
item item
xs={5} xs={5}
container container
direction={open ? 'column' : 'row'} direction={open ? 'column' : 'row'}
justify="flex-start" justifyContent="flex-start"
alignItems="baseline"> alignItems="baseline">
<H2 className={classes.title}>Setup Lamassu Admin</H2> <H2 className={classes.title}>Setup Lamassu Admin</H2>
<Info2 className={classes.subtitle}>{subtitle}</Info2> <Info2 className={classes.subtitle}>{subtitle}</Info2>
@ -69,7 +69,7 @@ function Footer({ currentStep, steps, subtitle, text, exImage, open, start }) {
xs={4} xs={4}
container container
direction="column" direction="column"
justify="flex-start" justifyContent="flex-start"
alignItems="flex-end" alignItems="flex-end"
spacing={5}> spacing={5}>
<Grid item xs={12}> <Grid item xs={12}>
@ -83,14 +83,14 @@ function Footer({ currentStep, steps, subtitle, text, exImage, open, start }) {
<Grid <Grid
container container
direction="row" direction="row"
justify="center" justifyContent="center"
alignItems="baseline"> alignItems="baseline">
<Grid <Grid
item item
xs={5} xs={5}
container container
direction="column" direction="column"
justify="flex-start" justifyContent="flex-start"
alignItems="flex-start"> alignItems="flex-start">
<Link <Link
onClick={() => { onClick={() => {
@ -104,7 +104,7 @@ function Footer({ currentStep, steps, subtitle, text, exImage, open, start }) {
xs={4} xs={4}
container container
direction="column" direction="column"
justify="flex-start" justifyContent="flex-start"
alignItems="flex-end" alignItems="flex-end"
spacing={5}> spacing={5}>
<Grid item> <Grid item>
@ -129,7 +129,7 @@ function Footer({ currentStep, steps, subtitle, text, exImage, open, start }) {
<img width={1152} src={exImage} alt="" /> <img width={1152} src={exImage} alt="" />
</Modal> </Modal>
</Drawer> </Drawer>
) );
} }
export default Footer export default Footer

View file

@ -1,4 +1,4 @@
import { createTheme } from '@mui/material/styles' import { createTheme, adaptV4Theme } from '@mui/material/styles';
import typographyStyles from 'src/components/typography/styles' import typographyStyles from 'src/components/typography/styles'
@ -18,7 +18,7 @@ import {
const { p } = typographyStyles const { p } = typographyStyles
export default createTheme({ export default createTheme(adaptV4Theme({
typography: { typography: {
fontFamily: inputFontFamily, fontFamily: inputFontFamily,
body1: { ...p } body1: { ...p }
@ -158,4 +158,4 @@ export default createTheme({
} }
} }
} }
}) }))