Merge branch 'feature/loading-acceleration' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/loading-acceleration
This commit is contained in:
commit
b8d2407530
@ -271,6 +271,7 @@ export const getPeopleList = createSelector(
|
||||
userName,
|
||||
activationStatus,
|
||||
status,
|
||||
groups,
|
||||
} = user;
|
||||
const statusType = getUserStatus(user);
|
||||
const role = getUserRole(user);
|
||||
@ -300,6 +301,7 @@ export const getPeopleList = createSelector(
|
||||
userName,
|
||||
mobilePhone,
|
||||
options,
|
||||
groups,
|
||||
};
|
||||
});
|
||||
}
|
||||
|
@ -1,52 +1,48 @@
|
||||
import { getUserByUserName } from '../people/selectors';
|
||||
import { getUserByUserName } from "../people/selectors";
|
||||
import { fetchPeople } from "../people/actions";
|
||||
import { store, api } from 'asc-web-common';
|
||||
import { store, api } from "asc-web-common";
|
||||
const { setCurrentUser } = store.auth.actions;
|
||||
const { isMe } = store.auth.selectors;
|
||||
|
||||
|
||||
export const SET_PROFILE = 'SET_PROFILE';
|
||||
export const CLEAN_PROFILE = 'CLEAN_PROFILE';
|
||||
export const SET_PROFILE = "SET_PROFILE";
|
||||
export const CLEAN_PROFILE = "CLEAN_PROFILE";
|
||||
|
||||
export function setProfile(targetUser) {
|
||||
return {
|
||||
type: SET_PROFILE,
|
||||
targetUser
|
||||
};
|
||||
targetUser,
|
||||
};
|
||||
}
|
||||
|
||||
export function resetProfile() {
|
||||
return {
|
||||
type: CLEAN_PROFILE
|
||||
};
|
||||
type: CLEAN_PROFILE,
|
||||
};
|
||||
}
|
||||
|
||||
export function employeeWrapperToMemberModel(profile) {
|
||||
const comment = profile.notes;
|
||||
const department = profile.groups ? profile.groups.map(group => group.id) : [];
|
||||
const department = profile.groups
|
||||
? profile.groups.map((group) => group.id)
|
||||
: [];
|
||||
const worksFrom = profile.workFrom;
|
||||
|
||||
return { ...profile, comment, department, worksFrom };
|
||||
};
|
||||
}
|
||||
|
||||
export function fetchProfile(userName) {
|
||||
return (dispatch, getState) => {
|
||||
const { auth, people } = getState();
|
||||
const { auth } = getState();
|
||||
|
||||
if (isMe(auth.user, userName)) {
|
||||
dispatch(setProfile(auth.user));
|
||||
} else {
|
||||
const user = getUserByUserName(people.users, userName);
|
||||
if (!user) {
|
||||
api.people.getUser(userName).then(user => {
|
||||
api.people.getUser(userName).then((user) => {
|
||||
dispatch(setProfile(user));
|
||||
});
|
||||
} else {
|
||||
dispatch(setProfile(user));
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
export function createProfile(profile) {
|
||||
return (dispatch, getState) => {
|
||||
@ -55,16 +51,20 @@ export function createProfile(profile) {
|
||||
const member = employeeWrapperToMemberModel(profile);
|
||||
let result;
|
||||
|
||||
return api.people.createUser(member).then(user => {
|
||||
return api.people
|
||||
.createUser(member)
|
||||
.then((user) => {
|
||||
result = user;
|
||||
return dispatch(setProfile(user));
|
||||
}).then(() => {
|
||||
})
|
||||
.then(() => {
|
||||
return fetchPeople(filter, dispatch);
|
||||
}).then(() => {
|
||||
})
|
||||
.then(() => {
|
||||
return Promise.resolve(result);
|
||||
});
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
export function updateProfile(profile) {
|
||||
return (dispatch, getState) => {
|
||||
@ -73,26 +73,30 @@ export function updateProfile(profile) {
|
||||
const member = employeeWrapperToMemberModel(profile);
|
||||
let result;
|
||||
|
||||
return api.people.updateUser(member).then(user => {
|
||||
return api.people
|
||||
.updateUser(member)
|
||||
.then((user) => {
|
||||
result = user;
|
||||
return Promise.resolve(dispatch(setProfile(user)));
|
||||
}).then(() => {
|
||||
})
|
||||
.then(() => {
|
||||
return fetchPeople(filter, dispatch);
|
||||
}).then(() => {
|
||||
})
|
||||
.then(() => {
|
||||
return Promise.resolve(result);
|
||||
});
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
export function updateProfileCulture(id, culture) {
|
||||
return (dispatch) => {
|
||||
return api.people.updateUserCulture(id, culture).then(user => {
|
||||
return api.people.updateUserCulture(id, culture).then((user) => {
|
||||
dispatch(setCurrentUser(user));
|
||||
return dispatch(setProfile(user));
|
||||
});
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
export function getUserPhoto(id) {
|
||||
return api.people.getUserPhoto(id);
|
||||
};
|
||||
}
|
||||
|
@ -74,7 +74,7 @@ class Filter {
|
||||
filtervalue: (search ?? "").trim(),
|
||||
groupId: group,
|
||||
fields:
|
||||
"id,status,isAdmin,isOwner,isVisitor,activationStatus,userName,email,mobilePhone,displayName,avatar,listAdminModules,birthday,title,location,isLDAP,isSSO"
|
||||
"id,status,isAdmin,isOwner,isVisitor,activationStatus,userName,email,mobilePhone,displayName,avatar,listAdminModules,birthday,title,location,isLDAP,isSSO,groups"
|
||||
};
|
||||
|
||||
switch (role) {
|
||||
|
Loading…
Reference in New Issue
Block a user