dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-02 07:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

import download fixes

Browse Source
This commit is contained in:
Jan Prochazka
2020-11-29 21:43:31 +01:00
parent 5aff88630a
commit 3e1e6f7164
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,11 +109,12 @@ function getFileFilters(extensions, storageType) {
return res; return res;
} }
async function addFileToSourceListDefault({ fileName, shortName }, newSources, newValues) { async function addFileToSourceListDefault({ fileName, shortName, isDownload }, newSources, newValues) {
const sourceName = shortName; const sourceName = shortName;
newSources.push(sourceName); newSources.push(sourceName);
newValues[`sourceFile_${sourceName}`] = { newValues[`sourceFile_${sourceName}`] = {
fileName, fileName,
isDownload,
}; };
} }
@@ -385,7 +386,7 @@ function SourceName({ name }) {
); );
}; };
const doChangeUrl = (url) => { const doChangeUrl = (url) => {
setFieldValue(`sourceFile_${name}`, { fileName: url }); setFieldValue(`sourceFile_${name}`, { fileName: url, isDownload: true });
}; };
const handleChangeUrl = () => { const handleChangeUrl = () => {
showModal((modalState) => ( showModal((modalState) => (
@@ -455,6 +456,8 @@ export default function ImportExportConfigurator({ uploadedFile = undefined, onC
}, []); }, []);
const supportsPreview = !!findFileFormat(extensions, values.sourceStorageType); const supportsPreview = !!findFileFormat(extensions, values.sourceStorageType);
const previewFileName =
previewSource && values[`sourceFile_${previewSource}`] && values[`sourceFile_${previewSource}`].fileName;
const handleChangePreviewSource = async () => { const handleChangePreviewSource = async () => {
if (previewSource && supportsPreview) { if (previewSource && supportsPreview) {
@@ -467,7 +470,7 @@ export default function ImportExportConfigurator({ uploadedFile = undefined, onC
React.useEffect(() => { React.useEffect(() => {
handleChangePreviewSource(); handleChangePreviewSource();
}, [previewSource, supportsPreview]); }, [previewSource, supportsPreview, previewFileName]);
const oldValues = React.useRef({}); const oldValues = React.useRef({});
React.useEffect(() => { React.useEffect(() => {

2
packages/web/src/impexp/createImpExpScript.js
View File

@@ -68,7 +68,7 @@ function getSourceExpr(extensions, sourceName, values, sourceConnection, sourceD
return [ return [
format.readerFunc, format.readerFunc,
{ {
...sourceFile, ..._.omit(sourceFile, ['isDownload']),
...extractApiParameters(values, 'source', format), ...extractApiParameters(values, 'source', format),
}, },
]; ];