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

renamed edituser to generaluser

Browse Source
This commit is contained in:
Florian Scholdei
2019-01-23 09:17:53 +01:00
parent ac28d7d019
commit 904f5851a7
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-ui/src/users/components/navLinks/EditUserNavLink.js → scm-ui/src/users/components/navLinks/GeneralUserNavLink.js
View File

@@ -10,7 +10,7 @@ type Props = {
editUrl: String editUrl: String
}; };
class EditUserNavLink extends React.Component<Props> { class GeneralUserNavLink extends React.Component<Props> {
render() { render() {
const { t, editUrl } = this.props; const { t, editUrl } = this.props;
@@ -25,4 +25,4 @@ class EditUserNavLink extends React.Component<Props> {
}; };
} }
export default translate("users")(EditUserNavLink); export default translate("users")(GeneralUserNavLink);

6
scm-ui/src/users/components/navLinks/EditUserNavLink.test.js → scm-ui/src/users/components/navLinks/GeneralUserNavLink.test.js
View File

@@ -2,14 +2,14 @@ import React from "react";
import { shallow } from "enzyme"; import { shallow } from "enzyme";
import "../../../tests/enzyme"; import "../../../tests/enzyme";
import "../../../tests/i18n"; import "../../../tests/i18n";
import EditUserNavLink from "./EditUserNavLink"; import GeneralUserNavLink from "./GeneralUserNavLink";
it("should render nothing, if the edit link is missing", () => { it("should render nothing, if the edit link is missing", () => {
const user = { const user = {
_links: {} _links: {}
}; };
const navLink = shallow(<EditUserNavLink user={user} editUrl='/user/edit'/>); const navLink = shallow(<GeneralUserNavLink user={user} editUrl='/user/edit'/>);
expect(navLink.text()).toBe(""); expect(navLink.text()).toBe("");
}); });
@@ -22,6 +22,6 @@ it("should render the navLink", () => {
} }
}; };
const navLink = shallow(<EditUserNavLink user={user} editUrl='/user/edit'/>); const navLink = shallow(<GeneralUserNavLink user={user} editUrl='/user/edit'/>);
expect(navLink.text()).not.toBe(""); expect(navLink.text()).not.toBe("");
}); });

2
scm-ui/src/users/components/navLinks/index.js
View File

@@ -1,2 +1,2 @@
export { default as EditUserNavLink } from "./EditUserNavLink"; export { default as GeneralUserNavLink } from "./GeneralUserNavLink";
export { default as SetPasswordNavLink } from "./SetPasswordNavLink"; export { default as SetPasswordNavLink } from "./SetPasswordNavLink";

4
scm-ui/src/users/containers/EditUser.js → scm-ui/src/users/containers/GeneralUser.js
View File

@@ -27,7 +27,7 @@ type Props = {
history: History history: History
}; };
class EditUser extends React.Component<Props> { class GeneralUser extends React.Component<Props> {
componentDidMount() { componentDidMount() {
const { modifyUserReset, user } = this.props; const { modifyUserReset, user } = this.props;
modifyUserReset(user); modifyUserReset(user);
@@ -80,4 +80,4 @@ const mapStateToProps = (state, ownProps) => {
export default connect( export default connect(
mapStateToProps, mapStateToProps,
mapDispatchToProps mapDispatchToProps
)(withRouter(EditUser)); )(withRouter(GeneralUser));

8
scm-ui/src/users/containers/SingleUser.js
View File

@@ -12,7 +12,7 @@ import {
} from "@scm-manager/ui-components"; } from "@scm-manager/ui-components";
import { Route } from "react-router"; import { Route } from "react-router";
import { Details } from "./../components/table"; import { Details } from "./../components/table";
import EditUser from "./EditUser"; import GeneralUser from "./GeneralUser";
import type { User } from "@scm-manager/ui-types"; import type { User } from "@scm-manager/ui-types";
import type { History } from "history"; import type { History } from "history";
import { import {
@@ -21,7 +21,7 @@ import {
isFetchUserPending, isFetchUserPending,
getFetchUserFailure getFetchUserFailure
} from "../modules/users"; } from "../modules/users";
import { EditUserNavLink, SetPasswordNavLink } from "./../components/navLinks"; import { GeneralUserNavLink, SetPasswordNavLink } from "./../components/navLinks";
import { translate } from "react-i18next"; import { translate } from "react-i18next";
import { getUsersLink } from "../../modules/indexResource"; import { getUsersLink } from "../../modules/indexResource";
import SetUserPassword from "../components/SetUserPassword"; import SetUserPassword from "../components/SetUserPassword";
@@ -84,7 +84,7 @@ class SingleUser extends React.Component<Props> {
<Route path={url} exact component={() => <Details user={user} />} /> <Route path={url} exact component={() => <Details user={user} />} />
<Route <Route
path={`${url}/settings/general`} path={`${url}/settings/general`}
component={() => <EditUser user={user} />} component={() => <GeneralUser user={user} />}
/> />
<Route <Route
path={`${url}/settings/password`} path={`${url}/settings/password`}
@@ -102,7 +102,7 @@ class SingleUser extends React.Component<Props> {
to={`${url}/settings/general`} to={`${url}/settings/general`}
label={t("single-user.menu.settingsNavLink")} label={t("single-user.menu.settingsNavLink")}
> >
<EditUserNavLink <GeneralUserNavLink
user={user} user={user}
editUrl={`${url}/settings/general`} editUrl={`${url}/settings/general`}
/> />