From 3bfd9becc97b9800c7f2ae611e01e92542496021 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Wed, 10 Apr 2019 17:34:31 +0200
Subject: [PATCH 1/2] Add button to switch between side-by-side and combined
 diff view

---
 .../ui-components/src/repos/DiffFile.js       | 42 ++++++++++++-------
 scm-ui/public/locales/de/repos.json           |  4 ++
 scm-ui/public/locales/en/repos.json           |  4 +-
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/repos/DiffFile.js b/scm-ui-components/packages/ui-components/src/repos/DiffFile.js
index ccc07f2ea1..64450659f0 100644
--- a/scm-ui-components/packages/ui-components/src/repos/DiffFile.js
+++ b/scm-ui-components/packages/ui-components/src/repos/DiffFile.js
@@ -11,6 +11,7 @@ import {
 import injectSheets from "react-jss";
 import classNames from "classnames";
 import { translate } from "react-i18next";
+import {Button} from "../buttons";
 
 const styles = {
   panel: {
@@ -39,14 +40,16 @@ type Props = DiffObjectProps & {
 };
 
 type State = {
-  collapsed: boolean
+  collapsed: boolean,
+  sideBySide: boolean
 };
 
 class DiffFile extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props);
     this.state = {
-      collapsed: false
+      collapsed: false,
+      sideBySide: false
     };
   }
 
@@ -56,6 +59,12 @@ class DiffFile extends React.Component<Props, State> {
     }));
   };
 
+  toggleSideBySide = () => {
+    this.setState(state => ({
+      sideBySide: !state.sideBySide
+    }));
+  };
+
   setCollapse = (collapsed: boolean) => {
     this.setState({
       collapsed
@@ -149,10 +158,10 @@ class DiffFile extends React.Component<Props, State> {
       file,
       fileControlFactory,
       fileAnnotationFactory,
-      sideBySide,
-      classes
+      classes,
+      t
     } = this.props;
-    const { collapsed } = this.state;
+    const { collapsed, sideBySide } = this.state;
     const viewType = sideBySide ? "split" : "unified";
 
     let body = null;
@@ -173,14 +182,10 @@ class DiffFile extends React.Component<Props, State> {
     }
 
     const fileControls = fileControlFactory ? fileControlFactory(file, this.setCollapse) : null;
-    return (
-      <div className={classNames("panel", classes.panel)}>
+    return <div className={classNames("panel", classes.panel)}>
         <div className="panel-heading">
           <div className="level">
-            <div
-              className={classNames("level-left", classes.titleHeader)}
-              onClick={this.toggleCollapse}
-            >
+            <div className={classNames("level-left", classes.titleHeader)} onClick={this.toggleCollapse}>
               <i className={icon} />
               <span className={classes.title}>
                 {this.renderFileTitle(file)}
@@ -189,12 +194,21 @@ class DiffFile extends React.Component<Props, State> {
                 {this.renderChangeTag(file)}
               </span>
             </div>
-            <div className="level-right">{fileControls}</div>
+            <div className="level-right">
+              <Button action={this.toggleSideBySide}>
+                <span className="icon is-small">
+                  <i className={classNames("fas", sideBySide ? "fa-align-left" : "fa-columns")} />
+                </span>
+                <span className="is-hidden-mobile">
+                  {t(sideBySide ? "diff.combined" : "diff.sideBySide")}
+                </span>
+              </Button>
+              {fileControls}
+            </div>
           </div>
         </div>
         {body}
-      </div>
-    );
+      </div>;
   }
 }
 
diff --git a/scm-ui/public/locales/de/repos.json b/scm-ui/public/locales/de/repos.json
index 47353fa79b..f4ee071613 100644
--- a/scm-ui/public/locales/de/repos.json
+++ b/scm-ui/public/locales/de/repos.json
@@ -173,5 +173,9 @@
       "submit": "Ja",
       "cancel": "Nein"
     }
+  },
+  "diff": {
+    "sideBySide": "Zweispalitg",
+    "combined": "Kombiniert"
   }
 }
diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
index 0d59b88819..714b7d4c14 100644
--- a/scm-ui/public/locales/en/repos.json
+++ b/scm-ui/public/locales/en/repos.json
@@ -181,6 +181,8 @@
       "modify": "modified",
       "rename": "renamed",
       "copy": "copied"
-    }
+    },
+    "sideBySide": "side-by-side",
+    "combined": "combined"
   }
 }

From e1bd626eac5de3248f4bf6be18b5c4576e6ec5a9 Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Thu, 11 Apr 2019 11:48:02 +0000
Subject: [PATCH 2/2] Close branch feature/side_by_side