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

apply prettier, removed flow related config and added tsconfig

Browse Source
This commit is contained in:
Sebastian Sdorra
2019-10-20 18:02:52 +02:00
parent 0e017dcadd
commit 490418d06e
231 changed files with 5771 additions and 30386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,61 +1,61 @@
import { orderBranches } from './orderBranches';
import { orderBranches } from "./orderBranches";
const branch1 = {
name: 'branch1',
revision: 'revision1',
name: "branch1",
revision: "revision1"
};
const branch2 = {
name: 'branch2',
revision: 'revision2',
name: "branch2",
revision: "revision2"
};
const branch3 = {
name: 'branch3',
revision: 'revision3',
defaultBranch: true,
name: "branch3",
revision: "revision3",
defaultBranch: true
};
const defaultBranch = {
name: 'default',
revision: 'revision4',
defaultBranch: false,
name: "default",
revision: "revision4",
defaultBranch: false
};
const developBranch = {
name: 'develop',
revision: 'revision5',
defaultBranch: false,
name: "develop",
revision: "revision5",
defaultBranch: false
};
const masterBranch = {
name: 'master',
revision: 'revision6',
defaultBranch: false,
name: "master",
revision: "revision6",
defaultBranch: false
};
describe('order branches', () => {
it('should return branches', () => {
describe("order branches", () => {
it("should return branches", () => {
let branches = [branch1, branch2];
orderBranches(branches);
expect(branches).toEqual([branch1, branch2]);
});
it('should return defaultBranch first', () => {
it("should return defaultBranch first", () => {
let branches = [branch1, branch2, branch3];
orderBranches(branches);
expect(branches).toEqual([branch3, branch1, branch2]);
});
it('should order special branches as follows: master > default > develop', () => {
it("should order special branches as follows: master > default > develop", () => {
let branches = [defaultBranch, developBranch, masterBranch];
orderBranches(branches);
expect(branches).toEqual([masterBranch, defaultBranch, developBranch]);
});
it('should order special branches but starting with defaultBranch', () => {
it("should order special branches but starting with defaultBranch", () => {
let branches = [masterBranch, developBranch, defaultBranch, branch3];
orderBranches(branches);
expect(branches).toEqual([
branch3,
masterBranch,
defaultBranch,
developBranch,
developBranch
]);
});
});

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

@@ -1,6 +1,6 @@
// master, default should always be the first one,
// followed by develop the rest should be ordered by its name
import { Branch } from '@scm-manager/ui-types';
import { Branch } from "@scm-manager/ui-types";
export function orderBranches(branches: Branch[]) {
branches.sort((a, b) => {
@@ -8,17 +8,17 @@ 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 === "master" && b.name !== "master") {
return -10;
} else if (a.name !== 'master' && b.name === 'master') {
} else if (a.name !== "master" && b.name === "master") {
return 10;
} else if (a.name === 'default' && b.name !== 'default') {
} else if (a.name === "default" && b.name !== "default") {
return -10;
} else if (a.name !== 'default' && b.name === 'default') {
} else if (a.name !== "default" && b.name === "default") {
return 10;
} else if (a.name === 'develop' && b.name !== 'develop') {
} else if (a.name === "develop" && b.name !== "develop") {
return -5;
} else if (a.name !== 'develop' && b.name === 'develop') {
} else if (a.name !== "develop" && b.name === "develop") {
return 5;
} else if (a.name < b.name) {
return -1;