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

Web: Fixed after merge.

Browse Source
This commit is contained in:
Tatiana Lopaeva 2024-02-20 20:27:56 +03:00
parent 123326cfc5
commit a835731ae4
2 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
View File

@ -1,7 +1,5 @@
import React, { useState } from "react";
import styled, { css } from "styled-components";
import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react";
import { TableRow } from "@docspace/shared/components/table";
import { TableCell } from "@docspace/shared/components/table";
@ -9,8 +7,6 @@ import { Link } from "@docspace/shared/components/link";
import { Text } from "@docspace/shared/components/text";
import { Checkbox } from "@docspace/shared/components/checkbox";
import { ComboBox } from "@docspace/shared/components/combobox";
import SpaceQuota from "SRC_DIR/components/SpaceQuota";
import withContent from "SRC_DIR/HOCs/withPeopleContent";
import Badges from "../../Badges";
import { Base } from "@docspace/shared/themes";
import { useNavigate } from "react-router-dom";
@ -659,27 +655,9 @@ const InsideGroupTableRow = (props) => {
{email}
</Link>
</TableCell>
{showStorageInfo && (
<TableCell className={"table-cell_Storage/Quota"}>
<SpaceQuota hideColumns={hideColumns} item={item} type="user" />
</TableCell>
)}
</StyledPeopleRow>
</StyledWrapper>
);
};
export default inject(({ currentQuotaStore }) => {
const { showStorageInfo } = currentQuotaStore;
return {
showStorageInfo,
};
})(
withContent(
withTranslation(["People", "Common", "Settings"])(
observer(InsideGroupTableRow),
),
),
);
export default InsideGroupTableRow;

22
packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
View File

@ -1,5 +1,6 @@
import React, { useState } from "react";
import styled, { css } from "styled-components";
import { inject, observer } from "mobx-react";
import { withTranslation } from "react-i18next";
import ExpanderDownReactSvgUrl from "PUBLIC_DIR/images/expander-down.react.svg?url";
import { TableRow } from "@docspace/shared/components/table";
@ -17,6 +18,8 @@ import { Base } from "@docspace/shared/themes";
import { DropDown } from "@docspace/shared/components/drop-down";
import { useNavigate } from "react-router-dom";
import SpaceQuota from "SRC_DIR/components/SpaceQuota";
const StyledWrapper = styled.div`
display: contents;
`;
@ -291,6 +294,7 @@ const PeopleTableRow = (props) => {
value,
standalone,
setCurrentGroup,
showStorageInfo,
} = props;
const {
@ -659,11 +663,25 @@ const PeopleTableRow = (props) => {
{email}
</Link>
</TableCell>
{showStorageInfo && (
<TableCell className={"table-cell_Storage/Quota"}>
<SpaceQuota hideColumns={hideColumns} item={item} type="user" />
</TableCell>
)}
</StyledPeopleRow>
</StyledWrapper>
);
};
export default withTranslation(["People", "Common", "Settings"])(
withContent(PeopleTableRow),
export default inject(({ currentQuotaStore }) => {
const { showStorageInfo } = currentQuotaStore;
return {
showStorageInfo,
};
})(
withContent(
withTranslation(["People", "Common", "Settings"])(observer(PeopleTableRow)),
),
);