diff --git a/frontend/src/container/BillingContainer/BillingUsageGraph/BillingUsageGraph.tsx b/frontend/src/container/BillingContainer/BillingUsageGraph/BillingUsageGraph.tsx index a11488595f..92f2744612 100644 --- a/frontend/src/container/BillingContainer/BillingUsageGraph/BillingUsageGraph.tsx +++ b/frontend/src/container/BillingContainer/BillingUsageGraph/BillingUsageGraph.tsx @@ -135,7 +135,7 @@ export function BillingUsageGraph(props: BillingUsageGraphProps): JSX.Element { }, y: { ...getYAxisScale({ - series: graphCompatibleData?.data.newResult.data.result, + series: graphCompatibleData?.data?.newResult?.data?.result, yAxisUnit: '', softMax: null, softMin: null, diff --git a/frontend/src/container/FormAlertRules/ChartPreview/index.tsx b/frontend/src/container/FormAlertRules/ChartPreview/index.tsx index 8d7e559f3b..9819690641 100644 --- a/frontend/src/container/FormAlertRules/ChartPreview/index.tsx +++ b/frontend/src/container/FormAlertRules/ChartPreview/index.tsx @@ -262,7 +262,9 @@ function ChartPreview({ panelType={graphType} data={chartData} name={name || 'Chart Preview'} - panelData={queryResponse.data?.payload.data.newResult.data.result || []} + panelData={ + queryResponse.data?.payload?.data?.newResult?.data?.result || [] + } query={query || initialQueriesMap.metrics} yAxisUnit={yAxisUnit} /> diff --git a/frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.tsx b/frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.tsx index 269e648aee..99c32731cc 100644 --- a/frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.tsx +++ b/frontend/src/container/GridCardLayout/GridCard/WidgetGraphComponent.tsx @@ -215,7 +215,7 @@ function WidgetGraphComponent({ const { graphVisibilityStates: localStoredVisibilityState, } = getLocalStorageGraphVisibilityState({ - apiResponse: queryResponse.data.payload.data.result, + apiResponse: queryResponse.data?.payload?.data?.result, name: widget.id, }); setGraphVisibility(localStoredVisibilityState); diff --git a/frontend/src/container/LogDetailedView/ContextView/useContextLogData.ts b/frontend/src/container/LogDetailedView/ContextView/useContextLogData.ts index 5a0ef84741..b29b8d3ef6 100644 --- a/frontend/src/container/LogDetailedView/ContextView/useContextLogData.ts +++ b/frontend/src/container/LogDetailedView/ContextView/useContextLogData.ts @@ -84,7 +84,7 @@ export const useContextLogData = ({ const handleSuccess = useCallback( (data: SuccessResponse) => { - const currentData = data?.payload.data.newResult.data.result || []; + const currentData = data?.payload?.data?.newResult?.data?.result || []; if (currentData.length > 0 && currentData[0].list) { const currentLogs: ILog[] = currentData[0].list.map((item) => ({ diff --git a/frontend/src/container/LogsContextList/index.tsx b/frontend/src/container/LogsContextList/index.tsx index 1e3b885153..ca90640776 100644 --- a/frontend/src/container/LogsContextList/index.tsx +++ b/frontend/src/container/LogsContextList/index.tsx @@ -84,7 +84,7 @@ function LogsContextList({ const handleSuccess = useCallback( (data: SuccessResponse) => { - const currentData = data?.payload.data.newResult.data.result || []; + const currentData = data?.payload?.data?.newResult?.data?.result || []; if (currentData.length > 0 && currentData[0].list) { const currentLogs: ILog[] = currentData[0].list.map((item) => ({ diff --git a/frontend/src/container/LogsExplorerViews/index.tsx b/frontend/src/container/LogsExplorerViews/index.tsx index 622de9ba83..28e199066a 100644 --- a/frontend/src/container/LogsExplorerViews/index.tsx +++ b/frontend/src/container/LogsExplorerViews/index.tsx @@ -409,7 +409,7 @@ function LogsExplorerViews({ useEffect(() => { const currentParams = data?.params as Omit; - const currentData = data?.payload.data.newResult.data.result || []; + const currentData = data?.payload?.data?.newResult?.data?.result || []; if (currentData.length > 0 && currentData[0].list) { const currentLogs: ILog[] = currentData[0].list.map((item) => ({ ...item.data, @@ -650,7 +650,7 @@ function LogsExplorerViews({ {selectedPanelType === PANEL_TYPES.TABLE && ( diff --git a/frontend/src/container/LogsPanelTable/LogsPanelComponent.tsx b/frontend/src/container/LogsPanelTable/LogsPanelComponent.tsx index 59f78499b3..f1d6e3642c 100644 --- a/frontend/src/container/LogsPanelTable/LogsPanelComponent.tsx +++ b/frontend/src/container/LogsPanelTable/LogsPanelComponent.tsx @@ -85,7 +85,7 @@ function LogsPanelComponent({ const [lastLog, setLastLog] = useState(); const { logs } = useLogsData({ - result: queryResponse.data?.payload.data.newResult.data.result, + result: queryResponse.data?.payload?.data?.newResult?.data?.result, panelType: PANEL_TYPES.LIST, stagedQuery: widget.query, }); diff --git a/frontend/src/container/LogsTopNav/index.tsx b/frontend/src/container/LogsTopNav/index.tsx index 40ce480e30..e80483484d 100644 --- a/frontend/src/container/LogsTopNav/index.tsx +++ b/frontend/src/container/LogsTopNav/index.tsx @@ -56,7 +56,7 @@ function LogsTopNav(): JSX.Element { : [], listQueryPayload: listQuery && listQuery[1] - ? listQuery[1].payload?.data.newResult.data.result || [] + ? listQuery[1].payload?.data?.newResult?.data?.result || [] : [], }; } diff --git a/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperationMetrics.tsx b/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperationMetrics.tsx index 6b9ab4ee72..22224862a4 100644 --- a/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperationMetrics.tsx +++ b/frontend/src/container/MetricsApplication/Tabs/Overview/TopOperationMetrics.tsx @@ -87,7 +87,7 @@ function TopOperationMetrics(): JSX.Element { }, ); - const queryTableData = data?.payload.data.newResult.data.result || []; + const queryTableData = data?.payload?.data?.newResult?.data?.result || []; const renderColumnCell = useMemo( () => diff --git a/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraphContainer.tsx b/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraphContainer.tsx index 7fd670346a..d0b69fcd8d 100644 --- a/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraphContainer.tsx +++ b/frontend/src/container/NewWidget/LeftContainer/WidgetGraph/WidgetGraphContainer.tsx @@ -50,7 +50,7 @@ function WidgetGraphContainer({ } if ( selectedGraph === PANEL_TYPES.LIST && - queryResponse.data?.payload.data.newResult?.data?.result?.length === 0 + queryResponse.data?.payload?.data?.newResult?.data?.result?.length === 0 ) { return ( diff --git a/frontend/src/container/OnboardingContainer/Steps/LogsConnectionStatus/LogsConnectionStatus.tsx b/frontend/src/container/OnboardingContainer/Steps/LogsConnectionStatus/LogsConnectionStatus.tsx index 3654b21fd7..9695721ef1 100644 --- a/frontend/src/container/OnboardingContainer/Steps/LogsConnectionStatus/LogsConnectionStatus.tsx +++ b/frontend/src/container/OnboardingContainer/Steps/LogsConnectionStatus/LogsConnectionStatus.tsx @@ -117,7 +117,7 @@ export default function LogsConnectionStatus(): JSX.Element { } } - const currentData = data?.payload.data.newResult.data.result || []; + const currentData = data?.payload?.data?.newResult?.data?.result || []; if (currentData.length > 0 && currentData[0].list) { const currentLogs: ILog[] = currentData[0].list.map((item) => ({ ...item.data, diff --git a/frontend/src/container/PanelWrapper/PiePanelWrapper.tsx b/frontend/src/container/PanelWrapper/PiePanelWrapper.tsx index 71c74b4b46..bfe6db81cd 100644 --- a/frontend/src/container/PanelWrapper/PiePanelWrapper.tsx +++ b/frontend/src/container/PanelWrapper/PiePanelWrapper.tsx @@ -39,7 +39,7 @@ function PiePanelWrapper({ }); const panelData = - queryResponse.data?.payload?.data.newResult.data.result || []; + queryResponse.data?.payload?.data?.newResult?.data?.result || []; const isDarkMode = useIsDarkMode(); diff --git a/frontend/src/container/PanelWrapper/TablePanelWrapper.tsx b/frontend/src/container/PanelWrapper/TablePanelWrapper.tsx index 5a440f4fdc..f068e6d902 100644 --- a/frontend/src/container/PanelWrapper/TablePanelWrapper.tsx +++ b/frontend/src/container/PanelWrapper/TablePanelWrapper.tsx @@ -9,7 +9,7 @@ function TablePanelWrapper({ tableProcessedDataRef, }: PanelWrapperProps): JSX.Element { const panelData = - queryResponse.data?.payload?.data.newResult.data.result || []; + queryResponse.data?.payload?.data?.newResult?.data?.result || []; const { thresholds } = widget; return ( dataLength || 0, [dataLength]); - const queryTableDataResult = data?.payload.data.newResult.data.result; + const queryTableDataResult = data?.payload?.data?.newResult?.data?.result; const queryTableData = useMemo(() => queryTableDataResult || [], [ queryTableDataResult, ]); diff --git a/frontend/src/container/TracesExplorer/TableView/index.tsx b/frontend/src/container/TracesExplorer/TableView/index.tsx index c6544f8eee..775db816c4 100644 --- a/frontend/src/container/TracesExplorer/TableView/index.tsx +++ b/frontend/src/container/TracesExplorer/TableView/index.tsx @@ -45,7 +45,7 @@ function TableView(): JSX.Element { diff --git a/frontend/src/container/TracesTableComponent/TracesTableComponent.tsx b/frontend/src/container/TracesTableComponent/TracesTableComponent.tsx index fc972ac2d1..4cdc8f1a66 100644 --- a/frontend/src/container/TracesTableComponent/TracesTableComponent.tsx +++ b/frontend/src/container/TracesTableComponent/TracesTableComponent.tsx @@ -54,7 +54,7 @@ function TracesTableComponent({ const totalCount = useMemo(() => dataLength || 0, [dataLength]); const queryTableDataResult = - queryResponse.data?.payload.data.newResult.data.result; + queryResponse.data?.payload?.data?.newResult?.data?.result; const queryTableData = useMemo(() => queryTableDataResult || [], [ queryTableDataResult, ]); diff --git a/frontend/src/hooks/useLogsData.ts b/frontend/src/hooks/useLogsData.ts index bad1e53200..16e550ba56 100644 --- a/frontend/src/hooks/useLogsData.ts +++ b/frontend/src/hooks/useLogsData.ts @@ -145,7 +145,7 @@ export const useLogsData = ({ useEffect(() => { const currentParams = data?.params as Omit; - const currentData = data?.payload.data.newResult.data.result || []; + const currentData = data?.payload?.data?.newResult?.data?.result || []; if (currentData.length > 0 && currentData[0].list) { const currentLogs: ILog[] = currentData[0].list.map((item) => ({ ...item.data,