complete removed axiosInstance

packages/web/src/App.svelte

@@ -9,7 +9,6 @@
   import Screen from './Screen.svelte';
   import { loadingPluginStore, subscribeApiDependendStores } from './stores';
   import { setAppLoaded } from './utility/appLoadManager';
-  import axiosInstance from './utility/axiosInstance';
   import ErrorHandler from './utility/ErrorHandler.svelte';
   import OpenTabsOnStartup from './utility/OpenTabsOnStartup.svelte';
   import { shouldWaitForElectronInitialize } from './utility/getElectron';

packages/web/src/appobj/ArchiveFileAppObject.svelte

@@ -69,7 +69,6 @@
 
   import { archiveFilesAsDataSheets, currentArchive, extensions, getCurrentDatabase } from '../stores';
 
-  import axiosInstance from '../utility/axiosInstance';
   import createQuickExportMenu from '../utility/createQuickExportMenu';
   import { exportElectronFile } from '../utility/exportElectronFile';
   import openNewTab from '../utility/openNewTab';

packages/web/src/appobj/ArchiveFolderAppObject.svelte

@@ -9,7 +9,6 @@
 
   import { currentArchive, currentDatabase } from '../stores';
 
-  import axiosInstance from '../utility/axiosInstance';
   import openNewTab from '../utility/openNewTab';
   import AppObjectCore from './AppObjectCore.svelte';
   import newQuery from '../query/newQuery';
@@ -17,7 +16,7 @@
   import ConfirmModal from '../modals/ConfirmModal.svelte';
   import InputTextModal from '../modals/InputTextModal.svelte';
   import ErrorMessageModal from '../modals/ErrorMessageModal.svelte';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
 
   export let data;
 

packages/web/src/appobj/ConnectionAppObject.svelte

@@ -17,7 +17,6 @@
   import _ from 'lodash';
   import AppObjectCore from './AppObjectCore.svelte';
   import { currentDatabase, extensions, getCurrentConfig, getOpenedConnections, openedConnections } from '../stores';
-  import axiosInstance from '../utility/axiosInstance';
   import { filterName } from 'dbgate-tools';
   import { showModal } from '../modals/modalTools';
   import ConnectionModal from '../modals/ConnectionModal.svelte';

packages/web/src/appobj/DatabaseAppObject.svelte

@@ -171,7 +171,6 @@
     pinnedDatabases,
     selectedWidget,
   } from '../stores';
-  import axiosInstance from '../utility/axiosInstance';
   import getElectron from '../utility/getElectron';
   import openNewTab from '../utility/openNewTab';
   import AppObjectCore from './AppObjectCore.svelte';

packages/web/src/appobj/DatabaseObjectAppObject.svelte

@@ -408,7 +408,6 @@
   import { exportElectronFile } from '../utility/exportElectronFile';
   import createQuickExportMenu from '../utility/createQuickExportMenu';
   import ConfirmSqlModal from '../modals/ConfirmSqlModal.svelte';
-  import axiosInstance from '../utility/axiosInstance';
   import { alterDatabaseDialog, renameDatabaseObjectDialog } from '../utility/alterDatabaseTools';
   import ConfirmModal from '../modals/ConfirmModal.svelte';
   import { apiCall } from '../utility/api';

packages/web/src/appobj/FavoriteFileAppObject.svelte

@@ -30,7 +30,6 @@
 </script>
 
 <script lang="ts">
-  import axiosInstance from '../utility/axiosInstance';
   import openNewTab from '../utility/openNewTab';
   import { copyTextToClipboard } from '../utility/clipboard';
   import { showModal } from '../modals/modalTools';

packages/web/src/appobj/SavedFileAppObject.svelte

@@ -76,7 +76,6 @@
   import { currentDatabase } from '../stores';
 import { apiCall } from '../utility/api';
 
-  import axiosInstance from '../utility/axiosInstance';
   import getConnectionLabel from '../utility/getConnectionLabel';
   import hasPermission from '../utility/hasPermission';
   import openNewTab from '../utility/openNewTab';

packages/web/src/charts/ChartCore.svelte

@@ -20,8 +20,7 @@
 <script lang="ts">
   import { onMount, afterUpdate, onDestroy } from 'svelte';
   import registerCommand from '../commands/registerCommand';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
-  import axiosInstance from '../utility/axiosInstance';
 
   import contextMenu, { getContextMenu, registerMenu } from '../utility/contextMenu';
   import createActivator, { getActiveComponent } from '../utility/createActivator';

packages/web/src/charts/chartDataLoader.ts

@@ -1,6 +1,5 @@
 import { dumpSqlSelect, Select } from 'dbgate-sqltree';
 import { EngineDriver } from 'dbgate-types';
-import axiosInstance from '../utility/axiosInstance';
 import _ from 'lodash';
 import { apiCall } from '../utility/api';
 

packages/web/src/commands/changeDatabaseStatusCommand.ts

@@ -2,7 +2,6 @@ import _ from 'lodash';
 import { currentDatabase, getCurrentDatabase } from '../stores';
 import getElectron from '../utility/getElectron';
 import registerCommand from './registerCommand';
-import axiosInstance from '../utility/axiosInstance';
 import { apiCall } from '../utility/api';
 
 registerCommand({

packages/web/src/commands/stdCommands.ts

@@ -18,7 +18,6 @@ import { getCurrentConfig, getCurrentDatabase } from '../stores';
 import './recentDatabaseSwitch';
 import './changeDatabaseStatusCommand';
 import hasPermission from '../utility/hasPermission';
-import axiosInstance from '../utility/axiosInstance';
 import _ from 'lodash';
 import { findEngineDriver } from 'dbgate-tools';
 import { openArchiveFolder } from '../utility/openArchiveFolder';

packages/web/src/datagrid/CollectionDataGridCore.svelte

@@ -117,7 +117,6 @@
   import { extensions } from '../stores';
   import { apiCall } from '../utility/api';
 
-  import axiosInstance from '../utility/axiosInstance';
   import { registerMenu } from '../utility/contextMenu';
   import createActivator, { getActiveComponent } from '../utility/createActivator';
   import createQuickExportMenu from '../utility/createQuickExportMenu';

packages/web/src/datagrid/DataGridCore.svelte

@@ -262,7 +262,6 @@
   import createReducer from '../utility/createReducer';
   import keycodes from '../utility/keycodes';
   import { copyRowsFormat, selectedCellsCallback } from '../stores';
-  import axiosInstance from '../utility/axiosInstance';
   import {
     copyRowsFormatDefs,
     copyRowsToClipboard,

packages/web/src/datagrid/JslDataGrid.svelte

@@ -1,10 +1,10 @@
 <script lang="ts">
   import { createGridCache, createGridConfig, JslGridDisplay } from 'dbgate-datalib';
   import { writable } from 'svelte/store';
+  import { useApiCall } from '../utility/api';
   import socket from '../utility/socket';
   import useEffect from '../utility/useEffect';
 
-  import useFetch from '../utility/useFetch';
   import DataGrid from './DataGrid.svelte';
   import JslDataGridCore from './JslDataGridCore.svelte';
 
@@ -12,11 +12,7 @@
 
   let loadedRows;
 
-  $: info = useFetch({
+  $: info = useApiCall('jsldata/get-info', { jslid }, {});
-    params: { jslid },
-    url: 'jsldata/get-info',
-    defaultValue: {},
-  });
 
   // $: columns = ($info && $info.columns) || [];
   const config = writable(createGridConfig());

packages/web/src/datagrid/JslDataGridCore.svelte

@@ -43,7 +43,6 @@
   import { extensions } from '../stores';
   import { apiCall } from '../utility/api';
 
-  import axiosInstance from '../utility/axiosInstance';
   import { registerMenu } from '../utility/contextMenu';
   import createActivator, { getActiveComponent } from '../utility/createActivator';
   import createQuickExportMenu from '../utility/createQuickExportMenu';

packages/web/src/datagrid/SqlDataGridCore.svelte

@@ -71,7 +71,6 @@
   import { extensions } from '../stores';
   import { apiCall } from '../utility/api';
 
-  import axiosInstance from '../utility/axiosInstance';
   import { registerMenu } from '../utility/contextMenu';
   import createActivator, { getActiveComponent } from '../utility/createActivator';
   import createQuickExportMenu from '../utility/createQuickExportMenu';

packages/web/src/forms/FormArchiveFolderSelect.svelte

@@ -2,8 +2,7 @@
   import InputTextModal from '../modals/InputTextModal.svelte';
 
   import { showModal } from '../modals/modalTools';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
-  import axiosInstance from '../utility/axiosInstance';
 
   import { useArchiveFolders } from '../utility/metadataLoaders';
   import { getFormContext } from './FormProviderCore.svelte';

packages/web/src/formview/FormView.svelte

@@ -174,9 +174,8 @@
   import FontIcon from '../icons/FontIcon.svelte';
   import DictionaryLookupModal from '../modals/DictionaryLookupModal.svelte';
   import { showModal } from '../modals/modalTools';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
 
-  import axiosInstance from '../utility/axiosInstance';
   import { copyTextToClipboard, extractRowCopiedValue } from '../utility/clipboard';
   import contextMenu, { getContextMenu, registerMenu } from '../utility/contextMenu';
   import createActivator, { getActiveComponent } from '../utility/createActivator';

packages/web/src/formview/SqlFormView.svelte

@@ -1,6 +1,4 @@
 <script lang="ts" context="module">
-  import { apiCall } from '../utility/api';
-
   async function loadRow(props, sql) {
     const { conid, database } = props;
 
@@ -18,9 +16,9 @@
 </script>
 
 <script lang="ts">
-  import axiosInstance from '../utility/axiosInstance';
   import ChangeSetFormer from './ChangeSetFormer';
   import FormView from './FormView.svelte';
+  import { apiCall } from '../utility/api';
 
   export let formDisplay;
   export let changeSetState;

packages/web/src/freetable/FreeTableGridCore.svelte

@@ -20,8 +20,7 @@
   import DataGridCore from '../datagrid/DataGridCore.svelte';
   import ImportExportModal from '../modals/ImportExportModal.svelte';
   import { showModal } from '../modals/modalTools';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
-  import axiosInstance from '../utility/axiosInstance';
   import { registerMenu } from '../utility/contextMenu';
   import createActivator, { getActiveComponent } from '../utility/createActivator';
   import FreeTableGrider from './FreeTableGrider';

packages/web/src/impexp/PreviewDataGrid.svelte

@@ -7,7 +7,6 @@
   import ErrorInfo from '../elements/ErrorInfo.svelte';
   import LoadingInfo from '../elements/LoadingInfo.svelte';
   import { apiCall } from '../utility/api';
-  import axiosInstance from '../utility/axiosInstance';
 
   export let reader;
 

packages/web/src/modals/ChooseConnectionColorModal.svelte

@@ -1,7 +1,6 @@
 <script lang="ts">
   import ColorSelector from '../forms/ColorSelector.svelte';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
-  import axiosInstance from '../utility/axiosInstance';
   import { useConnectionColor } from '../utility/useConnectionColor';
   import ModalBase from './ModalBase.svelte';
 

packages/web/src/modals/CommandModal.svelte

@@ -11,8 +11,7 @@
   import FormTextField from '../forms/FormTextField.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
   import { commandsSettings } from '../stores';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
-  import axiosInstance from '../utility/axiosInstance';
   import KeyboardModal from './KeyboardModal.svelte';
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal, showModal } from './modalTools';

packages/web/src/modals/ConnectionModal.svelte

@@ -4,7 +4,6 @@
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
-  import axiosInstance from '../utility/axiosInstance';
   import TabControl from '../elements/TabControl.svelte';
   import ConnectionModalDriverFields from './ConnectionModalDriverFields.svelte';
   import ConnectionModalSshTunnelFields from './ConnectionModalSshTunnelFields.svelte';

packages/web/src/modals/DictionaryLookupModal.svelte

@@ -6,7 +6,6 @@
   import { closeCurrentModal, showModal } from './modalTools';
   import DefineDictionaryDescriptionModal from './DefineDictionaryDescriptionModal.svelte';
   import ScrollableTableControl from '../elements/ScrollableTableControl.svelte';
-  import axiosInstance from '../utility/axiosInstance';
   import { getTableInfo } from '../utility/metadataLoaders';
   import { getDictionaryDescription } from '../utility/dictionaryDescriptionTools';
   import { onMount } from 'svelte';

packages/web/src/modals/FavoriteModal.svelte

@@ -5,7 +5,6 @@
   import hasPermission from '../utility/hasPermission';
   import localforage from 'localforage';
   import ModalBase from './ModalBase.svelte';
-  import axiosInstance from '../utility/axiosInstance';
   import uuidv1 from 'uuid/v1';
   import { closeCurrentModal } from './modalTools';
   import { copyTextToClipboard } from '../utility/clipboard';

packages/web/src/modals/ImportExportModal.svelte

@@ -16,8 +16,7 @@
   import RunnerOutputFiles from '../query/RunnerOutputFiles.svelte';
   import SocketMessageView from '../query/SocketMessageView.svelte';
   import { currentArchive, currentDatabase, extensions, selectedWidget } from '../stores';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
-  import axiosInstance from '../utility/axiosInstance';
   import createRef from '../utility/createRef';
   import openNewTab from '../utility/openNewTab';
   import socket from '../utility/socket';

packages/web/src/modals/SaveFileModal.svelte

@@ -4,9 +4,8 @@
   import FormProvider from '../forms/FormProvider.svelte';
   import FormSubmit from '../forms/FormSubmit.svelte';
   import FormTextField from '../forms/FormTextField.svelte';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
 
-  import axiosInstance from '../utility/axiosInstance';
   import getElectron from '../utility/getElectron';
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal } from './modalTools';

packages/web/src/modals/SqlGeneratorModal.svelte

@@ -18,7 +18,6 @@
 
   import FontIcon from '../icons/FontIcon.svelte';
   import SqlEditor from '../query/SqlEditor.svelte';
-  import axiosInstance from '../utility/axiosInstance';
   import createRef from '../utility/createRef';
   import { useDatabaseInfo } from '../utility/metadataLoaders';
   import WidgetColumnBar from '../widgets/WidgetColumnBar.svelte';
@@ -32,7 +31,7 @@
   import ErrorInfo from '../elements/ErrorInfo.svelte';
   import LoadingInfo from '../elements/LoadingInfo.svelte';
   import { getObjectTypeFieldLabel } from '../utility/common';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
 
   export let conid;
   export let database;
@@ -128,7 +127,6 @@ import { apiCall } from '../utility/api';
     );
     closeCurrentModal();
   }
-
 </script>
 
 <FormProviderCore values={valuesStore} template={FormFieldTemplateTiny}>
@@ -258,5 +256,4 @@ import { apiCall } from '../utility/api';
   .dbname {
     color: var(--theme-font-3);
   }
-
 </style>

packages/web/src/modals/ValueLookupModal.svelte

@@ -6,7 +6,6 @@
   import { closeCurrentModal, showModal } from './modalTools';
   import DefineDictionaryDescriptionModal from './DefineDictionaryDescriptionModal.svelte';
   import ScrollableTableControl from '../elements/ScrollableTableControl.svelte';
-  import axiosInstance from '../utility/axiosInstance';
   import { getDictionaryDescription } from '../utility/dictionaryDescriptionTools';
   import { onMount } from 'svelte';
   import { dumpSqlSelect } from 'dbgate-sqltree';

packages/web/src/plugins/AvailablePluginsList.svelte

@@ -3,20 +3,14 @@
 
   import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
-  import useFetch from '../utility/useFetch';
+  import { useApiCall } from '../utility/api';
   import WidgetsInnerContainer from '../widgets/WidgetsInnerContainer.svelte';
   import PluginsList from './PluginsList.svelte';
 
   let filter = '';
   let search = '';
 
-  $: plugins = useFetch({
+  $: plugins = useApiCall('plugins/search', { filter: search }, []);
-    url: 'plugins/search',
-    params: {
-      filter: search,
-    },
-    defaultValue: [],
-  });
 
   const setDebouncedFilter = _.debounce(value => (search = value), 500);
 

packages/web/src/plugins/PluginsProvider.svelte

@@ -1,6 +1,6 @@
 <script lang="ts" context="module">
   const dbgateEnv = {
-    axios: axiosInstance,
+    apiCall,
   };
 
   async function loadPlugins(pluginsDict, installedPlugins) {
@@ -56,7 +56,6 @@
 <script lang="ts">
   import _ from 'lodash';
   import { extensions, loadingPluginStore } from '../stores';
-  import axiosInstance from '../utility/axiosInstance';
   import { useInstalledPlugins } from '../utility/metadataLoaders';
   import { buildFileFormats, buildQuickExports } from './fileformats';
   import { buildThemes } from './themes';

packages/web/src/query/RunnerOutputFiles.svelte

@@ -2,7 +2,6 @@
   import ErrorInfo from '../elements/ErrorInfo.svelte';
   import TableControl from '../elements/TableControl.svelte';
 
-  import axiosInstance from '../utility/axiosInstance';
   import formatFileSize from '../utility/formatFileSize';
   import getElectron from '../utility/getElectron';
   import resolveApi from '../utility/resolveApi';

packages/web/src/settings/SettingsModal.svelte

@@ -14,7 +14,6 @@
   import { closeCurrentModal } from '../modals/modalTools';
   import { getCurrentSettings, getVisibleToolbar, getZoomKoef, visibleToolbar, zoomKoef } from '../stores';
   import { apiCall } from '../utility/api';
-  import axiosInstance from '../utility/axiosInstance';
 
   function handleOk(e) {
     apiCall(

packages/web/src/tabs/ChangelogTab.svelte

@@ -6,9 +6,7 @@
   import { onMount } from 'svelte';
   import LoadingInfo from '../elements/LoadingInfo.svelte';
   import Markdown from '../elements/Markdown.svelte';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
-
-  import axiosInstance from '../utility/axiosInstance';
 
   let isLoading = false;
   let text = null;

packages/web/src/tabs/ChartTab.svelte

@@ -26,7 +26,6 @@
   import LoadingInfo from '../elements/LoadingInfo.svelte';
 
   import useEditorData from '../query/useEditorData';
-  import axiosInstance from '../utility/axiosInstance';
   import { getContextMenu, registerMenu } from '../utility/contextMenu';
   import createActivator, { getActiveComponent } from '../utility/createActivator';
   import createUndoReducer from '../utility/createUndoReducer';

packages/web/src/tabs/CollectionDataTab.svelte

@@ -40,7 +40,6 @@
   import { extensions } from '../stores';
   import CollectionJsonView from '../jsonview/CollectionJsonView.svelte';
   import createActivator, { getActiveComponent } from '../utility/createActivator';
-  import axiosInstance from '../utility/axiosInstance';
   import { showModal } from '../modals/modalTools';
   import ErrorMessageModal from '../modals/ErrorMessageModal.svelte';
   import ConfirmNoSqlModal from '../modals/ConfirmNoSqlModal.svelte';

packages/web/src/tabs/CompareModelTab.svelte

@@ -155,7 +155,6 @@
   import useEditorData from '../query/useEditorData';
   import { extensions } from '../stores';
   import { apiCall } from '../utility/api';
-  import axiosInstance from '../utility/axiosInstance';
   import { changeTab } from '../utility/common';
   import contextMenu, { getContextMenu, registerMenu } from '../utility/contextMenu';
   import createActivator, { getActiveComponent } from '../utility/createActivator';

packages/web/src/tabs/FavoriteEditorTab.svelte

@@ -38,12 +38,11 @@
   import AceEditor from '../query/AceEditor.svelte';
   import useEditorData from '../query/useEditorData';
   import invalidateCommands from '../commands/invalidateCommands';
-  import axiosInstance from '../utility/axiosInstance';
   import { showModal } from '../modals/modalTools';
   import ErrorMessageModal from '../modals/ErrorMessageModal.svelte';
   import { openFavorite } from '../appobj/FavoriteFileAppObject.svelte';
   import createActivator, { getActiveComponent } from '../utility/createActivator';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
 
   export let tabid;
   export let savedFile;

packages/web/src/tabs/FreeTableTab.svelte

@@ -43,7 +43,6 @@
   import useEditorData from '../query/useEditorData';
   import { apiCall } from '../utility/api';
   import { markArchiveFileAsDataSheet } from '../utility/archiveTools';
-  import axiosInstance from '../utility/axiosInstance';
   import { changeTab } from '../utility/common';
   import { registerMenu } from '../utility/contextMenu';
   import createActivator, { getActiveComponent } from '../utility/createActivator';

packages/web/src/tabs/MarkdownViewTab.svelte

@@ -8,8 +8,6 @@
   import Markdown from '../elements/Markdown.svelte';
   import { apiCall } from '../utility/api';
 
-  import axiosInstance from '../utility/axiosInstance';
-
   export let savedFile;
 
   let isLoading = false;

packages/web/src/tabs/PluginTab.svelte

@@ -7,22 +7,16 @@
   import FormStyledButton from '../elements/FormStyledButton.svelte';
   import Markdown from '../elements/Markdown.svelte';
   import { extractPluginAuthor, extractPluginIcon } from '../plugins/manifestExtractors';
-import { apiCall } from '../utility/api';
+  import { apiCall, useApiCall } from '../utility/api';
 
-  import axiosInstance from '../utility/axiosInstance';
   import hasPermission from '../utility/hasPermission';
 
   import { useInstalledPlugins } from '../utility/metadataLoaders';
-  import useFetch from '../utility/useFetch';
 
   export let packageName;
 
   $: installed = useInstalledPlugins();
-  $: info = useFetch({
+  $: info = useApiCall('plugins/info', { packageName }, null);
-    params: { packageName },
-    url: 'plugins/info',
-    defaultValue: null,
-  });
   $: readme = $info?.readme;
   $: manifest = $info?.manifest;
   $: isPackaged = $info?.isPackaged;

packages/web/src/tabs/QueryDesignTab.svelte

@@ -21,7 +21,6 @@
   import SqlEditor from '../query/SqlEditor.svelte';
   import useEditorData from '../query/useEditorData';
   import { extensions } from '../stores';
-  import axiosInstance from '../utility/axiosInstance';
   import { changeTab } from '../utility/common';
   import { useConnectionInfo } from '../utility/metadataLoaders';
   import socket from '../utility/socket';
@@ -38,7 +37,7 @@
   import QueryDesignColumns from '../elements/QueryDesignColumns.svelte';
   import useTimerLabel from '../utility/useTimerLabel';
   import createActivator, { getActiveComponent } from '../utility/createActivator';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
 
   export let tabid;
   export let conid;

packages/web/src/tabs/QueryTab.svelte

@@ -52,7 +52,6 @@
   import useEditorData from '../query/useEditorData';
   import { extensions } from '../stores';
   import applyScriptTemplate from '../utility/applyScriptTemplate';
-  import axiosInstance from '../utility/axiosInstance';
   import { changeTab } from '../utility/common';
   import { getDatabaseInfo, useConnectionInfo } from '../utility/metadataLoaders';
   import socket from '../utility/socket';
@@ -69,7 +68,7 @@
   import AceEditor from '../query/AceEditor.svelte';
   import StatusBarTabItem from '../widgets/StatusBarTabItem.svelte';
   import { showSnackbarError } from '../utility/snackbar';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
 
   export let tabid;
   export let conid;

packages/web/src/tabs/ShellTab.svelte

@@ -48,8 +48,7 @@
   import AceEditor from '../query/AceEditor.svelte';
   import RunnerOutputPane from '../query/RunnerOutputPane.svelte';
   import useEditorData from '../query/useEditorData';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
-  import axiosInstance from '../utility/axiosInstance';
   import { copyTextToClipboard } from '../utility/clipboard';
   import { changeTab } from '../utility/common';
   import createActivator, { getActiveComponent } from '../utility/createActivator';

packages/web/src/tabs/TableDataTab.svelte

@@ -38,7 +38,6 @@
   import { writable } from 'svelte/store';
   import createUndoReducer from '../utility/createUndoReducer';
   import invalidateCommands from '../commands/invalidateCommands';
-  import axiosInstance from '../utility/axiosInstance';
   import { showModal } from '../modals/modalTools';
   import ErrorMessageModal from '../modals/ErrorMessageModal.svelte';
   import { useConnectionInfo, useDatabaseInfo } from '../utility/metadataLoaders';

packages/web/src/tabs/TableStructureTab.svelte

@@ -51,7 +51,6 @@
   import { useConnectionInfo, useDatabaseInfo, useDbCore } from '../utility/metadataLoaders';
   import { showModal } from '../modals/modalTools';
   import ConfirmSqlModal from '../modals/ConfirmSqlModal.svelte';
-  import axiosInstance from '../utility/axiosInstance';
   import ErrorMessageModal from '../modals/ErrorMessageModal.svelte';
   import { showSnackbarSuccess } from '../utility/snackbar';
   import InputTextModal from '../modals/InputTextModal.svelte';

packages/web/src/utility/alterDatabaseTools.ts

@@ -5,7 +5,6 @@ import { showModal } from '../modals/modalTools';
 import { getExtensions } from '../stores';
 import { getConnectionInfo, getDatabaseInfo } from './metadataLoaders';
 import ConfirmSqlModal from '../modals/ConfirmSqlModal.svelte';
-import axiosInstance from './axiosInstance';
 import { apiCall } from './api';
 
 export async function alterDatabaseDialog(conid, database, updateFunc) {

packages/web/src/utility/api.ts

@@ -1,4 +1,5 @@
 import resolveApi, { resolveApiHeaders } from './resolveApi';
+import { writable } from 'svelte/store';
 
 export async function apiCall(route: string, args: {} = undefined) {
   const resp = await fetch(`${resolveApi()}/${route}`, {
@@ -16,3 +17,15 @@ export async function apiCall(route: string, args: {} = undefined) {
 export function apiOn(event: string, hander: Function) {}
 
 export function apiOff(event: string, hander: Function) {}
+
+import _ from 'lodash';
+
+export function useApiCall(route, args, defaultValue) {
+  const result = writable(defaultValue);
+
+  apiCall(route, args).then(resp => {
+    result.set(resp);
+  });
+
+  return result;
+}

packages/web/src/utility/axiosInstance.js

@@ -1,25 +0,0 @@
-import axios from 'axios';
-import resolveApi, { resolveApiHeaders } from './resolveApi';
-
-let instance;
-
-function recreateAxiosInstance() {
-  instance = axios.create({
-    baseURL: resolveApi(),
-  });
-
-  instance.defaults.headers = {
-    'Cache-Control': 'no-cache',
-    Pragma: 'no-cache',
-    Expires: '0',
-    ...resolveApiHeaders(),
-  };
-}
-
-window['dbgate_recreateAxiosInstance'] = recreateAxiosInstance;
-
-recreateAxiosInstance();
-
-export default function axiosInstance() {
-  return instance;
-}

packages/web/src/utility/connectionsPinger.js

@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import { openedConnections, currentDatabase } from '../stores';
 import { apiCall } from './api';
-import axiosInstance from './axiosInstance';
 
 const doServerPing = value => {
   apiCall('server-connections/ping', { connections: value });

packages/web/src/utility/exportElectronFile.ts

@@ -1,6 +1,5 @@
 import ScriptWriter from '../impexp/ScriptWriter';
 import getElectron from './getElectron';
-import axiosInstance from '../utility/axiosInstance';
 import socket from '../utility/socket';
 import { showSnackbar, showSnackbarInfo, showSnackbarError, closeSnackbar } from '../utility/snackbar';
 import resolveApi from './resolveApi';

packages/web/src/utility/getElectron.ts

@@ -36,9 +36,6 @@ let apiInstance = null;
 
 function initializeElectron(args) {
   apiInstance = new ElectronApi(args);
-  if (window['dbgate_recreateAxiosInstance']) {
-    window['dbgate_recreateAxiosInstance']();
-  }
   if (window['dbgate_recreateSocket']) {
     window['dbgate_recreateSocket']();
   }

packages/web/src/utility/metadataLoaders.ts

@@ -1,4 +1,3 @@
-import axiosInstance from './axiosInstance';
 import _ from 'lodash';
 import { cacheGet, cacheSet, getCachedPromise } from './cache';
 import stableStringify from 'json-stable-stringify';

packages/web/src/utility/openArchiveFolder.ts

@@ -1,7 +1,6 @@
 import { get } from 'svelte/store';
 import getElectron from './getElectron';
 import { currentArchive, extensions, selectedWidget } from '../stores';
-import axiosInstance from '../utility/axiosInstance';
 import { showSnackbarSuccess } from './snackbar';
 import { apiCall } from './api';
 

packages/web/src/utility/openElectronFile.ts

@@ -5,7 +5,6 @@ import ImportExportModal from '../modals/ImportExportModal.svelte';
 import getElectron from './getElectron';
 import { currentDatabase, extensions } from '../stores';
 import { getUploadListener } from './uploadFiles';
-import axiosInstance from '../utility/axiosInstance';
 import { getDatabaseFileLabel } from './getConnectionLabel';
 import { apiCall } from './api';
 

packages/web/src/utility/saveTabFile.ts

@@ -1,7 +1,6 @@
 import { derived, get } from 'svelte/store';
 import { showModal } from '../modals/modalTools';
 import { openedTabs } from '../stores';
-import axiosInstance from '../utility/axiosInstance';
 import { changeTab } from './common';
 import SaveFileModal from '../modals/SaveFileModal.svelte';
 import registerCommand from '../commands/registerCommand';

packages/web/src/utility/useFetch.ts

@@ -1,21 +0,0 @@
-import _ from 'lodash';
-import axiosInstance from './axiosInstance';
-import { writable } from 'svelte/store';
-
-export default function useFetch({ url, data = undefined, params = undefined, defaultValue = undefined, ...config }) {
-  const result = writable(defaultValue);
-
-  axiosInstance
-    .request({
-      method: 'get',
-      params,
-      url,
-      data,
-      ...config,
-    })
-    .then(resp => {
-      result.set(resp.data);
-    });
-
-  return result;
-}

packages/web/src/widgets/ArchiveFilesList.svelte

@@ -30,7 +30,6 @@
   import { currentArchive } from '../stores';
   import { apiCall } from '../utility/api';
   import { markArchiveFileAsDataSheet } from '../utility/archiveTools';
-  import axiosInstance from '../utility/axiosInstance';
   import { useArchiveFiles, useArchiveFolders } from '../utility/metadataLoaders';
   import openNewTab from '../utility/openNewTab';
   import WidgetsInnerContainer from './WidgetsInnerContainer.svelte';

packages/web/src/widgets/ArchiveFolderList.svelte

@@ -11,8 +11,7 @@
   import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
-import { apiCall } from '../utility/api';
+  import { apiCall } from '../utility/api';
-  import axiosInstance from '../utility/axiosInstance';
   import { useArchiveFolders } from '../utility/metadataLoaders';
   import WidgetsInnerContainer from './WidgetsInnerContainer.svelte';
 

packages/web/src/widgets/ConnectionList.svelte

@@ -9,7 +9,6 @@
   import * as connectionAppObject from '../appobj/ConnectionAppObject.svelte';
   import SubDatabaseList from '../appobj/SubDatabaseList.svelte';
   import { commands, commandsCustomized, openedConnections } from '../stores';
-  import axiosInstance from '../utility/axiosInstance';
   import ToolbarButton from './ToolbarButton.svelte';
   import runCommand from '../commands/runCommand';
   import getConnectionLabel from '../utility/getConnectionLabel';

packages/web/src/widgets/QueryHistoryList.svelte

@@ -3,12 +3,10 @@
 
   import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
   import SearchInput from '../elements/SearchInput.svelte';
-  import useFetch from '../utility/useFetch';
   import WidgetsInnerContainer from '../widgets/WidgetsInnerContainer.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
   import { onMount } from 'svelte';
   import socket from '../utility/socket';
-  import axiosInstance from '../utility/axiosInstance';
   import openNewTab from '../utility/openNewTab';
   import CloseSearchButton from '../elements/CloseSearchButton.svelte';
   import { apiCall } from '../utility/api';

packages/web/src/widgets/SqlObjectList.svelte

@@ -24,7 +24,6 @@
   import SubColumnParamList from '../appobj/SubColumnParamList.svelte';
   import { chevronExpandIcon } from '../icons/expandIcons';
   import ErrorInfo from '../elements/ErrorInfo.svelte';
-  import axiosInstance from '../utility/axiosInstance';
   import LoadingInfo from '../elements/LoadingInfo.svelte';
   import { getObjectTypeFieldLabel } from '../utility/common';
   import DropDownButton from '../elements/DropDownButton.svelte';

packages/web/src/widgets/StatusBar.svelte

@@ -39,7 +39,6 @@
   import { activeTabId, currentDatabase, currentThemeDefinition, visibleCommandPalette } from '../stores';
   import getConnectionLabel from '../utility/getConnectionLabel';
   import { useConnectionList, useDatabaseServerVersion, useDatabaseStatus } from '../utility/metadataLoaders';
-  import axiosInstance from '../utility/axiosInstance';
   import { findCommand } from '../commands/runCommand';
   import { useConnectionColor } from '../utility/useConnectionColor';
   import { apiCall } from '../utility/api';

plugins/dbgate-plugin-excel/src/frontend/index.js

@@ -1,7 +1,7 @@
-let axios;
+let dbgateEnv;
 
 function initialize(dbgateEnv) {
-  axios = dbgateEnv.axios;
+  dbgateEnv = dbgateEnv;
 }
 
 const fileFormat = {
@@ -18,14 +18,14 @@ const fileFormat = {
   writerFunc: 'writer@dbgate-plugin-excel',
 
   addFileToSourceList: async ({ fileName }, newSources, newValues) => {
-    const resp = await axios.post('plugins/command', {
+    const resp = await dbgateEnv.apiCall('plugins/command', {
       command: 'analyse',
       packageName: 'dbgate-plugin-excel',
       args: {
         fileName,
       },
     });
-    const sheetNames = resp.data;
+    const sheetNames = resp;
     for (const sheetName of sheetNames) {
       newSources.push(sheetName);
       newValues[`sourceFile_${sheetName}`] = {