Skip to content

Commit 3c5cd56

Browse files
ryanschuhlerbrianchandotcom
authored andcommitted
LRSD-11337 Fix download url loading
1 parent be4ba48 commit 3c5cd56

File tree

1 file changed

+10
-4
lines changed
  • workspaces/liferay-customer-workspace/client-extensions/liferay-customer-custom-element/src/features/attachments/pages/routes/Outlets

1 file changed

+10
-4
lines changed

workspaces/liferay-customer-workspace/client-extensions/liferay-customer-custom-element/src/features/attachments/pages/routes/Outlets/AttachmentDownloaderOutlet.tsx

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,16 @@ const renderErrorComponent = (errorCode: string | null) => {
3232
};
3333

3434
const AttachmentDownloaderOutlet = () => {
35-
const {ticketAttachmentERC, ticketAttachmentId} = useParams();
36-
const {errorCode, hasAccess, loading} = useCheckAttachmentAccess();
37-
const [downloadUrl, setDownloadUrl] = useState<string | null>(null);
3835
const [downloadError, setDownloadError] = useState<string | null>(null);
36+
const [downloadUrl, setDownloadUrl] = useState<string | null>(null);
37+
const [downloadUrlLoading, setDownloadUrlLoading] = useState(false);
38+
const {errorCode, hasAccess, loading} = useCheckAttachmentAccess();
39+
const {ticketAttachmentERC, ticketAttachmentId} = useParams();
3940

4041
useEffect(() => {
4142
const fetchDownloadURL = async () => {
43+
setDownloadUrlLoading(true);
44+
4245
try {
4346
const endpoint = ticketAttachmentId
4447
? `/ticket-attachments/by-id/${ticketAttachmentId}/download`
@@ -63,14 +66,17 @@ const AttachmentDownloaderOutlet = () => {
6366
i18n.translate('error-downloading-attachment')
6467
);
6568
}
69+
finally {
70+
setDownloadUrlLoading(false);
71+
}
6672
};
6773

6874
if (hasAccess && (ticketAttachmentERC || ticketAttachmentId)) {
6975
fetchDownloadURL();
7076
}
7177
}, [hasAccess, ticketAttachmentERC, ticketAttachmentId]);
7278

73-
if (loading) {
79+
if (loading || downloadUrlLoading) {
7480
return (
7581
<div className="mx-auto">
7682
<ClayLoadingIndicator size="sm" />

0 commit comments

Comments
 (0)