mirror of
https://github.com/grafana/grafana.git
synced 2025-02-12 08:35:43 -06:00
* build(webpack): bump to v5 and successful yarn start compilation * build(webpack): update postcss dependencies * build(webpack): silence warnings about hash renamed to fullhash * build(webpack): enable persistent cache to store generated webpack modules / chunks * build(webpack): prefer eslintWebpackPlugin over tschecker so eslint doesn't block typechecking * chore(yarn): run yarn-deduplicate to clean up dependencies * chore(yarn): refresh lock file after clean install * build(webpack): prefer output.clean over CleanWebpackPlugin * build(webpack): prefer esbuild over babel-loader for dev config * build(babel): turn off cache compression to improve build performance * build(webpack): get production builds working * build(webpack): remove phantomJS (removed from grafana in v7) specific loader * build(webpack): put back babel for dev builds no performance gain in using esbuild in webpack * build(webpack): prefer terser and optimise css plugins for prod. slower but smaller bundles * build(webpack): clean up redundant code. inform postcss about node_modules * build(webpack): remove deprecation warnings flag * build(webpack): bump packages, dev performance optimisations, attempt to get hot working * chore(storybook): use webpack 5 for dev and production builds * build(storybook): speed up dev build * chore(yarn): refresh lock file * chore(webpack): bump webpack and related deps to latest * refactor(webpack): put back inline-source-map, move start scripts out of grafana toolkit * feat(webpack): prefer react-refresh over react-hot-loader * build(webpack): update webpack.hot to use react-refresh * chore: remove react-hot-loader from codebase * refactor(queryeditorrow): fix circular dependency causing react-fast-refresh errors * revert(webpack): remove stats.errorDetails from common config * build(webpack): bump to v5 and successful yarn start compilation * build(webpack): update postcss dependencies * build(webpack): silence warnings about hash renamed to fullhash * build(webpack): enable persistent cache to store generated webpack modules / chunks * build(webpack): prefer eslintWebpackPlugin over tschecker so eslint doesn't block typechecking * chore(yarn): run yarn-deduplicate to clean up dependencies * chore(yarn): refresh lock file after clean install * build(webpack): prefer output.clean over CleanWebpackPlugin * build(webpack): prefer esbuild over babel-loader for dev config * build(babel): turn off cache compression to improve build performance * build(webpack): get production builds working * build(webpack): remove phantomJS (removed from grafana in v7) specific loader * build(webpack): put back babel for dev builds no performance gain in using esbuild in webpack * build(webpack): prefer terser and optimise css plugins for prod. slower but smaller bundles * build(webpack): clean up redundant code. inform postcss about node_modules * build(webpack): remove deprecation warnings flag * build(webpack): bump packages, dev performance optimisations, attempt to get hot working * chore(storybook): use webpack 5 for dev and production builds * build(storybook): speed up dev build * chore(yarn): refresh lock file * chore(webpack): bump webpack and related deps to latest * refactor(webpack): put back inline-source-map, move start scripts out of grafana toolkit * feat(webpack): prefer react-refresh over react-hot-loader * build(webpack): update webpack.hot to use react-refresh * chore: remove react-hot-loader from codebase * refactor(queryeditorrow): fix circular dependency causing react-fast-refresh errors * revert(webpack): remove stats.errorDetails from common config * revert(webpack): remove include from babel-loader so symlinks (enterprise) work as before * refactor(webpack): fix deprecation warnings in prod builds * fix(storybook): fix failing builds due to replacing css-optimise webpack plugin * fix(storybook): use raw-loader for svg icons * build(webpack): fix dev script colors error * chore(webpack): bump css-loader and react-refresh-webpack-plugin to latest versions Co-authored-by: Torkel Ödegaard <torkel@grafana.com>
195 lines
5.7 KiB
TypeScript
195 lines
5.7 KiB
TypeScript
import React, { PureComponent } from 'react';
|
|
import { connect, ConnectedProps } from 'react-redux';
|
|
import { css } from 'emotion';
|
|
import { Collapse } from '@grafana/ui';
|
|
import { AbsoluteTimeRange, Field, LogRowModel, RawTimeRange } from '@grafana/data';
|
|
import { ExploreId, ExploreItemState } from 'app/types/explore';
|
|
import { StoreState } from 'app/types';
|
|
import { splitOpen } from './state/main';
|
|
import { addResultsToCache, clearCache } from './state/query';
|
|
import { updateTimeRange } from './state/time';
|
|
import { getTimeZone } from '../profile/state/selectors';
|
|
import { LiveLogsWithTheme } from './LiveLogs';
|
|
import { Logs } from './Logs';
|
|
import { LogsCrossFadeTransition } from './utils/LogsCrossFadeTransition';
|
|
import { LiveTailControls } from './useLiveTailControls';
|
|
import { getFieldLinksForExplore } from './utils/links';
|
|
|
|
interface LogsContainerProps extends PropsFromRedux {
|
|
width: number;
|
|
exploreId: ExploreId;
|
|
scanRange?: RawTimeRange;
|
|
syncedTimes: boolean;
|
|
onClickFilterLabel?: (key: string, value: string) => void;
|
|
onClickFilterOutLabel?: (key: string, value: string) => void;
|
|
onStartScanning: () => void;
|
|
onStopScanning: () => void;
|
|
}
|
|
|
|
export class LogsContainer extends PureComponent<LogsContainerProps> {
|
|
onChangeTime = (absoluteRange: AbsoluteTimeRange) => {
|
|
const { exploreId, updateTimeRange } = this.props;
|
|
updateTimeRange({ exploreId, absoluteRange });
|
|
};
|
|
|
|
getLogRowContext = async (row: LogRowModel, options?: any): Promise<any> => {
|
|
const { datasourceInstance } = this.props;
|
|
|
|
if (datasourceInstance?.getLogRowContext) {
|
|
return datasourceInstance.getLogRowContext(row, options);
|
|
}
|
|
|
|
return [];
|
|
};
|
|
|
|
showContextToggle = (row?: LogRowModel): boolean => {
|
|
const { datasourceInstance } = this.props;
|
|
|
|
if (datasourceInstance?.showContextToggle) {
|
|
return datasourceInstance.showContextToggle(row);
|
|
}
|
|
|
|
return false;
|
|
};
|
|
|
|
getFieldLinks = (field: Field, rowIndex: number) => {
|
|
const { splitOpen: splitOpenFn, range } = this.props;
|
|
return getFieldLinksForExplore({ field, rowIndex, splitOpenFn, range });
|
|
};
|
|
|
|
render() {
|
|
const {
|
|
loading,
|
|
logsHighlighterExpressions,
|
|
logRows,
|
|
logsMeta,
|
|
logsSeries,
|
|
logsQueries,
|
|
onClickFilterLabel,
|
|
onClickFilterOutLabel,
|
|
onStartScanning,
|
|
onStopScanning,
|
|
absoluteRange,
|
|
timeZone,
|
|
visibleRange,
|
|
scanning,
|
|
range,
|
|
width,
|
|
isLive,
|
|
exploreId,
|
|
addResultsToCache,
|
|
clearCache,
|
|
} = this.props;
|
|
|
|
if (!logRows) {
|
|
return null;
|
|
}
|
|
|
|
// We need to override css overflow of divs in Collapse element to enable sticky Logs navigation
|
|
const styleOverridesForStickyNavigation = css`
|
|
& > div {
|
|
overflow: visible;
|
|
& > div {
|
|
overflow: visible;
|
|
}
|
|
}
|
|
`;
|
|
|
|
return (
|
|
<>
|
|
<LogsCrossFadeTransition visible={isLive}>
|
|
<Collapse label="Logs" loading={false} isOpen>
|
|
<LiveTailControls exploreId={exploreId}>
|
|
{(controls) => (
|
|
<LiveLogsWithTheme
|
|
logRows={logRows}
|
|
timeZone={timeZone}
|
|
stopLive={controls.stop}
|
|
isPaused={this.props.isPaused}
|
|
onPause={controls.pause}
|
|
onResume={controls.resume}
|
|
/>
|
|
)}
|
|
</LiveTailControls>
|
|
</Collapse>
|
|
</LogsCrossFadeTransition>
|
|
<LogsCrossFadeTransition visible={!isLive}>
|
|
<Collapse label="Logs" loading={loading} isOpen className={styleOverridesForStickyNavigation}>
|
|
<Logs
|
|
logRows={logRows}
|
|
logsMeta={logsMeta}
|
|
logsSeries={logsSeries}
|
|
logsQueries={logsQueries}
|
|
width={width}
|
|
highlighterExpressions={logsHighlighterExpressions}
|
|
loading={loading}
|
|
onChangeTime={this.onChangeTime}
|
|
onClickFilterLabel={onClickFilterLabel}
|
|
onClickFilterOutLabel={onClickFilterOutLabel}
|
|
onStartScanning={onStartScanning}
|
|
onStopScanning={onStopScanning}
|
|
absoluteRange={absoluteRange}
|
|
visibleRange={visibleRange}
|
|
timeZone={timeZone}
|
|
scanning={scanning}
|
|
scanRange={range.raw}
|
|
showContextToggle={this.showContextToggle}
|
|
getRowContext={this.getLogRowContext}
|
|
getFieldLinks={this.getFieldLinks}
|
|
addResultsToCache={() => addResultsToCache(exploreId)}
|
|
clearCache={() => clearCache(exploreId)}
|
|
/>
|
|
</Collapse>
|
|
</LogsCrossFadeTransition>
|
|
</>
|
|
);
|
|
}
|
|
}
|
|
|
|
function mapStateToProps(state: StoreState, { exploreId }: { exploreId: string }) {
|
|
const explore = state.explore;
|
|
// @ts-ignore
|
|
const item: ExploreItemState = explore[exploreId];
|
|
const {
|
|
logsHighlighterExpressions,
|
|
logsResult,
|
|
loading,
|
|
scanning,
|
|
datasourceInstance,
|
|
isLive,
|
|
isPaused,
|
|
range,
|
|
absoluteRange,
|
|
} = item;
|
|
const timeZone = getTimeZone(state.user);
|
|
|
|
return {
|
|
loading,
|
|
logsHighlighterExpressions,
|
|
logRows: logsResult?.rows,
|
|
logsMeta: logsResult?.meta,
|
|
logsSeries: logsResult?.series,
|
|
logsQueries: logsResult?.queries,
|
|
visibleRange: logsResult?.visibleRange,
|
|
scanning,
|
|
timeZone,
|
|
datasourceInstance,
|
|
isLive,
|
|
isPaused,
|
|
range,
|
|
absoluteRange,
|
|
};
|
|
}
|
|
|
|
const mapDispatchToProps = {
|
|
updateTimeRange,
|
|
splitOpen,
|
|
addResultsToCache,
|
|
clearCache,
|
|
};
|
|
|
|
const connector = connect(mapStateToProps, mapDispatchToProps);
|
|
type PropsFromRedux = ConnectedProps<typeof connector>;
|
|
|
|
export default connector(LogsContainer);
|