From ae1097f20771506f8539fc754009e49aa1e8661c Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Tue, 10 May 2022 21:54:12 +0530 Subject: [PATCH] fix: switching between previewable & non-previewable files (#1021) --- .../AttachedFilesPopover/AttachedFilesButton.tsx | 9 +++++++-- .../javascripts/Components/Files/FilePreviewModal.tsx | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx index 78799a23f..d555d94f9 100644 --- a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx +++ b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx @@ -210,10 +210,15 @@ export const AttachedFilesButton: FunctionComponent = observer( case PopoverFileItemActionType.RenameFile: await renameFile(file, action.payload.name) break - case PopoverFileItemActionType.PreviewFile: + case PopoverFileItemActionType.PreviewFile: { keepMenuOpen(true) - appState.filePreviewModal.activate(file, currentTab === PopoverTabs.AllFiles ? allFiles : attachedFiles) + const otherFiles = currentTab === PopoverTabs.AllFiles ? allFiles : attachedFiles + appState.filePreviewModal.activate( + file, + otherFiles.filter((file) => !file.protected), + ) break + } } if ( diff --git a/app/assets/javascripts/Components/Files/FilePreviewModal.tsx b/app/assets/javascripts/Components/Files/FilePreviewModal.tsx index 2fe6eccaf..42635ecc8 100644 --- a/app/assets/javascripts/Components/Files/FilePreviewModal.tsx +++ b/app/assets/javascripts/Components/Files/FilePreviewModal.tsx @@ -69,6 +69,7 @@ export const FilePreviewModal: FunctionComponent = observer(({ applicatio setIsFilePreviewable(isPreviewable) if (!isPreviewable) { + setObjectUrl('') setIsLoadingFile(false) }