diff --git a/frontend/src/components/Styled/index.ts b/frontend/src/components/Styled/index.ts index 45b53896d1..bff30f653e 100644 --- a/frontend/src/components/Styled/index.ts +++ b/frontend/src/components/Styled/index.ts @@ -3,10 +3,7 @@ import { TextProps } from 'antd/lib/typography/Text'; import { TitleProps } from 'antd/lib/typography/Title'; import React from 'react'; import styled, { - css, - DefaultTheme, FlattenSimpleInterpolation, - ThemedCssFunction, } from 'styled-components'; import { IStyledClass } from './types'; @@ -14,52 +11,50 @@ import { IStyledClass } from './types'; const styledClass = (props: IStyledClass): FlattenSimpleInterpolation => props.styledclass; -interface IStyledCol extends AntD.ColProps, IStyledClass {} -const StyledCol = styled(AntD.Col)` +type TStyledCol = AntD.ColProps & IStyledClass; +const StyledCol = styled(AntD.Col)` ${styledClass} `; -interface IStyledRow extends AntD.RowProps, IStyledClass {} -const StyledRow = styled(AntD.Row)` +type TStyledRow = AntD.RowProps & IStyledClass; +const StyledRow = styled(AntD.Row)` ${styledClass} `; -interface IStyledDivider extends AntD.DividerProps, IStyledClass {} -const StyledDivider = styled(AntD.Divider)` +type TStyledDivider = AntD.DividerProps & IStyledClass; +const StyledDivider = styled(AntD.Divider)` ${styledClass} `; -interface IStyledSpace extends AntD.SpaceProps, IStyledClass {} -const StyledSpace = styled(AntD.Space)` +type TStyledSpace = AntD.SpaceProps & IStyledClass; +const StyledSpace = styled(AntD.Space)` ${styledClass} `; -interface IStyledTabs extends AntD.TabsProps, IStyledClass {} -const StyledTabs = styled(AntD.Divider)` +type TStyledTabs = AntD.TabsProps & IStyledClass; +const StyledTabs = styled(AntD.Divider)` ${styledClass} `; -interface IStyledButton extends AntD.ButtonProps, IStyledClass {} -const StyledButton = styled(AntD.Button)` +type TStyledButton = AntD.ButtonProps & IStyledClass; +const StyledButton = styled(AntD.Button)` ${styledClass} `; const { Text } = AntD.Typography; -interface IStyledTypographyText extends TextProps, IStyledClass {} -const StyledTypographyText = styled(Text)` +type TStyledTypographyText = TextProps & IStyledClass; +const StyledTypographyText = styled(Text)` ${styledClass} `; const { Title } = AntD.Typography; -interface IStyledTypographyTitle extends TitleProps, IStyledClass {} -const StyledTypographyTitle = styled(Title)` +type TStyledTypographyTitle = TitleProps & IStyledClass; +const StyledTypographyTitle = styled(Title)` ${styledClass} `; -interface IStyledDiv - extends React.HTMLAttributes, - IStyledClass {} -const StyledDiv = styled.div` +type TStyledDiv = React.HTMLAttributes & IStyledClass; +const StyledDiv = styled.div` ${styledClass} `; diff --git a/frontend/src/components/Styled/styles.ts b/frontend/src/components/Styled/styles.ts index 153ef27a94..8425beae07 100644 --- a/frontend/src/components/Styled/styles.ts +++ b/frontend/src/components/Styled/styles.ts @@ -1,6 +1,6 @@ import { css, FlattenSimpleInterpolation } from 'styled-components'; -const cssProprty = (key: string, value: any): FlattenSimpleInterpolation => +const cssProprty = (key: string, value): FlattenSimpleInterpolation => key && value && css` diff --git a/frontend/src/container/Timeline/index.tsx b/frontend/src/container/Timeline/index.tsx index 2e3fbd2053..6458b8a5a3 100644 --- a/frontend/src/container/Timeline/index.tsx +++ b/frontend/src/container/Timeline/index.tsx @@ -1,5 +1,5 @@ import { StyledDiv } from 'components/Styled'; -import { INTERVAL_UNITS } from 'container/TraceDetail/utils'; +import { IIntervalUnit, INTERVAL_UNITS } from 'container/TraceDetail/utils'; import useThemeMode from 'hooks/useThemeMode'; import React, { useEffect, useState } from 'react'; import { useMeasure } from 'react-use'; @@ -68,10 +68,9 @@ const Timeline = ({ {intervals && intervals.map((interval, index) => ( @@ -93,7 +92,7 @@ const Timeline = ({ interface TimelineProps { traceMetaData: object; globalTraceMetadata: object; - intervalUnit: object; + intervalUnit: IIntervalUnit; setIntervalUnit: any; } diff --git a/frontend/src/container/TraceDetail/index.tsx b/frontend/src/container/TraceDetail/index.tsx index 553f4f292b..e89d78530a 100644 --- a/frontend/src/container/TraceDetail/index.tsx +++ b/frontend/src/container/TraceDetail/index.tsx @@ -25,8 +25,7 @@ import { spanToTreeUtil } from 'utils/spanToTree'; import SelectedSpanDetails from './SelectedSpanDetails'; import * as styles from './styles'; -import { getSortedData } from './utils'; -import { INTERVAL_UNITS } from './utils'; +import { getSortedData, IIntervalUnit, INTERVAL_UNITS } from './utils'; const TraceDetail = ({ response }: TraceDetailProps): JSX.Element => { const spanServiceColors = useMemo( @@ -37,7 +36,9 @@ const TraceDetail = ({ response }: TraceDetailProps): JSX.Element => { const urlQuery = useUrlQuery(); const [spanId] = useState(urlQuery.get('spanId')); - const [intervalUnit, setIntervalUnit] = useState(INTERVAL_UNITS[0]); + const [intervalUnit, setIntervalUnit] = useState( + INTERVAL_UNITS[0], + ); // const [searchSpanString, setSearchSpanString] = useState(''); const [activeHoverId, setActiveHoverId] = useState(''); const [activeSelectedId, setActiveSelectedId] = useState(spanId || ''); diff --git a/frontend/src/container/TraceFlameGraph/index.tsx b/frontend/src/container/TraceFlameGraph/index.tsx index bbf35b9fce..344098624f 100644 --- a/frontend/src/container/TraceFlameGraph/index.tsx +++ b/frontend/src/container/TraceFlameGraph/index.tsx @@ -5,7 +5,6 @@ import { } from 'container/TraceDetail/utils'; import useThemeMode from 'hooks/useThemeMode'; import React, { useLayoutEffect, useMemo, useState } from 'react'; -import { pushDStree } from 'store/actions'; import { ITraceTree } from 'types/api/trace/getTraceItem'; import { toFixed } from 'utils/toFixed';