From 7d9b948b89d974dd54f6cb91466a666e82213f65 Mon Sep 17 00:00:00 2001 From: dan-du-car Date: Mon, 22 Jul 2024 10:49:17 -0400 Subject: [PATCH 1/3] init --- .../src/components/ros2_rosbag/ROS2RosbagRowItem.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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 ddf17a37..1b99d343 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 @@ -40,10 +40,17 @@ const ROS2RosbagRowItem = (props) => { let isGreen = (column.id === "process_status" && props.ROS2RosbagRow.process_status === PROCESSING_STATUS.COMPLETED) || (column.id === "upload_status" && props.ROS2RosbagRow.upload_status === UPLOAD_STATUS.COMPLETED); let isRed = (column.id === "process_status" && props.ROS2RosbagRow.process_status === PROCESSING_STATUS.ERROR) || (column.id === "upload_status" && props.ROS2RosbagRow.upload_status === UPLOAD_STATUS.ERROR); let createdBy = column.id === "created_by" && props.ROS2RosbagRow?.user?.login !== undefined ? props.ROS2RosbagRow?.user?.login : "NA"; + let isLowerCase = column.id === "process_status" || column.id === "upload_status"; value = column.id === "size" ? calFilesizes(value) : value; value = column.id === "created_by" ? createdBy : value; - value = column.id === "created_at" ? new Date(value).toLocaleString() : value; - value = column.id === "original_filename" && value.includes("/") ? value.split("/")[value.split("/").length-1]: value; + value = + column.id === "created_at" + ? new Date(value).toLocaleString() + : value; + value = + column.id === "original_filename" && value.includes("/") + ? value.split("/")[value.split("/").length - 1] + : value; return ( { wordBreak: "break-word", }} > - {value.toLowerCase()} + {isLowerCase ? value.toLowerCase() : value} {column.id === "process_status" && isRed && ( Date: Mon, 22 Jul 2024 10:50:42 -0400 Subject: [PATCH 2/3] init --- .../src/components/ros2_rosbag/ROS2RosbagRowItem.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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 1b99d343..43bcdbfb 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 @@ -43,14 +43,8 @@ const ROS2RosbagRowItem = (props) => { let isLowerCase = column.id === "process_status" || column.id === "upload_status"; value = column.id === "size" ? calFilesizes(value) : value; value = column.id === "created_by" ? createdBy : value; - value = - column.id === "created_at" - ? new Date(value).toLocaleString() - : value; - value = - column.id === "original_filename" && value.includes("/") - ? value.split("/")[value.split("/").length - 1] - : value; + value = column.id === "created_at" ? new Date(value).toLocaleString() : value; + value = column.id === "original_filename" && value.includes("/") ? value.split("/")[value.split("/").length-1]: value; return ( Date: Mon, 22 Jul 2024 11:03:15 -0400 Subject: [PATCH 3/3] update variable name --- .../client/src/components/ros2_rosbag/ROS2RosbagRowItem.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 43bcdbfb..88c88a9b 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 @@ -40,7 +40,7 @@ const ROS2RosbagRowItem = (props) => { let isGreen = (column.id === "process_status" && props.ROS2RosbagRow.process_status === PROCESSING_STATUS.COMPLETED) || (column.id === "upload_status" && props.ROS2RosbagRow.upload_status === UPLOAD_STATUS.COMPLETED); let isRed = (column.id === "process_status" && props.ROS2RosbagRow.process_status === PROCESSING_STATUS.ERROR) || (column.id === "upload_status" && props.ROS2RosbagRow.upload_status === UPLOAD_STATUS.ERROR); let createdBy = column.id === "created_by" && props.ROS2RosbagRow?.user?.login !== undefined ? props.ROS2RosbagRow?.user?.login : "NA"; - let isLowerCase = column.id === "process_status" || column.id === "upload_status"; + let columnsToLowercase = column.id === "process_status" || column.id === "upload_status"; value = column.id === "size" ? calFilesizes(value) : value; value = column.id === "created_by" ? createdBy : value; value = column.id === "created_at" ? new Date(value).toLocaleString() : value; @@ -63,7 +63,7 @@ const ROS2RosbagRowItem = (props) => { wordBreak: "break-word", }} > - {isLowerCase ? value.toLowerCase() : value} + {columnsToLowercase ? value.toLowerCase() : value} {column.id === "process_status" && isRed && (