mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-08 22:45:45 +01:00
renamed edituser to generaluser
This commit is contained in:
@@ -10,7 +10,7 @@ type Props = {
|
||||
editUrl: String
|
||||
};
|
||||
|
||||
class EditUserNavLink extends React.Component<Props> {
|
||||
class GeneralUserNavLink extends React.Component<Props> {
|
||||
render() {
|
||||
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);
|
||||
@@ -2,14 +2,14 @@ import React from "react";
|
||||
import { shallow } from "enzyme";
|
||||
import "../../../tests/enzyme";
|
||||
import "../../../tests/i18n";
|
||||
import EditUserNavLink from "./EditUserNavLink";
|
||||
import GeneralUserNavLink from "./GeneralUserNavLink";
|
||||
|
||||
it("should render nothing, if the edit link is missing", () => {
|
||||
const user = {
|
||||
_links: {}
|
||||
};
|
||||
|
||||
const navLink = shallow(<EditUserNavLink user={user} editUrl='/user/edit'/>);
|
||||
const navLink = shallow(<GeneralUserNavLink user={user} editUrl='/user/edit'/>);
|
||||
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("");
|
||||
});
|
||||
@@ -1,2 +1,2 @@
|
||||
export { default as EditUserNavLink } from "./EditUserNavLink";
|
||||
export { default as GeneralUserNavLink } from "./GeneralUserNavLink";
|
||||
export { default as SetPasswordNavLink } from "./SetPasswordNavLink";
|
||||
|
||||
@@ -27,7 +27,7 @@ type Props = {
|
||||
history: History
|
||||
};
|
||||
|
||||
class EditUser extends React.Component<Props> {
|
||||
class GeneralUser extends React.Component<Props> {
|
||||
componentDidMount() {
|
||||
const { modifyUserReset, user } = this.props;
|
||||
modifyUserReset(user);
|
||||
@@ -80,4 +80,4 @@ const mapStateToProps = (state, ownProps) => {
|
||||
export default connect(
|
||||
mapStateToProps,
|
||||
mapDispatchToProps
|
||||
)(withRouter(EditUser));
|
||||
)(withRouter(GeneralUser));
|
||||
@@ -12,7 +12,7 @@ import {
|
||||
} from "@scm-manager/ui-components";
|
||||
import { Route } from "react-router";
|
||||
import { Details } from "./../components/table";
|
||||
import EditUser from "./EditUser";
|
||||
import GeneralUser from "./GeneralUser";
|
||||
import type { User } from "@scm-manager/ui-types";
|
||||
import type { History } from "history";
|
||||
import {
|
||||
@@ -21,7 +21,7 @@ import {
|
||||
isFetchUserPending,
|
||||
getFetchUserFailure
|
||||
} from "../modules/users";
|
||||
import { EditUserNavLink, SetPasswordNavLink } from "./../components/navLinks";
|
||||
import { GeneralUserNavLink, SetPasswordNavLink } from "./../components/navLinks";
|
||||
import { translate } from "react-i18next";
|
||||
import { getUsersLink } from "../../modules/indexResource";
|
||||
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}/settings/general`}
|
||||
component={() => <EditUser user={user} />}
|
||||
component={() => <GeneralUser user={user} />}
|
||||
/>
|
||||
<Route
|
||||
path={`${url}/settings/password`}
|
||||
@@ -102,7 +102,7 @@ class SingleUser extends React.Component<Props> {
|
||||
to={`${url}/settings/general`}
|
||||
label={t("single-user.menu.settingsNavLink")}
|
||||
>
|
||||
<EditUserNavLink
|
||||
<GeneralUserNavLink
|
||||
user={user}
|
||||
editUrl={`${url}/settings/general`}
|
||||
/>
|
||||
|
||||
Reference in New Issue
Block a user