diff --git a/packages/web/src/App.svelte b/packages/web/src/App.svelte index 356019d86..c4688ca26 100644 --- a/packages/web/src/App.svelte +++ b/packages/web/src/App.svelte @@ -23,9 +23,11 @@ } try { - const settings = await axiosInstance.get('config/get-settings'); - const connections = await axiosInstance.get('connections/list'); - const config = await axiosInstance.get('config/get'); + // console.log('************** LOADING API'); + + const settings = await axiosInstance().get('config/get-settings'); + const connections = await axiosInstance().get('connections/list'); + const config = await axiosInstance().get('config/get'); loadedApi = settings?.data && connections?.data && config?.data; if (!loadedApi) { console.log('API not initialized correctly, trying again in 1s'); @@ -51,11 +53,11 @@ } - - {#if loadedApi} + + {#if $loadingPluginStore?.loaded} diff --git a/packages/web/src/appobj/ArchiveFileAppObject.svelte b/packages/web/src/appobj/ArchiveFileAppObject.svelte index 3704accb3..5102d2f77 100644 --- a/packages/web/src/appobj/ArchiveFileAppObject.svelte +++ b/packages/web/src/appobj/ArchiveFileAppObject.svelte @@ -16,7 +16,7 @@ const connProps: any = {}; let tooltip = undefined; - const resp = await axiosInstance.post('files/load', { + const resp = await axiosInstance().post('files/load', { folder: 'archive:' + folderName, file: fileName + '.' + fileType, format: 'text', @@ -91,7 +91,7 @@ label: 'New file name', header: 'Rename file', onConfirm: newFile => { - axiosInstance.post('archive/rename-file', { + axiosInstance().post('archive/rename-file', { file: data.fileName, folder: data.folderName, fileType: data.fileType, @@ -105,7 +105,7 @@ showModal(ConfirmModal, { message: `Really delete file ${data.fileName}?`, onConfirm: () => { - axiosInstance.post('archive/delete-file', { + axiosInstance().post('archive/delete-file', { file: data.fileName, folder: data.folderName, fileType: data.fileType, diff --git a/packages/web/src/appobj/ArchiveFolderAppObject.svelte b/packages/web/src/appobj/ArchiveFolderAppObject.svelte index 6bd006c9b..df7427568 100644 --- a/packages/web/src/appobj/ArchiveFolderAppObject.svelte +++ b/packages/web/src/appobj/ArchiveFolderAppObject.svelte @@ -26,7 +26,7 @@ ? `Really delete link to folder ${data.name}? Folder content remains untouched.` : `Really delete folder ${data.name}?`, onConfirm: () => { - axiosInstance.post('archive/delete-folder', { folder: data.name }); + axiosInstance().post('archive/delete-folder', { folder: data.name }); }, }); }; @@ -41,7 +41,7 @@ label: 'New folder name', header: 'Rename folder', onConfirm: async newFolder => { - await axiosInstance.post('archive/rename-folder', { + await axiosInstance().post('archive/rename-folder', { folder: data.name, newFolder: newFolder + suffix, }); @@ -78,7 +78,7 @@ await dbgateApi.deployDb(${JSON.stringify( }; const handleGenerateDeploySql = async () => { - const resp = await axiosInstance.post('database-connections/generate-deploy-sql', { + const resp = await axiosInstance().post('database-connections/generate-deploy-sql', { conid: $currentDatabase.connection._id, database: $currentDatabase.name, archiveFolder: data.name, diff --git a/packages/web/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte index 62c07f06e..9d8811185 100644 --- a/packages/web/src/appobj/ConnectionAppObject.svelte +++ b/packages/web/src/appobj/ConnectionAppObject.svelte @@ -44,14 +44,14 @@ const handleConnect = () => { if (data.singleDatabase) { $currentDatabase = { connection: data, name: data.defaultDatabase }; - axiosInstance.post('database-connections/refresh', { + axiosInstance().post('database-connections/refresh', { conid: data._id, database: data.defaultDatabase, keepOpen: true, }); } else { $openedConnections = _.uniq([...$openedConnections, data._id]); - axiosInstance.post('server-connections/refresh', { + axiosInstance().post('server-connections/refresh', { conid: data._id, keepOpen: true, }); @@ -61,16 +61,16 @@ const getContextMenu = () => { const config = getCurrentConfig(); const handleRefresh = () => { - axiosInstance.post('server-connections/refresh', { conid: data._id }); + axiosInstance().post('server-connections/refresh', { conid: data._id }); }; const handleDisconnect = () => { openedConnections.update(list => list.filter(x => x != data._id)); if (electron) { - axiosInstance.post('server-connections/disconnect', { conid: data._id }); + axiosInstance().post('server-connections/disconnect', { conid: data._id }); } if (_.get($currentDatabase, 'connection._id') == data._id) { if (electron) { - axiosInstance.post('database-connections/disconnect', { conid: data._id, database: $currentDatabase.name }); + axiosInstance().post('database-connections/disconnect', { conid: data._id, database: $currentDatabase.name }); } currentDatabase.set(null); } @@ -81,11 +81,11 @@ const handleDelete = () => { showModal(ConfirmModal, { message: `Really delete connection ${getConnectionLabel(data)}?`, - onConfirm: () => axiosInstance.post('connections/delete', data), + onConfirm: () => axiosInstance().post('connections/delete', data), }); }; const handleDuplicate = () => { - axiosInstance.post('connections/save', { + axiosInstance().post('connections/save', { ...data, _id: undefined, displayName: `${getConnectionLabel(data)} - copy`, @@ -97,7 +97,7 @@ value: 'newdb', label: 'Database name', onConfirm: name => - axiosInstance.post('server-connections/create-database', { + axiosInstance().post('server-connections/create-database', { conid: data._id, name, }), diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte index 39f74dfa0..218ea76bd 100644 --- a/packages/web/src/appobj/DatabaseAppObject.svelte +++ b/packages/web/src/appobj/DatabaseAppObject.svelte @@ -48,13 +48,13 @@ header: 'Create collection', onConfirm: async newCollection => { const dbid = { conid: connection._id, database: name }; - await axiosInstance.request({ + await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: dbid, data: { sql: `db.createCollection('${newCollection}')` }, }); - axiosInstance.post('database-connections/sync-model', dbid); + axiosInstance().post('database-connections/sync-model', dbid); }, }); }; @@ -90,13 +90,13 @@ const handleDisconnect = () => { if (electron) { - axiosInstance.post('database-connections/disconnect', { conid: connection._id, database: name }); + axiosInstance().post('database-connections/disconnect', { conid: connection._id, database: name }); } currentDatabase.set(null); }; const handleExportModel = async () => { - const resp = await axiosInstance.post('database-connections/export-model', { + const resp = await axiosInstance().post('database-connections/export-model', { conid: connection._id, database: name, }); diff --git a/packages/web/src/appobj/DatabaseObjectAppObject.svelte b/packages/web/src/appobj/DatabaseObjectAppObject.svelte index 522dc9ca7..9307bafab 100644 --- a/packages/web/src/appobj/DatabaseObjectAppObject.svelte +++ b/packages/web/src/appobj/DatabaseObjectAppObject.svelte @@ -559,13 +559,13 @@ message: `Really drop collection ${data.pureName}?`, onConfirm: async () => { const dbid = _.pick(data, ['conid', 'database']); - await axiosInstance.request({ + await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: dbid, data: { sql: `db.dropCollection('${data.pureName}')` }, }); - axiosInstance.post('database-connections/sync-model', dbid); + axiosInstance().post('database-connections/sync-model', dbid); }, }); } else { diff --git a/packages/web/src/appobj/FavoriteFileAppObject.svelte b/packages/web/src/appobj/FavoriteFileAppObject.svelte index 9c431432c..9c3efddc6 100644 --- a/packages/web/src/appobj/FavoriteFileAppObject.svelte +++ b/packages/web/src/appobj/FavoriteFileAppObject.svelte @@ -7,7 +7,7 @@ const { icon, tabComponent, title, props, tabdata } = favorite; let tabdataNew = tabdata; if (props.savedFile) { - const resp = await axiosInstance.post('files/load', { + const resp = await axiosInstance().post('files/load', { folder: props.savedFolder, file: props.savedFile, format: props.savedFormat, @@ -47,7 +47,7 @@ }; const editFavoriteJson = async () => { - const resp = await axiosInstance.post('files/load', { + const resp = await axiosInstance().post('files/load', { folder: 'favorites', file: data.file, format: 'text', @@ -76,7 +76,7 @@ showModal(ConfirmModal, { message: `Really delete favorite ${data.title}?`, onConfirm: () => { - axiosInstance.post('files/delete', { file: data.file, folder: 'favorites' }); + axiosInstance().post('files/delete', { file: data.file, folder: 'favorites' }); }, }); }; diff --git a/packages/web/src/appobj/SavedFileAppObject.svelte b/packages/web/src/appobj/SavedFileAppObject.svelte index d434db8a9..8f8727d19 100644 --- a/packages/web/src/appobj/SavedFileAppObject.svelte +++ b/packages/web/src/appobj/SavedFileAppObject.svelte @@ -114,7 +114,7 @@ showModal(ConfirmModal, { message: `Really delete file ${data.file}?`, onConfirm: () => { - axiosInstance.post('files/delete', data); + axiosInstance().post('files/delete', data); }, }); }; @@ -125,7 +125,7 @@ label: 'New file name', header: 'Rename file', onConfirm: newFile => { - axiosInstance.post('files/rename', { ...data, newFile }); + axiosInstance().post('files/rename', { ...data, newFile }); }, }); }; @@ -136,13 +136,13 @@ label: 'New file name', header: 'Rename file', onConfirm: newFile => { - axiosInstance.post('files/copy', { ...data, newFile }); + axiosInstance().post('files/copy', { ...data, newFile }); }, }); }; async function openTab() { - const resp = await axiosInstance.post('files/load', { folder, file: data.file, format: handler.format }); + const resp = await axiosInstance().post('files/load', { folder, file: data.file, format: handler.format }); const connProps: any = {}; let tooltip = undefined; diff --git a/packages/web/src/charts/ChartCore.svelte b/packages/web/src/charts/ChartCore.svelte index b3f09ee25..56dd79ea4 100644 --- a/packages/web/src/charts/ChartCore.svelte +++ b/packages/web/src/charts/ChartCore.svelte @@ -61,7 +61,7 @@ export async function exportChart() { saveFileToDisk(async filePath => { - await axiosInstance.post('files/export-chart', { + await axiosInstance().post('files/export-chart', { title, filePath, config: { diff --git a/packages/web/src/charts/chartDataLoader.ts b/packages/web/src/charts/chartDataLoader.ts index ae5786f64..00a927787 100644 --- a/packages/web/src/charts/chartDataLoader.ts +++ b/packages/web/src/charts/chartDataLoader.ts @@ -16,7 +16,7 @@ export async function loadChartStructure(driver: EngineDriver, conid, database, const dmp = driver.createDumper(); dumpSqlSelect(dmp, select); - const resp = await axiosInstance.post('database-connections/query-data', { conid, database, sql: dmp.s }); + const resp = await axiosInstance().post('database-connections/query-data', { conid, database, sql: dmp.s }); if (resp.data.errorMessage) throw new Error(resp.data.errorMessage); return resp.data.columns.map(x => x.columnName); } @@ -74,7 +74,7 @@ export async function loadChartData(driver: EngineDriver, conid, database, sql, const dmp = driver.createDumper(); dumpSqlSelect(dmp, select); - const resp = await axiosInstance.post('database-connections/query-data', { conid, database, sql: dmp.s }); + const resp = await axiosInstance().post('database-connections/query-data', { conid, database, sql: dmp.s }); let { rows, columns, errorMessage } = resp.data; if (errorMessage) { throw new Error(errorMessage); diff --git a/packages/web/src/commands/changeDatabaseStatusCommand.ts b/packages/web/src/commands/changeDatabaseStatusCommand.ts index cb1b59cee..2f18e100c 100644 --- a/packages/web/src/commands/changeDatabaseStatusCommand.ts +++ b/packages/web/src/commands/changeDatabaseStatusCommand.ts @@ -22,19 +22,19 @@ registerCommand({ { text: 'Sync model', onClick: () => { - axiosInstance.post('database-connections/sync-model', dbid); + axiosInstance().post('database-connections/sync-model', dbid); }, }, { text: 'Reopen', onClick: () => { - axiosInstance.post('database-connections/refresh', dbid); + axiosInstance().post('database-connections/refresh', dbid); }, }, { text: 'Disconnect', onClick: () => { - if (electron) axiosInstance.post('database-connections/disconnect', dbid); + if (electron) axiosInstance().post('database-connections/disconnect', dbid); currentDatabase.set(null); }, }, diff --git a/packages/web/src/commands/stdCommands.ts b/packages/web/src/commands/stdCommands.ts index a55a2b2e5..8bc5e9a48 100644 --- a/packages/web/src/commands/stdCommands.ts +++ b/packages/web/src/commands/stdCommands.ts @@ -123,7 +123,7 @@ registerCommand({ label: 'New archive folder name', header: 'Create archive folder', onConfirm: async folder => { - axiosInstance.post('archive/create-folder', { folder }); + axiosInstance().post('archive/create-folder', { folder }); }, }); }, @@ -190,13 +190,13 @@ registerCommand({ label: 'New collection name', header: 'Create collection', onConfirm: async newCollection => { - await axiosInstance.request({ + await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: dbid, data: { sql: `db.createCollection('${newCollection}')` }, }); - axiosInstance.post('database-connections/sync-model', dbid); + axiosInstance().post('database-connections/sync-model', dbid); }, }); }, @@ -258,7 +258,7 @@ registerCommand({ label: 'New database name', header: 'Create SQLite database', onConfirm: async file => { - const resp = await axiosInstance.post('connections/new-sqlite-database', { file }); + const resp = await axiosInstance().post('connections/new-sqlite-database', { file }); const connection = resp.data; currentDatabase.set({ connection, name: `${file}.sqlite` }); }, diff --git a/packages/web/src/datagrid/CollectionDataGridCore.svelte b/packages/web/src/datagrid/CollectionDataGridCore.svelte index 5d968e603..4a8c72c30 100644 --- a/packages/web/src/datagrid/CollectionDataGridCore.svelte +++ b/packages/web/src/datagrid/CollectionDataGridCore.svelte @@ -63,7 +63,7 @@ export async function loadCollectionDataPage(props, offset, limit) { const { conid, database } = props; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/collection-data', method: 'post', params: { @@ -95,7 +95,7 @@ async function loadRowCount(props) { const { conid, database } = props; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/collection-data', method: 'post', params: { diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte index 28d6fae4e..5b9a54c22 100644 --- a/packages/web/src/datagrid/DataGridCore.svelte +++ b/packages/web/src/datagrid/DataGridCore.svelte @@ -404,7 +404,7 @@ } export async function reconnect() { - await axiosInstance.post('database-connections/refresh', { conid, database }); + await axiosInstance().post('database-connections/refresh', { conid, database }); display.reload(); } diff --git a/packages/web/src/datagrid/JslDataGridCore.svelte b/packages/web/src/datagrid/JslDataGridCore.svelte index 73e3efac5..d6c099f7a 100644 --- a/packages/web/src/datagrid/JslDataGridCore.svelte +++ b/packages/web/src/datagrid/JslDataGridCore.svelte @@ -13,7 +13,7 @@ async function loadDataPage(props, offset, limit) { const { jslid, display } = props; - const response = await axiosInstance.post('jsldata/get-rows', { + const response = await axiosInstance().post('jsldata/get-rows', { jslid, offset, limit, @@ -30,7 +30,7 @@ async function loadRowCount(props) { const { jslid } = props; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'jsldata/get-stats', method: 'get', params: { diff --git a/packages/web/src/datagrid/SqlDataGridCore.svelte b/packages/web/src/datagrid/SqlDataGridCore.svelte index 623bd6f84..cb2289ff7 100644 --- a/packages/web/src/datagrid/SqlDataGridCore.svelte +++ b/packages/web/src/datagrid/SqlDataGridCore.svelte @@ -31,7 +31,7 @@ const sql = display.getPageQuery(offset, limit); - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/query-data', method: 'post', params: { @@ -56,7 +56,7 @@ const sql = display.getCountQuery(); - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/query-data', method: 'post', params: { diff --git a/packages/web/src/forms/FormArchiveFolderSelect.svelte b/packages/web/src/forms/FormArchiveFolderSelect.svelte index 313c63103..7593dde5c 100644 --- a/packages/web/src/forms/FormArchiveFolderSelect.svelte +++ b/packages/web/src/forms/FormArchiveFolderSelect.svelte @@ -34,7 +34,7 @@ ]; const createOption = folder => { - axiosInstance.post('archive/create-folder', { folder }); + axiosInstance().post('archive/create-folder', { folder }); setFieldValue(name, folder); }; diff --git a/packages/web/src/formview/FormView.svelte b/packages/web/src/formview/FormView.svelte index ed6875d33..315c6bf3a 100644 --- a/packages/web/src/formview/FormView.svelte +++ b/packages/web/src/formview/FormView.svelte @@ -260,7 +260,7 @@ } export async function reconnect() { - await axiosInstance.post('database-connections/refresh', { conid, database }); + await axiosInstance().post('database-connections/refresh', { conid, database }); formDisplay.reload(); } diff --git a/packages/web/src/formview/SqlFormView.svelte b/packages/web/src/formview/SqlFormView.svelte index 9df60108c..561120ffc 100644 --- a/packages/web/src/formview/SqlFormView.svelte +++ b/packages/web/src/formview/SqlFormView.svelte @@ -4,7 +4,7 @@ if (!sql) return null; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/query-data', method: 'post', params: { @@ -124,7 +124,7 @@ $: if (onReferenceSourceChanged && rowData) onReferenceSourceChanged([rowData], loadedTime); // async function handleConfirmSql(sql) { - // const resp = await axiosInstance.request({ + // const resp = await axiosInstance().request({ // url: 'database-connections/query-data', // method: 'post', // params: { diff --git a/packages/web/src/freetable/FreeTableGridCore.svelte b/packages/web/src/freetable/FreeTableGridCore.svelte index 4d9dbabca..c58477e39 100644 --- a/packages/web/src/freetable/FreeTableGridCore.svelte +++ b/packages/web/src/freetable/FreeTableGridCore.svelte @@ -45,7 +45,7 @@ export async function exportGrid() { const jslid = uuidv1(); - await axiosInstance.post('jsldata/save-free-table', { jslid, data: modelState.value }); + await axiosInstance().post('jsldata/save-free-table', { jslid, data: modelState.value }); const initialValues: any = {}; initialValues.sourceStorageType = 'jsldata'; initialValues.sourceJslId = jslid; diff --git a/packages/web/src/impexp/PreviewDataGrid.svelte b/packages/web/src/impexp/PreviewDataGrid.svelte index da916dcd4..64905f600 100644 --- a/packages/web/src/impexp/PreviewDataGrid.svelte +++ b/packages/web/src/impexp/PreviewDataGrid.svelte @@ -27,7 +27,7 @@ } errorMessage = null; isLoading = true; - const resp = await axiosInstance.post('runners/load-reader', sourceReader); + const resp = await axiosInstance().post('runners/load-reader', sourceReader); // @ts-ignore model = resp.data; grider = new RowsArrayGrider(resp.data.rows); diff --git a/packages/web/src/modals/ChooseConnectionColorModal.svelte b/packages/web/src/modals/ChooseConnectionColorModal.svelte index c6ad32068..1ed6063ad 100644 --- a/packages/web/src/modals/ChooseConnectionColorModal.svelte +++ b/packages/web/src/modals/ChooseConnectionColorModal.svelte @@ -27,13 +27,13 @@ value = e.detail; if (database) { - axiosInstance.post('connections/update-database', { + axiosInstance().post('connections/update-database', { conid, database, values: { connectionColor: e.detail }, }); } else { - axiosInstance.post('connections/update', { + axiosInstance().post('connections/update', { _id: conid, values: { connectionColor: e.detail }, }); diff --git a/packages/web/src/modals/CommandModal.svelte b/packages/web/src/modals/CommandModal.svelte index 876171619..378c8bf86 100644 --- a/packages/web/src/modals/CommandModal.svelte +++ b/packages/web/src/modals/CommandModal.svelte @@ -42,7 +42,7 @@ value="OK" on:click={e => { closeCurrentModal(); - axiosInstance.post('config/update-settings', { + axiosInstance().post('config/update-settings', { commands: { ...$commandsSettings, [command.id]: { @@ -58,7 +58,7 @@ value="Reset" on:click={() => { closeCurrentModal(); - axiosInstance.post('config/update-settings', { + axiosInstance().post('config/update-settings', { commands: _.omit($commandsSettings, [command.id]), }); }} diff --git a/packages/web/src/modals/ConnectionModal.svelte b/packages/web/src/modals/ConnectionModal.svelte index 6331302db..962f74a30 100644 --- a/packages/web/src/modals/ConnectionModal.svelte +++ b/packages/web/src/modals/ConnectionModal.svelte @@ -38,7 +38,7 @@ isTesting = true; testIdRef.update(x => x + 1); const testid = testIdRef.get(); - const resp = await axiosInstance.post('connections/test', e.detail); + const resp = await axiosInstance().post('connections/test', e.detail); if (testIdRef.get() != testid) return; isTesting = false; @@ -70,7 +70,7 @@ let connection = _.omit(e.detail, omitProps); if (driver?.beforeConnectionSave) connection = driver?.beforeConnectionSave(connection); - axiosInstance.post('connections/save', connection); + axiosInstance().post('connections/save', connection); closeCurrentModal(); } diff --git a/packages/web/src/modals/DictionaryLookupModal.svelte b/packages/web/src/modals/DictionaryLookupModal.svelte index 19fdfbf97..c1e215031 100644 --- a/packages/web/src/modals/DictionaryLookupModal.svelte +++ b/packages/web/src/modals/DictionaryLookupModal.svelte @@ -100,7 +100,7 @@ dumpSqlSelect(dmp, select); isLoading = true; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/query-data', method: 'post', params: { diff --git a/packages/web/src/modals/FavoriteModal.svelte b/packages/web/src/modals/FavoriteModal.svelte index 98503ab43..45103e81e 100644 --- a/packages/web/src/modals/FavoriteModal.svelte +++ b/packages/web/src/modals/FavoriteModal.svelte @@ -69,7 +69,7 @@ import FormButton from '../forms/FormButton.svelte'; const saveTab = async values => { const data = await getTabSaveData(values); - axiosInstance.post('files/save', { + axiosInstance().post('files/save', { folder: 'favorites', file: uuidv1(), format: 'json', @@ -78,13 +78,13 @@ import FormButton from '../forms/FormButton.svelte'; }; const saveFile = async values => { - const oldDataResp = await axiosInstance.post('files/load', { + const oldDataResp = await axiosInstance().post('files/load', { folder: 'favorites', file: editingData.file, format: 'json', }); - axiosInstance.post('files/save', { + axiosInstance().post('files/save', { folder: 'favorites', file: editingData.file, format: 'json', diff --git a/packages/web/src/modals/ImportExportModal.svelte b/packages/web/src/modals/ImportExportModal.svelte index bf154a035..c338e31f6 100644 --- a/packages/web/src/modals/ImportExportModal.svelte +++ b/packages/web/src/modals/ImportExportModal.svelte @@ -81,8 +81,8 @@ const handleRunnerDone = () => { busy = false; if (refreshArchiveFolderRef.get()) { - axiosInstance.post('archive/refresh-folders', {}); - axiosInstance.post('archive/refresh-files', { folder: refreshArchiveFolderRef.get() }); + axiosInstance().post('archive/refresh-folders', {}); + axiosInstance().post('archive/refresh-files', { folder: refreshArchiveFolderRef.get() }); $currentArchive = refreshArchiveFolderRef.get(); $selectedWidget = 'archive'; } @@ -108,7 +108,7 @@ const script = await createImpExpScript($extensions, values); executeNumber += 1; let runid = runnerId; - const resp = await axiosInstance.post('runners/start', { script }); + const resp = await axiosInstance().post('runners/start', { script }); runid = resp.data.runid; runnerId = runid; @@ -120,7 +120,7 @@ }; const handleCancel = () => { - axiosInstance.post('runners/cancel', { + axiosInstance().post('runners/cancel', { runid: runnerId, }); }; diff --git a/packages/web/src/modals/SaveFileModal.svelte b/packages/web/src/modals/SaveFileModal.svelte index 064235e71..b21eb2566 100644 --- a/packages/web/src/modals/SaveFileModal.svelte +++ b/packages/web/src/modals/SaveFileModal.svelte @@ -22,7 +22,7 @@ const handleSubmit = async e => { const { name } = e.detail; - await axiosInstance.post('files/save', { folder, file: name, data, format }); + await axiosInstance().post('files/save', { folder, file: name, data, format }); closeCurrentModal(); if (onSave) { onSave(name, { @@ -38,7 +38,7 @@ const parsed = path.parse(filePath); // if (!parsed.ext) filePath += `.${fileExtension}`; - await axiosInstance.post('files/save-as', { filePath, data, format }); + await axiosInstance().post('files/save-as', { filePath, data, format }); closeCurrentModal(); if (onSave) { diff --git a/packages/web/src/modals/SqlGeneratorModal.svelte b/packages/web/src/modals/SqlGeneratorModal.svelte index 5d500fc07..d8b66bcc9 100644 --- a/packages/web/src/modals/SqlGeneratorModal.svelte +++ b/packages/web/src/modals/SqlGeneratorModal.svelte @@ -86,7 +86,7 @@ const loadid = uuidv1(); loadRef.set(loadid); busy = true; - const response = await axiosInstance.post('database-connections/sql-preview', { + const response = await axiosInstance().post('database-connections/sql-preview', { conid, database, objects, diff --git a/packages/web/src/modals/ValueLookupModal.svelte b/packages/web/src/modals/ValueLookupModal.svelte index a5bc5b63d..089d73ca6 100644 --- a/packages/web/src/modals/ValueLookupModal.svelte +++ b/packages/web/src/modals/ValueLookupModal.svelte @@ -85,7 +85,7 @@ dumpSqlSelect(dmp, select); isLoading = true; - const response = await axiosInstance.request({ + const response = await axiosInstance().request({ url: 'database-connections/query-data', method: 'post', params: { diff --git a/packages/web/src/plugins/PluginsProvider.svelte b/packages/web/src/plugins/PluginsProvider.svelte index c6d30dd61..684811f3a 100644 --- a/packages/web/src/plugins/PluginsProvider.svelte +++ b/packages/web/src/plugins/PluginsProvider.svelte @@ -14,7 +14,7 @@ loaded: false, loadingPackageName: installed.name, }); - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ method: 'get', url: 'plugins/script', params: { diff --git a/packages/web/src/query/RunnerOutputFiles.svelte b/packages/web/src/query/RunnerOutputFiles.svelte index cec5a83dc..a19e6d58e 100644 --- a/packages/web/src/query/RunnerOutputFiles.svelte +++ b/packages/web/src/query/RunnerOutputFiles.svelte @@ -34,7 +34,7 @@ $: $effect; const handleRunnerDone = async () => { - const resp = await axiosInstance.get(`runners/files?runid=${runnerId}`); + const resp = await axiosInstance().get(`runners/files?runid=${runnerId}`); files = resp.data; }; diff --git a/packages/web/src/settings/SettingsModal.svelte b/packages/web/src/settings/SettingsModal.svelte index dc0a2a69e..94c97dc15 100644 --- a/packages/web/src/settings/SettingsModal.svelte +++ b/packages/web/src/settings/SettingsModal.svelte @@ -16,7 +16,7 @@ import axiosInstance from '../utility/axiosInstance'; function handleOk(e) { - axiosInstance.post( + axiosInstance().post( 'config/update-settings', _.omitBy(e.detail, (v, k) => k.startsWith(':')) ); diff --git a/packages/web/src/tabs/ChangelogTab.svelte b/packages/web/src/tabs/ChangelogTab.svelte index 575cff2c2..f9278c8f5 100644 --- a/packages/web/src/tabs/ChangelogTab.svelte +++ b/packages/web/src/tabs/ChangelogTab.svelte @@ -14,7 +14,7 @@ const handleLoad = async () => { isLoading = true; - const resp = await axiosInstance.get('config/changelog'); + const resp = await axiosInstance().get('config/changelog'); text = resp.data; isLoading = false; }; diff --git a/packages/web/src/tabs/CollectionDataTab.svelte b/packages/web/src/tabs/CollectionDataTab.svelte index d19b66cae..7ac6ad51c 100644 --- a/packages/web/src/tabs/CollectionDataTab.svelte +++ b/packages/web/src/tabs/CollectionDataTab.svelte @@ -91,7 +91,7 @@ // $: console.log('LOADED ROWS MONGO', loadedRows); async function handleConfirmChange(changeSet) { - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ url: 'database-connections/update-collection', method: 'post', params: { diff --git a/packages/web/src/tabs/CompareModelTab.svelte b/packages/web/src/tabs/CompareModelTab.svelte index db6461792..c15c62fa9 100644 --- a/packages/web/src/tabs/CompareModelTab.svelte +++ b/packages/web/src/tabs/CompareModelTab.svelte @@ -228,7 +228,7 @@ export async function showReport() { saveFileToDisk(async filePath => { - await axiosInstance.post('database-connections/generate-db-diff-report', { + await axiosInstance().post('database-connections/generate-db-diff-report', { filePath, sourceConid: $values?.sourceConid, sourceDatabase: $values?.sourceDatabase, @@ -261,11 +261,11 @@ } export function refreshModels() { - axiosInstance.post('database-connections/sync-model', { + axiosInstance().post('database-connections/sync-model', { conid: $values?.targetConid, database: $values?.targetDatabase, }); - axiosInstance.post('database-connections/sync-model', { + axiosInstance().post('database-connections/sync-model', { conid: $values?.sourceConid, database: $values?.sourceDatabase, }); @@ -275,7 +275,7 @@ const conid = $values?.targetConid; const database = $values?.targetDatabase; - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: { conid, database }, @@ -286,7 +286,7 @@ showModal(ErrorMessageModal, { title: 'Error when saving', message: errorMessage }); } else { $values = _.omitBy($values, (v, k) => k.startsWith('isChecked_')); - await axiosInstance.post('database-connections/sync-model', { conid, database }); + await axiosInstance().post('database-connections/sync-model', { conid, database }); showSnackbarSuccess('Saved to database'); } } diff --git a/packages/web/src/tabs/FavoriteEditorTab.svelte b/packages/web/src/tabs/FavoriteEditorTab.svelte index 5a21bb0ca..7d05f6f6f 100644 --- a/packages/web/src/tabs/FavoriteEditorTab.svelte +++ b/packages/web/src/tabs/FavoriteEditorTab.svelte @@ -97,7 +97,7 @@ export function save() { try { const data = JSON.parse(getData()); - axiosInstance.post('files/save', { + axiosInstance().post('files/save', { file: savedFile, folder: 'favorites', format: 'json', diff --git a/packages/web/src/tabs/FreeTableTab.svelte b/packages/web/src/tabs/FreeTableTab.svelte index 3763e43c3..d67dc24f0 100644 --- a/packages/web/src/tabs/FreeTableTab.svelte +++ b/packages/web/src/tabs/FreeTableTab.svelte @@ -63,7 +63,7 @@ tabid, loadFromArgs: initialArgs && initialArgs.functionName - ? () => axiosInstance.post('runners/load-reader', initialArgs).then(x => x.data) + ? () => axiosInstance().post('runners/load-reader', initialArgs).then(x => x.data) : null, onInitialData: value => { dispatchModel({ type: 'reset', value }); @@ -84,7 +84,7 @@ } const doSave = async (folder, file) => { - await axiosInstance.post('archive/save-free-table', { folder, file, data: $modelState.value }); + await axiosInstance().post('archive/save-free-table', { folder, file, data: $modelState.value }); changeTab(tabid, tab => ({ ...tab, title: file, diff --git a/packages/web/src/tabs/MarkdownViewTab.svelte b/packages/web/src/tabs/MarkdownViewTab.svelte index 7dd4eb4f1..e162a4715 100644 --- a/packages/web/src/tabs/MarkdownViewTab.svelte +++ b/packages/web/src/tabs/MarkdownViewTab.svelte @@ -16,7 +16,7 @@ const handleLoad = async () => { isLoading = true; - const resp = await axiosInstance.post('files/load', { + const resp = await axiosInstance().post('files/load', { folder: 'markdown', file: savedFile, format: 'text', diff --git a/packages/web/src/tabs/PluginTab.svelte b/packages/web/src/tabs/PluginTab.svelte index 4718c4f97..1f7b65b9c 100644 --- a/packages/web/src/tabs/PluginTab.svelte +++ b/packages/web/src/tabs/PluginTab.svelte @@ -27,13 +27,13 @@ $: isPackaged = $info?.isPackaged; const handleInstall = async () => { - axiosInstance.post('plugins/install', { packageName }); + axiosInstance().post('plugins/install', { packageName }); }; const handleUninstall = async () => { - axiosInstance.post('plugins/uninstall', { packageName }); + axiosInstance().post('plugins/uninstall', { packageName }); }; const handleUpgrade = async () => { - axiosInstance.post('plugins/upgrade', { packageName }); + axiosInstance().post('plugins/upgrade', { packageName }); }; $: installedFound = $installed?.find(x => x.name == packageName); diff --git a/packages/web/src/tabs/QueryDesignTab.svelte b/packages/web/src/tabs/QueryDesignTab.svelte index d9c78ddb3..44f40b76f 100644 --- a/packages/web/src/tabs/QueryDesignTab.svelte +++ b/packages/web/src/tabs/QueryDesignTab.svelte @@ -105,7 +105,7 @@ let sesid = sessionId; if (!sesid) { - const resp = await axiosInstance.post('sessions/create', { + const resp = await axiosInstance().post('sessions/create', { conid, database, }); @@ -114,14 +114,14 @@ } busy = true; timerLabel.start(); - await axiosInstance.post('sessions/execute-query', { + await axiosInstance().post('sessions/execute-query', { sesid, sql: sqlPreview, }); } export async function kill() { - await axiosInstance.post('sessions/kill', { + await axiosInstance().post('sessions/kill', { sesid: sessionId, }); sessionId = null; diff --git a/packages/web/src/tabs/QueryTab.svelte b/packages/web/src/tabs/QueryTab.svelte index 3f9293c6c..2e6284da2 100644 --- a/packages/web/src/tabs/QueryTab.svelte +++ b/packages/web/src/tabs/QueryTab.svelte @@ -150,7 +150,7 @@ let sesid = sessionId; if (!sesid) { - const resp = await axiosInstance.post('sessions/create', { + const resp = await axiosInstance().post('sessions/create', { conid, database, }); @@ -159,11 +159,11 @@ } busy = true; timerLabel.start(); - await axiosInstance.post('sessions/execute-query', { + await axiosInstance().post('sessions/execute-query', { sesid, sql, }); - await axiosInstance.post('query-history/write', { + await axiosInstance().post('query-history/write', { data: { sql, conid, @@ -184,7 +184,7 @@ } export async function kill() { - await axiosInstance.post('sessions/kill', { + await axiosInstance().post('sessions/kill', { sesid: sessionId, }); sessionId = null; diff --git a/packages/web/src/tabs/ShellTab.svelte b/packages/web/src/tabs/ShellTab.svelte index 69a0386ea..9c0c30d38 100644 --- a/packages/web/src/tabs/ShellTab.svelte +++ b/packages/web/src/tabs/ShellTab.svelte @@ -140,7 +140,7 @@ } export async function copyNodeScript() { - const resp = await axiosInstance.post('runners/get-node-script', { script: getActiveScript() }); + const resp = await axiosInstance().post('runners/get-node-script', { script: getActiveScript() }); copyTextToClipboard(resp.data); } @@ -172,7 +172,7 @@ executeNumber += 1; let runid = runnerId; - const resp = await axiosInstance.post('runners/start', { + const resp = await axiosInstance().post('runners/start', { script: getActiveScript(), }); runid = resp.data.runid; @@ -186,7 +186,7 @@ } export function kill() { - axiosInstance.post('runners/cancel', { + axiosInstance().post('runners/cancel', { runid: runnerId, }); timerLabel.stop(); diff --git a/packages/web/src/tabs/TableDataTab.svelte b/packages/web/src/tabs/TableDataTab.svelte index 28dc575a2..6b8e947b8 100644 --- a/packages/web/src/tabs/TableDataTab.svelte +++ b/packages/web/src/tabs/TableDataTab.svelte @@ -70,7 +70,7 @@ const [changeSetStore, dispatchChangeSet] = createUndoReducer(createChangeSet()); async function handleConfirmSql(sql) { - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: { diff --git a/packages/web/src/tabs/TableStructureTab.svelte b/packages/web/src/tabs/TableStructureTab.svelte index d30c99938..57b360468 100644 --- a/packages/web/src/tabs/TableStructureTab.svelte +++ b/packages/web/src/tabs/TableStructureTab.svelte @@ -130,7 +130,7 @@ } async function handleConfirmSql(sql, createTableName) { - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ url: 'database-connections/run-script', method: 'post', params: { @@ -154,14 +154,14 @@ })); } - await axiosInstance.post('database-connections/sync-model', { conid, database }); + await axiosInstance().post('database-connections/sync-model', { conid, database }); showSnackbarSuccess('Saved to database'); clearEditorData(); } } export async function reset() { - await axiosInstance.post('database-connections/sync-model', { conid, database }); + await axiosInstance().post('database-connections/sync-model', { conid, database }); clearEditorData(); } diff --git a/packages/web/src/utility/ErrorHandler.svelte b/packages/web/src/utility/ErrorHandler.svelte index 195bcea99..efbd98e85 100644 --- a/packages/web/src/utility/ErrorHandler.svelte +++ b/packages/web/src/utility/ErrorHandler.svelte @@ -1,7 +1,6 @@ diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte index ee21e9c8b..0243b21c7 100644 --- a/packages/web/src/widgets/ConnectionList.svelte +++ b/packages/web/src/widgets/ConnectionList.svelte @@ -29,7 +29,7 @@ const handleRefreshConnections = () => { for (const conid of $openedConnections) { - axiosInstance.post('server-connections/refresh', { conid }); + axiosInstance().post('server-connections/refresh', { conid }); } }; diff --git a/packages/web/src/widgets/QueryHistoryList.svelte b/packages/web/src/widgets/QueryHistoryList.svelte index b419661e9..5a3d6b073 100644 --- a/packages/web/src/widgets/QueryHistoryList.svelte +++ b/packages/web/src/widgets/QueryHistoryList.svelte @@ -18,7 +18,7 @@ let historyItems = []; async function reloadItems() { - const resp = await axiosInstance.request({ + const resp = await axiosInstance().request({ method: 'get', url: 'query-history/read', params: { diff --git a/packages/web/src/widgets/SqlObjectList.svelte b/packages/web/src/widgets/SqlObjectList.svelte index c490fe078..32c242c7a 100644 --- a/packages/web/src/widgets/SqlObjectList.svelte +++ b/packages/web/src/widgets/SqlObjectList.svelte @@ -62,7 +62,7 @@ // $: objectList = generateObjectList(generateIndex); const handleRefreshDatabase = () => { - axiosInstance.post('database-connections/refresh', { conid, database }); + axiosInstance().post('database-connections/refresh', { conid, database }); }; function createAddMenu() { diff --git a/packages/web/src/widgets/StatusBar.svelte b/packages/web/src/widgets/StatusBar.svelte index bfd8b357d..3fff2cdd8 100644 --- a/packages/web/src/widgets/StatusBar.svelte +++ b/packages/web/src/widgets/StatusBar.svelte @@ -64,7 +64,7 @@ async function handleSyncModel() { if (connection && databaseName) { - await axiosInstance.post('database-connections/sync-model', { conid: connection._id, database: databaseName }); + await axiosInstance().post('database-connections/sync-model', { conid: connection._id, database: databaseName }); } }