diff --git a/scm-ui/src/permissions/components/CreatePermissionForm.js b/scm-ui/src/permissions/components/CreatePermissionForm.js index f045bbe0df..c0f5b82bc9 100644 --- a/scm-ui/src/permissions/components/CreatePermissionForm.js +++ b/scm-ui/src/permissions/components/CreatePermissionForm.js @@ -3,12 +3,12 @@ import React from "react"; import { translate } from "react-i18next"; import { Checkbox, InputField } from "../../components/forms"; import TypeSelector from "./TypeSelector"; -import type { Permission } from "../types/Permissions"; +import type {PermissionEntry} from "../types/Permissions"; import { SubmitButton } from "../../components/buttons"; type Props = { t: string => string, - createPermission: (permission: Permission) => void, + createPermission: (permission: PermissionEntry) => void, loading: boolean }; diff --git a/scm-ui/src/permissions/containers/Permissions.js b/scm-ui/src/permissions/containers/Permissions.js index 2888152f96..a6b034e52a 100644 --- a/scm-ui/src/permissions/containers/Permissions.js +++ b/scm-ui/src/permissions/containers/Permissions.js @@ -13,7 +13,7 @@ import { } from "../modules/permissions"; import Loading from "../../components/Loading"; import ErrorPage from "../../components/ErrorPage"; -import type { Permission, PermissionCollection } from "../types/Permissions"; +import type {Permission, PermissionCollection, PermissionEntry} from "../types/Permissions"; import SinglePermission from "./SinglePermission"; import CreatePermissionForm from "../components/CreatePermissionForm"; @@ -29,7 +29,7 @@ type Props = { //dispatch functions fetchPermissions: (namespace: string, repoName: string) => void, createPermission: ( - permission: Permission, + permission: PermissionEntry, namespace: string, repoName: string ) => void, @@ -143,7 +143,7 @@ const mapDispatchToProps = dispatch => { dispatch(fetchPermissions(namespace, repoName)); }, createPermission: ( - permission: Permission, + permission: PermissionEntry, namespace: string, repoName: string ) => { diff --git a/scm-ui/src/permissions/modules/permissions.js b/scm-ui/src/permissions/modules/permissions.js index ba29f178e3..222d9fc594 100644 --- a/scm-ui/src/permissions/modules/permissions.js +++ b/scm-ui/src/permissions/modules/permissions.js @@ -2,7 +2,7 @@ import { apiClient } from "../../apiclient"; import * as types from "../../modules/types"; import type { Action } from "../../types/Action"; -import type { PermissionCollection, Permission } from "../types/Permissions"; +import type {PermissionCollection, Permission, PermissionEntry} from "../types/Permissions"; import { isPending } from "../../modules/pending"; import { getFailure } from "../../modules/failure"; import { Dispatch } from "redux"; @@ -206,7 +206,7 @@ export function modifyPermissionReset( // create permission export function createPermission( - permission: Permission, + permission: PermissionEntry, namespace: string, repoName: string, callback?: () => void @@ -240,7 +240,7 @@ export function createPermission( } export function createPermissionPending( - permission: Permission, + permission: PermissionEntry, namespace: string, repoName: string ): Action { @@ -252,7 +252,7 @@ export function createPermissionPending( } export function createPermissionSuccess( - permission: Permission, + permission: PermissionEntry, namespace: string, repoName: string ): Action { diff --git a/scm-ui/src/permissions/modules/permissions.test.js b/scm-ui/src/permissions/modules/permissions.test.js index f786b9f14d..edd51e232b 100644 --- a/scm-ui/src/permissions/modules/permissions.test.js +++ b/scm-ui/src/permissions/modules/permissions.test.js @@ -40,6 +40,9 @@ import reducer, { } from "./permissions"; import type { Permission, PermissionCollection } from "../types/Permissions"; +const namespace = "hitchhiker"; +const repoName = "puzzle42"; + const hitchhiker_puzzle42Permission_user_eins: Permission = { name: "user_eins", type: "READ", @@ -115,7 +118,7 @@ describe("permission fetch", () => { { type: FETCH_PERMISSIONS_PENDING, payload: { - namespace: "hitchhiker", + namespace: namespace, repoName: "puzzle42" }, itemId: "hitchhiker/puzzle42" diff --git a/scm-ui/src/permissions/types/Permissions.js b/scm-ui/src/permissions/types/Permissions.js index e3bd697fc5..00b3d13748 100644 --- a/scm-ui/src/permissions/types/Permissions.js +++ b/scm-ui/src/permissions/types/Permissions.js @@ -5,7 +5,13 @@ export type Permission = { name: string, type: string, groupPermission: boolean, - _links?: Links + _links: Links }; +export type PermissionEntry = { + name: string, + type: string, + groupPermission: boolean +} + export type PermissionCollection = Permission[];