Skip to content

Commit ef4c329

Browse files
authored
runfix(cells): use correct url to download files [WPB-20155] (#19558)
1 parent b229d71 commit ef4c329

File tree

6 files changed

+28
-10
lines changed

6 files changed

+28
-10
lines changed

src/script/components/CellsGlobalView/CellsTable/CellsFilePreviewModal/CellsFilePreviewModal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export const CellsFilePreviewModal = () => {
5353
isOpen={!!selectedFile}
5454
onClose={handleCloseFile}
5555
filePreviewUrl={getFileUrl()}
56+
fileUrl={url}
5657
fileName={name}
5758
fileExtension={extension}
5859
status={!getFileUrl() ? 'unavailable' : 'success'}

src/script/components/Conversation/ConversationCells/CellsTable/CellsFilePreviewModal/CellsFilePreviewModal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ export const CellsFilePreviewModal = () => {
5555
filePreviewUrl={getFileUrl()}
5656
fileName={name}
5757
fileExtension={extension}
58+
fileUrl={url}
5859
status={!getFileUrl() ? 'unavailable' : 'success'}
5960
senderName={owner}
6061
timestamp={uploadedAtTimestamp}

src/script/components/FileFullscreenModal/FileFullscreenModal.tsx

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ interface FileFullscreenModalProps {
3636
filePreviewUrl?: string;
3737
fileName: string;
3838
fileExtension: string;
39+
fileUrl?: string;
3940
status?: Status;
4041
senderName: string;
4142
timestamp: number;
@@ -47,6 +48,7 @@ export const FileFullscreenModal = ({
4748
isOpen,
4849
onClose,
4950
filePreviewUrl,
51+
fileUrl,
5052
status = 'success',
5153
fileName,
5254
fileExtension,
@@ -59,15 +61,17 @@ export const FileFullscreenModal = ({
5961
<FileHeader
6062
onClose={onClose}
6163
fileName={fileName}
62-
filePreviewUrl={filePreviewUrl}
6364
fileExtension={fileExtension}
65+
fileUrl={fileUrl}
6466
senderName={senderName}
6567
timestamp={timestamp}
6668
badges={badges}
6769
/>
6870
<ModalContent
71+
fileExtension={fileExtension}
6972
filePreviewUrl={filePreviewUrl}
7073
fileName={fileName}
74+
fileUrl={fileUrl}
7175
senderName={senderName}
7276
timestamp={timestamp}
7377
status={status}
@@ -77,20 +81,30 @@ export const FileFullscreenModal = ({
7781
};
7882

7983
interface ModalContentProps {
80-
filePreviewUrl?: string;
84+
fileExtension: string;
8185
fileName: string;
8286
status: Status;
8387
senderName: string;
8488
timestamp: number;
89+
filePreviewUrl?: string;
90+
fileUrl?: string;
8591
}
8692

87-
const ModalContent = ({filePreviewUrl, fileName, senderName, timestamp, status}: ModalContentProps) => {
93+
const ModalContent = ({
94+
fileExtension,
95+
filePreviewUrl,
96+
fileName,
97+
fileUrl,
98+
senderName,
99+
timestamp,
100+
status,
101+
}: ModalContentProps) => {
88102
if (status === 'loading' && !filePreviewUrl) {
89103
return <FileLoader />;
90104
}
91105

92106
if (status === 'unavailable' || !filePreviewUrl) {
93-
return <NoPreviewAvailable fileUrl={filePreviewUrl} fileName={fileName} />;
107+
return <NoPreviewAvailable fileUrl={fileUrl} fileName={fileName} fileExtension={fileExtension} />;
94108
}
95109

96110
const extension = getFileExtensionFromUrl(filePreviewUrl);
@@ -104,5 +118,5 @@ const ModalContent = ({filePreviewUrl, fileName, senderName, timestamp, status}:
104118
return <ImageFileView src={filePreviewUrl} senderName={senderName} timestamp={timestamp} />;
105119
}
106120

107-
return <NoPreviewAvailable fileUrl={filePreviewUrl} fileName={fileName} />;
121+
return <NoPreviewAvailable fileUrl={fileUrl} fileName={fileName} fileExtension={fileExtension} />;
108122
};

src/script/components/FileFullscreenModal/FileHeader/FileHeader.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,17 @@ import {
3838

3939
interface FileHeaderProps {
4040
onClose: () => void;
41-
filePreviewUrl?: string;
4241
fileName: string;
4342
fileExtension: string;
4443
senderName: string;
4544
timestamp: number;
4645
badges?: string[];
46+
fileUrl?: string;
4747
}
4848

4949
export const FileHeader = ({
5050
onClose,
51-
filePreviewUrl,
51+
fileUrl,
5252
fileName,
5353
fileExtension,
5454
senderName,
@@ -82,7 +82,7 @@ export const FileHeader = ({
8282
<Button
8383
variant={ButtonVariant.TERTIARY}
8484
css={downloadButtonStyles}
85-
onClick={() => forcedDownloadFile({url: filePreviewUrl || '', name: `${fileName}.${fileExtension}`})}
85+
onClick={() => forcedDownloadFile({url: fileUrl || '', name: fileName})}
8686
aria-label={t('cells.imageFullScreenModal.downloadButton')}
8787
>
8888
<DownloadIcon />

src/script/components/FileFullscreenModal/NoPreviewAvailable/NoPreviewAvailable.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@ import {forcedDownloadFile} from 'Util/util';
2525
import {FilePlaceholder} from '../common/FilePlaceholder/FilePlaceholder';
2626

2727
interface NoPreviewAvailableProps {
28-
fileUrl?: string;
28+
fileExtension: string;
2929
fileName: string;
30+
fileUrl?: string;
3031
}
3132

32-
export const NoPreviewAvailable = ({fileUrl, fileName}: NoPreviewAvailableProps) => {
33+
export const NoPreviewAvailable = ({fileUrl, fileName, fileExtension}: NoPreviewAvailableProps) => {
3334
return (
3435
<FilePlaceholder
3536
title={t('fileFullscreenModal.noPreviewAvailable.title')}

src/script/components/MessagesList/Message/ContentMessage/asset/MultipartAssets/FileAssetCard/common/FilePreviewModal/FilePreviewModal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export const FilePreviewModal = ({
7272
<FileFullscreenModal
7373
id={id}
7474
filePreviewUrl={getFileUrl()}
75+
fileUrl={fileUrl}
7576
fileName={fileName}
7677
fileExtension={fileExtension}
7778
senderName={senderName}

0 commit comments

Comments
 (0)