Enable retrieving and updating embed_configs

Author: ppsreejith

web/src/app/index.tsx

@@ -6,7 +6,7 @@ import ChakraContext from '../components/common/ChakraContext';
 import App from '../components/common/App';
 import { persistStore } from 'redux-persist';
 import { RootState, store } from '../state/store';
-import { setAppRecording, setIframeInfo, updateIsAppOpen } from '../state/settings/reducer';
+import { setAppRecording, setIframeInfo, updateIsAppOpen, setEmbedConfigs } from '../state/settings/reducer';
 import { dispatch } from '../state/dispatch';
 import { log, queryDOMMap, setMinusxMode, toggleMinusXRoot, queryURL, forwardToTab, gdocRead, gdocWrite, gdocImage, gdocReadSelected, captureVisibleTab, getPendingMessage, gsheetSetUserToken} from './rpc';
 import _, { get, isEqual, pick, set } from 'lodash';
@@ -185,6 +185,23 @@ function ProviderApp() {
                 document.head.appendChild(link)
             }
 
+            // Fetch JSON configuration
+            fetch(`${iframeInfo.origin}/minusx.json`)
+                .then(response => {
+                    if (response.ok) {
+                        return response.json()
+                    }
+                    throw new Error('Failed to fetch minusx.json')
+                })
+                .then(config => {
+                    if (config && typeof config === 'object') {
+                        dispatch(setEmbedConfigs(config))
+                    }
+                })
+                .catch(error => {
+                    console.warn('Could not fetch embed configuration:', error)
+                })
+            
             return () => {
                 const link = document.getElementById(linkId)
                 if (link) {

web/src/components/common/Markdown.tsx

@@ -12,6 +12,7 @@ import { getApp } from '../../helpers/app'
 import { processSQLWithCtesOrModels } from '../../helpers/catalogAsModels'
 import { getAllTemplateTagsInQuery, replaceLLMFriendlyIdentifiersInSqlWithModels } from 'apps'
 import type { MetabaseModel } from 'apps/types'
+import type { EmbedConfigs } from '../../state/settings/reducer'
 import { Badge } from "@chakra-ui/react";
 import { CodeBlock } from './CodeBlock';
 import { BiChevronDown, BiChevronRight } from 'react-icons/bi';
@@ -166,10 +167,11 @@ function ImageComponent(props: any) {
   return <ZoomableImage src={props.src} alt={props.alt}/>
 }
 
-function generateMetabaseQuestionURL(origin: string, sql: string, databaseId: number | null = null) {
-  // Get all template tags in the query (we don't have access to snippets here, so pass undefined)
+function generateMetabaseQuestionURL(sql: string, databaseId: number | null = null, embedConfigs: EmbedConfigs = {}) {
+  // Get Metabase origin from embed_configs if available, otherwise use iframe info
   const templateTags = getAllTemplateTagsInQuery(sql);
 
+  // Get all template tags in the query (we don't have access to snippets here, so pass undefined)
   const cardData = {
     "dataset_query": {
       "database": databaseId,
@@ -186,7 +188,11 @@ function generateMetabaseQuestionURL(origin: string, sql: string, databaseId: nu
   };
 
   const hash = btoa(JSON.stringify(cardData));
-  return `${origin}/question#${hash}`;
+  const origin = embedConfigs.embed_host;
+  if (!origin) {
+     return `${getOrigin()}/question#${hash}`;
+  }
+  return `${origin}/question?hash=${hash}`;
 }
 
 function extractLastSQLFromMessages(messages: any[], currentMessageIndex: number): string | null {
@@ -232,7 +238,8 @@ export function Markdown({content, messageIndex}: {content: string, messageIndex
   const settings = useSelector((state: RootState) => ({
     selectedCatalog: state.settings.selectedCatalog,
     availableCatalogs: state.settings.availableCatalogs,
-    modelsMode: state.settings.modelsMode
+    modelsMode: state.settings.modelsMode,
+    embed_configs: state.settings.embed_configs
   }));
   const mxModels = useSelector((state: RootState) => state.cache.mxModels);
 
@@ -250,13 +257,10 @@ export function Markdown({content, messageIndex}: {content: string, messageIndex
         }
 
         if (lastSQL) {
-          // Get Metabase origin from iframe info
-          const metabaseOrigin = getOrigin();
-          
           // Get current database ID from app state
           const databaseId = toolContext?.dbId || null;
 
-          const questionURL = generateMetabaseQuestionURL(metabaseOrigin, lastSQL, databaseId);
+          const questionURL = generateMetabaseQuestionURL(lastSQL, databaseId, settings.embed_configs);
 
           return renderString(content, {
             'MX_LAST_SQL_URL': `\n\n --- \n\n Continue your analysis [here](${questionURL})`

web/src/state/settings/reducer.ts

@@ -99,6 +99,10 @@ export interface SaveCatalogPayload extends Omit<ContextCatalog, 'allowWrite'> {
   currentUserId: string
 }
 
+export interface EmbedConfigs {
+  embed_host?: string
+}
+
 interface Settings {
   isLocal: boolean,
   uploadLogs: boolean,
@@ -136,6 +140,7 @@ interface Settings {
   manuallyLimitContext: boolean
   useV2States: boolean
   currentEmail?: string
+  embed_configs: EmbedConfigs
 }
 
 const initialState: Settings = {
@@ -176,7 +181,8 @@ const initialState: Settings = {
   metadataHashes: {},
   metadataProcessingCache: {},
   manuallyLimitContext: false,
-  useV2States: true
+  useV2States: true,
+  embed_configs: {}
 }
 
 export const settingsSlice = createSlice({
@@ -410,6 +416,9 @@ export const settingsSlice = createSlice({
     },
     setUseV2States: (state, action: PayloadAction<boolean>) => {
       state.useV2States = action.payload
+    },
+    setEmbedConfigs: (state, action: PayloadAction<EmbedConfigs>) => {
+      state.embed_configs = action.payload
     }
   },
 })
@@ -422,7 +431,7 @@ export const { updateIsLocal, updateUploadLogs,
   setIframeInfo, setConfirmChanges, setDemoMode, setAppRecording, setAiRules,
   applyTableDiff, setSelectedModels, setDRMode, setAnalystMode, setSelectedCatalog, saveCatalog, deleteCatalog, setMemberships,
   setGroupsEnabled, resetDefaultTablesDB, setModelsMode, setViewAllCatalogs, setEnableHighlightHelpers, setUseMemory, addMemory, setCustomCSS, setEnableStyleCustomization, setEnableUserDebugTools, setEnableReviews, setMetadataHash, setMetadataProcessingCache, clearMetadataProcessingCache,
-  updateManualContextSelection, setUseV2States, setCurrentEmail
+  updateManualContextSelection, setUseV2States, setCurrentEmail, setEmbedConfigs
 } = settingsSlice.actions
 
 export default settingsSlice.reducer

web/src/state/store.ts

@@ -530,14 +530,20 @@ const migrations = {
     })
     newState.chat.last_warmed_on = latestMessageTime
     return newState
+  },
+  53: (state: RootState) => {
+    let newState = {...state}
+    // Add embed_configs to settings
+    newState.settings.embed_configs = {}
+    return newState
   }
 }
 
 const BLACKLIST = ['billing', 'cache', userStateApi.reducerPath]
 
 const persistConfig = {
   key: 'root',
-  version: 52,
+  version: 53,
   storage,
   blacklist: BLACKLIST,
   // @ts-ignore