public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Logs: adjust logs panel feature toggles (#103776)

Browse Source
This commit is contained in:
Matias Chomicki
2025-04-10 14:08:26 +02:00
committed by GitHub
parent c4a0eb396b
commit f201fbc8d2
1 changed files with 103 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/explore/Logs/Logs.tsx
+103 -103
View File
@@ -1027,7 +1027,7 @@ const UnthemedLogs: React.FunctionComponent<Props> = (props: Props) => {
/> />
</div> </div>
)} )}
{config.featureToggles.logsPanelControls && hasData && ( {!config.featureToggles.newLogsPanel && config.featureToggles.logsPanelControls && hasData && (
<div className={styles.logRowsWrapper} data-testid="logRows"> <div className={styles.logRowsWrapper} data-testid="logRows">
<ControlledLogRows <ControlledLogRows
logsTableFrames={props.logsFrames} logsTableFrames={props.logsFrames}
@@ -1078,112 +1078,112 @@ const UnthemedLogs: React.FunctionComponent<Props> = (props: Props) => {
/> />
</div> </div>
)} )}
{!config.featureToggles.logsPanelControls && visualisationType === 'logs' && hasData && (
<>
<div
className={config.featureToggles.logsInfiniteScrolling ? styles.scrollableLogRows : styles.logRows}
data-testid="logRows"
ref={logsContainerRef}
>
<InfiniteScroll
loading={loading}
loadMoreLogs={infiniteScrollAvailable ? loadMoreLogs : undefined}
range={props.range}
timeZone={timeZone}
rows={logRows}
scrollElement={logsContainerRef.current}
sortOrder={logsSortOrder}
app={CoreApp.Explore}
>
<LogRows
pinnedLogs={pinnedLogs}
logRows={logRows}
deduplicatedRows={dedupedRows}
dedupStrategy={dedupStrategy}
onClickFilterLabel={onClickFilterLabel}
onClickFilterOutLabel={onClickFilterOutLabel}
showContextToggle={showContextToggle}
getRowContextQuery={getRowContextQuery}
showLabels={showLabels}
showTime={showTime}
enableLogDetails={true}
forceEscape={forceEscape}
wrapLogMessage={wrapLogMessage}
prettifyLogMessage={prettifyLogMessage}
timeZone={timeZone}
getFieldLinks={getFieldLinks}
logsSortOrder={logsSortOrder}
displayedFields={displayedFields}
onClickShowField={showField}
onClickHideField={hideField}
app={CoreApp.Explore}
onLogRowHover={onLogRowHover}
onOpenContext={onOpenContext}
onPermalinkClick={onPermalinkClick}
permalinkedRowId={panelState?.logs?.id}
scrollIntoView={scrollIntoView}
isFilterLabelActive={props.isFilterLabelActive}
scrollElement={logsContainerRef.current}
onClickFilterString={props.onClickFilterString}
onClickFilterOutString={props.onClickFilterOutString}
onUnpinLine={onPinToContentOutlineClick}
onPinLine={onPinToContentOutlineClick}
pinLineButtonTooltipTitle={pinLineButtonTooltipTitle}
/>
</InfiniteScroll>
</div>
<LogsNavigation
logsSortOrder={logsSortOrder}
visibleRange={navigationRange ?? absoluteRange}
absoluteRange={absoluteRange}
timeZone={timeZone}
onChangeTime={onChangeTime}
loading={loading}
queries={logsQueries ?? []}
scrollToTopLogs={scrollToTopLogs}
addResultsToCache={addResultsToCache}
clearCache={clearCache}
/>
</>
)}
{!config.featureToggles.logsPanelControls && {!config.featureToggles.logsPanelControls &&
!config.featureToggles.newLogsPanel &&
visualisationType === 'logs' && visualisationType === 'logs' &&
hasData && hasData && (
config.featureToggles.newLogsPanel && ( <>
<div data-testid="logRows" ref={logsContainerRef} className={styles.logRowsWrapper}> <div
{logsContainerRef.current && ( className={config.featureToggles.logsInfiniteScrolling ? styles.scrollableLogRows : styles.logRows}
<LogList data-testid="logRows"
app={CoreApp.Explore} ref={logsContainerRef}
containerElement={logsContainerRef.current} >
dedupStrategy={dedupStrategy} <InfiniteScroll
displayedFields={displayedFields} loading={loading}
filterLevels={filterLevels} loadMoreLogs={infiniteScrollAvailable ? loadMoreLogs : undefined}
forceEscape={forceEscape} range={props.range}
getFieldLinks={getFieldLinks}
getRowContextQuery={getRowContextQuery}
loadMore={loadMoreLogs}
logOptionsStorageKey={SETTING_KEY_ROOT}
logs={dedupedRows}
logsMeta={logsMeta}
logSupportsContext={showContextToggle}
onLogOptionsChange={onLogOptionsChange}
onLogLineHover={onLogRowHover}
onOpenContext={onOpenContext}
onPermalinkClick={onPermalinkClick}
onPinLine={onPinToContentOutlineClick}
onUnpinLine={onPinToContentOutlineClick}
pinLineButtonTooltipTitle={pinLineButtonTooltipTitle}
pinnedLogs={pinnedLogs}
showControls
showTime={showTime}
sortOrder={logsSortOrder}
timeRange={props.range}
timeZone={timeZone} timeZone={timeZone}
wrapLogMessage={wrapLogMessage} rows={logRows}
/> scrollElement={logsContainerRef.current}
)} sortOrder={logsSortOrder}
</div> app={CoreApp.Explore}
>
<LogRows
pinnedLogs={pinnedLogs}
logRows={logRows}
deduplicatedRows={dedupedRows}
dedupStrategy={dedupStrategy}
onClickFilterLabel={onClickFilterLabel}
onClickFilterOutLabel={onClickFilterOutLabel}
showContextToggle={showContextToggle}
getRowContextQuery={getRowContextQuery}
showLabels={showLabels}
showTime={showTime}
enableLogDetails={true}
forceEscape={forceEscape}
wrapLogMessage={wrapLogMessage}
prettifyLogMessage={prettifyLogMessage}
timeZone={timeZone}
getFieldLinks={getFieldLinks}
logsSortOrder={logsSortOrder}
displayedFields={displayedFields}
onClickShowField={showField}
onClickHideField={hideField}
app={CoreApp.Explore}
onLogRowHover={onLogRowHover}
onOpenContext={onOpenContext}
onPermalinkClick={onPermalinkClick}
permalinkedRowId={panelState?.logs?.id}
scrollIntoView={scrollIntoView}
isFilterLabelActive={props.isFilterLabelActive}
scrollElement={logsContainerRef.current}
onClickFilterString={props.onClickFilterString}
onClickFilterOutString={props.onClickFilterOutString}
onUnpinLine={onPinToContentOutlineClick}
onPinLine={onPinToContentOutlineClick}
pinLineButtonTooltipTitle={pinLineButtonTooltipTitle}
/>
</InfiniteScroll>
</div>
<LogsNavigation
logsSortOrder={logsSortOrder}
visibleRange={navigationRange ?? absoluteRange}
absoluteRange={absoluteRange}
timeZone={timeZone}
onChangeTime={onChangeTime}
loading={loading}
queries={logsQueries ?? []}
scrollToTopLogs={scrollToTopLogs}
addResultsToCache={addResultsToCache}
clearCache={clearCache}
/>
</>
)} )}
{config.featureToggles.newLogsPanel && visualisationType === 'logs' && hasData && (
<div data-testid="logRows" ref={logsContainerRef} className={styles.logRowsWrapper}>
{logsContainerRef.current && (
<LogList
app={CoreApp.Explore}
containerElement={logsContainerRef.current}
dedupStrategy={dedupStrategy}
displayedFields={displayedFields}
filterLevels={filterLevels}
forceEscape={forceEscape}
getFieldLinks={getFieldLinks}
getRowContextQuery={getRowContextQuery}
loadMore={loadMoreLogs}
logOptionsStorageKey={SETTING_KEY_ROOT}
logs={dedupedRows}
logsMeta={logsMeta}
logSupportsContext={showContextToggle}
onLogOptionsChange={onLogOptionsChange}
onLogLineHover={onLogRowHover}
onOpenContext={onOpenContext}
onPermalinkClick={onPermalinkClick}
onPinLine={onPinToContentOutlineClick}
onUnpinLine={onPinToContentOutlineClick}
pinLineButtonTooltipTitle={pinLineButtonTooltipTitle}
pinnedLogs={pinnedLogs}
showControls
showTime={showTime}
sortOrder={logsSortOrder}
timeRange={props.range}
timeZone={timeZone}
wrapLogMessage={wrapLogMessage}
/>
)}
</div>
)}
{!loading && !hasData && !scanning && ( {!loading && !hasData && !scanning && (
<div className={styles.noDataWrapper}> <div className={styles.noDataWrapper}>
<div className={styles.noData}> <div className={styles.noData}>