From 28c80455053ca7d40d1770a044d4d584c3fbd766 Mon Sep 17 00:00:00 2001
From: cdujeu <charles@ajaxplorer.info>
Date: Wed, 9 Sep 2020 09:14:08 +0200
Subject: [PATCH] Fix patch.Error display

---
 app/ux/src/components/PageActivities.js | 2 +-
 app/ux/src/models/Patch.js              | 1 -
 app/ux/src/task/PatchNode.js            | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/ux/src/components/PageActivities.js b/app/ux/src/components/PageActivities.js
index c36c987..8033def 100644
--- a/app/ux/src/components/PageActivities.js
+++ b/app/ux/src/components/PageActivities.js
@@ -164,7 +164,7 @@ class PageActivities extends Component {
                                                     </div>
                                                 </Sticky>
                                                 <div style={{paddingBottom: 6, paddingTop: 6}}>
-                                                    {patch.Error && <div>{patch.Error}</div>}
+                                                    {patch.Error && <div style={{color:Colors.error, padding: 10}}><Icon iconName={"Warning"}/> {patch.Error}</div>}
                                                     {patch.Root.Children.map((c,i) =>
                                                         <PatchNode
                                                             key={key+ "-" + i}
diff --git a/app/ux/src/models/Patch.js b/app/ux/src/models/Patch.js
index 4aeca8e..49af791 100644
--- a/app/ux/src/models/Patch.js
+++ b/app/ux/src/models/Patch.js
@@ -116,7 +116,6 @@ class Patch {
             this.Error = data.Error;
         }
         // Fix direction value
-        console.log("NEW PATCH", this, syncConfig);
         if(this.Stats && this.Stats.Source === syncConfig.RightURI){
             this.Root.reverseOperations();
         }
diff --git a/app/ux/src/task/PatchNode.js b/app/ux/src/task/PatchNode.js
index 6e26fca..76b1b06 100644
--- a/app/ux/src/task/PatchNode.js
+++ b/app/ux/src/task/PatchNode.js
@@ -43,7 +43,7 @@ class PatchNode extends React.Component {
     render(){
         const {patch, patchError, level, stats, openPath, t, flatMode} = this.props;
         const {open} = this.state;
-        if(!patch.hasOperations()){
+        if(!patch.hasOperations() && !patchError){
             return null;
         }
         const isLeaf = patch.Node.Type === 1;
@@ -127,7 +127,7 @@ class PatchNode extends React.Component {
                 newLevel = level > 0 ? level -1  : level;
             }
         }
-        //console.log(hideMain, patch, level, newLevel);
+        console.log(hideMain, patchError, level, newLevel);
         return (
             <div style={{paddingLeft}}>
                 {!hideMain &&