From 88e45d5eefc9ab27187632cde805a5877281bfe1 Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Mon, 17 Dec 2018 11:29:20 +0100
Subject: [PATCH] Minor fixes

---
 .../ui-components/src/BranchSelector.js       |  4 +--
 scm-ui/src/repos/containers/ChangesetsRoot.js | 26 ++++++++++++------
 .../src/repos/sources/containers/Sources.js   | 27 ++++++++++++-------
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/scm-ui-components/packages/ui-components/src/BranchSelector.js b/scm-ui-components/packages/ui-components/src/BranchSelector.js
index d594af9b21..aa90dec591 100644
--- a/scm-ui-components/packages/ui-components/src/BranchSelector.js
+++ b/scm-ui-components/packages/ui-components/src/BranchSelector.js
@@ -1,7 +1,7 @@
 // @flow
 
 import React from "react";
-import type {Branch} from "packages/ui-types/src/index";
+import type {Branch} from "@scm-manager/ui-types";
 import injectSheet from "react-jss";
 import classNames from "classnames";
 import DropDown from "./forms/DropDown";
@@ -35,7 +35,7 @@ class BranchSelector extends React.Component<Props, State> {
 
   componentDidMount() {
     const selectedBranch = this.props.branches.find(branch => branch.name === this.props.selectedBranch);
-    this.setState({ selectedBranch })
+    this.setState({ selectedBranch });
   }
 
   render() {
diff --git a/scm-ui/src/repos/containers/ChangesetsRoot.js b/scm-ui/src/repos/containers/ChangesetsRoot.js
index b914cd8298..2eea64b8e1 100644
--- a/scm-ui/src/repos/containers/ChangesetsRoot.js
+++ b/scm-ui/src/repos/containers/ChangesetsRoot.js
@@ -1,14 +1,23 @@
 // @flow
 
 import React from "react";
-import type {Branch, Repository} from "@scm-manager/ui-types";
-import {translate} from "react-i18next";
-import {Route, withRouter} from "react-router-dom";
+import type { Branch, Repository } from "@scm-manager/ui-types";
+import { translate } from "react-i18next";
+import { Route, withRouter } from "react-router-dom";
 import Changesets from "./Changesets";
-import {connect} from "react-redux";
-import {BranchSelector, ErrorNotification, Loading} from "@scm-manager/ui-components";
-import {fetchBranches, getBranches, getFetchBranchesFailure, isFetchBranchesPending} from "../modules/branches";
-import {compose} from "redux";
+import { connect } from "react-redux";
+import {
+  BranchSelector,
+  ErrorNotification,
+  Loading
+} from "@scm-manager/ui-components";
+import {
+  fetchBranches,
+  getBranches,
+  getFetchBranchesFailure,
+  isFetchBranchesPending
+} from "../modules/branches";
+import { compose } from "redux";
 
 type Props = {
   repository: Repository,
@@ -27,7 +36,8 @@ type Props = {
 
   // Context props
   history: any, // TODO flow type
-  match: any
+  match: any,
+  t: string => string
 };
 
 class BranchRoot extends React.Component<Props> {
diff --git a/scm-ui/src/repos/sources/containers/Sources.js b/scm-ui/src/repos/sources/containers/Sources.js
index b04bcb990d..0bcdb61f66 100644
--- a/scm-ui/src/repos/sources/containers/Sources.js
+++ b/scm-ui/src/repos/sources/containers/Sources.js
@@ -1,15 +1,21 @@
 // @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 {ErrorNotification, Loading} from "@scm-manager/ui-components";
+import { ErrorNotification, Loading } from "@scm-manager/ui-components";
 import BranchSelector from "../../../../../scm-ui-components/packages/ui-components/src/BranchSelector";
-import {fetchBranches, getBranches, getFetchBranchesFailure, isFetchBranchesPending} from "../../modules/branches";
-import {compose} from "redux";
+import { translate } from "react-i18next";
+import {
+  fetchBranches,
+  getBranches,
+  getFetchBranchesFailure,
+  isFetchBranchesPending
+} from "../../modules/branches";
+import { compose } from "redux";
 import Content from "./Content";
-import {fetchSources, isDirectory} from "../modules/sources";
+import { fetchSources, isDirectory } from "../modules/sources";
 
 type Props = {
   repository: Repository,
@@ -27,7 +33,8 @@ type Props = {
 
   // Context props
   history: any,
-  match: any
+  match: any,
+  t: string => string
 };
 
 class Sources extends React.Component<Props> {
@@ -104,13 +111,14 @@ class Sources extends React.Component<Props> {
   }
 
   renderBranchSelector = () => {
-    const { branches, revision } = this.props;
+    const { branches, revision, t } = this.props;
 
     if (branches) {
       return (
         <BranchSelector
           branches={branches}
           selectedBranch={revision}
+          label={t("branch-selector.label")}
           selected={(b: Branch) => {
             this.branchSelected(b);
           }}
@@ -155,6 +163,7 @@ const mapDispatchToProps = dispatch => {
 };
 
 export default compose(
+  translate("repos"),
   withRouter,
   connect(
     mapStateToProps,