From db6d5f498b5688a1bb8f41658da92a6b4bf3e337 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Tue, 27 Aug 2024 11:20:43 +0200 Subject: [PATCH] readonly connection fixes --- packages/web/src/datagrid/DataGridCell.svelte | 3 ++- packages/web/src/datagrid/DataGridRow.svelte | 1 + packages/web/src/datagrid/TableDataGrid.svelte | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/web/src/datagrid/DataGridCell.svelte b/packages/web/src/datagrid/DataGridCell.svelte index 53a7ebeb1..657d9f39b 100644 --- a/packages/web/src/datagrid/DataGridCell.svelte +++ b/packages/web/src/datagrid/DataGridCell.svelte @@ -32,6 +32,7 @@ export let onDictionaryLookup = null; export let onSetValue; export let editorTypes = null; + export let isReadonly; $: value = col.isStructured ? _.get(rowData || {}, col.uniquePath) : (rowData || {})[col.uniqueName]; @@ -102,7 +103,7 @@ {/if} {:else if col.foreignKey && rowData && rowData[col.uniqueName] && !isCurrentCell} onSetFormView(rowData, col)} /> - {:else if col.foreignKey && isCurrentCell && onDictionaryLookup} + {:else if col.foreignKey && isCurrentCell && onDictionaryLookup && !isReadonly} {:else if isJson} openJsonDocument(value, undefined, true)} /> diff --git a/packages/web/src/datagrid/DataGridRow.svelte b/packages/web/src/datagrid/DataGridRow.svelte index d7acaaf1e..4f23811ce 100644 --- a/packages/web/src/datagrid/DataGridRow.svelte +++ b/packages/web/src/datagrid/DataGridRow.svelte @@ -95,6 +95,7 @@ grider.editable} onDictionaryLookup={() => handleLookup(col)} onSetValue={value => grider.setCellValue(rowIndex, col.uniqueName, value)} + isReadonly={!grider.editable} /> {/if} {/each} diff --git a/packages/web/src/datagrid/TableDataGrid.svelte b/packages/web/src/datagrid/TableDataGrid.svelte index 9777ecda5..35394b610 100644 --- a/packages/web/src/datagrid/TableDataGrid.svelte +++ b/packages/web/src/datagrid/TableDataGrid.svelte @@ -158,7 +158,7 @@ formViewComponent={SqlFormView} {display} showReferences - showMacros + showMacros={!$connection?.isReadOnly} hasMultiColumnFilter onRunMacro={handleRunMacro} macroCondition={macro => macro.type == 'transformValue'}