Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-08 14:35:45 +01:00
Code Issues Packages Projects Releases Activity

fix redirect

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-09-04 15:06:04 +02:00
parent eecba7c163
commit a95cd9c416
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
scm-ui-components/packages/ui-components/src/Breadcrumb.js
View File

@@ -77,7 +77,12 @@ class Breadcrumb extends React.Component<Props> {
<ButtonGroup>
<ExtensionPoint
name="repos.sources.actionbar"
props={{ baseUrl, branch: branch ? branch : defaultBranch, path, isBranchUrl: branches && branches.filter(b => b.name === revision).length > 0 }}
props={{
baseUrl,
branch: branch ? branch : defaultBranch,
path,
isBranchUrl: branches &&
branches.filter(b => b.name.replace("/", "%2F") === revision).length > 0 }}
renderAll={true}
/>
</ButtonGroup>

30
scm-ui/src/repos/sources/containers/Sources.js
View File

@@ -61,44 +61,36 @@ class Sources extends React.Component<Props, State> {
repository,
revision,
path,
branches,
baseUrl,
fetchSources
} = this.props;
fetchBranches(repository);
fetchSources(repository, revision, path);
if (this.shouldRedirect()) {
const defaultBranches = branches.filter(b => b.defaultBranch);
if (defaultBranches.length > 0)
this.setState({ selectedBranch: defaultBranches[0] });
this.props.history.push(`${baseUrl}/${defaultBranches[0].name}/`);
}
this.redirectToDefaultBranch();
}
componentDidUpdate(prevProps) {
const {
fetchSources,
repository,
revision,
path,
branches,
baseUrl
} = this.props;
const { fetchSources, repository, revision, path } = this.props;
if (prevProps.revision !== revision || prevProps.path !== path) {
fetchSources(repository, revision, path);
}
this.redirectToDefaultBranch();
}
redirectToDefaultBranch = () => {
const { branches, baseUrl } = this.props;
if (this.shouldRedirect()) {
const defaultBranches = branches.filter(b => b.defaultBranch);
if (defaultBranches.length > 0)
this.setState({ selectedBranch: defaultBranches[0] });
this.props.history.push(`${baseUrl}/${defaultBranches[0].name}/`);
}
this.props.history.push(
`${baseUrl}/${defaultBranches[0].name.replace("/", "%2F")}/`
);
}
};
shouldRedirect = () => {
const { branches, location } = this.props;