complete removed axiosInstance

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;
-}