From 0536fd6b29f60236a5339771d0b60af28705106a Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 15 Feb 2024 09:33:54 -0500 Subject: [PATCH] rename variables --- .../src/components/ros2_rosbag/ROS2ROSBagFilter.js | 6 +++--- .../components/ros2_rosbag/ROS2ROSBagFilterForm.js | 12 ++++++------ .../ros2_rosbag/ROS2RosbagControlsItem.js | 14 +++++++------- .../ros2_rosbag/ROS2RosbagDescriptionDialog.js | 10 +++++----- .../components/ros2_rosbag/ROS2RosbagRowItem.js | 8 ++++---- .../src/components/ros2_rosbag/ROS2RosbagTable.js | 8 ++++---- .../ros2_rosbag/ROS2RosbagUploadDialog.js | 10 +++++----- .../ros2_rosbag/ROS2RosbagUploadPreviewTableRow.js | 10 +++++----- .../web_app/client/src/pages/ROS2RosbagPage.js | 6 +++--- 9 files changed, 42 insertions(+), 42 deletions(-) diff --git a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2ROSBagFilter.js b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2ROSBagFilter.js index f3c8f345..1db450fe 100644 --- a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2ROSBagFilter.js +++ b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2ROSBagFilter.js @@ -22,8 +22,8 @@ import React from "react"; import ROS2ROSBagFilterForm from "./ROS2ROSBagFilterForm"; const ROS2ROSBagFilter = (props) => { - const SearchROS2RosbagsHandler = (filteredEventList) => { - props.onSearchROS2Rosbags(filteredEventList); + const SearchHandler = (filteredEventList) => { + props.onSearch(filteredEventList); }; return ( @@ -32,7 +32,7 @@ const ROS2ROSBagFilter = (props) => { - props.onFresh()} filterROS2RosbagList={() => props.filterROS2RosbagList()} onUpload={formdata => props.onUpload(formdata)} /> + props.onFresh()} filter={() => props.filter()} onUpload={formdata => props.onUpload(formdata)} /> diff --git a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2ROSBagFilterForm.js b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2ROSBagFilterForm.js index 248cbe43..0aa12c03 100644 --- a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2ROSBagFilterForm.js +++ b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2ROSBagFilterForm.js @@ -61,7 +61,7 @@ const ROS2ROSBagFilterForm = memo((props) => { }; const filterROS2RosbagListHandler = () => { - props.filterROS2RosbagList(); + props.filter(); }; const refreshHandler = () => { @@ -87,12 +87,12 @@ const ROS2ROSBagFilterForm = memo((props) => { - ) }} onChange={handleInputTextChange} id="searchROS2rRosbagLabelId" > + ) }} onChange={handleInputTextChange} id="searchROS2rRosbagLabelId" > Upload Status - { props.uploadStatusList !== undefined && props.uploadStatusList.map((uploadStatus) => ( {uploadStatus} @@ -101,8 +101,8 @@ const ROS2ROSBagFilterForm = memo((props) => { - Processing Status - { props.processingStatusList !== undefined && props.processingStatusList.map((processingStatus) => ( @@ -112,7 +112,7 @@ const ROS2ROSBagFilterForm = memo((props) => { - + { diff --git a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagControlsItem.js b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagControlsItem.js index a9ea6057..620e3ecc 100644 --- a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagControlsItem.js +++ b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagControlsItem.js @@ -32,16 +32,16 @@ const ROS2RosbagControlsItem = (props) => { setOpen(true); }; - const handleProcessROS2RosbagReq = () => { - props.onProcessROS2RosbagReq(props.ROS2RosbagRow); + const handleProcessReq = () => { + props.onProcessReq(props.ROS2RosbagRow); }; const closeHandler = () => { setOpen(false); }; - const saveRos2RosbagDescriptionHandler = (UpdatedFileInfo) => { - props.onSaveRos2RosbagDescription(UpdatedFileInfo); + const saveDescHandler = (UpdatedFileInfo) => { + props.onSaveDescription(UpdatedFileInfo); }; return ( @@ -49,12 +49,12 @@ const ROS2RosbagControlsItem = (props) => { { authCtx.role !== USER_ROLES.VIEWER && authCtx.role !== undefined && authCtx.role !== null && authCtx.role !== "" && ( - - + + { props.ROS2RosbagRow !== undefined && props.ROS2RosbagRow.upload_status === UPLOAD_STATUS.COMPLETED && props.ROS2RosbagRow.process_status !== PROCESSING_STATUS.COMPLETED && ( - + )} )} diff --git a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagDescriptionDialog.js b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagDescriptionDialog.js index 4f3ad5f5..61018ddc 100644 --- a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagDescriptionDialog.js +++ b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagDescriptionDialog.js @@ -52,7 +52,7 @@ function ROS2RosbagDescriptionDialog(props) { clearErrors(); resetField("description"); }; - const handleDescriptionChange = (event) => { + const handleDescChange = (event) => { setDescription(event.target.value); }; @@ -67,7 +67,7 @@ function ROS2RosbagDescriptionDialog(props) { ); }, [props]); - const saveRos2RosbagDescriptionHandler = (event) => { + const saveDescHandler = (event) => { let localUpdatedFile = { content_location: props.ROS2RosbagRow.content_location, created_at: props.ROS2RosbagRow.created_at, @@ -97,12 +97,12 @@ function ROS2RosbagDescriptionDialog(props) { Update description for file ({props.ROS2RosbagRow.original_filename}) and click "SAVE". - + - Cancel - Save + Cancel + Save ); diff --git a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagRowItem.js b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagRowItem.js index d2fe86f1..ae820590 100644 --- a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagRowItem.js +++ b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagRowItem.js @@ -26,8 +26,8 @@ import AuthContext from "../../context/auth-context"; const ROS2RosbagRowItem = (props) => { const authCtx = React.useContext(AuthContext); - const saveRos2RosbagDescriptionHandler = (UpdatedFileInfo) => { - props.onSaveRos2RosbagDescription(UpdatedFileInfo); + const saveDescHandler = (UpdatedFileInfo) => { + props.onSaveDescription(UpdatedFileInfo); }; return ( @@ -66,8 +66,8 @@ const ROS2RosbagRowItem = (props) => { { authCtx.role !== USER_ROLES.VIEWER && authCtx.role !== undefined && authCtx.role !== null && authCtx.role !== "" && ( props.onProcessROS2RosbagReq(ROS2RosBagInfo)} /> + onSaveDescription={saveDescHandler} + onProcessReq={(ROS2RosBagInfo) => props.onProcessReq(ROS2RosBagInfo)} /> )} ) diff --git a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagTable.js b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagTable.js index 858f2a7e..7c8a5bdb 100644 --- a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagTable.js +++ b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagTable.js @@ -88,8 +88,8 @@ export default function ROS2RosbagTable(props) { setPage(0); }; - const saveRos2RosbagDescriptionHandler = (UpdatedFileInfo) => { - props.onSaveRos2RosbagDescription(UpdatedFileInfo); + const saveDescHandler = (UpdatedFileInfo) => { + props.onSaveDescription(UpdatedFileInfo); }; return ( @@ -110,8 +110,8 @@ export default function ROS2RosbagTable(props) { {props.ROS2RosbagList !== undefined && Array.isArray(props.ROS2RosbagList) && props.ROS2RosbagList.slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage).map((row) => { return ( props.onProcessROS2RosbagReq(ROS2RosBagInfo)} /> + onSaveDescription={saveDescHandler} + onProcessReq={(ROS2RosBagInfo) => props.onProcessReq(ROS2RosBagInfo)} /> ); })} diff --git a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagUploadDialog.js b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagUploadDialog.js index d3ba679f..e4ee4f2d 100644 --- a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagUploadDialog.js +++ b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagUploadDialog.js @@ -58,14 +58,14 @@ const ROS2RosbagUploadDialog = (props) => { setSelectedFilesForm(formData); }; - const confirmRemovalHandler = (filename) => { + const confirmHandler = (filename) => { let newForm = new FormData(); newForm["files"] = selectedfilesForm["files"].filter((item) => item.name !== filename); newForm["fields"] = selectedfilesForm["fields"].filter((item) => item.filename !== filename); setSelectedFilesForm(newForm); }; - const updateDescriptionHandler = (updatedROS2RosbagInfo) => { + const updateDescHandler = (updatedROS2RosbagInfo) => { let newForm = new FormData(); newForm["files"] = selectedfilesForm["files"]; newForm["fields"] = [...selectedfilesForm["fields"].filter((item) => item.filename !== updatedROS2RosbagInfo.filename), updatedROS2RosbagInfo]; @@ -73,7 +73,7 @@ const ROS2RosbagUploadDialog = (props) => { setSelectedFilesForm(newForm); }; - const uploadAndProcessROS2RosbagsHandler = () => { + const uploadAndProcessHandler = () => { props.onUpload(selectedfilesForm); closeHandler(); } @@ -96,12 +96,12 @@ const ROS2RosbagUploadDialog = (props) => { - + Cancel - Process + Process ); diff --git a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagUploadPreviewTableRow.js b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagUploadPreviewTableRow.js index e75db102..74085807 100644 --- a/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagUploadPreviewTableRow.js +++ b/telematic_system/telematic_apps/web_app/client/src/components/ros2_rosbag/ROS2RosbagUploadPreviewTableRow.js @@ -39,13 +39,13 @@ const ROS2RosbagUploadPreviewTableRow = (props) => { return ( - {props.previewFileFields.filename} - - {props.previewFileFields.filename} + + - {props.previewFileFields.filesize} - + {props.previewFileFields.filesize} + { props.onConfirm(props.previewFileFields.filename); }} onCloseWarning={closeHandler} > diff --git a/telematic_system/telematic_apps/web_app/client/src/pages/ROS2RosbagPage.js b/telematic_system/telematic_apps/web_app/client/src/pages/ROS2RosbagPage.js index a83440f7..e96b947e 100644 --- a/telematic_system/telematic_apps/web_app/client/src/pages/ROS2RosbagPage.js +++ b/telematic_system/telematic_apps/web_app/client/src/pages/ROS2RosbagPage.js @@ -52,7 +52,7 @@ const ROS2RosbagPage = React.memo(() => { }); }; - const saveRos2RosbagDescriptionHandler = (UpdatedFileInfo) => { + const saveDescriptionHandler = (UpdatedFileInfo) => { updateROS2RosbagDescription(UpdatedFileInfo).then((data) => { if (data.errCode !== undefined && data.errMsg !== undefined) { setAlertStatus({ @@ -226,9 +226,9 @@ const ROS2RosbagPage = React.memo(() => { } title="ROS2 Rosbag" /> - + - processROS2RosbagReqHandler(ROS2RosBagInfo)} /> + processROS2RosbagReqHandler(ROS2RosBagInfo)} /> )}