diff --git a/ui/src/admin/containers/AdminPage.js b/ui/src/admin/containers/AdminPage.js index 2687566acc..fcbedd0866 100644 --- a/ui/src/admin/containers/AdminPage.js +++ b/ui/src/admin/containers/AdminPage.js @@ -25,10 +25,10 @@ import { } from 'src/admin/actions' import AdminTabs from 'src/admin/components/AdminTabs' -import SourceIndicator from '../../shared/components/SourceIndicator' +import SourceIndicator from 'src/shared/components/SourceIndicator' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' import {publishAutoDismissingNotification} from 'shared/dispatchers' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' const isValidUser = user => { const minLen = 3 @@ -175,7 +175,7 @@ class AdminPage extends Component { - +
{users @@ -207,7 +207,7 @@ class AdminPage extends Component { : Loading...}
-
+ ) } diff --git a/ui/src/alerts/containers/AlertsApp.js b/ui/src/alerts/containers/AlertsApp.js index 927a030c2f..6206a3a0cc 100644 --- a/ui/src/alerts/containers/AlertsApp.js +++ b/ui/src/alerts/containers/AlertsApp.js @@ -1,9 +1,10 @@ import React, {PropTypes, Component} from 'react' -import SourceIndicator from '../../shared/components/SourceIndicator' -import AlertsTable from '../components/AlertsTable' -import NoKapacitorError from '../../shared/components/NoKapacitorError' + +import SourceIndicator from 'src/shared/components/SourceIndicator' +import AlertsTable from 'src/alerts/components/AlertsTable' +import NoKapacitorError from 'src/shared/components/NoKapacitorError' import CustomTimeRangeDropdown from 'shared/components/CustomTimeRangeDropdown' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' import {getAlerts} from '../apis' import AJAX from 'utils/ajax' @@ -149,7 +150,7 @@ class AlertsApp extends Component { - +
@@ -157,7 +158,7 @@ class AlertsApp extends Component {
-
+ ) } diff --git a/ui/src/dashboards/components/Dashboard.js b/ui/src/dashboards/components/Dashboard.js index 8c48b4f98d..80a2be61af 100644 --- a/ui/src/dashboards/components/Dashboard.js +++ b/ui/src/dashboards/components/Dashboard.js @@ -3,7 +3,7 @@ import classnames from 'classnames' import TemplateControlBar from 'src/dashboards/components/TemplateControlBar' import LayoutRenderer from 'shared/components/LayoutRenderer' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' const Dashboard = ({ source, @@ -41,7 +41,7 @@ const Dashboard = ({ }) return ( - @@ -71,7 +71,7 @@ const Dashboard = ({ } - + ) } diff --git a/ui/src/dashboards/containers/DashboardsPage.js b/ui/src/dashboards/containers/DashboardsPage.js index a36b51b219..fdfea5f83f 100644 --- a/ui/src/dashboards/containers/DashboardsPage.js +++ b/ui/src/dashboards/containers/DashboardsPage.js @@ -5,12 +5,12 @@ import {bindActionCreators} from 'redux' import SourceIndicator from 'shared/components/SourceIndicator' import DeleteConfirmTableCell from 'shared/components/DeleteConfirmTableCell' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' import {createDashboard} from 'src/dashboards/apis' import {getDashboardsAsync, deleteDashboardAsync} from 'src/dashboards/actions' import {NEW_DASHBOARD} from 'src/dashboards/constants' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' const {arrayOf, func, string, shape} = PropTypes @@ -73,7 +73,7 @@ const DashboardsPage = React.createClass({ - +
@@ -131,7 +131,7 @@ const DashboardsPage = React.createClass({
-
+ ) }, diff --git a/ui/src/data_explorer/components/DatabaseList.js b/ui/src/data_explorer/components/DatabaseList.js index 54b2b5948b..41542723be 100644 --- a/ui/src/data_explorer/components/DatabaseList.js +++ b/ui/src/data_explorer/components/DatabaseList.js @@ -1,12 +1,13 @@ import React, {PropTypes} from 'react' import classnames from 'classnames' import _ from 'lodash' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' import {showDatabases, showRetentionPolicies} from 'shared/apis/metaQuery' import showDatabasesParser from 'shared/parsing/showDatabases' import showRetentionPoliciesParser from 'shared/parsing/showRetentionPolicies' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' + const {func, shape, string} = PropTypes const DatabaseList = React.createClass({ @@ -68,7 +69,7 @@ const DatabaseList = React.createClass({
Databases
- + {this.state.namespaces.map(namespace => { const {database, retentionPolicy} = namespace const isActive = @@ -87,7 +88,7 @@ const DatabaseList = React.createClass({
) })} - +
) diff --git a/ui/src/data_explorer/components/FieldList.js b/ui/src/data_explorer/components/FieldList.js index 86e7a4d79b..85ad478260 100644 --- a/ui/src/data_explorer/components/FieldList.js +++ b/ui/src/data_explorer/components/FieldList.js @@ -1,8 +1,8 @@ import React, {PropTypes} from 'react' -import FieldListItem from './FieldListItem' -import GroupByTimeDropdown from './GroupByTimeDropdown' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' +import FieldListItem from 'src/data_explorer/components/FieldListItem' +import GroupByTimeDropdown from 'src/data_explorer/components/GroupByTimeDropdown' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' import {showFieldKeys} from 'shared/apis/metaQuery' import showFieldKeysParser from 'shared/parsing/showFieldKeys' @@ -110,7 +110,7 @@ const FieldList = React.createClass({ return (
- + {this.state.fields.map(fieldFunc => { const selectedField = this.props.query.fields.find( f => f.field === fieldFunc.field @@ -126,7 +126,7 @@ const FieldList = React.createClass({ /> ) })} - +
) }, diff --git a/ui/src/data_explorer/components/MeasurementList.js b/ui/src/data_explorer/components/MeasurementList.js index eb09c67ce1..98d6e05ff9 100644 --- a/ui/src/data_explorer/components/MeasurementList.js +++ b/ui/src/data_explorer/components/MeasurementList.js @@ -1,10 +1,11 @@ import React, {PropTypes} from 'react' import classnames from 'classnames' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' import {showMeasurements} from 'shared/apis/metaQuery' import showMeasurementsParser from 'shared/parsing/showMeasurements' -import TagList from './TagList' + +import TagList from 'src/data_explorer/components/TagList' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' const {func, shape, string} = PropTypes @@ -120,7 +121,7 @@ const MeasurementList = React.createClass({ return (
- + {measurements.map(measurement => { const isActive = measurement === this.props.query.measurement const numTagsActive = Object.keys(this.props.query.tags).length @@ -167,7 +168,7 @@ const MeasurementList = React.createClass({
) })} - + ) }, diff --git a/ui/src/hosts/containers/HostPage.js b/ui/src/hosts/containers/HostPage.js index 5ef94ce15b..ed47502f15 100644 --- a/ui/src/hosts/containers/HostPage.js +++ b/ui/src/hosts/containers/HostPage.js @@ -7,6 +7,8 @@ import classnames from 'classnames' import LayoutRenderer from 'shared/components/LayoutRenderer' import DashboardHeader from 'src/dashboards/components/DashboardHeader' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' + import timeRanges from 'hson!../../shared/data/timeRanges.hson' import { getMappings, @@ -18,7 +20,6 @@ import {fetchLayouts} from 'shared/apis' import {setAutoRefresh} from 'shared/actions/app' import {presentationButtonDispatcher} from 'shared/dispatchers' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' const {shape, string, bool, func, number} = PropTypes @@ -200,14 +201,14 @@ export const HostPage = React.createClass({ ) })} -
{layouts.length > 0 ? this.renderLayouts(layouts) : ''}
-
+ ) }, diff --git a/ui/src/hosts/containers/HostsPage.js b/ui/src/hosts/containers/HostsPage.js index 67c46d5f81..24d7f94aa2 100644 --- a/ui/src/hosts/containers/HostsPage.js +++ b/ui/src/hosts/containers/HostsPage.js @@ -1,9 +1,11 @@ import React, {PropTypes} from 'react' import _ from 'lodash' -import HostsTable from '../components/HostsTable' -import SourceIndicator from '../../shared/components/SourceIndicator' + +import HostsTable from 'src/hosts/components/HostsTable' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' +import SourceIndicator from 'src/shared/components/SourceIndicator' + import {getCpuAndLoadForHosts, getMappings, getAppsForHosts} from '../apis' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' export const HostsPage = React.createClass({ propTypes: { @@ -88,7 +90,7 @@ export const HostsPage = React.createClass({ - +
@@ -101,7 +103,7 @@ export const HostsPage = React.createClass({
-
+ ) }, diff --git a/ui/src/kapacitor/components/KapacitorForm.js b/ui/src/kapacitor/components/KapacitorForm.js index a5dbb61232..6ba8c51080 100644 --- a/ui/src/kapacitor/components/KapacitorForm.js +++ b/ui/src/kapacitor/components/KapacitorForm.js @@ -1,6 +1,7 @@ import React, {Component, PropTypes} from 'react' -import AlertTabs from './AlertTabs' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' + +import AlertTabs from 'src/kapacitor/components/AlertTabs' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' class KapacitorForm extends Component { render() { @@ -18,7 +19,7 @@ class KapacitorForm extends Component { - +
@@ -101,7 +102,7 @@ class KapacitorForm extends Component {
-
+ ) } diff --git a/ui/src/kapacitor/components/KapacitorRule.js b/ui/src/kapacitor/components/KapacitorRule.js index 566d60c0f9..11b03d33c2 100644 --- a/ui/src/kapacitor/components/KapacitorRule.js +++ b/ui/src/kapacitor/components/KapacitorRule.js @@ -1,13 +1,15 @@ import React, {PropTypes} from 'react' -import DataSection from '../components/DataSection' -import ValuesSection from '../components/ValuesSection' + +import DataSection from 'src/kapacitor/components/DataSection' +import ValuesSection from 'src/kapacitor/components/ValuesSection' import RuleHeader from 'src/kapacitor/components/RuleHeader' import RuleGraph from 'src/kapacitor/components/RuleGraph' import RuleMessage from 'src/kapacitor/components/RuleMessage' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' + import {createRule, editRule} from 'src/kapacitor/apis' import buildInfluxQLQuery from 'utils/influxql' import timeRanges from 'hson!../../shared/data/timeRanges.hson' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' export const KapacitorRule = React.createClass({ propTypes: { @@ -58,7 +60,7 @@ export const KapacitorRule = React.createClass({ timeRange={timeRange} source={source} /> - +
@@ -90,7 +92,7 @@ export const KapacitorRule = React.createClass({
-
+ ) }, diff --git a/ui/src/kapacitor/components/KapacitorRules.js b/ui/src/kapacitor/components/KapacitorRules.js index 335fc9e8c0..ebc269e44c 100644 --- a/ui/src/kapacitor/components/KapacitorRules.js +++ b/ui/src/kapacitor/components/KapacitorRules.js @@ -1,10 +1,10 @@ import React, {PropTypes} from 'react' import {Link} from 'react-router' -import NoKapacitorError from '../../shared/components/NoKapacitorError' -import SourceIndicator from '../../shared/components/SourceIndicator' +import NoKapacitorError from 'src/shared/components/NoKapacitorError' +import SourceIndicator from 'src/shared/components/SourceIndicator' import KapacitorRulesTable from 'src/kapacitor/components/KapacitorRulesTable' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' const KapacitorRules = ({ source, @@ -63,7 +63,7 @@ const PageContents = ({children, source}) => ( - +
@@ -73,7 +73,7 @@ const PageContents = ({children, source}) => (
-
+ ) diff --git a/ui/src/shared/components/Dropdown.js b/ui/src/shared/components/Dropdown.js index 1abafc9870..52867449e8 100644 --- a/ui/src/shared/components/Dropdown.js +++ b/ui/src/shared/components/Dropdown.js @@ -2,7 +2,7 @@ import React, {Component, PropTypes} from 'react' import {Link} from 'react-router' import classnames from 'classnames' import OnClickOutside from 'shared/components/OnClickOutside' -import FancyScrollbox from 'shared/components/FancyScrollbar' +import FancyScrollbar from 'shared/components/FancyScrollbar' import {DROPDOWN_MENU_MAX_HEIGHT, DROPDOWN_MENU_ITEM_THRESHOLD} from 'shared/constants/index' class Dropdown extends Component { @@ -108,7 +108,7 @@ class Dropdown extends Component { const {actions, addNew, items, menuWidth, menuLabel} = this.props return ( ) } diff --git a/ui/src/shared/components/FancyScrollbar.js b/ui/src/shared/components/FancyScrollbar.js index 1fdc15f47e..d573347012 100644 --- a/ui/src/shared/components/FancyScrollbar.js +++ b/ui/src/shared/components/FancyScrollbar.js @@ -2,7 +2,7 @@ import React, {Component, PropTypes} from 'react' import classnames from 'classnames' import {Scrollbars} from 'react-custom-scrollbars' -class FancyScrollbox extends Component { +class FancyScrollbar extends Component { constructor(props) { super(props) } @@ -33,10 +33,10 @@ class FancyScrollbox extends Component { const {bool, node, string} = PropTypes -FancyScrollbox.propTypes = { +FancyScrollbar.propTypes = { children: node.isRequired, className: string, autoHide: bool, } -export default FancyScrollbox \ No newline at end of file +export default FancyScrollbar \ No newline at end of file diff --git a/ui/src/shared/components/TimeRangeDropdown.js b/ui/src/shared/components/TimeRangeDropdown.js index 2969e40931..619fab5d71 100644 --- a/ui/src/shared/components/TimeRangeDropdown.js +++ b/ui/src/shared/components/TimeRangeDropdown.js @@ -1,10 +1,10 @@ import React from 'react' import classnames from 'classnames' -import OnClickOutside from 'shared/components/OnClickOutside' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' - import moment from 'moment' +import OnClickOutside from 'src/shared/components/OnClickOutside' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' + import timeRanges from 'hson!../data/timeRanges.hson' const TimeRangeDropdown = React.createClass({ @@ -68,7 +68,7 @@ const TimeRangeDropdown = React.createClass({ ) diff --git a/ui/src/sources/containers/ManageSources.js b/ui/src/sources/containers/ManageSources.js index 823f5ae895..495cb58565 100644 --- a/ui/src/sources/containers/ManageSources.js +++ b/ui/src/sources/containers/ManageSources.js @@ -1,7 +1,6 @@ import React, {Component, PropTypes} from 'react' import {connect} from 'react-redux' import {bindActionCreators} from 'redux' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' import { removeAndLoadSources, @@ -10,8 +9,9 @@ import { deleteKapacitorAsync, } from 'src/shared/actions/sources' -import SourceIndicator from '../../shared/components/SourceIndicator' -import InfluxTable from '../components/InfluxTable' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' +import SourceIndicator from 'src/shared/components/SourceIndicator' +import InfluxTable from 'src/sources/components/InfluxTable' class ManageSources extends Component { constructor(props) { @@ -62,7 +62,7 @@ class ManageSources extends Component { - +
-
+ ) } diff --git a/ui/src/sources/containers/SourcePage.js b/ui/src/sources/containers/SourcePage.js index 3c1d8ab43d..c4a2e14faa 100644 --- a/ui/src/sources/containers/SourcePage.js +++ b/ui/src/sources/containers/SourcePage.js @@ -9,8 +9,8 @@ import { import {connect} from 'react-redux' import SourceForm from 'src/sources/components/SourceForm' -import FancyScrollbox from 'src/shared/components/FancyScrollbar' -import SourceIndicator from '../../shared/components/SourceIndicator' +import FancyScrollbar from 'src/shared/components/FancyScrollbar' +import SourceIndicator from 'src/shared/components/SourceIndicator' const {func, shape, string} = PropTypes @@ -129,7 +129,7 @@ export const SourcePage = React.createClass({ - +
@@ -145,7 +145,7 @@ export const SourcePage = React.createClass({
-
+ ) },