From b6d18c1ee01e2a3d2eb295f14d580aa94e5d9d72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 24 Nov 2020 09:58:07 +0100
Subject: [PATCH] List main branch on top of branches list

---
 .../src/repos/branches/util/orderBranches.test.ts   | 13 +++++++++----
 .../src/repos/branches/util/orderBranches.ts        |  8 ++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.test.ts b/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.test.ts
index afdd325a90..13024ace8a 100644
--- a/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.test.ts
+++ b/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.test.ts
@@ -47,9 +47,14 @@ const developBranch = {
   revision: "revision5",
   defaultBranch: false
 };
+const mainBranch = {
+  name: "main",
+  revision: "revision6",
+  defaultBranch: false
+};
 const masterBranch = {
   name: "master",
-  revision: "revision6",
+  revision: "revision7",
   defaultBranch: false
 };
 
@@ -66,10 +71,10 @@ describe("order branches", () => {
     expect(branches).toEqual([branch3, branch1, branch2]);
   });
 
-  it("should order special branches as follows: master > default > develop", () => {
-    const branches = [defaultBranch, developBranch, masterBranch];
+  it("should order special branches as follows: main > master > default > develop", () => {
+    const branches = [defaultBranch, mainBranch, developBranch, masterBranch];
     orderBranches(branches);
-    expect(branches).toEqual([masterBranch, defaultBranch, developBranch]);
+    expect(branches).toEqual([mainBranch, masterBranch, defaultBranch, developBranch]);
   });
 
   it("should order special branches but starting with defaultBranch", () => {
diff --git a/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.ts b/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.ts
index 69102d5d88..827d791fbe 100644
--- a/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.ts
+++ b/scm-ui/ui-webapp/src/repos/branches/util/orderBranches.ts
@@ -32,10 +32,14 @@ export function orderBranches(branches: Branch[]) {
       return -20;
     } else if (!a.defaultBranch && b.defaultBranch) {
       return 20;
-    } else if (a.name === "master" && b.name !== "master") {
+    } else if (a.name === "main" && b.name !== "main") {
       return -10;
-    } else if (a.name !== "master" && b.name === "master") {
+    } else if (a.name !== "main" && b.name === "main") {
       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") {
       return -10;
     } else if (a.name !== "default" && b.name === "default") {