renamed limitedEntities and only keeping table and model names/ids, no fields (#278)

Author: kektobiologist

apps/src/metabase/helpers/DOMToState.ts

@@ -19,6 +19,7 @@ import { getMBQLAppState } from './mbql/appState';
 import { isMBQLPageUrl, MBQLInfo } from './mbql/utils';
 import { getModelsWithFields, getSelectedAndRelevantModels, modifySqlForMetabaseModels} from './metabaseModels';
 import { MetabaseAppStateSQLEditorV2, MetabaseAppStateType, processCard } from './analystModeTypes';
+import { MetabaseTableOrModel } from './metabaseAPITypes';
 
 const {modifySqlForMxModels} = catalogAsModels
 
@@ -41,6 +42,7 @@ interface ExtractedTable {
   id: number;
 }
 
+
 export interface MetabaseAppStateSQLEditor {
   type: MetabaseAppStateType.SQLEditor;
   availableDatabases?: string[];
@@ -65,7 +67,7 @@ export interface MetabaseAppStateSQLEditor {
   metabaseOrigin?: string;
   metabaseUrl?: string;
   isEmbedded: boolean;
-  relevantEntitiesWithFields?: FormattedTable[];
+  limitedEntities?: MetabaseTableOrModel[];
   currentCard?: Card;
 }
 
@@ -77,7 +79,7 @@ export interface MetabaseAppStateDashboard extends DashboardInfo {
   metabaseOrigin?: string;
   metabaseUrl?: string;
   isEmbedded: boolean;
-  relevantEntitiesWithFields?: FormattedTable[];
+  limitedEntities?: MetabaseTableOrModel[];
 }
 
 export interface MetabaseAppStateMBQLEditor extends MBQLInfo {
@@ -114,14 +116,14 @@ export async function convertDOMtoStateSQLQueryV2() : Promise<MetabaseAppStateSQ
   const currentCard = processCard(currentCardRaw);
   const metabaseOrigin = new URL(metabaseUrl).origin;
   const isEmbedded = getParsedIframeInfo().isEmbedded
-  const relevantEntitiesWithFields: FormattedTable[] = []
+  const limitedEntities: MetabaseTableOrModel[] = []
   return {
     type: MetabaseAppStateType.SQLEditor,
     version: '2',
     metabaseOrigin,
     metabaseUrl,
     isEmbedded,
-    relevantEntitiesWithFields,
+    limitedEntities,
     currentCard,
     outputMarkdown,
     parameterValues,
@@ -203,21 +205,20 @@ export async function convertDOMtoStateSQLQuery() {
     metabaseAppStateSQLEditor.sqlErrorMessage = sqlErrorMessage;
   }
   if (appSettings.analystMode && appSettings.manuallyLimitContext) {
-    const relevantTablesWithFieldsAndType = relevantTablesWithFields.map(table => ({
-      ...table,
+    const limitToTables: MetabaseTableOrModel[] = relevantTablesWithFields.map(table => ({
       type: 'table',
+      id: table.id,
+      name: table.name,
+      schema: table.schema,
+      description: table.description,
     }))
-    const relevantModelsWithFieldsAndType = relevantModelsWithFields.map(model => ({
-      ...model,
+    const limitToModels: MetabaseTableOrModel[] = relevantModels.map(model => ({
       type: 'model',
-      name: model.modelName,
       id: model.modelId,
-      schema: undefined,
-      table: undefined,
-      modelId: undefined,
-      modelName: undefined,
+      name: model.name,
+      description: model.description,
     }))
-    metabaseAppStateSQLEditor.relevantEntitiesWithFields = [...relevantTablesWithFieldsAndType, ...relevantModelsWithFieldsAndType];
+    metabaseAppStateSQLEditor.limitedEntities = [...limitToTables, ...limitToModels];
   }
   return metabaseAppStateSQLEditor;
 }

apps/src/metabase/helpers/analystModeTypes.ts

@@ -1,6 +1,7 @@
 import { omit, pick } from "lodash";
 import { DashboardInfo } from "./dashboard/types";
 import { Card, FormattedTable, ParameterValues } from "./types";
+import { MetabaseTableOrModel } from "./metabaseAPITypes";
 
 export enum MetabaseAppStateType {
     SQLEditor = 'metabaseSQLEditor',
@@ -15,7 +16,7 @@ interface MetabaseAppStateBase {
   metabaseOrigin: string;
   metabaseUrl: string;
   isEmbedded: boolean;
-  relevantEntitiesWithFields: FormattedTable[];
+  limitedEntities: MetabaseTableOrModel[];
 }
 
 export interface MetabaseAppStateSQLEditorV2 extends MetabaseAppStateBase {

apps/src/metabase/helpers/dashboard/appState.ts

@@ -12,6 +12,7 @@ import { getTablesFromSqlRegex, TableAndSchema } from '../parseSql';
 import { getTableContextYAML } from '../catalog';
 import { getModelsFromSql, getModelsWithFields, modifySqlForMetabaseModels, replaceLLMFriendlyIdentifiersInSqlWithModels } from '../metabaseModels';
 import { MetabaseAppStateType } from '../analystModeTypes';
+import { MetabaseTableOrModel } from '../metabaseAPITypes';
 
 // Removed: const { getMetabaseState } = RPCs - using centralized state functions instead
 
@@ -327,21 +328,20 @@ export async function getDashboardAppState(): Promise<MetabaseAppStateDashboard
     isEmbedded: getParsedIframeInfo().isEmbedded,
   };
   if (appSettings.analystMode && appSettings.manuallyLimitContext) {
-    const relevantTablesWithFieldsAndType = relevantTablesWithFields.map(table => ({
-      ...table,
+    const limitToTables: MetabaseTableOrModel[] = relevantTablesWithFields.map(table => ({
       type: 'table',
+      id: table.id,
+      name: table.name,
+      schema: table.schema,
+      description: table.description,
     }))
-    const relevantModelsWithFieldsAndType = relevantModelsWithFields.map(model => ({
-      ...model,
+    const limitToModels: MetabaseTableOrModel[] = dedupedCardAndSelectedModels.map(model => ({
       type: 'model',
-      name: model.modelName,
       id: model.modelId,
-      schema: undefined,
-      table: undefined,
-      modelId: undefined,
-      modelName: undefined,
+      name: model.name,
+      description: model.description,
     }))
-    dashboardAppState.relevantEntitiesWithFields = [...relevantTablesWithFieldsAndType, ...relevantModelsWithFieldsAndType];
+    dashboardAppState.limitedEntities = [...limitToTables, ...limitToModels];
   }
   return dashboardAppState
 }

apps/src/metabase/helpers/metabaseAPITypes.ts

@@ -62,6 +62,15 @@ export interface MetabaseModel {
   dbId: number;
 }
 
+
+export interface MetabaseTableOrModel {
+  type: 'table' | 'model'
+  id: number | string
+  description?: string
+  schema?: string
+  name: string
+}
+
 export interface DatabaseInfo {
   name: string;
   description: string;