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

This commit is contained in:
Timofey Boyko 2024-04-11 17:07:58 +03:00
commit 6559055ff2
5 changed files with 10 additions and 6 deletions

View File

@ -33,8 +33,7 @@ import { Text } from "@docspace/shared/components/text";
import { parseAddresses } from "@docspace/shared/utils";
import { getAccessOptions } from "../utils";
import { getUserRole, getUserTypeLabel } from "@docspace/shared/utils/common";
import { capitalize } from "lodash";
import { getUserTypeLabel } from "@docspace/shared/utils/common";
import {
StyledEditInput,
@ -111,7 +110,6 @@ const Item = ({
return "user";
};
const role = getUserRole(item);
const type = getUserType(item);
const typeLabel = item?.isEmailInvite
@ -270,7 +268,7 @@ const Item = ({
<>
<Avatar
size="min"
role={role}
role={type}
source={source}
isGroup={isGroup}
userName={groupName}

View File

@ -104,7 +104,9 @@ class PeopleTableHeader extends React.Component {
});
const columns = props.getColumns(defaultColumns);
const storageColumns = localStorage.getItem(this.props.tableStorageName);
const storageColumns = localStorage.getItem(
`${TABLE_COLUMNS}=${this.props.userId}`,
);
const splitColumns = storageColumns && storageColumns.split(",");
const resetColumnsSize =

View File

@ -102,7 +102,7 @@ export const StyledInfo = styled.div`
.rows-container {
display: grid;
grid-template-columns: minmax(75px, auto) 1fr;
grid-template-columns: minmax(75px, auto) minmax(0, 1fr);
gap: 24px;
max-width: 100%;

View File

@ -39,6 +39,7 @@ import {
import { getRooms } from "@docspace/shared/api/rooms";
import { getUserList } from "@docspace/shared/api/people";
import { SortByFieldName } from "SRC_DIR/helpers/constants";
import { RoomsProviderType } from "@docspace/shared/enums";
const FILTER_COUNT = 6;
@ -85,6 +86,8 @@ class StorageManagement {
this.roomFilterData.pageCount = FILTER_COUNT;
this.roomFilterData.sortBy = SortByFieldName.UsedSpace;
this.roomFilterData.sortOrder = "descending";
this.roomFilterData.provider = RoomsProviderType.Storage;
const requests = [
getPortal(),
getPortalUsersCount(),

View File

@ -156,6 +156,7 @@ export const enum RoomsProviderType {
SharePoint = 6,
WebDav = 7,
Yandex = 8,
Storage = 9,
}
/**