Web:Client: update get users list
This commit is contained in:
parent
c9671b16ff
commit
876740d119
@ -2,6 +2,7 @@ import React from "react";
|
||||
import { inject, observer } from "mobx-react";
|
||||
import styled from "styled-components";
|
||||
import { withTranslation } from "react-i18next";
|
||||
import { useNavigate, useLocation } from "react-router-dom";
|
||||
|
||||
import { PaymentsType, AccountLoginType } from "@docspace/common/constants";
|
||||
|
||||
@ -44,21 +45,25 @@ const Badges = ({
|
||||
withoutPaid,
|
||||
isPaid = false,
|
||||
filter,
|
||||
getUsersList,
|
||||
|
||||
isSSO = false,
|
||||
}) => {
|
||||
const navigate = useNavigate();
|
||||
const location = useLocation();
|
||||
|
||||
const onClickPaid = () => {
|
||||
if (filter.payments === PaymentsType.Paid) return;
|
||||
const newFilter = filter.clone();
|
||||
newFilter.payments = PaymentsType.Paid;
|
||||
getUsersList(newFilter, true);
|
||||
|
||||
navigate(`${location.pathname}?${newFilter.toUrlParams()}`);
|
||||
};
|
||||
|
||||
const onClickSSO = () => {
|
||||
if (filter.accountLoginType === AccountLoginType.SSO) return;
|
||||
const newFilter = filter.clone();
|
||||
newFilter.accountLoginType = AccountLoginType.SSO;
|
||||
getUsersList(newFilter, true);
|
||||
navigate(`${location.pathname}?${newFilter.toUrlParams()}`);
|
||||
};
|
||||
|
||||
return (
|
||||
@ -99,10 +104,9 @@ const Badges = ({
|
||||
};
|
||||
|
||||
export default inject(({ peopleStore }) => {
|
||||
const { filterStore, usersStore } = peopleStore;
|
||||
const { filterStore } = peopleStore;
|
||||
|
||||
const { filter } = filterStore;
|
||||
|
||||
const { getUsersList } = usersStore;
|
||||
return { filter, getUsersList };
|
||||
return { filter };
|
||||
})(withTranslation(["Common"])(observer(Badges)));
|
||||
|
@ -96,11 +96,9 @@ class PeopleStore {
|
||||
};
|
||||
|
||||
resetFilter = () => {
|
||||
const { getUsersList } = this.usersStore;
|
||||
|
||||
const filter = Filter.getDefault();
|
||||
|
||||
return getUsersList(filter, true);
|
||||
window.DocSpace.navigate(`accounts/filter?${filter.toUrlParams()}`);
|
||||
};
|
||||
|
||||
onChangeType = (e) => {
|
||||
@ -167,10 +165,8 @@ class PeopleStore {
|
||||
};
|
||||
|
||||
changeStatus = (status, users) => {
|
||||
const {
|
||||
setChangeUserStatusDialogVisible,
|
||||
setDialogData,
|
||||
} = this.dialogStore;
|
||||
const { setChangeUserStatusDialogVisible, setDialogData } =
|
||||
this.dialogStore;
|
||||
|
||||
const userIDs = users.map((user) => {
|
||||
return user?.id ? user.id : user;
|
||||
@ -195,10 +191,8 @@ class PeopleStore {
|
||||
hasUsersToRemove,
|
||||
hasFreeUsers,
|
||||
} = this.selectionStore;
|
||||
const {
|
||||
setSendInviteDialogVisible,
|
||||
setDeleteDialogVisible,
|
||||
} = this.dialogStore;
|
||||
const { setSendInviteDialogVisible, setDeleteDialogVisible } =
|
||||
this.dialogStore;
|
||||
|
||||
const { isOwner } = this.authStore.userStore.user;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user