Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-01-20 06:22:10 +01:00
Code Issues Packages Projects Releases Activity

Fix file search for branches including "/" (#1748)

Browse Source
This commit is contained in:
Eduard Heimbuch
2021-07-28 11:34:18 +02:00
committed by GitHub
parent e560d20d5a
commit ae21da7cd2
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/changelog/file_search.yaml Normal file
View File

@@ -0,0 +1,2 @@
- type: Fixed
description: Fix file search on branches with "/" ([#1748](https://github.com/scm-manager/scm-manager/pull/1748))

2
scm-ui/ui-webapp/src/repos/codeSection/components/FileSearchButton.tsx
View File

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

11
scm-ui/ui-webapp/src/repos/codeSection/containers/FileSearch.tsx
View File

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