Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0

2022-12-07 16:13:47 +05:00 · 2022-12-07 16:13:47 +05:00 · af37879c18
commit af37879c18
parent d8fc76e789 79d710bb88
21 changed files with 79 additions and 41 deletions
--- a/packages/client/public/locales/en/Files.json
+++ b/packages/client/public/locales/en/Files.json
@ -72,7 +72,8 @@
  "Open": "Open",
  "OpenLocation": "Open location",
  "PersonalEmptyContainerDescription": "Drop files here or create new ones.",
-  "Pin": "Pin to top",
+  "PinToTop": "Pin to top",
+  "Pin": "Pin",
  "Presentation": "Presentation",
  "PrivateRoomDescriptionEncrypted": "Encrypted editing and real-time collaboration.",
  "PrivateRoomDescriptionSafest": "The safest storage for docx, xlsx and pptx.",
--- a/packages/client/src/components/GlobalEvents/CreateEvent.js
+++ b/packages/client/src/components/GlobalEvents/CreateEvent.js
@ -93,13 +93,13 @@ const CreateEvent = ({
      setStartValue(newValue);
    }

-    let tab =
-      !isDesktop && extension && open
-        ? window.open(
-            combineUrl(AppServerConfig.proxyURL, config.homepage, "/doceditor"),
-            "_blank"
-          )
-        : null;
+    // let tab =
+    //   !isDesktop && extension && open
+    //     ? window.open(
+    //         combineUrl(AppServerConfig.proxyURL, config.homepage, `/doceditor`),
+    //         "_blank"
+    //       )
+    //     : null;

    if (!extension) {
      createFolder(parentId, newValue)
@ -127,7 +127,7 @@ const CreateEvent = ({
            createdFileId = file.id;
            addActiveItems([file.id]);

-            open && openDocEditor(file.id, file.providerKey, tab);
+            open && openDocEditor(file.id, file.providerKey, null);
          })
          .then(() => editCompleteAction(item, type))
          .catch((err) => {
@ -154,7 +154,7 @@ const CreateEvent = ({
            });
            setConvertPasswordDialogVisible(true);

-            open && openDocEditor(null, null, tab);
+            // open && openDocEditor(null, null, null);
          })
          .finally(() => {
            const fileIds = [+id];
@ -177,7 +177,7 @@ const CreateEvent = ({
            setCreatedItem({ id: createdFileId, type: "file" });
            addActiveItems([file.id]);

-            return open && openDocEditor(file.id, file.providerKey, tab);
+            return open && openDocEditor(file.id, file.providerKey, null);
          })
          .then(() => editCompleteAction(item, type))
          .catch((e) => toastr.error(e))
@ -208,12 +208,12 @@ const CreateEvent = ({
                  true,
                  false
                ).then(
-                  () => open && openDocEditor(file.id, file.providerKey, tab)
+                  () => open && openDocEditor(file.id, file.providerKey, null)
                );
              });
            }

-            return open && openDocEditor(file.id, file.providerKey, tab);
+            return open && openDocEditor(file.id, file.providerKey, null);
          })
          .then(() => editCompleteAction(item, type))
          .catch((e) => toastr.error(e))
--- a/packages/client/src/components/dialogs/ConvertPasswordDialog/index.js
+++ b/packages/client/src/components/dialogs/ConvertPasswordDialog/index.js
@ -111,6 +111,7 @@ const ConvertPasswordDialogComponent = (props) => {
          .then((file) => {
            toastr.success(t("SuccessfullyCreated", { fileTitle: newTitle }));
            onClose();
+
            open && openDocEditor(file.id, file.providerKey, tab);
          })
          .then(() => {
@ -123,7 +124,8 @@ const ConvertPasswordDialogComponent = (props) => {
            }

            toastr.error(t("CreationError"), t("Common:Warning"));
-            open && openDocEditor(null, null, tab);
+
+            // open && openDocEditor(null, null, tab);
            if (_isMounted) {
              setPasswordValid(false);
              focusInput();
--- a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/TagInput/TagList.js
+++ b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/TagInput/TagList.js
@ -17,6 +17,10 @@ const StyledTagList = styled.div`
    border-radius: 3px;
    margin: 0;

+    :hover {
+      background: ${(props) =>
+        props.theme.createEditRoomDialog.tagInput.tagHoverBackground};
+    }
    .tag-icon {
      margin-left: 10px;
    }
--- a/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/FilesItemTitle.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/FilesItemTitle.js
@ -30,12 +30,17 @@ const FilesItemTitle = ({
      </StyledTitle>
    );

+  const icon =
+    selection?.isRoom && selection?.logo?.medium
+      ? selection.logo.medium
+      : selection.icon;
+
  return (
    <StyledTitle ref={itemTitleRef}>
      <div className="item-icon">
        <img
          className={`icon ${selection.isRoom && "is-room"}`}
-          src={selection.icon}
+          src={icon}
          alt="thumbnail-icon"
        />
      </div>
--- a/packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Branding/whitelabel.js
@ -20,6 +20,7 @@ const StyledComponent = styled.div`
  .subtitle {
    margin-top: 5px;
    margin-bottom: 20px;
+    color: ${(props) => props.theme.client.settings.common.descriptionColor};
  }

  .header-container {
@ -390,9 +391,7 @@ const WhiteLabel = (props) => {
    <LoaderWhiteLabel />
  ) : (
    <StyledComponent>
-      <Text className="subtitle" color="#657077">
-        {t("BrandingSubtitle")}
-      </Text>
+      <Text className="subtitle">{t("BrandingSubtitle")}</Text>

      <div className="header-container">
        <Text fontSize="16px" fontWeight="700">
--- a/packages/client/src/pages/PortalSettings/categories/common/customization.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/customization.js
@ -26,7 +26,7 @@ const StyledComponent = styled.div`
  .category-description {
    margin-top: 5px;
    line-height: 20px;
-    color: #657077;
+    color: ${(props) => props.theme.client.settings.common.descriptionColor};
    margin-bottom: 20px;
    max-width: 700px;
  }
--- a/packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
@ -22,6 +22,7 @@ const Backup = ({
    return (
      <>
        <HelpButton
+          place="bottom"
          iconName={"/static/images/help.react.svg"}
          tooltipContent={
            <>
--- a/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js
+++ b/packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js
@ -25,7 +25,7 @@ export const MainContainer = styled.div`

  .helper {
    margin-bottom: 24px;
-    color: #657077;
+    color: ${(props) => props.theme.client.settings.common.descriptionColor};
  }

  .button {
--- a/packages/client/src/pages/PortalSettings/categories/payments/index.js
+++ b/packages/client/src/pages/PortalSettings/categories/payments/index.js
@ -196,6 +196,7 @@ const PaymentsPage = ({
    return (
      <>
        <HelpButton
+          offsetRight={0}
          iconName={"/static/images/help.react.svg"}
          tooltipContent={
            <>
--- a/packages/client/src/pages/Profile/Section/Footer/styled-active-sessions.js
+++ b/packages/client/src/pages/Profile/Section/Footer/styled-active-sessions.js
@ -42,7 +42,7 @@ export const TableHeaderCell = styled.th`
    left: -8px;
    width: 1px;
    height: 10px;
-    background: #d0d5da;
+    background: ${(props) => props.theme.activeSessions.sortHeaderColor};
  }
 `;

@ -110,7 +110,7 @@ export const TableDataCell = styled.td`
      right: -8px;
      width: 1px;
      height: 12px;
-      background: #d0d5da;
+      background: ${(props) => props.theme.activeSessions.sortHeaderColor};
    }
  }

--- a/packages/client/src/store/ContextOptionsStore.js
+++ b/packages/client/src/store/ContextOptionsStore.js
@ -266,7 +266,11 @@ class ContextOptionsStore {
    let tab =
      !this.authStore.isDesktopClient && fileExst
        ? window.open(
-            combineUrl(AppServerConfig.proxyURL, config.homepage, "/doceditor"),
+            combineUrl(
+              AppServerConfig.proxyURL,
+              config.homepage,
+              `/doceditor?fileId=${id}`
+            ),
            "_blank"
          )
        : null;
@ -633,7 +637,7 @@ class ContextOptionsStore {
          {
            id: "option_pin-room",
            key: "pin-room",
-            label: t("Pin"),
+            label: t("PinToTop"),
            icon: "/static/images/pin.react.svg",
            onClick: (e) => this.onClickPin(e, item.id, t),
            disabled: false,
@ -986,7 +990,7 @@ class ContextOptionsStore {
      const pinOption = isPinOption
        ? {
            key: "pin-room",
-            label: t("Pin"),
+            label: t("PinToTop"),
            icon: "/static/images/pin.react.svg",
            onClick: pinRooms,
            disabled: false,
--- a/packages/client/src/store/FilesActionsStore.js
+++ b/packages/client/src/store/FilesActionsStore.js
@ -1807,7 +1807,7 @@ class FilesActionStore {
                combineUrl(
                  AppServerConfig.proxyURL,
                  config.homepage,
-                  "/doceditor"
+                  `/doceditor?fileId=${id}`
                ),
                "_blank"
              )
--- a/packages/common/components/ColorTheme/styled/iconWrapper.js
+++ b/packages/common/components/ColorTheme/styled/iconWrapper.js
@ -4,10 +4,14 @@ import StyledIconWrapper from "@docspace/common/components/Navigation/sub-compon
 const getDefaultStyles = ({ $currentColorScheme }) =>
  $currentColorScheme &&
  css`
-  svg {
-    path:nth-child(2) {
+    svg {
+      path:nth-child(2) {
        fill: ${$currentColorScheme.main.accent};
+      }
+      circle {
+        stroke: ${$currentColorScheme.main.accent};
+      }
    }
-`;
+  `;

 export default styled(StyledIconWrapper)(getDefaultStyles);
--- a/packages/common/components/FilterInput/sub-components/SelectedItem.js
+++ b/packages/common/components/FilterInput/sub-components/SelectedItem.js
@ -24,6 +24,10 @@ const StyledSelectedItem = styled.div`

  background: ${(props) => props.theme.filterInput.selectedItems.background};

+  :hover {
+    background: ${(props) =>
+      props.theme.filterInput.selectedItems.hoverBackground};
+  }
  .selected-item_label {
    line-height: 20px;
    margin-right: 10px;
--- a/packages/components/catalog-item/styled-catalog-item.js
+++ b/packages/components/catalog-item/styled-catalog-item.js
@ -261,7 +261,8 @@ const StyledCatalogItemImg = styled.div`
  svg {
    width: ${(props) => props.theme.catalogItem.img.svg.width};
    height: ${(props) => props.theme.catalogItem.img.svg.height};
-    path {
+    path,
+    circle {
      fill: ${(props) =>
        props.isActive
          ? props.theme.catalogItem.img.svg.isActiveFill
--- a/packages/components/selector/sub-components/Item/index.js
+++ b/packages/components/selector/sub-components/Item/index.js
@ -94,8 +94,10 @@ const Item = React.memo(({ index, style, data }) => {
      onSelect && onSelect(item);
    };

-    const onClick = () => {
-      !isMultiSelect && onSelect && onSelect(item);
+    const onClick = (e) => {
+      if (e.target.closest(".checkbox")) return;
+
+      onSelect && onSelect(item);
    };

    return (
--- a/packages/components/table-container/GroupMenuItem.js
+++ b/packages/components/table-container/GroupMenuItem.js
@ -11,7 +11,7 @@ import { isChrome, browserVersion } from "react-device-detect";

 const StyledButton = styled(Button)`
  border: none;
-  padding: 0 10px;
+  padding: 0 12px;
  height: 100%;
  min-width: fit-content;

@ -78,7 +78,11 @@ const StyledButton = styled(Button)`
  .button-content {
    @media ${tablet} {
      flex-direction: column;
-      gap: 0px;
+      gap: 4px;
+    }
+
+    @media ${hugeMobile} {
+      margin-top: 4px;
    }

    ${isChrome &&
--- a/packages/components/table-container/StyledTableContainer.js
+++ b/packages/components/table-container/StyledTableContainer.js
@ -128,8 +128,8 @@ const StyledTableGroupMenu = styled.div`
  .table-container_group-menu-separator {
    border-right: ${(props) =>
      props.theme.tableContainer.groupMenu.borderRight};
-    width: 2px;
-    height: 20px;
+    width: 1px;
+    height: 21px;
    margin: 0 16px 0 20px;

    @media ${tablet} {
@ -141,7 +141,7 @@ const StyledTableGroupMenu = styled.div`
      height: 36px;
    `}

-    @media ${mobile} {
+    @media ${hugeMobile} {
      height: 20px;
    }

@ -158,7 +158,7 @@ const StyledTableGroupMenu = styled.div`
  .table-container_group-menu-combobox {
    height: 24px;
    width: 16px;
-    margin: 3px 0px 0px 3px;
+    margin: 7px 2px 0px 9px;
    background: transparent;

    .combo-button {
--- a/packages/components/themes/base.js
+++ b/packages/components/themes/base.js
@ -2145,6 +2145,7 @@ const Base = {

    selectedItems: {
      background: "#eceef1",
+      hoverBackground: "#F3F4F4",
    },
  },

@ -2407,6 +2408,7 @@ const Base = {

    tagInput: {
      tagBackground: "#ECEEF1",
+      tagHoverBackground: "#F3F4F4",
    },

    dropdown: {
@ -2905,7 +2907,7 @@ const Base = {
        linkColorHelp: link,
        tooltipLinkColor: black,
        arrowColor: black,
-        descriptionColor: cyanBlueDarkShade,
+        descriptionColor: grayMain,

        whiteLabel: {
          borderImg: "1px solid #d1d1d1",
@ -3035,6 +3037,7 @@ const Base = {
    borderColor: "#eceef1",
    tickIconColor: "#35AD17",
    removeIconColor: "#A3A9AE",
+    sortHeaderColor: "#d0d5da",
  },

  formWrapper: {
--- a/packages/components/themes/dark.js
+++ b/packages/components/themes/dark.js
@ -2138,7 +2138,8 @@ const Dark = {
    },

    selectedItems: {
-      background: "#000000",
+      background: "#242424",
+      hoverBackground: "#3d3d3d",
    },
  },

@ -2406,7 +2407,8 @@ const Dark = {
    },

    tagInput: {
-      tagBackground: "#292929",
+      tagBackground: "#242424",
+      tagHoverBackground: "#3D3D3D",
    },

    dropdown: {
@ -3035,6 +3037,7 @@ const Dark = {
    borderColor: "#474747",
    tickIconColor: "#3BA420",
    removeIconColor: "#A3A9AE",
+    sortHeaderColor: "#474747",
  },

  formWrapper: {