From 7ffb2eb118acd83f0b941f69bf4a460d91240efd Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Dec 17 2019 14:41:32 +0000
Subject: Issue 50780 - Fix UI issues


Description:  Fixed issue with replication conflict entry modal, and
              problem with the monitor's replication and suffix
              state data collision that caused a crash if you first
              looked at replication and then the suffix monitor

relates: https://pagure.io/389-ds-base/issue/50780

Reviewed by: spichugi(Thanks!)

---

diff --git a/src/cockpit/389-console/src/css/ds.css b/src/cockpit/389-console/src/css/ds.css
index fdc79e7..e6bb1da 100644
--- a/src/cockpit/389-console/src/css/ds.css
+++ b/src/cockpit/389-console/src/css/ds.css
@@ -316,11 +316,11 @@ td {
     min-width: 350px !important;
 }
 
-.ds-modal-wide {
+.ds-modal-wide .modal-content {
     width: 875px !important;
     min-width: 875px !important;
     vertical-align: middle;
-    margin-left: -100px !important;
+    margin-left: -90px !important;
 }
 
 .ds-button-right {
@@ -553,7 +553,7 @@ textarea {
 }
 
 .ds-conflict-btn {
-    width: 110px;
+    width: 150px;
 }
 
 option {
diff --git a/src/cockpit/389-console/src/database.jsx b/src/cockpit/389-console/src/database.jsx
index 697eb14..e359626 100644
--- a/src/cockpit/389-console/src/database.jsx
+++ b/src/cockpit/389-console/src/database.jsx
@@ -556,6 +556,9 @@ export class Database extends React.Component {
         for (let el of elements) {
             el.setAttribute('title', el.innerText);
         }
+        this.setState({
+            disableTree: false
+        });
     }
 
     showSuffixModal () {
diff --git a/src/cockpit/389-console/src/lib/monitor/monitorModals.jsx b/src/cockpit/389-console/src/lib/monitor/monitorModals.jsx
index 519acb7..96007ea 100644
--- a/src/cockpit/389-console/src/lib/monitor/monitorModals.jsx
+++ b/src/cockpit/389-console/src/lib/monitor/monitorModals.jsx
@@ -544,7 +544,7 @@ class ConflictCompareModal extends React.Component {
                             <Icon type="pf" name="close" />
                         </button>
                         <Modal.Title>
-                            Resolve Replication Conflicts
+                            Resolve Replication Conflict
                         </Modal.Title>
                     </Modal.Header>
                     <Modal.Body>
@@ -580,7 +580,7 @@ class ConflictCompareModal extends React.Component {
                                     <h4>You can convert the <b>Conflict Entry</b> into a new valid entry by providing a new RDN value below, like "<i>cn=NEW_RDN</i>"</h4>
                                 </Row>
                                 <Row>
-                                    <Col sm={2}>
+                                    <Col sm={3}>
                                         <Button
                                             bsStyle="primary"
                                             className="ds-conflict-btn"
diff --git a/src/cockpit/389-console/src/lib/monitor/monitorTables.jsx b/src/cockpit/389-console/src/lib/monitor/monitorTables.jsx
index 26db0ca..21c0128 100644
--- a/src/cockpit/389-console/src/lib/monitor/monitorTables.jsx
+++ b/src/cockpit/389-console/src/lib/monitor/monitorTables.jsx
@@ -123,6 +123,7 @@ class AbortCleanALLRUVTable extends React.Component {
                                 return [
                                     <td key={rowData.name[0]}>
                                         <Button
+                                            bsStyle="primary"
                                             onClick={() => {
                                                 this.props.viewLog(this.props.viewLog(rowData.name));
                                             }}
@@ -321,6 +322,7 @@ class CleanALLRUVTable extends React.Component {
                                 return [
                                     <td key={rowData.name[0]}>
                                         <Button
+                                            bsStyle="primary"
                                             onClick={() => {
                                                 this.props.viewLog(rowData.name);
                                             }}
@@ -1495,6 +1497,7 @@ class ConflictTable extends React.Component {
                                 return [
                                     <td key={rowData.dn[0]}>
                                         <Button
+                                            bsStyle="primary"
                                             onClick={() => {
                                                 this.props.resolveConflict(rowData.dn[0]);
                                             }}
diff --git a/src/cockpit/389-console/src/monitor.jsx b/src/cockpit/389-console/src/monitor.jsx
index 6798dda..fd2bc0d 100644
--- a/src/cockpit/389-console/src/monitor.jsx
+++ b/src/cockpit/389-console/src/monitor.jsx
@@ -352,7 +352,10 @@ export class Monitor extends React.Component {
                 };
             });
         } else {
-            if (selectedNode.id in this.state) {
+            if (selectedNode.id in this.state &&
+                ("chainingData" in this.state[selectedNode.id] ||
+                 "suffixData" in this.state[selectedNode.id])
+            ) {
                 // This suffix is already cached
                 this.setState(prevState => {
                     return {
diff --git a/src/lib389/lib389/replica.py b/src/lib389/lib389/replica.py
index 9ba97ff..ba58416 100644
--- a/src/lib389/lib389/replica.py
+++ b/src/lib389/lib389/replica.py
@@ -1169,7 +1169,7 @@ class Replica(DSLdapObject):
             if len(conflicts) > 0:
                 report = copy.deepcopy(DSREPLLE0002)
                 report['detail'] = report['detail'].replace('SUFFIX', suffix)
-                report['detail'] = report['detail'].replace('COUNT', len(conflicts))
+                report['detail'] = report['detail'].replace('COUNT', str(len(conflicts)))
                 report['fix'] = report['fix'].replace('YOUR_INSTANCE', self._instance.serverid)
                 yield report