Merge pull request #1466 from HubSpot/old_tail

Add links between tailer versions
HubSpot · Mar 23, 2017 · de67f46 · de67f46
2 parents e2d5c5a + 2b5c638
commit de67f46
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 1 deletion.
diff --git a/SingularityUI/app/components/logs/Header.jsx b/SingularityUI/app/components/logs/Header.jsx
@@ -40,6 +40,20 @@ class Header extends React.Component {
     );
   }
 
+  renderSwitchToNewTailer() {
+    if (!this.props.taskGroupHasMultipleTasks) {
+      if ((this.props.taskGroupCount === 1)) {
+        return (<Link to={`/task/${this.props.firstTaskId}/tail/${this.props.path}`}>
+          <button type="button" className="btn btn-sm btn-default">Switch to new tailer</button>
+        </Link>);
+      } else if ((this.props.taskGroupCount > 1)) {
+        return (<Link to={`/request/${this.props.requestId}/tail/${this.props.path}`}>
+          <button type="button" className="btn btn-sm btn-default">Switch to new tailer</button>
+        </Link>);
+      }
+    }
+  }
+
   render() {
     return (
       <div className="tail-header">
@@ -60,6 +74,7 @@ class Header extends React.Component {
             </ul>
           </div>
           <div className="col-md-3 hidden-xs tail-buttons">
+            {this.renderSwitchToNewTailer()}
             <SearchDropdown />
             <TasksDropdown />
             <ColorDropdown />

diff --git a/SingularityUI/app/components/logs/NewHeader.jsx b/SingularityUI/app/components/logs/NewHeader.jsx
@@ -61,6 +61,18 @@ class NewHeader extends React.Component {
     }
   }
 
+  renderSwitchToOldTailer() {
+    if ((this.props.tailerGroupCount === 1)) {
+      return (<Link to={`/task/${this.props.taskIds[0]}/old-tail/${this.props.paths[0]}`}>
+        <button type="button" className="btn btn-sm btn-default">Back to old tailer</button>
+      </Link>);
+    } else if ((this.props.tailerGroupCount > 1)) {
+      return (<Link to={`/request/${this.props.requestIds[0]}/old-tail/${this.props.paths[0]}`}>
+        <button type="button" className="btn btn-sm btn-default">Back to old tailer</button>
+      </Link>);
+    }
+  }
+
   render() {
     if (!this.props.ready) {
       return (<div>Loading...</div>);
@@ -80,6 +92,7 @@ class NewHeader extends React.Component {
             </ul>
           </div>
           <div className="col-md-3 hidden-xs tail-buttons">
+            {this.renderSwitchToOldTailer()}
             {this.renderTasksDropdown()}
             <NewColorDropdown activeColor={this.props.activeColor} onSetColor={this.props.setColor} />
             {this.renderAnchorButtons()}

diff --git a/SingularityUI/app/rootComponent.jsx b/SingularityUI/app/rootComponent.jsx
@@ -76,7 +76,7 @@ const rootComponent = (Wrapped, refresh = null, refreshInterval = true, pageMarg
   }
 
   componentDidMount() {
-    const onLoadPromise = onLoad(this.props);
+    const onLoadPromise = this.dispatchOnLoad();
     if (onLoadPromise) {
       onLoadPromise.catch((reason) => setTimeout(() => { throw new Error(reason); }));
     }

diff --git a/SingularityUI/app/router.jsx b/SingularityUI/app/router.jsx
@@ -26,6 +26,7 @@ import Disasters from './components/disasters/Disasters';
 import TaskLogTailerContainer from './containers/TaskLogTailerContainer';
 import RequestLogTailerContainer from './containers/RequestLogTailerContainer';
 import CustomLogTailerContainer from './containers/CustomLogTailerContainer';
+import { Tail, AggregateTail } from './components/logs/Tail';
 
 const getFilenameFromSplat = (splat) => _.last(splat.split('/'));
 
@@ -42,13 +43,15 @@ const routes = (
       <Route path=":requestId/task-search" component={TaskSearch} title="Task Search" />
       <Route path=":requestId/deploy" component={NewDeployForm} title="New Deploy" />
       <Route path=":requestId/deploy/:deployId" component={DeployDetail} title={(params) => `Deploy ${params.deployId}`} />
+      <Route path=":requestId/old-tail/**" component={AggregateTail} title={(params) => `Tail of ${getFilenameFromSplat(params.splat)}`} />
       <Route path=":requestId/tail/**" component={RequestLogTailerContainer} title={(params) => `Tail of ${getFilenameFromSplat(params.splat)}`} />
       <Route path=":requestId/instance/:instanceNo" component={TaskInstanceRedirect} />
       <IndexRoute component={NotFound} title="Not Found" />
     </Route>
     <Route path="tasks(/:state)(/:requestsSubFilter)(/:searchFilter)" component={TasksPage} title="Tasks" />
     <Route path="task">
       <Route path=":taskId(/files**)" component={TaskDetail} title={(params) => params.taskId} />
+      <Route path=":taskId/old-tail/**" component={Tail} title={(params) => `Tail of ${getFilenameFromSplat(params.splat)}`} />
       <Route path=":taskId/tail/**" component={TaskLogTailerContainer} title={(params) => `Tail of ${getFilenameFromSplat(params.splat)}`} />
       <IndexRoute component={NotFound} title="Not Found" />
     </Route>