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

packages/client/src/components/GlobalEvents/EditRoomEvent.js

@@ -162,7 +162,9 @@ const EditRoomEvent = ({
       for (let i = 0; i < newTags.length; i++) {
         createTagActions.push(createTag(newTags[i]));
       }
-      await Promise.all(createTagActions);
+      if (!!createTagActions.length) {
+        await Promise.all(createTagActions);
+      }
 
       const actions = [];
       if (isOwnerChanged) {
@@ -176,7 +178,8 @@ const EditRoomEvent = ({
         };
       }
       if (tags.length) {
-        actions.push(addTagsToRoom(room.id, newTags));
+        const tagsToAddList = tags.filter((t) => !startTags.includes(t));
+        actions.push(addTagsToRoom(room.id, tagsToAddList));
         room.tags = tags;
       }
 
@@ -185,7 +188,9 @@ const EditRoomEvent = ({
         room.tags = tags;
       }
 
-      await Promise.all(actions);
+      if (!!actions.length) {
+        await Promise.all(actions);
+      }
 
       if (!!item.logo.original && !roomParams.icon.uploadedFile) {
         room = await removeLogoFromRoom(room.id);

packages/client/src/store/FilesStore.js

@@ -1476,10 +1476,10 @@ class FilesStore {
 
     const { filterType, searchInContent } = filterData;
 
-    if (typeof filterData.withSubfolders !== "boolean")
+    if (!Boolean(filterData.withSubfolders))
       filterData.withSubfolders = defaultFilter.withSubfolders;
 
-    if (typeof searchInContent !== "boolean")
+    if (!Boolean(searchInContent))
       filterData.searchInContent = defaultFilter.searchInContent;
 
     if (!Object.keys(FilterType).find((key) => FilterType[key] === filterType))

packages/shared/components/modal-dialog/ModalDialog.styled.ts

@@ -155,12 +155,14 @@ const Content = styled.div.attrs((props: { modalSwipeOffset?: number }) => ({
         `}
 `;
 
-const StyledHeader = styled.div`
+const StyledHeader = styled.div<{ currentDisplayType?: ModalDialogType }>`
   display: flex;
   align-items: center;
   border-bottom: ${(props) =>
     `1px solid ${props.theme.modalDialog.headerBorderColor}`};
   height: 52px;
+  margin-bottom: ${(props) =>
+    props.currentDisplayType === "aside" ? "0px" : "16px"};
   padding: 0 16px 0;
 
   .heading {

packages/shared/components/modal-dialog/sub-components/Modal.tsx

@@ -191,6 +191,7 @@ const Modal = ({
                       "modal-header"
                     }
                     {...headerProps}
+                    currentDisplayType={currentDisplayType}
                   >
                     <Heading
                       level={1}