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

packages/client/src/components/panels/AddUsersPanel/index.tsx

@@ -523,6 +523,7 @@ const AddUsersPanel = ({
             // Todo: Update groups empty screen texts when they are ready
             headerLabel: t("Common:ListAccounts"),
             withoutBackButton: false,
+            withoutBorder: true,
             onBackClick,
           }}
           onSelect={onSelect}

packages/client/src/components/panels/InvitePanel/StyledInvitePanel.js

@@ -325,6 +325,28 @@ const StyledInviteInputContainer = styled.div`
 
   .header_aside-panel {
     max-width: 100% !important;
+
+    .selector_body_tabs {
+      display: flex;
+      justify-content: left;
+      margin-bottom: 16px;
+      padding: 0;
+      width: -webkit-fill-available;
+
+      .sticky-indent {
+        height: 0;
+      }
+
+      .sticky {
+        .scroll-body {
+          overflow-x: hidden;
+        }
+        .scroll-body > div {
+          justify-content: left;
+          padding-left: 16px;
+        }
+      }
+    }
   }
 `;
 

packages/client/src/routes/confirm.js

@@ -193,7 +193,7 @@ const confirmRoutes = [
   {
     path: "PortalSuspend",
     element: (
-      <ConfirmRoute>
+      <ConfirmRoute doAuthenticated={AuthenticatedAction.Logout}>
         <DeactivatePortal />
       </ConfirmRoute>
     ),
@@ -201,7 +201,7 @@ const confirmRoutes = [
   {
     path: "PortalContinue",
     element: (
-      <ConfirmRoute>
+      <ConfirmRoute doAuthenticated={AuthenticatedAction.Logout}>
         <ContinuePortal />
       </ConfirmRoute>
     ),

packages/client/src/store/CreateEditRoomStore.js

@@ -165,6 +165,8 @@ class CreateEditRoomStore {
         actions.push(createTag(createTagsData[i]));
       }
 
+      if (!!actions.length) await Promise.all(actions);
+
       // add new tags to room
       if (!!addTagsData.length)
         room = await addTagsToRoom(room.id, addTagsData);

packages/shared/components/selector/Selector.styled.ts

@@ -71,7 +71,10 @@ const StyledHeader = styled.div`
 
   padding: 0 16px;
 
-  border-bottom: ${(props) => props.theme.selector.border};
+  ${(props) =>
+    props.withoutBorder
+      ? "border-bottom: none;"
+      : `border-bottom: ${props.theme.selector.border};`}
 
   display: flex;
   align-items: center;
@@ -115,7 +118,7 @@ const StyledBody = styled.div<{
         ? `calc(100% - 16px - ${props.headerHeight}px)`
         : `calc(100% - 16px)`};
 
-  padding: ${({ withTabs }) => (withTabs ? "8px 0 0 0" : "16px 0 0 0")};
+  padding: ${({ withTabs }) => (withTabs ? "0" : "16px 0 0 0")};
 
   .search-input,
   .search-loader {

packages/shared/components/selector/Selector.types.ts

@@ -42,10 +42,12 @@ type THeaderBackButton =
   | {
       onBackClick: () => void;
       withoutBackButton: false;
+      withoutBorder: false;
     }
   | {
       onBackClick?: undefined;
       withoutBackButton?: undefined;
+      withoutBorder: undefined;
     };
 
 export type HeaderProps = {

packages/shared/components/selector/sub-components/Body.tsx

@@ -203,7 +203,11 @@ const Body = ({
       <BreadCrumbs />
 
       {withTabs && tabsData && (
-        <StyledTabs items={tabsData} selectedItemId={activeTabId} />
+        <StyledTabs
+          items={tabsData}
+          selectedItemId={activeTabId}
+          className="selector_body_tabs"
+        />
       )}
 
       <Search isSearch={itemsCount > 0 || isSearch} />

packages/shared/components/selector/sub-components/Header.tsx

@@ -35,9 +35,14 @@ import { StyledHeader } from "../Selector.styled";
 import { HeaderProps } from "../Selector.types";
 
 const Header = React.memo(
-  ({ onBackClick, withoutBackButton, headerLabel }: HeaderProps) => {
+  ({
+    onBackClick,
+    withoutBackButton,
+    headerLabel,
+    withoutBorder,
+  }: HeaderProps) => {
     return (
-      <StyledHeader>
+      <StyledHeader withoutBorder={withoutBorder}>
         {!withoutBackButton && typeof withoutBackButton === "boolean" && (
           <IconButton
             className="arrow-button"