From cd645afd0059a56a4813a736c8ca20dabf262557 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Sun, 12 Apr 2020 20:01:50 +0200
Subject: [PATCH] useTableInfo refactor

---
 packages/web/src/utility/metadataLoaders.js | 103 ++++++++++----------
 1 file changed, 51 insertions(+), 52 deletions(-)

diff --git a/packages/web/src/utility/metadataLoaders.js b/packages/web/src/utility/metadataLoaders.js
index 39304b8cb..22cd639e9 100644
--- a/packages/web/src/utility/metadataLoaders.js
+++ b/packages/web/src/utility/metadataLoaders.js
@@ -1,67 +1,66 @@
 import useFetch from './useFetch';
 import axios from './axios';
 
-// /** @returns {import('@dbgate/types').TableInfo} */
-// function makeTableInfo(x) {
-//   return x;
-// }
+const tableInfoLoader = ({ conid, database, schemaName, pureName }) => ({
+  url: 'metadata/table-info',
+  params: { conid, database, schemaName, pureName },
+  reloadTrigger: `database-structure-changed-${conid}-${database}`,
+});
 
-// const tableInfoLoader = ({ conid, database, schemaName, pureName }) => ({
-//   url: 'metadata/table-info',
-//   params: { conid, database, schemaName, pureName },
-//   reloadTrigger: `database-structure-changed-${conid}-${database}`,
-//   type: makeTableInfo,
-// });
-
-// function createGet(loader) {
-//   return async (args) => {
-//     const { url, params, reloadTrigger, type } = loader(args);
-//     const resp = await axios.request({
-//       method: 'get',
-//       url,
-//       params,
-//     });
-//     return type(resp.data);
-//   };
-// }
-
-// function createUse(loader) {
-//   return async (args) => {
-//     const { url, params, reloadTrigger, type } = loader(args);
-
-//     const res = useFetch({
-//       url,
-//       params,
-//       reloadTrigger,
-//     });
-//     return type(res);
-//   };
-// }
-
-// export const getTableInfo = createGet(tableInfoLoader);
-// export const useTableInfo = createUse(tableInfoLoader);
-
-export async function getTableInfo({ conid, database, schemaName, pureName }) {
+async function getCore(loader, args) {
+  const { url, params, reloadTrigger } = loader(args);
   const resp = await axios.request({
     method: 'get',
-    url: 'metadata/table-info',
-    params: { conid, database, schemaName, pureName },
+    url,
+    params,
   });
-  /** @type {import('@dbgate/types').TableInfo} */
-  const res = resp.data;
+  return resp.data;
+}
+
+function useCore(loader, args) {
+  const { url, params, reloadTrigger } = loader(args);
+
+  const res = useFetch({
+    url,
+    params,
+    reloadTrigger,
+  });
+
   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;
+/** @returns {Promise<import('@dbgate/types').TableInfo>} */
+export function getTableInfo(args) {
+  return getCore(tableInfoLoader, args);
 }
 
+/** @returns {import('@dbgate/types').TableInfo} */
+export function useTableInfo(args) {
+  return useCore(tableInfoLoader, args);
+}
+// export const useTableInfo = createUse(tableInfoLoader);
+
+// export async function getTableInfo({ conid, database, schemaName, pureName }) {
+//   const resp = await axios.request({
+//     method: 'get',
+//     url: 'metadata/table-info',
+//     params: { conid, database, schemaName, pureName },
+//   });
+//   /** @type {import('@dbgate/types').TableInfo} */
+//   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({