Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Show a copyable link when the desktop opener fails

setalpcc8586a262ff
diff --git a/web/apps/ensu/src/components/MarkdownRenderer.tsx b/web/apps/ensu/src/components/MarkdownRenderer.tsx
index 337605b28c..8627ca073d 100644
--- a/web/apps/ensu/src/components/MarkdownRenderer.tsx
+++ b/web/apps/ensu/src/components/MarkdownRenderer.tsx
@@ -5,6 +5,7 @@ import {
import { Copy01Icon } from "@hugeicons/core-free-icons";
import { HugeiconsIcon } from "@hugeicons/react";
import { Box, IconButton } from "@mui/material";
+import { useBaseContext } from "ente-base/context";
import React, { useState } from "react";
import ReactMarkdown from "react-markdown";
import rehypeKatex from "rehype-katex";
@@ -99,6 +100,7 @@ const ExternalLink = ({
children,
...rest
}: AnchorProps) => {
+ const { showMiniDialog } = useBaseContext();
const safeHref = safeExternalUrl(href);
if (!safeHref) return <>{children}</>;
@@ -108,7 +110,7 @@ const ExternalLink = ({
href={safeHref}
target="_blank"
rel="noopener noreferrer"
- onClick={handleExternalLinkClick}
+ onClick={(event) => handleExternalLinkClick(event, showMiniDialog)}
>
{children}
</a>
diff --git a/web/apps/ensu/src/components/chat/ChatMessageList.tsx b/web/apps/ensu/src/components/chat/ChatMessageList.tsx
index 43fd1a8cbd..35e1ffcd48 100644
--- a/web/apps/ensu/src/components/chat/ChatMessageList.tsx
+++ b/web/apps/ensu/src/components/chat/ChatMessageList.tsx
@@ -34,6 +34,7 @@ import {
} from "@mui/material";
import type { SxProps, Theme } from "@mui/material/styles";
import type { SystemStyleObject } from "@mui/system";
+import { useBaseContext } from "ente-base/context";
import React, { memo, useCallback, useEffect, useMemo, useState } from "react";
interface DocumentAttachment {
@@ -225,6 +226,7 @@ type LocalNoteSource = Extract<MessageSource, { type: "localNote" }>;
const PackSourceCard = memo(
({ source, number }: { source: PackSource; number: number }) => {
+ const { showMiniDialog } = useBaseContext();
const { citation } = source;
return (
<Stack
@@ -250,7 +252,9 @@ const PackSourceCard = memo(
target="_blank"
rel="noopener noreferrer"
underline="hover"
- onClick={handleExternalLinkClick}
+ onClick={(event) =>
+ handleExternalLinkClick(event, showMiniDialog)
+ }
sx={sourceLinkSx}
>
Open source β†—
@@ -260,7 +264,9 @@ const PackSourceCard = memo(
target="_blank"
rel="noopener noreferrer"
underline="hover"
- onClick={handleExternalLinkClick}
+ onClick={(event) =>
+ handleExternalLinkClick(event, showMiniDialog)
+ }
sx={sourceLinkSx}
>
{citation.licenseLabel} β†—
diff --git a/web/apps/ensu/src/services/external-links.ts b/web/apps/ensu/src/services/external-links.ts
index 90c3c2301f..c38441fe2e 100644
--- a/web/apps/ensu/src/services/external-links.ts
+++ b/web/apps/ensu/src/services/external-links.ts
@@ -1,4 +1,5 @@
import { isTauriRuntime } from "@/services/tauri-runtime";
+import type { MiniDialogAttributes } from "ente-base/components/MiniDialog";
import type { MouseEvent } from "react";
export const safeExternalUrl = (href: string | undefined) => {
@@ -15,6 +16,7 @@ export const safeExternalUrl = (href: string | undefined) => {
export const handleExternalLinkClick = (
event: MouseEvent<HTMLAnchorElement>,
+ showMiniDialog: (attributes: MiniDialogAttributes) => void,
) => {
if (!isTauriRuntime() || event.button !== 0) return;
const href = safeExternalUrl(event.currentTarget.href);
@@ -22,5 +24,15 @@ export const handleExternalLinkClick = (
event.preventDefault();
void import("@tauri-apps/plugin-opener")
.then(({ openUrl }) => openUrl(href))
- .catch(() => window.open(href, "_blank", "noopener,noreferrer"));
+ .catch(() =>
+ showMiniDialog({
+ title: "Unable to open link",
+ message: href,
+ continue: {
+ text: "Copy link",
+ action: () => navigator.clipboard.writeText(href),
+ },
+ cancel: "Close",
+ }),
+ );
};