Merge branch 'hotfix/v2.6.1' into bugfix/Bug69601

2024-08-13 14:49:13 +03:00 · 2024-08-13 14:49:13 +03:00 · 475483a699
commit 475483a699
parent a99d62d828 9ff85666fa
34 changed files with 1396 additions and 39 deletions
--- a/.vscode/extensions.json
+++ b/.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"
  ]
 }
--- a/packages/client/src/Shell.jsx
+++ b/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));
--- a/packages/client/src/components/AccessSelector/index.tsx
+++ b/packages/client/src/components/AccessSelector/index.tsx
@ -146,7 +146,7 @@ const AccessSelector: React.FC<AccessSelectorProps> = ({
          directionX="right"
          directionY="top"
          fixedDirection
-          manualWidth="fit-content"
+          manualWidth="auto"
          isDefaultMode
          isAside={isMobileView}
          setIsOpenItemAccess={setIsOpenItemAccess}
--- a/packages/client/src/components/MainBar/index.js
+++ b/packages/client/src/components/MainBar/index.js
@ -63,7 +63,7 @@ const MainBar = ({
  snackbarExist,
  setMaintenanceExist,
  isNotPaidPeriod,
-  isFrame,
+  barTypeInFrame,
 }) => {
  const { pathname } = useLocation();

@ -72,7 +72,7 @@ const MainBar = ({
  }, []);

  const isVisibleBar =
-    !isFrame &&
+    barTypeInFrame !== "none" &&
    !isNotPaidPeriod &&
    !pathname.includes("error") &&
    !pathname.includes("confirm") &&
@ -95,7 +95,7 @@ export default inject(
    filesStore,
    currentTariffStatusStore,
  }) => {
-    const { checkedMaintenance, setMaintenanceExist, snackbarExist, isFrame } =
+    const { checkedMaintenance, setMaintenanceExist, snackbarExist, frameConfig } =
      settingsStore;
    const { isNotPaidPeriod } = currentTariffStatusStore;
    const { firstLoad } = clientLoadingStore;
@ -107,7 +107,7 @@ export default inject(
      snackbarExist,
      setMaintenanceExist,
      isNotPaidPeriod,
-      isFrame,
+      barTypeInFrame: frameConfig?.showHeaderBanner
    };
  },
 )(observer(MainBar));
--- a/packages/client/src/components/QuotaForm/index.js
+++ b/packages/client/src/components/QuotaForm/index.js
@ -218,7 +218,7 @@ const QuotaForm = ({
          size="content"
          onSelect={onSelectComboBox}
          showDisabledItems
-          manualWidth={"fit-content"}
+          manualWidth="auto"
          directionY="both"
        />
      </div>
--- a/packages/client/src/components/SpaceQuota/index.js
+++ b/packages/client/src/components/SpaceQuota/index.js
@ -196,7 +196,7 @@ const SpaceQuota = (props) => {
        size="content"
        modernView
        isLoading={isLoading}
-        manualWidth="fit-content"
+        manualWidth="auto"
        directionY="both"
      />
    </StyledBody>
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ThirdPartyStorage/ThirdPartyComboBox.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ThirdPartyStorage/ThirdPartyComboBox.js
@ -239,7 +239,7 @@ const ThirdPartyComboBox = ({
          scaled
          withBackdrop={isMobile}
          size="content"
-          manualWidth={"fit-content"}
+          manualWidth={"auto"}
          isMobileView={isMobileOnly}
          directionY="both"
          displaySelectedOption
--- a/packages/client/src/components/dialogs/DataReassignmentDialog/sub-components/Body/AccountInfo.js
+++ b/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}
--- a/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx
+++ b/packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx
@ -174,7 +174,7 @@ const GroupMember = ({ member, infoPanelSelection }: GroupMemberProps) => {
              size="content"
              modernView
              title={t("Common:Role")}
-              manualWidth={"fit-content"}
+              manualWidth="auto"
              isMobileView={isMobileOnly}
              directionY="both"
              displaySelectedOption
--- a/packages/client/src/helpers/people-helpers.js
+++ b/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,
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Accounts/index.js
@ -176,7 +176,7 @@ const Accounts = (props) => {
        size="content"
        displaySelectedOption
        modernView
-        manualWidth={"fit-content"}
+        manualWidth="auto"
        isLoading={isLoading}
      />
    );
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
@ -378,7 +378,7 @@ const User = ({
              size="content"
              modernView
              title={t("Common:Role")}
-              manualWidth={"fit-content"}
+              manualWidth="auto"
              isLoading={isLoading}
              isMobileView={isMobileOnly}
              directionY="both"
--- a/packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
+++ b/packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
@ -399,7 +399,7 @@ const InsideGroupTableRow = (props) => {
          directionY="both"
          size="content"
          modernView
-          manualWidth={"fit-content"}
+          manualWidth="auto"
          isLoading={isLoading}
          optionStyle={{ maxWidth: "400px" }}
          textOverflow
@ -442,7 +442,7 @@ const InsideGroupTableRow = (props) => {
        size="content"
        displaySelectedOption
        modernView
-        manualWidth={"fit-content"}
+        manualWidth="auto"
        isLoading={isLoading}
      />
    );
--- a/packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
+++ b/packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
@ -438,7 +438,7 @@ const PeopleTableRow = (props) => {
        size="content"
        displaySelectedOption
        modernView
-        manualWidth={"fit-content"}
+        manualWidth={"auto"}
        isLoading={isLoading}
      />
    );
--- a/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
@ -131,7 +131,7 @@ const UsersRowContent = ({
          size="content"
          displaySelectedOption
          modernView
-          manualWidth="fit-content"
+          manualWidth="auto"
        />
      </div>
    </Box>,
--- a/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js
@ -126,7 +126,7 @@ const UsersTypeTableRow = ({
            size="content"
            displaySelectedOption
            modernView
-            manualWidth="fit-content"
+            manualWidth="auto"
          />
        </div>
      </TableCell>
--- a/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js
@ -219,7 +219,7 @@ const GoogleWorkspace = ({
    return clearCheckedAccounts;
  }, []);

-  if (isMobile || isMobileBreakpoint())
+  if (isMobileBreakpoint())
    return (
      <BreakpointWarning
        isMobileUnavailableOnly
--- a/packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersRowContent.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersRowContent.js
@ -132,7 +132,7 @@ const UsersRowContent = ({
          size="content"
          displaySelectedOption
          modernView
-          manualWidth="fit-content"
+          manualWidth="auto"
        />
      </div>
    </Box>,
--- a/packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTableRow.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTableRow.js
@ -126,7 +126,7 @@ const UsersTypeTableRow = ({
            size="content"
            displaySelectedOption
            modernView
-            manualWidth="fit-content"
+            manualWidth="auto"
          />
        </div>
      </TableCell>
--- a/packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/index.js
@ -133,7 +133,7 @@ const NextcloudWorkspace = (props) => {
    return clearCheckedAccounts;
  }, []);

-  if (isMobile || isMobileBreakpoint())
+  if (isMobileBreakpoint())
    return (
      <BreakpointWarning
        isMobileUnavailableOnly
--- a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectFileStep/index.js
@ -208,6 +208,7 @@ const SelectFileStep = ({
            setIsFileError(true);
            setIsFileLoading(false);
            clearInterval(uploadInterval.current);
+            setShowErrorText(true);
            return;
          }

--- a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
@ -132,7 +132,7 @@ const UsersRowContent = ({
          size="content"
          displaySelectedOption
          modernView
-          manualWidth="fit-content"
+          manualWidth="auto"
        />
      </div>
    </Box>,
--- a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js
@ -126,7 +126,7 @@ const UsersTypeTableRow = ({
            size="content"
            displaySelectedOption
            modernView
-            manualWidth="fit-content"
+            manualWidth="auto"
          />
        </div>
      </TableCell>
--- a/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js
@ -216,7 +216,7 @@ const OnlyofficeWorkspace = ({
    return clearCheckedAccounts;
  }, []);

-  if (isMobile || isMobileBreakpoint()) {
+  if (isMobileBreakpoint()) {
    return (
      <BreakpointWarning
        isMobileUnavailableOnly
--- a/packages/client/src/store/PluginStore.ts
+++ b/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";
--- a/packages/shared/components/cron/Cron.utils.ts
+++ b/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 {
--- a/packages/shared/components/drop-down/DropDown.styled.ts
+++ b/packages/shared/components/drop-down/DropDown.styled.ts
@ -106,7 +106,7 @@ const StyledDropdown = styled.div<{
  border: ${(props) => props.theme.dropDown.border};
  border-radius: ${(props) => props.theme.dropDown.borderRadius};
  -moz-border-radius: ${(props) => props.theme.dropDown.borderRadius};
-  -webkit-border-radius: ${(props) => props.theme.dropDown.borderRadius};dropDownMaxHeight
+  -webkit-border-radius: ${(props) => props.theme.dropDown.borderRadius};
  box-shadow: ${(props) => props.theme.dropDown.boxShadow};
  -moz-box-shadow: ${(props) => props.theme.dropDown.boxShadow};
  -webkit-box-shadow: ${(props) => props.theme.dropDown.boxShadow};
--- a/packages/shared/components/link-with-dropdown/LinkWithDropdown.styled.tsx
+++ b/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,
--- a/packages/shared/components/media-viewer/sub-components/ImageViewer/index.tsx
+++ b/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}
--- a/packages/shared/components/media-viewer/sub-components/ViewerPlayer/index.tsx
+++ b/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}
--- a/packages/shared/components/selector/sub-components/AccessSelector.tsx
+++ b/packages/shared/components/selector/sub-components/AccessSelector.tsx
@ -63,7 +63,7 @@ const AccessSelector = (props: AccessSelectorProps) => {
      options={accessRights as TOption[]}
      size={ComboBoxSize.content}
      scaled={false}
-      manualWidth="fit-content"
+      manualWidth="auto"
      selectedOption={selectedAccessRight as TOption}
      showDisabledItems
      directionX="right"
@ -81,7 +81,7 @@ const AccessSelector = (props: AccessSelectorProps) => {
      directionX="right"
      directionY="top"
      fixedDirection={isMobileView}
-      manualWidth={isMobileView ? "fit-content" : `${width}px`}
+      manualWidth={isMobileView ? "auto" : `${width}px`}
      isAside={isMobileView}
      manualY={isMobileView ? "0px" : undefined}
      withoutBackground={isMobileView}
--- a/packages/shared/components/share/sub-components/LinkRow.tsx
+++ b/packages/shared/components/share/sub-components/LinkRow.tsx
@ -153,7 +153,7 @@ const LinkRow = ({
              modernView
              type="onlyIcon"
              isDisabled={isExpiredLink || isLoaded}
-              manualWidth="fit-content"
+              manualWidth="auto"
              withBackdrop={false}
            />
          </div>
--- a/packages/shared/constants/index.ts
+++ b/packages/shared/constants/index.ts
@ -171,7 +171,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`
--- a/public/scripts/sdk/1.0.1/api.js
+++ b/public/scripts/sdk/1.0.1/api.js