apply eslint and prettier rules

This commit is contained in:
Sebastian Sdorra
2019-10-21 10:57:56 +02:00
parent 85773186db
commit 4bb8e6153b
227 changed files with 1147 additions and 4076 deletions

View File

@@ -11,9 +11,7 @@ describe("GeneralNavLink", () => {
_links: {}
};
const navLink = shallow(
<EditRepoNavLink repository={repository} editUrl="" />
);
const navLink = shallow(<EditRepoNavLink repository={repository} editUrl="" />);
expect(navLink.text()).toBe("");
});
@@ -26,9 +24,7 @@ describe("GeneralNavLink", () => {
}
};
const navLink = mount(
<EditRepoNavLink repository={repository} editUrl="" />
);
const navLink = mount(<EditRepoNavLink repository={repository} editUrl="" />);
expect(navLink.text()).toBe("repositoryRoot.menu.generalNavLink");
});
});

View File

@@ -20,9 +20,7 @@ class EditRepoNavLink extends React.Component<Props> {
if (!this.isEditable()) {
return null;
}
return (
<NavLink to={editUrl} label={t("repositoryRoot.menu.generalNavLink")} />
);
return <NavLink to={editUrl} label={t("repositoryRoot.menu.generalNavLink")} />;
}
}

View File

@@ -10,9 +10,7 @@ describe("PermissionsNavLink", () => {
_links: {}
};
const navLink = shallow(
<PermissionsNavLink repository={repository} permissionUrl="" />
);
const navLink = shallow(<PermissionsNavLink repository={repository} permissionUrl="" />);
expect(navLink.text()).toBe("");
});
@@ -25,9 +23,7 @@ describe("PermissionsNavLink", () => {
}
};
const navLink = mount(
<PermissionsNavLink repository={repository} permissionUrl="" />
);
const navLink = mount(<PermissionsNavLink repository={repository} permissionUrl="" />);
expect(navLink.text()).toBe("repositoryRoot.menu.permissionsNavLink");
});
});

View File

@@ -18,12 +18,7 @@ class PermissionsNavLink extends React.Component<Props> {
return null;
}
const { permissionUrl, t } = this.props;
return (
<NavLink
to={permissionUrl}
label={t("repositoryRoot.menu.permissionsNavLink")}
/>
);
return <NavLink to={permissionUrl} label={t("repositoryRoot.menu.permissionsNavLink")} />;
}
}

View File

@@ -56,9 +56,7 @@ class ChangesetDetails extends React.Component<Props, State> {
const { collapsed } = this.state;
const description = changesets.parseDescription(changeset.description);
const id = (
<ChangesetId repository={repository} changeset={changeset} link={false} />
);
const id = <ChangesetId repository={repository} changeset={changeset} link={false} />;
const date = <DateFromNow date={changeset.date} />;
return (

View File

@@ -1,12 +1,6 @@
import React from "react";
import { translate } from "react-i18next";
import {
Subtitle,
InputField,
Select,
SubmitButton,
Textarea
} from "@scm-manager/ui-components";
import { Subtitle, InputField, Select, SubmitButton, Textarea } from "@scm-manager/ui-components";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
import { Repository, RepositoryType } from "@scm-manager/ui-types";
import * as validator from "./repositoryValidation";
@@ -74,8 +68,7 @@ class RepositoryForm extends React.Component<Props, State> {
this.state.nameValidationError ||
this.state.contactValidationError ||
this.isFalsy(repository.name) ||
(namespaceStrategy === CUSTOM_NAMESPACE_STRATEGY &&
this.isFalsy(repository.namespace))
(namespaceStrategy === CUSTOM_NAMESPACE_STRATEGY && this.isFalsy(repository.namespace))
);
};
@@ -101,11 +94,7 @@ class RepositoryForm extends React.Component<Props, State> {
const disabled = !this.isModifiable() && !this.isCreateMode();
const submitButton = disabled ? null : (
<SubmitButton
disabled={!this.isValid()}
loading={loading}
label={t("repositoryForm.submit")}
/>
<SubmitButton disabled={!this.isValid()} loading={loading} label={t("repositoryForm.submit")} />
);
let subtitle = null;
@@ -167,13 +156,7 @@ class RepositoryForm extends React.Component<Props, State> {
return <InputField {...props} />;
}
return (
<ExtensionPoint
name="repos.create.namespace"
props={props}
renderAll={false}
/>
);
return <ExtensionPoint name="repos.create.namespace" props={props} renderAll={false} />;
};
renderCreateOnlyFields() {

View File

@@ -13,17 +13,7 @@ describe("repository name validation", () => {
});
it("should allow same names as the backend", () => {
const validPaths = [
"scm",
"s",
"sc",
".hiddenrepo",
"b.",
"...",
"..c",
"d..",
"a..c"
];
const validPaths = ["scm", "s", "sc", ".hiddenrepo", "b.", "...", "..c", "d..", "a..c"];
validPaths.forEach(path => expect(validator.isNameValid(path)).toBe(true));
});
@@ -80,9 +70,7 @@ describe("repository name validation", () => {
"scm/plugins/git-plugin"
];
invalidPaths.forEach(path =>
expect(validator.isNameValid(path)).toBe(false)
);
invalidPaths.forEach(path => expect(validator.isNameValid(path)).toBe(false));
});
});
@@ -93,9 +81,7 @@ describe("repository contact validation", () => {
// we don't need rich tests, because they are in validation.test.js
it("should allow real mail addresses", () => {
expect(validator.isContactValid("trici.mcmillian@hitchhiker.com")).toBe(
true
);
expect(validator.isContactValid("trici.mcmillian@hitchhiker.com")).toBe(true);
});
it("should fail on invalid mail addresses", () => {

View File

@@ -15,45 +15,28 @@ class RepositoryEntry extends React.Component<Props> {
renderBranchesLink = (repository: Repository, repositoryLink: string) => {
if (repository._links["branches"]) {
return (
<RepositoryEntryLink
icon="code-branch"
to={repositoryLink + "/branches"}
/>
);
return <RepositoryEntryLink icon="code-branch" to={repositoryLink + "/branches"} />;
}
return null;
};
renderChangesetsLink = (repository: Repository, repositoryLink: string) => {
if (repository._links["changesets"]) {
return (
<RepositoryEntryLink
icon="exchange-alt"
to={repositoryLink + "/changesets"}
/>
);
return <RepositoryEntryLink icon="exchange-alt" to={repositoryLink + "/changesets"} />;
}
return null;
};
renderSourcesLink = (repository: Repository, repositoryLink: string) => {
if (repository._links["sources"]) {
return (
<RepositoryEntryLink icon="code" to={repositoryLink + "/sources"} />
);
return <RepositoryEntryLink icon="code" to={repositoryLink + "/sources"} />;
}
return null;
};
renderModifyLink = (repository: Repository, repositoryLink: string) => {
if (repository._links["update"]) {
return (
<RepositoryEntryLink
icon="cog"
to={repositoryLink + "/settings/general"}
/>
);
return <RepositoryEntryLink icon="cog" to={repositoryLink + "/settings/general"} />;
}
return null;
};

View File

@@ -53,11 +53,7 @@ it("should group the repositories by their namespace", () => {
const expected = [
{
name: "hitchhiker",
repositories: [
hitchhikerHeartOfGold,
hitchhikerPuzzle42,
hitchhikerRestand
]
repositories: [hitchhikerHeartOfGold, hitchhikerPuzzle42, hitchhikerRestand]
},
{
name: "slarti",

View File

@@ -1,10 +1,8 @@
import { Repository, RepositoryGroup } from "@scm-manager/ui-types";
export default function groupByNamespace(
repositories: Repository[]
): RepositoryGroup[] {
let groups = {};
for (let repository of repositories) {
export default function groupByNamespace(repositories: Repository[]): RepositoryGroup[] {
const groups = {};
for (const repository of repositories) {
const groupName = repository.namespace;
let group = groups[groupName];
@@ -18,8 +16,8 @@ export default function groupByNamespace(
group.repositories.push(repository);
}
let groupArray = [];
for (let groupName in groups) {
const groupArray = [];
for (const groupName in groups) {
const group = groups[groupName];
group.repositories.sort(sortByName);
groupArray.push(groups[groupName]);