quick export on web

This commit is contained in:
Jan Prochazka
2022-03-10 10:23:33 +01:00
parent c26bc6d0e9
commit ddff3d2b89
7 changed files with 15 additions and 15 deletions

View File

@@ -70,7 +70,7 @@
import { archiveFilesAsDataSheets, currentArchive, extensions, getCurrentDatabase } from '../stores';
import createQuickExportMenu from '../utility/createQuickExportMenu';
import { exportElectronFile } from '../utility/exportFileTools';
import { exportQuickExportFile } from '../utility/exportFileTools';
import openNewTab from '../utility/openNewTab';
import AppObjectCore from './AppObjectCore.svelte';
import getConnectionLabel from '../utility/getConnectionLabel';
@@ -170,7 +170,7 @@
{ text: 'Rename', onClick: handleRename },
data.fileType == 'jsonl' &&
createQuickExportMenu(fmt => async () => {
exportElectronFile(
exportQuickExportFile(
data.fileName,
{
functionName: 'archiveReader',

View File

@@ -414,7 +414,7 @@
if (menu.isQuickExport) {
return createQuickExportMenu(fmt => async () => {
const coninfo = await getConnectionInfo(data);
exportElectronFile(
exportQuickExportFile(
data.pureName,
{
functionName: menu.functionName,
@@ -620,7 +620,7 @@
import SqlGeneratorModal from '../modals/SqlGeneratorModal.svelte';
import getConnectionLabel from '../utility/getConnectionLabel';
import getElectron from '../utility/getElectron';
import { exportElectronFile } from '../utility/exportFileTools';
import { exportQuickExportFile } from '../utility/exportFileTools';
import createQuickExportMenu from '../utility/createQuickExportMenu';
import ConfirmSqlModal from '../modals/ConfirmSqlModal.svelte';
import { alterDatabaseDialog, renameDatabaseObjectDialog } from '../utility/alterDatabaseTools';

View File

@@ -122,7 +122,7 @@
import { registerMenu } from '../utility/contextMenu';
import createActivator, { getActiveComponent } from '../utility/createActivator';
import createQuickExportMenu from '../utility/createQuickExportMenu';
import { exportElectronFile } from '../utility/exportFileTools';
import { exportQuickExportFile } from '../utility/exportFileTools';
import { getConnectionInfo } from '../utility/metadataLoaders';
import openNewTab from '../utility/openNewTab';
import ChangeSetGrider from './ChangeSetGrider';
@@ -196,7 +196,7 @@
const quickExportHandler = fmt => async () => {
const coninfo = await getConnectionInfo({ conid });
exportElectronFile(
exportQuickExportFile(
pureName || 'Data',
{
functionName: 'queryReader',

View File

@@ -48,7 +48,7 @@
import { registerMenu } from '../utility/contextMenu';
import createActivator, { getActiveComponent } from '../utility/createActivator';
import createQuickExportMenu from '../utility/createQuickExportMenu';
import { exportElectronFile } from '../utility/exportFileTools';
import { exportQuickExportFile } from '../utility/exportFileTools';
import useEffect from '../utility/useEffect';
import LoadingDataGridCore from './LoadingDataGridCore.svelte';
@@ -104,7 +104,7 @@
const quickExportHandler = fmt => async () => {
const archiveMatch = jslid.match(/^archive:\/\/([^/]+)\/(.*)$/);
if (archiveMatch) {
exportElectronFile(
exportQuickExportFile(
archiveMatch[2],
{
functionName: 'archiveReader',
@@ -116,7 +116,7 @@
fmt
);
} else {
exportElectronFile(
exportQuickExportFile(
'Query',
{
functionName: 'jslDataReader',

View File

@@ -76,7 +76,7 @@
import { registerMenu } from '../utility/contextMenu';
import createActivator, { getActiveComponent } from '../utility/createActivator';
import createQuickExportMenu from '../utility/createQuickExportMenu';
import { exportElectronFile } from '../utility/exportFileTools';
import { exportQuickExportFile } from '../utility/exportFileTools';
import { getConnectionInfo } from '../utility/metadataLoaders';
import openNewTab from '../utility/openNewTab';
import ChangeSetGrider from './ChangeSetGrider';
@@ -181,7 +181,7 @@
const quickExportHandler = fmt => async () => {
const coninfo = await getConnectionInfo({ conid });
exportElectronFile(
exportQuickExportFile(
pureName || 'Data',
{
functionName: 'queryReader',

View File

@@ -4,7 +4,7 @@ import { showSnackbar, showSnackbarInfo, showSnackbarError, closeSnackbar } from
import resolveApi from './resolveApi';
import { apiCall, apiOff, apiOn } from './api';
export async function exportElectronFile(dataName, reader, format) {
export async function exportQuickExportFile(dataName, reader, format) {
const electron = getElectron();
let filePath;
@@ -17,7 +17,7 @@ export async function exportElectronFile(dataName, reader, format) {
properties: ['showOverwriteConfirmation'],
});
} else {
const resp = await apiCall('files/generate-uploads-file');
const resp = await apiCall('files/generate-uploads-file', { extension: format.extension });
filePath = resp.filePath;
pureFileName = resp.fileName;
}