Merge branch 'feature/translations-3.1' of https://github.com/ONLYOFF…

…ICE/DocSpace-client into feature/translations-3.1
ONLYOFFICE · Dec 10, 2024 · 3302006 · 3302006
2 parents 72e073b + a4d2a31
commit 3302006
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 33 deletions.
diff --git a/packages/client/src/components/AccessSelector/index.tsx b/packages/client/src/components/AccessSelector/index.tsx
@@ -86,13 +86,15 @@ const AccessSelector: React.FC<AccessSelectorProps> = ({
   const [horizontalOrientation, setHorizontalOrientation] = useState(false);
   const [width, setWidth] = useState(manualWidth || 0);
 
+  const offsetWidth = containerRef?.current?.offsetWidth;
+
   useEffect(() => {
-    if (!containerRef?.current?.offsetWidth) {
+    if (!offsetWidth) {
       return;
     }
 
-    setWidth(containerRef?.current?.offsetWidth - 32);
-  }, [containerRef?.current?.offsetWidth]);
+    setWidth(offsetWidth - 32);
+  }, [offsetWidth]);
 
   const accessOptions = getAccessOptions(
     t,

diff --git a/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js b/packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
@@ -29,34 +29,29 @@ import styled, { css } from "styled-components";
 import { withTranslation } from "react-i18next";
 import { inject, observer } from "mobx-react";
 
-import RoomTypeDropdown from "./RoomTypeDropdown";
-import TagInput from "./TagInput";
-import RoomType from "@docspace/shared/components/room-type";
-import PermanentSettings from "./PermanentSettings";
-import InputParam from "./Params/InputParam";
-import ThirdPartyStorage from "./ThirdPartyStorage";
-// import IsPrivateParam from "./IsPrivateParam";
-
-import withLoader from "@docspace/client/src/HOCs/withLoader";
-import SetRoomParamsLoader from "@docspace/shared/skeletons/create-edit-room/SetRoomParams";
-
-import VirtualDataRoomBlock from "./VirtualDataRoomBlock";
-import ItemIcon from "@docspace/client/src/components/ItemIcon";
-
-import ChangeRoomOwner from "./ChangeRoomOwner";
-import RoomQuota from "./RoomQuota";
 import { RoomsType } from "@docspace/shared/enums";
-
+import { globalColors } from "@docspace/shared/themes";
 import { isMobile, mobile } from "@docspace/shared/utils";
-import { isMobileOnly } from "react-device-detect";
-
-import { AvatarEditorDialog } from "SRC_DIR/components/dialogs";
-
+import VirtualDataRoomBlock from "./VirtualDataRoomBlock";
+import RoomType from "@docspace/shared/components/room-type";
 import { RoomIcon } from "@docspace/shared/components/room-icon";
-import { globalColors } from "@docspace/shared/themes";
+import SetRoomParamsLoader from "@docspace/shared/skeletons/create-edit-room/SetRoomParams";
+
+import ItemIcon from "../../../ItemIcon";
+import withLoader from "../../../../HOCs/withLoader";
+import AvatarEditorDialog from "../../AvatarEditorDialog";
 
 import { removeEmojiCharacters } from "SRC_DIR/helpers/utils";
 
+import TagInput from "./TagInput";
+import RoomQuota from "./RoomQuota";
+import InputParam from "./Params/InputParam";
+import ChangeRoomOwner from "./ChangeRoomOwner";
+import RoomTypeDropdown from "./RoomTypeDropdown";
+import PermanentSettings from "./PermanentSettings";
+import ThirdPartyStorage from "./ThirdPartyStorage";
+// import IsPrivateParam from "./IsPrivateParam";
+
 const StyledSetRoomParams = styled.div`
   display: flex;
   flex-direction: column;

diff --git a/packages/client/src/helpers/contacts/utils.ts b/packages/client/src/helpers/contacts/utils.ts
@@ -39,7 +39,7 @@ import {
 } from "@docspace/shared/api/people";
 import { toastr } from "@docspace/shared/components/toast";
 
-import UsersStore from "SRC_DIR/store/contacts/UsersStore";
+import type UsersStore from "SRC_DIR/store/contacts/UsersStore";
 import config from "PACKAGE_FILE";
 
 import { showEmailActivationToast } from "../people-helpers";

diff --git a/packages/client/src/pages/PortalSettings/categories/common/appearance.js b/packages/client/src/pages/PortalSettings/categories/common/appearance.js
@@ -727,7 +727,7 @@ const Appearance = (props) => {
         </div>
 
         <div className="theme-custom-container">
-          <div className="theme-name">{t("Settings:Custom")}</div>
+          <div className="theme-name">{t("Common:Custom")}</div>
 
           <div className="theme-container">
             <div className="custom-themes">

diff --git a/packages/client/src/store/ProfileActionsStore.js b/packages/client/src/store/ProfileActionsStore.js
@@ -65,7 +65,6 @@ class ProfileActionsStore {
   userStore = null;
   settingsStore = null;
   filesStore = null;
-  peopleStore = null;
   treeFoldersStore = null;
   selectedFolderStore = null;
   pluginStore = null;
@@ -77,7 +76,6 @@ class ProfileActionsStore {
   constructor(
     authStore,
     filesStore,
-    peopleStore,
     treeFoldersStore,
     selectedFolderStore,
     pluginStore,
@@ -87,7 +85,6 @@ class ProfileActionsStore {
   ) {
     this.authStore = authStore;
     this.filesStore = filesStore;
-    this.peopleStore = peopleStore;
     this.treeFoldersStore = treeFoldersStore;
     this.selectedFolderStore = selectedFolderStore;
     this.pluginStore = pluginStore;

diff --git a/packages/client/src/store/index.js b/packages/client/src/store/index.js
@@ -187,7 +187,6 @@ const dialogsStore = new DialogsStore(
 const profileActionsStore = new ProfileActionsStore(
   authStore,
   filesStore,
-  peopleStore,
   treeFoldersStore,
   selectedFolderStore,
   pluginStore,
@@ -208,8 +207,6 @@ const peopleStore = new PeopleStore(
   currentQuotaStore,
 );
 
-profileActionsStore.peopleStore = peopleStore;
-
 const uploadDataStore = new UploadDataStore(
   settingsStore,
   treeFoldersStore,