From 992bc99cea39f56b400ea659308f9c99036a708d Mon Sep 17 00:00:00 2001 From: Denis Tingaikin Date: Fri, 24 Jan 2025 03:50:56 +0300 Subject: [PATCH] Apply feedback improvements: UBERF-9189 (#7778) --- packages/presentation/src/link-preview.ts | 8 +++++--- .../src/components/AttachmentPresenter.svelte | 2 +- .../src/components/AttachmentRefInput.svelte | 4 ++-- .../src/components/LinkPreviewList.svelte | 6 ++++-- .../src/components/LinkPreviewPresenter.svelte | 9 +++++---- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/packages/presentation/src/link-preview.ts b/packages/presentation/src/link-preview.ts index 580f18ae91..02c4e82e2a 100644 --- a/packages/presentation/src/link-preview.ts +++ b/packages/presentation/src/link-preview.ts @@ -33,10 +33,10 @@ export function canDisplayLinkPreview (val: LinkPreviewDetails): boolean { if (val.hostname === undefined) { return false } - if (val.image === undefined && val.description === undefined) { + if (val.image === undefined && val.description?.trim() === '') { return false } - if (val.title === undefined && val.description === undefined) { + if (val.title?.trim() === '' && val.description?.trim() === '') { return false } return true @@ -53,7 +53,9 @@ export async function fetchLinkPreviewDetails (url: string, timeoutMs = 15000): headers: { Authorization: 'Bearer ' + token }, signal: AbortSignal.timeout(timeoutMs) }) - return response.json() as LinkPreviewDetails + const res = (await response.json()) as LinkPreviewDetails + res.url = url + return res } catch { return {} } diff --git a/plugins/attachment-resources/src/components/AttachmentPresenter.svelte b/plugins/attachment-resources/src/components/AttachmentPresenter.svelte index 0b02673066..44279e5c25 100644 --- a/plugins/attachment-resources/src/components/AttachmentPresenter.svelte +++ b/plugins/attachment-resources/src/components/AttachmentPresenter.svelte @@ -115,7 +115,7 @@ {#await getJsonOrEmpty(value.file, value.name)} {:then linkPreviewDetails} -
+
{#if linkPreviewDetails.icon !== undefined && !useDefaultIcon} [] = []
{#each attachments as attachment} - + + + {/each}
diff --git a/plugins/attachment-resources/src/components/LinkPreviewPresenter.svelte b/plugins/attachment-resources/src/components/LinkPreviewPresenter.svelte index 6a24c3bee9..95ae06e402 100644 --- a/plugins/attachment-resources/src/components/LinkPreviewPresenter.svelte +++ b/plugins/attachment-resources/src/components/LinkPreviewPresenter.svelte @@ -33,7 +33,7 @@
{#if canDisplay}
-
+
{#if viewModel.icon !== undefined && !useDefaultIcon}