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

List main branch on top of branches list

Browse Source
This commit is contained in:
René Pfeuffer
2020-11-24 09:58:07 +01:00
parent 7bbda71c4f
commit b6d18c1ee0
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
scm-ui/ui-webapp/src/repos/branches/util/orderBranches.test.ts
View File

@@ -47,9 +47,14 @@ const developBranch = {
revision: "revision5", revision: "revision5",
defaultBranch: false defaultBranch: false
}; };
const mainBranch = {
name: "main",
revision: "revision6",
defaultBranch: false
};
const masterBranch = { const masterBranch = {
name: "master", name: "master",
revision: "revision6", revision: "revision7",
defaultBranch: false defaultBranch: false
}; };
@@ -66,10 +71,10 @@ describe("order branches", () => {
expect(branches).toEqual([branch3, branch1, branch2]); expect(branches).toEqual([branch3, branch1, branch2]);
}); });
it("should order special branches as follows: master > default > develop", () => { it("should order special branches as follows: main > master > default > develop", () => {
const branches = [defaultBranch, developBranch, masterBranch]; const branches = [defaultBranch, mainBranch, developBranch, masterBranch];
orderBranches(branches); orderBranches(branches);
expect(branches).toEqual([masterBranch, defaultBranch, developBranch]); expect(branches).toEqual([mainBranch, masterBranch, defaultBranch, developBranch]);
}); });
it("should order special branches but starting with defaultBranch", () => { it("should order special branches but starting with defaultBranch", () => {

8
scm-ui/ui-webapp/src/repos/branches/util/orderBranches.ts
View File

@@ -32,10 +32,14 @@ export function orderBranches(branches: Branch[]) {
return -20; return -20;
} else if (!a.defaultBranch && b.defaultBranch) { } else if (!a.defaultBranch && b.defaultBranch) {
return 20; return 20;
} else if (a.name === "master" && b.name !== "master") { } else if (a.name === "main" && b.name !== "main") {
return -10; return -10;
} else if (a.name !== "master" && b.name === "master") { } else if (a.name !== "main" && b.name === "main") {
return 10; return 10;
} else if (a.name === "master" && b.name !== "master") {
return -9;
} else if (a.name !== "master" && b.name === "master") {
return 9;
} else if (a.name === "default" && b.name !== "default") { } else if (a.name === "default" && b.name !== "default") {
return -10; return -10;
} else if (a.name !== "default" && b.name === "default") { } else if (a.name !== "default" && b.name === "default") {