modify search websocket url and some css style

Author: chenyunan

app/backendAPI/websocketClients.js

@@ -191,8 +191,9 @@ class SearchSocketClient {
       const firstSlashIdx = wsUrl.indexOf('/', 8)
       const [host, path] = firstSlashIdx === -1 ? [wsUrl, ''] : [wsUrl.substring(0, firstSlashIdx), wsUrl.substring(firstSlashIdx)]
 
-      const url = `${host}:8066/search/sockjs`
-
+      // const url = `${host}:8066/search/sockjs`
+      const url = `${host}${path}/search/sockjs/${config.spaceKey}`
+      // http://dev.coding.ide/ide-ws/search/sockjs/kfddvb/info
       this.sockJSConfigs = [url, {}, {server: `${config.spaceKey}`, transports: 'websocket'}]
 
       this.backoff = getBackoff({

app/components/Search/search.new.jsx

@@ -2,6 +2,7 @@ import { Component } from "react";
 import { observer } from 'mobx-react'
 import subscribeToSearch from 'commons/Search/subscribeToSearch'
 import state from 'commons/Search/state'
+import cx from 'classnames'
 import { openFile } from 'commands/commandBindings/file'
 import * as delegate from 'commons/Search/action'
 import icons from 'file-icons-js'
@@ -31,7 +32,6 @@ export class SearchResultItem extends Component {
         openFile({ path, editor: { filePath: path, selection } })
     }
 
-
     render() {
         const {fileName, pattern, path, results} = this.props;
         const resultSize = results.length;
@@ -40,7 +40,7 @@ export class SearchResultItem extends Component {
             <div className='search-item' key={path}>
                 <div className='search-item-path' onClick={this.handlePathClick}>
                 <i
-                    className={({
+                    className={cx({
                     'fa fa-caret-right': this.state.isFolded,
                     'fa fa-caret-down': !this.state.isFolded
                     })}
@@ -85,6 +85,9 @@ class SearchPanel extends Component {
     }
 
     searchTxt = () => {
+        if(state.searching.pattern.length == 0 || state.searching.pattern.trim() == '') {
+            return ;
+        }
         if(state.ws.first) {
             state.ws.first = false
         }
@@ -148,7 +151,7 @@ class SearchPanel extends Component {
                             placeholder={i18n.get('panel.left.find')}
                         />
                     </div>
-                    <div className='search-checkbox'>
+                    {/* <div className='search-checkbox'>
                         <input 
                             title={i18n.get('panel.checkbox.case')}
                             label={i18n.get('panel.checkbox.case')}
@@ -166,7 +169,7 @@ class SearchPanel extends Component {
                             className='search-control-pattern'
                             onChange={this.pattern}
                             type='checkbox'/>
-                    </div>
+                    </div> */}
                 </div>
                 {this.renderResult()}
             </div>

app/styles/core-ui/Search.styl

@@ -10,7 +10,7 @@
     margin-bottom: 14px;
     background-color: #1e1e1e
     border: 1px solid #333
-    display: flex
+    // display: flex
     .search-controls {
       border: none
     }