optimize all imports in ui-webapp and reformat with prettier

This commit is contained in:
Eduard Heimbuch
2020-01-08 15:57:13 +01:00
parent b8d4bb6904
commit 0d546755a9
79 changed files with 340 additions and 348 deletions

View File

@@ -1,7 +1,7 @@
import React from "react";
import { WithTranslation, withTranslation } from "react-i18next";
import { Repository, Branch } from "@scm-manager/ui-types";
import { ButtonAddons, Button } from "@scm-manager/ui-components";
import { Branch, Repository } from "@scm-manager/ui-types";
import { Button, ButtonAddons } from "@scm-manager/ui-components";
type Props = WithTranslation & {
repository: Repository;

View File

@@ -1,5 +1,5 @@
import React from "react";
import { Repository, Branch } from "@scm-manager/ui-types";
import { Branch, Repository } from "@scm-manager/ui-types";
import { WithTranslation, withTranslation } from "react-i18next";
import BranchButtonGroup from "./BranchButtonGroup";
import DefaultBranchTag from "./DefaultBranchTag";

View File

@@ -1,7 +1,7 @@
import React from "react";
import { WithTranslation, withTranslation } from "react-i18next";
import { Repository, Branch, BranchRequest } from "@scm-manager/ui-types";
import { Select, InputField, Level, SubmitButton, validation as validator } from "@scm-manager/ui-components";
import { Branch, BranchRequest, Repository } from "@scm-manager/ui-types";
import { InputField, Level, Select, SubmitButton, validation as validator } from "@scm-manager/ui-components";
import { orderBranches } from "../util/orderBranches";
type Props = WithTranslation & {

View File

@@ -1,7 +1,7 @@
import React from "react";
import BranchDetail from "./BranchDetail";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
import { Repository, Branch } from "@scm-manager/ui-types";
import { Branch, Repository } from "@scm-manager/ui-types";
type Props = {
repository: Repository;

View File

@@ -3,11 +3,10 @@ import BranchView from "../components/BranchView";
import { connect } from "react-redux";
import { compose } from "redux";
import { Redirect, Route, Switch, withRouter } from "react-router-dom";
import { Repository, Branch } from "@scm-manager/ui-types";
import { Branch, Repository } from "@scm-manager/ui-types";
import { fetchBranch, getBranch, getFetchBranchFailure, isFetchBranchPending } from "../modules/branches";
import { ErrorNotification, Loading } from "@scm-manager/ui-components";
import { ErrorNotification, Loading, NotFoundError } from "@scm-manager/ui-components";
import { History } from "history";
import { NotFoundError } from "@scm-manager/ui-components";
import queryString from "query-string";
type Props = {

View File

@@ -4,19 +4,19 @@ import { withRouter } from "react-router-dom";
import { WithTranslation, withTranslation } from "react-i18next";
import queryString from "query-string";
import { History } from "history";
import { Repository, Branch, BranchRequest } from "@scm-manager/ui-types";
import { Branch, BranchRequest, Repository } from "@scm-manager/ui-types";
import { ErrorNotification, Loading, Subtitle } from "@scm-manager/ui-components";
import BranchForm from "../components/BranchForm";
import {
fetchBranches,
getBranches,
getBranchCreateLink,
createBranch,
createBranchReset,
isCreateBranchPending,
fetchBranches,
getBranchCreateLink,
getBranches,
getCreateBranchFailure,
isFetchBranchesPending,
getFetchBranchesFailure
getFetchBranchesFailure,
isCreateBranchPending,
isFetchBranchesPending
} from "../modules/branches";
import { compose } from "redux";

View File

@@ -2,27 +2,27 @@ import configureMockStore from "redux-mock-store";
import thunk from "redux-thunk";
import fetchMock from "fetch-mock";
import reducer, {
FETCH_BRANCHES,
FETCH_BRANCHES_FAILURE,
FETCH_BRANCHES_PENDING,
FETCH_BRANCHES_SUCCESS,
FETCH_BRANCH_PENDING,
FETCH_BRANCH_SUCCESS,
FETCH_BRANCH_FAILURE,
CREATE_BRANCH,
CREATE_BRANCH_FAILURE,
CREATE_BRANCH_PENDING,
CREATE_BRANCH_SUCCESS,
fetchBranches,
createBranch,
FETCH_BRANCH_FAILURE,
FETCH_BRANCH_PENDING,
FETCH_BRANCH_SUCCESS,
FETCH_BRANCHES,
FETCH_BRANCHES_FAILURE,
FETCH_BRANCHES_PENDING,
FETCH_BRANCHES_SUCCESS,
fetchBranch,
fetchBranches,
fetchBranchSuccess,
getBranch,
getBranches,
getFetchBranchesFailure,
isFetchBranchesPending,
createBranch,
isCreateBranchPending,
getCreateBranchFailure,
getFetchBranchesFailure,
isCreateBranchPending,
isFetchBranchesPending,
isPermittedToCreateBranches
} from "./branches";

View File

@@ -1,4 +1,4 @@
import { FAILURE_SUFFIX, PENDING_SUFFIX, SUCCESS_SUFFIX, RESET_SUFFIX } from "../../../modules/types";
import { FAILURE_SUFFIX, PENDING_SUFFIX, RESET_SUFFIX, SUCCESS_SUFFIX } from "../../../modules/types";
import { apiClient } from "@scm-manager/ui-components";
import { Action, Branch, BranchRequest, Repository } from "@scm-manager/ui-types";
import { isPending } from "../../../modules/pending";

View File

@@ -1,5 +1,5 @@
import React from "react";
import { shallow, mount } from "@scm-manager/ui-tests/enzyme-router";
import { mount, shallow } from "@scm-manager/ui-tests/enzyme-router";
import "@scm-manager/ui-tests/enzyme";
import "@scm-manager/ui-tests/i18n";

View File

@@ -1,7 +1,7 @@
import React from "react";
import { WithTranslation, withTranslation } from "react-i18next";
import { Repository } from "@scm-manager/ui-types";
import { MailLink, DateFromNow } from "@scm-manager/ui-components";
import { DateFromNow, MailLink } from "@scm-manager/ui-components";
type Props = WithTranslation & {
repository: Repository;

View File

@@ -1,5 +1,5 @@
import React from "react";
import { shallow, mount } from "@scm-manager/ui-tests/enzyme-router";
import { mount, shallow } from "@scm-manager/ui-tests/enzyme-router";
import "@scm-manager/ui-tests/i18n";
import RepositoryNavLink from "./RepositoryNavLink";

View File

@@ -5,16 +5,16 @@ import styled from "styled-components";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
import { Changeset, Repository, Tag } from "@scm-manager/ui-types";
import {
DateFromNow,
ChangesetId,
ChangesetTag,
AvatarImage,
AvatarWrapper,
Button,
ChangesetAuthor,
ChangesetDiff,
AvatarWrapper,
AvatarImage,
ChangesetId,
changesets,
Level,
Button
ChangesetTag,
DateFromNow,
Level
} from "@scm-manager/ui-components";
type Props = WithTranslation & {

View File

@@ -2,7 +2,7 @@ import React from "react";
import { WithTranslation, withTranslation } from "react-i18next";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
import { Repository, RepositoryType } from "@scm-manager/ui-types";
import { Subtitle, InputField, Select, Textarea, Level, SubmitButton } from "@scm-manager/ui-components";
import { InputField, Level, Select, SubmitButton, Subtitle, Textarea } from "@scm-manager/ui-components";
import * as validator from "./repositoryValidation";
type Props = WithTranslation & {

View File

@@ -1,2 +1,3 @@
import RepositoryForm from "./RepositoryForm";
export default RepositoryForm;

View File

@@ -1,2 +1,3 @@
import RepositoryList from "./RepositoryList";
export default RepositoryList;

View File

@@ -5,10 +5,10 @@ import { withRouter } from "react-router-dom";
import { WithTranslation, withTranslation } from "react-i18next";
import { Branch, Changeset, PagedCollection, Repository } from "@scm-manager/ui-types";
import {
ChangesetList,
ErrorNotification,
getPageFromMatch,
LinkPaginator,
ChangesetList,
Loading,
Notification
} from "@scm-manager/ui-components";

View File

@@ -2,7 +2,7 @@ import React from "react";
import { connect } from "react-redux";
import { WithTranslation, withTranslation } from "react-i18next";
import { History } from "history";
import { Repository, RepositoryType, NamespaceStrategies } from "@scm-manager/ui-types";
import { NamespaceStrategies, Repository, RepositoryType } from "@scm-manager/ui-types";
import { Page } from "@scm-manager/ui-components";
import {
fetchRepositoryTypesIfNeeded,

View File

@@ -5,7 +5,7 @@ import { withRouter } from "react-router-dom";
import { WithTranslation, withTranslation } from "react-i18next";
import { History } from "history";
import { Repository } from "@scm-manager/ui-types";
import { Level, DeleteButton, confirmAlert, ErrorNotification } from "@scm-manager/ui-components";
import { confirmAlert, DeleteButton, ErrorNotification, Level } from "@scm-manager/ui-components";
import { deleteRepo, getDeleteRepoFailure, isDeleteRepoPending } from "../modules/repos";
type Props = WithTranslation & {

View File

@@ -4,7 +4,7 @@ import { withRouter } from "react-router-dom";
import RepositoryForm from "../components/form";
import DeleteRepo from "./DeleteRepo";
import { Repository } from "@scm-manager/ui-types";
import { modifyRepo, isModifyRepoPending, getModifyRepoFailure, modifyRepoReset } from "../modules/repos";
import { getModifyRepoFailure, isModifyRepoPending, modifyRepo, modifyRepoReset } from "../modules/repos";
import { History } from "history";
import { ErrorNotification } from "@scm-manager/ui-components";
import { ExtensionPoint } from "@scm-manager/ui-extensions";

View File

@@ -1,16 +1,16 @@
import React from "react";
import { connect } from "react-redux";
import { withRouter, RouteComponentProps } from "react-router-dom";
import { RouteComponentProps, withRouter } from "react-router-dom";
import { WithTranslation, withTranslation } from "react-i18next";
import { History } from "history";
import { RepositoryCollection } from "@scm-manager/ui-types";
import {
CreateButton,
LinkPaginator,
Notification,
OverviewPageActions,
Page,
PageActions,
OverviewPageActions,
CreateButton,
Notification,
LinkPaginator,
urls
} from "@scm-manager/ui-components";
import { getRepositoriesLink } from "../../modules/indexResource";
@@ -23,21 +23,22 @@ import {
} from "../modules/repos";
import RepositoryList from "../components/list";
type Props = WithTranslation & RouteComponentProps & {
loading: boolean;
error: Error;
showCreateButton: boolean;
collection: RepositoryCollection;
page: number;
reposLink: string;
type Props = WithTranslation &
RouteComponentProps & {
loading: boolean;
error: Error;
showCreateButton: boolean;
collection: RepositoryCollection;
page: number;
reposLink: string;
// context props
history: History;
location: any;
// context props
history: History;
location: any;
// dispatched functions
fetchReposByPage: (link: string, page: number, filter?: string) => void;
};
// dispatched functions
fetchReposByPage: (link: string, page: number, filter?: string) => void;
};
class Overview extends React.Component<Props> {
componentDidMount() {

View File

@@ -2,50 +2,50 @@ import configureMockStore from "redux-mock-store";
import thunk from "redux-thunk";
import fetchMock from "fetch-mock";
import reducer, {
FETCH_REPOS_PENDING,
FETCH_REPOS_SUCCESS,
fetchRepos,
FETCH_REPOS_FAILURE,
fetchReposSuccess,
getRepositoryCollection,
FETCH_REPOS,
isFetchReposPending,
getFetchReposFailure,
fetchReposByLink,
fetchReposByPage,
FETCH_REPO,
fetchRepoByLink,
fetchRepoByName,
FETCH_REPO_PENDING,
FETCH_REPO_SUCCESS,
FETCH_REPO_FAILURE,
fetchRepoSuccess,
getRepository,
isFetchRepoPending,
getFetchRepoFailure,
CREATE_REPO,
CREATE_REPO_FAILURE,
CREATE_REPO_PENDING,
CREATE_REPO_SUCCESS,
createRepo,
CREATE_REPO_FAILURE,
isCreateRepoPending,
CREATE_REPO,
getCreateRepoFailure,
isAbleToCreateRepos,
DELETE_REPO,
DELETE_REPO_FAILURE,
DELETE_REPO_PENDING,
DELETE_REPO_SUCCESS,
deleteRepo,
DELETE_REPO_PENDING,
DELETE_REPO_FAILURE,
isDeleteRepoPending,
FETCH_REPO,
FETCH_REPO_FAILURE,
FETCH_REPO_PENDING,
FETCH_REPO_SUCCESS,
FETCH_REPOS,
FETCH_REPOS_FAILURE,
FETCH_REPOS_PENDING,
FETCH_REPOS_SUCCESS,
fetchRepoByLink,
fetchRepoByName,
fetchRepos,
fetchReposByLink,
fetchReposByPage,
fetchReposSuccess,
fetchRepoSuccess,
getCreateRepoFailure,
getDeleteRepoFailure,
modifyRepo,
getFetchRepoFailure,
getFetchReposFailure,
getModifyRepoFailure,
getPermissionsLink,
getRepository,
getRepositoryCollection,
isAbleToCreateRepos,
isCreateRepoPending,
isDeleteRepoPending,
isFetchRepoPending,
isFetchReposPending,
isModifyRepoPending,
MODIFY_REPO,
MODIFY_REPO_FAILURE,
MODIFY_REPO_PENDING,
MODIFY_REPO_SUCCESS,
MODIFY_REPO_FAILURE,
MODIFY_REPO,
isModifyRepoPending,
getModifyRepoFailure,
getPermissionsLink
modifyRepo
} from "./repos";
import { Repository, RepositoryCollection } from "@scm-manager/ui-types";

View File

@@ -1,7 +1,7 @@
import fetchMock from "fetch-mock";
import configureMockStore from "redux-mock-store";
import thunk from "redux-thunk";
import {
import reducer, {
FETCH_REPOSITORY_TYPES,
FETCH_REPOSITORY_TYPES_FAILURE,
FETCH_REPOSITORY_TYPES_PENDING,
@@ -13,7 +13,6 @@ import {
isFetchRepositoryTypesPending,
shouldFetchRepositoryTypes
} from "./repositoryTypes";
import reducer from "./repositoryTypes";
const git = {
name: "git",

View File

@@ -1,10 +1,11 @@
import React from "react";
import { shallow, mount } from "@scm-manager/ui-tests/enzyme-router";
import { mount, shallow } from "@scm-manager/ui-tests/enzyme-router";
import "@scm-manager/ui-tests/enzyme";
import "@scm-manager/ui-tests/i18n";
import DeletePermissionButton from "./DeletePermissionButton";
import { confirmAlert } from "@scm-manager/ui-components";
jest.mock("@scm-manager/ui-components", () => ({
confirmAlert: jest.fn(),
DeleteButton: require.requireActual("@scm-manager/ui-components").DeleteButton

View File

@@ -1,6 +1,6 @@
import React from "react";
import { WithTranslation, withTranslation } from "react-i18next";
import { ButtonGroup, Button, SubmitButton, Modal } from "@scm-manager/ui-components";
import { Button, ButtonGroup, Modal, SubmitButton } from "@scm-manager/ui-components";
import PermissionCheckbox from "../../../permissions/components/PermissionCheckbox";
type Props = WithTranslation & {

View File

@@ -5,8 +5,8 @@ import {
Button,
GroupAutocomplete,
LabelWithHelpIcon,
Radio,
Level,
Radio,
SubmitButton,
Subtitle,
UserAutocomplete

View File

@@ -3,14 +3,14 @@ import { connect } from "react-redux";
import { History } from "history";
import { WithTranslation, withTranslation } from "react-i18next";
import styled from "styled-components";
import { RepositoryRole, Permission } from "@scm-manager/ui-types";
import { Permission, RepositoryRole } from "@scm-manager/ui-types";
import { Button, Icon } from "@scm-manager/ui-components";
import {
modifyPermission,
isModifyPermissionPending,
deletePermission,
findVerbsForRole,
isDeletePermissionPending,
findVerbsForRole
isModifyPermissionPending,
modifyPermission
} from "../modules/permissions";
import DeletePermissionButton from "../components/buttons/DeletePermissionButton";
import RoleSelector from "../components/RoleSelector";

View File

@@ -1,7 +1,6 @@
import { Action } from "@scm-manager/ui-components";
import { apiClient } from "@scm-manager/ui-components";
import { Action, apiClient } from "@scm-manager/ui-components";
import * as types from "../../../modules/types";
import { RepositoryRole, Permission, PermissionCollection, PermissionCreateEntry } from "@scm-manager/ui-types";
import { Permission, PermissionCollection, PermissionCreateEntry, RepositoryRole } from "@scm-manager/ui-types";
import { isPending } from "../../../modules/pending";
import { getFailure } from "../../../modules/failure";
import { Dispatch } from "redux";

View File

@@ -5,9 +5,9 @@ import { withRouter } from "react-router-dom";
import { WithTranslation, withTranslation } from "react-i18next";
import styled from "styled-components";
import { binder } from "@scm-manager/ui-extensions";
import { Repository, File } from "@scm-manager/ui-types";
import { File, Repository } from "@scm-manager/ui-types";
import { ErrorNotification, Loading, Notification } from "@scm-manager/ui-components";
import { getFetchSourcesFailure, isFetchSourcesPending, getSources, fetchSources } from "../modules/sources";
import { fetchSources, getFetchSourcesFailure, getSources, isFetchSourcesPending } from "../modules/sources";
import FileTreeLeaf from "./FileTreeLeaf";
type Props = WithTranslation & {

View File

@@ -1,6 +1,6 @@
import React from "react";
import { WithTranslation, withTranslation } from "react-i18next";
import { ButtonAddons, Button } from "@scm-manager/ui-components";
import { Button, ButtonAddons } from "@scm-manager/ui-components";
type Props = WithTranslation & {
className?: string;

View File

@@ -1,8 +1,7 @@
import React from "react";
import { WithTranslation, withTranslation } from "react-i18next";
import { apiClient, SyntaxHighlighter } from "@scm-manager/ui-components";
import { apiClient, ErrorNotification, Loading, SyntaxHighlighter } from "@scm-manager/ui-components";
import { File } from "@scm-manager/ui-types";
import { ErrorNotification, Loading } from "@scm-manager/ui-components";
type Props = WithTranslation & {
file: File;

View File

@@ -1,6 +1,6 @@
import React from "react";
import { File, Changeset, Repository, PagedCollection } from "@scm-manager/ui-types";
import { ErrorNotification, Loading, StatePaginator, ChangesetList } from "@scm-manager/ui-components";
import { Changeset, File, PagedCollection, Repository } from "@scm-manager/ui-types";
import { ChangesetList, ErrorNotification, Loading, StatePaginator } from "@scm-manager/ui-components";
import { getHistory } from "./history";
type Props = {

View File

@@ -1,16 +1,11 @@
import React from "react";
import { connect, Dispatch, DispatchProp, MapDispatchToProps } from "react-redux";
import { connect } from "react-redux";
import { withRouter } from "react-router-dom";
import { WithTranslation, withTranslation } from "react-i18next";
import { Branch, Repository } from "@scm-manager/ui-types";
import { Breadcrumb, ErrorNotification, Loading } from "@scm-manager/ui-components";
import FileTree from "../components/FileTree";
import {
fetchBranches,
getBranches,
getFetchBranchesFailure,
isFetchBranchesPending
} from "../../branches/modules/branches";
import { getFetchBranchesFailure, isFetchBranchesPending } from "../../branches/modules/branches";
import { compose } from "redux";
import Content from "./Content";
import { fetchSources, getSources, isDirectory } from "../modules/sources";

View File

@@ -1,19 +1,19 @@
import { Repository, File } from "@scm-manager/ui-types";
import { File, Repository } from "@scm-manager/ui-types";
import configureMockStore from "redux-mock-store";
import thunk from "redux-thunk";
import fetchMock from "fetch-mock";
import {
default as reducer,
FETCH_SOURCES,
FETCH_SOURCES_FAILURE,
FETCH_SOURCES_PENDING,
FETCH_SOURCES_SUCCESS,
fetchSources,
getFetchSourcesFailure,
isFetchSourcesPending,
default as reducer,
getSources,
fetchSourcesSuccess,
isDirectory
getFetchSourcesFailure,
getSources,
isDirectory,
isFetchSourcesPending
} from "./sources";
const sourcesUrl = "http://localhost:8081/scm/rest/api/v2/repositories/scm/core/sources/";
@@ -198,7 +198,7 @@ describe("selector tests", () => {
const state = {
sources: {
"scm/core/abc/src/main/package.json": {
sources: {noDirectory}
sources: { noDirectory }
}
}
};

View File

@@ -1,5 +1,5 @@
import * as types from "../../../modules/types";
import { Repository, File, Action, Link } from "@scm-manager/ui-types";
import { Action, File, Link, Repository } from "@scm-manager/ui-types";
import { apiClient } from "@scm-manager/ui-components";
import { isPending } from "../../../modules/pending";
import { getFailure } from "../../../modules/failure";