From 55f02238da785b22832e10e87e32eddfac49667b Mon Sep 17 00:00:00 2001
From: Philipp Czora <philipp.czora@cloudogu.com>
Date: Thu, 2 Aug 2018 13:47:57 +0200
Subject: [PATCH] Fixed bug which caused loading state in GroupForm not to be
 set correctly

---
 scm-ui/src/groups/components/GroupForm.js |  4 ++--
 scm-ui/src/groups/containers/EditGroup.js |  6 ++++--
 scm-ui/src/groups/modules/groups.js       | 11 +++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/scm-ui/src/groups/components/GroupForm.js b/scm-ui/src/groups/components/GroupForm.js
index 0477837604..924c0bdee3 100644
--- a/scm-ui/src/groups/components/GroupForm.js
+++ b/scm-ui/src/groups/components/GroupForm.js
@@ -63,7 +63,7 @@ class GroupForm extends React.Component<Props, State> {
 
   render() {
     const { t, loading } = this.props;
-    const { group } = this.state
+    const group = this.state.group
     let nameField = null;
     if (!this.props.group) {
       nameField = (
@@ -76,7 +76,7 @@ class GroupForm extends React.Component<Props, State> {
       />
       );
     }
-    return (   
+    return (
       <form onSubmit={this.onSubmit}>
         {nameField}
         <InputField
diff --git a/scm-ui/src/groups/containers/EditGroup.js b/scm-ui/src/groups/containers/EditGroup.js
index 47431a8c90..846c392a83 100644
--- a/scm-ui/src/groups/containers/EditGroup.js
+++ b/scm-ui/src/groups/containers/EditGroup.js
@@ -18,7 +18,7 @@ type Props = {
 };
 
 class EditGroup extends React.Component<Props> {
-  groupModified = (group: Group) => {
+  groupModified = (group: Group) => () => {
     this.props.history.push(`/group/${group.name}`)
   }
 
@@ -46,7 +46,9 @@ const mapStateToProps = (state, ownProps) => {
 
 const mapDispatchToProps = (dispatch) => {
   return {
-   modifyGroup: (group: Group, callback?: () => void) => {dispatch(modifyGroup(group, callback))}
+   modifyGroup: (group: Group, callback?: () => void) => {
+     dispatch(modifyGroup(group, callback))
+    }
   };
 };
 
diff --git a/scm-ui/src/groups/modules/groups.js b/scm-ui/src/groups/modules/groups.js
index 53e18656f4..b9fc3bef80 100644
--- a/scm-ui/src/groups/modules/groups.js
+++ b/scm-ui/src/groups/modules/groups.js
@@ -181,7 +181,7 @@ export function createGroupReset() {
 // modify group 
 export function modifyGroup(group: Group, callback?: () => void) {
   return function(dispatch: Dispatch) {
-    dispatch(modifyGroupPending());
+    dispatch(modifyGroupPending(group));
     return apiClient
     .putWithContentType(group._links.update.href, group, CONTENT_TYPE_GROUP)
     .then(() => {
@@ -196,16 +196,19 @@ export function modifyGroup(group: Group, callback?: () => void) {
   };
 }
 
-export function modifyGroupPending(): Action {
+export function modifyGroupPending(group: Group): Action {
   return {
-    type: MODIFY_GROUP_PENDING
+    type: MODIFY_GROUP_PENDING,
+    payload: group,
+    itemId: group.name
   }
 }
 
 export function modifyGroupSuccess(group: Group): Action {
   return {
     type: MODIFY_GROUP_SUCCESS,
-    payload: group
+    payload: group,
+    itemId: group.name
   }
 }