From ed24cd5b529689ff3f04a1ac6d2f91024e0897fb Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Tue, 16 Jul 2019 22:23:10 -0400
Subject: [PATCH] Fixed: Movie Editor RootFolders, SelectedState persisting
 editor toggle

---
 frontend/src/Movie/Index/MovieIndex.js          |  4 +++-
 frontend/src/Movie/Index/MovieIndexConnector.js | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/src/Movie/Index/MovieIndex.js b/frontend/src/Movie/Index/MovieIndex.js
index 1245b7c6d..16314156b 100644
--- a/frontend/src/Movie/Index/MovieIndex.js
+++ b/frontend/src/Movie/Index/MovieIndex.js
@@ -215,7 +215,9 @@ class MovieIndex extends Component {
     if (this.state.isMovieEditorActive) {
       this.setState({ isMovieEditorActive: false });
     } else {
-      this.setState({ isMovieEditorActive: true });
+      const newState = selectAll(this.state.selectedState, false)
+      newState.isMovieEditorActive = true;
+      this.setState(newState);
     }
   }
 
diff --git a/frontend/src/Movie/Index/MovieIndexConnector.js b/frontend/src/Movie/Index/MovieIndexConnector.js
index 5723fd197..e6b94e053 100644
--- a/frontend/src/Movie/Index/MovieIndexConnector.js
+++ b/frontend/src/Movie/Index/MovieIndexConnector.js
@@ -6,7 +6,7 @@ import createMovieClientSideCollectionItemsSelector from 'Store/Selectors/create
 import dimensions from 'Styles/Variables/dimensions';
 import createCommandExecutingSelector from 'Store/Selectors/createCommandExecutingSelector';
 import createDimensionsSelector from 'Store/Selectors/createDimensionsSelector';
-import { fetchMovies } from 'Store/Actions/movieActions';
+import { fetchRootFolders } from 'Store/Actions/rootFolderActions';
 import scrollPositions from 'Store/scrollPositions';
 import { setMovieSort, setMovieFilter, setMovieView, setMovieTableOption, saveMovieEditor } from 'Store/Actions/movieIndexActions';
 import { executeCommand } from 'Store/Actions/commandActions';
@@ -64,8 +64,8 @@ function createMapStateToProps() {
 
 function createMapDispatchToProps(dispatch, props) {
   return {
-    dispatchFetchMovies() {
-      dispatch(fetchMovies);
+    dispatchFetchRootFolders() {
+      dispatch(fetchRootFolders());
     },
 
     onTableOptionChange(payload) {
@@ -122,7 +122,8 @@ class MovieIndexConnector extends Component {
   }
 
   componentDidMount() {
-    this.props.dispatchFetchMovies();
+    // TODO: Fetch root folders here for now, but should eventually fetch on editor toggle and check loaded before showing controls
+    this.props.dispatchFetchRootFolders();
   }
 
   //
@@ -167,7 +168,7 @@ MovieIndexConnector.propTypes = {
   isSmallScreen: PropTypes.bool.isRequired,
   view: PropTypes.string.isRequired,
   scrollTop: PropTypes.number.isRequired,
-  dispatchFetchMovies: PropTypes.func.isRequired,
+  dispatchFetchRootFolders: PropTypes.func.isRequired,
   dispatchSetMovieView: PropTypes.func.isRequired,
   dispatchSaveMovieEditor: PropTypes.func.isRequired
 };