Client: Fix getting accounts that don't belong current group when remove some user in this group
This commit is contained in:
parent
5fc6b7a5fe
commit
5143fb615e
@ -26,16 +26,18 @@
|
|||||||
|
|
||||||
import React from "react";
|
import React from "react";
|
||||||
import PropTypes from "prop-types";
|
import PropTypes from "prop-types";
|
||||||
|
import { matchPath } from "react-router";
|
||||||
|
import { withTranslation } from "react-i18next";
|
||||||
|
|
||||||
import { Button } from "@docspace/shared/components/button";
|
import { Button } from "@docspace/shared/components/button";
|
||||||
import { toastr } from "@docspace/shared/components/toast";
|
import { toastr } from "@docspace/shared/components/toast";
|
||||||
import { ModalDialog } from "@docspace/shared/components/modal-dialog";
|
import { ModalDialog } from "@docspace/shared/components/modal-dialog";
|
||||||
import { withTranslation } from "react-i18next";
|
import { mobileMore } from "@docspace/shared/utils";
|
||||||
import api from "@docspace/shared/api";
|
import api from "@docspace/shared/api";
|
||||||
|
|
||||||
import ModalDialogContainer from "../ModalDialogContainer";
|
import ModalDialogContainer from "../ModalDialogContainer";
|
||||||
import { inject, observer } from "mobx-react";
|
import { inject, observer } from "mobx-react";
|
||||||
import styled, { css } from "styled-components";
|
import styled, { css } from "styled-components";
|
||||||
import { mobileMore } from "@docspace/shared/utils";
|
|
||||||
import BodyComponent from "./sub-components/BodyComponent";
|
import BodyComponent from "./sub-components/BodyComponent";
|
||||||
|
|
||||||
const { deleteUser } = api.people;
|
const { deleteUser } = api.people;
|
||||||
@ -108,6 +110,7 @@ const DeleteProfileEverDialogComponent = (props) => {
|
|||||||
removeUser,
|
removeUser,
|
||||||
userIds,
|
userIds,
|
||||||
filter,
|
filter,
|
||||||
|
refreshInsideGroup,
|
||||||
setSelected,
|
setSelected,
|
||||||
deleteWithoutReassign,
|
deleteWithoutReassign,
|
||||||
onlyOneUser,
|
onlyOneUser,
|
||||||
@ -123,15 +126,22 @@ const DeleteProfileEverDialogComponent = (props) => {
|
|||||||
|
|
||||||
const areUsersOnly = usersToDelete.every((user) => user.isVisitor);
|
const areUsersOnly = usersToDelete.every((user) => user.isVisitor);
|
||||||
|
|
||||||
|
const isInsideGroup = matchPath(
|
||||||
|
"/accounts/groups/:groupId/filter",
|
||||||
|
location.pathname,
|
||||||
|
);
|
||||||
|
|
||||||
const onDeleteUser = (id) => {
|
const onDeleteUser = (id) => {
|
||||||
setIsRequestRunning(true);
|
setIsRequestRunning(true);
|
||||||
|
|
||||||
deleteUser(id)
|
deleteUser(id)
|
||||||
|
.then(() => {
|
||||||
|
return isInsideGroup
|
||||||
|
? refreshInsideGroup()
|
||||||
|
: getUsersList(filter, true);
|
||||||
|
})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
toastr.success(t("SuccessfullyDeleteUserInfoMessage"));
|
toastr.success(t("SuccessfullyDeleteUserInfoMessage"));
|
||||||
getUsersList(filter, true);
|
|
||||||
|
|
||||||
return;
|
|
||||||
})
|
})
|
||||||
.catch((error) => toastr.error(error))
|
.catch((error) => toastr.error(error))
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
@ -142,7 +152,7 @@ const DeleteProfileEverDialogComponent = (props) => {
|
|||||||
};
|
};
|
||||||
const onDeleteUsers = (ids) => {
|
const onDeleteUsers = (ids) => {
|
||||||
setIsRequestRunning(true);
|
setIsRequestRunning(true);
|
||||||
removeUser(ids, filter)
|
removeUser(ids, filter, isInsideGroup)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
toastr.success(t("DeleteGroupUsersSuccessMessage"));
|
toastr.success(t("DeleteGroupUsersSuccessMessage"));
|
||||||
})
|
})
|
||||||
@ -239,6 +249,7 @@ DeleteProfileEverDialog.propTypes = {
|
|||||||
|
|
||||||
export default inject(({ peopleStore }, { users }) => {
|
export default inject(({ peopleStore }, { users }) => {
|
||||||
const { dialogStore, selectionStore, filterStore, usersStore } = peopleStore;
|
const { dialogStore, selectionStore, filterStore, usersStore } = peopleStore;
|
||||||
|
const { refreshInsideGroup } = peopleStore.groupsStore;
|
||||||
|
|
||||||
const { getUsersList, needResetUserSelection } = peopleStore.usersStore;
|
const { getUsersList, needResetUserSelection } = peopleStore.usersStore;
|
||||||
|
|
||||||
@ -272,6 +283,7 @@ export default inject(({ peopleStore }, { users }) => {
|
|||||||
removeUser: usersStore.removeUser,
|
removeUser: usersStore.removeUser,
|
||||||
needResetUserSelection,
|
needResetUserSelection,
|
||||||
filter: filterStore.filter,
|
filter: filterStore.filter,
|
||||||
|
refreshInsideGroup,
|
||||||
getUsersList,
|
getUsersList,
|
||||||
deleteWithoutReassign,
|
deleteWithoutReassign,
|
||||||
onlyOneUser,
|
onlyOneUser,
|
||||||
|
@ -282,6 +282,7 @@ class GroupsStore {
|
|||||||
filter,
|
filter,
|
||||||
updateFilter = false,
|
updateFilter = false,
|
||||||
withFilterLocalStorage = false,
|
withFilterLocalStorage = false,
|
||||||
|
updateCurrentGroup = false,
|
||||||
) => {
|
) => {
|
||||||
this.setInsideGroupLoading(true);
|
this.setInsideGroupLoading(true);
|
||||||
|
|
||||||
@ -309,7 +310,7 @@ class GroupsStore {
|
|||||||
|
|
||||||
requests.push(api.people.getUserList(filterData));
|
requests.push(api.people.getUserList(filterData));
|
||||||
|
|
||||||
if (groupId !== this.currentGroup?.id) {
|
if (updateCurrentGroup || groupId !== this.currentGroup?.id) {
|
||||||
requests.push(groupsApi.getGroupById(groupId));
|
requests.push(groupsApi.getGroupById(groupId));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -329,6 +330,18 @@ class GroupsStore {
|
|||||||
return Promise.resolve(filteredMembersRes.items);
|
return Promise.resolve(filteredMembersRes.items);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
refreshInsideGroup = async () => {
|
||||||
|
if (!this.currentGroup) return;
|
||||||
|
|
||||||
|
await this.fetchGroup(
|
||||||
|
this.currentGroup.id,
|
||||||
|
this.insideGroupFilter,
|
||||||
|
true,
|
||||||
|
false,
|
||||||
|
true,
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
get hasMoreInsideGroupUsers() {
|
get hasMoreInsideGroupUsers() {
|
||||||
return (
|
return (
|
||||||
this.peopleStore.usersStore.users.length < this.insideGroupFilter.total
|
this.peopleStore.usersStore.users.length < this.insideGroupFilter.total
|
||||||
|
@ -149,9 +149,14 @@ class UsersStore {
|
|||||||
return Promise.resolve(result);
|
return Promise.resolve(result);
|
||||||
};
|
};
|
||||||
|
|
||||||
removeUser = async (userId, filter) => {
|
removeUser = async (userId, filter, isInsideGroup) => {
|
||||||
|
const { refreshInsideGroup } = this.peopleStore.groupsStore;
|
||||||
|
|
||||||
await api.people.deleteUsers(userId);
|
await api.people.deleteUsers(userId);
|
||||||
await this.getUsersList(filter, true);
|
|
||||||
|
isInsideGroup
|
||||||
|
? await refreshInsideGroup()
|
||||||
|
: await this.getUsersList(filter, true);
|
||||||
};
|
};
|
||||||
|
|
||||||
get needResetUserSelection() {
|
get needResetUserSelection() {
|
||||||
|
Loading…
Reference in New Issue
Block a user