Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1

packages/client/public/locales/en/InfoPanel.json

@@ -12,6 +12,7 @@
   "FeedLocationLabel": "Folder «{{folderTitle}}»",
   "FeedLocationLabelFrom": "from «{{folderTitle}}»",
   "FeedLocationRoomLabel": "Room «{{folderTitle}}»",
+  "FeedLocationSectionLabel": "Section «{{folderTitle}}»",
   "FileConverted": "File converted.",
   "FileCopied": "Files copied.",
   "FileCopiedTo": "Files copied to «{{folderTitle}}»",

packages/client/src/components/Badges.js

@@ -254,7 +254,7 @@ const Badges = ({
         </BadgeWrapper>
       )}
 
-      {isEditing && !isVisitor && !(isRecentTab && !canEditing) && (
+      {isEditing && !(isRecentTab && !canEditing) && (
         <ColorTheme
           themeId={ThemeId.IconButton}
           isEditing={isEditing}

packages/client/src/components/dialogs/LogoutAllSessionDialog/index.js

@@ -56,10 +56,9 @@ const LogoutAllSessionDialog = ({
       visible={visible}
       onClose={onClose}
       displayType="modal"
+      autoMaxHeight
     >
-      <ModalDialog.Header>
-        {t("Profile:LogoutAllActiveConnections")}
-      </ModalDialog.Header>
+      <ModalDialog.Header>{t("Common:LogoutButton")}</ModalDialog.Header>
       <ModalDialog.Body>
         <Text>{t("Profile:LogoutDescription")}</Text>
         <Text style={{ margin: "15px 0" }}>
@@ -70,8 +69,8 @@ const LogoutAllSessionDialog = ({
             className="change-password"
             isChecked={isChecked}
             onChange={onChangeCheckbox}
+            label={t("Profile:ChangePasswordAfterLoggingOut")}
           />
-          {t("Profile:ChangePasswordAfterLoggingOut")}
         </Box>
       </ModalDialog.Body>
       <ModalDialog.Footer>

packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlockContent/MainTextFolderInfo.tsx

@@ -27,6 +27,7 @@
 import { withTranslation } from "react-i18next";
 import { inject, observer } from "mobx-react";
 import { TTranslation } from "@docspace/shared/types";
+import { FolderType } from "@docspace/shared/enums";
 import { StyledHistoryBlockMessage } from "../../../styles/history";
 
 type HistoryMainTextFolderInfoProps = {
@@ -54,12 +55,15 @@ const HistoryMainTextFolderInfo = ({
 
   if (!parentTitle) return null;
 
-  const isFolder = parentType === 0;
-  const isFromFolder = fromParentType === 0;
+  const isSection = parentType === FolderType.USER;
+  const isFolder = parentType === FolderType.DEFAULT;
+  const isFromFolder = fromParentType === FolderType.DEFAULT;
 
   const destination = isFolder
     ? t("FeedLocationLabel", { folderTitle: parentTitle })
-    : t("FeedLocationRoomLabel", { folderTitle: parentTitle });
+    : isSection
+      ? t("FeedLocationSectionLabel", { folderTitle: parentTitle })
+      : t("FeedLocationRoomLabel", { folderTitle: parentTitle });
 
   const sourceDestination = isFromFolder
     ? t("FeedLocationLabelFrom", { folderTitle: fromParentTitle })

packages/client/src/store/FilesStore.js

@@ -2176,7 +2176,7 @@ class FilesStore {
         fileOptions = this.removeOptions(fileOptions, ["download"]);
       }
 
-      if (!isPdf || item.startFilling || item.isForm) {
+      if (!isPdf || (shouldFillForm && canFillForm)) {
         fileOptions = this.removeOptions(fileOptions, ["open-pdf"]);
       }
 

packages/client/src/store/SettingsSetupStore.js

@@ -586,7 +586,6 @@ class SettingsSetupStore {
   };
 
   getSessions = () => {
-    if (this.sessionsIsInit) return;
     this.getAllSessions().then((res) => {
       this.setSessions(res.items);
       this.currentSession = res.loginEvent;

packages/doceditor/src/components/file-password/index.tsx

@@ -26,7 +26,7 @@
 
 "use client";
 
-import React, { useState } from "react";
+import React, { useState, useEffect } from "react";
 import { Trans, useTranslation } from "react-i18next";
 
 import { Text } from "@docspace/shared/components/text";
@@ -49,12 +49,13 @@ import { toastr } from "@docspace/shared/components/toast";
 import { TData } from "@docspace/shared/components/toast/Toast.type";
 
 import { getLogoUrl } from "@docspace/shared/utils";
+import { frameCallCommand } from "@docspace/shared/utils/common";
 import { useTheme } from "styled-components";
 import { ValidationStatus, WhiteLabelLogoType } from "@docspace/shared/enums";
 import { validatePublicRoomPassword } from "@docspace/shared/api/rooms";
 import Image from "next/image";
 
-const FilesPassword = ({ shareKey, title, entryTitle }: FilePasswordProps) => {
+const FilePassword = ({ shareKey, title, entryTitle }: FilePasswordProps) => {
   const { t } = useTranslation(["Common"]);
 
   const theme = useTheme();
@@ -64,6 +65,8 @@ const FilesPassword = ({ shareKey, title, entryTitle }: FilePasswordProps) => {
   const [isLoading, setIsLoading] = useState(false);
   const [errorMessage, setErrorMessage] = useState("");
 
+  useEffect(() => frameCallCommand("setIsLoaded"), []);
+
   const onChangePassword = (e: React.ChangeEvent<HTMLInputElement>) => {
     setPassword(e.target.value);
     !passwordValid && setPasswordValid(true);
@@ -210,4 +213,4 @@ const FilesPassword = ({ shareKey, title, entryTitle }: FilePasswordProps) => {
   );
 };
 
-export default FilesPassword;
+export default FilePassword;