Web: Files: restored MoveToPublicRoom dialog
This commit is contained in:
parent
f272f406ea
commit
f589e5979b
@ -88,6 +88,7 @@ export type FilesSelectorProps = {
|
||||
withoutImmediatelyClose: boolean;
|
||||
isThirdParty: boolean;
|
||||
isEditorDialog: boolean;
|
||||
setMoveToPublicRoomVisible: (visible: boolean, operationData: object) => void;
|
||||
|
||||
onClose?: () => void;
|
||||
|
||||
|
@ -339,12 +339,14 @@ export const useFilesHelper = ({
|
||||
pathParts.map(async (folderId: number | string) => {
|
||||
const folderInfo: any = await getFolderInfo(folderId);
|
||||
|
||||
const { title, id, parentId, rootFolderType } = folderInfo;
|
||||
const { title, id, parentId, rootFolderType, roomType } =
|
||||
folderInfo;
|
||||
|
||||
return {
|
||||
label: title,
|
||||
id: id,
|
||||
isRoom: parentId === 0 && rootFolderType === FolderType.Rooms,
|
||||
roomType,
|
||||
};
|
||||
})
|
||||
);
|
||||
|
@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
|
||||
|
||||
// @ts-ignore
|
||||
import Loaders from "@docspace/common/components/Loaders";
|
||||
import { FolderType } from "@docspace/common/constants";
|
||||
import { FolderType, RoomsType } from "@docspace/common/constants";
|
||||
|
||||
import Aside from "@docspace/components/aside";
|
||||
import Backdrop from "@docspace/components/backdrop";
|
||||
@ -82,6 +82,7 @@ const FilesSelector = ({
|
||||
|
||||
descriptionText,
|
||||
setSelectedItems,
|
||||
setMoveToPublicRoomVisible,
|
||||
}: FilesSelectorProps) => {
|
||||
const { t } = useTranslation(["Files", "Common", "Translations"]);
|
||||
|
||||
@ -292,6 +293,10 @@ const FilesSelector = ({
|
||||
fileName: string,
|
||||
isChecked: boolean
|
||||
) => {
|
||||
const isPublic =
|
||||
breadCrumbs.findIndex((f: any) => f.roomType === RoomsType.PublicRoom) >
|
||||
-1;
|
||||
|
||||
if ((isMove || isCopy || isRestoreAll) && !isEditorDialog) {
|
||||
const folderTitle = breadCrumbs[breadCrumbs.length - 1].label;
|
||||
|
||||
@ -329,6 +334,11 @@ const FilesSelector = ({
|
||||
},
|
||||
};
|
||||
|
||||
if (isPublic) {
|
||||
setMoveToPublicRoomVisible(true, operationData);
|
||||
return;
|
||||
}
|
||||
|
||||
setIsRequestRunning(true);
|
||||
setSelectedItems();
|
||||
checkFileConflicts(selectedItemId, folderIds, fileIds)
|
||||
@ -544,6 +554,7 @@ export default inject(
|
||||
conflictResolveDialogVisible,
|
||||
isFolderActions,
|
||||
setIsFolderActions,
|
||||
setMoveToPublicRoomVisible,
|
||||
} = dialogsStore;
|
||||
|
||||
const { theme } = auth.settingsStore;
|
||||
@ -600,6 +611,7 @@ export default inject(
|
||||
setRestoreAllPanelVisible,
|
||||
setIsFolderActions,
|
||||
setSelectedItems,
|
||||
setMoveToPublicRoomVisible,
|
||||
};
|
||||
}
|
||||
)(observer(FilesSelector));
|
||||
|
Loading…
Reference in New Issue
Block a user