Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 15:05:44 +01:00
Code Issues Packages Projects Releases Activity

fixed preloading bug for sorting null branches

Browse Source
This commit is contained in:
Florian Scholdei
2019-03-29 14:54:18 +01:00
parent b7178d3332
commit e6912ef77b
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scm-ui/src/repos/branches/containers/BranchesOverview.js
View File

@@ -40,9 +40,9 @@ type Props = {
// followed by develop the rest should be ordered by its name
export function orderBranches(branches: Branch[]) {
branches.sort((a, b) => {
if (a.defaultBranch && !b.defaultBranch ) {
if (a.defaultBranch && !b.defaultBranch) {
return -20;
} else if (!a.defaultBranch && b.defaultBranch ) {
} else if (!a.defaultBranch && b.defaultBranch) {
return 20;
} else if (a.name === "master" && b.name !== "master") {
return -10;
@@ -74,16 +74,16 @@ class BranchesOverview extends React.Component<Props> {
render() {
const { baseUrl, loading, error, branches, t } = this.props;
orderBranches(branches);
if (error) {
return <ErrorNotification error={error} />;
}
if (loading) {
if (!branches || loading) {
return <Loading />;
}
orderBranches(branches);
return (
<>
<Subtitle subtitle={t("branches.overview.title")} />