diff --git a/frontend/src/container/LogDetailedView/ContextView/ContextLogRenderer.tsx b/frontend/src/container/LogDetailedView/ContextView/ContextLogRenderer.tsx index 39b55d21a0..cb5d85a966 100644 --- a/frontend/src/container/LogDetailedView/ContextView/ContextLogRenderer.tsx +++ b/frontend/src/container/LogDetailedView/ContextView/ContextLogRenderer.tsx @@ -6,17 +6,27 @@ import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar'; import { LOCALSTORAGE } from 'constants/localStorage'; import ShowButton from 'container/LogsContextList/ShowButton'; import { useOptionsMenu } from 'container/OptionsMenu'; +import { defaultLogsSelectedColumns } from 'container/OptionsMenu/constants'; import { FontSize } from 'container/OptionsMenu/types'; import { ORDERBY_FILTERS } from 'container/QueryBuilder/filters/OrderByFilter/config'; import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder'; import { useCallback, useEffect, useMemo, useState } from 'react'; import { Virtuoso } from 'react-virtuoso'; +import { IField } from 'types/api/logs/fields'; import { ILog } from 'types/api/logs/log'; import { Query, TagFilter } from 'types/api/queryBuilder/queryBuilderData'; import { DataSource, StringOperators } from 'types/common/queryBuilder'; import { useContextLogData } from './useContextLogData'; +const defaultLogsSelectedFields: IField[] = defaultLogsSelectedColumns.map( + (item) => ({ + name: item.key, + type: item.type, + dataType: item.dataType, + }), +); + function ContextLogRenderer({ isEdit, query, @@ -109,6 +119,7 @@ function ContextLogRenderer({ data={logTorender} linesPerRow={1} fontSize={options.fontSize} + selectedFields={defaultLogsSelectedFields} /> ), [log.id, options.fontSize], diff --git a/frontend/src/pages/TraceDetailV2/TraceDetailV2.tsx b/frontend/src/pages/TraceDetailV2/TraceDetailV2.tsx index f035b03161..c672e22649 100644 --- a/frontend/src/pages/TraceDetailV2/TraceDetailV2.tsx +++ b/frontend/src/pages/TraceDetailV2/TraceDetailV2.tsx @@ -68,11 +68,11 @@ function TraceDetailsV2(): JSX.Element { () => !isFetchingTraceData && !errorFetchingTraceData && - defaultTo(traceData?.payload?.spans.length, 0) === 0, + defaultTo(traceData?.payload?.spans?.length, 0) === 0, [ errorFetchingTraceData, isFetchingTraceData, - traceData?.payload?.spans.length, + traceData?.payload?.spans?.length, ], );