Web: People: GroupAction: fixed reset of the selected group in tree when updating (or following a link) of the group edit page

products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js

@@ -19,7 +19,12 @@ import {
   resetGroup,
   updateGroup,
 } from "../../../../../store/group/actions";
-import { selectGroup, setFilter } from "../../../../../store/people/actions";
+import {
+  selectGroup,
+  setFilter,
+  setSelectGroup,
+} from "../../../../../store/people/actions";
+import { getSelectedGroupId } from "../../../../../store/people/selectors";
 
 import { GUID_EMPTY } from "../../../../../helpers/constants";
 import PropTypes from "prop-types";
@@ -91,6 +96,14 @@ class SectionBodyContent extends React.Component {
     this.state = this.mapPropsToState();
   }
 
+  componentDidMount() {
+    const { selectedGroup, group, setSelectGroup } = this.props;
+    const { id } = group;
+    if (!selectedGroup || selectedGroup !== id) {
+      setSelectGroup(id);
+    }
+  }
+
   mapPropsToState = () => {
     const { group, users, groups, t } = this.props;
     const buttonLabel = group ? t("SaveButton") : t("AddButton");
@@ -520,6 +533,7 @@ function mapStateToProps(state) {
     currentModuleName,
     filter: state.people.filter,
     isLoaded,
+    selectedGroup: getSelectedGroupId(state),
   };
 }
 
@@ -529,4 +543,5 @@ export default connect(mapStateToProps, {
   updateGroup,
   selectGroup,
   setFilter,
+  setSelectGroup,
 })(withRouter(withTranslation()(SectionBodyContent)));

products/ASC.People/Client/src/store/people/actions.js

@@ -174,6 +174,13 @@ export function setIsEditingForm(isEdit) {
   };
 }
 
+export function setSelectGroup(groupId) {
+  return {
+    type: SELECT_GROUP,
+    groupId,
+  };
+}
+
 export function fetchSelectorUsers() {
   return (dispatch) => {
     api.people.getSelectorUserList().then((data) => {
@@ -235,10 +242,7 @@ function fetchPeopleByFilter(dispatch, filter) {
   return api.people.getUserList(filterData).then((data) => {
     filterData.total = data.total;
     dispatch(setFilter(filterData));
-    dispatch({
+    dispatch(setSelectGroup(filterData.group));
-      type: SELECT_GROUP,
-      groupId: filterData.group,
-    });
     return dispatch(setUsers(data.items));
   });
 }

products/ASC.People/Client/src/store/people/selectors.js

@@ -456,3 +456,7 @@ export const getIsEmptyGroup = createSelector(
     return false;
   }
 );
+
+export const getSelectedGroupId = (state) => {
+  return state.people.selectedGroup;
+};