Merge branch 'hotfix/v2.6.1' into develop

# Conflicts:
#	packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js

.vscode/extensions.json

@@ -10,6 +10,7 @@
     "formulahendry.auto-complete-tag",
     "formulahendry.auto-rename-tag",
     "mrmlnc.vscode-duplicate",
-    "ms-python.python"
+    "ms-python.python",
+    "wix.vscode-import-cost"
   ]
 }

packages/client/src/Shell.jsx

@@ -88,6 +88,7 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
     version,
     pagesWithoutNavMenu,
     isFrame,
+    barTypeInFrame,
   } = rest;
 
   const theme = useTheme();
@@ -457,7 +458,7 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
       <DialogsWrapper t={t} />
 
       <Main isDesktop={isDesktop}>
-        {!isFrame && <MainBar />}
+        {barTypeInFrame !== "none" && <MainBar />}
         <div className="main-container">
           <Outlet />
         </div>
@@ -565,6 +566,7 @@ const ShellWrapper = inject(
       version,
       pagesWithoutNavMenu,
       isFrame,
+      barTypeInFrame: frameConfig?.showHeaderBanner,
     };
   },
 )(observer(Shell));

packages/client/src/components/MainBar/index.js

@@ -60,7 +60,7 @@ const MainBar = ({
   snackbarExist,
   setMaintenanceExist,
   isNotPaidPeriod,
-  isFrame,
+  barTypeInFrame,
 }) => {
   const { pathname } = useLocation();
 
@@ -69,7 +69,7 @@ const MainBar = ({
   }, []);
 
   const isVisibleBar =
-    !isFrame &&
+    barTypeInFrame !== "none" &&
     !isNotPaidPeriod &&
     !pathname.includes("error") &&
     !pathname.includes("confirm") &&
@@ -92,7 +92,7 @@ export default inject(
     filesStore,
     currentTariffStatusStore,
   }) => {
-    const { checkedMaintenance, setMaintenanceExist, snackbarExist, isFrame } =
+    const { checkedMaintenance, setMaintenanceExist, snackbarExist, frameConfig } =
       settingsStore;
     const { isNotPaidPeriod } = currentTariffStatusStore;
     const { firstLoad } = clientLoadingStore;
@@ -104,7 +104,7 @@ export default inject(
       snackbarExist,
       setMaintenanceExist,
       isNotPaidPeriod,
-      isFrame,
+      barTypeInFrame: frameConfig?.showHeaderBanner
     };
   },
 )(observer(MainBar));

packages/client/src/components/dialogs/DataReassignmentDialog/sub-components/Body/AccountInfo.js

@@ -31,7 +31,7 @@ import { Avatar } from "@docspace/shared/components/avatar";
 
 import CatalogSpamIcon from "PUBLIC_DIR/images/catalog.spam.react.svg";
 import { commonIconsStyles } from "@docspace/shared/utils";
-import { capitalize } from "lodash";
+import capitalize from "lodash/capitalize";
 
 const StyledCatalogSpamIcon = styled(CatalogSpamIcon)`
   ${commonIconsStyles}

packages/client/src/helpers/people-helpers.js

@@ -27,7 +27,8 @@
 import React from "react";
 import { Trans } from "react-i18next";
 import MailReactSvgUrl from "PUBLIC_DIR/images/mail.react.svg?url";
-import { find, cloneDeep } from "lodash";
+import cloneDeep from "lodash/cloneDeep";
+import find from "lodash/find";
 import {
   EmployeeActivationStatus,
   EmployeeStatus,

packages/client/src/store/PluginStore.ts

@@ -26,7 +26,7 @@
 
 /* eslint-disable no-console */
 import { makeAutoObservable, runInAction } from "mobx";
-import { cloneDeep } from "lodash";
+import cloneDeep from "lodash/cloneDeep";
 
 import api from "@docspace/shared/api";
 import { SettingsStore } from "@docspace/shared/store/SettingsStore";

packages/shared/components/cron/Cron.utils.ts

@@ -24,7 +24,7 @@
 // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 
-import { capitalize } from "lodash";
+import capitalize from "lodash/capitalize";
 import { DateTime, Info } from "luxon";
 
 import {

packages/shared/components/link-with-dropdown/LinkWithDropdown.styled.tsx

@@ -24,7 +24,6 @@
 // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 
-import React from "react";
 import styled, { css } from "styled-components";
 import ExpanderDownReactSvg from "PUBLIC_DIR/images/expander-down.react.svg";
 
@@ -32,7 +31,6 @@ import { Base } from "../../themes";
 import { Text } from "../text";
 import { TextProps } from "../text/Text.types";
 
-// import { transform } from "lodash";
 import {
   SimpleLinkWithDropdownProps,
   TDropdownType,

packages/shared/components/media-viewer/sub-components/ImageViewer/index.tsx

@@ -988,7 +988,7 @@ export const ImageViewer = ({
               window.ClientConfig?.imageThumbnails &&
               thumbnailSrc &&
               !showOriginSrc
-                ? `${thumbnailSrc}&size=3840x2160`
+                ? `${thumbnailSrc}&size=3840x2160&view=true`
                 : src
             }
             ref={imgRef}

packages/shared/components/media-viewer/sub-components/ViewerPlayer/index.tsx

@@ -24,7 +24,7 @@
 // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 
-import lodash from "lodash";
+import omit from "lodash/omit";
 import { useGesture } from "@use-gesture/react";
 import { useSpring, animated } from "@react-spring/web";
 import {
@@ -640,7 +640,7 @@ export const ViewerPlayer = ({
             ref={videoRef}
             hidden={isAudio}
             preload="metadata"
-            style={lodash.omit(style, ["x", "y"])}
+            style={omit(style, ["x", "y"])}
             src={thumbnailSrc ? src : `${src}#t=0.001`}
             poster={posterUrl}
             onError={hadleError}

packages/shared/constants/index.ts

@@ -172,7 +172,8 @@ export const HTML_EXST = [".htm", ".mht", ".html"];
 
 export const SYSTEM_THEME_KEY = "system_theme";
 
-const SDK_VERSION = "1.0.0";
+const SDK_VERSION = "1.0.1";
+
 export const SDK_SCRIPT_URL =
   typeof window !== "undefined"
     ? `${window.location.origin}/static/scripts/sdk/${SDK_VERSION}/api.js`