New: Don't require artist mapping

frontend/src/Components/Form/RootFolderSelectInput.js

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import FileBrowserModal from 'Components/FileBrowser/FileBrowserModal';
+import EditRootFolderModalConnector from 'Settings/MediaManagement/RootFolder/EditRootFolderModalConnector';
 import EnhancedSelectInput from './EnhancedSelectInput';
 import RootFolderSelectInputOption from './RootFolderSelectInputOption';
 import RootFolderSelectInputSelectedValue from './RootFolderSelectInputSelectedValue';
@@ -14,8 +14,7 @@ class RootFolderSelectInput extends Component {
     super(props, context);
 
     this.state = {
-      isAddNewRootFolderModalOpen: false,
-      newRootFolderPath: ''
+      isAddNewRootFolderModalOpen: false
     };
   }
 
@@ -52,9 +51,7 @@ class RootFolderSelectInput extends Component {
   }
 
   onNewRootFolderSelect = ({ value }) => {
-    this.setState({ newRootFolderPath: value }, () => {
-      this.props.onNewRootFolderSelect(value);
-    });
+    this.setState({ newRootFolderPath: value });
   }
 
   onAddRootFolderModalClose = () => {
@@ -66,8 +63,7 @@ class RootFolderSelectInput extends Component {
 
   render() {
     const {
-      includeNoChange,
-      onNewRootFolderSelect,
+      value,
       ...otherProps
     } = this.props;
 
@@ -75,17 +71,16 @@ class RootFolderSelectInput extends Component {
       <div>
         <EnhancedSelectInput
           {...otherProps}
+          value={value || ''}
           selectedValueComponent={RootFolderSelectInputSelectedValue}
           optionComponent={RootFolderSelectInputOption}
           onChange={this.onChange}
         />
 
-        <FileBrowserModal
+        <EditRootFolderModalConnector
           isOpen={this.state.isAddNewRootFolderModalOpen}
-          name="rootFolderPath"
-          value=""
-          onChange={this.onNewRootFolderSelect}
           onModalClose={this.onAddRootFolderModalClose}
+          onRootFolderAdded={this.onNewRootFolderSelect}
         />
       </div>
     );
@@ -94,16 +89,11 @@ class RootFolderSelectInput extends Component {
 
 RootFolderSelectInput.propTypes = {
   name: PropTypes.string.isRequired,
+  value: PropTypes.string,
   values: PropTypes.arrayOf(PropTypes.object).isRequired,
   isSaving: PropTypes.bool.isRequired,
   saveError: PropTypes.object,
-  includeNoChange: PropTypes.bool.isRequired,
-  onChange: PropTypes.func.isRequired,
-  onNewRootFolderSelect: PropTypes.func.isRequired
-};
-
-RootFolderSelectInput.defaultProps = {
-  includeNoChange: false
+  onChange: PropTypes.func.isRequired
 };
 
 export default RootFolderSelectInput;