Merge pull request #120 from PDOK/PickerBug

Picker bug

src/DataClassifyDialog.js

@@ -19,6 +19,12 @@ class DataClassifyDialog extends Component {
       lovAvailable: true,
     };
   }
+  onVocabPicked = (_, index) => {
+    this.setState({
+      vocabPickerIndex: index,
+    });
+  };
+
   searchVocabulary = (e) => {
     const query = this.state.searchText;
     const tempState = this.state;
@@ -74,6 +80,9 @@ class DataClassifyDialog extends Component {
       };
     }
     this.props.finishCallBack(result, this.state.baseUri);
+    this.resetDialog();
+  };
+  resetDialog = () => {
     this.setState({
       searchText: '',
       stepIndex: 0,
@@ -138,7 +147,7 @@ class DataClassifyDialog extends Component {
               name="Base-uri:"
               type="url"
               hintText="type a base URI here"
-              onChange={(_, string) => this.setState({ baseURI: string })}
+              onChange={(_, string) => this.setState({ baseUri: string })}
             />
           </div>
 
@@ -176,15 +185,18 @@ class DataClassifyDialog extends Component {
       <FlatButton
         label={(this.state.stepIndex === 0) ? 'Next' : 'Finish'}
         primary
-        onClick={(this.state.stepIndex === 0) ?
-          this.setState({ stepIndex: 1 }) : this.handlePick}
+        onClick={() => ((this.state.stepIndex === 0) ?
+          this.setState({ stepIndex: 1 }) : this.handlePick())}
         disabled={(this.state.stepIndex === 0 || this.state.vocabDownText) ?
           false : !!(this.state.results.length === 0 || this.state.vocabDownText)}
       />,
       <FlatButton
         label="Cancel"
         primary={false}
-        onClick={this.props.closeCallBack}
+        onClick={() => {
+          this.resetDialog();
+          this.props.closeCallBack();
+        }}
       />,
     ];
     return (

src/DataClassifyView.js

@@ -60,14 +60,6 @@ class DataClassifyView extends Component {
     this.props.setBaseUri(index, text);
   };
 
-  onVocabPicked = (_, index) => {
-    const dialog = this.state.dialog;
-    dialog.vocabPickerIndex = index;
-    this.setState({
-      dialog,
-    });
-  };
-
   onChange = (_, string) => {
     const dialog = this.state.dialog;
     dialog.searchText = string;

src/DataLinkDialog.js

@@ -25,6 +25,13 @@ class DataLinkDialog extends Component {
   onChange = (object, string) => {
     this.setState({ searchText: string });
   };
+
+  onVocabPicked = (_, index) => {
+    this.setState({
+      vocabPickerIndex: index,
+    });
+  };
+
   handlePick = () => {
     let result;
     let name;

src/DataLinkView.js

@@ -199,14 +199,6 @@ class DataLinkView extends Component {
       selected: {},
     });
   };
-  onVocabPicked = (_, index) => {
-    const dialog = this.state.dialog;
-    dialog.vocabPickerIndex = index;
-    this.setState({
-      dialog,
-    });
-  };
-
 
   // Helper to find the index of a given node
   getNodeIndex(searchNode) {