From d997fc09b39055e71168a980be05e1ba11025784 Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Mon, 28 Jan 2019 16:48:57 +0100 Subject: [PATCH] Fixed minor flow issues --- .../components/permissionValidation.test.js | 6 ++++-- .../permissions/containers/SinglePermission.js | 4 ++-- .../permissions/modules/permissions.test.js | 18 ++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/scm-ui/src/repos/permissions/components/permissionValidation.test.js b/scm-ui/src/repos/permissions/components/permissionValidation.test.js index b2e7e8be68..1149075537 100644 --- a/scm-ui/src/repos/permissions/components/permissionValidation.test.js +++ b/scm-ui/src/repos/permissions/components/permissionValidation.test.js @@ -18,7 +18,8 @@ describe("permission validation", () => { name: "PermissionName", groupPermission: true, type: "READ", - _links: {} + _links: {}, + verbs: [] } ]; const name = "PermissionName"; @@ -35,7 +36,8 @@ describe("permission validation", () => { name: "PermissionName", groupPermission: false, type: "READ", - _links: {} + _links: {}, + verbs: [] } ]; const name = "PermissionName"; diff --git a/scm-ui/src/repos/permissions/containers/SinglePermission.js b/scm-ui/src/repos/permissions/containers/SinglePermission.js index 52f671baf2..b16d26e903 100644 --- a/scm-ui/src/repos/permissions/containers/SinglePermission.js +++ b/scm-ui/src/repos/permissions/containers/SinglePermission.js @@ -22,7 +22,7 @@ import AdvancedPermissionsDialog from "./AdvancedPermissionsDialog"; type Props = { availablePermissions: AvailableRepositoryPermissions, submitForm: Permission => void, - modifyPermission: (Permission, string, string) => void, + modifyPermission: (permission: Permission, namespace: string, name: string) => void, permission: Permission, t: string => string, namespace: string, @@ -30,7 +30,7 @@ type Props = { match: any, history: History, loading: boolean, - deletePermission: (Permission, string, string) => void, + deletePermission: (permission: Permission, namespace: string, name: string) => void, deleteLoading: boolean }; diff --git a/scm-ui/src/repos/permissions/modules/permissions.test.js b/scm-ui/src/repos/permissions/modules/permissions.test.js index 8ac02b7ec0..5c3e9cce31 100644 --- a/scm-ui/src/repos/permissions/modules/permissions.test.js +++ b/scm-ui/src/repos/permissions/modules/permissions.test.js @@ -59,7 +59,8 @@ const hitchhiker_puzzle42Permission_user_eins: Permission = { href: "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/puzzle42/permissions/user_eins" } - } + }, + verbs: [] }; const hitchhiker_puzzle42Permission_user_zwei: Permission = { @@ -79,7 +80,8 @@ const hitchhiker_puzzle42Permission_user_zwei: Permission = { href: "http://localhost:8081/scm/api/rest/v2/repositories/hitchhiker/puzzle42/permissions/user_zwei" } - } + }, + verbs: [] }; const hitchhiker_puzzle42Permissions: PermissionCollection = [ @@ -175,8 +177,7 @@ describe("permission fetch", () => { } ); - let editedPermission = { ...hitchhiker_puzzle42Permission_user_eins }; - editedPermission.type = "OWNER"; + let editedPermission = { ...hitchhiker_puzzle42Permission_user_eins, type: "OWNER" }; const store = mockStore({}); @@ -197,8 +198,7 @@ describe("permission fetch", () => { } ); - let editedPermission = { ...hitchhiker_puzzle42Permission_user_eins }; - editedPermission.type = "OWNER"; + let editedPermission = { ...hitchhiker_puzzle42Permission_user_eins, type: "OWNER" }; const store = mockStore({}); @@ -227,8 +227,7 @@ describe("permission fetch", () => { } ); - let editedPermission = { ...hitchhiker_puzzle42Permission_user_eins }; - editedPermission.type = "OWNER"; + let editedPermission = { ...hitchhiker_puzzle42Permission_user_eins, type: "OWNER" }; const store = mockStore({}); @@ -451,8 +450,7 @@ describe("permissions reducer", () => { entries: [hitchhiker_puzzle42Permission_user_eins] } }; - let permissionEdited = { ...hitchhiker_puzzle42Permission_user_eins }; - permissionEdited.type = "OWNER"; + let permissionEdited = { ...hitchhiker_puzzle42Permission_user_eins, type: "OWNER" }; let expectedState = { "hitchhiker/puzzle42": { entries: [permissionEdited]