refactor: move database things for website

quarylabs · Sep 5, 2024 · 7faa9c3 · 7faa9c3
1 parent 5f34859
commit 7faa9c3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/js/packages/quary-extension-bus/src/databaseShared.ts b/js/packages/quary-extension-bus/src/databaseShared.ts
@@ -1,18 +1,16 @@
 import { isErr, Ok, Result } from './result'
-import { TableAddress } from '@quary/proto/quary/service/v1/table_address'
 import {
   CacheViewInformation,
   CacheViewInformationPaths,
 } from '@quary/proto/quary/service/v1/wasm_rust_rpc_calls'
 import { Empty } from '@quary/proto/google/protobuf/empty'
-import { DatabaseDependentSettings } from './config'
+import { ServicesDatabase } from './database'
 
 export const cacheViewBuilder = async (
-  databaseDependentSettings: DatabaseDependentSettings,
-  listViews: () => Promise<Result<Array<TableAddress>>>,
+  database: ServicesDatabase,
 ): Promise<Result<CacheViewInformation>> => {
-  if (databaseDependentSettings.lookForCacheViews) {
-    const tables = await listViews()
+  if (database.returnDatabaseConfiguration().lookForCacheViews) {
+    const tables = await database.listViews()
     if (isErr(tables)) {
       return tables
     }

diff --git a/js/packages/quary-extension/src/web/chartCustomEditor.ts b/js/packages/quary-extension/src/web/chartCustomEditor.ts
@@ -448,10 +448,7 @@ export class ChartEditorProvider
             if (isErr(preInitSetupResult)) {
               return handleError(preInitSetupResult.error, allAssets)
             }
-            const cacheView = await cacheViewBuilder(
-              services.database.returnDatabaseConfiguration(),
-              services.database.listViews,
-            )
+            const cacheView = await cacheViewBuilder(services.database)
             if (isErr(cacheView)) {
               return handleError(cacheView.error, allAssets)
             }

diff --git a/js/packages/quary-extension/src/web/commandsDocumentation.ts b/js/packages/quary-extension/src/web/commandsDocumentation.ts
@@ -59,10 +59,7 @@ const getModelDetails = async ({
   const table = !isErr(modelTableDetails)
     ? (modelTableDetails.value.table ?? null)
     : null
-  const cacheViewInformation = await cacheViewBuilder(
-    services.database.returnDatabaseConfiguration(),
-    services.database.listViews,
-  )
+  const cacheViewInformation = await cacheViewBuilder(services.database)
   if (isErr(cacheViewInformation)) {
     return cacheViewInformation
   }

diff --git a/js/packages/quary-extension/src/web/commandsExecuteSQL.ts b/js/packages/quary-extension/src/web/commandsExecuteSQL.ts
@@ -52,10 +52,7 @@ const getModelDetails = async ({
     })
   }
 
-  const cacheViewInformation = await cacheViewBuilder(
-    services.database.returnDatabaseConfiguration(),
-    services.database.listViews,
-  )
+  const cacheViewInformation = await cacheViewBuilder(services.database)
   if (isErr(cacheViewInformation)) {
     return cacheViewInformation
   }