diff --git a/scm-ui/src/createReduxStore.js b/scm-ui/src/createReduxStore.js index 7c84b55013..9906091162 100644 --- a/scm-ui/src/createReduxStore.js +++ b/scm-ui/src/createReduxStore.js @@ -11,7 +11,7 @@ import groups from "./groups/modules/groups"; import auth from "./modules/auth"; import pending from "./modules/pending"; import failure from "./modules/failure"; -import permissions from "./permissions/modules/permissions"; +import permissions from "./repos/permissions/modules/permissions"; import config from "./config/modules/config"; import type { BrowserHistory } from "history/createBrowserHistory"; diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js index 920bc26031..8119071ac1 100644 --- a/scm-ui/src/repos/containers/RepositoryRoot.js +++ b/scm-ui/src/repos/containers/RepositoryRoot.js @@ -22,7 +22,7 @@ import { translate } from "react-i18next"; import RepositoryDetails from "../components/RepositoryDetails"; import DeleteNavAction from "../components/DeleteNavAction"; import Edit from "../containers/Edit"; -import Permissions from "../../permissions/containers/Permissions"; +import Permissions from "../permissions/containers/Permissions"; import type { History } from "history"; import EditNavLink from "../components/EditNavLink"; diff --git a/scm-ui/src/permissions/components/CreatePermissionForm.js b/scm-ui/src/repos/permissions/components/CreatePermissionForm.js similarity index 96% rename from scm-ui/src/permissions/components/CreatePermissionForm.js rename to scm-ui/src/repos/permissions/components/CreatePermissionForm.js index be6a71aa12..143f5f1065 100644 --- a/scm-ui/src/permissions/components/CreatePermissionForm.js +++ b/scm-ui/src/repos/permissions/components/CreatePermissionForm.js @@ -1,7 +1,7 @@ // @flow import React from "react"; import { translate } from "react-i18next"; -import { Checkbox, InputField, SubmitButton } from "@scm-manager/ui-components"; +import { Checkbox, InputField, SubmitButton } from "../../../../../scm-ui-components/packages/ui-components/src/index"; import TypeSelector from "./TypeSelector"; import type { PermissionCollection, diff --git a/scm-ui/src/permissions/components/TypeSelector.js b/scm-ui/src/repos/permissions/components/TypeSelector.js similarity index 91% rename from scm-ui/src/permissions/components/TypeSelector.js rename to scm-ui/src/repos/permissions/components/TypeSelector.js index 2422868941..80d522d3e6 100644 --- a/scm-ui/src/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-manager/ui-components"; +} from "../../../../../scm-ui-components/packages/ui-components/src/index"; type Props = { t: string => string, diff --git a/scm-ui/src/permissions/components/buttons/DeletePermissionButton.js b/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js similarity index 95% rename from scm-ui/src/permissions/components/buttons/DeletePermissionButton.js rename to scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js index 9f81a5c88f..540b606d67 100644 --- a/scm-ui/src/permissions/components/buttons/DeletePermissionButton.js +++ b/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.js @@ -5,7 +5,7 @@ import type { Permission } from "../../types/Permissions"; import { confirmAlert, DeleteButton -} from "@scm-manager/ui-components"; +} from "../../../../../../scm-ui-components/packages/ui-components/src/index"; type Props = { permission: Permission, diff --git a/scm-ui/src/permissions/components/buttons/DeletePermissionButton.test.js b/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.test.js similarity index 94% rename from scm-ui/src/permissions/components/buttons/DeletePermissionButton.test.js rename to scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.test.js index cf6bc2d9a0..450dc352fc 100644 --- a/scm-ui/src/permissions/components/buttons/DeletePermissionButton.test.js +++ b/scm-ui/src/repos/permissions/components/buttons/DeletePermissionButton.test.js @@ -1,7 +1,7 @@ import React from "react"; import { mount, shallow } from "enzyme"; -import "../../../tests/enzyme"; -import "../../../tests/i18n"; +import "../../../../tests/enzyme"; +import "../../../../tests/i18n"; import DeletePermissionButton from "./DeletePermissionButton"; import { confirmAlert } from "@scm-manager/ui-components"; @@ -10,7 +10,7 @@ jest.mock("@scm-manager/ui-components", () => ({ NavAction: require.requireActual("@scm-manager/ui-components").NavAction })); -xdescribe("DeletePermissionButton", () => { +describe("DeletePermissionButton", () => { it("should render nothing, if the delete link is missing", () => { const permission = { _links: {} diff --git a/scm-ui/src/permissions/containers/Permissions.js b/scm-ui/src/repos/permissions/containers/Permissions.js similarity index 98% rename from scm-ui/src/permissions/containers/Permissions.js rename to scm-ui/src/repos/permissions/containers/Permissions.js index 93409a47ad..6062f60f10 100644 --- a/scm-ui/src/permissions/containers/Permissions.js +++ b/scm-ui/src/repos/permissions/containers/Permissions.js @@ -17,7 +17,7 @@ import { modifyPermissionReset, deletePermissionReset } from "../modules/permissions"; -import { Loading, ErrorPage } from "@scm-manager/ui-components"; +import { Loading, ErrorPage } from "../../../../../scm-ui-components/packages/ui-components/src/index"; import type { Permission, PermissionCollection, diff --git a/scm-ui/src/permissions/containers/SinglePermission.js b/scm-ui/src/repos/permissions/containers/SinglePermission.js similarity index 97% rename from scm-ui/src/permissions/containers/SinglePermission.js rename to scm-ui/src/repos/permissions/containers/SinglePermission.js index a96788296f..c4ab746a71 100644 --- a/scm-ui/src/permissions/containers/SinglePermission.js +++ b/scm-ui/src/repos/permissions/containers/SinglePermission.js @@ -10,7 +10,7 @@ import { } from "../modules/permissions"; import { connect } from "react-redux"; import type { History } from "history"; -import { Checkbox } from "@scm-manager/ui-components"; +import { Checkbox } from "../../../../../scm-ui-components/packages/ui-components/src/index"; import DeletePermissionButton from "../components/buttons/DeletePermissionButton"; import TypeSelector from "../components/TypeSelector"; diff --git a/scm-ui/src/permissions/modules/permissions.js b/scm-ui/src/repos/permissions/modules/permissions.js similarity index 97% rename from scm-ui/src/permissions/modules/permissions.js rename to scm-ui/src/repos/permissions/modules/permissions.js index aa05f37fda..089a1afb34 100644 --- a/scm-ui/src/permissions/modules/permissions.js +++ b/scm-ui/src/repos/permissions/modules/permissions.js @@ -1,15 +1,15 @@ // @flow -import { apiClient } from "@scm-manager/ui-components"; -import * as types from "../../modules/types"; -import type { Action } from "@scm-manager/ui-types"; +import { apiClient } from "../../../../../scm-ui-components/packages/ui-components/src/index"; +import * as types from "../../../modules/types"; +import type { Action } from "../../../../../scm-ui-components/packages/ui-types/src/index"; import type { PermissionCollection, Permission, PermissionEntry } from "../types/Permissions"; -import { isPending } from "../../modules/pending"; -import { getFailure } from "../../modules/failure"; +import { isPending } from "../../../modules/pending"; +import { getFailure } from "../../../modules/failure"; import { Dispatch } from "redux"; export const FETCH_PERMISSIONS = "scm/permissions/FETCH_PERMISSIONS"; diff --git a/scm-ui/src/permissions/modules/permissions.test.js b/scm-ui/src/repos/permissions/modules/permissions.test.js similarity index 100% rename from scm-ui/src/permissions/modules/permissions.test.js rename to scm-ui/src/repos/permissions/modules/permissions.test.js diff --git a/scm-ui/src/permissions/types/Permissions.js b/scm-ui/src/repos/permissions/types/Permissions.js similarity index 100% rename from scm-ui/src/permissions/types/Permissions.js rename to scm-ui/src/repos/permissions/types/Permissions.js