From 904f5851a7acbbf7fb67a589a295863ca3dbf002 Mon Sep 17 00:00:00 2001 From: Florian Scholdei Date: Wed, 23 Jan 2019 09:17:53 +0100 Subject: [PATCH] renamed edituser to generaluser --- .../{EditUserNavLink.js => GeneralUserNavLink.js} | 4 ++-- ...EditUserNavLink.test.js => GeneralUserNavLink.test.js} | 6 +++--- scm-ui/src/users/components/navLinks/index.js | 2 +- .../src/users/containers/{EditUser.js => GeneralUser.js} | 4 ++-- scm-ui/src/users/containers/SingleUser.js | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) rename scm-ui/src/users/components/navLinks/{EditUserNavLink.js => GeneralUserNavLink.js} (82%) rename scm-ui/src/users/components/navLinks/{EditUserNavLink.test.js => GeneralUserNavLink.test.js} (67%) rename scm-ui/src/users/containers/{EditUser.js => GeneralUser.js} (96%) diff --git a/scm-ui/src/users/components/navLinks/EditUserNavLink.js b/scm-ui/src/users/components/navLinks/GeneralUserNavLink.js similarity index 82% rename from scm-ui/src/users/components/navLinks/EditUserNavLink.js rename to scm-ui/src/users/components/navLinks/GeneralUserNavLink.js index b98a02c2db..a6f1201152 100644 --- a/scm-ui/src/users/components/navLinks/EditUserNavLink.js +++ b/scm-ui/src/users/components/navLinks/GeneralUserNavLink.js @@ -10,7 +10,7 @@ type Props = { editUrl: String }; -class EditUserNavLink extends React.Component { +class GeneralUserNavLink extends React.Component { render() { const { t, editUrl } = this.props; @@ -25,4 +25,4 @@ class EditUserNavLink extends React.Component { }; } -export default translate("users")(EditUserNavLink); +export default translate("users")(GeneralUserNavLink); diff --git a/scm-ui/src/users/components/navLinks/EditUserNavLink.test.js b/scm-ui/src/users/components/navLinks/GeneralUserNavLink.test.js similarity index 67% rename from scm-ui/src/users/components/navLinks/EditUserNavLink.test.js rename to scm-ui/src/users/components/navLinks/GeneralUserNavLink.test.js index ec46c531a1..018e98f47e 100644 --- a/scm-ui/src/users/components/navLinks/EditUserNavLink.test.js +++ b/scm-ui/src/users/components/navLinks/GeneralUserNavLink.test.js @@ -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(); + const navLink = shallow(); expect(navLink.text()).toBe(""); }); @@ -22,6 +22,6 @@ it("should render the navLink", () => { } }; - const navLink = shallow(); + const navLink = shallow(); expect(navLink.text()).not.toBe(""); }); diff --git a/scm-ui/src/users/components/navLinks/index.js b/scm-ui/src/users/components/navLinks/index.js index 64f7536c4c..64a266f923 100644 --- a/scm-ui/src/users/components/navLinks/index.js +++ b/scm-ui/src/users/components/navLinks/index.js @@ -1,2 +1,2 @@ -export { default as EditUserNavLink } from "./EditUserNavLink"; +export { default as GeneralUserNavLink } from "./GeneralUserNavLink"; export { default as SetPasswordNavLink } from "./SetPasswordNavLink"; diff --git a/scm-ui/src/users/containers/EditUser.js b/scm-ui/src/users/containers/GeneralUser.js similarity index 96% rename from scm-ui/src/users/containers/EditUser.js rename to scm-ui/src/users/containers/GeneralUser.js index a8f3276471..ac94b10148 100644 --- a/scm-ui/src/users/containers/EditUser.js +++ b/scm-ui/src/users/containers/GeneralUser.js @@ -27,7 +27,7 @@ type Props = { history: History }; -class EditUser extends React.Component { +class GeneralUser extends React.Component { 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)); diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js index 321e117976..060c55bf70 100644 --- a/scm-ui/src/users/containers/SingleUser.js +++ b/scm-ui/src/users/containers/SingleUser.js @@ -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 {
} /> } + component={() => } /> { to={`${url}/settings/general`} label={t("single-user.menu.settingsNavLink")} > -