Merge branch 'main' into next

MOV-AI · Feb 3, 2025 · 6d3dad5 · 6d3dad5
2 parents d3353ba + 8d32dc5
commit 6d3dad5
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,14 @@
-# TBD
+# v1.3.9
 
 - [FP-2857](https://movai.atlassian.net/browse/FP-2857): Merge fix for FP-2810 into 2.4.1
 - [FP-2858](https://movai.atlassian.net/browse/FP-2858): Removelog duplication for the second overlapping in requests
 - [FP-2741](https://movai.atlassian.net/browse/FP-2741): Odd message when trying to start another flow when one is running
+- [FP-3093](https://movai.atlassian.net/browse/FP-3093): Removed onClick handler that was causing issues
+
+# v1.3.8
+
+- [FP-2857](https://movai.atlassian.net/browse/FP-2857): Fleetboard - Logs refactor, merge fix for FP-2810
+- [FP-2780](https://movai.atlassian.net/browse/FP-2780): Fleetboard - Logs - clear search not working
 - [FP-2917](https://movai.atlassian.net/browse/FP-2917): Configure husky, lint-staged and prettier for lib-react
 
 # 1.3.7

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mov-ai/mov-fe-lib-react",
-  "version": "1.3.7-1",
+  "version": "1.3.10-0",
   "description": "The Mov.AI's frontend library for React.",
   "keywords": [
     "frontend",

diff --git a/src/Components/Logs/Logs.js b/src/Components/Logs/Logs.js
@@ -11,7 +11,6 @@ import LogsFilterBar from "./LogsFilterBar/LogsFilterBar";
 import LogsTable from "./LogsTable/LogsTable";
 import { ROBOT_LOG_TYPE } from "./utils/Constants";
 import { COLUMNS_LABEL } from "./utils/Constants";
-import { getDateTime } from "./utils/Utils";
 import useUpdateEffect from "./hooks/useUpdateEffect";
 import _isEqual from "lodash/isEqual";
 import { useStyles } from "./styles";
@@ -217,7 +216,7 @@ const Logs = (props) => {
       setLogsData(
         (prevState) =>
           (logsDataGlobal = [
-            transformLog(item, 0, [item], 0.001),
+            transformLog(item, 0, [item], 0.000001),
             ...prevState,
           ].slice(0, MAX_FETCH_LOGS)),
       );
@@ -253,7 +252,7 @@ const Logs = (props) => {
     // from https://www.epochconverter.com/programming/
     const dateString = !filteredLogs.length
       ? new Date().toISOString()
-      : new Date(filteredLogs[0].timestamp * 0.001).toISOString();
+      : new Date(filteredLogs[0].time * 0.001).toISOString();
     const columnLabels = Object.keys(columns)
       .filter((key) => columns[key])
       .map((key) => COLUMNS_LABEL[key]);

diff --git a/src/Components/Logs/LogsFilterBar/sub-components/SearchInput.js b/src/Components/Logs/LogsFilterBar/sub-components/SearchInput.js
@@ -29,7 +29,7 @@ const SearchInput = () => {
         <IconButton
           data-testid="output_button"
           disabled={!message}
-          onClick={() => onChangeText("")}
+          onClick={() => onChangeText({ target: { value: "" } })}
         >
           <ResetSearch color="inherit" fontSize="small" />
         </IconButton>

diff --git a/src/Components/ProfileMenu/ProfileMenu.tsx b/src/Components/ProfileMenu/ProfileMenu.tsx
@@ -189,10 +189,7 @@ const ProfileMenu = (props: ProfileMenuProps) => {
           )}
           {customEl}
           {handleToggleTheme && (
-            <MenuItem
-              className={classes.menuItemSpacing}
-              onClick={(ev) => ev.preventDefault()}
-            >
+            <MenuItem className={classes.menuItemSpacing}>
               {darkThemeLabel}
               <Toggle
                 onToggle={handleToggleTheme}