Fix things

- Change statusTime to startTime in table - Handle _replicatorDB not found - Fix replication reducer - Fix polling refresh
apache · Jun 13, 2020 · a35a657 · a35a657
1 parent 4753053
commit a35a657
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/app/addons/replication/api.js b/app/addons/replication/api.js
@@ -332,7 +332,8 @@ export const fetchReplicationDocs = ({docsPerPage, page}) => {
       const url = Helpers.getServerUrl('/_replicator/_find');
       const docsPromise = post(url, mangoPayload)
         .then((res) => {
-          return parseReplicationDocs(res.docs);
+          const docs = res.error ? [] : res.docs;
+          return parseReplicationDocs(docs);
         });
 
       if (!newApi) {

diff --git a/app/addons/replication/components/common-table.js b/app/addons/replication/components/common-table.js
@@ -400,9 +400,9 @@ export class ReplicationTable extends React.Component {
               Target
               <span className={`replication__table-header-icon ${this.iconDirection('target')} ${this.isSelected('target')}`} />
             </th>
-            <th className="replication__table-header-time" onClick={this.onSort('statusTime')}>
+            <th className="replication__table-header-time" onClick={this.onSort('startTime')}>
               Start Time
-              <span className={`replication__table-header-icon ${this.iconDirection('statusTime')} ${this.isSelected('statusTime')}`} />
+              <span className={`replication__table-header-icon ${this.iconDirection('startTime')} ${this.isSelected('startTime')}`} />
             </th>
             <th className="replication__table-header-type" onClick={this.onSort('continuous')}>
               Type

diff --git a/app/addons/replication/controller.js b/app/addons/replication/controller.js
@@ -24,6 +24,11 @@ const {LoadLines, Polling, RefreshBtn} = Components;
 
 export default class ReplicationController extends React.Component {
 
+  constructor(props) {
+    super(props);
+    this.onRefresh = this.onRefresh.bind(this);
+  }
+
   loadReplicationInfo (props, oldProps) {
     this.props.initReplicator(props.routeLocalSource, props.localSource);
     this.getAllActivity(props.pagination);
@@ -42,6 +47,10 @@ export default class ReplicationController extends React.Component {
     this.props.getReplicateActivity();
   }
 
+  onRefresh() {
+    this.getAllActivity(this.props.pagination);
+  }
+
   componentDidMount () {
     this.props.checkForNewApi();
     this.props.getDatabasesList();
@@ -173,10 +182,10 @@ export default class ReplicationController extends React.Component {
           max={600}
           startValue={300}
           stepSize={60}
-          onPoll={this.getAllActivity.bind(this, this.props.pagination)}
+          onPoll={this.onRefresh}
         />
         <RefreshBtn
-          refresh={this.getAllActivity.bind(this, this.props.pagination)}
+          refresh={this.onRefresh}
         />
       </div>
     );

diff --git a/app/addons/replication/reducers.js b/app/addons/replication/reducers.js
@@ -389,6 +389,7 @@ const replication = (state = initialState, {type, options}) => {
       return {
         ...state,
         pagination: {
+          ...state.pagination,
           docsPerPage: state.pagination.docsPerPage,
           page: state.pagination.page + 1
         }
@@ -398,6 +399,7 @@ const replication = (state = initialState, {type, options}) => {
       return {
         ...state,
         pagination: {
+          ...state.pagination,
           docsPerPage: state.pagination.docsPerPage,
           page: state.pagination.page - 1
         }