Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make Time Travel a modular component #2888

Merged
merged 7 commits into from
Oct 17, 2017
Merged

Make Time Travel a modular component #2888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ada122c
Started making component more independent.
fbarl Oct 11, 2017
742a8c5
Made two time travel component parts independent of global state.
fbarl Oct 11, 2017
6b84243
Merged TimeTravelTimeline into TimeTravelComponent so that whole of t…
fbarl Oct 16, 2017
11b2e77
Using styled components.
fbarl Oct 16, 2017
8a5eb63
Inject ui-components Theme into App component.
fbarl Oct 16, 2017
0056424
TimeTravelComponent as a fully styled component.
fbarl Oct 16, 2017
760f1d9
Use more colors from the theme in TimeTravelComponent.
fbarl Oct 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions client/app/scripts/actions/app-actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,12 +615,6 @@ export function receiveNodes(nodes) {
};
}

export function timeTravelStartTransition() {
return {
type: ActionTypes.TIME_TRAVEL_START_TRANSITION,
};
}

export function jumpToTime(timestamp) {
return (dispatch, getState) => {
dispatch({
Expand Down
65 changes: 35 additions & 30 deletions client/app/scripts/components/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ import classNames from 'classnames';
import { connect } from 'react-redux';
import { debounce } from 'lodash';

import { ThemeProvider } from 'styled-components';
import theme from 'weaveworks-ui-components/lib/theme';

import Logo from './logo';
import Footer from './footer';
import Sidebar from './sidebar';
Expand Down Expand Up @@ -175,42 +178,44 @@ class App extends React.Component {
const isIframe = window !== window.top;

return (
<div className={className} ref={this.saveAppRef}>
{showingDebugToolbar() && <DebugToolbar />}

{showingHelp && <HelpPanel />}

{showingTroubleshootingMenu && <TroubleshootingMenu />}

{showingDetails && <Details />}

<div className="header">
<TimeTravel />
<div className="selectors">
<div className="logo">
{!isIframe && <svg width="100%" height="100%" viewBox="0 0 1089 217">
<Logo />
</svg>}
<ThemeProvider theme={theme}>
<div className={className} ref={this.saveAppRef}>
{showingDebugToolbar() && <DebugToolbar />}

{showingHelp && <HelpPanel />}

{showingTroubleshootingMenu && <TroubleshootingMenu />}

{showingDetails && <Details />}

<div className="header">
<TimeTravel />
<div className="selectors">
<div className="logo">
{!isIframe && <svg width="100%" height="100%" viewBox="0 0 1089 217">
<Logo />
</svg>}
</div>
<Search />
<Topologies />
<ViewModeSelector />
<TimeControl />
</div>
<Search />
<Topologies />
<ViewModeSelector />
<TimeControl />
</div>
</div>

<Nodes />
<Nodes />

<Sidebar classNames={isTableViewMode ? 'sidebar-gridmode' : ''}>
{showingNetworkSelector && isGraphViewMode && <NetworkSelector />}
{!isResourceViewMode && <Status />}
{!isResourceViewMode && <TopologyOptions />}
</Sidebar>
<Sidebar classNames={isTableViewMode ? 'sidebar-gridmode' : ''}>
{showingNetworkSelector && isGraphViewMode && <NetworkSelector />}
{!isResourceViewMode && <Status />}
{!isResourceViewMode && <TopologyOptions />}
</Sidebar>

<Footer />
<Footer />

<Overlay faded={timeTravelTransitioning} />
</div>
<Overlay faded={timeTravelTransitioning} />
</div>
</ThemeProvider>
);
}
}
Expand Down
6 changes: 2 additions & 4 deletions client/app/scripts/components/time-control.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ import { connect } from 'react-redux';
import { trackAnalyticsEvent } from '../utils/tracking-utils';
import { pauseTimeAtNow, resumeTime, startTimeTravel } from '../actions/app-actions';

import { TIMELINE_TICK_INTERVAL } from '../constants/timer';


const className = isSelected => (
classNames('time-control-action', { 'time-control-action-selected': isSelected })
Expand All @@ -24,8 +22,8 @@ class TimeControl extends React.Component {
}

componentDidMount() {
// Force periodic for the paused info.
this.timer = setInterval(() => { this.forceUpdate(); }, TIMELINE_TICK_INTERVAL);
// Force periodic updates every one second for the paused info.
this.timer = setInterval(() => { this.forceUpdate(); }, 1000);
}

componentWillUnmount() {
Expand Down
Loading