From 728696de32ea7e20ade532a4a82c50c9ba309ea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 22 Oct 2018 08:00:34 +0200
Subject: [PATCH] Render file tree even when no branch is selected

---
 .../src/repos/sources/components/FileTree.js  | 14 +++++------
 .../src/repos/sources/containers/Sources.js   | 24 ++++++++++++-------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/scm-ui/src/repos/sources/components/FileTree.js b/scm-ui/src/repos/sources/components/FileTree.js
index b8fa4a0dc4..ace812e261 100644
--- a/scm-ui/src/repos/sources/components/FileTree.js
+++ b/scm-ui/src/repos/sources/components/FileTree.js
@@ -67,13 +67,6 @@ class FileTree extends React.Component<Props> {
       t
     } = this.props;
 
-    let baseUrlWithRevision = baseUrl;
-    if (revision) {
-      baseUrlWithRevision += "/" + revision;
-    } else {
-      baseUrlWithRevision += "/" + tree.revision;
-    }
-
     const compareFiles = function(f1: File, f2: File): number {
       if (f1.directory) {
         if (f2.directory) {
@@ -112,6 +105,13 @@ class FileTree extends React.Component<Props> {
 
     files.push(...tree._embedded.children.sort(compareFiles));
 
+    let baseUrlWithRevision = baseUrl;
+    if (revision) {
+      baseUrlWithRevision += "/" + revision;
+    } else {
+      baseUrlWithRevision += "/" + tree.revision;
+    }
+
     return (
       <table className="table table-hover table-sm is-fullwidth">
         <thead>
diff --git a/scm-ui/src/repos/sources/containers/Sources.js b/scm-ui/src/repos/sources/containers/Sources.js
index 2d75b4193a..40d4e6c214 100644
--- a/scm-ui/src/repos/sources/containers/Sources.js
+++ b/scm-ui/src/repos/sources/containers/Sources.js
@@ -1,8 +1,8 @@
 // @flow
 import React from "react";
 import { connect } from "react-redux";
-import { Route, withRouter } from "react-router-dom";
-import type { Repository, Branch, File } from "@scm-manager/ui-types";
+import { Route, Switch, withRouter } from "react-router-dom";
+import type { Repository, Branch } from "@scm-manager/ui-types";
 import FileTree from "../components/FileTree";
 import { ErrorNotification, Loading } from "@scm-manager/ui-components";
 import BranchSelector from "../../containers/BranchSelector";
@@ -61,12 +61,20 @@ class Sources extends React.Component<Props> {
     return (
       <>
         {this.renderBranchSelector()}
-        <Route
-          path={`${baseUrl}/:revision/:path*`}
-          component={() => (
-            <FileTree repository={repository} baseUrl={baseUrl} />
-          )}
-        />
+        <Switch>
+          <Route
+            path={`${baseUrl}/:revision/:path*`}
+            component={() => (
+              <FileTree repository={repository} baseUrl={baseUrl} />
+            )}
+          />
+          <Route
+            path={`${baseUrl}`}
+            component={() => (
+              <FileTree repository={repository} baseUrl={baseUrl} />
+            )}
+          />
+        </Switch>
       </>
     );
   }