renamed general to edit

This commit is contained in:
Florian Scholdei
2019-01-29 08:22:43 +01:00
parent df8f2af341
commit f06d2d67a3
14 changed files with 35 additions and 35 deletions

View File

@@ -10,7 +10,7 @@ type Props = {
t: string => string
};
class GeneralGroupNavLink extends React.Component<Props> {
class EditGroupNavLink extends React.Component<Props> {
isEditable = () => {
return this.props.group._links.update;
};
@@ -25,4 +25,4 @@ class GeneralGroupNavLink extends React.Component<Props> {
}
}
export default translate("groups")(GeneralGroupNavLink);
export default translate("groups")(EditGroupNavLink);

View File

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

View File

@@ -1,2 +1,2 @@
export { default as GeneralGroupNavLink } from "./GeneralGroupNavLink";
export { default as EditGroupNavLink } from "./EditGroupNavLink";
export { default as SetPermissionsNavLink } from "./SetPermissionsNavLink";

View File

@@ -30,7 +30,7 @@ type Props = {
error: Error
};
class GeneralGroup extends React.Component<Props> {
class EditGroup extends React.Component<Props> {
componentDidMount() {
const { group, modifyGroupReset } = this.props;
modifyGroupReset(group);
@@ -116,4 +116,4 @@ const mapDispatchToProps = dispatch => {
export default connect(
mapStateToProps,
mapDispatchToProps
)(withRouter(GeneralGroup));
)(withRouter(EditGroup));

View File

@@ -13,7 +13,7 @@ import {
import { Route } from "react-router";
import { Details } from "./../components/table";
import {
GeneralGroupNavLink,
EditGroupNavLink,
SetPermissionsNavLink
} from "./../components/navLinks";
import type { Group } from "@scm-manager/ui-types";
@@ -26,7 +26,7 @@ import {
} from "../modules/groups";
import { translate } from "react-i18next";
import GeneralGroup from "./GeneralGroup";
import EditGroup from "./EditGroup";
import { getGroupsLink } from "../../modules/indexResource";
import SetPermissions from "../../permissions/components/SetPermissions";
import { ExtensionPoint } from "@scm-manager/ui-extensions";
@@ -99,7 +99,7 @@ class SingleGroup extends React.Component<Props> {
<Route
path={`${url}/settings/general`}
exact
component={() => <GeneralGroup group={group} />}
component={() => <EditGroup group={group} />}
/>
<Route
path={`${url}/settings/permissions`}
@@ -133,7 +133,7 @@ class SingleGroup extends React.Component<Props> {
to={`${url}/settings/general`}
label={t("singleGroup.menu.settingsNavLink")}
>
<GeneralGroupNavLink
<EditGroupNavLink
group={group}
editUrl={`${url}/settings/general`}
/>

View File

@@ -10,7 +10,7 @@ type Props = {
t: string => string
};
class GeneralRepoNavLink extends React.Component<Props> {
class EditRepoNavLink extends React.Component<Props> {
isEditable = () => {
return this.props.repository._links.update;
};
@@ -25,4 +25,4 @@ class GeneralRepoNavLink extends React.Component<Props> {
}
}
export default translate("repos")(GeneralRepoNavLink);
export default translate("repos")(EditRepoNavLink);

View File

@@ -3,7 +3,7 @@ import { shallow, mount } from "enzyme";
import "../../tests/enzyme";
import "../../tests/i18n";
import ReactRouterEnzymeContext from "react-router-enzyme-context";
import GeneralRepoNavLink from "./GeneralRepoNavLink";
import EditRepoNavLink from "./EditRepoNavLink";
describe("GeneralNavLink", () => {
const options = new ReactRouterEnzymeContext();
@@ -14,7 +14,7 @@ describe("GeneralNavLink", () => {
};
const navLink = shallow(
<GeneralRepoNavLink repository={repository} editUrl="" />,
<EditRepoNavLink repository={repository} editUrl="" />,
options.get()
);
expect(navLink.text()).toBe("");
@@ -30,7 +30,7 @@ describe("GeneralNavLink", () => {
};
const navLink = mount(
<GeneralRepoNavLink repository={repository} editUrl="" />,
<EditRepoNavLink repository={repository} editUrl="" />,
options.get()
);
expect(navLink.text()).toBe("repositoryRoot.menu.generalNavLink");

View File

@@ -28,7 +28,7 @@ type Props = {
history: History
};
class GeneralRepo extends React.Component<Props> {
class EditRepo extends React.Component<Props> {
componentDidMount() {
const { modifyRepoReset, repository } = this.props;
modifyRepoReset(repository);
@@ -93,4 +93,4 @@ const mapDispatchToProps = dispatch => {
export default connect(
mapStateToProps,
mapDispatchToProps
)(withRouter(GeneralRepo));
)(withRouter(EditRepo));

View File

@@ -22,11 +22,11 @@ import {
} from "@scm-manager/ui-components";
import { translate } from "react-i18next";
import RepositoryDetails from "../components/RepositoryDetails";
import GeneralRepo from "./GeneralRepo";
import EditRepo from "./EditRepo";
import Permissions from "../permissions/containers/Permissions";
import type { History } from "history";
import GeneralRepoNavLink from "../components/GeneralRepoNavLink";
import EditRepoNavLink from "../components/EditRepoNavLink";
import BranchRoot from "./ChangesetsRoot";
import ChangesetView from "./ChangesetView";
@@ -113,7 +113,7 @@ class RepositoryRoot extends React.Component<Props> {
/>
<Route
path={`${url}/settings/general`}
component={() => <GeneralRepo repository={repository} />}
component={() => <EditRepo repository={repository} />}
/>
<Route
path={`${url}/settings/permissions`}
@@ -203,7 +203,7 @@ class RepositoryRoot extends React.Component<Props> {
to={`${url}/settings/general`}
label={t("repositoryRoot.menu.settingsNavLink")}
>
<GeneralRepoNavLink
<EditRepoNavLink
repository={repository}
editUrl={`${url}/settings/general`}
/>

View File

@@ -10,7 +10,7 @@ type Props = {
t: string => string
};
class GeneralUserNavLink extends React.Component<Props> {
class EditUserNavLink extends React.Component<Props> {
isEditable = () => {
return this.props.user._links.update;
};
@@ -25,4 +25,4 @@ class GeneralUserNavLink extends React.Component<Props> {
}
}
export default translate("users")(GeneralUserNavLink);
export default translate("users")(EditUserNavLink);

View File

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

View File

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

View File

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

View File

@@ -12,7 +12,7 @@ import {
} from "@scm-manager/ui-components";
import { Route } from "react-router";
import { Details } from "./../components/table";
import GeneralUser from "./GeneralUser";
import EditUser from "./EditUser";
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 { GeneralUserNavLink, SetPasswordNavLink, SetPermissionsNavLink } from "./../components/navLinks";
import { EditUserNavLink, SetPasswordNavLink, SetPermissionsNavLink } from "./../components/navLinks";
import { translate } from "react-i18next";
import { getUsersLink } from "../../modules/indexResource";
import SetUserPassword from "../components/SetUserPassword";
@@ -91,7 +91,7 @@ class SingleUser extends React.Component<Props> {
<Route path={url} exact component={() => <Details user={user} />} />
<Route
path={`${url}/settings/general`}
component={() => <GeneralUser user={user} />}
component={() => <EditUser user={user} />}
/>
<Route
path={`${url}/settings/password`}
@@ -118,7 +118,7 @@ class SingleUser extends React.Component<Props> {
to={`${url}/settings/general`}
label={t("singleUser.menu.settingsNavLink")}
>
<GeneralUserNavLink
<EditUserNavLink
user={user}
editUrl={`${url}/settings/general`}
/>