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

metadata loaders refactor, cache fixes

Browse Source
This commit is contained in:
Jan Prochazka
2020-04-12 21:02:34 +02:00
parent e9c03345c3
commit 46814bab81
10 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/web/src/utility/globalState.js
View File

@@ -63,7 +63,7 @@ const [OpenedTabsProvider, useOpenedTabs, useSetOpenedTabs] = createStorageState
export { OpenedTabsProvider, useOpenedTabs, useSetOpenedTabs };
export function useUpdateDatabaseForTab(tabVisible, conid, database) {
const connection = useConnectionInfo(conid);
const connection = useConnectionInfo({ conid });
const setDb = useSetCurrentDatabase();
const previousTabVisible = usePrevious(!!(tabVisible && connection));

89
packages/web/src/utility/metadataLoaders.js
View File

@@ -9,6 +9,18 @@ const tableInfoLoader = ({ conid, database, schemaName, pureName }) => ({
reloadTrigger: `database-structure-changed-${conid}-${database}`,
});
const viewInfoLoader = ({ conid, database, schemaName, pureName }) => ({
url: 'metadata/view-info',
params: { conid, database, schemaName, pureName },
reloadTrigger: `database-structure-changed-${conid}-${database}`,
});
const connectionInfoLoader = ({ conid }) => ({
url: 'connections/get',
params: { conid },
reloadTrigger: 'connection-list-changed',
});
async function getCore(loader, args) {
const { url, params, reloadTrigger } = loader(args);
const key = stableStringify({ url, ...params });
@@ -53,55 +65,42 @@ export function getTableInfo(args) {
export function useTableInfo(args) {
return useCore(tableInfoLoader, args);
}
// export const useTableInfo = createUse(tableInfoLoader);
// export async function getTableInfo({ conid, database, schemaName, pureName }) {
/** @returns {Promise<import('@dbgate/types').ViewInfo>} */
export function getViewInfo(args) {
return getCore(viewInfoLoader, args);
}
/** @returns {import('@dbgate/types').ViewInfo} */
export function useViewInfo(args) {
return useCore(viewInfoLoader, args);
}
/** @returns {Promise<import('@dbgate/types').StoredConnection>} */
export function getConnectionInfo(args) {
return getCore(connectionInfoLoader, args);
}
/** @returns {import('@dbgate/types').StoredConnection} */
export function useConnectionInfo(args) {
return useCore(connectionInfoLoader, args);
}
// export function useConnectionInfo(conid) {
// /** @type {import('@dbgate/types').StoredConnection} */
// const connection = useFetch({
// params: { conid },
// url: 'connections/get',
// });
// return connection;
// }
// export async function getConnectionInfo(conid) {
// const resp = await axios.request({
// method: 'get',
// url: 'metadata/table-info',
// params: { conid, database, schemaName, pureName },
// params: { conid },
// url: 'connections/get',
// });
// /** @type {import('@dbgate/types').TableInfo} */
// /** @type {import('@dbgate/types').StoredConnection} */
// const res = resp.data;
// return res;
// }
// export function useTableInfo({ conid, database, schemaName, pureName }) {
// /** @type {import('@dbgate/types').TableInfo} */
// const tableInfo = useFetch({
// url: 'metadata/table-info',
// params: { conid, database, schemaName, pureName },
// reloadTrigger: `database-structure-changed-${conid}-${database}`,
// });
// return tableInfo;
// }
export function useViewInfo({ conid, database, schemaName, pureName }) {
/** @type {import('@dbgate/types').ViewInfo} */
const viewInfo = useFetch({
url: 'metadata/view-info',
params: { conid, database, schemaName, pureName },
reloadTrigger: `database-structure-changed-${conid}-${database}`,
});
return viewInfo;
}
export function useConnectionInfo(conid) {
/** @type {import('@dbgate/types').StoredConnection} */
const connection = useFetch({
params: { conid },
url: 'connections/get',
});
return connection;
}
export async function getConnectionInfo(conid) {
const resp = await axios.request({
method: 'get',
params: { conid },
url: 'connections/get',
});
/** @type {import('@dbgate/types').StoredConnection} */
const res = resp.data;
return res;
}

21
packages/web/src/utility/useFetch.js
View File

@@ -38,26 +38,19 @@ export default function useFetch({
if (cacheKey) {
const fromCache = cacheGet(cacheKey);
if (fromCache) return fromCache;
const res = await getCachedPromise(cacheKey, doLoad);
setValue([res, loadedIndicators]);
cacheSet(cacheKey, res, reloadTrigger);
if (fromCache) {
setValue([fromCache, loadedIndicators]);
} else {
const res = await getCachedPromise(cacheKey, doLoad);
cacheSet(cacheKey, res, reloadTrigger);
setValue([res, loadedIndicators]);
}
} else {
const res = await doLoad();
setValue([res, loadedIndicators]);
}
}
// React.useEffect(() => {
// loadValue(indicators);
// if (reloadTrigger && socket) {
// socket.on(reloadTrigger, handleReload);
// return () => {
// socket.off(reloadTrigger, handleReload);
// };
// }
// }, [...indicators, socket]);
React.useEffect(() => {
loadValue(indicators);
}, [...indicators]);