From 7549d37a045bc07155d34a6b3c807612f93a388c Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Thu, 26 Sep 2024 12:39:29 +0200 Subject: [PATCH] better column mapping --- packages/web/src/impexp/ImportExportConfigurator.svelte | 6 ++++-- packages/web/src/modals/ColumnMapModal.svelte | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/web/src/impexp/ImportExportConfigurator.svelte b/packages/web/src/impexp/ImportExportConfigurator.svelte index c97667240..e994aa056 100644 --- a/packages/web/src/impexp/ImportExportConfigurator.svelte +++ b/packages/web/src/impexp/ImportExportConfigurator.svelte @@ -221,8 +221,10 @@ onClick={() => { showModal(ColumnMapModal, { initialValue: $values[`columns_${row}`], - sourceTableInfo: $sourceDbinfo?.tables?.find(x => x.pureName == row), - targetTableInfo: $targetDbinfo?.tables?.find(x => x.pureName == values[`targetName_${row}`] || row), + sourceTableInfo: $sourceDbinfo?.tables?.find(x => x.pureName?.toLowerCase() == row?.toLowerCase()), + targetTableInfo: $targetDbinfo?.tables?.find( + x => x.pureName?.toLowerCase() == (values[`targetName_${row}`] || row)?.toLowerCase() + ), onConfirm: value => setFieldValue(`columns_${row}`, value), }); }} diff --git a/packages/web/src/modals/ColumnMapModal.svelte b/packages/web/src/modals/ColumnMapModal.svelte index 67178fe0c..9f0946675 100644 --- a/packages/web/src/modals/ColumnMapModal.svelte +++ b/packages/web/src/modals/ColumnMapModal.svelte @@ -27,6 +27,13 @@ skip: false, })); } + if (targetTableInfo && !sourceTableInfo) { + return targetTableInfo.columns.map(x => ({ + src: x.columnName, + dst: x.columnName, + skip: false, + })); + } return []; }