diff --git a/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx b/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx index ffc9bcb7bd6..75520609002 100644 --- a/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx +++ b/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx @@ -442,6 +442,21 @@ export const LogTable = ({ }) } + useShortcut(SHORTCUT_IDS.RESULTS_COPY_JSON, () => handleCopySelectedRows('json'), { + enabled: selectedRowsData.length > 0, + conflictBehavior: 'allow', + }) + + useShortcut(SHORTCUT_IDS.RESULTS_COPY_MARKDOWN, () => handleCopySelectedRows('markdown'), { + enabled: selectedRowsData.length > 0, + conflictBehavior: 'allow', + }) + + useShortcut(SHORTCUT_IDS.RESULTS_COPY_CSV, () => handleCopySelectedRows('csv'), { + enabled: selectedRowsData.length > 0, + conflictBehavior: 'allow', + }) + const logsExplorerTableHeader = (
diff --git a/apps/studio/components/ui/DownloadResultsButton.tsx b/apps/studio/components/ui/DownloadResultsButton.tsx index e5f2f0a89a1..e05e077fbb7 100644 --- a/apps/studio/components/ui/DownloadResultsButton.tsx +++ b/apps/studio/components/ui/DownloadResultsButton.tsx @@ -30,6 +30,7 @@ interface DownloadResultsButtonProps { align?: 'start' | 'center' | 'end' results: any[] fileName: string + enableCopyShortcuts?: boolean onDownloadAsCSV?: () => void onCopyAsMarkdown?: () => void onCopyAsJSON?: () => void @@ -43,6 +44,7 @@ export const DownloadResultsButton = ({ align = 'start', results, fileName, + enableCopyShortcuts = true, onDownloadAsCSV, onCopyAsMarkdown, onCopyAsJSON, @@ -103,15 +105,18 @@ export const DownloadResultsButton = ({ } useShortcut(SHORTCUT_IDS.RESULTS_COPY_MARKDOWN, copyAsMarkdown, { - enabled: !isEmpty, + enabled: !isEmpty && enableCopyShortcuts, + conflictBehavior: 'allow', registerInCommandMenu: true, }) useShortcut(SHORTCUT_IDS.RESULTS_COPY_JSON, copyAsJSON, { - enabled: !isEmpty, + enabled: !isEmpty && enableCopyShortcuts, + conflictBehavior: 'allow', registerInCommandMenu: true, }) useShortcut(SHORTCUT_IDS.RESULTS_COPY_CSV, copyAsCSV, { - enabled: !isEmpty, + enabled: !isEmpty && enableCopyShortcuts, + conflictBehavior: 'allow', registerInCommandMenu: true, }) useShortcut(SHORTCUT_IDS.RESULTS_DOWNLOAD_CSV, downloadAsCSV, {