From a62c4a1fc0b6edcfc700ac04e68c0c67ddb3303b Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Wed, 23 Oct 2019 17:25:52 +0200
Subject: [PATCH] always render breadcrumd

---
 scm-ui/ui-components/src/Breadcrumb.js        | 26 ++++++----
 .../src/repos/sources/containers/Sources.js   | 49 ++++++++-----------
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/scm-ui/ui-components/src/Breadcrumb.js b/scm-ui/ui-components/src/Breadcrumb.js
index 524230a0a4..f441c8e2d1 100644
--- a/scm-ui/ui-components/src/Breadcrumb.js
+++ b/scm-ui/ui-components/src/Breadcrumb.js
@@ -1,11 +1,11 @@
 //@flow
 import React from "react";
-import { Link } from "react-router-dom";
-import { translate } from "react-i18next";
+import {Link} from "react-router-dom";
+import {translate} from "react-i18next";
 import classNames from "classnames";
 import styled from "styled-components";
-import { binder, ExtensionPoint } from "@scm-manager/ui-extensions";
-import type { Branch, Repository } from "@scm-manager/ui-types";
+import {binder, ExtensionPoint} from "@scm-manager/ui-extensions";
+import type {Branch, Repository} from "@scm-manager/ui-types";
 import Icon from "./Icon";
 
 type Props = {
@@ -74,6 +74,11 @@ class Breadcrumb extends React.Component<Props> {
       t
     } = this.props;
 
+    let homeUrl = baseUrl + "/";
+    if (revision) {
+      homeUrl += encodeURIComponent(revision) + "/";
+    }
+
     return (
       <>
         <div className="is-flex">
@@ -83,7 +88,7 @@ class Breadcrumb extends React.Component<Props> {
           >
             <ul>
               <li>
-                <Link to={baseUrl + "/" + revision + "/"}>
+                <Link to={homeUrl}>
                   <HomeIcon
                     title={t("breadcrumb.home")}
                     name="home"
@@ -101,12 +106,13 @@ class Breadcrumb extends React.Component<Props> {
                 props={{
                   baseUrl,
                   branch: branch ? branch : defaultBranch,
+                  revision: branches ? undefined : revision,
                   path,
-                  isBranchUrl:
-                    branches &&
-                    branches.filter(
-                      b => b.name.replace("/", "%2F") === revision
-                    ).length > 0,
+                  isBranchUrl: branches
+                    ? branches.filter(
+                        b => b.name.replace("/", "%2F") === revision
+                      ).length > 0
+                    : true,
                   repository
                 }}
                 renderAll={true}
diff --git a/scm-ui/ui-webapp/src/repos/sources/containers/Sources.js b/scm-ui/ui-webapp/src/repos/sources/containers/Sources.js
index 98f173efb5..18b65e3f2f 100644
--- a/scm-ui/ui-webapp/src/repos/sources/containers/Sources.js
+++ b/scm-ui/ui-webapp/src/repos/sources/containers/Sources.js
@@ -1,25 +1,20 @@
 // @flow
 import React from "react";
-import { connect } from "react-redux";
-import { withRouter } from "react-router-dom";
-import type { Branch, Repository } from "@scm-manager/ui-types";
+import {connect} from "react-redux";
+import {withRouter} from "react-router-dom";
+import type {Branch, Repository} from "@scm-manager/ui-types";
 import FileTree from "../components/FileTree";
-import {
-  BranchSelector,
-  Breadcrumb,
-  ErrorNotification,
-  Loading
-} from "@scm-manager/ui-components";
-import { translate } from "react-i18next";
+import {BranchSelector, Breadcrumb, ErrorNotification, Loading} from "@scm-manager/ui-components";
+import {translate} from "react-i18next";
 import {
   fetchBranches,
   getBranches,
   getFetchBranchesFailure,
   isFetchBranchesPending
 } from "../../branches/modules/branches";
-import { compose } from "redux";
+import {compose} from "redux";
 import Content from "./Content";
-import { fetchSources, isDirectory } from "../modules/sources";
+import {fetchSources, isDirectory} from "../modules/sources";
 
 type Props = {
   repository: Repository,
@@ -175,22 +170,20 @@ class Sources extends React.Component<Props, State> {
     const { revision, path, baseUrl, branches, repository } = this.props;
     const { selectedBranch } = this.state;
 
-    if (revision) {
-      return (
-        <Breadcrumb
-          revision={encodeURIComponent(revision)}
-          path={path}
-          baseUrl={baseUrl}
-          branch={selectedBranch}
-          defaultBranch={
-            branches && branches.filter(b => b.defaultBranch === true)[0]
-          }
-          branches={branches}
-          repository={repository}
-        />
-      );
-    }
-    return null;
+    //TODO refactor
+    return (
+      <Breadcrumb
+        revision={revision}
+        path={path}
+        baseUrl={baseUrl}
+        branch={selectedBranch}
+        defaultBranch={
+          branches && branches.filter(b => b.defaultBranch === true)[0]
+        }
+        branches={branches}
+        repository={repository}
+      />
+    );
   };
 }