dont wait for db id (#292)

* show mx on all pages

* choose if only db, null if otherwise

* handle all cases when dbid is null

* wip random page

* make collections page work

* Update dbId detection message in TaskUI

---------

Co-authored-by: Sreejith <1743700+ppsreejith@users.noreply.github.com>

Author: nuwandavek

apps/src/metabase/appController.ts

@@ -426,7 +426,7 @@ export class MetabaseController extends AppController<MetabaseAppState> {
             // return await this.updateSQLQuery({ sql, executeImmediately: true, _type: "csv", ctes: _ctes });
         // }
     }
-    else if (pageType === 'dashboard') {
+    else if ((pageType === 'dashboard') || (pageType === 'unknown')) {
         // if (hasTemplateTagsOrParams) {
             return await this.runSQLQueryWithParams({ sql, template_tags, parameters, ctes: _ctes });
         // } else {

apps/src/metabase/appState.ts

@@ -133,12 +133,12 @@ export class MetabaseState extends DefaultAppState<MetabaseAppState> {
     const getState = this.useStore().getState
     const dbId = await getSelectedDbId();
     let toolEnabledNew = shouldEnable(elements, url);
-    if (dbId === undefined || dbId === null) {
-      toolEnabledNew = {
-        value: false,
-        reason: "Unable to detect correct database. Please navigate to a SQL query page to enable MinusX."
-      }
-    }
+    // if (dbId === undefined || dbId === null) {
+    //   toolEnabledNew = {
+    //     value: false,
+    //     reason: "Unable to detect correct database. Please navigate to a SQL query page to enable MinusX."
+    //   }
+    // }
     const pageType: MetabasePageType = determineMetabasePageType(elements, url);
     getState().update((oldState) => ({
       ...oldState,
@@ -527,30 +527,6 @@ function determineMetabasePageType(elements: DOMQueryMapResponse, url: string):
 }
 
 function shouldEnable(elements: DOMQueryMapResponse, url: string) {
-  const hash = btoa(JSON.stringify({
-        "dataset_query": {
-            "database": null,
-            "type": "native",
-            "native": {
-                "query": "",
-                "template-tags": {}
-            }
-        },
-        "display": "table",
-        "parameters": [],
-        "visualization_settings": {},
-        "type": "question"
-    }))
-  const SQLQueryURL = new URL(url).origin + '/question#' + hash;
-  const MBQLURL = new URL(url).origin + '/question/notebook';
-  const reason = `To use MinusX on Metabase, head over to the [SQL query](${SQLQueryURL}), [Question Builder](${MBQLURL}) or any of your Dashboard pages!`
-  const metabasePageType = determineMetabasePageType(elements, url);
-  if (metabasePageType === 'unknown') {
-    return {
-        value: false,
-        reason: reason
-    };
-  }
   return {
     value: true,
     reason: "",

apps/src/metabase/helpers/DOMToState.ts

@@ -17,6 +17,7 @@ import { catalogAsModels } from 'web';
 import { canUseModelsModeForCatalog } from '../../../../web/src/helpers/catalogAsModels';
 import { getMBQLAppState } from './mbql/appState';
 import { isMBQLPageUrl, MBQLInfo } from './mbql/utils';
+import { isSQLPageUrl } from './sql/utils';
 import { getModelsWithFields, getSelectedAndRelevantModels, modifySqlForMetabaseModels} from './metabaseModels';
 import { MetabaseAppStateSQLEditorV2, MetabaseAppStateType, processCard } from './analystModeTypes';
 import { MetabaseTableOrModel } from './metabaseAPITypes';
@@ -181,6 +182,7 @@ export async function convertDOMtoStateSQLQueryV2() : Promise<MetabaseAppStateSQ
   const sqlErrorMessage = await getSqlErrorMessage();
   // add tables in the sql as relevant tables, after fetching their fields
   let relevantTablesWithFields: FormattedTable[] = []
+  const pageType = isSQLPageUrl(metabaseUrl) ? MetabaseAppStateType.SQLEditor : MetabaseAppStateType.RandomPage;
   {
       const dbTables = await getAllRelevantTablesForSelectedDb(dbId || 0)
       const sqlTables = await getTablesFromSqlRegex(sqlQuery)
@@ -198,7 +200,7 @@ export async function convertDOMtoStateSQLQueryV2() : Promise<MetabaseAppStateSQ
       relevantTablesWithFields = sqlTablesWithFields
   }
   return {
-    type: MetabaseAppStateType.SQLEditor,
+    type: pageType,
     version: '2',
     metabaseOrigin,
     metabaseUrl,
@@ -346,10 +348,6 @@ export async function convertDOMtoState() {
   if (isMBQLPageUrl(url) || (qlType === 'query')) {
     return await convertDOMtoStateMBQLQuery();
   }
-//   const appSettings = RPCs.getAppSettings()
-//   if(appSettings.semanticPlanner) {
-//     return await semanticQueryState();
-//   }
   const appSettings = RPCs.getAppSettings()
   if (appSettings.useV2States && appSettings.analystMode) {
     return await convertDOMtoStateSQLQueryV2();

apps/src/metabase/helpers/analystModeTypes.ts

@@ -8,7 +8,8 @@ export enum MetabaseAppStateType {
     SQLEditor = 'metabaseSQLEditor',
     Dashboard = 'metabaseDashboard',
     SemanticQuery = 'metabaseSemanticQuery',
-    MBQLEditor = 'metabaseMBQLEditor'
+    MBQLEditor = 'metabaseMBQLEditor',
+    RandomPage = 'metabaseRandomPage'
 }
 
 interface MetabaseAppStateBase {
@@ -22,7 +23,7 @@ interface MetabaseAppStateBase {
 }
 
 export interface MetabaseAppStateSQLEditorV2 extends MetabaseAppStateBase {
-  type: MetabaseAppStateType.SQLEditor
+  type: MetabaseAppStateType.SQLEditor | MetabaseAppStateType.RandomPage
   version: '2'
   currentCard: Card
   outputMarkdown: string

apps/src/metabase/helpers/metabaseStateAPI.ts

@@ -57,11 +57,26 @@ export async function getSelectedDbId(): Promise<number | undefined> {
       dbId = parseInt(dbId);
     } catch (e) {}
   } else {
-    // this works for both MBQL and SQL pages
+    // this works for all pages
+    // if there is only one database, it will return the id
+    // else if there is only one non-sample database, it will return the id
+    // else (0 dbs, or >1 non sample dbs) it will return undefined
     dbId = await getMetabaseState('qb.card.dataset_query.database');
     if (!dbId) {
         const entity_dbs = await getMetabaseState('entities.databases') as object;
-        dbId = _.find(entity_dbs, (db: any) => !db.is_sample)?.id || Object.keys(entity_dbs)[0];
+        const all_dbs = Object.entries(entity_dbs)
+        if (all_dbs.length === 1) {
+            dbId = all_dbs[0][1].id;
+        }
+        else {
+            const non_sample_dbs = all_dbs.filter(([key, value]) => !value.is_sample)
+            if (non_sample_dbs.length > 1) {
+                console.log('More than one DB found', non_sample_dbs);
+            }
+            else {
+                dbId = non_sample_dbs[0][1].id;
+            }
+        }
     }
   }
 

apps/src/metabase/helpers/sql/utils.ts

@@ -0,0 +1,3 @@
+export const isSQLPageUrl = (url: string) => {
+  return url.includes('/question');
+}

web/src/components/common/ChatContent.tsx

@@ -15,7 +15,7 @@ export const ChatContent: React.FC<{content: ChatMessageContent, messageIndex?:
   const url = useAppStore((state) => state.toolContext)?.url || ''
   const pageType = useAppStore((state) => state.toolContext)?.pageType || ''
   if (content.type == 'DEFAULT') {
-    const contentText = (pageType === 'dashboard' && role === 'assistant') ? `${content.text} {{MX_LAST_SQL_URL}}` : content.text;
+    const contentText = ((pageType === 'dashboard' || pageType === 'unknown') && role === 'assistant') ? `${content.text} {{MX_LAST_SQL_URL}}` : content.text;
     return (
       <div>
         {content.images.map(image => (

web/src/components/common/TaskUI.tsx

@@ -248,9 +248,24 @@ const TaskUI = forwardRef<HTMLTextAreaElement>((_props, ref) => {
         toastDescription = "Please enter a valid message/question"
         preventRunTask = true
     }
-    else if (isUndefined(get(toolContext, 'dbId'))) {
+    else if (isUndefined(get(toolContext, 'dbId')) && toolContext.pageType == 'sql') {
         toastTitle = 'No database selected'
-        toastDescription = "Please select a database"
+        toastDescription = "You can select a specific database to use in the top left corner of the SQL editor"
+        preventRunTask = true
+    }
+    else if (isUndefined(get(toolContext, 'dbId')) && toolContext.pageType == 'mbql') {
+        toastTitle = 'No database selected'
+        toastDescription = "You can select a specific database by selecting any table / model as data source"
+        preventRunTask = true
+    }
+    else if (isUndefined(get(toolContext, 'dbId')) && toolContext.pageType == 'dashboard') {
+        toastTitle = 'No database selected'
+        toastDescription = "We can't tell which database to use! You can select a database either in the SQL editor or by selecting a table or model in the MBQL editor"
+        preventRunTask = true
+    }
+    else if (isUndefined(get(toolContext, 'dbId')) && toolContext.pageType == 'unknown') {
+        toastTitle = 'No database selected'
+        toastDescription = "We can't tell which database to use! You can select a database by navigating to a dashboard, the SQL editor, or the MBQL editor"
         preventRunTask = true
     }
     else if (toolContext.pageType === 'dashboard' && (!drMode)) {