From 7f1aeb0492879c823745b089374f97e0576dfe96 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Mon, 1 Apr 2019 15:13:44 +0200 Subject: [PATCH] restyled branches overview tabled, fixed en/decoded branch name --- scm-ui/src/repos/branches/components/BranchDetailTable.js | 8 ++++---- scm-ui/src/repos/branches/containers/BranchView.js | 1 - scm-ui/src/repos/modules/branches.js | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/scm-ui/src/repos/branches/components/BranchDetailTable.js b/scm-ui/src/repos/branches/components/BranchDetailTable.js index 08935aa26c..53718c5b6d 100644 --- a/scm-ui/src/repos/branches/components/BranchDetailTable.js +++ b/scm-ui/src/repos/branches/components/BranchDetailTable.js @@ -19,19 +19,19 @@ class BranchDetailTable extends React.Component { - + - - + diff --git a/scm-ui/src/repos/branches/containers/BranchView.js b/scm-ui/src/repos/branches/containers/BranchView.js index fd65f6eab0..4774e2825a 100644 --- a/scm-ui/src/repos/branches/containers/BranchView.js +++ b/scm-ui/src/repos/branches/containers/BranchView.js @@ -72,7 +72,6 @@ const mapStateToProps = (state, ownProps) => { const { repository } = ownProps; const branchName = decodeURIComponent(ownProps.match.params.branch); const branch = getBranchByName(state, branchName); - console.log(branchName + " Branch:",branch); const loading = isFetchBranchPending(state, branchName); const error = getFetchBranchFailure(state, branchName); return { diff --git a/scm-ui/src/repos/modules/branches.js b/scm-ui/src/repos/modules/branches.js index 15dfb9c714..5c9a63b5d6 100644 --- a/scm-ui/src/repos/modules/branches.js +++ b/scm-ui/src/repos/modules/branches.js @@ -22,7 +22,7 @@ export const FETCH_BRANCH_FAILURE = `${FETCH_BRANCH}_${FAILURE_SUFFIX}`; // Fetching branches export function fetchBranchByName(link: string, name: string) { - const branchUrl = link.endsWith("/") ? link + name : link + "/" + name; + const branchUrl = link.endsWith("/") ? link + encodeURIComponent(name) : link + "/" + encodeURIComponent(name); return fetchBranch(branchUrl, name); } @@ -68,7 +68,6 @@ export function fetchBranch(link: string, name: string) { } export function getBranchByName(state: Object, name: string) { - console.log("State:", state); if (state.branches) { return state.branches[name]; }
{t("branch.name")}{t("branch.name")} {branch.name} {this.renderDefaultBranch()}
+ {t("branch.repository")} - + {repository.name}
{t("branch.actions")}{t("branch.actions")}