From 1e68060a982626d30bd770fe27ace5ddf2a8aaee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maren=20S=C3=BCwer?= Date: Mon, 3 Sep 2018 14:19:44 +0200 Subject: [PATCH] remove if else to show permission add option also in repos without any permissions --- .../src/permissions/containers/Permissions.js | 59 +++++++++---------- 1 file changed, 27 insertions(+), 32 deletions(-) diff --git a/scm-ui/src/permissions/containers/Permissions.js b/scm-ui/src/permissions/containers/Permissions.js index 03d34414eb..67bac16e8b 100644 --- a/scm-ui/src/permissions/containers/Permissions.js +++ b/scm-ui/src/permissions/containers/Permissions.js @@ -15,7 +15,6 @@ import { import Loading from "../../components/Loading"; import ErrorPage from "../../components/ErrorPage"; import type { - Permission, PermissionCollection, PermissionEntry } from "../types/Permissions"; @@ -70,6 +69,7 @@ class Permissions extends React.Component { loadingCreatePermission, hasPermissionToCreate } = this.props; + console.log(permissions); if (error) { return ( @@ -98,36 +98,32 @@ class Permissions extends React.Component { loading={loadingCreatePermission} /> ) : null; - - if (permissions.length > 0) - return ( -
- - - - - - - - - - {permissions.map((permission, index) => { - return ( - - ); - })} - -
{t("permission.name")}{t("permission.type")}{t("permission.group-permission")}
- {createPermissionForm} -
- ); - - return
; + return ( +
+ + + + + + + + + + {permissions.map(permission => { + return ( + + ); + })} + +
{t("permission.name")}{t("permission.type")}{t("permission.group-permission")}
+ {createPermissionForm} +
+ ); } } @@ -142,7 +138,6 @@ const mapStateToProps = (state, ownProps) => { namespace, repoName ); - console.log(permissions); const hasPermissionToCreate = hasCreatePermission(state, namespace, repoName); return { namespace,