From ede25ecdce46ff406fb36dcebd9e92c47a4d7bbb Mon Sep 17 00:00:00 2001 From: Iris Scholten Date: Wed, 10 Oct 2018 16:26:36 -0700 Subject: [PATCH] Add ability to show a line graph and change to other line graph type in veo --- .../ui/src/dashboards/components/VEO.tsx | 2 +- .../src/dashboards/components/VEOHeader.tsx | 26 +-- .../dataExplorer/components/DataExplorer.tsx | 11 +- .../components/DataExplorerPage.tsx | 34 +++- .../ui/src/shared/actions/v2/timeMachines.ts | 13 +- .../src/shared/components/RefreshingView.tsx | 4 +- .../ui/src/shared/components/TimeMachine.scss | 51 ++++++ .../ui/src/shared/components/TimeMachine.tsx | 119 ++++++++++++- .../src/shared/components/TimeMachineTabs.tsx | 44 +++++ .../shared/components/ViewTypeSelector.scss | 159 ++++++++++++++++++ .../shared/components/ViewTypeSelector.tsx | 50 ++++++ .../shared/components/threesizer/Division.tsx | 36 +++- .../components/threesizer/Threesizer.tsx | 2 +- .../ui/src/shared/reducers/v2/timeMachines.ts | 88 +++++++++- chronograf/ui/src/style/chronograf.scss | 2 + 15 files changed, 594 insertions(+), 47 deletions(-) create mode 100644 chronograf/ui/src/shared/components/TimeMachine.scss create mode 100644 chronograf/ui/src/shared/components/TimeMachineTabs.tsx create mode 100644 chronograf/ui/src/shared/components/ViewTypeSelector.scss create mode 100644 chronograf/ui/src/shared/components/ViewTypeSelector.tsx diff --git a/chronograf/ui/src/dashboards/components/VEO.tsx b/chronograf/ui/src/dashboards/components/VEO.tsx index 5efd02f483..3d75da0943 100644 --- a/chronograf/ui/src/dashboards/components/VEO.tsx +++ b/chronograf/ui/src/dashboards/components/VEO.tsx @@ -78,7 +78,7 @@ class VEO extends PureComponent { onCancel={onHide} onSave={this.handleSave} /> - + ) } diff --git a/chronograf/ui/src/dashboards/components/VEOHeader.tsx b/chronograf/ui/src/dashboards/components/VEOHeader.tsx index 3a0536d61f..446f6a7620 100644 --- a/chronograf/ui/src/dashboards/components/VEOHeader.tsx +++ b/chronograf/ui/src/dashboards/components/VEOHeader.tsx @@ -3,8 +3,8 @@ import React, {PureComponent} from 'react' // Components import VEOHeaderName from 'src/dashboards/components/VEOHeaderName' +import TimeMachineTabs from 'src/shared/components/TimeMachineTabs' import { - Radio, ButtonShape, Button, ComponentColor, @@ -43,26 +43,10 @@ class VEOHeader extends PureComponent { - - - Queries - - - Visualization - - +