diff --git a/common/ASC.Api.Core/Model/EmployeeFullDto.cs b/common/ASC.Api.Core/Model/EmployeeFullDto.cs
index 07410cd8c3..c627cdb063 100644
--- a/common/ASC.Api.Core/Model/EmployeeFullDto.cs
+++ b/common/ASC.Api.Core/Model/EmployeeFullDto.cs
@@ -244,17 +244,17 @@ public class EmployeeFullDtoHelper : EmployeeDtoHelper
if (_context.Check("avatarMax"))
{
- result.AvatarMax = await _userPhotoManager.GetMaxPhotoURL(userInfo.Id) + $"?_={cacheKey}";
+ result.AvatarMax = await _userPhotoManager.GetMaxPhotoURL(userInfo.Id) + $"?hash={cacheKey}";
}
if (_context.Check("avatarMedium"))
{
- result.AvatarMedium = await _userPhotoManager.GetMediumPhotoURL(userInfo.Id) + $"?_={cacheKey}";
+ result.AvatarMedium = await _userPhotoManager.GetMediumPhotoURL(userInfo.Id) + $"?hash={cacheKey}";
}
if (_context.Check("avatar"))
{
- result.Avatar = await _userPhotoManager.GetBigPhotoURL(userInfo.Id) + $"?_={cacheKey}";
+ result.Avatar = await _userPhotoManager.GetBigPhotoURL(userInfo.Id) + $"?hash={cacheKey}";
}
if (_context.Check("listAdminModules"))
diff --git a/packages/client/public/locales/en/Settings.json b/packages/client/public/locales/en/Settings.json
index fcd6b84101..6a2076a12e 100644
--- a/packages/client/public/locales/en/Settings.json
+++ b/packages/client/public/locales/en/Settings.json
@@ -73,9 +73,9 @@
"DeleteTheme": "Delete theme",
"DeleteThemeForever": "Delete theme forever?",
"DeleteThemeNotice": "The theme will be deleted permanently. You will not be able to undo this action.",
- "DeveloperTools": "Developer",
+ "DeveloperTools": "Developer Tools",
"Disabled": "Disabled",
- "DownloadCopy": "Download the copy",
+ "DownloadCopy": "Download copy",
"DownloadReportBtnText": "Download report",
"DownloadReportDescription": "The report will be saved to My Documents",
"DownloadStatisticsText": "You can download the report for the data available during the selected storage period to view the detailed statistics.",
@@ -86,6 +86,7 @@
"EnableAutomaticBackup": "Enable automatic backup.",
"EnableAutomaticBackupDescription": "Use this option to back up the space data.",
"EnterTitle": "Enter title",
+ "EnterPath": "Enter path",
"EveryDay": "Every day",
"EveryMonth": "Every month",
"EveryWeek": "Every week",
diff --git a/packages/client/public/locales/ru/Settings.json b/packages/client/public/locales/ru/Settings.json
index 7f7323ce38..2444cbda67 100644
--- a/packages/client/public/locales/ru/Settings.json
+++ b/packages/client/public/locales/ru/Settings.json
@@ -73,7 +73,7 @@
"DeleteTheme": "Удалить тему",
"DeleteThemeForever": "Удалить тему навсегда?",
"DeleteThemeNotice": "Тема будет удалена навсегда. Вы не сможете отменить это действие.",
- "DeveloperTools": "Разработчик",
+ "DeveloperTools": "Инструменты разработчика",
"Disabled": "Отключено",
"DownloadCopy": "Скачать копию",
"DownloadReportBtn": "Скачать и открыть отчет",
@@ -85,6 +85,7 @@
"EnableAutomaticBackup": "Давать возможность автоматически копировать данные",
"EnableAutomaticBackupDescription": "Используйте эту опцию для выполнения резервного копирования данных портала.",
"EnterTitle": "Укажите название",
+ "EnterPath": "Введите путь",
"EveryDay": "Каждый день",
"EveryMonth": "Каждый месяц",
"EveryWeek": "Каждую неделю",
diff --git a/packages/client/src/HOCs/withFileActions.js b/packages/client/src/HOCs/withFileActions.js
index a39d86535b..870e7c11f4 100644
--- a/packages/client/src/HOCs/withFileActions.js
+++ b/packages/client/src/HOCs/withFileActions.js
@@ -87,7 +87,9 @@ export default function withFileActions(WrappedFileItem) {
const { isThirdPartyFolder } = item;
const notSelectable = e.target.closest(".not-selectable");
- const isFileName = e.target.classList.contains("item-file-name");
+ const isFileName =
+ e.target.classList.contains("item-file-name") ||
+ e.target.classList.contains("row-content-link");
if (
isPrivacy ||
@@ -225,7 +227,7 @@ export default function withFileActions(WrappedFileItem) {
itemIndex,
} = this.props;
- const { fileExst, access, id } = item;
+ const { access, id } = item;
const isDragging = isFolder && access < 2 && !isTrashFolder && !isPrivacy;
@@ -233,11 +235,7 @@ export default function withFileActions(WrappedFileItem) {
if (draggable) className += " draggable";
let value = !item.isFolder ? `file_${id}` : `folder_${id}`;
- value += draggable
- ? "_draggable"
- : item.providerKey
- ? `_${item.providerKey}`
- : "_false";
+ value += draggable ? "_draggable" : "_false";
value += `_index_${itemIndex}`;
diff --git a/packages/client/src/components/Article/Body/Items.js b/packages/client/src/components/Article/Body/Items.js
index f18ed35332..4a14247946 100644
--- a/packages/client/src/components/Article/Body/Items.js
+++ b/packages/client/src/components/Article/Body/Items.js
@@ -298,7 +298,7 @@ const Items = ({
const onMoveTo = React.useCallback(
(destFolderId, title) => {
- moveDragItems(destFolderId, title, null, {
+ moveDragItems(destFolderId, title, {
copy: t("Translations:CopyOperation"),
move: t("Translations:MoveToOperation"),
});
diff --git a/packages/client/src/pages/FormGallery/TilesView/StyledTileView.js b/packages/client/src/pages/FormGallery/TilesView/StyledTileView.js
index 39c34141a0..bb04de6ffe 100644
--- a/packages/client/src/pages/FormGallery/TilesView/StyledTileView.js
+++ b/packages/client/src/pages/FormGallery/TilesView/StyledTileView.js
@@ -212,10 +212,6 @@ const paddingCss = css`
@media ${desktop} {
padding-right: 3px;
}
-
- @media ${tablet} {
- margin-left: -1px;
- }
`;
const StyledGridWrapper = styled.div`
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js b/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js
index fa980b40b3..a267660f07 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/styles/common.js
@@ -15,7 +15,7 @@ const StyledInfoPanelBody = styled.div`
: css`
padding: 80px 3px 0 20px;
@media ${hugeMobile} {
- padding: 80px 8px 0 16px;
+ padding: 80px 0 0 16px;
}
`}
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/styles/details.js b/packages/client/src/pages/Home/InfoPanel/Body/styles/details.js
index 87bf01407c..1f86b2d6dd 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/styles/details.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/styles/details.js
@@ -1,5 +1,5 @@
import styled from "styled-components";
-
+import { isMobileOnly } from "react-device-detect";
import { Base } from "@docspace/components/themes";
const StyledThumbnail = styled.div`
@@ -7,13 +7,14 @@ const StyledThumbnail = styled.div`
justify-content: center;
align-items: center;
width: 100%;
- height: auto;
+ height: ${isMobileOnly ? "188" : "240"}px;
img {
border: ${(props) => `solid 1px ${props.theme.infoPanel.borderColor}`};
border-radius: 6px;
- width: auto;
- max-width: 100%;
- height: auto;
+ width: 100%;
+ height: 100%;
+ object-fit: none;
+ object-position: top;
}
`;
@@ -30,7 +31,8 @@ const StyledNoThumbnail = styled.div`
border-radius: 16px;
}
.custom-logo {
- outline: 1px solid ${(props) => props.theme.infoPanel.details.customLogoBorderColor};
+ outline: 1px solid ${(props) =>
+ props.theme.infoPanel.details.customLogoBorderColor};
`;
const StyledAccess = styled.div`
diff --git a/packages/client/src/pages/Home/InfoPanel/Body/styles/gallery.js b/packages/client/src/pages/Home/InfoPanel/Body/styles/gallery.js
index 8d1390fda9..1f6fd64d98 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/styles/gallery.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/styles/gallery.js
@@ -1,11 +1,11 @@
import styled from "styled-components";
-
+import { isMobileOnly } from "react-device-detect";
import { Base } from "@docspace/components/themes";
const StyledGalleryThumbnail = styled.div`
box-sizing: border-box;
width: 100%;
- height: 346px;
+ height: ${isMobileOnly ? "335" : "346"}px;
overflow: hidden;
border: ${(props) =>
`solid 1px ${props.theme.infoPanel.gallery.borderColor}`};
diff --git a/packages/client/src/pages/Home/MediaViewer/index.js b/packages/client/src/pages/Home/MediaViewer/index.js
index 3a0da85f61..e03680764f 100644
--- a/packages/client/src/pages/Home/MediaViewer/index.js
+++ b/packages/client/src/pages/Home/MediaViewer/index.js
@@ -27,6 +27,7 @@ const FilesMediaViewer = (props) => {
setToPreviewFile,
setScrollToItem,
setCurrentId,
+ setAlreadyFetchingRooms,
setBufferSelection,
isFavoritesFolder,
archiveRoomsId,
@@ -72,6 +73,7 @@ const FilesMediaViewer = (props) => {
fetchFiles(previewFile.folderId).finally(() => {
setIsLoading(false);
setFirstLoad(false);
+ setAlreadyFetchingRooms(false);
});
}
}, [previewFile]);
@@ -230,6 +232,7 @@ export default inject(
isPreview,
resetUrl,
setSelection,
+ setAlreadyFetchingRooms,
} = filesStore;
const {
visible,
@@ -286,6 +289,7 @@ export default inject(
setScrollToItem,
setCurrentId,
setBufferSelection,
+ setAlreadyFetchingRooms,
isFavoritesFolder,
onClickFavorite,
onClickDownloadAs,
diff --git a/packages/client/src/pages/Home/Section/Body/TilesView/FileTile.js b/packages/client/src/pages/Home/Section/Body/TilesView/FileTile.js
index 9421cb8154..cc66f0f7da 100644
--- a/packages/client/src/pages/Home/Section/Body/TilesView/FileTile.js
+++ b/packages/client/src/pages/Home/Section/Body/TilesView/FileTile.js
@@ -95,12 +95,14 @@ const FileTile = (props) => {
/>
);
+ const activeClass = checkedProps || isActive ? "tile-selected" : "";
+
return (
(props.isMedia ? "cover" : "none")};
+ object-fit: none;
object-position: top;
z-index: 0;
border-radius: 6px 6px 0 0;
diff --git a/packages/client/src/pages/Home/Section/Body/index.js b/packages/client/src/pages/Home/Section/Body/index.js
index e7537ea08c..315fcb702e 100644
--- a/packages/client/src/pages/Home/Section/Body/index.js
+++ b/packages/client/src/pages/Home/Section/Body/index.js
@@ -188,7 +188,6 @@ const SectionBodyContent = (props) => {
const splitValue = treeDataValue && treeDataValue.split(" ");
const isDragging = splitValue && splitValue.includes("dragging");
const treeValue = isDragging ? splitValue[0] : null;
- const treeProvider = splitValue && splitValue[splitValue.length - 1];
const elem = e.target.closest(".droppable");
const title = elem && elem.dataset.title;
@@ -201,21 +200,20 @@ const SectionBodyContent = (props) => {
}
const folderId = value ? value.split("_")[1] : treeValue;
- const providerKey = value ? value.split("_")[2]?.trim() : treeProvider;
setStartDrag(false);
setDragging(false);
- onMoveTo(folderId, title, providerKey);
+ onMoveTo(folderId, title);
isDragActive = false;
return;
};
- const onMoveTo = (destFolderId, title, providerKey) => {
+ const onMoveTo = (destFolderId, title) => {
const id = isNaN(+destFolderId) ? destFolderId : +destFolderId;
- moveDragItems(id, title, providerKey, {
+ moveDragItems(id, title, {
copy: t("Common:CopyOperation"),
move: t("Translations:MoveToOperation"),
- }); //TODO: then catch
+ });
};
const onDropEvent = () => {
diff --git a/packages/client/src/pages/PortalSettings/categories/data-management/backup/StyledBackup.js b/packages/client/src/pages/PortalSettings/categories/data-management/backup/StyledBackup.js
index abd4fcada6..0d51b9e3fe 100644
--- a/packages/client/src/pages/PortalSettings/categories/data-management/backup/StyledBackup.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-management/backup/StyledBackup.js
@@ -5,7 +5,7 @@ import {
} from "../../../utils/commonSettingsStyles";
import globalColors from "@docspace/components/utils/globalColors";
import { isMobileOnly } from "react-device-detect";
-import { mobile } from "@docspace/components/utils/device";
+import { hugeMobile, tablet, mobile } from "@docspace/components/utils/device";
const linkColor = globalColors.black;
@@ -72,14 +72,34 @@ const StyledManualBackup = styled.div`
.manual-backup_buttons {
margin-top: 16px;
margin-left: 24px;
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+
button:first-child {
- width: 50%;
- max-width: 164px;
+ max-width: 124px;
margin-right: 8px;
}
button:last-child {
- max-width: 164px;
- width: calc(50% - 8px);
+ max-width: 153px;
+ }
+
+ @media ${tablet} {
+ button:first-child {
+ max-width: 129px;
+ }
+ button:last-child {
+ max-width: 160px;
+ }
+ }
+
+ @media ${hugeMobile} {
+ button:first-child {
+ max-width: 155px;
+ }
+ button:last-child {
+ max-width: 155px;
+ }
}
}
.manual-backup_storages-module {
diff --git a/packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js b/packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
index ab450f5e4e..9329b5004e 100644
--- a/packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-management/backup/manual-backup/index.js
@@ -284,7 +284,7 @@ class ManualBackup extends React.Component {
{isCheckedTemporaryStorage && (