From 29b205292a7c84d32c95f1a37c4ae62ada08a9bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Thu, 13 Sep 2018 09:41:45 +0200 Subject: [PATCH] use correct imports and put permission types to ui-components --- .../packages/ui-types/src/RepositoryPermissions.js | 4 ++-- scm-ui-components/packages/ui-types/src/index.js | 2 ++ .../repos/permissions/components/CreatePermissionForm.js | 8 ++------ scm-ui/src/repos/permissions/components/TypeSelector.js | 2 +- .../components/buttons/DeletePermissionButton.js | 2 +- scm-ui/src/repos/permissions/containers/Permissions.js | 4 ++-- .../src/repos/permissions/containers/SinglePermission.js | 4 ++-- scm-ui/src/repos/permissions/modules/permissions.js | 6 +++--- scm-ui/src/repos/permissions/modules/permissions.test.js | 2 +- 9 files changed, 16 insertions(+), 18 deletions(-) rename scm-ui/src/repos/permissions/types/Permissions.js => scm-ui-components/packages/ui-types/src/RepositoryPermissions.js (79%) diff --git a/scm-ui/src/repos/permissions/types/Permissions.js b/scm-ui-components/packages/ui-types/src/RepositoryPermissions.js similarity index 79% rename from scm-ui/src/repos/permissions/types/Permissions.js rename to scm-ui-components/packages/ui-types/src/RepositoryPermissions.js index 00b3d13748..ceb5fe135e 100644 --- a/scm-ui/src/repos/permissions/types/Permissions.js +++ b/scm-ui-components/packages/ui-types/src/RepositoryPermissions.js @@ -1,11 +1,11 @@ //@flow -import type { Links } from "../../types/hal"; +import type { Links } from "./hal"; export type Permission = { name: string, type: string, groupPermission: boolean, - _links: Links + _links?: Links }; export type PermissionEntry = { diff --git a/scm-ui-components/packages/ui-types/src/index.js b/scm-ui-components/packages/ui-types/src/index.js index 109fb9bb6a..4b9e6c3810 100644 --- a/scm-ui-components/packages/ui-types/src/index.js +++ b/scm-ui-components/packages/ui-types/src/index.js @@ -10,3 +10,5 @@ export type { Repository, RepositoryCollection, RepositoryGroup } from "./Reposi export type { RepositoryType, RepositoryTypeCollection } from "./RepositoryTypes"; export type { Config } from "./Config"; + +export type { Permission, PermissionEntry, PermissionCollection } from "./RepositoryPermissions"; diff --git a/scm-ui/src/repos/permissions/components/CreatePermissionForm.js b/scm-ui/src/repos/permissions/components/CreatePermissionForm.js index 417f3480fc..2261c89d3b 100644 --- a/scm-ui/src/repos/permissions/components/CreatePermissionForm.js +++ b/scm-ui/src/repos/permissions/components/CreatePermissionForm.js @@ -1,16 +1,12 @@ // @flow import React from "react"; import { translate } from "react-i18next"; -import { - Checkbox, - InputField, - SubmitButton -} from "../../../../../scm-ui-components/packages/ui-components/src/index"; +import { Checkbox, InputField, SubmitButton } from "@scm-manager/ui-components"; import TypeSelector from "./TypeSelector"; import type { PermissionCollection, PermissionEntry -} from "../types/Permissions"; +} from "@scm-manager/ui-types"; type Props = { t: string => string, diff --git a/scm-ui/src/repos/permissions/components/TypeSelector.js b/scm-ui/src/repos/permissions/components/TypeSelector.js index 80d522d3e6..2422868941 100644 --- a/scm-ui/src/repos/permissions/components/TypeSelector.js +++ b/scm-ui/src/repos/permissions/components/TypeSelector.js @@ -3,7 +3,7 @@ import React from "react"; import { translate } from "react-i18next"; import { Select -} from "../../../../../scm-ui-components/packages/ui-components/src/index"; +} from "@scm-manager/ui-components"; type Props = { t: string => string, diff --git a/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js b/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js index 25407e4f54..05831e9a07 100644 --- a/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js +++ b/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js @@ -1,7 +1,7 @@ // @flow import React from "react"; import { translate } from "react-i18next"; -import type { Permission } from "../../types/Permissions"; +import type { Permission } from "@scm-manager/ui-types"; import { confirmAlert, DeleteButton } from "@scm-manager/ui-components"; type Props = { diff --git a/scm-ui/src/repos/permissions/containers/Permissions.js b/scm-ui/src/repos/permissions/containers/Permissions.js index 6062f60f10..97d65d91fc 100644 --- a/scm-ui/src/repos/permissions/containers/Permissions.js +++ b/scm-ui/src/repos/permissions/containers/Permissions.js @@ -17,12 +17,12 @@ import { modifyPermissionReset, deletePermissionReset } from "../modules/permissions"; -import { Loading, ErrorPage } from "../../../../../scm-ui-components/packages/ui-components/src/index"; +import { Loading, ErrorPage } from "@scm-manager/ui-components"; import type { Permission, PermissionCollection, PermissionEntry -} from "../types/Permissions"; +} from "@scm-manager/ui-types"; import SinglePermission from "./SinglePermission"; import CreatePermissionForm from "../components/CreatePermissionForm"; import type { History } from "history"; diff --git a/scm-ui/src/repos/permissions/containers/SinglePermission.js b/scm-ui/src/repos/permissions/containers/SinglePermission.js index c4ab746a71..2e3294b3d9 100644 --- a/scm-ui/src/repos/permissions/containers/SinglePermission.js +++ b/scm-ui/src/repos/permissions/containers/SinglePermission.js @@ -1,6 +1,6 @@ // @flow import React from "react"; -import type { Permission } from "../types/Permissions"; +import type { Permission } from "@scm-manager/ui-types"; import { translate } from "react-i18next"; import { modifyPermission, @@ -10,7 +10,7 @@ import { } from "../modules/permissions"; import { connect } from "react-redux"; import type { History } from "history"; -import { Checkbox } from "../../../../../scm-ui-components/packages/ui-components/src/index"; +import { Checkbox } from "@scm-manager/ui-components"; import DeletePermissionButton from "../components/buttons/DeletePermissionButton"; import TypeSelector from "../components/TypeSelector"; diff --git a/scm-ui/src/repos/permissions/modules/permissions.js b/scm-ui/src/repos/permissions/modules/permissions.js index 089a1afb34..fc0e10e03a 100644 --- a/scm-ui/src/repos/permissions/modules/permissions.js +++ b/scm-ui/src/repos/permissions/modules/permissions.js @@ -1,13 +1,13 @@ // @flow -import { apiClient } from "../../../../../scm-ui-components/packages/ui-components/src/index"; +import { apiClient } from "@scm-manager/ui-components"; import * as types from "../../../modules/types"; -import type { Action } from "../../../../../scm-ui-components/packages/ui-types/src/index"; +import type { Action } from "@scm-manager/ui-components"; import type { PermissionCollection, Permission, PermissionEntry -} from "../types/Permissions"; +} from "@scm-manager/ui-types"; import { isPending } from "../../../modules/pending"; import { getFailure } from "../../../modules/failure"; import { Dispatch } from "redux"; diff --git a/scm-ui/src/repos/permissions/modules/permissions.test.js b/scm-ui/src/repos/permissions/modules/permissions.test.js index 4eb26f5efa..f96c313a52 100644 --- a/scm-ui/src/repos/permissions/modules/permissions.test.js +++ b/scm-ui/src/repos/permissions/modules/permissions.test.js @@ -40,7 +40,7 @@ import reducer, { isCreatePermissionPending, getDeletePermissionsFailure } from "./permissions"; -import type { Permission, PermissionCollection } from "../types/Permissions"; +import type { Permission, PermissionCollection } from "@scm-manager/ui-types"; const hitchhiker_puzzle42Permission_user_eins: Permission = { name: "user_eins",