From 394c1f53d47ba0bdf2d5b91f18e5d70d9a8b777e Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Wed, 15 May 2019 17:30:42 +0200
Subject: [PATCH] create EditRepoRoles

---
 .../roles/components/PermissionRoleDetails.js |  6 +-
 .../roles/containers/EditRepositoryRole.js    | 71 +++++++++++++++++++
 .../roles/containers/RepositoryRoleForm.js    |  3 +
 .../roles/containers/SingleRepositoryRole.js  | 37 +++++-----
 4 files changed, 98 insertions(+), 19 deletions(-)
 create mode 100644 scm-ui/src/config/roles/containers/EditRepositoryRole.js

diff --git a/scm-ui/src/config/roles/components/PermissionRoleDetails.js b/scm-ui/src/config/roles/components/PermissionRoleDetails.js
index 92dab08b86..8ca21b1ac3 100644
--- a/scm-ui/src/config/roles/components/PermissionRoleDetails.js
+++ b/scm-ui/src/config/roles/components/PermissionRoleDetails.js
@@ -4,9 +4,11 @@ import { translate } from "react-i18next";
 import type { Role } from "@scm-manager/ui-types";
 import ExtensionPoint from "@scm-manager/ui-extensions/lib/ExtensionPoint";
 import PermissionRoleDetailsTable from "./PermissionRoleDetailsTable";
+import {Button, Subtitle} from "@scm-manager/ui-components";
 
 type Props = {
   role: Role,
+  url: string,
 
   // context props
   t: string => string,
@@ -14,13 +16,15 @@ type Props = {
 
 class PermissionRoleDetails extends React.Component<Props> {
   render() {
-    const { role } = this.props;
+    const { role, url } = this.props;
 
     return (
 
       <div>
         <PermissionRoleDetailsTable role={role}/>
         <hr/>
+        <Subtitle subtitle={"repositoryRoles.edit"}/>
+        <Button label={"test"} link={`${url}/edit`} color="primary" />
         <div className="content">
           <ExtensionPoint
             name="roles.repositoryRole-details.information"
diff --git a/scm-ui/src/config/roles/containers/EditRepositoryRole.js b/scm-ui/src/config/roles/containers/EditRepositoryRole.js
new file mode 100644
index 0000000000..f16db79dda
--- /dev/null
+++ b/scm-ui/src/config/roles/containers/EditRepositoryRole.js
@@ -0,0 +1,71 @@
+// @flow
+import React from "react";
+import RepositoryRoleForm from "./RepositoryRoleForm";
+import { connect } from "react-redux";
+import { translate } from "react-i18next";
+import {
+  getModifyRoleFailure,
+  isModifyRolePending,
+  modifyRole,
+} from "../modules/roles";
+import type { Role } from "@scm-manager/ui-types";
+
+type Props = {
+  disabled: boolean,
+  role: Role,
+  repositoryRolesLink: string,
+
+  //dispatch function
+  updateRole: (link: string, role: Role, callback?: () => void) => void
+};
+
+
+
+class EditRepositoryRole extends React.Component<Props> {
+
+  repositoryRoleUpdated = (role: Role) => {
+    const { history } = this.props;
+    history.push("/config/role/" + role.name);
+  };
+
+  updateRepositoryRole = (role: Role) => {
+    this.props.updateRole(role, () =>
+      this.repositoryRoleUpdated(role)
+    );
+  };
+
+  render() {
+    return (
+      <>
+        <RepositoryRoleForm
+          disabled={false}
+          role={this.props.role}
+          submitForm={role => this.updateRepositoryRole(role)}
+        />
+      </>
+    );
+  }
+}
+
+const mapStateToProps = (state, ownProps) => {
+  const loading = isModifyRolePending(state);
+  const error = getModifyRoleFailure(state);
+
+  return {
+    loading,
+    error,
+  };
+};
+
+const mapDispatchToProps = dispatch => {
+  return {
+    updateRole: (role: Role, callback?: () => void) => {
+      dispatch(modifyRole(role, callback));
+    }
+  };
+};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(translate("config")(EditRepositoryRole));
diff --git a/scm-ui/src/config/roles/containers/RepositoryRoleForm.js b/scm-ui/src/config/roles/containers/RepositoryRoleForm.js
index e35c2f2c2f..852e097e4a 100644
--- a/scm-ui/src/config/roles/containers/RepositoryRoleForm.js
+++ b/scm-ui/src/config/roles/containers/RepositoryRoleForm.js
@@ -49,6 +49,9 @@ class RepositoryRoleForm extends React.Component<Props, State> {
   componentDidMount() {
     const { fetchAvailableVerbs, verbsLink} = this.props;
     fetchAvailableVerbs(verbsLink);
+    if (this.props.role) {
+      this.setState({role: this.props.role})
+    }
   }
 
   isFalsy(value) {
diff --git a/scm-ui/src/config/roles/containers/SingleRepositoryRole.js b/scm-ui/src/config/roles/containers/SingleRepositoryRole.js
index 6c77bfd46b..6b4f48819a 100644
--- a/scm-ui/src/config/roles/containers/SingleRepositoryRole.js
+++ b/scm-ui/src/config/roles/containers/SingleRepositoryRole.js
@@ -1,12 +1,10 @@
 //@flow
 import React from "react";
 import { connect } from "react-redux";
-import {Loading, ErrorPage, Title} from "@scm-manager/ui-components";
+import { Loading, ErrorPage, Title } from "@scm-manager/ui-components";
 import { Route } from "react-router";
 import type { History } from "history";
-import {
-  EditRepositoryRoleNavLink,
-} from "../../components/navLinks";
+import { EditRepositoryRoleNavLink } from "../../components/navLinks";
 import { translate } from "react-i18next";
 import type { Role } from "@scm-manager/ui-types";
 import { getRepositoryRolesLink } from "../../../modules/indexResource";
@@ -19,6 +17,8 @@ import {
 } from "../modules/roles";
 import { withRouter } from "react-router-dom";
 import PermissionRoleDetail from "../components/PermissionRoleDetails";
+import EditRepositoryRole from "./EditRepositoryRole";
+import Switch from "react-router-dom/es/Switch";
 
 type Props = {
   roleName: string,
@@ -83,22 +83,23 @@ class SingleRepositoryRole extends React.Component<Props> {
 
     return (
       <>
-        <Title title={t("repositoryRoles.title")}/>
+        <Title title={t("repositoryRoles.title")} />
         <div className="columns">
           <div className="column is-three-quarters">
-            <Route
-              path={url}
-              component={() => <PermissionRoleDetail role={role} />}
-            />
-            <Route
-              path={`${url}/settings/general`}
-              component={() => <EditRepositoryRoleNavLink role={role} />}
-            />
-            <ExtensionPoint
-              name="roles.route"
-              props={extensionProps}
-              renderAll={true}
-            />
+              <Route
+                path={url}
+                component={() => <PermissionRoleDetail role={role} url={url} />}
+              />
+              <Route
+                path={`${url}`}
+                exact
+                component={() => <EditRepositoryRole role={role} />}
+              />
+              <ExtensionPoint
+                name="roles.route"
+                props={extensionProps}
+                renderAll={true}
+              />
           </div>
         </div>
       </>