From 01406b11f15888fba518412dd29cbc279df5530d Mon Sep 17 00:00:00 2001 From: zivglik Date: Mon, 27 Jan 2025 15:15:53 +0200 Subject: [PATCH] fix add gpu --- .../Base/SidebarLeft/useSubMenuAdmin.js | 24 +++++++++---------- .../SidebarRight/NodeStatistics.react.js | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Routes/Base/SidebarLeft/useSubMenuAdmin.js b/src/Routes/Base/SidebarLeft/useSubMenuAdmin.js index 192f7c98f..d08d9359f 100644 --- a/src/Routes/Base/SidebarLeft/useSubMenuAdmin.js +++ b/src/Routes/Base/SidebarLeft/useSubMenuAdmin.js @@ -9,13 +9,13 @@ import Icon, { import { USER_GUIDE, RIGHT_SIDEBAR_NAMES } from 'const'; import { ReactComponent as DriversIcon } from 'images/drivers-icon.svg'; import { ReactComponent as WorkerIcon } from 'images/worker-icon.svg'; -import { useStats, useStorage } from 'hooks/graphql'; +import { useStats } from 'hooks/graphql'; import { Tag } from 'antd'; -import { +/* import { getColorStatus, getStorageColorStatus, combineStatus, -} from 'utils/warningColorStatus'; +} from 'utils/warningColorStatus'; */ import { Name, IconStyle, @@ -23,15 +23,15 @@ import { BadgeStyle, tagStyle, } from './MenuStyles'; -import { getBottomActions } from './../../SidebarRight/schema'; +// import { getBottomActions } from './../../SidebarRight/schema'; const useSubMenuAdmin = (totalNewWarnings, dataMoreCount) => { const { pageName } = useParams(); const location = useLocation(); - - const { cpu, memory, gpu } = useStats(); - const { storage } = useStorage(); - const dataCounters = useMemo( + const { gpu } = useStats(); + // const { cpu, memory, gpu } = useStats(); + // const { storage } = useStorage(); + /* const dataCounters = useMemo( () => getBottomActions({ warnings: totalNewWarnings, @@ -44,7 +44,7 @@ const useSubMenuAdmin = (totalNewWarnings, dataMoreCount) => { }), [cpu, gpu, memory, storage, totalNewWarnings] - ); + ); */ const menuAdminItems = useMemo(() => { const itemsMenu = [ @@ -78,7 +78,7 @@ const useSubMenuAdmin = (totalNewWarnings, dataMoreCount) => { ], ]; - if (dataCounters?.gpuStatus?.total) { + if (gpu?.legend?.length > 0) { itemsMenu.push([ RIGHT_SIDEBAR_NAMES.GPU, FundOutlined, @@ -88,11 +88,11 @@ const useSubMenuAdmin = (totalNewWarnings, dataMoreCount) => { return itemsMenu; }, [ - dataCounters?.gpuStatus?.total, - dataMoreCount.drivers, dataMoreCount.workers, + dataMoreCount.drivers, pageName, totalNewWarnings, + gpu?.legend, ]); const menuAdminItemsJson = useMemo(() => { diff --git a/src/Routes/SidebarRight/NodeStatistics.react.js b/src/Routes/SidebarRight/NodeStatistics.react.js index 99c4dd275..e0890b32a 100644 --- a/src/Routes/SidebarRight/NodeStatistics.react.js +++ b/src/Routes/SidebarRight/NodeStatistics.react.js @@ -17,7 +17,7 @@ const Container = styled.div` // Define the custom formatter component outside of NodeStatistics const CustomAxisLeftTick = ({ value }) => - value.length > 15 ? ( + value?.length > 15 ? ( {`${value.substring(0, 15)}...`} {value}