From d939ca662ee24544564fb3b63f8efa8c3999686b Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 25 Aug 2017 19:34:04 -0400
Subject: [PATCH] Fix directly loading a torrent detail page

---
 src/index.js              | 34 +++++++++++++++-------------------
 src/ui/connection.js      |  9 +++++++++
 src/ui/torrent_details.js | 13 ++++++++++---
 3 files changed, 34 insertions(+), 22 deletions(-)
 create mode 100644 src/ui/connection.js

diff --git a/src/index.js b/src/index.js
index 354f919..b0cee8d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -12,27 +12,23 @@ import { filter_subscribe } from './actions/filter_subscribe';
 
 import Nav from './ui/navigation';
 import Main from './ui/main';
+import Connection from './ui/connection';
+
+const root = document.getElementById('root');
+ReactDOM.render(<Connection />, root);
 
 ws_init(() => {
   store.dispatch(filter_subscribe());
   store.dispatch(filter_subscribe('server'));
-});
-
-const render = App => ReactDOM.render(
-  <Provider store={store}>
-    <ConnectedRouter history={history}>
-      <div>
-        <Nav />
-        <div className="container">
-          <App />
+  ReactDOM.render(
+    <Provider store={store}>
+      <ConnectedRouter history={history}>
+        <div>
+          <Nav />
+          <div className="container">
+            <Main />
+          </div>
         </div>
-      </div>
-    </ConnectedRouter>
-  </Provider>,
-  document.getElementById('root'));
-
-render(Main);
-
-if (module.hot) {
-  module.hot.accept('./ui/main', () => render(Main));
-}
+      </ConnectedRouter>
+    </Provider>, root);
+});
diff --git a/src/ui/connection.js b/src/ui/connection.js
new file mode 100644
index 0000000..7d547dc
--- /dev/null
+++ b/src/ui/connection.js
@@ -0,0 +1,9 @@
+import React, { Component } from 'react';
+
+export default class Connection extends Component {
+  render() {
+    return (
+      <p>Connecting...</p>
+    );
+  }
+}
diff --git a/src/ui/torrent_details.js b/src/ui/torrent_details.js
index 38d58b2..32bc93c 100644
--- a/src/ui/torrent_details.js
+++ b/src/ui/torrent_details.js
@@ -13,9 +13,8 @@ import {
   Progress
 } from 'reactstrap';
 import ws_send from '../socket';
+import selectTorrent, { UNION } from '../actions/selection';
 
-// TODO: use component lifecycle functions here to invoke
-// torrent_state.updateSubscriptions
 // TODO: fix navigating directly to torrent pages
 
 function File({ file }) {
@@ -152,6 +151,13 @@ class TorrentDetails extends Component {
     };
   }
 
+  componentDidMount() {
+    const { dispatch } = this.props;
+    const { ids } = this.props.match.params;
+    const _ids = ids.split(",");
+    _ids.forEach(id => dispatch(selectTorrent(id, UNION)));
+  }
+
   renderHeader(selection) {
     return (
       <div>
@@ -197,5 +203,6 @@ export default connect(state => ({
   router: state.router,
   torrents: state.torrents,
   files: state.files,
-  selection: state.selection
+  selection: state.selection,
+  server: state.server
 }))(TorrentDetails);