Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-13 17:05:43 +01:00
Code Issues Packages Projects Releases Activity

prepare RepoRoleDetailsView

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-05-15 15:21:43 +02:00
parent 77d8a3ad21
commit 8ebd720f8e
2 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-ui/src/config/roles/components/PermissionRoleRow.js
View File

@@ -20,7 +20,8 @@ class PermissionRoleRow extends React.Component<Props> {
render() {
const { baseUrl, role } = this.props;
const to = `${baseUrl}/${encodeURIComponent(role.name)}/info`;
const singleRepoRoleUrl = baseUrl.substring(0, baseUrl.length - 1);
const to = `${singleRepoRoleUrl}/${encodeURIComponent(role.name)}/info`;
return (
<tr>
<td>{this.renderLink(to, role.name, !role._links.update)}</td>

24
scm-ui/src/config/roles/containers/SingleRepositoryRole.js
View File

@@ -14,9 +14,12 @@ import type { Role } from "@scm-manager/ui-types";
import {getRepositoryRolesLink} from "../../../modules/indexResource";
import {ExtensionPoint} from "@scm-manager/ui-extensions";
import {fetchRoleByName, getFetchRoleFailure, getRoleByName, isFetchRolePending} from "../modules/roles";
import RepositoryRoleForm from "./RepositoryRoleForm";
import {withRouter} from "react-router-dom";
import PermissionRoleDetail from "../components/PermissionRoleDetail";
type Props = {
name: string,
roleName: string,
role: Role,
loading: boolean,
error: Error,
@@ -34,7 +37,8 @@ type Props = {
class SingleRepositoryRole extends React.Component<Props> {
componentDidMount() {
this.props.fetchRoleByName(this.props.repositoryRolesLink, this.props.name);
this.props.fetchRoleByName(this.props.repositoryRolesLink, this.props.roleName);
console.log(this.props.match)
}
stripEndingSlash = (url: string) => {
@@ -76,7 +80,7 @@ class SingleRepositoryRole extends React.Component<Props> {
<Page title={role.displayName}>
<div className="columns">
<div className="column is-three-quarters">
<Route path={url} exact component={() => <RepositoryRoleDetailNavLink role={role} />} />
<Route path={url} component={() => <PermissionRoleDetail role={role} />} />
<Route
path={`${url}/settings/general`}
component={() => <EditRepositoryRoleNavLink role={role} />}
@@ -94,14 +98,14 @@ class SingleRepositoryRole extends React.Component<Props> {
}
const mapStateToProps = (state, ownProps) => {
const name = ownProps.match.params.name;
const role = getRoleByName(state, name);
const loading = isFetchRolePending(state, name);
const error = getFetchRoleFailure(state, name);
const roleName = ownProps.match.params.role;
const role = getRoleByName(state, roleName);
const loading = isFetchRolePending(state, roleName);
const error = getFetchRoleFailure(state, roleName);
const repositoryRolesLink = getRepositoryRolesLink(state);
return {
repositoryRolesLink,
name,
roleName,
role,
loading,
error
@@ -116,7 +120,7 @@ const mapDispatchToProps = dispatch => {
};
};
export default connect(
export default withRouter(connect(
mapStateToProps,
mapDispatchToProps
)(translate("users")(SingleRepositoryRole));
)(translate("users")(SingleRepositoryRole)));