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

packages/client/src/pages/Home/Hooks/useFiles.js

@@ -314,6 +314,7 @@ const useFiles = ({
             fromTemplate: true,
             title: gallerySelected.attributes.name_form,
             openEditor: !isFormRoom,
+            edit: true,
           };
 
           event.payload = payload;

packages/client/src/pages/Home/InfoPanel/Body/helpers/DetailsHelper.js

@@ -70,7 +70,7 @@ const tagList = (tags, selectTag) => (
         key={i}
         className="property-tag"
         label={tag}
-        onClick={() => selectTag(tag)}
+        onClick={() => selectTag({ label: tag })}
       />
     ))}
   </div>

packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/index.js

@@ -67,7 +67,7 @@ const AccountsTable = (props) => {
     },
     {
       key: UserTypes.RoomAdmin,
-      label: t(`Common:${UserTypes.RoomAdmin}`),
+      label: t("Common:RoomAdmin"),
       onClick: setTypeRoomAdmin,
     },
     {

packages/client/src/pages/PortalSettings/categories/security/access-portal/bruteForceProtection.js

@@ -265,6 +265,7 @@ const BruteForceProtection = (props) => {
 
       <FieldContainer
         className="input-container"
+        labelVisible={true}
         labelText={t("NumberOfAttempts")}
         isVertical={true}
         place="top"
@@ -284,6 +285,7 @@ const BruteForceProtection = (props) => {
 
       <FieldContainer
         className="input-container"
+        labelVisible={true}
         labelText={t("BlockingTime")}
         isVertical={true}
         place="top"
@@ -303,6 +305,7 @@ const BruteForceProtection = (props) => {
 
       <FieldContainer
         className="input-container"
+        labelVisible={true}
         labelText={t("CheckPeriod")}
         isVertical={true}
         place="top"

packages/client/src/store/DialogsStore.js

@@ -402,6 +402,7 @@ class DialogsStore {
       templateId: fileInfo.id,
       withoutDialog,
       preview,
+      edit: true,
     };
 
     event.payload = payload;

packages/doceditor/src/components/Editor.tsx

@@ -189,21 +189,29 @@ const Editor = ({
   }
 
   const customization = new URLSearchParams(search).get("customization");
+
   const sdkCustomization: NonNullable<
     IConfig["editorConfig"]
   >["customization"] = JSON.parse(customization || "{}");
 
   const theme = sdkCustomization?.uiTheme || user?.theme;
 
-  if (newConfig.editorConfig)
+  if (newConfig.editorConfig) {
     newConfig.editorConfig.customization = {
       ...newConfig.editorConfig.customization,
       ...sdkCustomization,
       goback: { ...goBack },
-      close: { visible: SHOW_CLOSE, text: t("Common:CloseButton") },
       uiTheme: getEditorTheme(theme as ThemeKeys),
     };
 
+    if (SHOW_CLOSE) {
+      newConfig.editorConfig.customization.close = {
+        visible: SHOW_CLOSE,
+        text: t("Common:CloseButton"),
+      };
+    }
+  }
+
   //if (newConfig.document && newConfig.document.info)
   //  newConfig.document.info.favorite = false;
 

packages/shared/components/share/sub-components/LinkRow.tsx

@@ -153,6 +153,7 @@ const LinkRow = ({
               modernView
               type="onlyIcon"
               isDisabled={isExpiredLink || isLoaded}
+              manualWidth="fit-content"
             />
           </div>
         </StyledLinkRow>