IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web:Accounts: fix filter for pending user

Browse Source
This commit is contained in:
Timofey Boyko 2023-03-01 17:09:31 +03:00
parent 44f9bca278
commit 7af2d9040c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/client/src/pages/AccountsHome/Section/Filter/index.js
View File

@ -11,7 +11,11 @@ import Loaders from "@docspace/common/components/Loaders";
import { withLayoutSize } from "@docspace/common/utils";
import withPeopleLoader from "SRC_DIR/HOCs/withPeopleLoader";
import { EmployeeType, PaymentsType } from "@docspace/common/constants";
import {
EmployeeType,
EmployeeStatus,
PaymentsType,
} from "@docspace/common/constants";
const getStatus = (filterValues) => {
const employeeStatus = result(
@ -79,8 +83,12 @@ const SectionFilterContent = ({
const newFilter = filter.clone();
if (status === 3) {
newFilter.employeeStatus = 2;
newFilter.employeeStatus = EmployeeStatus.Disabled;
newFilter.activationStatus = null;
} else if (status === 2) {
console.log(status);
newFilter.employeeStatus = EmployeeStatus.Active;
newFilter.activationStatus = status;
} else {
newFilter.employeeStatus = null;
newFilter.activationStatus = status;
@ -93,6 +101,7 @@ const SectionFilterContent = ({
newFilter.group = group;
newFilter.payments = payments;
console.log(newFilter);
setIsLoading(true);
fetchPeople(newFilter, true).finally(() => setIsLoading(false));

4
packages/client/src/store/UsersStore.js
View File

@ -33,10 +33,6 @@ class UsersStore {
filterData.pageCount = 100;
}
if (filterData.employeeStatus === EmployeeStatus.Active) {
filterData.employeeStatus = null;
}
if (filterData.group && filterData.group === "root")
filterData.group = undefined;