Web: People: fixed updating of user information after editing

products/ASC.People/Client/src/pages/Profile/Section/Header/index.js

@@ -384,9 +384,11 @@ class SectionHeaderContent extends React.PureComponent {
   };
 
   onClickBack = () => {
-    const { filter, setFilter, history, settings } = this.props;
+    const { filter, setFilter, history, settings, resetProfile } = this.props;
+
+    resetProfile();
     history.push(settings.homepage);
-    setFilter(filter);
+    //setFilter(filter);
   };
 
   render() {

products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js

@@ -47,6 +47,7 @@ import {
   mapGroupsToGroupSelectorOptions,
   toEmployeeWrapper,
 } from "../../../../helpers/people-helpers";
+import { getUserList } from "@appserver/common/api/people/fake";
 
 const dialogsDataset = {
   changeEmail: "changeEmail",
@@ -265,6 +266,7 @@ class UpdateUserForm extends React.Component {
   }
 
   handleSubmit() {
+    const { getUsersList, filter } = this.props;
     if (!this.validate()) return false;
 
     const {
@@ -926,5 +928,6 @@ export default withRouter(
     updateProfile: peopleStore.targetUserStore.updateProfile,
     getUserPhoto: peopleStore.targetUserStore.getUserPhoto,
     disableProfileType: peopleStore.targetUserStore.getDisableProfileType,
+    getUsersList: peopleStore.usersStore.getUsersList,
   }))(observer(withTranslation("ProfileAction")(UpdateUserForm)))
 );

products/ASC.People/Client/src/pages/ProfileAction/Section/Header/index.js

@@ -6,6 +6,9 @@ import Headline from "@appserver/common/components/Headline";
 import { useTranslation } from "react-i18next";
 import { inject, observer } from "mobx-react";
 
+import config from "../../../../../package.json";
+const homepage = config.homepage;
+
 const Wrapper = styled.div`
   display: grid;
   grid-template-columns: auto 1fr auto auto;
@@ -61,15 +64,15 @@ const SectionHeaderContent = (props) => {
   const setFilterAndReset = useCallback(
     (filter) => {
       props.resetProfile();
-      history.goBack();
       setFilter(filter);
     },
     [props, setFilter]
   );
 
   const goBackAndReset = useCallback(() => {
-    props.resetProfile();
+    if (!profile || !document.referrer) setFilterAndReset(filter);
-    history.push(`/products/people/view/${profile.userName}`);
+    else props.resetProfile();
+    history.push(`${homepage}/view/${profile.userName}`);
   }, [history, props]);
 
   const onClickBack = useCallback(() => {

products/ASC.People/Client/src/store/TargetUserStore.js

@@ -32,12 +32,12 @@ class TargetUserStore {
   }
 
   getTargetUser = async (userName) => {
-    if (authStore.userStore.user.userName === userName) {
+    /*if (authStore.userStore.user.userName === userName) {
       return this.setTargetUser(authStore.userStore.user);
-    } else {
+    } else {*/
-      const user = await api.people.getUser(userName);
+    const user = await api.people.getUser(userName);
-      return this.setTargetUser(user);
+    return this.setTargetUser(user);
-    }
+    //}
   };
 
   setTargetUser = (user) => {

products/ASC.People/Client/src/store/UsersStore.js

@@ -98,7 +98,8 @@ class UsersStore {
       updatedProfile = this.peopleStore.targetUserStore.targetUser;
     }
     const { userName } = updatedProfile;
-    const oldProfile = this.users.filter((u) => u.userName === userName);
+    const oldProfileArr = this.users.filter((u) => u.userName === userName);
+    const oldProfile = oldProfileArr[0];
     const newProfile = {};
 
     for (let key in oldProfile) {