diff --git a/scm-ui/eslint-config/index.js b/scm-ui/eslint-config/index.js index bd124931cf..fb3b20e8f8 100644 --- a/scm-ui/eslint-config/index.js +++ b/scm-ui/eslint-config/index.js @@ -1,28 +1,28 @@ module.exports = { - "extends": [ + extends: [ "react-app", "plugin:prettier/recommended", "plugin:flowtype/recommended" ], - "rules": { - "semi": ["error", "always"], - "quotes": ["error", "double"], + rules: { + semi: ["error", "always"], + quotes: ["error", "double"], "jsx-a11y/href-no-hash": [0], "flowtype/no-types-missing-file-annotation": 2, "no-console": "error" }, - "overrides": [ + overrides: [ { files: ["*.ts", "*.tsx"], parser: "@typescript-eslint/parser", - "extends": [ + extends: [ "react-app", "plugin:prettier/recommended", "plugin:@typescript-eslint/recommended" ], - "rules": { - "semi": ["error", "always"], - "quotes": ["error", "double"], + rules: { + semi: ["error", "always"], + quotes: ["error", "double"], "jsx-a11y/href-no-hash": [0], "@typescript-eslint/explicit-function-return-type": "off", "no-console": "error" diff --git a/scm-ui/ui-components/src/Autocomplete.tsx b/scm-ui/ui-components/src/Autocomplete.tsx index 47f5697171..7618464b57 100644 --- a/scm-ui/ui-components/src/Autocomplete.tsx +++ b/scm-ui/ui-components/src/Autocomplete.tsx @@ -25,10 +25,7 @@ class Autocomplete extends React.Component { noOptionsMessage: "No suggestion available" }; - handleInputChange = ( - newValue: ValueType, - action: ActionMeta - ) => { + handleInputChange = (newValue: ValueType, action: ActionMeta) => { this.selectValue(newValue as SelectValue); }; @@ -42,9 +39,7 @@ class Autocomplete extends React.Component { selectValue: ValueType, selectOptions: readonly SelectValue[] ): boolean => { - const isNotDuplicated = !selectOptions - .map(option => option.label) - .includes(inputValue); + const isNotDuplicated = !selectOptions.map(option => option.label).includes(inputValue); const isNotEmpty = inputValue !== ""; return isNotEmpty && isNotDuplicated; }; diff --git a/scm-ui/ui-components/src/BranchSelector.tsx b/scm-ui/ui-components/src/BranchSelector.tsx index 4f93c0bbb2..970417fc3c 100644 --- a/scm-ui/ui-components/src/BranchSelector.tsx +++ b/scm-ui/ui-components/src/BranchSelector.tsx @@ -38,9 +38,7 @@ export default class BranchSelector extends React.Component { componentDidMount() { const { branches } = this.props; if (branches) { - const selectedBranch = branches.find( - branch => branch.name === this.props.selectedBranch - ); + const selectedBranch = branches.find(branch => branch.name === this.props.selectedBranch); this.setState({ selectedBranch }); @@ -53,9 +51,7 @@ export default class BranchSelector extends React.Component { if (branches) { return (
- +
@@ -66,11 +62,7 @@ export default class BranchSelector extends React.Component { options={branches.map(b => b.name)} optionSelected={this.branchSelected} disabled={!!disabled} - preselectedOption={ - this.state.selectedBranch - ? this.state.selectedBranch.name - : "" - } + preselectedOption={this.state.selectedBranch ? this.state.selectedBranch.name : ""} /> diff --git a/scm-ui/ui-components/src/Breadcrumb.tsx b/scm-ui/ui-components/src/Breadcrumb.tsx index 56379b4f5e..3afdf6d2dc 100644 --- a/scm-ui/ui-components/src/Breadcrumb.tsx +++ b/scm-ui/ui-components/src/Breadcrumb.tsx @@ -62,32 +62,16 @@ class Breadcrumb extends React.Component { } render() { - const { - baseUrl, - branch, - defaultBranch, - branches, - revision, - path, - repository, - t - } = this.props; + const { baseUrl, branch, defaultBranch, branches, revision, path, repository, t } = this.props; return ( <>
- +
  • - +
    • {this.renderPath()} @@ -101,11 +85,7 @@ class Breadcrumb extends React.Component { baseUrl, branch: branch ? branch : defaultBranch, path, - isBranchUrl: - branches && - branches.filter( - b => b.name.replace("/", "%2F") === revision - ).length > 0, + isBranchUrl: branches && branches.filter(b => b.name.replace("/", "%2F") === revision).length > 0, repository }} renderAll={true} diff --git a/scm-ui/ui-components/src/CardColumn.tsx b/scm-ui/ui-components/src/CardColumn.tsx index a48e6b9a23..fd84b9b11e 100644 --- a/scm-ui/ui-components/src/CardColumn.tsx +++ b/scm-ui/ui-components/src/CardColumn.tsx @@ -66,24 +66,14 @@ export default class CardColumn extends React.Component { }; render() { - const { - avatar, - title, - description, - contentRight, - footerLeft, - footerRight, - className - } = this.props; + const { avatar, title, description, contentRight, footerLeft, footerRight, className } = this.props; const link = this.createLink(); return ( <> {link} {avatar} - +

    @@ -95,9 +85,7 @@ export default class CardColumn extends React.Component {

    {footerLeft}
    -
    - {footerRight} -
    +
    {footerRight}
         diff --git a/scm-ui/ui-components/src/CardColumnGroup.tsx b/scm-ui/ui-components/src/CardColumnGroup.tsx index 0c2c319f9c..2a2596e914 100644 --- a/scm-ui/ui-components/src/CardColumnGroup.tsx +++ b/scm-ui/ui-components/src/CardColumnGroup.tsx @@ -56,16 +56,7 @@ export default class CardColumnGroup extends React.Component { const fullColumnWidth = this.isFullSize(elements, index); const sizeClass = fullColumnWidth ? "is-full" : "is-half"; return ( -
    +
    {entry}
    ); @@ -74,17 +65,12 @@ export default class CardColumnGroup extends React.Component { return (

    - + {name}

    - - {content} - + {content}
    ); diff --git a/scm-ui/ui-components/src/DateFromNow.tsx b/scm-ui/ui-components/src/DateFromNow.tsx index 3ecb07c63e..cdbf5adb10 100644 --- a/scm-ui/ui-components/src/DateFromNow.tsx +++ b/scm-ui/ui-components/src/DateFromNow.tsx @@ -5,7 +5,7 @@ import { enUS, de, es } from "date-fns/locale"; import styled from "styled-components"; type LocaleMap = { - [key: string]: Locale + [key: string]: Locale; }; type DateInput = Date | string; @@ -67,7 +67,7 @@ class DateFromNow extends React.Component { return value as Date; } return parseISO(value); - } + }; getBaseDate = () => { const { baseDate } = this.props; diff --git a/scm-ui/ui-components/src/ErrorNotification.tsx b/scm-ui/ui-components/src/ErrorNotification.tsx index 2e51459278..23f9f57485 100644 --- a/scm-ui/ui-components/src/ErrorNotification.tsx +++ b/scm-ui/ui-components/src/ErrorNotification.tsx @@ -18,18 +18,14 @@ class ErrorNotification extends React.Component { } else if (error instanceof UnauthorizedError) { return ( - {t("errorNotification.prefix")}:{" "} - {t("errorNotification.timeout")}{" "} - - {t("errorNotification.loginLink")} - + {t("errorNotification.prefix")}: {t("errorNotification.timeout")}{" "} + {t("errorNotification.loginLink")} ); } else if (error instanceof ForbiddenError) { return ( - {t("errorNotification.prefix")}:{" "} - {t("errorNotification.forbidden")} + {t("errorNotification.prefix")}: {t("errorNotification.forbidden")} ); } else { diff --git a/scm-ui/ui-components/src/Help.tsx b/scm-ui/ui-components/src/Help.tsx index ce3e9c85ae..16567afb9d 100644 --- a/scm-ui/ui-components/src/Help.tsx +++ b/scm-ui/ui-components/src/Help.tsx @@ -18,10 +18,7 @@ export default class Help extends React.Component { render() { const { message, className } = this.props; return ( - + ); diff --git a/scm-ui/ui-components/src/HelpIcon.tsx b/scm-ui/ui-components/src/HelpIcon.tsx index 33661d2d31..d5c9ca7f84 100644 --- a/scm-ui/ui-components/src/HelpIcon.tsx +++ b/scm-ui/ui-components/src/HelpIcon.tsx @@ -8,8 +8,6 @@ type Props = { export default class HelpIcon extends React.Component { render() { const { className } = this.props; - return ( - - ); + return ; } } diff --git a/scm-ui/ui-components/src/Icon.tsx b/scm-ui/ui-components/src/Icon.tsx index 8db0000b54..800f270c90 100644 --- a/scm-ui/ui-components/src/Icon.tsx +++ b/scm-ui/ui-components/src/Icon.tsx @@ -16,28 +16,8 @@ export default class Icon extends React.Component { render() { const { title, name, color, className } = this.props; if (title) { - return ( - - ); + return ; } - return ( - - ); + return ; } } diff --git a/scm-ui/ui-components/src/LinkPaginator.tsx b/scm-ui/ui-components/src/LinkPaginator.tsx index 5c1bd15aff..fc736785d9 100644 --- a/scm-ui/ui-components/src/LinkPaginator.tsx +++ b/scm-ui/ui-components/src/LinkPaginator.tsx @@ -22,14 +22,7 @@ class LinkPaginator extends React.Component { } renderFirstButton() { - return ( - diff --git a/scm-ui/ui-components/src/buttons/ButtonAddons.tsx b/scm-ui/ui-components/src/buttons/ButtonAddons.tsx index b29264269f..d5047e23b6 100644 --- a/scm-ui/ui-components/src/buttons/ButtonAddons.tsx +++ b/scm-ui/ui-components/src/buttons/ButtonAddons.tsx @@ -28,11 +28,7 @@ class ButtonAddons extends React.Component { } }); - return ( - - {childWrapper} - - ); + return {childWrapper}; } } diff --git a/scm-ui/ui-components/src/buttons/ButtonGroup.tsx b/scm-ui/ui-components/src/buttons/ButtonGroup.tsx index 01850b5af3..bcd5ef9e02 100644 --- a/scm-ui/ui-components/src/buttons/ButtonGroup.tsx +++ b/scm-ui/ui-components/src/buttons/ButtonGroup.tsx @@ -21,11 +21,7 @@ class ButtonGroup extends React.Component { } }); - return ( -
    - {childWrapper} -
    - ); + return
    {childWrapper}
    ; } } diff --git a/scm-ui/ui-components/src/buttons/DownloadButton.tsx b/scm-ui/ui-components/src/buttons/DownloadButton.tsx index 7ac4b3374f..0e63d34073 100644 --- a/scm-ui/ui-components/src/buttons/DownloadButton.tsx +++ b/scm-ui/ui-components/src/buttons/DownloadButton.tsx @@ -18,12 +18,7 @@ class DownloadButton extends React.Component { because jsx a does not the custom disabled attribute but bulma does. // @ts-ignore */} - + diff --git a/scm-ui/ui-components/src/buttons/index.stories.tsx b/scm-ui/ui-components/src/buttons/index.stories.tsx index 4cacd4fa92..92faf3fe89 100644 --- a/scm-ui/ui-components/src/buttons/index.stories.tsx +++ b/scm-ui/ui-components/src/buttons/index.stories.tsx @@ -11,27 +11,13 @@ import EditButton from "./EditButton"; import SubmitButton from "./SubmitButton"; import { ReactElement } from "react"; -const colors = [ - "primary", - "link", - "info", - "success", - "warning", - "danger", - "white", - "light", - "dark", - "black", - "text" -]; +const colors = ["primary", "link", "info", "success", "warning", "danger", "white", "light", "dark", "black", "text"]; const Spacing = styled.div` padding: 1em; `; -const RoutingDecorator = story => ( - {story()} -); +const RoutingDecorator = story => {story()}; const SpacingDecorator = story => {story()}; @@ -65,17 +51,7 @@ buttonStory("AddButton", () => Add); buttonStory("CreateButton", () => Create); buttonStory("DeleteButton", () => Delete); buttonStory("DownloadButton", () => ( - -)).add("Disabled", () => ( - -)); + +)).add("Disabled", () => ); buttonStory("EditButton", () => Edit); buttonStory("SubmitButton", () => Submit); diff --git a/scm-ui/ui-components/src/buttons/index.ts b/scm-ui/ui-components/src/buttons/index.ts index 885145a0ad..c5d536133f 100644 --- a/scm-ui/ui-components/src/buttons/index.ts +++ b/scm-ui/ui-components/src/buttons/index.ts @@ -9,6 +9,4 @@ export { default as SubmitButton } from "./SubmitButton"; export { default as DownloadButton } from "./DownloadButton"; export { default as ButtonGroup } from "./ButtonGroup"; export { default as ButtonAddons } from "./ButtonAddons"; -export { - default as RemoveEntryOfTableButton -} from "./RemoveEntryOfTableButton"; +export { default as RemoveEntryOfTableButton } from "./RemoveEntryOfTableButton"; diff --git a/scm-ui/ui-components/src/config/Configuration.tsx b/scm-ui/ui-components/src/config/Configuration.tsx index 6c6ccec6f9..02f86f7b84 100644 --- a/scm-ui/ui-components/src/config/Configuration.tsx +++ b/scm-ui/ui-components/src/config/Configuration.tsx @@ -123,20 +123,16 @@ class Configuration extends React.Component { const modificationUrl = this.getModificationUrl(); if (modificationUrl) { - apiClient - .put( - modificationUrl, - modifiedConfiguration, - this.getContentType() - ) - .then(() => - this.setState({ - modifying: false, - configChanged: true, - valid: false - }) - ) - .catch(this.handleError); + apiClient + .put(modificationUrl, modifiedConfiguration, this.getContentType()) + .then(() => + this.setState({ + modifying: false, + configChanged: true, + valid: false + }) + ) + .catch(this.handleError); } else { this.setState({ error: new Error("no modification link available") @@ -186,11 +182,7 @@ class Configuration extends React.Component {
    {this.props.render(renderProps)}
    - + ); diff --git a/scm-ui/ui-components/src/config/ConfigurationBinder.tsx b/scm-ui/ui-components/src/config/ConfigurationBinder.tsx index a207175ad1..2ce5eee2f1 100644 --- a/scm-ui/ui-components/src/config/ConfigurationBinder.tsx +++ b/scm-ui/ui-components/src/config/ConfigurationBinder.tsx @@ -16,7 +16,7 @@ type RepositoryRouteProps = { }; class ConfigurationBinder { - i18nNamespace: string = "plugins"; + i18nNamespace = "plugins"; navLink(to: string, labelI18nKey: string, t: any) { return ; @@ -26,12 +26,7 @@ class ConfigurationBinder { return Component} exact />; } - bindGlobal( - to: string, - labelI18nKey: string, - linkName: string, - ConfigurationComponent: any - ) { + bindGlobal(to: string, labelI18nKey: string, linkName: string, ConfigurationComponent: any) { // create predicate based on the link name of the index resource // if the linkname is not available, the navigation link and the route are not bound to the extension points const configPredicate = (props: any) => { @@ -47,19 +42,12 @@ class ConfigurationBinder { binder.bind("admin.setting", ConfigNavLink, configPredicate); // route for global configuration, passes the link from the index resource to component - const ConfigRoute = ({ - url, - links, - ...additionalProps - }: GlobalRouteProps) => { + const ConfigRoute = ({ url, links, ...additionalProps }: GlobalRouteProps) => { const link = links[linkName]; if (link) { return this.route( url + "/settings" + to, - + ); } }; @@ -68,20 +56,11 @@ class ConfigurationBinder { binder.bind("admin.route", ConfigRoute, configPredicate); } - bindRepository( - to: string, - labelI18nKey: string, - linkName: string, - RepositoryComponent: any - ) { + bindRepository(to: string, labelI18nKey: string, linkName: string, RepositoryComponent: any) { // create predicate based on the link name of the current repository route // if the linkname is not available, the navigation link and the route are not bound to the extension points const repoPredicate = (props: any) => { - return ( - props.repository && - props.repository._links && - props.repository._links[linkName] - ); + return props.repository && props.repository._links && props.repository._links[linkName]; }; // create NavigationLink with translated label @@ -93,20 +72,12 @@ class ConfigurationBinder { binder.bind("repository.navigation", RepoNavLink, repoPredicate); // route for global configuration, passes the current repository to component - const RepoRoute = ({ - url, - repository, - ...additionalProps - }: RepositoryRouteProps) => { + const RepoRoute = ({ url, repository, ...additionalProps }: RepositoryRouteProps) => { const link = repository._links[linkName]; if (link) { return this.route( url + to, - + ); } }; @@ -115,20 +86,11 @@ class ConfigurationBinder { binder.bind("repository.route", RepoRoute, repoPredicate); } - bindRepositorySetting( - to: string, - labelI18nKey: string, - linkName: string, - RepositoryComponent: any - ) { + bindRepositorySetting(to: string, labelI18nKey: string, linkName: string, RepositoryComponent: any) { // create predicate based on the link name of the current repository route // if the linkname is not available, the navigation link and the route are not bound to the extension points const repoPredicate = (props: any) => { - return ( - props.repository && - props.repository._links && - props.repository._links[linkName] - ); + return props.repository && props.repository._links && props.repository._links[linkName]; }; // create NavigationLink with translated label @@ -140,20 +102,12 @@ class ConfigurationBinder { binder.bind("repository.setting", RepoNavLink, repoPredicate); // route for global configuration, passes the current repository to component - const RepoRoute = ({ - url, - repository, - ...additionalProps - }: RepositoryRouteProps) => { + const RepoRoute = ({ url, repository, ...additionalProps }: RepositoryRouteProps) => { const link = repository._links[linkName]; if (link) { return this.route( url + "/settings" + to, - + ); } }; diff --git a/scm-ui/ui-components/src/errors.test.ts b/scm-ui/ui-components/src/errors.test.ts index c2e852927f..cb06a0bc52 100644 --- a/scm-ui/ui-components/src/errors.test.ts +++ b/scm-ui/ui-components/src/errors.test.ts @@ -1,9 +1,4 @@ -import { - BackendError, - UnauthorizedError, - createBackendError, - NotFoundError -} from "./errors"; +import { BackendError, UnauthorizedError, createBackendError, NotFoundError } from "./errors"; describe("test createBackendError", () => { const earthNotFoundError = { diff --git a/scm-ui/ui-components/src/errors.ts b/scm-ui/ui-components/src/errors.ts index 88367e9392..5171fe07b4 100644 --- a/scm-ui/ui-components/src/errors.ts +++ b/scm-ui/ui-components/src/errors.ts @@ -64,10 +64,7 @@ export class ConflictError extends BackendError { } } -export function createBackendError( - content: BackendErrorContent, - statusCode: number -) { +export function createBackendError(content: BackendErrorContent, statusCode: number) { switch (statusCode) { case 404: return new NotFoundError(content, statusCode); @@ -79,8 +76,5 @@ export function createBackendError( } export function isBackendError(response: Response) { - return ( - response.headers.get("Content-Type") === - "application/vnd.scmm-error+json;v=2" - ); + return response.headers.get("Content-Type") === "application/vnd.scmm-error+json;v=2"; } diff --git a/scm-ui/ui-components/src/forms/AddEntryToTableField.tsx b/scm-ui/ui-components/src/forms/AddEntryToTableField.tsx index cc24537dd8..536bf772a2 100644 --- a/scm-ui/ui-components/src/forms/AddEntryToTableField.tsx +++ b/scm-ui/ui-components/src/forms/AddEntryToTableField.tsx @@ -27,11 +27,7 @@ class AddEntryToTableField extends React.Component { isValid = () => { const { validateEntry } = this.props; - if ( - !this.state.entryToAdd || - this.state.entryToAdd === "" || - !validateEntry - ) { + if (!this.state.entryToAdd || this.state.entryToAdd === "" || !validateEntry) { return true; } else { return validateEntry(this.state.entryToAdd); @@ -39,13 +35,7 @@ class AddEntryToTableField extends React.Component { }; render() { - const { - disabled, - buttonLabel, - fieldLabel, - errorMessage, - helpText - } = this.props; + const { disabled, buttonLabel, fieldLabel, errorMessage, helpText } = this.props; return (
    { creatable={true} /> - +
    ); } diff --git a/scm-ui/ui-components/src/forms/DropDown.tsx b/scm-ui/ui-components/src/forms/DropDown.tsx index e471a4b20d..9ffd227583 100644 --- a/scm-ui/ui-components/src/forms/DropDown.tsx +++ b/scm-ui/ui-components/src/forms/DropDown.tsx @@ -12,33 +12,14 @@ type Props = { class DropDown extends React.Component { render() { - const { - options, - optionValues, - preselectedOption, - className, - disabled - } = this.props; + const { options, optionValues, preselectedOption, className, disabled } = this.props; return ( -
    - ); diff --git a/scm-ui/ui-components/src/forms/InputField.tsx b/scm-ui/ui-components/src/forms/InputField.tsx index b7f9568c46..5fbfc91ef2 100644 --- a/scm-ui/ui-components/src/forms/InputField.tsx +++ b/scm-ui/ui-components/src/forms/InputField.tsx @@ -47,22 +47,9 @@ class InputField extends React.Component { }; render() { - const { - type, - placeholder, - value, - validationError, - errorMessage, - disabled, - label, - helpText - } = this.props; + const { type, placeholder, value, validationError, errorMessage, disabled, label, helpText } = this.props; const errorView = validationError ? "is-danger" : ""; - const helper = validationError ? ( -

    {errorMessage}

    - ) : ( - "" - ); + const helper = validationError ?

    {errorMessage}

    : ""; return (
    diff --git a/scm-ui/ui-components/src/forms/PasswordConfirmation.tsx b/scm-ui/ui-components/src/forms/PasswordConfirmation.tsx index e8a8d8f7a5..321d7f942f 100644 --- a/scm-ui/ui-components/src/forms/PasswordConfirmation.tsx +++ b/scm-ui/ui-components/src/forms/PasswordConfirmation.tsx @@ -85,8 +85,7 @@ class PasswordConfirmation extends React.Component { }; handlePasswordChange = (password: string) => { - const passwordConfirmationFailed = - password !== this.state.confirmedPassword; + const passwordConfirmationFailed = password !== this.state.confirmedPassword; this.setState( { diff --git a/scm-ui/ui-components/src/forms/TagGroup.tsx b/scm-ui/ui-components/src/forms/TagGroup.tsx index dcf2123f93..9e21c25251 100644 --- a/scm-ui/ui-components/src/forms/TagGroup.tsx +++ b/scm-ui/ui-components/src/forms/TagGroup.tsx @@ -33,11 +33,7 @@ export default class TagGroup extends React.Component { return (
    - this.removeEntry(item)} - /> + this.removeEntry(item)} />
    ); diff --git a/scm-ui/ui-components/src/forms/index.ts b/scm-ui/ui-components/src/forms/index.ts index 73255c39a1..7050f53f86 100644 --- a/scm-ui/ui-components/src/forms/index.ts +++ b/scm-ui/ui-components/src/forms/index.ts @@ -1,9 +1,7 @@ // @create-index export { default as AddEntryToTableField } from "./AddEntryToTableField"; -export { - default as AutocompleteAddEntryToTableField -} from "./AutocompleteAddEntryToTableField"; +export { default as AutocompleteAddEntryToTableField } from "./AutocompleteAddEntryToTableField"; export { default as TagGroup } from "./TagGroup"; export { default as MemberNameTagGroup } from "./MemberNameTagGroup"; export { default as Checkbox } from "./Checkbox"; diff --git a/scm-ui/ui-components/src/index.ts b/scm-ui/ui-components/src/index.ts index 4f442e14e7..f5c7f62418 100644 --- a/scm-ui/ui-components/src/index.ts +++ b/scm-ui/ui-components/src/index.ts @@ -4,6 +4,19 @@ import * as validation from "./validation"; import * as urls from "./urls"; import * as repositories from "./repositories"; +// not sure if it is required +import { + File, + FileChangeType, + Hunk, + Change, + BaseContext, + AnnotationFactory, + AnnotationFactoryContext, + DiffEventHandler, + DiffEventContext +} from "./repos"; + export { validation, urls, repositories }; export { default as DateFromNow } from "./DateFromNow"; @@ -51,19 +64,6 @@ export * from "./modals"; export * from "./navigation"; export * from "./repos"; -// not sure if it is required -import { - File, - FileChangeType, - Hunk, - Change, - BaseContext, - AnnotationFactory, - AnnotationFactoryContext, - DiffEventHandler, - DiffEventContext -} from "./repos"; - export { File, FileChangeType, diff --git a/scm-ui/ui-components/src/layout/Page.tsx b/scm-ui/ui-components/src/layout/Page.tsx index e2193a4936..472acc0410 100644 --- a/scm-ui/ui-components/src/layout/Page.tsx +++ b/scm-ui/ui-components/src/layout/Page.tsx @@ -45,8 +45,7 @@ export default class Page extends React.Component { isPageAction(node: any) { return ( - node.displayName === PageActions.displayName || - (node.type && node.type.displayName === PageActions.displayName) + node.displayName === PageActions.displayName || (node.type && node.type.displayName === PageActions.displayName) ); } @@ -60,12 +59,7 @@ export default class Page extends React.Component { if (this.isPageAction(child)) { pageActions = ( {child} @@ -74,9 +68,7 @@ export default class Page extends React.Component { } } }); - let underline = pageActionsExists ? ( -
    - ) : null; + const underline = pageActionsExists ?
    : null; return ( <> @@ -102,7 +94,7 @@ export default class Page extends React.Component { return ; } - let content: ReactNode[] = []; + const content: ReactNode[] = []; React.Children.forEach(children, child => { if (child) { if (!this.isPageAction(child)) { diff --git a/scm-ui/ui-components/src/modals/ConfirmAlert.tsx b/scm-ui/ui-components/src/modals/ConfirmAlert.tsx index 68b527e027..544ac9e8b0 100644 --- a/scm-ui/ui-components/src/modals/ConfirmAlert.tsx +++ b/scm-ui/ui-components/src/modals/ConfirmAlert.tsx @@ -37,11 +37,7 @@ class ConfirmAlert extends React.Component {     ); - return ( - this.close()} - body={body} - active={true} - footer={footer} - /> - ); + return this.close()} body={body} active={true} footer={footer} />; } } diff --git a/scm-ui/ui-components/src/modals/Modal.tsx b/scm-ui/ui-components/src/modals/Modal.tsx index 334e33de5b..52a73773ba 100644 --- a/scm-ui/ui-components/src/modals/Modal.tsx +++ b/scm-ui/ui-components/src/modals/Modal.tsx @@ -17,15 +17,7 @@ class Modal extends React.Component { }; render() { - const { - title, - closeFunction, - body, - footer, - active, - className, - headColor - } = this.props; + const { title, closeFunction, body, footer, active, className, headColor } = this.props; const isActive = active ? "is-active" : null; @@ -38,18 +30,9 @@ class Modal extends React.Component {
    -
    +

    {title}

    -
    {body}
    {showFooter} diff --git a/scm-ui/ui-components/src/navigation/NavLink.tsx b/scm-ui/ui-components/src/navigation/NavLink.tsx index 5db892077c..f87351d496 100644 --- a/scm-ui/ui-components/src/navigation/NavLink.tsx +++ b/scm-ui/ui-components/src/navigation/NavLink.tsx @@ -47,9 +47,7 @@ class NavLink extends React.Component { render() { const { to, activeOnlyWhenExact } = this.props; - return ( - - ); + return ; } } diff --git a/scm-ui/ui-components/src/navigation/PrimaryNavigation.tsx b/scm-ui/ui-components/src/navigation/PrimaryNavigation.tsx index ea8a969a2e..76c0c27030 100644 --- a/scm-ui/ui-components/src/navigation/PrimaryNavigation.tsx +++ b/scm-ui/ui-components/src/navigation/PrimaryNavigation.tsx @@ -1,4 +1,4 @@ -import React, {ReactNode} from "react"; +import React, { ReactNode } from "react"; import { translate } from "react-i18next"; import PrimaryNavigationLink from "./PrimaryNavigationLink"; import { Links } from "@scm-manager/ui-types"; @@ -18,14 +18,7 @@ class PrimaryNavigation extends React.Component { return (to: string, match: string, label: string, linkName: string) => { const link = links[linkName]; if (link) { - const navigationItem = ( - - ); + const navigationItem = ; navigationItems.push(navigationItem); } }; @@ -41,11 +34,7 @@ class PrimaryNavigation extends React.Component { if (binder.hasExtension("primary-navigation.logout", props)) { navigationItems.push( - + ); } else { append("/logout", "/logout", "primary-navigation.logout", "logout"); @@ -64,26 +53,12 @@ class PrimaryNavigation extends React.Component { const append = this.createNavigationAppender(navigationItems); if (binder.hasExtension("primary-navigation.first-menu", props)) { navigationItems.push( - + ); } - append( - "/repos/", - "/(repo|repos)", - "primary-navigation.repositories", - "repositories" - ); + append("/repos/", "/(repo|repos)", "primary-navigation.repositories", "repositories"); append("/users/", "/(user|users)", "primary-navigation.users", "users"); - append( - "/groups/", - "/(group|groups)", - "primary-navigation.groups", - "groups" - ); + append("/groups/", "/(group|groups)", "primary-navigation.groups", "groups"); append("/admin", "/admin", "primary-navigation.admin", "config"); navigationItems.push( diff --git a/scm-ui/ui-components/src/navigation/PrimaryNavigationLink.tsx b/scm-ui/ui-components/src/navigation/PrimaryNavigationLink.tsx index 8bb1fcd5ba..de538f30d2 100644 --- a/scm-ui/ui-components/src/navigation/PrimaryNavigationLink.tsx +++ b/scm-ui/ui-components/src/navigation/PrimaryNavigationLink.tsx @@ -21,13 +21,7 @@ class PrimaryNavigationLink extends React.Component { render() { const { to, match, activeOnlyWhenExact } = this.props; const path = match ? match : to; - return ( - - ); + return ; } } diff --git a/scm-ui/ui-components/src/navigation/SubNavigation.tsx b/scm-ui/ui-components/src/navigation/SubNavigation.tsx index 8477253cff..258658561a 100644 --- a/scm-ui/ui-components/src/navigation/SubNavigation.tsx +++ b/scm-ui/ui-components/src/navigation/SubNavigation.tsx @@ -48,17 +48,11 @@ class SubNavigation extends React.Component { const { to, activeOnlyWhenExact } = this.props; // removes last part of url - let parents = to.split("/"); + const parents = to.split("/"); parents.splice(-1, 1); - let parent = parents.join("/"); + const parent = parents.join("/"); - return ( - - ); + return ; } } diff --git a/scm-ui/ui-components/src/repos/DiffFile.tsx b/scm-ui/ui-components/src/repos/DiffFile.tsx index e33a3fe89f..bbd65ed0b6 100644 --- a/scm-ui/ui-components/src/repos/DiffFile.tsx +++ b/scm-ui/ui-components/src/repos/DiffFile.tsx @@ -2,12 +2,7 @@ import React from "react"; import { translate, InjectedTranslateProps } from "react-i18next"; import classNames from "classnames"; import styled from "styled-components"; -import { - Change, - Diff as DiffComponent, - getChangeKey, - Hunk -} from "react-diff-view"; +import { Change, Diff as DiffComponent, getChangeKey, Hunk } from "react-diff-view"; import { Button, ButtonGroup } from "../buttons"; import Tag from "../Tag"; import Icon from "../Icon"; @@ -183,14 +178,10 @@ class DiffFile extends React.Component { }; renderFileTitle = (file: File) => { - if ( - file.oldPath !== file.newPath && - (file.type === "copy" || file.type === "rename") - ) { + if (file.oldPath !== file.newPath && (file.type === "copy" || file.type === "rename")) { return ( <> - {file.oldPath} {" "} - {file.newPath} + {file.oldPath} {file.newPath} ); } else if (file.type === "delete") { @@ -200,10 +191,7 @@ class DiffFile extends React.Component { }; hoverFileTitle = (file: File): string => { - if ( - file.oldPath !== file.newPath && - (file.type === "copy" || file.type === "rename") - ) { + if (file.oldPath !== file.newPath && (file.type === "copy" || file.type === "rename")) { return `${file.oldPath} > ${file.newPath}`; } else if (file.type === "delete") { return file.oldPath; @@ -222,19 +210,9 @@ class DiffFile extends React.Component { value = file.type; } const color = - value === "added" - ? "success is-outlined" - : value === "deleted" - ? "danger is-outlined" - : "info is-outlined"; + value === "added" ? "success is-outlined" : value === "deleted" ? "danger is-outlined" : "info is-outlined"; - return ( - - ); + return ; }; render() { @@ -245,9 +223,7 @@ class DiffFile extends React.Component { let body = null; let icon = "angle-right"; if (!collapsed) { - const fileAnnotations = fileAnnotationFactory - ? fileAnnotationFactory(file) - : null; + const fileAnnotations = fileAnnotationFactory ? fileAnnotationFactory(file) : null; icon = "angle-down"; body = (
    @@ -258,32 +234,20 @@ class DiffFile extends React.Component {
    ); } - const collapseIcon = - file && !file.isBinary ? : null; + const collapseIcon = file && !file.isBinary ? : null; - const fileControls = fileControlFactory - ? fileControlFactory(file, this.setCollapse) - : null; + const fileControls = fileControlFactory ? fileControlFactory(file, this.setCollapse) : null; return ( - +
    {collapseIcon} - + {this.renderFileTitle(file)} {this.renderChangeTag(file)} diff --git a/scm-ui/ui-components/src/repos/DiffTypes.ts b/scm-ui/ui-components/src/repos/DiffTypes.ts index 7cbfda58f3..82325dce08 100644 --- a/scm-ui/ui-components/src/repos/DiffTypes.ts +++ b/scm-ui/ui-components/src/repos/DiffTypes.ts @@ -63,10 +63,7 @@ export type DiffEventContext = BaseContext & { export type DiffEventHandler = (context: DiffEventContext) => void; -export type FileControlFactory = ( - file: File, - setCollapseState: (p: boolean) => void -) => ReactNode | null | undefined; +export type FileControlFactory = (file: File, setCollapseState: (p: boolean) => void) => ReactNode | null | undefined; export type DiffObjectProps = { sideBySide: boolean; diff --git a/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx b/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx index a09ac88d14..6f607351d2 100644 --- a/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx +++ b/scm-ui/ui-components/src/repos/changesets/ChangesetAuthor.tsx @@ -27,10 +27,7 @@ class ChangesetAuthor extends React.Component { renderWithMail(name: string, mail: string) { const { t } = this.props; return ( - + {name} ); diff --git a/scm-ui/ui-components/src/repos/changesets/ChangesetButtonGroup.tsx b/scm-ui/ui-components/src/repos/changesets/ChangesetButtonGroup.tsx index 5b5cb67c4c..674f59db69 100644 --- a/scm-ui/ui-components/src/repos/changesets/ChangesetButtonGroup.tsx +++ b/scm-ui/ui-components/src/repos/changesets/ChangesetButtonGroup.tsx @@ -19,18 +19,8 @@ class ChangesetButtonGroup extends React.Component { const sourcesLink = createSourcesLink(repository, changeset); return ( -
    - + { const message = tags.map(tag => tag.name).join(", "); return ( - + ); } diff --git a/scm-ui/ui-components/src/repos/changesets/changesets.ts b/scm-ui/ui-components/src/repos/changesets/changesets.ts index 61cafcc536..1ffc2b5db6 100644 --- a/scm-ui/ui-components/src/repos/changesets/changesets.ts +++ b/scm-ui/ui-components/src/repos/changesets/changesets.ts @@ -5,17 +5,11 @@ export type Description = { message: string; }; -export function createChangesetLink( - repository: Repository, - changeset: Changeset -) { +export function createChangesetLink(repository: Repository, changeset: Changeset) { return `/repo/${repository.namespace}/${repository.name}/changeset/${changeset.id}`; } -export function createSourcesLink( - repository: Repository, - changeset: Changeset -) { +export function createSourcesLink(repository: Repository, changeset: Changeset) { return `/repo/${repository.namespace}/${repository.name}/sources/${changeset.id}`; } diff --git a/scm-ui/ui-components/src/repos/diffs.test.ts b/scm-ui/ui-components/src/repos/diffs.test.ts index ac6cd413d1..5819b1fa04 100644 --- a/scm-ui/ui-components/src/repos/diffs.test.ts +++ b/scm-ui/ui-components/src/repos/diffs.test.ts @@ -1,16 +1,8 @@ import { File, FileChangeType, Hunk } from "./DiffTypes"; -import { - getPath, - createHunkIdentifier, - createHunkIdentifierFromContext -} from "./diffs"; +import { getPath, createHunkIdentifier, createHunkIdentifierFromContext } from "./diffs"; describe("tests for diff util functions", () => { - const file = ( - type: FileChangeType, - oldPath: string, - newPath: string - ): File => { + const file = (type: FileChangeType, oldPath: string, newPath: string): File => { return { hunks: [], type: type, diff --git a/scm-ui/ui-components/src/repos/index.ts b/scm-ui/ui-components/src/repos/index.ts index 351c9fccfa..bc3aec1949 100644 --- a/scm-ui/ui-components/src/repos/index.ts +++ b/scm-ui/ui-components/src/repos/index.ts @@ -1,13 +1,5 @@ import * as diffs from "./diffs"; -export { diffs }; - -export * from "./changesets"; - -export { default as Diff } from "./Diff"; -export { default as DiffFile } from "./DiffFile"; -export { default as LoadingDiff } from "./LoadingDiff"; - import { File, FileChangeType, @@ -21,6 +13,14 @@ import { DiffEventContext } from "./DiffTypes"; +export { diffs }; + +export * from "./changesets"; + +export { default as Diff } from "./Diff"; +export { default as DiffFile } from "./DiffFile"; +export { default as LoadingDiff } from "./LoadingDiff"; + export { File, FileChangeType, diff --git a/scm-ui/ui-components/src/repositories.ts b/scm-ui/ui-components/src/repositories.ts index a7768131f3..431743233a 100644 --- a/scm-ui/ui-components/src/repositories.ts +++ b/scm-ui/ui-components/src/repositories.ts @@ -8,7 +8,7 @@ export function getProtocolLinkByType(repository: Repository, type: string) { if (!Array.isArray(protocols)) { protocols = [protocols]; } - for (let proto of protocols) { + for (const proto of protocols) { if (proto.name === type) { return proto.href; } diff --git a/scm-ui/ui-components/src/urls.test.ts b/scm-ui/ui-components/src/urls.test.ts index 1db965b418..180237a1a2 100644 --- a/scm-ui/ui-components/src/urls.test.ts +++ b/scm-ui/ui-components/src/urls.test.ts @@ -1,9 +1,4 @@ -import { - concat, - getPageFromMatch, - getQueryStringFromLocation, - withEndingSlash -} from "./urls"; +import { concat, getPageFromMatch, getQueryStringFromLocation, withEndingSlash } from "./urls"; describe("tests for withEndingSlash", () => { it("should append missing slash", () => { diff --git a/scm-ui/ui-components/src/urls.ts b/scm-ui/ui-components/src/urls.ts index 16ea8d20d0..3c524bce37 100644 --- a/scm-ui/ui-components/src/urls.ts +++ b/scm-ui/ui-components/src/urls.ts @@ -16,7 +16,7 @@ export function withEndingSlash(url: string) { export function concat(base: string, ...parts: string[]) { let url = base; - for (let p of parts) { + for (const p of parts) { url = withEndingSlash(url) + p; } return url; diff --git a/scm-ui/ui-components/src/validation.test.ts b/scm-ui/ui-components/src/validation.test.ts index 1416241bfe..eb729214d1 100644 --- a/scm-ui/ui-components/src/validation.test.ts +++ b/scm-ui/ui-components/src/validation.test.ts @@ -19,7 +19,7 @@ describe("test name validation", () => { "!!!", "!_!" ]; - for (let name of invalidNames) { + for (const name of invalidNames) { it(`should return false for '${name}'`, () => { expect(validator.isNameValid(name)).toBe(false); }); @@ -42,7 +42,7 @@ describe("test name validation", () => { "this.one_as-well", "and@this" ]; - for (let name of validNames) { + for (const name of validNames) { it(`should return true for '${name}'`, () => { expect(validator.isNameValid(name)).toBe(true); }); @@ -59,7 +59,7 @@ describe("test mail validation", () => { "s.sdorra@ ostfalia.de", "s.sdorra@[ostfalia.de" ]; - for (let mail of invalid) { + for (const mail of invalid) { it(`should return false for '${mail}'`, () => { expect(validator.isMailValid(mail)).toBe(false); }); @@ -78,7 +78,7 @@ describe("test mail validation", () => { "s'sdorra@scm.solutions", '"S Sdorra"@scm.solutions' ]; - for (let mail of valid) { + for (const mail of valid) { it(`should return true for '${mail}'`, () => { expect(validator.isMailValid(mail)).toBe(true); }); @@ -87,13 +87,13 @@ describe("test mail validation", () => { describe("test number validation", () => { const invalid = ["1a", "35gu", "dj6", "45,5", "test"]; - for (let number of invalid) { + for (const number of invalid) { it(`should return false for '${number}'`, () => { expect(validator.isNumberValid(number)).toBe(false); }); } const valid = ["1", "35", "2", "235", "34.4"]; - for (let number of valid) { + for (const number of valid) { it(`should return true for '${number}'`, () => { expect(validator.isNumberValid(number)).toBe(true); }); @@ -102,13 +102,13 @@ describe("test number validation", () => { describe("test path validation", () => { const invalid = ["//", "some//path", "end//"]; - for (let path of invalid) { + for (const path of invalid) { it(`should return false for '${path}'`, () => { expect(validator.isPathValid(path)).toBe(false); }); } const valid = ["", "/", "dir", "some/path", "end/"]; - for (let path of valid) { + for (const path of valid) { it(`should return true for '${path}'`, () => { expect(validator.isPathValid(path)).toBe(true); }); diff --git a/scm-ui/ui-extensions/src/ExtensionPoint.test.tsx b/scm-ui/ui-extensions/src/ExtensionPoint.test.tsx index f7255d27b3..c40362070f 100644 --- a/scm-ui/ui-extensions/src/ExtensionPoint.test.tsx +++ b/scm-ui/ui-extensions/src/ExtensionPoint.test.tsx @@ -50,9 +50,7 @@ describe("ExtensionPoint test", () => { mockedBinder.hasExtension.mockReturnValue(true); mockedBinder.getExtensions.mockReturnValue([labelOne, labelTwo]); - const rendered = mount( - - ); + const rendered = mount(); const text = rendered.text(); expect(text).toContain("Extension One"); expect(text).toContain("Extension Two"); @@ -123,11 +121,7 @@ describe("ExtensionPoint test", () => { }; const HelloUser = () => { - return ( - - {({ name }) => } - - ); + return {({ name }) => }; }; mockedBinder.hasExtension.mockReturnValue(true); diff --git a/scm-ui/ui-extensions/src/binder.test.ts b/scm-ui/ui-extensions/src/binder.test.ts index 5058416046..2bcd302a36 100644 --- a/scm-ui/ui-extensions/src/binder.test.ts +++ b/scm-ui/ui-extensions/src/binder.test.ts @@ -41,25 +41,13 @@ describe("binder tests", () => { }); type Props = { - category: string + category: string; }; it("should return only extensions which predicates matches", () => { - binder.bind( - "hitchhicker.trillian", - "heartOfGold", - (props: Props) => props.category === "a" - ); - binder.bind( - "hitchhicker.trillian", - "earth", - (props: Props) => props.category === "b" - ); - binder.bind( - "hitchhicker.trillian", - "earth2", - (props: Props) => props.category === "a" - ); + binder.bind("hitchhicker.trillian", "heartOfGold", (props: Props) => props.category === "a"); + binder.bind("hitchhicker.trillian", "earth", (props: Props) => props.category === "b"); + binder.bind("hitchhicker.trillian", "earth2", (props: Props) => props.category === "a"); const extensions = binder.getExtensions("hitchhicker.trillian", { category: "b" diff --git a/scm-ui/ui-extensions/src/binder.ts b/scm-ui/ui-extensions/src/binder.ts index df96b82c11..a359973a50 100644 --- a/scm-ui/ui-extensions/src/binder.ts +++ b/scm-ui/ui-extensions/src/binder.ts @@ -31,7 +31,7 @@ export class Binder { } const registration = { predicate: predicate ? predicate : () => true, - extension, + extension }; this.extensionPoints[extensionPoint].push(registration); } diff --git a/scm-ui/ui-types/src/Branches.ts b/scm-ui/ui-types/src/Branches.ts index 8326895977..df7728c1ed 100644 --- a/scm-ui/ui-types/src/Branches.ts +++ b/scm-ui/ui-types/src/Branches.ts @@ -1,4 +1,4 @@ -import { Links } from './hal'; +import { Links } from "./hal"; export type Branch = { name: string; diff --git a/scm-ui/ui-types/src/Changesets.ts b/scm-ui/ui-types/src/Changesets.ts index 2e5ad3d403..26b3d5fab1 100644 --- a/scm-ui/ui-types/src/Changesets.ts +++ b/scm-ui/ui-types/src/Changesets.ts @@ -1,6 +1,6 @@ -import { Collection, Links } from './hal'; -import { Tag } from './Tags'; -import { Branch } from './Branches'; +import { Collection, Links } from "./hal"; +import { Tag } from "./Tags"; +import { Branch } from "./Branches"; export type Changeset = Collection & { id: string; diff --git a/scm-ui/ui-types/src/Config.ts b/scm-ui/ui-types/src/Config.ts index 14a02e0f82..ab5a6bdc8d 100644 --- a/scm-ui/ui-types/src/Config.ts +++ b/scm-ui/ui-types/src/Config.ts @@ -1,4 +1,4 @@ -import { Links } from './hal'; +import { Links } from "./hal"; export type Config = { proxyPassword: string | null; diff --git a/scm-ui/ui-types/src/Group.ts b/scm-ui/ui-types/src/Group.ts index c00cf91257..381b5e61d5 100644 --- a/scm-ui/ui-types/src/Group.ts +++ b/scm-ui/ui-types/src/Group.ts @@ -1,4 +1,4 @@ -import { Collection, Links } from './hal'; +import { Collection, Links } from "./hal"; export type Member = { name: string; diff --git a/scm-ui/ui-types/src/IndexResources.ts b/scm-ui/ui-types/src/IndexResources.ts index 30eadc2628..78a2795c9e 100644 --- a/scm-ui/ui-types/src/IndexResources.ts +++ b/scm-ui/ui-types/src/IndexResources.ts @@ -1,4 +1,4 @@ -import { Links } from './hal'; +import { Links } from "./hal"; export type IndexResources = { version: string; diff --git a/scm-ui/ui-types/src/Me.ts b/scm-ui/ui-types/src/Me.ts index aa6925901f..d43932d9b3 100644 --- a/scm-ui/ui-types/src/Me.ts +++ b/scm-ui/ui-types/src/Me.ts @@ -1,4 +1,4 @@ -import { Links } from './hal'; +import { Links } from "./hal"; export type Me = { name: string; diff --git a/scm-ui/ui-types/src/NamespaceStrategies.ts b/scm-ui/ui-types/src/NamespaceStrategies.ts index 99acae17a6..7d8dc17b90 100644 --- a/scm-ui/ui-types/src/NamespaceStrategies.ts +++ b/scm-ui/ui-types/src/NamespaceStrategies.ts @@ -1,4 +1,4 @@ -import { Links } from './hal'; +import { Links } from "./hal"; export type NamespaceStrategies = { current: string; diff --git a/scm-ui/ui-types/src/Plugin.ts b/scm-ui/ui-types/src/Plugin.ts index 1abc36a0cb..2277463248 100644 --- a/scm-ui/ui-types/src/Plugin.ts +++ b/scm-ui/ui-types/src/Plugin.ts @@ -1,4 +1,4 @@ -import { Collection, Links } from './hal'; +import { Collection, Links } from "./hal"; export type Plugin = { name: string; diff --git a/scm-ui/ui-types/src/Repositories.ts b/scm-ui/ui-types/src/Repositories.ts index 2f7bccdffb..11e48d9ff7 100644 --- a/scm-ui/ui-types/src/Repositories.ts +++ b/scm-ui/ui-types/src/Repositories.ts @@ -1,4 +1,4 @@ -import { PagedCollection, Links } from './hal'; +import { PagedCollection, Links } from "./hal"; export type Repository = { namespace: string; diff --git a/scm-ui/ui-types/src/RepositoryPermissions.ts b/scm-ui/ui-types/src/RepositoryPermissions.ts index f1af6b03c5..dbc9d5bde9 100644 --- a/scm-ui/ui-types/src/RepositoryPermissions.ts +++ b/scm-ui/ui-types/src/RepositoryPermissions.ts @@ -1,4 +1,4 @@ -import { Links } from './hal'; +import { Links } from "./hal"; export type PermissionCreateEntry = { name: string; diff --git a/scm-ui/ui-types/src/RepositoryRole.ts b/scm-ui/ui-types/src/RepositoryRole.ts index 5b801720de..7f8bf93f93 100644 --- a/scm-ui/ui-types/src/RepositoryRole.ts +++ b/scm-ui/ui-types/src/RepositoryRole.ts @@ -1,4 +1,4 @@ -import { Links } from './hal'; +import { Links } from "./hal"; export type RepositoryRole = { name: string; diff --git a/scm-ui/ui-types/src/RepositoryTypes.ts b/scm-ui/ui-types/src/RepositoryTypes.ts index b859a54e6b..889d3445cb 100644 --- a/scm-ui/ui-types/src/RepositoryTypes.ts +++ b/scm-ui/ui-types/src/RepositoryTypes.ts @@ -1,4 +1,4 @@ -import { Collection } from './hal'; +import { Collection } from "./hal"; export type RepositoryType = { name: string; diff --git a/scm-ui/ui-types/src/Sources.ts b/scm-ui/ui-types/src/Sources.ts index 41084edb79..4e0e7fe188 100644 --- a/scm-ui/ui-types/src/Sources.ts +++ b/scm-ui/ui-types/src/Sources.ts @@ -1,4 +1,4 @@ -import { Links } from './hal'; +import { Links } from "./hal"; // TODO ?? check ?? links export type SubRepository = { diff --git a/scm-ui/ui-types/src/Tags.ts b/scm-ui/ui-types/src/Tags.ts index 0841c98917..dfabcaa1f9 100644 --- a/scm-ui/ui-types/src/Tags.ts +++ b/scm-ui/ui-types/src/Tags.ts @@ -1,4 +1,4 @@ -import { Links } from './hal'; +import { Links } from "./hal"; export type Tag = { name: string; diff --git a/scm-ui/ui-types/src/User.ts b/scm-ui/ui-types/src/User.ts index 00e7572758..aacfe8191e 100644 --- a/scm-ui/ui-types/src/User.ts +++ b/scm-ui/ui-types/src/User.ts @@ -1,4 +1,4 @@ -import { Links } from './hal'; +import { Links } from "./hal"; export type DisplayedUser = { id: string; diff --git a/scm-ui/ui-types/src/index.ts b/scm-ui/ui-types/src/index.ts index 4d2606feb9..625b85febc 100644 --- a/scm-ui/ui-types/src/index.ts +++ b/scm-ui/ui-types/src/index.ts @@ -5,7 +5,11 @@ export { Me } from "./Me"; export { DisplayedUser, User } from "./User"; export { Group, Member } from "./Group"; -export { Repository, RepositoryCollection, RepositoryGroup } from "./Repositories"; +export { + Repository, + RepositoryCollection, + RepositoryGroup +} from "./Repositories"; export { RepositoryType, RepositoryTypeCollection } from "./RepositoryTypes"; export { Branch, BranchRequest } from "./Branches"; @@ -18,13 +22,22 @@ export { Config } from "./Config"; export { IndexResources } from "./IndexResources"; -export { Permission, PermissionCreateEntry, PermissionCollection } from "./RepositoryPermissions"; +export { + Permission, + PermissionCreateEntry, + PermissionCollection +} from "./RepositoryPermissions"; export { SubRepository, File } from "./Sources"; export { SelectValue, AutocompleteObject } from "./Autocomplete"; -export { Plugin, PluginCollection, PluginGroup, PendingPlugins } from "./Plugin"; +export { + Plugin, + PluginCollection, + PluginGroup, + PendingPlugins +} from "./Plugin"; export { RepositoryRole } from "./RepositoryRole"; diff --git a/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx b/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx index 3bd5a67bc1..f820777208 100644 --- a/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx +++ b/scm-ui/ui-webapp/src/admin/components/form/ConfigForm.tsx @@ -91,24 +91,13 @@ class ConfigForm extends React.Component { }; render() { - const { - loading, - t, - namespaceStrategies, - configReadPermission, - configUpdatePermission - } = this.props; + const { loading, t, namespaceStrategies, configReadPermission, configUpdatePermission } = this.props; const config = this.state.config; let noPermissionNotification = null; if (!configReadPermission) { - return ( - - ); + return ; } if (this.state.showNotification) { @@ -135,27 +124,21 @@ class ConfigForm extends React.Component { pluginUrl={config.pluginUrl} enabledXsrfProtection={config.enabledXsrfProtection} namespaceStrategy={config.namespaceStrategy} - onChange={(isValid, changedValue, name) => - this.onChange(isValid, changedValue, name) - } + onChange={(isValid, changedValue, name) => this.onChange(isValid, changedValue, name)} hasUpdatePermission={configUpdatePermission} />
    - this.onChange(isValid, changedValue, name) - } + onChange={(isValid, changedValue, name) => this.onChange(isValid, changedValue, name)} hasUpdatePermission={configUpdatePermission} />
    - this.onChange(isValid, changedValue, name) - } + onChange={(isValid, changedValue, name) => this.onChange(isValid, changedValue, name)} hasUpdatePermission={configUpdatePermission} />
    @@ -166,18 +149,14 @@ class ConfigForm extends React.Component { proxyUser={config.proxyUser ? config.proxyUser : ""} enableProxy={config.enableProxy} proxyExcludes={config.proxyExcludes} - onChange={(isValid, changedValue, name) => - this.onChange(isValid, changedValue, name) - } + onChange={(isValid, changedValue, name) => this.onChange(isValid, changedValue, name)} hasUpdatePermission={configUpdatePermission} />
    ); @@ -199,10 +178,7 @@ class ConfigForm extends React.Component { }; hasError = () => { - return ( - this.state.error.loginAttemptLimit || - this.state.error.loginAttemptLimitTimeout - ); + return this.state.error.loginAttemptLimit || this.state.error.loginAttemptLimitTimeout; }; onClose = () => { diff --git a/scm-ui/ui-webapp/src/admin/components/form/LoginAttempt.tsx b/scm-ui/ui-webapp/src/admin/components/form/LoginAttempt.tsx index 9c56a7b7fb..0474f922ae 100644 --- a/scm-ui/ui-webapp/src/admin/components/form/LoginAttempt.tsx +++ b/scm-ui/ui-webapp/src/admin/components/form/LoginAttempt.tsx @@ -1,10 +1,6 @@ import React from "react"; import { translate } from "react-i18next"; -import { - InputField, - Subtitle, - validation as validator -} from "@scm-manager/ui-components"; +import { InputField, Subtitle, validation as validator } from "@scm-manager/ui-components"; type Props = { loginAttemptLimit: number; @@ -29,12 +25,7 @@ class LoginAttempt extends React.Component { }; } render() { - const { - t, - loginAttemptLimit, - loginAttemptLimitTimeout, - hasUpdatePermission - } = this.props; + const { t, loginAttemptLimit, loginAttemptLimitTimeout, hasUpdatePermission } = this.props; return (
    @@ -73,11 +64,7 @@ class LoginAttempt extends React.Component { ...this.state, loginAttemptLimitError: !validator.isNumberValid(value) }); - this.props.onChange( - validator.isNumberValid(value), - value, - "loginAttemptLimit" - ); + this.props.onChange(validator.isNumberValid(value), value, "loginAttemptLimit"); }; handleLoginAttemptLimitTimeoutChange = (value: string) => { @@ -85,11 +72,7 @@ class LoginAttempt extends React.Component { ...this.state, loginAttemptLimitTimeoutError: !validator.isNumberValid(value) }); - this.props.onChange( - validator.isNumberValid(value), - value, - "loginAttemptLimitTimeout" - ); + this.props.onChange(validator.isNumberValid(value), value, "loginAttemptLimitTimeout"); }; } diff --git a/scm-ui/ui-webapp/src/admin/components/form/NamespaceStrategySelect.tsx b/scm-ui/ui-webapp/src/admin/components/form/NamespaceStrategySelect.tsx index 221a7f3ec3..33699870d1 100644 --- a/scm-ui/ui-webapp/src/admin/components/form/NamespaceStrategySelect.tsx +++ b/scm-ui/ui-webapp/src/admin/components/form/NamespaceStrategySelect.tsx @@ -37,11 +37,7 @@ class NamespaceStrategySelect extends React.Component { findSelected = () => { const { namespaceStrategies, value } = this.props; - if ( - !namespaceStrategies || - !namespaceStrategies.available || - namespaceStrategies.available.indexOf(value) < 0 - ) { + if (!namespaceStrategies || !namespaceStrategies.available || namespaceStrategies.available.indexOf(value) < 0) { return namespaceStrategies.current; } return value; diff --git a/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx b/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx index 2d8ac642d2..306b1d3f87 100644 --- a/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx +++ b/scm-ui/ui-webapp/src/admin/components/form/ProxySettings.tsx @@ -1,11 +1,6 @@ import React from "react"; import { translate } from "react-i18next"; -import { - Checkbox, - InputField, - Subtitle, - AddEntryToTableField -} from "@scm-manager/ui-components"; +import { Checkbox, InputField, Subtitle, AddEntryToTableField } from "@scm-manager/ui-components"; import ProxyExcludesTable from "../table/ProxyExcludesTable"; type Props = { @@ -92,9 +87,7 @@ class ProxySettings extends React.Component {
    - this.props.onChange(isValid, changedValue, name) - } + onChange={(isValid, changedValue, name) => this.props.onChange(isValid, changedValue, name)} disabled={!enableProxy || !hasUpdatePermission} /> { if (this.isProxyExcludeMember(proxyExcludeName)) { return; } - this.props.onChange( - true, - [...this.props.proxyExcludes, proxyExcludeName], - "proxyExcludes" - ); + this.props.onChange(true, [...this.props.proxyExcludes, proxyExcludeName], "proxyExcludes"); }; isProxyExcludeMember = (proxyExcludeName: string) => { diff --git a/scm-ui/ui-webapp/src/admin/components/table/ArrayConfigTable.tsx b/scm-ui/ui-webapp/src/admin/components/table/ArrayConfigTable.tsx index ec11901705..2b1a35a933 100644 --- a/scm-ui/ui-webapp/src/admin/components/table/ArrayConfigTable.tsx +++ b/scm-ui/ui-webapp/src/admin/components/table/ArrayConfigTable.tsx @@ -1,8 +1,5 @@ import React from "react"; -import { - RemoveEntryOfTableButton, - LabelWithHelpIcon -} from "@scm-manager/ui-components"; +import { RemoveEntryOfTableButton, LabelWithHelpIcon } from "@scm-manager/ui-components"; type Props = { items: string[]; diff --git a/scm-ui/ui-webapp/src/admin/containers/Admin.tsx b/scm-ui/ui-webapp/src/admin/containers/Admin.tsx index e103fe0582..3360a212bd 100644 --- a/scm-ui/ui-webapp/src/admin/containers/Admin.tsx +++ b/scm-ui/ui-webapp/src/admin/containers/Admin.tsx @@ -6,18 +6,8 @@ import { History } from "history"; import { connect } from "react-redux"; import { compose } from "redux"; import { Links } from "@scm-manager/ui-types"; -import { - Page, - Navigation, - NavLink, - Section, - SubNavigation -} from "@scm-manager/ui-components"; -import { - getLinks, - getAvailablePluginsLink, - getInstalledPluginsLink -} from "../../modules/indexResource"; +import { Page, Navigation, NavLink, Section, SubNavigation } from "@scm-manager/ui-components"; +import { getLinks, getAvailablePluginsLink, getInstalledPluginsLink } from "../../modules/indexResource"; import AdminDetails from "./AdminDetails"; import PluginsOverview from "../plugins/containers/PluginsOverview"; import GlobalConfig from "./GlobalConfig"; @@ -73,96 +63,45 @@ class Admin extends React.Component { - - + + ( - - )} + render={() => } /> ( - - )} + render={() => } /> ( - - )} + render={() => } /> ( - - )} + render={() => } /> ( - - )} - /> - } + render={() => } /> + } /> ( - - )} - /> - } - /> - } /> + } /> +
    - + {(availablePluginsLink || installedPluginsLink) && ( { label={t("plugins.menu.pluginsNavLink")} > {installedPluginsLink && ( - + )} {availablePluginsLink && ( - + )} )} @@ -190,24 +123,10 @@ class Admin extends React.Component { activeWhenMatch={this.matchesRoles} activeOnlyWhenExact={false} /> - - - - + + + +
    diff --git a/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx b/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx index 8c661ec58a..82b7f66cfd 100644 --- a/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx +++ b/scm-ui/ui-webapp/src/admin/containers/AdminDetails.tsx @@ -15,8 +15,7 @@ type Props = { }; const BoxShadowBox = styled.div` - box-shadow: 0 2px 3px rgba(40, 177, 232, 0.1), - 0 0 0 2px rgba(40, 177, 232, 0.2); + box-shadow: 0 2px 3px rgba(40, 177, 232, 0.1), 0 0 0 2px rgba(40, 177, 232, 0.2); `; const ImageWrapper = styled.div` @@ -38,22 +37,13 @@ class AdminDetails extends React.Component {
    - {t("admin.info.communityIconAlt")} + {t("admin.info.communityIconAlt")}
    -

    - {t("admin.info.communityTitle")} -

    +

    {t("admin.info.communityTitle")}

    {t("admin.info.communityInfo")}

    - + {t("admin.info.communityButton")}
    @@ -63,16 +53,11 @@ class AdminDetails extends React.Component {
    - {t("admin.info.enterpriseIconAlt")} + {t("admin.info.enterpriseIconAlt")}
    -

    - {t("admin.info.enterpriseTitle")} -

    +

    {t("admin.info.enterpriseTitle")}

    {t("admin.info.enterpriseInfo")}
    diff --git a/scm-ui/ui-webapp/src/admin/containers/GlobalConfig.tsx b/scm-ui/ui-webapp/src/admin/containers/GlobalConfig.tsx index c690b62ab5..fa3957eee1 100644 --- a/scm-ui/ui-webapp/src/admin/containers/GlobalConfig.tsx +++ b/scm-ui/ui-webapp/src/admin/containers/GlobalConfig.tsx @@ -119,13 +119,7 @@ class GlobalConfig extends React.Component { }; renderContent = () => { - const { - error, - loading, - config, - configUpdatePermission, - namespaceStrategies - } = this.props; + const { error, loading, config, configUpdatePermission, namespaceStrategies } = this.props; const { configReadPermission } = this.state; if (!error) { return ( @@ -165,13 +159,9 @@ const mapDispatchToProps = dispatch => { const mapStateToProps = state => { const loading = - isFetchConfigPending(state) || - isModifyConfigPending(state) || - isFetchNamespaceStrategiesPending(state); + isFetchConfigPending(state) || isModifyConfigPending(state) || isFetchNamespaceStrategiesPending(state); const error = - getFetchConfigFailure(state) || - getModifyConfigFailure(state) || - getFetchNamespaceStrategiesFailure(state); + getFetchConfigFailure(state) || getModifyConfigFailure(state) || getFetchNamespaceStrategiesFailure(state); const config = getConfig(state); const configUpdatePermission = getConfigUpdatePermission(state); diff --git a/scm-ui/ui-webapp/src/admin/modules/config.test.ts b/scm-ui/ui-webapp/src/admin/modules/config.test.ts index aecbe4a7d6..924fb5d972 100644 --- a/scm-ui/ui-webapp/src/admin/modules/config.test.ts +++ b/scm-ui/ui-webapp/src/admin/modules/config.test.ts @@ -233,8 +233,7 @@ describe("config reducer", () => { it("should return empty arrays for null values", () => { // $FlowFixMe - const config = reducer({}, fetchConfigSuccess(configWithNullValues)) - .entries; + const config = reducer({}, fetchConfigSuccess(configWithNullValues)).entries; expect(config.adminUsers).toEqual([]); expect(config.adminGroups).toEqual([]); expect(config.proxyExcludes).toEqual([]); diff --git a/scm-ui/ui-webapp/src/admin/modules/namespaceStrategies.ts b/scm-ui/ui-webapp/src/admin/modules/namespaceStrategies.ts index 92d01a8424..ee898aa61d 100644 --- a/scm-ui/ui-webapp/src/admin/modules/namespaceStrategies.ts +++ b/scm-ui/ui-webapp/src/admin/modules/namespaceStrategies.ts @@ -5,8 +5,7 @@ import { isPending } from "../../modules/pending"; import { getFailure } from "../../modules/failure"; import { MODIFY_CONFIG_SUCCESS } from "./config"; -export const FETCH_NAMESPACESTRATEGIES_TYPES = - "scm/config/FETCH_NAMESPACESTRATEGIES_TYPES"; +export const FETCH_NAMESPACESTRATEGIES_TYPES = "scm/config/FETCH_NAMESPACESTRATEGIES_TYPES"; export const FETCH_NAMESPACESTRATEGIES_TYPES_PENDING = `${FETCH_NAMESPACESTRATEGIES_TYPES}_${types.PENDING_SUFFIX}`; export const FETCH_NAMESPACESTRATEGIES_TYPES_SUCCESS = `${FETCH_NAMESPACESTRATEGIES_TYPES}_${types.SUCCESS_SUFFIX}`; export const FETCH_NAMESPACESTRATEGIES_TYPES_FAILURE = `${FETCH_NAMESPACESTRATEGIES_TYPES}_${types.FAILURE_SUFFIX}`; @@ -15,10 +14,7 @@ export function fetchNamespaceStrategiesIfNeeded() { return function(dispatch: any, getState: () => object) { const state = getState(); if (shouldFetchNamespaceStrategies(state)) { - return fetchNamespaceStrategies( - dispatch, - state.indexResources.links.namespaceStrategies.href - ); + return fetchNamespaceStrategies(dispatch, state.indexResources.links.namespaceStrategies.href); } }; } @@ -37,10 +33,7 @@ function fetchNamespaceStrategies(dispatch: any, url: string) { } export function shouldFetchNamespaceStrategies(state: object) { - if ( - isFetchNamespaceStrategiesPending(state) || - getFetchNamespaceStrategiesFailure(state) - ) { + if (isFetchNamespaceStrategiesPending(state) || getFetchNamespaceStrategiesFailure(state)) { return false; } return !state.namespaceStrategies || !state.namespaceStrategies.current; @@ -52,9 +45,7 @@ export function fetchNamespaceStrategiesPending(): Action { }; } -export function fetchNamespaceStrategiesSuccess( - namespaceStrategies: NamespaceStrategies -): Action { +export function fetchNamespaceStrategiesSuccess(namespaceStrategies: NamespaceStrategies): Action { return { type: FETCH_NAMESPACESTRATEGIES_TYPES_SUCCESS, payload: namespaceStrategies @@ -76,10 +67,7 @@ export default function reducer( type: "UNKNOWN" } ): object { - if ( - action.type === FETCH_NAMESPACESTRATEGIES_TYPES_SUCCESS && - action.payload - ) { + if (action.type === FETCH_NAMESPACESTRATEGIES_TYPES_SUCCESS && action.payload) { return action.payload; } else if (action.type === MODIFY_CONFIG_SUCCESS && action.payload) { const config = action.payload; diff --git a/scm-ui/ui-webapp/src/admin/plugins/components/ExecutePendingAction.tsx b/scm-ui/ui-webapp/src/admin/plugins/components/ExecutePendingAction.tsx index 4f067681d8..3c0c7936af 100644 --- a/scm-ui/ui-webapp/src/admin/plugins/components/ExecutePendingAction.tsx +++ b/scm-ui/ui-webapp/src/admin/plugins/components/ExecutePendingAction.tsx @@ -39,12 +39,7 @@ class ExecutePendingAction extends React.Component { const { showModal } = this.state; const { pendingPlugins } = this.props; if (showModal) { - return ( - - ); + return ; } return null; }; @@ -54,11 +49,7 @@ class ExecutePendingAction extends React.Component { return ( <> {this.renderModal()} -