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

update EditRepositoryRole / fix Translationkeys

Browse Source
This commit is contained in:
Eduard Heimbuch
2019-05-16 08:55:31 +02:00
parent a726005730
commit 8fbe20afd6
8 changed files with 57 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-ui/src/config/containers/Config.js
View File

@@ -57,7 +57,7 @@ class Config extends React.Component<Props> {
<Route path={url} exact component={GlobalConfig} /> <Route path={url} exact component={GlobalConfig} />
<Route <Route
path={`${url}/role/:role`} path={`${url}/role/:role`}
render={() => <SingleRepositoryRole baseUrl={`${url}/roles`} />} render={() => <SingleRepositoryRole baseUrl={`${url}/roles`} history={this.props.history} />}
/> />
<Route <Route
path={`${url}/roles`} path={`${url}/roles`}
@@ -83,7 +83,7 @@ class Config extends React.Component<Props> {
/> />
<NavLink <NavLink
to={`${url}/roles`} to={`${url}/roles`}
label={t("roles.navLink")} label={t("repositoryRole.navLink")}
activeWhenMatch={this.matchesRoles} activeWhenMatch={this.matchesRoles}
/> />
<ExtensionPoint <ExtensionPoint

31
scm-ui/src/config/roles/components/PermissionRoleDetails.js
View File

@@ -4,36 +4,47 @@ import { translate } from "react-i18next";
import type { Role } from "@scm-manager/ui-types"; import type { Role } from "@scm-manager/ui-types";
import ExtensionPoint from "@scm-manager/ui-extensions/lib/ExtensionPoint"; import ExtensionPoint from "@scm-manager/ui-extensions/lib/ExtensionPoint";
import PermissionRoleDetailsTable from "./PermissionRoleDetailsTable"; import PermissionRoleDetailsTable from "./PermissionRoleDetailsTable";
import {Button, Subtitle} from "@scm-manager/ui-components"; import { Button, Subtitle } from "@scm-manager/ui-components";
type Props = { type Props = {
role: Role, role: Role,
url: string, url: string,
// context props // context props
t: string => string, t: string => string
}; };
class PermissionRoleDetails extends React.Component<Props> { class PermissionRoleDetails extends React.Component<Props> {
renderEditButton() {
const { t, url } = this.props;
if (!!this.props.role._links.update) {
return (
<Button
label={t("repositoryRole.button.edit")}
link={`${url}/edit`}
color="primary"
/>
);
}
return null;
}
render() { render() {
const { role, url } = this.props; const { role } = this.props;
return ( return (
<div> <div>
<PermissionRoleDetailsTable role={role}/> <PermissionRoleDetailsTable role={role} />
<hr/> <hr />
<Subtitle subtitle={"repositoryRoles.edit"}/> {this.renderEditButton()}
<Button label={"test"} link={`${url}/edit`} color="primary" />
<div className="content"> <div className="content">
<ExtensionPoint <ExtensionPoint
name="roles.repositoryRole-details.information" name="repositoryRole.role-details.information"
renderAll={true} renderAll={true}
props={{ role }} props={{ role }}
/> />
</div> </div>
</div> </div>
); );
} }
} }

2
scm-ui/src/config/roles/components/PermissionRoleTable.js
View File

@@ -18,7 +18,7 @@ class PermissionRoleTable extends React.Component<Props> {
<table className="card-table table is-hoverable is-fullwidth"> <table className="card-table table is-hoverable is-fullwidth">
<thead> <thead>
<tr> <tr>
<th>{t("roles.form.name")}</th> <th>{t("repositoryRole.form.name")}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

2
scm-ui/src/config/roles/containers/CreateRepositoryRole.js
View File

@@ -26,7 +26,7 @@ class CreateRepositoryRole extends React.Component<Props> {
repositoryRoleCreated = (role: Role) => { repositoryRoleCreated = (role: Role) => {
const { history } = this.props; const { history } = this.props;
history.push("/config/role/" + role.name); history.push("/config/role/" + role.name + "/info");
}; };
createRepositoryRole = (role: Role) => { createRepositoryRole = (role: Role) => {

6
scm-ui/src/config/roles/containers/EditRepositoryRole.js
View File

@@ -25,7 +25,7 @@ class EditRepositoryRole extends React.Component<Props> {
repositoryRoleUpdated = (role: Role) => { repositoryRoleUpdated = (role: Role) => {
const { history } = this.props; const { history } = this.props;
history.push("/config/role/" + role.name); history.push("/config/roles");
}; };
updateRepositoryRole = (role: Role) => { updateRepositoryRole = (role: Role) => {
@@ -38,13 +38,13 @@ class EditRepositoryRole extends React.Component<Props> {
return ( return (
<> <>
<RepositoryRoleForm <RepositoryRoleForm
disabled={false} nameDisabled={true}
role={this.props.role} role={this.props.role}
submitForm={role => this.updateRepositoryRole(role)} submitForm={role => this.updateRepositoryRole(role)}
/> />
</> </>
); );
} }w
} }
const mapStateToProps = (state, ownProps) => { const mapStateToProps = (state, ownProps) => {

14
scm-ui/src/config/roles/containers/RepositoryRoleForm.js
View File

@@ -16,7 +16,7 @@ import {getRepositoryRolesLink, getRepositoryVerbsLink} from "../../../modules/i
type Props = { type Props = {
role?: Role, role?: Role,
loading?: boolean, loading?: boolean,
disabled: boolean, nameDisabled: boolean,
availableVerbs: string[], availableVerbs: string[],
verbsLink: string, verbsLink: string,
submitForm: Role => void, submitForm: Role => void,
@@ -63,7 +63,7 @@ class RepositoryRoleForm extends React.Component<Props, State> {
return !( return !(
this.isFalsy(role) || this.isFalsy(role) ||
this.isFalsy(role.name) || this.isFalsy(role.name) ||
this.isFalsy(role.verbs) this.isFalsy(role.verbs.length > 0)
); );
}; };
@@ -100,7 +100,7 @@ class RepositoryRoleForm extends React.Component<Props, State> {
}; };
render() { render() {
const { loading, availableVerbs, disabled, t } = this.props; const { loading, availableVerbs, nameDisabled, t } = this.props;
const { role } = this.state; const { role } = this.state;
const verbSelectBoxes = !availableVerbs const verbSelectBoxes = !availableVerbs
@@ -120,10 +120,10 @@ class RepositoryRoleForm extends React.Component<Props, State> {
<div className="column"> <div className="column">
<InputField <InputField
name="name" name="name"
label={t("roles.create.name")} label={t("repositoryRole.create.name")}
onChange={this.handleNameChange} onChange={this.handleNameChange}
value={role.name ? role.name : ""} value={role.name ? role.name : ""}
disabled={disabled} disabled={nameDisabled}
/> />
</div> </div>
</div> </div>
@@ -133,8 +133,8 @@ class RepositoryRoleForm extends React.Component<Props, State> {
<div className="column"> <div className="column">
<SubmitButton <SubmitButton
loading={loading} loading={loading}
label={t("roles.create.submit")} label={t("repositoryRole.form.submit")}
disabled={disabled || !this.isValid()} disabled={!this.isValid()}
/> />
</div> </div>
</div> </div>

6
scm-ui/src/config/roles/containers/RepositoryRoles.js
View File

@@ -56,7 +56,7 @@ class RepositoryRoles extends React.Component<Props> {
return ( return (
<div> <div>
<Title title={t("roles.title")} /> <Title title={t("repositoryRole.title")} />
{this.renderPermissionsTable()} {this.renderPermissionsTable()}
{this.renderCreateButton()} {this.renderCreateButton()}
</div> </div>
@@ -74,14 +74,14 @@ class RepositoryRoles extends React.Component<Props> {
); );
} }
return ( return (
<Notification type="info">{t("roles.noPermissionRoles")}</Notification> <Notification type="info">{t("repositoryRole.noPermissionRoles")}</Notification>
); );
} }
renderCreateButton() { renderCreateButton() {
const { canAddRoles, baseUrl, t } = this.props; const { canAddRoles, baseUrl, t } = this.props;
if (canAddRoles) { if (canAddRoles) {
return <CreateButton label={t("roles.createButton")} link={`${baseUrl}/create`} />; return <CreateButton label={t("repositoryRole.createButton")} link={`${baseUrl}/create`} />;
} }
return null; return null;
} }

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

@@ -4,7 +4,6 @@ import { connect } from "react-redux";
import { Loading, ErrorPage, Title } from "@scm-manager/ui-components"; import { Loading, ErrorPage, Title } from "@scm-manager/ui-components";
import { Route } from "react-router"; import { Route } from "react-router";
import type { History } from "history"; import type { History } from "history";
import { EditRepositoryRoleNavLink } from "../../components/navLinks";
import { translate } from "react-i18next"; import { translate } from "react-i18next";
import type { Role } from "@scm-manager/ui-types"; import type { Role } from "@scm-manager/ui-types";
import { getRepositoryRolesLink } from "../../../modules/indexResource"; import { getRepositoryRolesLink } from "../../../modules/indexResource";
@@ -18,7 +17,6 @@ import {
import { withRouter } from "react-router-dom"; import { withRouter } from "react-router-dom";
import PermissionRoleDetail from "../components/PermissionRoleDetails"; import PermissionRoleDetail from "../components/PermissionRoleDetails";
import EditRepositoryRole from "./EditRepositoryRole"; import EditRepositoryRole from "./EditRepositoryRole";
import Switch from "react-router-dom/es/Switch";
type Props = { type Props = {
roleName: string, roleName: string,
@@ -43,7 +41,6 @@ class SingleRepositoryRole extends React.Component<Props> {
this.props.repositoryRolesLink, this.props.repositoryRolesLink,
this.props.roleName this.props.roleName
); );
console.log(this.props.match);
} }
stripEndingSlash = (url: string) => { stripEndingSlash = (url: string) => {
@@ -67,7 +64,7 @@ class SingleRepositoryRole extends React.Component<Props> {
subtitle={t("singleUser.errorSubtitle")} subtitle={t("singleUser.errorSubtitle")}
error={error} error={error}
/> />
); );0
} }
if (!role || loading) { if (!role || loading) {
@@ -83,17 +80,19 @@ class SingleRepositoryRole extends React.Component<Props> {
return ( return (
<> <>
<Title title={t("repositoryRoles.title")} /> <Title title={t("repositoryRole.title")} />
<div className="columns"> <div className="columns">
<div className="column is-three-quarters"> <div className="column is-three-quarters">
<Route <Route
path={url} path={`${url}/info`}
component={() => <PermissionRoleDetail role={role} url={url} />} component={() => (
<PermissionRoleDetail role={role} url={url} />
)}
/> />
<Route <Route
path={`${url}`} path={`${url}/edit`}
exact exact
component={() => <EditRepositoryRole role={role} />} component={() => <EditRepositoryRole role={role} history={this.props.history} />}
/> />
<ExtensionPoint <ExtensionPoint
name="roles.route" name="roles.route"