Skip to content

Commit

Permalink
fixed a lot of eslint warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@atiderko
atiderko committed Apr 3, 2024
1 parent 5bfdbc1 commit 5604d92
Show file tree
Hide file tree
Showing 24 changed files with 473 additions and 455 deletions.
195 changes: 95 additions & 100 deletions fkie_mas_gui/src/renderer/components/ConnectToProviderModal/ConnectToProviderModal.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useContext, useEffect, useMemo, useState } from 'react';
import { useCallback, useContext, useEffect, useMemo, useState } from 'react';

import CheckBoxIcon from '@mui/icons-material/CheckBox';
import CheckBoxOutlineBlankIcon from '@mui/icons-material/CheckBoxOutlineBlank';
Expand Down Expand Up @@ -114,7 +114,6 @@ function ConnectToProviderModal() {
'ConnectToProviderModal:startConfigurations',
[],
);
const [filterHostsText, setFilterHostsText] = useState('');
const [selectedHistory, setSelectedHistory] = useState('');
const [forceRestart, setForceRestart] = useState(true);
const [saveDefaultParameter, setSaveDefaultParameter] = useState(false);
Expand All @@ -141,13 +140,6 @@ function ConnectToProviderModal() {
setStartProviderIsSubmitting(false);
};

useEffect(() => {
// use system ros version
if (rosCtx.rosInfo?.version) {
setRosVersion(rosCtx.rosInfo?.version);
}
}, [rosCtx.rosInfo]);

useEffect(() => {
if (!rosCtx.systemInfo) return;
if (!rosCtx.systemInfo.hosts) return;
Expand Down Expand Up @@ -221,10 +213,13 @@ function ConnectToProviderModal() {
return robotHosts;
};

const setRosVersion = (rosVersion) => {
startParameter.rosVersion = rosVersion;
setStartParameter(JSON.parse(JSON.stringify(startParameter)));
};
const setRosVersion = useCallback(
(rosVersion) => {
startParameter.rosVersion = rosVersion;
setStartParameter(JSON.parse(JSON.stringify(startParameter)));
},
[startParameter],
);

const setNetworkId = (networkId) => {
startParameter.networkId = networkId;
Expand Down Expand Up @@ -377,92 +372,92 @@ function ConnectToProviderModal() {
}, 500);
};

const generateHistoryView = useMemo(
(provider) => {
if (startConfigurations.length === 0) {
return <></>;
}
return (
<Stack
maxHeight={'13em'}
// backgroundColor={settingsCtx.get('backgroundColor')}
paddingBottom="1.2em"
useEffect(() => {
// use system ros version
if (rosCtx.rosInfo?.version) {
setRosVersion(rosCtx.rosInfo?.version);
}
}, [rosCtx.rosInfo, setRosVersion]);

const generateHistoryView = useMemo(() => {
if (startConfigurations.length === 0) {
// eslint-disable-next-line react/jsx-no-useless-fragment
return <></>;
}
return (
<Stack
maxHeight="13em"
// backgroundColor={settingsCtx.get('backgroundColor')}
paddingBottom="1.2em"
>
<Typography paddingBottom="0.3em" variant="body2">
Recent:
</Typography>
<Paper
sx={{
maxHeight: '13em',
width: '100%',
overflow: 'auto',
backgroundColor: settingsCtx.get('backgroundColor'),
}}
>
<Typography paddingBottom="0.3em" variant="body2">
Recent:
</Typography>
<Paper
sx={{
maxHeight: '13em',
width: '100%',
overflow: 'auto',
backgroundColor: settingsCtx.get('backgroundColor'),
}}
>
<TableContainer>
<Table aria-label="favorite table">
<TableBody>
{startConfigurations.map((cfg) => (
<TableRow
hover
key={cfg.id}
onClick={() => {
setStartParameter(cfg.params);
setHostValues(cfg.hosts);
setHostInputValue('');
setSelectedHistory(cfg.id);
}}
>
<TableCell>
<Typography
noWrap
variant="body2"
fontWeight={
selectedHistory === cfg.id ? 'bold' : 'normal'
}
style={{
cursor: 'pointer',
<TableContainer>
<Table aria-label="favorite table">
<TableBody>
{startConfigurations.map((cfg) => (
<TableRow
hover
key={cfg.id}
onClick={() => {
setStartParameter(cfg.params);
setHostValues(cfg.hosts);
setHostInputValue('');
setSelectedHistory(cfg.id);
}}
>
<TableCell>
<Typography
noWrap
variant="body2"
fontWeight={
selectedHistory === cfg.id ? 'bold' : 'normal'
}
style={{
cursor: 'pointer',
}}
>
{stringifyStartConfig(cfg)}
</Typography>
</TableCell>
<TableCell style={{ padding: 0, width: '2em' }}>
<Tooltip title="Delete entry" placement="bottom">
<IconButton
color="error"
onClick={() => {
setStartConfigurations((prev) =>
prev.filter((pCfg) => pCfg.id !== cfg.id),
);
}}
size="small"
>
{stringifyStartConfig(cfg)}
</Typography>
</TableCell>
<TableCell style={{ padding: 0, width: '2em' }}>
<Tooltip title="Delete entry" placement="bottom">
<IconButton
color="error"
onClick={() => {
setStartConfigurations((prev) =>
prev.filter((pCfg) => pCfg.id !== cfg.id),
);
}}
size="small"
>
<DeleteOutlineOutlinedIcon fontSize="inherit" />
</IconButton>
</Tooltip>
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</TableContainer>
</Paper>
</Stack>
);
},
[
settingsCtx.changed,
startConfigurations,
selectedHistory,
setSelectedHistory,
setStartParameter,
setStartConfigurations,
setHostValues,
setHostInputValue,
stringifyStartConfig,
],
);
<DeleteOutlineOutlinedIcon fontSize="inherit" />
</IconButton>
</Tooltip>
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</TableContainer>
</Paper>
</Stack>
);
}, [
startConfigurations,
settingsCtx,
selectedHistory,
setStartConfigurations,
]);

return (
<>
Expand Down Expand Up @@ -583,7 +578,7 @@ function ConnectToProviderModal() {
<div>{startProviderDescription}</div>
</Stack>
) : (
<Stack direction="row" spacing={'1em'} marginLeft="1rem">
<Stack direction="row" spacing="1em" marginLeft="1rem">
<Button
type="submit"
variant="contained"
Expand All @@ -600,7 +595,7 @@ function ConnectToProviderModal() {
style={{ height: '3em', textAlign: 'center' }}
endIcon={<RocketLaunchIcon />}
>
{'Start'}
Start
</Button>
<Button
type="submit"
Expand All @@ -617,7 +612,7 @@ function ConnectToProviderModal() {
style={{ height: '3em', textAlign: 'center' }}
endIcon={<JoinFullIcon />}
>
{'Join'}
Join
</Button>
</Stack>
)}
Expand Down Expand Up @@ -1146,7 +1141,7 @@ function ConnectToProviderModal() {
}}
endIcon={<RestartAltIcon />}
>
{'Reset advanced parameters to default'}
Reset advanced parameters to default
</Button>
</Box>
</Stack>
Expand Down
61 changes: 32 additions & 29 deletions fkie_mas_gui/src/renderer/components/HostTreeView/LaunchFileList.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,35 +51,38 @@ function LaunchFileList({
/**
* Create and open a new panel with a [FileEditorPanel] for a given file path and host
*/
const createFileEditorPanel = useCallback((provId, launchContent) => {
const launchName = getBaseName(launchContent.path);
// const provider = rosCtx.getProviderById(provId);
// const packages = provider?.packages?.filter((rosPackage) => {
// return launchContent.path.startsWith(
// rosPackage.path.endsWith('/')
// ? rosPackage.path
// : `${rosPackage.path}/`,
// );
// });
// [${packages.length > 0 ? packages[0].name : ''}]@${providerName}
const id = `editor-${provId}-${launchContent.path}`;
emitCustomEvent(
EVENT_OPEN_COMPONENT,
eventOpenComponent(
id,
launchName,
<FileEditorPanel
tabId={id}
providerId={provId}
currentFilePath={launchContent.path}
rootFilePath={launchContent.path}
/>,
true,
LAYOUT_TAB_SETS[settingsCtx.get('editorOpenLocation')],
new LayoutTabConfig(false, 'editor'),
),
);
}, []);
const createFileEditorPanel = useCallback(
(provId, launchContent) => {
const launchName = getBaseName(launchContent.path);
// const provider = rosCtx.getProviderById(provId);
// const packages = provider?.packages?.filter((rosPackage) => {
// return launchContent.path.startsWith(
// rosPackage.path.endsWith('/')
// ? rosPackage.path
// : `${rosPackage.path}/`,
// );
// });
// [${packages.length > 0 ? packages[0].name : ''}]@${providerName}
const id = `editor-${provId}-${launchContent.path}`;
emitCustomEvent(
EVENT_OPEN_COMPONENT,
eventOpenComponent(
id,
launchName,
<FileEditorPanel
tabId={id}
providerId={provId}
currentFilePath={launchContent.path}
rootFilePath={launchContent.path}
/>,
true,
LAYOUT_TAB_SETS[settingsCtx.get('editorOpenLocation')],
new LayoutTabConfig(false, 'editor'),
),
);
},
[settingsCtx],
);

/**
* Create and open a new panel with a [LaunchFilePanel]
Expand Down
2 changes: 1 addition & 1 deletion fkie_mas_gui/src/renderer/components/LaunchFileModal/LaunchFileModal.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ function LaunchFileModal({
);
}
},
[currentArgs],
[currentArgs, lastOpenPath, setLastOpenPath],
);

const isPathParam = (name, value) => {
Expand Down
Loading

0 comments on commit 5604d92

Please sign in to comment.