dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-23 01:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

axiosInstance replaced with apiCall

Browse Source
This commit is contained in:
Jan Prochazka
2021-12-22 10:16:44 +01:00
parent 148af24b2c
commit f9c54cdce2
55 changed files with 257 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/web/src/tabs/ChangelogTab.svelte
View File

@@ -6,6 +6,7 @@
import { onMount } from 'svelte';
import LoadingInfo from '../elements/LoadingInfo.svelte';
import Markdown from '../elements/Markdown.svelte';
import { apiCall } from '../utility/api';
import axiosInstance from '../utility/axiosInstance';
@@ -14,8 +15,8 @@
const handleLoad = async () => {
isLoading = true;
const resp = await axiosInstance().get('config/changelog');
text = resp.data;
const resp = await apiCall('config/changelog');
text = resp;
isLoading = false;
};

13
packages/web/src/tabs/CollectionDataTab.svelte
View File

@@ -50,6 +50,7 @@
import ChangeSetGrider from '../datagrid/ChangeSetGrider';
import { setContext } from 'svelte';
import _ from 'lodash';
import { apiCall } from '../utility/api';
export let tabid;
export let conid;
@@ -91,14 +92,10 @@
// $: console.log('LOADED ROWS MONGO', loadedRows);
async function handleConfirmChange(changeSet) {
const resp = await axiosInstance().request({
url: 'database-connections/update-collection',
method: 'post',
params: {
conid,
database,
},
data: { changeSet },
const resp = await apiCall('database-connections/update-collection', {
conid,
database,
changeSet,
});
const { errorMessage } = resp.data || {};
if (errorMessage) {

16
packages/web/src/tabs/CompareModelTab.svelte
View File

@@ -154,6 +154,7 @@
import SqlEditor from '../query/SqlEditor.svelte';
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';
@@ -228,7 +229,7 @@
export async function showReport() {
saveFileToDisk(async filePath => {
await axiosInstance().post('database-connections/generate-db-diff-report', {
await apiCall('database-connections/generate-db-diff-report', {
filePath,
sourceConid: $values?.sourceConid,
sourceDatabase: $values?.sourceDatabase,
@@ -261,11 +262,11 @@
}
export function refreshModels() {
axiosInstance().post('database-connections/sync-model', {
apiCall('database-connections/sync-model', {
conid: $values?.targetConid,
database: $values?.targetDatabase,
});
axiosInstance().post('database-connections/sync-model', {
apiCall('database-connections/sync-model', {
conid: $values?.sourceConid,
database: $values?.sourceDatabase,
});
@@ -275,18 +276,13 @@
const conid = $values?.targetConid;
const database = $values?.targetDatabase;
const resp = await axiosInstance().request({
url: 'database-connections/run-script',
method: 'post',
params: { conid, database },
data: { sql },
});
const resp = await apiCall('database-connections/run-script', { conid, database, sql });
const { errorMessage } = resp.data || {};
if (errorMessage) {
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 apiCall('database-connections/sync-model', { conid, database });
showSnackbarSuccess('Saved to database');
}
}

3
packages/web/src/tabs/FavoriteEditorTab.svelte
View File

@@ -43,6 +43,7 @@
import ErrorMessageModal from '../modals/ErrorMessageModal.svelte';
import { openFavorite } from '../appobj/FavoriteFileAppObject.svelte';
import createActivator, { getActiveComponent } from '../utility/createActivator';
import { apiCall } from '../utility/api';
export let tabid;
export let savedFile;
@@ -97,7 +98,7 @@
export function save() {
try {
const data = JSON.parse(getData());
axiosInstance().post('files/save', {
apiCall('files/save', {
file: savedFile,
folder: 'favorites',
format: 'json',

8
packages/web/src/tabs/FreeTableTab.svelte
View File

@@ -41,6 +41,7 @@
import { showModal } from '../modals/modalTools';
import SaveArchiveModal from '../modals/SaveArchiveModal.svelte';
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';
@@ -61,10 +62,7 @@
const { setEditorData, editorState } = useEditorData({
tabid,
loadFromArgs:
initialArgs && initialArgs.functionName
? () => axiosInstance().post('runners/load-reader', initialArgs).then(x => x.data)
: null,
loadFromArgs: initialArgs && initialArgs.functionName ? () => apiCall('runners/load-reader', initialArgs) : null,
onInitialData: value => {
dispatchModel({ type: 'reset', value });
},
@@ -84,7 +82,7 @@
}
const doSave = async (folder, file) => {
await axiosInstance().post('archive/save-free-table', { folder, file, data: $modelState.value });
await apiCall('archive/save-free-table', { folder, file, data: $modelState.value });
changeTab(tabid, tab => ({
...tab,
title: file,

5
packages/web/src/tabs/MarkdownViewTab.svelte
View File

@@ -6,6 +6,7 @@
import { onMount } from 'svelte';
import LoadingInfo from '../elements/LoadingInfo.svelte';
import Markdown from '../elements/Markdown.svelte';
import { apiCall } from '../utility/api';
import axiosInstance from '../utility/axiosInstance';
@@ -16,12 +17,12 @@
const handleLoad = async () => {
isLoading = true;
const resp = await axiosInstance().post('files/load', {
const resp = await apiCall('files/load', {
folder: 'markdown',
file: savedFile,
format: 'text',
});
text = resp.data;
text = resp;
isLoading = false;
};

7
packages/web/src/tabs/PluginTab.svelte
View File

@@ -7,6 +7,7 @@
import FormStyledButton from '../elements/FormStyledButton.svelte';
import Markdown from '../elements/Markdown.svelte';
import { extractPluginAuthor, extractPluginIcon } from '../plugins/manifestExtractors';
import { apiCall } from '../utility/api';
import axiosInstance from '../utility/axiosInstance';
import hasPermission from '../utility/hasPermission';
@@ -27,13 +28,13 @@
$: isPackaged = $info?.isPackaged;
const handleInstall = async () => {
axiosInstance().post('plugins/install', { packageName });
apiCall('plugins/install', { packageName });
};
const handleUninstall = async () => {
axiosInstance().post('plugins/uninstall', { packageName });
apiCall('plugins/uninstall', { packageName });
};
const handleUpgrade = async () => {
axiosInstance().post('plugins/upgrade', { packageName });
apiCall('plugins/upgrade', { packageName });
};
$: installedFound = $installed?.find(x => x.name == packageName);

9
packages/web/src/tabs/QueryDesignTab.svelte
View File

@@ -38,6 +38,7 @@
import QueryDesignColumns from '../elements/QueryDesignColumns.svelte';
import useTimerLabel from '../utility/useTimerLabel';
import createActivator, { getActiveComponent } from '../utility/createActivator';
import { apiCall } from '../utility/api';
export let tabid;
export let conid;
@@ -105,23 +106,23 @@
let sesid = sessionId;
if (!sesid) {
const resp = await axiosInstance().post('sessions/create', {
const resp = await apiCall('sessions/create', {
conid,
database,
});
sesid = resp.data.sesid;
sesid = resp.sesid;
sessionId = sesid;
}
busy = true;
timerLabel.start();
await axiosInstance().post('sessions/execute-query', {
await apiCall('sessions/execute-query', {
sesid,
sql: sqlPreview,
});
}
export async function kill() {
await axiosInstance().post('sessions/kill', {
await apiCall('sessions/kill', {
sesid: sessionId,
});
sessionId = null;

11
packages/web/src/tabs/QueryTab.svelte
View File

@@ -69,6 +69,7 @@
import AceEditor from '../query/AceEditor.svelte';
import StatusBarTabItem from '../widgets/StatusBarTabItem.svelte';
import { showSnackbarError } from '../utility/snackbar';
import { apiCall } from '../utility/api';
export let tabid;
export let conid;
@@ -150,20 +151,20 @@
let sesid = sessionId;
if (!sesid) {
const resp = await axiosInstance().post('sessions/create', {
const resp = await apiCall('sessions/create', {
conid,
database,
});
sesid = resp.data.sesid;
sesid = resp.sesid;
sessionId = sesid;
}
busy = true;
timerLabel.start();
await axiosInstance().post('sessions/execute-query', {
await apiCall('sessions/execute-query', {
sesid,
sql,
});
await axiosInstance().post('query-history/write', {
await apiCall('query-history/write', {
data: {
sql,
conid,
@@ -184,7 +185,7 @@
}
export async function kill() {
await axiosInstance().post('sessions/kill', {
await apiCall('sessions/kill', {
sesid: sessionId,
});
sessionId = null;

11
packages/web/src/tabs/ShellTab.svelte
View File

@@ -48,6 +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 axiosInstance from '../utility/axiosInstance';
import { copyTextToClipboard } from '../utility/clipboard';
import { changeTab } from '../utility/common';
@@ -140,8 +141,8 @@
}
export async function copyNodeScript() {
const resp = await axiosInstance().post('runners/get-node-script', { script: getActiveScript() });
copyTextToClipboard(resp.data);
const resp = await apiCall('runners/get-node-script', { script: getActiveScript() });
copyTextToClipboard(resp);
}
// export function openWizardEnabled() {
@@ -172,10 +173,10 @@
executeNumber += 1;
let runid = runnerId;
const resp = await axiosInstance().post('runners/start', {
const resp = await apiCall('runners/start', {
script: getActiveScript(),
});
runid = resp.data.runid;
runid = resp.runid;
runnerId = runid;
busy = true;
timerLabel.start();
@@ -186,7 +187,7 @@
}
export function kill() {
axiosInstance().post('runners/cancel', {
apiCall('runners/cancel', {
runid: runnerId,
});
timerLabel.stop();

13
packages/web/src/tabs/TableDataTab.svelte
View File

@@ -53,6 +53,7 @@
import openNewTab from '../utility/openNewTab';
import { getBoolSettingsValue } from '../settings/settingsTools';
import { setContext } from 'svelte';
import { apiCall } from '../utility/api';
export let tabid;
export let conid;
@@ -70,16 +71,8 @@
const [changeSetStore, dispatchChangeSet] = createUndoReducer(createChangeSet());
async function handleConfirmSql(sql) {
const resp = await axiosInstance().request({
url: 'database-connections/run-script',
method: 'post',
params: {
conid,
database,
},
data: { sql },
});
const { errorMessage } = resp.data || {};
const resp = await apiCall('database-connections/run-script', { conid, database, sql });
const { errorMessage } = resp || {};
if (errorMessage) {
showModal(ErrorMessageModal, { title: 'Error when saving', message: errorMessage });
} else {

17
packages/web/src/tabs/TableStructureTab.svelte
View File

@@ -58,6 +58,7 @@
import { changeTab } from '../utility/common';
import StatusBarTabItem from '../widgets/StatusBarTabItem.svelte';
import openNewTab from '../utility/openNewTab';
import { apiCall } from '../utility/api';
export let tabid;
export let conid;
@@ -130,16 +131,8 @@
}
async function handleConfirmSql(sql, createTableName) {
const resp = await axiosInstance().request({
url: 'database-connections/run-script',
method: 'post',
params: {
conid,
database,
},
data: { sql },
});
const { errorMessage } = resp.data || {};
const resp = await apiCall('database-connections/run-script', { conid, database, sql });
const { errorMessage } = resp || {};
if (errorMessage) {
showModal(ErrorMessageModal, { title: 'Error when saving', message: errorMessage });
} else {
@@ -154,14 +147,14 @@
}));
}
await axiosInstance().post('database-connections/sync-model', { conid, database });
await apiCall('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 apiCall('database-connections/sync-model', { conid, database });
clearEditorData();
}