Merge branch 'hotfix/v3.0.1' of git.onlyoffice.com:ONLYOFFICE/DocSpac…

…e-client into hotfix/v3.0.1
ONLYOFFICE · Dec 4, 2024 · b95ea89 · b95ea89
2 parents bde99e6 + e5b725f
commit b95ea89
Show file tree

Hide file tree

Showing 22 changed files with 332 additions and 385 deletions.
diff --git a/packages/client/src/components/Article/Body/index.js b/packages/client/src/components/Article/Body/index.js
@@ -188,7 +188,10 @@ const ArticleBodyContent = (props) => {
 
       const isAccountsClick = folderId === "accounts";
 
-      let withTimer = isAccountsClick ? false : !!selectedFolderId;
+      let withTimer = isAccountsClick
+        ? window.location.pathname.includes("accounts") &&
+          !window.location.pathname.includes("groups")
+        : !!selectedFolderId;
 
       if (isAccountsClick) {
         clearFiles();
@@ -309,12 +312,12 @@ export default inject(
     const {
       showArticleLoader,
 
-      setIsSectionFilterLoading,
+      setIsSectionBodyLoading,
       firstLoad,
     } = clientLoadingStore;
 
     const setIsLoading = (param, withTimer) => {
-      setIsSectionFilterLoading(param, withTimer);
+      setIsSectionBodyLoading(param, withTimer);
 
       if (param && withTimer) showProgress();
     };

diff --git a/packages/client/src/components/EmptyContainer/RootFolderContainer.js b/packages/client/src/components/EmptyContainer/RootFolderContainer.js
@@ -380,10 +380,10 @@ export default inject(
   }) => {
     const { isDesktopClient, isEncryptionSupport, theme } = settingsStore;
 
-    const { setIsSectionFilterLoading } = clientLoadingStore;
+    const { setIsSectionBodyLoading } = clientLoadingStore;
 
     const setIsLoading = (param) => {
-      setIsSectionFilterLoading(param);
+      setIsSectionBodyLoading(param);
     };
 
     const { filter, privacyInstructions, isEmptyPage } = filesStore;

diff --git a/packages/client/src/components/EmptyContainer/sub-components/CommonButtons.js b/packages/client/src/components/EmptyContainer/sub-components/CommonButtons.js
@@ -287,10 +287,10 @@ export default inject(
 
     const { onClickInviteUsers } = contextOptionsStore;
 
-    const { setIsSectionFilterLoading, isLoading } = clientLoadingStore;
+    const { setIsSectionBodyLoading, isLoading } = clientLoadingStore;
 
     const setIsLoading = (param) => {
-      setIsSectionFilterLoading(param);
+      setIsSectionBodyLoading(param);
     };
 
     return {

diff --git a/...c/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.hooks.ts b/...c/components/EmptyContainer/sub-components/EmptyViewContainer/EmptyViewContainer.hooks.ts
@@ -193,8 +193,6 @@ export const useOptions = (
 
     const path = getCategoryUrl(CategoryType.Personal);
 
-    // setIsSectionFilterLoading(true);
-
     return {
       to: {
         pathname: path,

diff --git a/packages/client/src/components/GlobalEvents/CreateEvent.js b/packages/client/src/components/GlobalEvents/CreateEvent.js
@@ -48,7 +48,6 @@ const CreateEvent = ({
   templateId,
   fromTemplate,
   onClose,
-  setIsLoading,
 
   createFolder,
   addActiveItems,
@@ -124,8 +123,6 @@ const CreateEvent = ({
 
     const isMakeFormFromFile = templateId ? true : false;
 
-    setIsLoading(true);
-
     let newValue = value;
 
     if (value.trim() === "") {
@@ -163,7 +160,6 @@ const CreateEvent = ({
 
           clearActiveOperations(null, folderIds);
           onCloseAction();
-          return setIsLoading(false);
         });
     } else {
       try {
@@ -222,7 +218,6 @@ const CreateEvent = ({
       } catch (error) {
         toastr.error(error);
       } finally {
-        setIsLoading(false);
         onCloseAction();
       }
     }
@@ -259,12 +254,6 @@ export default inject(
     currentTariffStatusStore,
     publicRoomStore,
   }) => {
-    const { setIsSectionBodyLoading } = clientLoadingStore;
-
-    const setIsLoading = (param) => {
-      setIsSectionBodyLoading(param);
-    };
-
     const publicRoomKey = publicRoomStore.publicRoomKey;
 
     const {
@@ -303,7 +292,6 @@ export default inject(
       setPortalTariff,
       setEventDialogVisible,
       eventDialogVisible,
-      setIsLoading,
       createFile,
       createFolder,
       addActiveItems,

diff --git a/packages/client/src/components/Layout/index.js b/packages/client/src/components/Layout/index.js
@@ -79,15 +79,18 @@ const Layout = (props) => {
     isFrame,
   } = props;
 
-  const [contentHeight, setContentHeight] = useState();
   const [isPortrait, setIsPortrait] = useState();
 
-  if (window.DocSpace) {
-    window.DocSpace.navigate = useNavigate();
-    window.DocSpace.location = useLocation();
-  } else {
-    window.DocSpace = { navigate: useNavigate(), location: useLocation() };
-  }
+  const navigate = useNavigate();
+  const location = useLocation();
+
+  window.DocSpace = {
+    ...window.DocSpace,
+    navigate,
+    location,
+  };
+
+  const isSDKPath = window.DocSpace.location.pathname.includes("/sdk/");
 
   let intervalHandler;
   let timeoutHandler;
@@ -161,12 +164,12 @@ const Layout = (props) => {
   };
 
   return (
-    <StyledContainer
-      className="Layout"
-      contentHeight={contentHeight}
-      isPortrait={isPortrait}
-    >
-      <Scrollbar id="customScrollBar">{children}</Scrollbar>
+    <StyledContainer className="Layout" isPortrait={isPortrait}>
+      {isSDKPath ? (
+        children
+      ) : (
+        <Scrollbar id="customScrollBar">{children}</Scrollbar>
+      )}
     </StyledContainer>
   );
 };
@@ -182,8 +185,8 @@ export default inject(({ settingsStore }) => {
     isTabletView,
     setIsTabletView,
     setWindowWidth,
-    isFrame,
     setWindowAngle,
+    isFrame,
   } = settingsStore;
   return {
     isTabletView,

diff --git a/packages/client/src/components/NewFilesBadge/sub-components/NewFilesPanel.tsx b/packages/client/src/components/NewFilesBadge/sub-components/NewFilesPanel.tsx
@@ -200,7 +200,7 @@ export const NewFilesPanelComponent = ({
         <Scrollbar>{content}</Scrollbar>
         {markAsReadButton}
       </StyledPanel>
-      {isMobile() && <Backdrop visible withoutBackground withoutBlur />}
+      {!isMobile() && <Backdrop visible withoutBackground withoutBlur />}
     </>
   );
 

diff --git a/packages/client/src/pages/Home/Section/Filter/useContacts.tsx b/packages/client/src/pages/Home/Section/Filter/useContacts.tsx
@@ -798,7 +798,11 @@ export const useContactsFilter = ({
       };
 
       if (isGuests) {
-        options.push(email, inviter, registrationDate);
+        options.push(firstName, email);
+
+        if (!isRoomAdmin) options.push(inviter);
+
+        options.push(registrationDate);
       } else {
         options.push(firstName, type, department, email);
         if (showStorageInfo) options.push(storage);
@@ -833,7 +837,7 @@ export const useContactsFilter = ({
     groupsOptions.push(title, people, manager);
 
     return groupsOptions;
-  }, [isGroups, isGuests, showStorageInfo, t]);
+  }, [isGroups, isGuests, isRoomAdmin, showStorageInfo, t]);
 
   const removeContactsSelectedItem = React.useCallback(
     (group: FilterGroups) => {

diff --git a/packages/client/src/pages/Home/Section/Header/index.js b/packages/client/src/pages/Home/Section/Header/index.js
@@ -782,14 +782,14 @@ export default inject(
     } = filesStore;
 
     const {
-      setIsSectionFilterLoading,
+      setIsSectionBodyLoading,
       showHeaderLoader,
 
       isLoading,
     } = clientLoadingStore;
 
     const setIsLoading = (param) => {
-      setIsSectionFilterLoading(param);
+      setIsSectionBodyLoading(param);
     };
 
     const { isRecycleBinFolder, isRoomsFolder, isArchiveFolder } =

diff --git a/packages/client/src/pages/Home/Section/Tabs/ContactsTabs/index.tsx b/packages/client/src/pages/Home/Section/Tabs/ContactsTabs/index.tsx
@@ -48,17 +48,16 @@ import {
 } from "SRC_DIR/helpers/contacts";
 
 type ContactsTabsProps = {
-  showFilterLoader: ClientLoadingStore["showFilterLoader"];
+  showTabsLoader: ClientLoadingStore["showTabsLoader"];
 
   setUsersSelection: UsersStore["setSelection"];
   setUsersBufferSelection: UsersStore["setBufferSelection"];
-  isUsersFetched: UsersStore["isUsersFetched"];
   setContactsTab: UsersStore["setContactsTab"];
   guestsTabVisited: UsersStore["guestsTabVisited"];
+  contactsTab: UsersStore["contactsTab"];
 
   setGroupsSelection: GroupsStore["setSelection"];
   setGroupsBufferSelection: GroupsStore["setBufferSelection"];
-  isGroupsFetched: GroupsStore["isGroupsFetched"];
 
   setIsSectionBodyLoading: ClientLoadingStore["setIsSectionBodyLoading"];
 
@@ -69,7 +68,7 @@ type ContactsTabsProps = {
 };
 
 const ContactsTabs = ({
-  showFilterLoader,
+  showTabsLoader,
   setUsersSelection,
   setGroupsSelection,
   setUsersBufferSelection,
@@ -80,12 +79,11 @@ const ContactsTabs = ({
   isCollaborator,
   isRoomAdmin,
 
-  isUsersFetched,
-  isGroupsFetched,
-
   setContactsTab,
 
   guestsTabVisited,
+
+  contactsTab,
 }: ContactsTabsProps) => {
   const { t } = useTranslation(["Common"]);
   const location = useLocation();
@@ -98,15 +96,15 @@ const ContactsTabs = ({
     setUsersBufferSelection(null);
     setGroupsSelection([]);
     setGroupsBufferSelection(null);
-    setIsSectionBodyLoading(true, isUsersFetched);
+    setIsSectionBodyLoading(true, contactsTab !== "groups");
     setContactsTab("people");
     navigate(PEOPLE_ROUTE_WITH_FILTER);
   };
 
   const onGroups = () => {
     setUsersSelection([]);
     setUsersBufferSelection(null);
-    setIsSectionBodyLoading(true, isGroupsFetched);
+    setIsSectionBodyLoading(true, false);
     setContactsTab("groups");
 
     navigate(GROUPS_ROUTE_WITH_FILTER);
@@ -118,7 +116,7 @@ const ContactsTabs = ({
     setUsersBufferSelection(null);
     setGroupsSelection([]);
     setGroupsBufferSelection(null);
-    setIsSectionBodyLoading(true, isUsersFetched);
+    setIsSectionBodyLoading(true, contactsTab !== "groups");
 
     const filter = Filter.getDefault();
 
@@ -133,7 +131,7 @@ const ContactsTabs = ({
 
   if (contactsView === "inside_group") return null;
 
-  if (showFilterLoader) return <SectionSubmenuSkeleton />;
+  if (showTabsLoader) return <SectionSubmenuSkeleton />;
 
   const items: TTabItem[] = [
     {
@@ -185,7 +183,7 @@ export default inject(
     clientLoadingStore: ClientLoadingStore;
     userStore: UserStore;
   }) => {
-    const { showFilterLoader, setIsSectionBodyLoading } = clientLoadingStore;
+    const { showTabsLoader, setIsSectionBodyLoading } = clientLoadingStore;
     const { usersStore, groupsStore } = peopleStore;
 
     const {
@@ -199,21 +197,19 @@ export default inject(
       setSelection: setUsersSelection,
       setBufferSelection: setUsersBufferSelection,
 
-      isUsersFetched,
-
       setContactsTab,
 
       guestsTabVisited,
+
+      contactsTab,
     } = usersStore!;
     const {
       setSelection: setGroupsSelection,
       setBufferSelection: setGroupsBufferSelection,
-
-      isGroupsFetched,
     } = groupsStore!;
 
     return {
-      showFilterLoader,
+      showTabsLoader,
       setUsersSelection,
       setUsersBufferSelection,
       setGroupsSelection,
@@ -226,12 +222,11 @@ export default inject(
       isCollaborator,
       isRoomAdmin,
 
-      isUsersFetched,
-      isGroupsFetched,
-
       setContactsTab,
 
       guestsTabVisited,
+
+      contactsTab,
     };
   },
 )(observer(ContactsTabs));
diff --git a/packages/client/src/pages/Home/Section/Tabs/MyDocumentsTabs/index.js b/packages/client/src/pages/Home/Section/Tabs/MyDocumentsTabs/index.js
@@ -36,7 +36,7 @@ const MyDocumentsTabs = ({
   isPersonalRoom,
   isRecentTab,
   setFilter,
-  showBodyLoader,
+  showTabsLoader,
   isRoot,
   user,
   setChangeDocumentsTabs,
@@ -90,7 +90,7 @@ const MyDocumentsTabs = ({
       ? tabs[1].id
       : tabs[0].id;
 
-  if (showTabs && showBodyLoader) return <SectionSubmenuSkeleton />;
+  if (showTabs && showTabsLoader) return <SectionSubmenuSkeleton />;
 
   return showTabs ? (
     <Tabs items={tabs} selectedItemId={startSelectId} onSelect={onSelect} />
@@ -107,15 +107,15 @@ export default inject(
   }) => {
     const { isPersonalRoom, isRecentTab, isRoot } = treeFoldersStore;
     const { setFilter } = filesStore;
-    const { showBodyLoader } = clientLoadingStore;
+    const { showTabsLoader } = clientLoadingStore;
     const { user } = userStore;
     const { setChangeDocumentsTabs } = selectedFolderStore;
 
     return {
       isPersonalRoom,
       isRecentTab,
       setFilter,
-      showBodyLoader,
+      showTabsLoader,
       isRoot,
       user,
       setChangeDocumentsTabs,

diff --git a/packages/client/src/pages/Home/index.js b/packages/client/src/pages/Home/index.js
@@ -185,14 +185,9 @@ const PureHome = (props) => {
   const setIsLoading = React.useCallback(
     (param, withoutTimer, withHeaderLoader) => {
       if (withHeaderLoader) setIsSectionHeaderLoading(param, !withoutTimer);
-      setIsSectionFilterLoading(param, !withoutTimer);
       setIsSectionBodyLoading(param, !withoutTimer);
     },
-    [
-      setIsSectionHeaderLoading,
-      setIsSectionFilterLoading,
-      setIsSectionBodyLoading,
-    ],
+    [setIsSectionHeaderLoading, setIsSectionBodyLoading],
   );
 
   const { onDrop } = useFiles({