Merge pull request #491 from chunqiuyiyu/dashboard-dev-search

Fix bug of searchAPI cyclic dependence

Author: KevenYoung

app/backendAPI/websocketClients.js

@@ -5,7 +5,6 @@ import emitter, * as E from 'utils/emitter'
 import config from 'config'
 import { autorun, runInAction } from 'mobx'
 import { notify, NOTIFY_TYPE } from '../components/Notification/actions'
-import * as searchAPI from 'backendAPI/searchAPI'
 
 const log = console.log || (x => x)
 const warn = console.warn || (x => x)
@@ -263,7 +262,6 @@ class SearchSocketClient {
   close () {
     const self = this
     if (config.searchSocketConnected) {
-      searchAPI.searchWorkspaceDown();
       self.shouldClose = true;
       self.socket.close();
       // must emit ???

app/commons/Search/subscribeToSearch.js

@@ -1,4 +1,3 @@
-
 import { SearchSocketClient } from 'backendAPI/websocketClients'
 import { autorun } from 'mobx'
 import state from './state'

app/components/Search/search.jsx

@@ -7,6 +7,8 @@ import { openFile } from 'commands/commandBindings/file'
 import * as delegate from 'commons/Search/action'
 import icons from 'file-icons-js'
 import { Aa, Word, Reg } from './icons'
+import * as api from 'backendAPI/searchAPI'
+import config from 'config'
 
 const hoverColor = '#337ab7'
 
@@ -23,6 +25,7 @@ export class SearchResultItem extends Component {
           isFolded: !this.state.isFolded
         })
     }
+
 
     handleItemClick = (path, start, end, lineNum) => {
         const selection = new monaco.Selection(
@@ -72,7 +75,13 @@ export class SearchResultItem extends Component {
 @observer
 class SearchPanel extends Component {
     componentDidMount () {
-        subscribeToSearch()
+      subscribeToSearch()
+    }
+
+    componentWillUnmount() {
+      if (config.searchSocketConnected) {
+        api.searchWorkspaceDown()
+      }
     }
 
     onKeyDown = (e) => {