From 46456d0390e776fe83142fd3dc46ad8797df5da4 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Thu, 16 May 2019 12:17:18 +0200
Subject: [PATCH] add Errorhandling to CreateRepoRole & EditRepoRole

---
 .../roles/containers/CreateRepositoryRole.js  | 14 +++++++----
 .../roles/containers/EditRepositoryRole.js    | 23 +++++++++++--------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/scm-ui/src/config/roles/containers/CreateRepositoryRole.js b/scm-ui/src/config/roles/containers/CreateRepositoryRole.js
index 1ea0d3f1cf..4a572a3206 100644
--- a/scm-ui/src/config/roles/containers/CreateRepositoryRole.js
+++ b/scm-ui/src/config/roles/containers/CreateRepositoryRole.js
@@ -3,9 +3,10 @@ import React from "react";
 import RepositoryRoleForm from "./RepositoryRoleForm";
 import { connect } from "react-redux";
 import { translate } from "react-i18next";
-import { Title } from "@scm-manager/ui-components";
+import { ErrorNotification, Title } from "@scm-manager/ui-components";
 import {
   createRole,
+  getCreateRoleFailure,
   getFetchVerbsFailure,
   isFetchVerbsPending
 } from "../modules/roles";
@@ -18,6 +19,7 @@ import {
 type Props = {
   disabled: boolean,
   repositoryRolesLink: string,
+  error?: Error,
 
   //dispatch function
   addRole: (link: string, role: Role, callback?: () => void) => void,
@@ -27,7 +29,6 @@ type Props = {
 };
 
 class CreateRepositoryRole extends React.Component<Props> {
-
   repositoryRoleCreated = (role: Role) => {
     const { history } = this.props;
     history.push("/config/role/" + role.name + "/info");
@@ -40,7 +41,12 @@ class CreateRepositoryRole extends React.Component<Props> {
   };
 
   render() {
-    const { t } = this.props;
+    const { t, error } = this.props;
+
+    if (error) {
+      return <ErrorNotification error={error} />;
+    }
+
     return (
       <>
         <Title title={t("repositoryRole.title")} />
@@ -55,7 +61,7 @@ class CreateRepositoryRole extends React.Component<Props> {
 
 const mapStateToProps = (state, ownProps) => {
   const loading = isFetchVerbsPending(state);
-  const error = getFetchVerbsFailure(state);
+  const error = getFetchVerbsFailure(state) || getCreateRoleFailure(state);
   const verbsLink = getRepositoryVerbsLink(state);
   const repositoryRolesLink = getRepositoryRolesLink(state);
 
diff --git a/scm-ui/src/config/roles/containers/EditRepositoryRole.js b/scm-ui/src/config/roles/containers/EditRepositoryRole.js
index 0bc7e71e8d..1555c63ce8 100644
--- a/scm-ui/src/config/roles/containers/EditRepositoryRole.js
+++ b/scm-ui/src/config/roles/containers/EditRepositoryRole.js
@@ -6,35 +6,38 @@ import { translate } from "react-i18next";
 import {
   getModifyRoleFailure,
   isModifyRolePending,
-  modifyRole,
+  modifyRole
 } from "../modules/roles";
+import { ErrorNotification } from "@scm-manager/ui-components";
 import type { Role } from "@scm-manager/ui-types";
 
 type Props = {
   disabled: boolean,
   role: Role,
   repositoryRolesLink: string,
+  error?: Error,
 
   //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/roles/");
   };
 
   updateRepositoryRole = (role: Role) => {
-    this.props.updateRole(role, () =>
-      this.repositoryRoleUpdated(role)
-    );
+    this.props.updateRole(role, () => this.repositoryRoleUpdated(role));
   };
 
   render() {
+    const { error } = this.props;
+
+    if (error) {
+      return <ErrorNotification error={error} />;
+    }
+
     return (
       <>
         <RepositoryRoleForm
@@ -44,16 +47,16 @@ class EditRepositoryRole extends React.Component<Props> {
         />
       </>
     );
-  }w
+  }
 }
 
 const mapStateToProps = (state, ownProps) => {
   const loading = isModifyRolePending(state);
-  const error = getModifyRoleFailure(state);
+  const error = getModifyRoleFailure(state, ownProps.role.name);
 
   return {
     loading,
-    error,
+    error
   };
 };