From 36c792f44e2388720f1fa55cc217cbfd064c914f Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Fri, 17 Feb 2023 13:57:30 +0100
Subject: [PATCH] excel import fix

---
 .../web/src/impexp/ImportExportConfigurator.svelte    |  3 ++-
 packages/web/src/plugins/PluginsProvider.svelte       |  5 -----
 plugins/dbgate-plugin-excel/src/frontend/index.js     | 11 ++---------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/packages/web/src/impexp/ImportExportConfigurator.svelte b/packages/web/src/impexp/ImportExportConfigurator.svelte
index 982253d6..daa58a33 100644
--- a/packages/web/src/impexp/ImportExportConfigurator.svelte
+++ b/packages/web/src/impexp/ImportExportConfigurator.svelte
@@ -22,7 +22,7 @@
     for (const file of getAsArray(files)) {
       const format = findFileFormat(extensions, storage);
       if (format) {
-        await (format.addFileToSourceList || addFileToSourceListDefault)(file, newSources, newValues);
+        await (format.addFileToSourceList || addFileToSourceListDefault)(file, newSources, newValues, apiCall);
       }
     }
     newValues['sourceList'] = [...(values.sourceList || []).filter(x => !newSources.includes(x)), ...newSources];
@@ -58,6 +58,7 @@
   import { showModal } from '../modals/modalTools';
   import { findFileFormat } from '../plugins/fileformats';
   import { extensions } from '../stores';
+  import { apiCall } from '../utility/api';
   import getAsArray from '../utility/getAsArray';
   import { useConnectionInfo, useDatabaseInfo } from '../utility/metadataLoaders';
   import { setUploadListener } from '../utility/uploadFiles';
diff --git a/packages/web/src/plugins/PluginsProvider.svelte b/packages/web/src/plugins/PluginsProvider.svelte
index 28580b06..42a10bce 100644
--- a/packages/web/src/plugins/PluginsProvider.svelte
+++ b/packages/web/src/plugins/PluginsProvider.svelte
@@ -1,8 +1,4 @@
 <script lang="ts" context="module">
-  const dbgateEnv = {
-    apiCall,
-  };
-
   async function loadPlugins(pluginsDict, installedPlugins) {
     window['DBGATE_TOOLS'] = dbgateTools;
 
@@ -20,7 +16,6 @@
         const module = eval(`${resp}; plugin`);
         console.log('Loaded plugin', module);
         const moduleContent = module.__esModule ? module.default : module;
-        if (moduleContent.initialize) moduleContent.initialize(dbgateEnv);
         newPlugins[installed.name] = moduleContent;
       }
     }
diff --git a/plugins/dbgate-plugin-excel/src/frontend/index.js b/plugins/dbgate-plugin-excel/src/frontend/index.js
index 16d401fb..cd6fa4f8 100644
--- a/plugins/dbgate-plugin-excel/src/frontend/index.js
+++ b/plugins/dbgate-plugin-excel/src/frontend/index.js
@@ -1,9 +1,3 @@
-let dbgateEnv;
-
-function initialize(dbgateEnv) {
-  dbgateEnv = dbgateEnv;
-}
-
 const fileFormat = {
   packageName: 'dbgate-plugin-excel',
   // file format identifier
@@ -17,8 +11,8 @@ const fileFormat = {
   // function name from backend, which contains writer factory, postfixed by package name
   writerFunc: 'writer@dbgate-plugin-excel',
 
-  addFileToSourceList: async ({ fileName }, newSources, newValues) => {
-    const resp = await dbgateEnv.apiCall('plugins/command', {
+  addFileToSourceList: async ({ fileName }, newSources, newValues, apiCall) => {
+    const resp = await apiCall('plugins/command', {
       command: 'analyse',
       packageName: 'dbgate-plugin-excel',
       args: {
@@ -85,5 +79,4 @@ export default {
       }),
     },
   ],
-  initialize,
 };