Merge branch 'hotfix/v2.6.1' of https://github.com/ONLYOFFICE/DocSpace-client into hotfix/v2.6.1

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

@@ -145,7 +145,9 @@ const SimulatePassword = memo(
     }, [isDisabled]);
 
     useEffect(() => {
-      setPassword(inputValue);
+      if (inputValue !== undefined) {
+        setPassword(inputValue);
+      }
     }, [inputValue]);
 
     return (

packages/client/src/components/panels/NewFilesPanel/index.js

@@ -52,6 +52,7 @@ import { StyledNewFilesBody, StyledLink } from "../StyledPanels";
 import withLoader from "../../../HOCs/withLoader";
 
 import config from "PACKAGE_FILE";
+import { MEDIA_VIEW_URL } from "@docspace/shared/constants";
 
 const NewFilesPanel = (props) => {
   const {
@@ -60,8 +61,6 @@ const NewFilesPanel = (props) => {
     getFolderIcon,
     newFiles,
     markAsRead,
-    setMediaViewerData,
-    currentFolderId,
     setIsLoading,
     t,
     visible,
@@ -203,40 +202,10 @@ const NewFilesPanel = (props) => {
       }
 
       if (isMedia) {
-        if (currentFolderId !== item.folderId) {
-          const categoryType = getCategoryTypeByFolderType(
-            rootFolderType,
-            item.folderId,
-          );
-
-          const state = {
-            title: "",
-            rootFolderType,
-
-            isRoot: false,
-          };
-          setIsLoading(true);
-
-          const url = getCategoryUrl(categoryType, item.folderId);
-
-          const filter = FilesFilter.getDefault();
-          filter.folder = item.folderId;
-
-          window.DocSpace.navigate(`${url}?${filter.toUrlParams()}`, { state });
-
-          const mediaItem = { visible: true, id };
-          setMediaViewerData(mediaItem);
-
-          setInProgress(false);
-          onClose();
-        } else {
-          const mediaItem = { visible: true, id };
-          setMediaViewerData(mediaItem);
-
-          return onClose();
-        }
-
-        return;
+        return window.open(
+          combineUrl(MEDIA_VIEW_URL, id),
+          openOnNewPage ? "_blank" : "_self",
+        );
       }
 
       if (fileItemsList && enablePlugins) {
@@ -335,7 +304,6 @@ export default inject(
     filesStore,
     mediaViewerDataStore,
     filesActionsStore,
-    selectedFolderStore,
     dialogsStore,
     filesSettingsStore,
     clientLoadingStore,
@@ -349,10 +317,9 @@ export default inject(
       setIsSectionFilterLoading(param);
     };
 
-    const { setMediaViewerData, setCurrentItem } = mediaViewerDataStore;
+    const { setCurrentItem } = mediaViewerDataStore;
     const { getIcon, getFolderIcon, openOnNewPage } = filesSettingsStore;
     const { markAsRead } = filesActionsStore;
-    const { id: currentFolderId } = selectedFolderStore;
 
     const {
       setNewFilesPanelVisible,
@@ -371,8 +338,6 @@ export default inject(
       newFilesIds,
       isLoading,
       setCurrentItem,
-      currentFolderId,
-      setMediaViewerData,
       getIcon,
       getFolderIcon,
       markAsRead,

packages/client/src/pages/Home/InfoPanel/Body/sub-components/ItemTitle/Rooms/index.js

@@ -52,7 +52,7 @@ const RoomsItemHeader = ({
   setSelection,
   setBufferSelection,
   isArchive,
-  hasLinks,
+  isShared,
   showSearchBlock,
   setShowSearchBlock,
   roomType,
@@ -70,7 +70,7 @@ const RoomsItemHeader = ({
     (selection.roomType === RoomsType.PublicRoom ||
       selection.roomType === RoomsType.FormRoom ||
       selection.roomType === RoomsType.CustomRoom) &&
-    hasLinks;
+    isShared;
 
   const badgeUrl = showPlanetIcon ? Planet12ReactSvgUrl : null;
   const isRoomMembersPanel = selection?.isRoom && roomsView === "info_members";
@@ -161,7 +161,6 @@ export default inject(
     selectedFolderStore,
     filesStore,
     infoPanelStore,
-    publicRoomStore,
   }) => {
     const {
       infoPanelSelection,
@@ -170,7 +169,6 @@ export default inject(
       showSearchBlock,
       setShowSearchBlock,
     } = infoPanelStore;
-    const { externalLinks } = publicRoomStore;
 
     const selection = infoPanelSelection.length > 1 ? null : infoPanelSelection;
     const isArchive = selection?.rootFolderType === FolderType.Archive;
@@ -196,7 +194,7 @@ export default inject(
       setSelection: filesStore.setSelection,
       setBufferSelection: filesStore.setBufferSelection,
       isArchive,
-      hasLinks: externalLinks.length,
+      isShared: selection?.shared,
       roomType,
     };
   },

packages/client/src/pages/PortalSettings/categories/common/Branding/additionalResources.js

@@ -187,12 +187,14 @@ const AdditionalResources = (props) => {
   const onSave = useCallback(async () => {
     setIsLoading(true);
 
+    const settings = JSON.parse(JSON.stringify(additionalResourcesData));
+
+    settings.feedbackAndSupportEnabled = feedbackAndSupportEnabled;
+    settings.videoGuidesEnabled = videoGuidesEnabled;
+    settings.helpCenterEnabled = helpCenterEnabled;
+
     await api.settings
-      .setAdditionalResources(
-        feedbackAndSupportEnabled,
-        videoGuidesEnabled,
-        helpCenterEnabled,
-      )
+      .setAdditionalResources(settings)
       .then(() => {
         toastr.success(t("Settings:SuccessfullySaveSettingsMessage"));
       })

packages/shared/api/settings/index.ts

@@ -407,16 +407,10 @@ export async function getCustomSchemaList() {
 }
 
 export function setAdditionalResources(
-  feedbackAndSupportEnabled,
-  videoGuidesEnabled,
-  helpCenterEnabled,
+  additionalResources: TAdditionalResources,
 ) {
   const data = {
-    settings: {
-      helpCenterEnabled,
-      feedbackAndSupportEnabled,
-      videoGuidesEnabled,
-    },
+    settings: additionalResources,
   };
 
   return request({