Merge branch 'release/v2.6.0' into bugfix/group-dialog-issues

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, {
+            <div className="settings-section_header">
-              organizationName: t("Common:OrganizationName"),
+              <div className="header">
-            })}
+                {t(header, {
-            {isNeedPaidIcon ? (
+                  organizationName: t("Common:OrganizationName"),
-              <Badge
+                })}
-                backgroundColor={theme.isBase ? "#EDC409" : "#A38A1A"}
+              </div>
-                label={t("Common:Paid")}
+              {isNeedPaidIcon ? (
-                fontWeight="700"
+                <Badge
-                className="settings-section_badge"
+                  backgroundColor={theme.isBase ? "#EDC409" : "#A38A1A"}
-                isPaidBadge={true}
+                  label={t("Common:Paid")}
-              />
+                  fontWeight="700"
-            ) : (
+                  className="settings-section_badge"
-              ""
+                  isPaidBadge={true}
-            )}
+                />
+              ) : (
+                ""
+              )}
+            </div>
           </Headline>
           <div className="tariff-bar">
             <TariffBar />

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;
 

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"
 }

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"

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;