From ae21da7cd2b50e996be18a0937416bf04c45c0ea Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Wed, 28 Jul 2021 11:34:18 +0200
Subject: [PATCH] Fix file search for branches including "/" (#1748)

---
 gradle/changelog/file_search.yaml                     |  2 ++
 .../repos/codeSection/components/FileSearchButton.tsx |  2 +-
 .../src/repos/codeSection/containers/FileSearch.tsx   | 11 +++++------
 3 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 gradle/changelog/file_search.yaml

diff --git a/gradle/changelog/file_search.yaml b/gradle/changelog/file_search.yaml
new file mode 100644
index 0000000000..453b1452c0
--- /dev/null
+++ b/gradle/changelog/file_search.yaml
@@ -0,0 +1,2 @@
+- type: Fixed
+  description: Fix file search on branches with "/" ([#1748](https://github.com/scm-manager/scm-manager/pull/1748))
diff --git a/scm-ui/ui-webapp/src/repos/codeSection/components/FileSearchButton.tsx b/scm-ui/ui-webapp/src/repos/codeSection/components/FileSearchButton.tsx
index a215bb7381..efe4cfbe42 100644
--- a/scm-ui/ui-webapp/src/repos/codeSection/components/FileSearchButton.tsx
+++ b/scm-ui/ui-webapp/src/repos/codeSection/components/FileSearchButton.tsx
@@ -39,7 +39,7 @@ const SearchIcon = styled(Icon)`
 const FileSearchButton: FC<Props> = ({ baseUrl, revision }) => {
   const [t] = useTranslation("repos");
   return (
-    <Link to={`${baseUrl}/search/${revision}`}>
+    <Link to={`${baseUrl}/search/${encodeURIComponent(revision)}`}>
       <SearchIcon title={t("filesearch.button.title")} name="search" color="inherit" />
     </Link>
   );
diff --git a/scm-ui/ui-webapp/src/repos/codeSection/containers/FileSearch.tsx b/scm-ui/ui-webapp/src/repos/codeSection/containers/FileSearch.tsx
index c446cbd767..86cac4ebd2 100644
--- a/scm-ui/ui-webapp/src/repos/codeSection/containers/FileSearch.tsx
+++ b/scm-ui/ui-webapp/src/repos/codeSection/containers/FileSearch.tsx
@@ -23,13 +23,12 @@
  */
 import React, { FC, useEffect, useState } from "react";
 import { Branch, Repository } from "@scm-manager/ui-types";
-import { useHistory, useLocation, useParams } from "react-router-dom";
+import { Link, useHistory, useLocation, useParams } from "react-router-dom";
 import { urls, usePaths } from "@scm-manager/ui-api";
 import { ErrorNotification, FilterInput, Help, Icon, Loading } from "@scm-manager/ui-components";
 import CodeActionBar from "../components/CodeActionBar";
 import styled from "styled-components";
 import FileSearchResults from "../components/FileSearchResults";
-import { Link } from "react-router-dom";
 import { useTranslation } from "react-i18next";
 import { filepathSearch } from "../utils/filepathSearch";
 
@@ -67,7 +66,7 @@ const SearchHelp = styled(Help)`
 
 const useRevision = () => {
   const { revision } = useParams<Params>();
-  return decodeURIComponent(revision);
+  return revision;
 };
 
 const FileSearch: FC<Props> = ({ repository, baseUrl, branches, selectedBranch }) => {
@@ -98,12 +97,12 @@ const FileSearch: FC<Props> = ({ repository, baseUrl, branches, selectedBranch }
 
   const evaluateSwitchViewLink = (type: string) => {
     if (type === "sources") {
-      return `${baseUrl}/sources/${encodeURIComponent(revision)}/`;
+      return `${baseUrl}/sources/${revision}/`;
     }
-    return `${baseUrl}/changesets/${encodeURIComponent(revision)}/`;
+    return `${baseUrl}/changesets/${revision}/`;
   };
 
-  const contentBaseUrl = `${baseUrl}/sources/${encodeURIComponent(revision)}/`;
+  const contentBaseUrl = `${baseUrl}/sources/${revision}/`;
 
   return (
     <>