Render file tree even when no branch is selected

This commit is contained in:
René Pfeuffer
2018-10-22 08:00:34 +02:00
parent 28671cc297
commit 728696de32
2 changed files with 23 additions and 15 deletions

View File

@@ -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>

View File

@@ -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>
</>
);
}