Store cards in dbInfo

Author: ppsreejith

apps/src/metabase/appState.ts

@@ -7,7 +7,7 @@ import { cloneDeep, get, isEmpty, memoize, times } from "lodash";
 import { DOMQueryMapResponse } from "extension/types";
 import { subscribe, setInstructions, dispatch } from "web";
 import { getRelevantTablesForSelectedDb } from "./helpers/getDatabaseSchema";
-import { getDatabaseTablesAndModelsWithoutFields, getDatabaseInfo } from "./helpers/metabaseAPIHelpers";
+import { getDatabaseTablesAndModelsWithoutFields, getDatabaseInfo, getDatabaseTablesModelsCardsWithoutFields } from "./helpers/metabaseAPIHelpers";
 import { querySelectorMap } from "./helpers/querySelectorMap";
 import { getSelectedDbId } from "./helpers/metabaseStateAPI";
 import { abortable, createRunner, handlePromise } from "../common/utils";
@@ -547,7 +547,7 @@ Here's what I need modified:
       const isCancelled = () => taskStatus.status === 'cancelled';
       const [relevantTables, dbInfo] = await Promise.all([
         handlePromise(abortable(getRelevantTablesForSelectedDb(dbId), isCancelled), "Failed to get relevant tables", []),
-        handlePromise(abortable(getDatabaseTablesAndModelsWithoutFields(dbId), isCancelled), "Failed to get database info", DB_INFO_DEFAULT)
+        handlePromise(abortable(getDatabaseTablesModelsCardsWithoutFields(dbId), isCancelled), "Failed to get database info", DB_INFO_DEFAULT)
       ])
       state.getState().update((oldState) => ({
         ...oldState,

apps/src/metabase/helpers/metabaseAPIHelpers.ts

@@ -258,7 +258,8 @@ export async function getAllCardsAndModels(forceRefresh = false, currentDBId: nu
   }
 
   const cardsForProcessing = finalCards;
-  const processedCards = map(cardsForProcessing, processCard);
+  // const processedCards = map(cardsForProcessing, processCard);
+  const processedCards = cardsForProcessing.map(processCard)
 
   console.log('Processed cards:', processedCards);
   const tables: Record<string, TableAndSchema> = {};
@@ -385,6 +386,31 @@ export async function getDatabaseTablesAndModelsWithoutFields(db_id: number, for
   };
 }
 
+export async function getDatabaseTablesModelsCardsWithoutFields(db_id: number, forceRefreshModels: boolean = false, forceRefreshTables: boolean = false): Promise<DatabaseInfoWithTablesAndModels> {
+  const tablesAndDetails = await getRelevantTablesAndDetailsForSelectedDb(db_id, forceRefreshTables);
+  const cardsAndModels = await getAllCardsAndModels(forceRefreshModels, db_id);
+  const allCardsAndModels = cardsAndModels.cards || [];
+  const cards = allCardsAndModels.filter(card => card.type == 'question');
+  const models = allCardsAndModels.filter(card => card.type !== 'question');
+
+  return {
+      ...tablesAndDetails,
+      models: models.map((model) => ({
+        name: model.name,
+        collectionId: model.collection_id || null,
+        collectionName: get(model.collection, 'name', ''),
+        modelId: model.id,
+        description: model.description || undefined,
+        dbId: db_id
+      })),
+      cards: cards.map(card => ({
+        name: card.name,
+        id: card.id,
+        description: card.description,
+      }))
+  };
+}
+
 export function handleEmpty<T>(promise: Promise<T>, defaultValue: T): Promise<T> {
   return Promise.resolve(promise).catch(() => defaultValue);
 }

apps/src/metabase/helpers/metabaseAPITypes.ts

@@ -63,6 +63,12 @@ export interface MetabaseModel {
   dbId: number;
 }
 
+export interface MetabaseCard {
+  name: string;
+  id: number;
+  descption?: string;
+}
+
 
 export interface MetabaseTableOrModel {
   type: 'table' | 'model'
@@ -88,6 +94,7 @@ export interface DatabaseInfo {
 export interface DatabaseInfoWithTablesAndModels extends DatabaseInfo {
   tables: FormattedTable[];
   models: MetabaseModel[];
+  cards: MetabaseCard[];
 }
 
 export interface DatabaseResponse {

apps/src/metabase/helpers/types.ts

@@ -57,6 +57,11 @@ export interface Card {
     visualization_settings: visualizationSettings;
     type: string;
     parameters?: QBParameters;
+    name: string;
+    id: number;
+    description?: string;
+    collection_id?: number;
+    collection?: object;
 }
 
 export interface SavedCard extends Card {