Account for null schemas

metabase · Apr 4, 2024 · 4f5c4e9 · 4f5c4e9
1 parent 8a2fb07
commit 4f5c4e9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/frontend/src/metabase-types/api/table.ts b/frontend/src/metabase-types/api/table.ts
@@ -30,7 +30,7 @@ export interface Table {
   db_id: DatabaseId;
   db?: Database;
 
-  schema: SchemaName;
+  schema: SchemaName | null;
 
   fks?: ForeignKey[];
   fields?: Field[];

diff --git a/frontend/src/metabase/common/components/DataPicker/types.ts b/frontend/src/metabase/common/components/DataPicker/types.ts
@@ -45,7 +45,7 @@ export type ModelItem = {
 export type TablePickerValue = {
   id: TableId;
   db_id: DatabaseId;
-  schema?: SchemaName;
+  schema: SchemaName;
 };
 
 export type NotebookDataPickerFolderItem =

diff --git a/frontend/src/metabase/common/components/DataPicker/utils.ts b/frontend/src/metabase/common/components/DataPicker/utils.ts
@@ -37,7 +37,7 @@ export const tablePickerValueFromTable = (
   return {
     db_id: table.db_id,
     id: table.id,
-    schema: table.schema,
+    schema: table.schema ?? "",
   };
 };
 
@@ -47,7 +47,7 @@ const tablePickerValueFromTableEntity = (
   return {
     db_id: table.db_id,
     id: table.id,
-    schema: table.schema_name ?? table.schema?.name,
+    schema: table.schema_name ?? table.schema?.name ?? "",
   };
 };
 
@@ -66,15 +66,15 @@ export const getDbItem = (
 };
 
 export const getSchemaItem = (
-  schemaName: SchemaName | undefined,
+  schemaName: SchemaName | undefined | null,
 ): NotebookDataPickerFolderItem | null => {
   if (typeof schemaName === "undefined") {
     return null;
   }
 
   const name = getSchemaDisplayName(schemaName);
 
-  return { model: "schema", id: schemaName, name };
+  return { model: "schema", id: schemaName ?? "", name };
 };
 
 export const getTableItem = (
@@ -91,8 +91,10 @@ export const getTableItem = (
   return { model: "table", id: tableId, name };
 };
 
-export const getSchemaDisplayName = (schemaName: SchemaName | undefined) => {
-  if (typeof schemaName === "undefined") {
+export const getSchemaDisplayName = (
+  schemaName: SchemaName | undefined | null,
+) => {
+  if (!schemaName) {
     return "";
   }