opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-08-06 04:19:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Chore: eslint plugin react hooks fix in jeager (#27580)

Browse Source 
* Use eslintignore instead of gitignore

* Fix jaeger errors
This commit is contained in:
Zoltán Bedi
2020-09-24 14:41:57 +02:00
committed by GitHub
parent 92c804fd55
commit b98c85d81c
6 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/jaeger-ui-components/src/TracePageHeader/TracePageHeader.tsx
View File

@ -164,14 +164,13 @@ export const HEADER_ITEMS = [
{
key: 'timestamp',
label: 'Trace Start',
renderer: (trace: Trace) => {
const styles = getStyles(useTheme());
renderer: (trace: Trace, styles?: ReturnType<typeof getStyles>) => {
const dateStr = formatDatetime(trace.startTime);
const match = dateStr.match(/^(.+)(:\d\d\.\d+)$/);
return match ? (
<span className={styles.TracePageHeaderOverviewItemValue}>
<span className={styles?.TracePageHeaderOverviewItemValue}>
{match[1]}
<span className={styles.TracePageHeaderOverviewItemValueDetail}>{match[2]}</span>
<span className={styles?.TracePageHeaderOverviewItemValueDetail}>{match[2]}</span>
</span>
) : (
dateStr
@ -223,22 +222,26 @@ export default function TracePageHeader(props: TracePageHeaderEmbedProps) {
hideSearchButtons,
} = props;
const styles = getStyles(useTheme());
const links = useMemo(() => {
if (!trace) {
return [];
}
return getTraceLinks(trace);
}, [trace]);
if (!trace) {
return null;
}
const links = useMemo(() => getTraceLinks(trace), [trace]);
const summaryItems =
!hideSummary &&
!slimView &&
HEADER_ITEMS.map(item => {
const { renderer, ...rest } = item;
return { ...rest, value: renderer(trace) };
return { ...rest, value: renderer(trace, styles) };
});
const styles = getStyles(useTheme());
const title = (
<h1 className={cx(styles.TracePageHeaderTitle, canCollapse && styles.TracePageHeaderTitleCollapsible)}>
<TraceName traceName={getTraceName(trace.spans)} />{' '}

4
packages/jaeger-ui-components/src/TraceTimelineViewer/SpanDetail/AccordianKeyValues.tsx
View File

@ -96,10 +96,12 @@ type AccordianKeyValuesProps = {
// export for tests
export function KeyValuesSummary(props: { data?: TraceKeyValuePair[] }) {
const { data } = props;
const styles = getStyles(useTheme());
if (!Array.isArray(data) || !data.length) {
return null;
}
const styles = getStyles(useTheme());
return (
<ul className={styles.summary}>
{data.map((item, i) => (