Merge pull request #1121 from weseek/imprv/reactify-admin-full-text-search-management-4

Render Admin Rebuild Search

src/client/js/app.js

@@ -205,7 +205,7 @@ const adminFullTextSearchManagementElem = document.getElementById('admin-full-te
 if (adminFullTextSearchManagementElem != null) {
 
   ReactDOM.render(
-    <Provider inject={[appContainer]}>
+    <Provider inject={[websocketContainer]}>
       <I18nextProvider i18n={i18n}>
         <FullTextSearchManagement />
       </I18nextProvider>

src/client/js/components/Admin/AdminRebuildSearch.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import { createSubscribedElement } from '../UnstatedUtils';
-import WebsocketContainer from '../../services/AppContainer';
+import WebsocketContainer from '../../services/WebsocketContainer';
 
 class AdminRebuildSearch extends React.Component {
 
@@ -18,7 +18,7 @@ class AdminRebuildSearch extends React.Component {
   }
 
   componentDidMount() {
-    const socket = this.props.webspcketContainer.getWebSocket();
+    const socket = this.props.websocketContainer.getWebSocket();
 
     socket.on('admin:addPageProgress', (data) => {
       const newStates = Object.assign(data, { isCompleted: false });
@@ -76,7 +76,7 @@ const AdminRebuildSearchWrapper = (props) => {
 };
 
 AdminRebuildSearch.propTypes = {
-  webspcketContainer: PropTypes.instanceOf(WebsocketContainer).isRequired,
+  websocketContainer: PropTypes.instanceOf(WebsocketContainer).isRequired,
 };
 
 export default AdminRebuildSearchWrapper;

src/client/js/components/Admin/FullTextSearchManagement/FullTextSearchPage.jsx

@@ -2,6 +2,7 @@ import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { withTranslation } from 'react-i18next';
 
+import AdminRebuildSearch from '../AdminRebuildSearch';
 import AppContainer from '../../../services/AppContainer';
 
 import { createSubscribedElement } from '../../UnstatedUtils';
@@ -40,7 +41,7 @@ class FullTextSearchManagement extends React.Component {
 
     return (
       <Fragment>
-        <fieldset className="pr-3">
+        <fieldset>
           <legend> { t('full_text_search_management.elasticsearch_management') } </legend>
           <div className="form-group form-horizontal">
             <div className="col-xs-3 control-label"></div>
@@ -54,6 +55,8 @@ class FullTextSearchManagement extends React.Component {
             </div>
           </div>
         </fieldset>
+
+        <AdminRebuildSearch />
       </Fragment>
     );
   }

src/server/views/admin/search.html

@@ -18,7 +18,8 @@
       {% include './widget/menu.html' with {current: 'search'} %}
     </div>
     <div
-    id ="admin-full-text-search-management"
+      class="col-md-9"
+      id ="admin-full-text-search-management"
     >
       <!-- Reactify Paginator start -->
       <!-- {% include '../widget/pager.html' with {path: "/admin/search", pager: pager} %} -->