dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-18 12:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Jan Prochazka
2020-11-14 18:03:54 +01:00
parent b1ce2f7b90
commit 844ebf129a
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/web/src/impexp/ImportExportConfigurator.js
View File

@@ -86,9 +86,9 @@ function getFileFilters(storageType) {
return res;
}
async function addFilesToSourceList(files, values, setFieldValue) {
async function addFilesToSourceList(files, values, setFieldValue, preferedStorageType) {
const newSources = [];
const storage = values.sourceStorageType;
const storage = preferedStorageType || values.sourceStorageType;
for (const file of getAsArray(files)) {
if (isFileStorage(storage)) {
if (storage == 'excel') {
@@ -113,6 +113,9 @@ async function addFilesToSourceList(files, values, setFieldValue) {
}
}
setFieldValue('sourceList', [...(values.sourceList || []).filter((x) => !newSources.includes(x)), ...newSources]);
if (preferedStorageType && preferedStorageType != values.sourceStorageType) {
setFieldValue('sourceStorageType', preferedStorageType);
}
}
function ElectronFilesInput() {
@@ -311,7 +314,7 @@ export default function ImportExportConfigurator({ uploadedFile = undefined }) {
const sourceConnectionInfo = useConnectionInfo({ conid: values.sourceConnectionId });
const { engine: sourceEngine } = sourceConnectionInfo || {};
const { sourceList } = values;
const { uploadListener, setUploadListener } = useUploadsProvider();
const { setUploadListener } = useUploadsProvider();
const theme = useTheme();
const handleUpload = React.useCallback(
@@ -324,11 +327,12 @@ export default function ImportExportConfigurator({ uploadedFile = undefined }) {
},
],
values,
setFieldValue
setFieldValue,
!sourceList || sourceList.length == 0 ? file.storageType : null
);
// setFieldValue('sourceList', [...(sourceList || []), file.originalName]);
},
[setFieldValue, sourceList]
[setFieldValue, sourceList, values]
);
React.useEffect(() => {