From faac37843b4342db51f25238ddcfcafa303b9b20 Mon Sep 17 00:00:00 2001
From: Akmal Isomadinov <isomadinovakmal1997@gmail.com>
Date: Tue, 23 Jul 2024 16:21:09 +0500
Subject: [PATCH 1/4] Doceditor:Components:CompletedForm Fixed translation

---
 packages/doceditor/public/locales/en/CompletedForm.json         | 2 +-
 .../doceditor/src/components/completed-form/CompletedForm.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/doceditor/public/locales/en/CompletedForm.json b/packages/doceditor/public/locales/en/CompletedForm.json
index 80cdfb6a3e..e33c11f6cc 100644
--- a/packages/doceditor/public/locales/en/CompletedForm.json
+++ b/packages/doceditor/public/locales/en/CompletedForm.json
@@ -7,6 +7,6 @@
   "FillItOutAgain": "Fill it out again",
   "FormCompletedSuccessfully": "Form completed successfully",
   "FormNumber": "Form number:",
-  "Manager": "Manager:",
+  "FormOwner": "Form owner",
   "Title": "The form is completed"
 }
diff --git a/packages/doceditor/src/components/completed-form/CompletedForm.tsx b/packages/doceditor/src/components/completed-form/CompletedForm.tsx
index 79d1618c01..679c9dea47 100644
--- a/packages/doceditor/src/components/completed-form/CompletedForm.tsx
+++ b/packages/doceditor/src/components/completed-form/CompletedForm.tsx
@@ -207,7 +207,7 @@ export const CompletedForm = ({
           </Box>
         </FormNumberWrapper>
         <ManagerWrapper>
-          <span className="label">{t("CompletedForm:Manager")}</span>
+          <span className="label">{t("CompletedForm:FormOwner")}</span>
           <Box>
             <Avatar
               className="manager__avatar"

From c89bd662056e93848c90f4bc8ecec699c5c97a6b Mon Sep 17 00:00:00 2001
From: Viktor Fomin <viktor.fomin@onlyoffice.com>
Date: Tue, 23 Jul 2024 16:01:12 +0300
Subject: [PATCH 2/4] Client: PortalSettings: fix header

---
 .../Layout/Section/Header/index.js            | 34 ++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js b/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
index ae879f3771..46f0c4bd0c 100644
--- a/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
+++ b/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
@@ -74,8 +74,6 @@ const HeaderContainer = styled.div`
       white-space: nowrap;
       overflow: hidden;
       color: ${(props) => props.theme.client.settings.headerTitleColor};
-      display: flex;
-      align-items: center;
     }
   }
   .action-wrapper {
@@ -368,20 +366,24 @@ const SectionHeaderContent = (props) => {
             />
           )}
           <Headline type="content" truncate={true}>
-            {t(header, {
-              organizationName: t("Common:OrganizationName"),
-            })}
-            {isNeedPaidIcon ? (
-              <Badge
-                backgroundColor={theme.isBase ? "#EDC409" : "#A38A1A"}
-                label={t("Common:Paid")}
-                fontWeight="700"
-                className="settings-section_badge"
-                isPaidBadge={true}
-              />
-            ) : (
-              ""
-            )}
+            <div className="settings-section_header">
+              <div className="header">
+                {t(header, {
+                  organizationName: t("Common:OrganizationName"),
+                })}
+              </div>
+              {isNeedPaidIcon ? (
+                <Badge
+                  backgroundColor={theme.isBase ? "#EDC409" : "#A38A1A"}
+                  label={t("Common:Paid")}
+                  fontWeight="700"
+                  className="settings-section_badge"
+                  isPaidBadge={true}
+                />
+              ) : (
+                ""
+              )}
+            </div>
           </Headline>
           <div className="tariff-bar">
             <TariffBar />

From dbed7aa23c497c6352c4c3717caaf0e085e81238 Mon Sep 17 00:00:00 2001
From: Akmal Isomadinov <isomadinovakmal1997@gmail.com>
Date: Tue, 23 Jul 2024 18:14:15 +0500
Subject: [PATCH 3/4] Client: Removed legacy code change file status (issue:
 open simple PDF)

---
 packages/client/src/store/FilesStore.js | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/packages/client/src/store/FilesStore.js b/packages/client/src/store/FilesStore.js
index b99c584f78..e186d1bd5c 100644
--- a/packages/client/src/store/FilesStore.js
+++ b/packages/client/src/store/FilesStore.js
@@ -3961,19 +3961,6 @@ class FilesStore {
 
   openDocEditor = (id, preview = false, shareKey = null, editForm = false) => {
     const { openOnNewPage } = this.filesSettingsStore;
-    const foundIndex = this.files.findIndex((x) => x.id === id);
-    const file = foundIndex !== -1 ? this.files[foundIndex] : undefined;
-    if (
-      file &&
-      !preview &&
-      file.rootFolderType !== FolderType.Archive &&
-      file.fileExst !== ".oform"
-    ) {
-      const newStatus = file.fileStatus | FileStatus.IsEditing;
-
-      this.updateSelectionStatus(id, newStatus, true);
-      this.updateFileStatus(foundIndex, newStatus);
-    }
 
     const share = shareKey ? shareKey : this.publicRoomStore.publicRoomKey;
 

From f3a97669942bc68a5a097c8cce26d56728f95cb3 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Tue, 23 Jul 2024 17:29:48 +0300
Subject: [PATCH 4/4] Web: Components: TableHeader: restored check

---
 packages/shared/components/table/TableHeader.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/shared/components/table/TableHeader.tsx b/packages/shared/components/table/TableHeader.tsx
index 799de41dfc..c62d08ad9e 100644
--- a/packages/shared/components/table/TableHeader.tsx
+++ b/packages/shared/components/table/TableHeader.tsx
@@ -368,7 +368,11 @@ class TableHeader extends React.Component<
     if (storageSize) {
       const splitStorage = storageSize.split(" ");
 
-      if (getSubstring(splitStorage[0]) <= defaultMinColumnSize) {
+      if (
+        (defaultSize &&
+          splitStorage[splitStorage.length - 2] !== `${defaultSize}px`) ||
+        getSubstring(splitStorage[0]) <= defaultMinColumnSize
+      ) {
         localStorage.removeItem(columnStorageName);
         this.onResize();
         return;