From deeecd652d4b341a385d749e4f2310b45ff3e272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Thu, 23 Aug 2018 11:11:40 +0200 Subject: [PATCH] renaming --- scm-ui/src/permissions/containers/Permissions.js | 5 ++--- scm-ui/src/permissions/modules/permissions.js | 4 ++-- scm-ui/src/permissions/modules/permissions.test.js | 4 ++-- scm-ui/src/permissions/types/Permissions.js | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/scm-ui/src/permissions/containers/Permissions.js b/scm-ui/src/permissions/containers/Permissions.js index ea107289fa..5c1c77b6cc 100644 --- a/scm-ui/src/permissions/containers/Permissions.js +++ b/scm-ui/src/permissions/containers/Permissions.js @@ -8,23 +8,22 @@ import { isFetchPermissionsPending, getPermissionsOfRepo } from "../modules/permissions"; -import type { History } from "history"; import Loading from "../../components/Loading"; import ErrorPage from "../../components/ErrorPage"; +import type {PermissionCollection} from "../types/Permissions"; type Props = { namespace: string, name: string, loading: boolean, error: Error, - permissions: Permissions, + permissions: PermissionCollection, //dispatch functions fetchPermissions: (namespace: string, name: string) => void, // context props t: string => string, - history: History, match: any }; diff --git a/scm-ui/src/permissions/modules/permissions.js b/scm-ui/src/permissions/modules/permissions.js index 84de9df95c..63bf61b6fc 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 { Permissions } from "../types/Permissions"; +import type { PermissionCollection } from "../types/Permissions"; import { isPending } from "../../modules/pending"; import { getFailure } from "../../modules/failure"; @@ -52,7 +52,7 @@ export function fetchPermissionsPending( } export function fetchPermissionsSuccess( - permissions: Permissions, + permissions: PermissionCollection, namespace: string, name: string ): Action { diff --git a/scm-ui/src/permissions/modules/permissions.test.js b/scm-ui/src/permissions/modules/permissions.test.js index 22a2a43249..e0a14f9241 100644 --- a/scm-ui/src/permissions/modules/permissions.test.js +++ b/scm-ui/src/permissions/modules/permissions.test.js @@ -13,7 +13,7 @@ import reducer, { FETCH_PERMISSIONS_SUCCESS, FETCH_PERMISSIONS_FAILURE } from "./permissions"; -import type { Permission, Permissions } from "../types/Permissions"; +import type { Permission, PermissionCollection } from "../types/Permissions"; const hitchhiker_puzzle42Permission_user_eins: Permission = { name: "user_eins", @@ -55,7 +55,7 @@ const hitchhiker_puzzle42Permission_user_zwei: Permission = { } }; -const hitchhiker_puzzle42Permissions: Permissions = [ +const hitchhiker_puzzle42Permissions: PermissionCollection = [ hitchhiker_puzzle42Permission_user_eins, hitchhiker_puzzle42Permission_user_zwei ]; diff --git a/scm-ui/src/permissions/types/Permissions.js b/scm-ui/src/permissions/types/Permissions.js index e76e0dbda4..c292347755 100644 --- a/scm-ui/src/permissions/types/Permissions.js +++ b/scm-ui/src/permissions/types/Permissions.js @@ -8,4 +8,4 @@ export type Permission = { _links: Links }; -export type Permissions = Permission[]; +export type PermissionCollection = Permission[];