From f06d2d67a3b65b6f6dd237bd57ffa5c19441982c Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Tue, 29 Jan 2019 08:22:43 +0100
Subject: [PATCH] renamed general to edit

---
 .../{GeneralGroupNavLink.js => EditGroupNavLink.js}       | 4 ++--
 ...neralGroupNavLink.test.js => EditGroupNavLink.test.js} | 6 +++---
 scm-ui/src/groups/components/navLinks/index.js            | 2 +-
 .../groups/containers/{GeneralGroup.js => EditGroup.js}   | 4 ++--
 scm-ui/src/groups/containers/SingleGroup.js               | 8 ++++----
 .../{GeneralRepoNavLink.js => EditRepoNavLink.js}         | 4 ++--
 ...GeneralRepoNavLink.test.js => EditRepoNavLink.test.js} | 6 +++---
 .../src/repos/containers/{GeneralRepo.js => EditRepo.js}  | 4 ++--
 scm-ui/src/repos/containers/RepositoryRoot.js             | 8 ++++----
 .../{GeneralUserNavLink.js => EditUserNavLink.js}         | 4 ++--
 .../users/components/navLinks/GeneralUserNavLink.test.js  | 6 +++---
 scm-ui/src/users/components/navLinks/index.js             | 2 +-
 .../src/users/containers/{GeneralUser.js => EditUser.js}  | 4 ++--
 scm-ui/src/users/containers/SingleUser.js                 | 8 ++++----
 14 files changed, 35 insertions(+), 35 deletions(-)
 rename scm-ui/src/groups/components/navLinks/{GeneralGroupNavLink.js => EditGroupNavLink.js} (82%)
 rename scm-ui/src/groups/components/navLinks/{GeneralGroupNavLink.test.js => EditGroupNavLink.test.js} (66%)
 rename scm-ui/src/groups/containers/{GeneralGroup.js => EditGroup.js} (97%)
 rename scm-ui/src/repos/components/{GeneralRepoNavLink.js => EditRepoNavLink.js} (83%)
 rename scm-ui/src/repos/components/{GeneralRepoNavLink.test.js => EditRepoNavLink.test.js} (81%)
 rename scm-ui/src/repos/containers/{GeneralRepo.js => EditRepo.js} (96%)
 rename scm-ui/src/users/components/navLinks/{GeneralUserNavLink.js => EditUserNavLink.js} (82%)
 rename scm-ui/src/users/containers/{GeneralUser.js => EditUser.js} (96%)

diff --git a/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js b/scm-ui/src/groups/components/navLinks/EditGroupNavLink.js
similarity index 82%
rename from scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js
rename to scm-ui/src/groups/components/navLinks/EditGroupNavLink.js
index b04e572937..9713c5c5c9 100644
--- a/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.js
+++ b/scm-ui/src/groups/components/navLinks/EditGroupNavLink.js
@@ -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);
diff --git a/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.test.js b/scm-ui/src/groups/components/navLinks/EditGroupNavLink.test.js
similarity index 66%
rename from scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.test.js
rename to scm-ui/src/groups/components/navLinks/EditGroupNavLink.test.js
index 1120dab2fd..7399f4f714 100644
--- a/scm-ui/src/groups/components/navLinks/GeneralGroupNavLink.test.js
+++ b/scm-ui/src/groups/components/navLinks/EditGroupNavLink.test.js
@@ -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("");
 });
diff --git a/scm-ui/src/groups/components/navLinks/index.js b/scm-ui/src/groups/components/navLinks/index.js
index 88e2e7f4b5..992e9ab9a3 100644
--- a/scm-ui/src/groups/components/navLinks/index.js
+++ b/scm-ui/src/groups/components/navLinks/index.js
@@ -1,2 +1,2 @@
-export { default as GeneralGroupNavLink } from "./GeneralGroupNavLink";
+export { default as EditGroupNavLink } from "./EditGroupNavLink";
 export { default as SetPermissionsNavLink } from "./SetPermissionsNavLink";
diff --git a/scm-ui/src/groups/containers/GeneralGroup.js b/scm-ui/src/groups/containers/EditGroup.js
similarity index 97%
rename from scm-ui/src/groups/containers/GeneralGroup.js
rename to scm-ui/src/groups/containers/EditGroup.js
index a89491568f..241a61356a 100644
--- a/scm-ui/src/groups/containers/GeneralGroup.js
+++ b/scm-ui/src/groups/containers/EditGroup.js
@@ -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));
diff --git a/scm-ui/src/groups/containers/SingleGroup.js b/scm-ui/src/groups/containers/SingleGroup.js
index 3db1fa0006..f8d88d7a7d 100644
--- a/scm-ui/src/groups/containers/SingleGroup.js
+++ b/scm-ui/src/groups/containers/SingleGroup.js
@@ -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`}
                   />
diff --git a/scm-ui/src/repos/components/GeneralRepoNavLink.js b/scm-ui/src/repos/components/EditRepoNavLink.js
similarity index 83%
rename from scm-ui/src/repos/components/GeneralRepoNavLink.js
rename to scm-ui/src/repos/components/EditRepoNavLink.js
index 650cf0f62c..9a502cdafb 100644
--- a/scm-ui/src/repos/components/GeneralRepoNavLink.js
+++ b/scm-ui/src/repos/components/EditRepoNavLink.js
@@ -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);
diff --git a/scm-ui/src/repos/components/GeneralRepoNavLink.test.js b/scm-ui/src/repos/components/EditRepoNavLink.test.js
similarity index 81%
rename from scm-ui/src/repos/components/GeneralRepoNavLink.test.js
rename to scm-ui/src/repos/components/EditRepoNavLink.test.js
index 2ce050f69c..22bb06fae0 100644
--- a/scm-ui/src/repos/components/GeneralRepoNavLink.test.js
+++ b/scm-ui/src/repos/components/EditRepoNavLink.test.js
@@ -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");
diff --git a/scm-ui/src/repos/containers/GeneralRepo.js b/scm-ui/src/repos/containers/EditRepo.js
similarity index 96%
rename from scm-ui/src/repos/containers/GeneralRepo.js
rename to scm-ui/src/repos/containers/EditRepo.js
index 83c5d47b52..072a45b670 100644
--- a/scm-ui/src/repos/containers/GeneralRepo.js
+++ b/scm-ui/src/repos/containers/EditRepo.js
@@ -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));
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index 9291017ba9..583d351a97 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -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`}
                   />
diff --git a/scm-ui/src/users/components/navLinks/GeneralUserNavLink.js b/scm-ui/src/users/components/navLinks/EditUserNavLink.js
similarity index 82%
rename from scm-ui/src/users/components/navLinks/GeneralUserNavLink.js
rename to scm-ui/src/users/components/navLinks/EditUserNavLink.js
index e222a7bec2..051bf9a4bd 100644
--- a/scm-ui/src/users/components/navLinks/GeneralUserNavLink.js
+++ b/scm-ui/src/users/components/navLinks/EditUserNavLink.js
@@ -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);
diff --git a/scm-ui/src/users/components/navLinks/GeneralUserNavLink.test.js b/scm-ui/src/users/components/navLinks/GeneralUserNavLink.test.js
index 018e98f47e..ec46c531a1 100644
--- a/scm-ui/src/users/components/navLinks/GeneralUserNavLink.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 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("");
 });
diff --git a/scm-ui/src/users/components/navLinks/index.js b/scm-ui/src/users/components/navLinks/index.js
index 87eda98f68..cb97c57e3f 100644
--- a/scm-ui/src/users/components/navLinks/index.js
+++ b/scm-ui/src/users/components/navLinks/index.js
@@ -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";
diff --git a/scm-ui/src/users/containers/GeneralUser.js b/scm-ui/src/users/containers/EditUser.js
similarity index 96%
rename from scm-ui/src/users/containers/GeneralUser.js
rename to scm-ui/src/users/containers/EditUser.js
index cb578d6f1e..6b061c48bf 100644
--- a/scm-ui/src/users/containers/GeneralUser.js
+++ b/scm-ui/src/users/containers/EditUser.js
@@ -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));
diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js
index 64ed7946e4..9a1633a162 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 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`}
                   />