Sotaro KARASAWA 9 лет назад
Родитель
Сommit
877e8339da

+ 9 - 0
resource/js/components/PageListSearch.js

@@ -109,6 +109,7 @@ export default class PageListSearch extends React.Component {
         searchingKeyword: '',
         searchedPages: [],
         searchResultMeta: {},
+        searchError: null,
       });
 
       return true;
@@ -127,12 +128,19 @@ export default class PageListSearch extends React.Component {
           searchedPages: res.data.data,
           searchResultMeta: res.data.meta,
         });
+      } else {
+        this.setState({
+          searchError: res.data,
+        });
       }
 
 
       // TODO error
     })
     .catch((res) => {
+      this.setState({
+        searchError: res.data,
+      });
       // TODO error
     });
   };
@@ -152,6 +160,7 @@ export default class PageListSearch extends React.Component {
           pages={this.state.searchedPages}
           searchingKeyword={this.state.searchingKeyword}
           searchResultMeta={this.state.searchResultMeta}
+          searchError={this.state.searchError}
           />
       </div>
     );

+ 9 - 1
resource/js/components/SearchPage.js

@@ -60,6 +60,7 @@ export default class SearchPage extends React.Component {
         searchingKeyword: '',
         searchedPages: [],
         searchResultMeta: {},
+        searchError: null,
       });
 
       return true;
@@ -79,13 +80,19 @@ export default class SearchPage extends React.Component {
           searchedPages: res.data.data,
           searchResultMeta: res.data.meta,
         });
+      } else {
+        this.setState({
+          searchError: res.data,
+        });
       }
 
-
       // TODO error
     })
     .catch((res) => {
       // TODO error
+      this.setState({
+        searchError: res.data,
+      });
     });
   };
 
@@ -117,5 +124,6 @@ SearchPage.propTypes = {
 SearchPage.defaultProps = {
   //pollInterval: 1000,
   query: SearchPage.getQueryByLocation(location || {}),
+  searchError: null,
 };
 

+ 18 - 0
resource/js/components/SearchPage/SearchResult.js

@@ -14,9 +14,26 @@ export default class SearchResult extends React.Component {
     return this.props.searchingKeyword !== '' && this.props.pages.length === 0;
   }
 
+  isError() {
+    if (this.props.searchError !== null) {
+      return true;
+    }
+    return false;
+  }
+
   render() {
     const excludePathString = this.props.tree;
 
+    console.log(this.props.searchError);
+    console.log(this.isError());
+    if (this.isError()) {
+      return (
+        <div className="content-main">
+          <i className="searcing fa fa-warning"></i> Error on searching.
+        </div>
+      );
+    }
+
     if (this.isNotSearchedYet()) {
       return <div />;
     }
@@ -92,5 +109,6 @@ SearchResult.defaultProps = {
   pages: [],
   searchingKeyword: '',
   searchResultMeta: {},
+  searchError: null,
 };