Skip to content

Commit

Permalink
[APM] Move style variables to commons
Browse files Browse the repository at this point in the history
  • Loading branch information
sorenlouv committed Nov 22, 2018
1 parent 8c14c25 commit c9904de
Show file tree
Hide file tree
Showing 40 changed files with 62 additions and 40 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ module.exports = {
rules: {
'no-unused-vars': ['error', { ignoreRestSiblings: true }],
'no-console': ['warn', { allow: ['error'] }],
'import/no-extraneous-dependencies': 'off',
},
},

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
px,
colors,
borderRadius
} from '../../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';
import { get, capitalize, isEmpty } from 'lodash';
import { STATUS } from '../../../../constants';
import { StickyProperties } from '../../../shared/StickyProperties';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
colors,
fontFamilyCode,
fontSizes
} from '../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';
import {
ERROR_CULPRIT,
ERROR_LOG_MESSAGE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
fontFamilyCode,
fontSizes,
truncate
} from '../../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';

function paginateItems({ items, pageIndex, pageSize }) {
return items.slice(pageIndex * pageSize, (pageIndex + 1) * pageSize);
Expand Down
7 changes: 6 additions & 1 deletion x-pack/plugins/apm/public/components/app/Main/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ import styled from 'styled-components';
import { Route, Switch } from 'react-router-dom';
import { routes } from './routeConfig';
import ScrollToTopOnPathChange from './ScrollToTopOnPathChange';
import { px, units, unit, topNavHeight } from '../../../style/variables';
import {
px,
units,
unit,
topNavHeight
} from 'x-pack/plugins/apm/common/variables';
import ConnectRouterToRedux from '../../shared/ConnectRouterToRedux';

const MainContainer = styled.div`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import { EuiToolTip } from '@elastic/eui';
import React from 'react';
import styled from 'styled-components';
import { fontSizes, truncate } from 'x-pack/plugins/apm/common/variables';
import { IServiceListItem } from 'x-pack/plugins/apm/server/lib/services/get_services';
import { fontSizes, truncate } from '../../../../style/variables';
import { asDecimal, asMillis } from '../../../../utils/formatters';
import { RelativeLink } from '../../../../utils/url';
import { ManagedTable } from '../../../shared/ManagedTable';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import React from 'react';
import styled from 'styled-components';
import { fontSizes, truncate } from 'x-pack/plugins/apm/common/variables';
import { ITransactionGroup } from 'x-pack/plugins/apm/server/lib/transaction_groups/transform';
import { fontSizes, truncate } from '../../../style/variables';
import { asMillis } from '../../../utils/formatters';
import { ImpactBar } from '../../shared/ImpactBar';
import { ITableColumn, ManagedTable } from '../../shared/ManagedTable';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import React from 'react';
import styled from 'styled-components';
import { units, px } from '../../../../style/variables';
import { units, px } from 'x-pack/plugins/apm/common/variables';
import { EuiIcon } from '@elastic/eui';
import { Tooltip } from 'pivotal-ui/react/tooltip';
import { OverlayTrigger } from 'pivotal-ui/react/overlay-trigger';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import {
import { capitalize, first, get } from 'lodash';
import React from 'react';
import styled from 'styled-components';
import { px, units } from 'x-pack/plugins/apm/common/variables';
import { Transaction } from '../../../../../typings/Transaction';
import { IUrlParams } from '../../../../store/urlParams';
import { px, units } from '../../../../style/variables';
import { fromQuery, history, toQuery } from '../../../../utils/url';
import {
getPropertyTabNames,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { EuiTitle } from '@elastic/eui';
import React from 'react';
import styled from 'styled-components';
import { px, unit } from '../../../../../style/variables';
import { px, unit } from 'x-pack/plugins/apm/common/variables';
// @ts-ignore
import Legend from '../../../../shared/charts/Legend';
import { IServiceColors } from './Waterfall/waterfall_helpers/waterfall_helpers';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
px,
unit,
units
} from '../../../../../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';

import SyntaxHighlighter, {
registerLanguage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import React from 'react';
import styled from 'styled-components';

// @ts-ignore
import { px, unit } from 'x-pack/plugins/apm/common/variables';
import {
SERVICE_LANGUAGE_NAME,
SPAN_HEX_ID,
SPAN_ID
} from '../../../../../../../../common/constants';
import { px, unit } from '../../../../../../../style/variables';

// @ts-ignore
import Stacktrace from '../../../../../../shared/Stacktrace';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
px,
unit,
units
} from '../../../../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';
import { IWaterfallItem } from './waterfall_helpers/waterfall_helpers';

type ItemType = 'transaction' | 'span';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
uniq,
zipObject
} from 'lodash';
import { colors } from 'x-pack/plugins/apm/public/style/variables';
import { colors } from 'x-pack/plugins/apm/common/variables';
import { Span } from '../../../../../../../../typings/Span';
import { Transaction } from '../../../../../../../../typings/Transaction';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@

import React from 'react';
import styled from 'styled-components';
import { units, borderRadius, px, colors } from '../../../../style/variables';
import {
units,
borderRadius,
px,
colors
} from 'x-pack/plugins/apm/common/variables';

const ImpactBarBackground = styled.div`
height: ${px(units.minus)};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import React from 'react';
import styled from 'styled-components';
import { units, px } from '../../../../style/variables';
import { units, px } from 'x-pack/plugins/apm/common/variables';
import { EuiIcon } from '@elastic/eui';
import { Tooltip } from 'pivotal-ui/react/tooltip';
import { OverlayTrigger } from 'pivotal-ui/react/overlay-trigger';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { RelativeLink, legacyEncodeURIComponent } from '../../../../utils/url';
import { asMillis, asDecimal, tpmUnit } from '../../../../utils/formatters';
import { ImpactBar } from '../../../shared/ImpactBar';

import { fontFamilyCode, truncate } from '../../../../style/variables';
import { fontFamilyCode, truncate } from 'x-pack/plugins/apm/common/variables';
import { ManagedTable } from '../../../shared/ManagedTable';

function tpmLabel(type) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import TabNavigation from '../../shared/TabNavigation';
import TransactionCharts from '../../shared/charts/TransactionCharts';
import { ViewMLJob } from '../../../utils/url';
import List from './List';
import { units, px, fontSizes } from '../../../style/variables';
import { units, px, fontSizes } from 'x-pack/plugins/apm/common/variables';
import { TransactionOverviewChartsRequest } from '../../../store/reactReduxRequest/transactionOverviewCharts';
import { TransactionListRequest } from '../../../store/reactReduxRequest/transactionList';
import { ServiceDetailsRequest } from '../../../store/reactReduxRequest/serviceDetails';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
px,
colors,
borderRadius
} from '../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';

const ContextContainer = styled.div`
position: relative;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
units,
fontFamily,
unit
} from '../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';

import { Ellipsis } from '../../shared/Icons';
import { PropertiesTable } from '../../shared/PropertiesTable';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
colors,
fontFamilyCode,
borderRadius
} from '../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';

import { isEmpty } from 'lodash';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
units,
fontSizes,
unit
} from '../../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';
import { tint } from 'polished';

function getIconColor(type) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import PropTypes from 'prop-types';
import styled from 'styled-components';
import { isEmpty } from 'lodash';
import Suggestion from './Suggestion';
import { units, colors, px, unit } from '../../../../style/variables';
import { units, colors, px, unit } from 'x-pack/plugins/apm/common/variables';
import { rgba } from 'polished';

const List = styled.ul`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import _ from 'lodash';
import React from 'react';
import styled from 'styled-components';

import { StringMap } from '../../../../typings/common';
import {
colors,
fontFamilyCode,
fontSizes,
px,
units
} from '../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';
import { StringMap } from '../../../../typings/common';

export type KeySorter = (data: StringMap, parentKey?: string) => string[];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import _ from 'lodash';
import React from 'react';
import styled from 'styled-components';

import { StringMap } from '../../../../typings/common';
import {
colors,
fontSize,
fontSizes,
px,
unit,
units
} from '../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';
import { StringMap } from '../../../../typings/common';
import { getAgentFeatureDocsUrl } from '../../../utils/documentation/agents';
// @ts-ignore
import { ExternalLink } from '../../../utils/url';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import styled from 'styled-components';
import { isEmpty, get } from 'lodash';
import CodePreview from '../../shared/CodePreview';
import { Ellipsis } from '../../shared/Icons';
import { units, px } from '../../../style/variables';
import { units, px } from 'x-pack/plugins/apm/common/variables';
import { EmptyMessage } from '../../shared/EmptyMessage';
import { EuiLink, EuiTitle } from '@elastic/eui';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
truncate,
unit,
units
} from '../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';

export interface IStickyProperty {
val: any;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
colors,
fontSizes,
truncate
} from '../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';
import { isEmpty } from 'lodash';

import TooltipOverlay from '../../shared/TooltipOverlay';
Expand Down
8 changes: 7 additions & 1 deletion x-pack/plugins/apm/public/components/shared/UIComponents.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
*/

import styled from 'styled-components';
import { unit, units, px, fontSizes, colors } from '../../style/variables';
import {
unit,
units,
px,
fontSizes,
colors
} from 'x-pack/plugins/apm/common/variables';
import { RelativeLink } from '../../utils/url';

export const HeaderContainer = styled.div`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
px,
colors,
truncate
} from '../../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';

const Container = styled.div`
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import d3 from 'd3';
import PropTypes from 'prop-types';
import React from 'react';

import { unit } from '../../../../style/variables';
import { unit } from 'x-pack/plugins/apm/common/variables';

const XY_HEIGHT = unit * 16;
const XY_MARGIN = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
makeWidthFlexible,
VerticalGridLines
} from 'react-vis';
import { unit, colors } from '../../../../style/variables';
import { unit, colors } from 'x-pack/plugins/apm/common/variables';
import Tooltip from '../Tooltip';

const XY_HEIGHT = unit * 10;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@

import React, { PureComponent } from 'react';
import styled from 'styled-components';
import { units, px, colors, fontSizes } from '../../../../style/variables';
import {
units,
px,
colors,
fontSizes
} from 'x-pack/plugins/apm/common/variables';

const Container = styled.div`
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { EuiToolTip } from '@elastic/eui';
import Legend from '../Legend';
import { colors, units, px } from '../../../../style/variables';
import { colors, units, px } from 'x-pack/plugins/apm/common/variables';
import styled from 'styled-components';
import { asTime } from '../../../../utils/formatters';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { Sticky } from 'react-sticky';
import { XYPlot, XAxis } from 'react-vis';
import LastTickValue from './LastTickValue';
import AgentMarker from './AgentMarker';
import { colors, px } from '../../../../style/variables';
import { colors, px } from 'x-pack/plugins/apm/common/variables';
import { getTimeFormatter } from '../../../../utils/formatters';

// Remove any tick that is too close to traceRootDuration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import React, { PureComponent } from 'react';
import PropTypes from 'prop-types';
import { XYPlot, VerticalGridLines } from 'react-vis';
import { colors } from '../../../../style/variables';
import { colors } from 'x-pack/plugins/apm/common/variables';

class VerticalLines extends PureComponent {
render() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
borderRadius,
fontSize,
fontSizes
} from '../../../../style/variables';
} from 'x-pack/plugins/apm/common/variables';
import Legend from '../Legend';

const TooltipElm = styled.div`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import PropTypes from 'prop-types';
import CustomPlot from '../CustomPlot';
import { asMillis, tpmUnit, asInteger } from '../../../../utils/formatters';
import styled from 'styled-components';
import { units, unit, px } from '../../../../style/variables';
import { units, unit, px } from 'x-pack/plugins/apm/common/variables';
import { timefilter } from 'ui/timefilter';
import moment from 'moment';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
import d3 from 'd3';
import { difference, last, memoize, zipObject } from 'lodash';
import { rgba } from 'polished';
import { colors } from 'x-pack/plugins/apm/common/variables';
import { AvgAnomalyBucket } from 'x-pack/plugins/apm/server/lib/transactions/charts/get_avg_response_time_anomalies/get_anomaly_aggs/transform';
import { TimeSeriesAPIResponse } from 'x-pack/plugins/apm/server/lib/transactions/charts/get_timeseries_data/transform';
import { StringMap } from 'x-pack/plugins/apm/typings/common';
import { colors } from '../../style/variables';
import { asDecimal, asMillis, tpmUnit } from '../../utils/formatters';
import { IUrlParams } from '../urlParams';

Expand Down

0 comments on commit c9904de

Please sign in to comment.