Merge branch 'release/v2.5.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.5.0

packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js

@@ -43,6 +43,7 @@ import { Text } from "@docspace/shared/components/text";
 import { Link } from "@docspace/shared/components/link";
 import { IconButton } from "@docspace/shared/components/icon-button";
 import { Tooltip } from "@docspace/shared/components/tooltip";
+import { isDesktop } from "@docspace/shared/utils";
 import LinksToViewingIconUrl from "PUBLIC_DIR/images/links-to-viewing.react.svg?url";
 import PlusReactSvgUrl from "PUBLIC_DIR/images/actions.button.plus.react.svg?url";
 
@@ -174,7 +175,7 @@ const Members = ({
 
               {additionalLinks.length >= LINKS_LIMIT_COUNT && (
                 <Tooltip
-                  float
+                  float={isDesktop()}
                   id="emailTooltip"
                   getContent={({ content }) => (
                     <Text fontSize="12px">{content}</Text>

packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableHeader.js

@@ -30,6 +30,7 @@ import { withTranslation } from "react-i18next";
 
 import { TableHeader } from "@docspace/shared/components/table";
 import { Events } from "@docspace/shared/enums";
+import { SortByFieldName } from "SRC_DIR/helpers/constants";
 
 const TABLE_VERSION = "6";
 const TABLE_COLUMNS = `insideGroupTableColumns_ver-${TABLE_VERSION}`;
@@ -87,6 +88,19 @@ class InsideGroupTableHeader extends React.Component {
       },
     ];
 
+    props.showStorageInfo &&
+      defaultColumns.push({
+        key: "Storage",
+        title: props.isDefaultUsersQuotaSet
+          ? t("Common:StorageAndQuota")
+          : t("Common:Storage"),
+        enable: props.storageAccountsColumnIsEnabled,
+        sortBy: SortByFieldName.UsedSpace,
+        resizable: true,
+        onChange: this.onColumnChange,
+        onClick: this.onFilter,
+      });
+
     const columns = props.getColumns(defaultColumns);
 
     this.state = { columns };
@@ -188,6 +202,7 @@ export default inject(
     settingsStore,
     userStore,
     tableStore,
+    currentQuotaStore,
   }) => {
     const { groupsStore } = peopleStore;
 
@@ -203,8 +218,11 @@ export default inject(
       typeAccountsInsideGroupColumnIsEnabled,
       groupAccountsInsideGroupColumnIsEnabled,
       emailAccountsInsideGroupColumnIsEnabled,
+      storageAccountsColumnIsEnabled,
     } = tableStore;
 
+    const { showStorageInfo, isDefaultUsersQuotaSet } = currentQuotaStore;
+
     return {
       filter,
       setFilter,
@@ -219,6 +237,9 @@ export default inject(
       typeAccountsInsideGroupColumnIsEnabled,
       groupAccountsInsideGroupColumnIsEnabled,
       emailAccountsInsideGroupColumnIsEnabled,
+      storageAccountsColumnIsEnabled,
+      showStorageInfo,
+      isDefaultUsersQuotaSet,
     };
   },
 )(

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

@@ -25,6 +25,7 @@
 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 
 import React, { useState } from "react";
+import { inject, observer } from "mobx-react";
 import styled, { css } from "styled-components";
 import { withTranslation } from "react-i18next";
 import { TableRow } from "@docspace/shared/components/table";
@@ -38,6 +39,8 @@ import Badges from "../../Badges";
 import { Base } from "@docspace/shared/themes";
 import { useNavigate } from "react-router-dom";
 
+import SpaceQuota from "SRC_DIR/components/SpaceQuota";
+
 const StyledWrapper = styled.div`
   display: contents;
 `;
@@ -221,6 +224,8 @@ const InsideGroupTableRow = (props) => {
     typeAccountsInsideGroupColumnIsEnabled,
     groupAccountsInsideGroupColumnIsEnabled,
     emailAccountsInsideGroupColumnIsEnabled,
+    showStorageInfo,
+    storageAccountsColumnIsEnabled,
   } = props;
 
   const {
@@ -601,11 +606,32 @@ const InsideGroupTableRow = (props) => {
         ) : (
           <div />
         )}
+
+        {showStorageInfo &&
+          (storageAccountsColumnIsEnabled ? (
+            <TableCell className={"table-cell_Storage/Quota"}>
+              <SpaceQuota hideColumns={hideColumns} item={item} type="user" />
+            </TableCell>
+          ) : (
+            <div />
+          ))}
       </StyledPeopleRow>
     </StyledWrapper>
   );
 };
 
-export default withTranslation(["People", "Common", "Settings"])(
-  withContent(InsideGroupTableRow),
+export default inject(({ currentQuotaStore, tableStore }) => {
+  const { showStorageInfo } = currentQuotaStore;
+  const { storageAccountsColumnIsEnabled } = tableStore;
+
+  return {
+    showStorageInfo,
+    storageAccountsColumnIsEnabled,
+  };
+})(
+  withContent(
+    withTranslation(["People", "Common", "Settings"])(
+      observer(InsideGroupTableRow),
+    ),
+  ),
 );