renamed add to create

scm-ui-components/packages/ui-components/src/OverviewPageActions.js

@@ -4,7 +4,6 @@ import type { History } from "history";
 import { withRouter } from "react-router-dom";
 import classNames from "classnames";
 import injectSheet from "react-jss";
-import { PageActions } from "./layout";
 import { FilterInput } from "./forms";
 import { Button, urls } from "./index";
 
@@ -30,13 +29,12 @@ const styles = {
 class OverviewPageActions extends React.Component<Props> {
   render() {
     const { history, location, link } = this.props;
-    let directory = link.substring(0, link.indexOf("/"));
     return (
       <>
         <FilterInput
           value={urls.getQueryStringFromLocation(location)}
           filter={filter => {
-            history.push(`/${directory}/?q=${filter}`);
+            history.push(`/${link}/?q=${filter}`);
           }}
         />
         {this.renderCreateButton()}
@@ -49,7 +47,7 @@ class OverviewPageActions extends React.Component<Props> {
     if (showCreateButton) {
       return (
         <div className={classNames(classes.button, "input-button control")}>
-          <Button label={label} link={`/${link}`} color="primary" />
+          <Button label={label} link={`/${link}/create`} color="primary" />
         </div>
       );
     }

scm-ui/public/locales/de/users.json

@@ -39,7 +39,7 @@
       "setPermissionsNavLink": "Berechtigungen"
     }
   },
-  "addUser": {
+  "createUser": {
     "title": "Benutzer erstellen",
     "subtitle": "Erstellen eines neuen Benutzers"
   },

scm-ui/public/locales/en/users.json

@@ -39,7 +39,7 @@
       "setPermissionsNavLink": "Permissions"
     }
   },
-  "addUser": {
+  "createUser": {
     "title": "Create User",
     "subtitle": "Create a new user"
   },

scm-ui/src/containers/Main.js

@@ -12,14 +12,14 @@ import Logout from "../containers/Logout";
 import { ProtectedRoute } from "@scm-manager/ui-components";
 import { binder, ExtensionPoint } from "@scm-manager/ui-extensions";
 
-import AddUser from "../users/containers/AddUser";
+import CreateUser from "../users/containers/CreateUser";
 import SingleUser from "../users/containers/SingleUser";
 import RepositoryRoot from "../repos/containers/RepositoryRoot";
 import Create from "../repos/containers/Create";
 
 import Groups from "../groups/containers/Groups";
 import SingleGroup from "../groups/containers/SingleGroup";
-import AddGroup from "../groups/containers/AddGroup";
+import CreateGroup from "../groups/containers/CreateGroup";
 
 import Config from "../config/containers/Config";
 import Profile from "./Profile";
@@ -74,8 +74,8 @@ class Main extends React.Component<Props> {
           />
           <ProtectedRoute
             authenticated={authenticated}
-            path="/users/add"
-            component={AddUser}
+            path="/users/create"
+            component={CreateUser}
           />
           <ProtectedRoute
             exact
@@ -102,8 +102,8 @@ class Main extends React.Component<Props> {
           />
           <ProtectedRoute
             authenticated={authenticated}
-            path="/groups/add"
-            component={AddGroup}
+            path="/groups/create"
+            component={CreateGroup}
           />
           <ProtectedRoute
             exact

scm-ui/src/groups/containers/CreateGroup.js

@@ -31,7 +31,7 @@ type Props = {
 
 type State = {};
 
-class AddGroup extends React.Component<Props, State> {
+class CreateGroup extends React.Component<Props, State> {
   componentDidMount() {
     this.props.resetForm();
   }
@@ -104,4 +104,4 @@ const mapStateToProps = state => {
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(translate("groups")(AddGroup));
+)(translate("groups")(CreateGroup));

scm-ui/src/groups/containers/Groups.js

@@ -87,7 +87,7 @@ class Groups extends React.Component<Props> {
         <PageActions>
           <OverviewPageActions
             showCreateButton={canAddGroups}
-            link="groups/add"
+            link="groups"
             label={t("create-group-button.label")}
           />
         </PageActions>
@@ -118,7 +118,7 @@ class Groups extends React.Component<Props> {
       return (
         <CreateButton
           label={t("create-group-button.label")}
-          link="/groups/add"
+          link="/groups/create"
         />
       );
     }

scm-ui/src/repos/containers/Overview.js

@@ -85,7 +85,7 @@ class Overview extends React.Component<Props> {
         <PageActions>
           <OverviewPageActions
             showCreateButton={showCreateButton}
-            link="repos/create"
+            link="repos"
             label={t("overview.createButton")}
           />
         </PageActions>

scm-ui/src/users/containers/CreateUser.js

@@ -28,7 +28,7 @@ type Props = {
   history: History
 };
 
-class AddUser extends React.Component<Props> {
+class CreateUser extends React.Component<Props> {
   componentDidMount() {
     this.props.resetForm();
   }
@@ -49,8 +49,8 @@ class AddUser extends React.Component<Props> {
 
     return (
       <Page
-        title={t("addUser.title")}
-        subtitle={t("addUser.subtitle")}
+        title={t("createUser.title")}
+        subtitle={t("createUser.subtitle")}
         error={error}
         showContentOnError={true}
       >
@@ -88,4 +88,4 @@ const mapStateToProps = (state, ownProps) => {
 export default connect(
   mapStateToProps,
   mapDispatchToProps
-)(translate("users")(AddUser));
+)(translate("users")(CreateUser));

scm-ui/src/users/containers/Users.js

@@ -87,7 +87,7 @@ class Users extends React.Component<Props> {
         <PageActions>
           <OverviewPageActions
             showCreateButton={canAddUsers}
-            link="users/add"
+            link="users"
             label={t("users.createButton")}
           />
         </PageActions>
@@ -115,7 +115,9 @@ class Users extends React.Component<Props> {
   renderCreateButton() {
     const { canAddUsers, t } = this.props;
     if (canAddUsers) {
-      return <CreateButton label={t("users.createButton")} link="/users/add" />;
+      return (
+        <CreateButton label={t("users.createButton")} link="/users/create" />
+      );
     }
     return null;
   }