diff --git a/scm-ui/public/locales/en/groups.json b/scm-ui/public/locales/en/groups.json index 654ab2a2db..83dcf18fe5 100644 --- a/scm-ui/public/locales/en/groups.json +++ b/scm-ui/public/locales/en/groups.json @@ -18,7 +18,7 @@ "navigationLabel": "Group Navigation", "informationNavLink": "Information", "settingsNavLink": "Settings", - "editNavLink": "General", + "generalNavLink": "General", "setPermissionsNavLink": "Permissions" } }, diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json index 564748c9eb..577386572e 100644 --- a/scm-ui/public/locales/en/repos.json +++ b/scm-ui/public/locales/en/repos.json @@ -26,7 +26,7 @@ "historyNavLink": "Commits", "sourcesNavLink": "Sources", "settingsNavLink": "Settings", - "editNavLink": "General", + "generalNavLink": "General", "permissionsNavLink": "Permissions" } }, diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json index 731b59e563..e907f88f4c 100644 --- a/scm-ui/public/locales/en/users.json +++ b/scm-ui/public/locales/en/users.json @@ -34,7 +34,7 @@ "navigationLabel": "User Navigation", "informationNavLink": "Information", "settingsNavLink": "Settings", - "editNavLink": "General", + "generalNavLink": "General", "setPasswordNavLink": "Password", "setPermissionsNavLink": "Permissions" } diff --git a/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js b/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js index fe59fa41a3..5b0528ba3a 100644 --- a/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js +++ b/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js @@ -18,7 +18,7 @@ class GeneralGroupNavLink extends React.Component { if (!this.isEditable()) { return null; } - return ; + return ; } isEditable = () => { diff --git a/scm-ui/src/repos/components/EditNavLink.js b/scm-ui/src/repos/components/GeneralRepoNavLink.js similarity index 69% rename from scm-ui/src/repos/components/EditNavLink.js rename to scm-ui/src/repos/components/GeneralRepoNavLink.js index b06cd8d96e..a76231529b 100644 --- a/scm-ui/src/repos/components/EditNavLink.js +++ b/scm-ui/src/repos/components/GeneralRepoNavLink.js @@ -6,7 +6,7 @@ import type { Repository } from "@scm-manager/ui-types"; type Props = { editUrl: string, t: string => string, repository: Repository }; -class EditNavLink extends React.Component { +class GeneralRepoNavLink extends React.Component { isEditable = () => { return this.props.repository._links.update; }; @@ -15,8 +15,8 @@ class EditNavLink extends React.Component { return null; } const { editUrl, t } = this.props; - return ; + return ; } } -export default translate("repos")(EditNavLink); +export default translate("repos")(GeneralRepoNavLink); diff --git a/scm-ui/src/repos/components/EditNavLink.test.js b/scm-ui/src/repos/components/GeneralRepoNavLink.test.js similarity index 70% rename from scm-ui/src/repos/components/EditNavLink.test.js rename to scm-ui/src/repos/components/GeneralRepoNavLink.test.js index 080440cc88..2ce050f69c 100644 --- a/scm-ui/src/repos/components/EditNavLink.test.js +++ b/scm-ui/src/repos/components/GeneralRepoNavLink.test.js @@ -3,9 +3,9 @@ import { shallow, mount } from "enzyme"; import "../../tests/enzyme"; import "../../tests/i18n"; import ReactRouterEnzymeContext from "react-router-enzyme-context"; -import EditNavLink from "./EditNavLink"; +import GeneralRepoNavLink from "./GeneralRepoNavLink"; -describe("EditNavLink", () => { +describe("GeneralNavLink", () => { const options = new ReactRouterEnzymeContext(); it("should render nothing, if the modify link is missing", () => { @@ -14,7 +14,7 @@ describe("EditNavLink", () => { }; const navLink = shallow( - , + , options.get() ); expect(navLink.text()).toBe(""); @@ -30,9 +30,9 @@ describe("EditNavLink", () => { }; const navLink = mount( - , + , options.get() ); - expect(navLink.text()).toBe("repositoryRoot.menu.editNavLink"); + expect(navLink.text()).toBe("repositoryRoot.menu.generalNavLink"); }); }); diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js index 5791622b9a..dcad647d4e 100644 --- a/scm-ui/src/repos/containers/RepositoryRoot.js +++ b/scm-ui/src/repos/containers/RepositoryRoot.js @@ -13,6 +13,7 @@ import GeneralRepo from "./GeneralRepo"; import Permissions from "../permissions/containers/Permissions"; import type {History} from "history"; +import GeneralRepoNavLink from "../components/GeneralRepoNavLink"; import BranchRoot from "./ChangesetsRoot"; import ChangesetView from "./ChangesetView"; @@ -183,7 +184,7 @@ class RepositoryRoot extends React.Component { to={`${url}/settings/general`} label={t("repositoryRoot.menu.settingsNavLink")} > - + { if (!this.isEditable()) { return null; } - return ; + return ; } isEditable = () => {