Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 23:45:44 +01:00
Code Issues Packages Projects Releases Activity

add createPermission reset and validation for creating

Browse Source
This commit is contained in:
Maren Süwer
2018-09-03 15:17:57 +02:00
parent 1e68060a98
commit bdb6148e54
4 changed files with 65 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scm-ui/src/permissions/containers/Permissions.js
View File

@@ -10,7 +10,7 @@ import {
getPermissionsOfRepo,
hasCreatePermission,
createPermission,
isCreatePermissionPending
isCreatePermissionPending, getCreatePermissionFailure, createPermissionReset
} from "../modules/permissions";
import Loading from "../../components/Loading";
import ErrorPage from "../../components/ErrorPage";
@@ -39,6 +39,7 @@ type Props = {
repoName: string,
callback?: () => void
) => void,
createPermissionReset: (string, string) => void,
// context props
t: string => string,
@@ -48,8 +49,9 @@ type Props = {
class Permissions extends React.Component<Props> {
componentDidMount() {
const { fetchPermissions, namespace, repoName } = this.props;
const { fetchPermissions, namespace, repoName, createPermissionReset } = this.props;
createPermissionReset(namespace, repoName);
fetchPermissions(namespace, repoName);
}
@@ -69,7 +71,6 @@ class Permissions extends React.Component<Props> {
loadingCreatePermission,
hasPermissionToCreate
} = this.props;
console.log(permissions);
if (error) {
return (
@@ -96,6 +97,7 @@ class Permissions extends React.Component<Props> {
)
}
loading={loadingCreatePermission}
currentPermissions={permissions}
/>
) : null;
return (
@@ -130,7 +132,7 @@ class Permissions extends React.Component<Props> {
const mapStateToProps = (state, ownProps) => {
const namespace = ownProps.namespace;
const repoName = ownProps.repoName;
const error = getFetchPermissionsFailure(state, namespace, repoName);
const error = getFetchPermissionsFailure(state, namespace, repoName) || getCreatePermissionFailure(state, namespace, repoName);
const loading = isFetchPermissionsPending(state, namespace, repoName);
const permissions = getPermissionsOfRepo(state, namespace, repoName);
const loadingCreatePermission = isCreatePermissionPending(
@@ -162,6 +164,12 @@ const mapDispatchToProps = dispatch => {
callback?: () => void
) => {
dispatch(createPermission(permission, namespace, repoName, callback));
},
createPermissionReset: (
namespace: string,
repoName: string
) => {
dispatch(createPermissionReset(namespace, repoName));
}
};
};