Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Remove Schema entity (#74085)

Romeo Van Snicke1c681f33748
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx
index 8701d747050..35d1fec7165 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx
@@ -1,16 +1,19 @@
/* eslint-disable react/prop-types */
import cx from "classnames";
-import { Component } from "react";
+import { Component, useCallback } from "react";
import { t } from "ttag";
import _ from "underscore";
-import { useSearchQuery } from "metabase/api";
+import {
+ useLazyListDatabaseSchemaTablesQuery,
+ useLazyListDatabaseSchemasQuery,
+ useSearchQuery,
+} from "metabase/api";
import { EmptyState } from "metabase/common/components/EmptyState";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { Databases } from "metabase/entities/databases";
import { Questions } from "metabase/entities/questions";
-import { Schemas } from "metabase/entities/schemas";
import { Tables } from "metabase/entities/tables";
import { connect } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
@@ -22,6 +25,7 @@ import {
getQuestionIdFromVirtualTableId,
isVirtualCardId,
} from "metabase-lib/v1/metadata/utils/saved-questions";
+import { parseSchemaId } from "metabase-lib/v1/metadata/utils/schema";
import DataBucketPicker from "../DataSelectorDataBucketPicker";
import DatabasePicker from "../DataSelectorDatabasePicker";
@@ -857,6 +861,37 @@ export class UnconnectedDataSelector extends Component {
}
}
+// Exposes `fetchSchemas` / `fetchSchemaTables` as props backed by RTK's lazy
+// query triggers. The triggers' subscriptions are tied to this wrapper's
+// lifecycle, so the cache is released when the DataSelector unmounts.
+function withSchemaFetchers(WrappedComponent) {
+ return function DataSelectorWithSchemaFetchers(props) {
+ const [triggerListSchemas] = useLazyListDatabaseSchemasQuery();
+ const [triggerListSchemaTables] = useLazyListDatabaseSchemaTablesQuery();
+
+ const fetchSchemas = useCallback(
+ (databaseId) => triggerListSchemas({ id: databaseId }).unwrap(),
+ [triggerListSchemas],
+ );
+
+ const fetchSchemaTables = useCallback(
+ (schemaId) => {
+ const [dbId, schema] = parseSchemaId(schemaId);
+ return triggerListSchemaTables({ id: dbId, schema }).unwrap();
+ },
+ [triggerListSchemaTables],
+ );
+
+ return (
+ <WrappedComponent
+ {...props}
+ fetchSchemas={fetchSchemas}
+ fetchSchemaTables={fetchSchemaTables}
+ />
+ );
+ };
+}
+
// If there is at least one model, we want to display a slightly different
// data picker view (see DATA_BUCKET step). Pre-fetches available models via
// search and exposes them as `metadata`/`loading`/`loaded` props.
@@ -887,6 +922,7 @@ const DataSelector = _.compose(
query: { saved: true },
}),
withAvailableModels,
+ withSchemaFetchers,
connect(
(state, ownProps) => ({
// `metadata` exposes the search response (available_models, etc.). Not to
@@ -910,9 +946,6 @@ const DataSelector = _.compose(
}),
{
fetchDatabases: () => Databases.actions.fetchList({ saved: true }),
- fetchSchemas: (databaseId) =>
- Schemas.actions.fetchList({ dbId: databaseId }),
- fetchSchemaTables: (schemaId) => Schemas.actions.fetch({ id: schemaId }),
fetchFields: (tableId) => Tables.actions.fetchMetadata({ id: tableId }),
fetchQuestion: (id) =>
Questions.actions.fetch({
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
index 22b4ba6c1ee..9ed69e3e289 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
@@ -11,6 +11,7 @@ import { Icon } from "metabase/ui";
import { isSyncCompleted } from "metabase/utils/syncing";
import type Database from "metabase-lib/v1/metadata/Database";
import type Schema from "metabase-lib/v1/metadata/Schema";
+import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import DataSelectorLoading from "../DataSelectorLoading";
import { RawDataBackButton } from "../RawDataBackButton";
@@ -62,7 +63,7 @@ const DataSelectorDatabaseSchemaPicker = ({
!database.is_saved_questions && database.getSchemas().length > 1
? database.getSchemas().map((schema) => ({
schema,
- name: tc(schema.displayName()) ?? "",
+ name: tc(getSchemaDisplayName(schema.name)) ?? "",
}))
: [],
className: database.is_saved_questions ? CS.bgLight : undefined,
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
index 1b4b5810b22..9802d412a8f 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
@@ -3,6 +3,7 @@ import { render, renderWithProviders, screen } from "__support__/ui";
import { createMockState } from "metabase/redux/store/mocks";
import { getMetadata } from "metabase/selectors/metadata";
import { checkNotNull } from "metabase/utils/types";
+import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import { createMockDatabase, createMockSchema } from "metabase-types/api/mocks";
import DataSelectorDatabaseSchemaPicker from "./DataSelectorDatabaseSchemaPicker";
@@ -45,12 +46,8 @@ describe("DataSelectorDatabaseSchemaPicker", () => {
id: 1,
name: databaseName,
getSchemas: () => [
- {
- displayName: () => schemaName,
- },
- {
- displayName: () => "another schema name",
- },
+ { name: schemaName },
+ { name: "another schema name" },
],
},
];
@@ -58,7 +55,9 @@ describe("DataSelectorDatabaseSchemaPicker", () => {
render(<DataSelectorDatabaseSchemaPicker databases={databases} />);
expect(screen.getByText(databaseName)).toBeInTheDocument();
- expect(screen.getByText(schemaName)).toBeInTheDocument();
+ expect(
+ screen.getByText(getSchemaDisplayName(schemaName)),
+ ).toBeInTheDocument();
});
it("displays Saved Questions if it's about saved questions", () => {
@@ -71,12 +70,8 @@ describe("DataSelectorDatabaseSchemaPicker", () => {
is_saved_questions: true,
name: databaseName,
getSchemas: () => [
- {
- displayName: () => schemaName,
- },
- {
- displayName: () => "another schema name",
- },
+ { name: schemaName },
+ { name: "another schema name" },
],
},
];
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
index bc40c47018a..e8053881412 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
@@ -3,6 +3,7 @@ import CS from "metabase/css/core/index.css";
import { useTranslateContent } from "metabase/i18n/hooks";
import { Box, Icon } from "metabase/ui";
import type Schema from "metabase-lib/v1/metadata/Schema";
+import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import type { SchemaId } from "metabase-types/api";
import { CONTAINER_WIDTH } from "../constants";
@@ -31,7 +32,7 @@ const DataSelectorSchemaPicker = ({
const sections = [
{
items: schemas.map((schema) => ({
- name: tc(schema.displayName()),
+ name: tc(getSchemaDisplayName(schema.name)),
schema: schema,
})),
},
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js b/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js
index a9360f89cfc..00bf79cb6e6 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js
@@ -1,13 +1,16 @@
import { render, screen } from "__support__/ui";
+import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import DataSelectorSchemaPicker from "./DataSelectorSchemaPicker";
describe("DataSelectorSchemaPicker", () => {
it("displays schema name", () => {
const schemaName = "Schema name";
- const schemas = [{ displayName: () => schemaName }];
+ const schemas = [{ name: schemaName }];
render(<DataSelectorSchemaPicker schemas={schemas} />);
- expect(screen.getByText(schemaName)).toBeInTheDocument();
+ expect(
+ screen.getByText(getSchemaDisplayName(schemaName)),
+ ).toBeInTheDocument();
});
});
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx
index 03b6c714e44..f60e746ac89 100644
--- a/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx
+++ b/enterprise/frontend/src/embedding/data-picker/DataSelectorTablePicker/DataSelectorTablePicker.tsx
@@ -20,6 +20,7 @@ import { isNotNull } from "metabase/utils/types";
import type Database from "metabase-lib/v1/metadata/Database";
import type Schema from "metabase-lib/v1/metadata/Schema";
import type Table from "metabase-lib/v1/metadata/Table";
+import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import DataSelectorSectionHeader from "../DataSelectorSectionHeader";
import { CONTAINER_WIDTH } from "../constants";
@@ -205,7 +206,7 @@ const Header = ({
/
</Box>
<Box component="span" data-testid="source-schema" c="text-secondary">
- {tc(selectedSchema.displayName())}
+ {tc(getSchemaDisplayName(selectedSchema.name))}
</Box>
</>
)}
diff --git a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/graph.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/graph.unit.spec.ts
index 8718f2b14a8..e91e8dafb80 100644
--- a/enterprise/frontend/src/metabase-enterprise/advanced_permissions/graph.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/advanced_permissions/graph.unit.spec.ts
@@ -1,5 +1,4 @@
import Database from "metabase-lib/v1/metadata/Database";
-import Schema from "metabase-lib/v1/metadata/Schema";
import {
DataPermission,
DataPermissionValue,
@@ -21,14 +20,11 @@ const database = new Database({
tables: [tableId],
});
-// mock out schemas as real Schema
database.schemas = [
- new Schema(
- createMockSchema({
- id: "100",
- name: schema,
- }),
- ),
+ createMockSchema({
+ id: "100",
+ name: schema,
+ }),
];
const createGraph = (viewPermissions: SchemasPermissions) => ({
diff --git a/frontend/src/metabase-lib/v1/metadata/Schema.ts b/frontend/src/metabase-lib/v1/metadata/Schema.ts
index e9da5e4673f..1853a2daa8d 100644
--- a/frontend/src/metabase-lib/v1/metadata/Schema.ts
+++ b/frontend/src/metabase-lib/v1/metadata/Schema.ts
@@ -1,38 +1,19 @@
-import { humanize, titleize } from "metabase/utils/formatting";
import type { NormalizedSchema } from "metabase-types/api";
import type Database from "./Database";
import type Metadata from "./Metadata";
import type Table from "./Table";
-interface Schema extends Omit<NormalizedSchema, "database" | "tables"> {
- database?: Database;
- tables?: Table[];
- metadata?: Metadata;
-}
-
/**
+ * Schema as seen by the metadata layer — `NormalizedSchema` with `database`
+ * and `tables` replaced by their hydrated counterparts.
+ *
* @deprecated use RTK Query endpoints and plain api objects from metabase-types/api
*/
-class Schema {
- private readonly _plainObject: NormalizedSchema;
-
- constructor(schema: NormalizedSchema) {
- this._plainObject = schema;
- Object.assign(this, schema);
- }
-
- getPlainObject() {
- return this._plainObject;
- }
-
- displayName() {
- return this.name ? titleize(humanize(this.name)) : null;
- }
-
- getTables() {
- return this.tables ?? [];
- }
+export interface Schema extends Omit<NormalizedSchema, "database" | "tables"> {
+ database?: Database;
+ tables?: Table[];
+ metadata?: Metadata;
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
diff --git a/frontend/src/metabase-lib/v1/metadata/Schema.unit.spec.ts b/frontend/src/metabase-lib/v1/metadata/Schema.unit.spec.ts
deleted file mode 100644
index 6793eafa330..00000000000
--- a/frontend/src/metabase-lib/v1/metadata/Schema.unit.spec.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { createMockMetadata } from "__support__/metadata";
-import type { Table } from "metabase-types/api";
-import { createMockTable } from "metabase-types/api/mocks";
-
-const TEST_TABLE = createMockTable({
- schema: "foo_bar",
-});
-
-interface SetupOpts {
- table?: Table;
-}
-
-const setup = ({ table = TEST_TABLE }: SetupOpts = {}) => {
- const metadata = createMockMetadata({ tables: [table] });
- const instance = metadata.table(table.id)?.schema;
- if (!instance) {
- throw new TypeError();
- }
-
- return instance;
-};
-
-describe("Schema", () => {
- describe("displayName", () => {
- it("should return a formatted `name` string", () => {
- const schema = setup();
- expect(schema.displayName()).toBe("Foo Bar");
- });
- });
-});
diff --git a/frontend/src/metabase-lib/v1/metadata/Table.ts b/frontend/src/metabase-lib/v1/metadata/Table.ts
index 144562207cc..56cc60bfc6b 100644
--- a/frontend/src/metabase-lib/v1/metadata/Table.ts
+++ b/frontend/src/metabase-lib/v1/metadata/Table.ts
@@ -11,6 +11,7 @@ import type Field from "./Field";
import type ForeignKey from "./ForeignKey";
import type Metadata from "./Metadata";
import type Schema from "./Schema";
+import { getSchemaDisplayName } from "./utils/schema";
interface Table extends Omit<
NormalizedTable,
@@ -71,8 +72,9 @@ class Table {
displayName({ includeSchema }: { includeSchema?: boolean } = {}) {
return (
- (includeSchema && this.schema ? this.schema.displayName() + "." : "") +
- this.display_name
+ (includeSchema && this.schema
+ ? getSchemaDisplayName(this.schema.name) + "."
+ : "") + this.display_name
);
}
diff --git a/frontend/src/metabase-lib/v1/metadata/utils/schema.ts b/frontend/src/metabase-lib/v1/metadata/utils/schema.ts
index 5951f3580f8..57be8feeb10 100644
--- a/frontend/src/metabase-lib/v1/metadata/utils/schema.ts
+++ b/frontend/src/metabase-lib/v1/metadata/utils/schema.ts
@@ -1,5 +1,10 @@
+import { humanize, titleize } from "metabase/utils/formatting";
import type { DatabaseId, SchemaId, SchemaName } from "metabase-types/api";
+export const getSchemaDisplayName = (
+ name: SchemaName | null | undefined,
+): string | null => (name ? titleize(humanize(name)) : null);
+
export const getSchemaName = (id: string | null | undefined): SchemaId => {
return parseSchemaId(id)[1];
};
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
index f10e29bc2d3..8f23b212a4d 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/data-sidebar.ts
@@ -91,8 +91,7 @@ const getTablesSidebar = (
name: schema.name,
entityId: getSchemaEntityId(schema),
icon: "folder" as const,
- children: schema
- .getTables()
+ children: (schema.tables ?? [])
.sort((a, b) => a.displayName().localeCompare(b.displayName()))
.map((table) => ({
id: getTableId(table.id),
diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
index 34cf896615a..50b7b7e168a 100644
--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/permission-editor.tsx
@@ -255,8 +255,7 @@ export const getDatabasesPermissionEditor = createSelector(
? database.getSchemas()[0]
: (database.schema(schemaName) as Schema);
permissionSubject = "fields";
- entities = schema
- .getTables()
+ entities = (schema.tables ?? [])
.sort((a, b) => a.display_name.localeCompare(b.display_name))
.map((table) => {
const entityId = getTableEntityId(table);
diff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.ts b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.ts
index fa8e2ea81dd..3fb834cd096 100644
--- a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.ts
+++ b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.ts
@@ -25,7 +25,7 @@ import {
// subtypes to make testing easier and avoid using deprecated Database / Schema types
type SchemaPartial = {
name: string;
- getTables: () => { id: number | string }[];
+ tables?: { id: number | string }[];
};
type DatabasePartial = {
schemas?: SchemaPartial[];
@@ -63,7 +63,7 @@ export function hasPermissionValueInSubgraph(
}
return schemasToSearch.some((schema) => {
- return schema.getTables().some((table) => {
+ return (schema.tables ?? []).some((table) => {
return (
value ===
getFieldsPermission(
diff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.unit.spec.ts b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.unit.spec.ts
index 1fda49e36f7..b6299657720 100644
--- a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.unit.spec.ts
+++ b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/has.unit.spec.ts
@@ -12,7 +12,7 @@ import { hasPermissionValueInSubgraph } from "./has";
describe("data permissions", () => {
describe("hasPermissionValueInSubgraph", () => {
it("should handle database entity ids", async () => {
- const schemas = [{ name: "", getTables: () => [{ id: 1 }, { id: 2 }] }];
+ const schemas = [{ name: "", tables: [{ id: 1 }, { id: 2 }] }];
const database = {
schemas,
schema: (name: string) =>
@@ -73,8 +73,8 @@ describe("data permissions", () => {
it("should handle databases with multiple schemas", async () => {
const schemas = [
- { name: "public", getTables: () => [{ id: 1 }] },
- { name: "public2", getTables: () => [{ id: 2 }] },
+ { name: "public", tables: [{ id: 1 }] },
+ { name: "public2", tables: [{ id: 2 }] },
];
const database = {
schemas,
@@ -109,8 +109,8 @@ describe("data permissions", () => {
it("should handle schema entity ids", async () => {
const schemas = [
- { name: "public", getTables: () => [{ id: 1 }] },
- { name: "public2", getTables: () => [{ id: 2 }] },
+ { name: "public", tables: [{ id: 1 }] },
+ { name: "public2", tables: [{ id: 2 }] },
];
const database = {
schemas,
@@ -176,8 +176,8 @@ describe("data permissions", () => {
it("should handle default permissions omitted from the graph", async () => {
const schemas = [
- { name: "public", getTables: () => [{ id: 1 }] },
- { name: "public2", getTables: () => [{ id: 2 }] },
+ { name: "public", tables: [{ id: 1 }] },
+ { name: "public2", tables: [{ id: 2 }] },
];
const database = {
schemas,
diff --git a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/update.ts b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/update.ts
index 0a40fdd4f2b..ef73d3ef547 100644
--- a/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/update.ts
+++ b/frontend/src/metabase/admin/permissions/utils/graph/data-permissions/update.ts
@@ -109,7 +109,7 @@ export function updateTablesPermission(
permission: DataPermission,
) {
const schema = database.schema(schemaName);
- const tableIds = schema?.getTables().map((t: Table) => t.id);
+ const tableIds = schema?.tables?.map((t: Table) => t.id);
permissions = updateSchemasPermission(
permissions,
diff --git a/frontend/src/metabase/api/database.ts b/frontend/src/metabase/api/database.ts
index e85dafcb7d9..cd13edd8d7b 100644
--- a/frontend/src/metabase/api/database.ts
+++ b/frontend/src/metabase/api/database.ts
@@ -1,5 +1,11 @@
import { updateMetadata } from "metabase/redux/metadata";
-import { DatabaseSchema, FieldSchema, TableSchema } from "metabase/schema";
+import {
+ DatabaseSchema,
+ FieldSchema,
+ SchemaSchema,
+ TableSchema,
+} from "metabase/schema";
+import { generateSchemaId } from "metabase-lib/v1/metadata/utils/schema";
import type {
AutocompleteRequest,
AutocompleteSuggestion,
@@ -38,6 +44,13 @@ import {
} from "./tags";
import { handleQueryFulfilled } from "./utils/lifecycle";
+const toNormalizedSchemas = (dbId: DatabaseId, schemaNames: SchemaName[]) =>
+ schemaNames.map((schemaName) => ({
+ id: generateSchemaId(dbId, schemaName),
+ name: schemaName,
+ database: { id: dbId },
+ }));
+
export const databaseApi = Api.injectEndpoints({
endpoints: (builder) => ({
listDatabases: builder.query<
@@ -116,6 +129,14 @@ export const databaseApi = Api.injectEndpoints({
listTag("schema"),
...schemas.map((schema) => idTag("schema", schema)),
],
+ onQueryStarted: ({ id }, { queryFulfilled, dispatch }) =>
+ handleQueryFulfilled(queryFulfilled, (schemaNames) =>
+ dispatch(
+ updateMetadata(toNormalizedSchemas(id, schemaNames), [
+ SchemaSchema,
+ ]),
+ ),
+ ),
}),
listSyncableDatabaseSchemas: builder.query<SchemaName[], DatabaseId>({
query: (id) => ({
@@ -126,6 +147,14 @@ export const databaseApi = Api.injectEndpoints({
listTag("schema"),
...schemas.map((schema) => idTag("schema", schema)),
],
+ onQueryStarted: (id, { queryFulfilled, dispatch }) =>
+ handleQueryFulfilled(queryFulfilled, (schemaNames) =>
+ dispatch(
+ updateMetadata(toNormalizedSchemas(id, schemaNames), [
+ SchemaSchema,
+ ]),
+ ),
+ ),
}),
listDatabaseSchemaTables: builder.query<
Table[],
diff --git a/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx b/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx
index 873b9cab02f..cd6a23daa55 100644
--- a/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx
+++ b/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx
@@ -1,25 +1,28 @@
import cx from "classnames";
import { t } from "ttag";
+import { useListDatabaseSchemasQuery } from "metabase/api";
import { TableBrowser } from "metabase/browse/tables/TableBrowser";
import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";
+import { NotFound } from "metabase/common/components/ErrorPages";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { Databases } from "metabase/entities/databases";
-import { Schemas } from "metabase/entities/schemas";
import { Flex } from "metabase/ui";
import * as Urls from "metabase/urls";
-import type { CollectionItem } from "metabase-types/api";
import { BrowseCard } from "../components/BrowseCard";
import S from "../components/BrowseContainer.module.css";
import { BrowseDataHeader } from "../components/BrowseDataHeader";
import { BrowseGrid } from "../components/BrowseGrid";
+type Schema = { id: string; name: string };
+
const BrowseSchemasContainer = ({
schemas,
params,
}: {
- schemas: CollectionItem[];
+ schemas: Schema[];
params: any;
}) => {
const { slug } = params;
@@ -82,8 +85,29 @@ const BrowseSchemasContainer = ({
);
};
-export const BrowseSchemas = Schemas.loadList({
- query: (state: any, { params: { slug } }: { params: { slug: string } }) => ({
- dbId: Urls.extractEntityId(slug),
- }),
-})(BrowseSchemasContainer);
+export const BrowseSchemas = ({ params }: { params: { slug: string } }) => {
+ const dbId = Urls.extractEntityId(params.slug);
+
+ if (dbId == null) {
+ return <NotFound />;
+ }
+
+ return <BrowseSchemasForDatabase dbId={dbId} params={params} />;
+};
+
+const BrowseSchemasForDatabase = ({
+ dbId,
+ params,
+}: {
+ dbId: number;
+ params: { slug: string };
+}) => {
+ const { data, isLoading, error } = useListDatabaseSchemasQuery({ id: dbId });
+
+ if (isLoading || error) {
+ return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
+ }
+
+ const schemas: Schema[] = (data ?? []).map((name) => ({ id: name, name }));
+ return <BrowseSchemasContainer schemas={schemas} params={params} />;
+};
diff --git a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts b/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts
index 8e704fa6db1..3dae010e2a9 100644
--- a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts
+++ b/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts
@@ -45,7 +45,6 @@ export type EntityType =
| "pulses"
| "questions"
| "revisions"
- | "schemas"
| "search"
| "segments"
| "snippetCollections"
diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.ts
index e57d61af6b0..e30fce8eae6 100644
--- a/frontend/src/metabase/entities/index.ts
+++ b/frontend/src/metabase/entities/index.ts
@@ -74,7 +74,6 @@ export { Dashboards as dashboards } from "./dashboards";
export { Questions as questions } from "./questions";
export { Databases as databases } from "./databases";
-export { Schemas as schemas } from "./schemas";
export { Tables as tables } from "./tables";
export { Fields as fields } from "./fields";
diff --git a/frontend/src/metabase/entities/schemas.js b/frontend/src/metabase/entities/schemas.js
deleted file mode 100644
index c6c6566310d..00000000000
--- a/frontend/src/metabase/entities/schemas.js
+++ /dev/null
@@ -1,238 +0,0 @@
-import { assocIn, updateIn } from "icepick";
-import { useMemo } from "react";
-
-import {
- databaseApi,
- skipToken,
- useListDatabaseSchemaTablesQuery,
- useListDatabaseSchemasQuery,
- useListSyncableDatabaseSchemasQuery,
-} from "metabase/api";
-import { Questions } from "metabase/entities/questions";
-import { SchemaSchema } from "metabase/schema";
-import { getMetadata } from "metabase/selectors/metadata";
-import {
- SAVED_QUESTIONS_VIRTUAL_DB_ID,
- getCollectionVirtualSchemaId,
- getCollectionVirtualSchemaName,
- getQuestionVirtualTableId,
-} from "metabase-lib/v1/metadata/utils/saved-questions";
-import {
- generateSchemaId,
- parseSchemaId,
-} from "metabase-lib/v1/metadata/utils/schema";
-
-import { createEntity, entityCompatibleQuery } from "./utils";
-
-// This is a weird entity because we don't have actual schema objects
-
-/**
- * @deprecated use "metabase/api" instead
- */
-export const Schemas = createEntity({
- name: "schemas",
- schema: SchemaSchema,
-
- rtk: () => ({
- getUseGetQuery: () => ({
- useGetQuery,
- }),
- useListQuery,
- }),
-
- api: {
- list: async ({ dbId, getAll = false, ...args }, dispatch) => {
- if (!dbId) {
- throw new Error("Schemas can only be listed for a particular dbId");
- }
- const schemaNames = getAll
- ? await entityCompatibleQuery(
- dbId,
- dispatch,
- databaseApi.endpoints.listSyncableDatabaseSchemas, // includes empty schema
- )
- : await entityCompatibleQuery(
- { id: dbId, ...args },
- dispatch,
- databaseApi.endpoints.listDatabaseSchemas,
- );
-
- return schemaNames.map((schemaName) => ({
- // NOTE: needs unique IDs for entities to work correctly
- id: generateSchemaId(dbId, schemaName),
- name: schemaName,
- database: { id: dbId },
- }));
- },
- get: async ({ id, ...args }, options, dispatch) => {
- const [dbId, schemaName] = parseSchemaId(id);
- if (!dbId || schemaName === undefined) {
- throw new Error("Schemas ID is of the form dbId:schemaName");
- }
- const tables = await entityCompatibleQuery(
- { id: dbId, schema: schemaName, ...args },
- dispatch,
- databaseApi.endpoints.listDatabaseSchemaTables,
- );
- return {
- id,
- name: schemaName,
- tables: tables,
- database: { id: dbId },
- };
- },
- },
-
- selectors: {
- getObject: (state, { entityId }) => getMetadata(state).schema(entityId),
- },
-
- reducer: (state = {}, { type, payload, error }) => {
- if (type === Questions.actionTypes.CREATE && !error) {
- const { question, status, data } = payload;
- if (question) {
- const schema = getCollectionVirtualSchemaId(question.collection);
- if (!state[schema]) {
- return state;
- }
- const virtualQuestionId = getQuestionVirtualTableId(question.id);
- return updateIn(state, [schema, "tables"], (tables) =>
- addTableAvoidingDuplicates(tables, virtualQuestionId),
- );
- }
- // IF there is no question
- // AND if the request has failed,
- // throw the error message to display
- else if (status === 400 && data?.message) {
- throw new Error(data.message);
- }
- }
-
- if (type === Questions.actionTypes.UPDATE && !error) {
- const { question: card } = payload;
- const virtualSchemaId = getCollectionVirtualSchemaId(card.collection);
- const virtualSchemaName = getCollectionVirtualSchemaName(card.collection);
- const virtualQuestionId = getQuestionVirtualTableId(card.id);
- const previousSchemaContainingTheQuestion =
- getPreviousSchemaContainingTheQuestion(
- state,
- virtualSchemaId,
- virtualQuestionId,
- );
-
- if (previousSchemaContainingTheQuestion) {
- state = removeVirtualQuestionFromSchema(
- state,
- previousSchemaContainingTheQuestion.id,
- virtualQuestionId,
- );
- }
-
- if (!state[virtualSchemaId]) {
- state = assocIn(state, [virtualSchemaId], {
- id: virtualSchemaId,
- name: virtualSchemaName,
- database: SAVED_QUESTIONS_VIRTUAL_DB_ID,
- });
- }
-
- return updateIn(state, [virtualSchemaId, "tables"], (tables) => {
- if (!tables) {
- return tables;
- }
-
- if (card.archived) {
- return tables.filter((id) => id !== virtualQuestionId);
- }
- return addTableAvoidingDuplicates(tables, virtualQuestionId);
- });
- }
-
- return state;
- },
-});
-
-function getPreviousSchemaContainingTheQuestion(
- state,
- schemaId,
- virtualQuestionId,
-) {
- return Object.values(state).find((schema) => {
- if (schema.id === schemaId) {
- return false;
- }
-
- return (schema.tables || []).includes(virtualQuestionId);
- });
-}
-
-function removeVirtualQuestionFromSchema(state, schemaId, virtualQuestionId) {
- return updateIn(state, [schemaId, "tables"], (tables) =>
- tables.filter((tableId) => tableId !== virtualQuestionId),
- );
-}
-
-function addTableAvoidingDuplicates(tables, tableId) {
- if (!Array.isArray(tables)) {
- return [tableId];
- }
- return tables.includes(tableId) ? tables : [...tables, tableId];
-}
-
-const useGetQuery = (query, options) => {
- const { id, ...args } = query;
- const [dbId, schemaName] = parseSchemaId(id);
-
- if (query !== skipToken && (!dbId || schemaName === undefined)) {
- throw new Error("Schemas ID is of the form dbId:schemaName");
- }
-
- const finalQuery =
- query === skipToken ? skipToken : { id: dbId, schema: schemaName, ...args };
-
- const tables = useListDatabaseSchemaTablesQuery(finalQuery, options);
-
- const data = useMemo(() => {
- if (tables.isLoading || tables.error) {
- return tables.data;
- }
-
- return {
- id,
- name: schemaName,
- tables: tables.data,
- database: { id: dbId },
- };
- }, [id, schemaName, tables, dbId]);
-
- const result = useMemo(() => ({ ...tables, data }), [data, tables]);
-
- return result;
-};
-
-function useListQuery({ dbId, getAll = false, ...args }, options) {
- const syncableDatabaseSchemas = useListSyncableDatabaseSchemasQuery(
- getAll ? dbId : skipToken,
- options,
- );
-
- const databaseSchemas = useListDatabaseSchemasQuery(
- getAll ? skipToken : { id: dbId, ...args },
- options,
- );
-
- const schemas = getAll ? syncableDatabaseSchemas : databaseSchemas;
-
- const data = useMemo(() => {
- return schemas.data?.map((schemaName) => ({
- // NOTE: needs unique IDs for entities to work correctly
- id: generateSchemaId(dbId, schemaName),
- name: schemaName,
- database: { id: dbId },
- }));
- }, [dbId, schemas]);
-
- const result = useMemo(() => ({ ...schemas, data }), [data, schemas]);
-
- return result;
-}
diff --git a/frontend/src/metabase/entities/schemas.unit.spec.js b/frontend/src/metabase/entities/schemas.unit.spec.js
deleted file mode 100644
index 2531f057c62..00000000000
--- a/frontend/src/metabase/entities/schemas.unit.spec.js
+++ /dev/null
@@ -1,287 +0,0 @@
-import fetchMock from "fetch-mock";
-
-import { getStore } from "__support__/entities-store";
-import { Api } from "metabase/api";
-import { Questions } from "metabase/entities/questions";
-import { Schemas } from "metabase/entities/schemas";
-import {
- ROOT_COLLECTION_VIRTUAL_SCHEMA,
- SAVED_QUESTIONS_VIRTUAL_DB_ID,
-} from "metabase-lib/v1/metadata/utils/saved-questions";
-
-describe("schema entity", () => {
- let store;
-
- beforeEach(() => {
- store = getStore(
- {
- [Api.reducerPath]: Api.reducer,
- },
- {},
- [Api.middleware],
- );
- });
-
- it("should save metadata from fetching a schema's tables", async () => {
- fetchMock.get("path:/api/database/1/schema/public", [
- { id: 123, name: "foo" },
- { id: 234, name: "bar" },
- ]);
-
- await store.dispatch(Schemas.actions.fetch({ id: "1:public" }));
- const { schemas, tables } = store.getState().entities;
- expect(schemas).toEqual({
- "1:public": {
- database: 1,
- id: "1:public",
- name: "public",
- tables: [123, 234],
- },
- });
- expect(tables).toEqual({
- 123: { id: 123, name: "foo" },
- 234: { id: 234, name: "bar" },
- });
- });
-
- it("should save metadata from listing schemas", async () => {
- fetchMock.get("path:/api/database/1/schemas", ["foo", "bar"]);
-
- await store.dispatch(Schemas.actions.fetchList({ dbId: "1" }));
- const { schemas } = store.getState().entities;
- expect(schemas).toEqual({
- "1:bar": { database: "1", id: "1:bar", name: "bar" },
- "1:foo": { database: "1", id: "1:foo", name: "foo" },
- });
- });
-
- it("should handle schema-less databases", async () => {
- fetchMock.get("path:/api/database/1/schemas", [""]);
-
- await store.dispatch(Schemas.actions.fetchList({ dbId: "1" }));
- const { schemas } = store.getState().entities;
- expect(schemas).toEqual({ "1:": { database: "1", id: "1:", name: "" } });
- });
-
- it("should fetch schema tables for a schema-less database", async () => {
- fetchMock.get("path:/api/database/1/schema/", [
- { id: 123, name: "foo" },
- { id: 234, name: "bar" },
- ]);
-
- await store.dispatch(Schemas.actions.fetch({ id: "1:" }));
- const { schemas, tables } = store.getState().entities;
- expect(schemas).toEqual({
- "1:": {
- database: 1,
- id: "1:",
- name: "",
- tables: [123, 234],
- },
- });
- expect(tables).toEqual({
- 123: { id: 123, name: "foo" },
- 234: { id: 234, name: "bar" },
- });
- });
-
- describe("saved questions schema | reducer", () => {
- function getQuestion({
- id = 5,
- name = "Q1",
- collection = null,
- dataset_query = { database: 1 },
- archived = false,
- } = {}) {
- return {
- id,
- name,
- collection,
- dataset_query,
- archived,
- };
- }
-
- function getCreateAction(question) {
- return {
- type: Questions.actionTypes.CREATE,
- payload: {
- question,
- object: question,
- },
- };
- }
-
- function getUpdateAction(question) {
- return {
- type: Questions.actionTypes.UPDATE,
- payload: {
- question,
- object: question,
- },
- };
- }
-
- it("should add new question ID to collection schema tables", () => {
- const question = getQuestion();
-
- const nextState = Schemas.reducer(
- {
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: ["card__123"],
- },
- },
- getCreateAction(question),
- );
-
- expect(nextState).toEqual({
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: ["card__123", `card__${question.id}`],
- },
- });
- });
-
- it("should add new question ID to it's collection schema correctly", () => {
- const question = getQuestion({
- collection: { id: 4, name: "Marketing" },
- });
-
- const nextState = Schemas.reducer(
- {
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: ["card__123"],
- },
- "-1337:Marketing": {
- tables: ["card__51"],
- },
- },
- getCreateAction(question),
- );
-
- expect(nextState).toEqual({
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: ["card__123"],
- },
- "-1337:Marketing": {
- tables: ["card__51", `card__${question.id}`],
- },
- });
- });
-
- it("should create collection schema's tables when adding a saved question", () => {
- const question = getQuestion();
-
- const nextState = Schemas.reducer(
- {
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {},
- },
- getCreateAction(question),
- );
-
- expect(nextState).toEqual({
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: [`card__${question.id}`],
- },
- });
- });
-
- it("should not add new question ID if it's already present", () => {
- const question = getQuestion();
- const id = `card__${question.id}`;
-
- const nextState = Schemas.reducer(
- {
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: [id],
- },
- },
- getCreateAction(getQuestion()),
- );
-
- expect(nextState).toEqual({
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: [id],
- },
- });
- });
-
- it("should not add new ID if it's collection schema is not present in store", () => {
- const nextState = Schemas.reducer(
- {
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: ["card__123"],
- },
- },
- getCreateAction(getQuestion({ collection: { id: 3, name: "foo" } })),
- );
-
- expect(nextState).toEqual({
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: ["card__123"],
- },
- });
- });
-
- it("should remove question ID from it's collection schema when question is archived", () => {
- const question = getQuestion();
-
- const nextState = Schemas.reducer(
- {
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- id: ROOT_COLLECTION_VIRTUAL_SCHEMA,
- tables: ["card__123", `card__${question.id}`],
- },
- },
- getUpdateAction(getQuestion({ ...question, archived: true })),
- );
-
- expect(nextState).toEqual({
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- id: ROOT_COLLECTION_VIRTUAL_SCHEMA,
- tables: ["card__123"],
- },
- });
- });
-
- it("should add question ID to collection schema tables when question is unarchived", () => {
- const question = getQuestion();
-
- const nextState = Schemas.reducer(
- {
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: ["card__123"],
- },
- },
- getUpdateAction(question),
- );
-
- expect(nextState).toEqual({
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: ["card__123", `card__${question.id}`],
- },
- });
- });
-
- it("should add question ID when it is unarchived if collection schema is not present in store", () => {
- const nextState = Schemas.reducer(
- {
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: ["card__123"],
- },
- },
- getUpdateAction(getQuestion({ collection: { id: 3, name: "foo" } })),
- );
-
- expect(nextState).toEqual({
- [ROOT_COLLECTION_VIRTUAL_SCHEMA]: {
- tables: ["card__123"],
- },
- [`${SAVED_QUESTIONS_VIRTUAL_DB_ID}:foo`]: {
- id: `${SAVED_QUESTIONS_VIRTUAL_DB_ID}:foo`,
- name: "foo",
- database: SAVED_QUESTIONS_VIRTUAL_DB_ID,
- },
- });
- });
- });
-});
diff --git a/frontend/src/metabase/entities/utils.ts b/frontend/src/metabase/entities/utils.ts
index b0f2cf7231e..816acc7abc7 100644
--- a/frontend/src/metabase/entities/utils.ts
+++ b/frontend/src/metabase/entities/utils.ts
@@ -973,7 +973,7 @@ type CombinedEntities = {
* another entity's normalizr schema (e.g. measures inside a table's
* `query_metadata` response).
*/
-const RETIRED_ENTITY_NAMES = ["measures", "metrics", "segments"];
+const RETIRED_ENTITY_NAMES = ["measures", "metrics", "schemas", "segments"];
export function combineEntities(entities: Entity[]): CombinedEntities {
const entitiesMap: Record<string, Entity> = {};
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx
index cdb4cf3fef9..d12260a136b 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelector.jsx
@@ -1,17 +1,20 @@
/* eslint-disable react/prop-types */
import cx from "classnames";
import PropTypes from "prop-types";
-import { Component } from "react";
+import { Component, useCallback } from "react";
import { t } from "ttag";
import _ from "underscore";
-import { useSearchQuery } from "metabase/api";
+import {
+ useLazyListDatabaseSchemaTablesQuery,
+ useLazyListDatabaseSchemasQuery,
+ useSearchQuery,
+} from "metabase/api";
import { EmptyState } from "metabase/common/components/EmptyState";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import CS from "metabase/css/core/index.css";
import { Databases } from "metabase/entities/databases";
import { Questions } from "metabase/entities/questions";
-import { Schemas } from "metabase/entities/schemas";
import { Tables } from "metabase/entities/tables";
import { connect } from "metabase/redux";
import { getMetadata } from "metabase/selectors/metadata";
@@ -23,6 +26,7 @@ import {
getQuestionIdFromVirtualTableId,
isVirtualCardId,
} from "metabase-lib/v1/metadata/utils/saved-questions";
+import { parseSchemaId } from "metabase-lib/v1/metadata/utils/schema";
import { DataSelectorDataBucketPicker } from "./DataSelectorDataBucketPicker";
import { DataSelectorDatabasePicker } from "./DataSelectorDatabasePicker";
@@ -1059,6 +1063,42 @@ export class UnconnectedDataSelector extends Component {
}
}
+// Exposes `fetchSchemas` / `fetchSchemaTables` as props backed by RTK's lazy
+// query triggers. The triggers' subscriptions are tied to this wrapper's
+// lifecycle, so the cache is released when the DataSelector unmounts.
+function withSchemaFetchers(WrappedComponent) {
+ return function DataSelectorWithSchemaFetchers(props) {
+ const [triggerListSchemas] = useLazyListDatabaseSchemasQuery();
+ const [triggerListSchemaTables] = useLazyListDatabaseSchemaTablesQuery();
+
+ const fetchSchemas = useCallback(
+ (databaseId) =>
+ triggerListSchemas({ id: databaseId, "can-query": true }).unwrap(),
+ [triggerListSchemas],
+ );
+
+ const fetchSchemaTables = useCallback(
+ (schemaId) => {
+ const [dbId, schema] = parseSchemaId(schemaId);
+ return triggerListSchemaTables({
+ id: dbId,
+ schema,
+ "can-query": true,
+ }).unwrap();
+ },
+ [triggerListSchemaTables],
+ );
+
+ return (
+ <WrappedComponent
+ {...props}
+ fetchSchemas={fetchSchemas}
+ fetchSchemaTables={fetchSchemaTables}
+ />
+ );
+ };
+}
+
// If there is at least one model or metric, we want to display a slightly
// different data picker view (see DATA_BUCKET step). Pre-fetches available
// models via search and exposes them as `metadata`/`loading`/`loaded` props.
@@ -1092,6 +1132,7 @@ const DataSelector = _.compose(
listName: "allDatabases",
}),
withAvailableModels,
+ withSchemaFetchers,
connect(
(state, ownProps) => ({
availableModels: ownProps.metadata?.available_models ?? [],
@@ -1120,10 +1161,6 @@ const DataSelector = _.compose(
{
fetchDatabases: (databaseQuery) =>
Databases.actions.fetchList({ ...databaseQuery, "can-query": true }),
- fetchSchemas: (databaseId) =>
- Schemas.actions.fetchList({ dbId: databaseId, "can-query": true }),
- fetchSchemaTables: (schemaId) =>
- Schemas.actions.fetch({ id: schemaId, "can-query": true }),
fetchFields: (tableId) => Tables.actions.fetchMetadata({ id: tableId }),
fetchQuestion: (id) =>
Questions.actions.fetch({
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
index 14420b2c988..d9391212297 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.tsx
@@ -10,6 +10,7 @@ import { Icon } from "metabase/ui";
import { isSyncCompleted } from "metabase/utils/syncing";
import type Database from "metabase-lib/v1/metadata/Database";
import type Schema from "metabase-lib/v1/metadata/Schema";
+import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import { DataSelectorLoading } from "../DataSelectorLoading";
import { RawDataBackButton } from "../RawDataBackButton";
@@ -59,7 +60,7 @@ export const DataSelectorDatabaseSchemaPicker = ({
!database.is_saved_questions && database.getSchemas().length > 1
? database.getSchemas().map((schema) => ({
schema,
- name: schema.displayName() ?? "",
+ name: getSchemaDisplayName(schema.name) ?? "",
}))
: [],
className: database.is_saved_questions ? CS.bgLight : undefined,
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
index b411a21080c..cac08643007 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorDatabaseSchemaPicker/DataSelectorDatabaseSchemaPicker.unit.spec.js
@@ -3,6 +3,7 @@ import { render, renderWithProviders, screen } from "__support__/ui";
import { createMockState } from "metabase/redux/store/mocks";
import { getMetadata } from "metabase/selectors/metadata";
import { checkNotNull } from "metabase/utils/types";
+import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import { createMockDatabase, createMockSchema } from "metabase-types/api/mocks";
import { DataSelectorDatabaseSchemaPicker } from "./DataSelectorDatabaseSchemaPicker";
@@ -45,12 +46,8 @@ describe("DataSelectorDatabaseSchemaPicker", () => {
id: 1,
name: databaseName,
getSchemas: () => [
- {
- displayName: () => schemaName,
- },
- {
- displayName: () => "another schema name",
- },
+ { name: schemaName },
+ { name: "another schema name" },
],
},
];
@@ -58,7 +55,9 @@ describe("DataSelectorDatabaseSchemaPicker", () => {
render(<DataSelectorDatabaseSchemaPicker databases={databases} />);
expect(screen.getByText(databaseName)).toBeInTheDocument();
- expect(screen.getByText(schemaName)).toBeInTheDocument();
+ expect(
+ screen.getByText(getSchemaDisplayName(schemaName)),
+ ).toBeInTheDocument();
});
it("displays Saved Questions if it's about saved questions", () => {
@@ -71,12 +70,8 @@ describe("DataSelectorDatabaseSchemaPicker", () => {
is_saved_questions: true,
name: databaseName,
getSchemas: () => [
- {
- displayName: () => schemaName,
- },
- {
- displayName: () => "another schema name",
- },
+ { name: schemaName },
+ { name: "another schema name" },
],
},
];
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
index 13a4ec602e8..bdc0c4582e8 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.tsx
@@ -2,6 +2,7 @@ import { AccordionList } from "metabase/common/components/AccordionList";
import CS from "metabase/css/core/index.css";
import { Box, Icon } from "metabase/ui";
import type Schema from "metabase-lib/v1/metadata/Schema";
+import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import type { SchemaId } from "metabase-types/api";
import { CONTAINER_WIDTH } from "../constants";
@@ -29,7 +30,7 @@ export const DataSelectorSchemaPicker = ({
const sections = [
{
items: schemas.map((schema) => ({
- name: schema.displayName(),
+ name: getSchemaDisplayName(schema.name),
schema: schema,
})),
},
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js
index faee34fcdc9..f7d20810198 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorSchemaPicker/DataSelectorSchemaPicker.unit.spec.js
@@ -1,13 +1,16 @@
import { render, screen } from "__support__/ui";
+import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import { DataSelectorSchemaPicker } from "./DataSelectorSchemaPicker";
describe("DataSelectorSchemaPicker", () => {
it("displays schema name", () => {
const schemaName = "Schema name";
- const schemas = [{ displayName: () => schemaName }];
+ const schemas = [{ name: schemaName }];
render(<DataSelectorSchemaPicker schemas={schemas} />);
- expect(screen.getByText(schemaName)).toBeInTheDocument();
+ expect(
+ screen.getByText(getSchemaDisplayName(schemaName)),
+ ).toBeInTheDocument();
});
});
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx
index 294a5807ed0..526e46fa80d 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/DataSelectorTablePicker/DataSelectorTablePicker.tsx
@@ -19,6 +19,7 @@ import { isNotNull } from "metabase/utils/types";
import type Database from "metabase-lib/v1/metadata/Database";
import type Schema from "metabase-lib/v1/metadata/Schema";
import type Table from "metabase-lib/v1/metadata/Table";
+import { getSchemaDisplayName } from "metabase-lib/v1/metadata/utils/schema";
import { DataSelectorSectionHeader } from "../DataSelectorSectionHeader";
import { CONTAINER_WIDTH } from "../constants";
@@ -199,7 +200,7 @@ const Header = ({
/
</Box>
<Box component="span" data-testid="source-schema" c="text-secondary">
- {selectedSchema.displayName()}
+ {getSchemaDisplayName(selectedSchema.name)}
</Box>
</>
)}
diff --git a/frontend/src/metabase/selectors/metadata.ts b/frontend/src/metabase/selectors/metadata.ts
index 481025c7097..3513ca61aae 100644
--- a/frontend/src/metabase/selectors/metadata.ts
+++ b/frontend/src/metabase/selectors/metadata.ts
@@ -8,7 +8,7 @@ import Database from "metabase-lib/v1/metadata/Database";
import Field from "metabase-lib/v1/metadata/Field";
import ForeignKey from "metabase-lib/v1/metadata/ForeignKey";
import Metadata from "metabase-lib/v1/metadata/Metadata";
-import Schema from "metabase-lib/v1/metadata/Schema";
+import type Schema from "metabase-lib/v1/metadata/Schema";
import Table from "metabase-lib/v1/metadata/Table";
import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";
import {
@@ -170,7 +170,7 @@ export const getMetadata: (
database.tables = hydrateDatabaseTables(database, metadata);
});
Object.values(metadata.schemas).forEach((schema) => {
- schema.database = hydrateSchemaDatabase(schema, metadata);
+ schema.database = hydrateSchemaDatabase(schemas[schema.id], metadata);
});
Object.values(metadata.tables).forEach((table) => {
table.db = hydrateTableDatabase(table, metadata);
@@ -185,7 +185,7 @@ export const getMetadata: (
database.schemas = hydrateDatabaseSchemas(database, metadata);
});
Object.values(metadata.schemas).forEach((schema) => {
- schema.tables = hydrateSchemaTables(schema, metadata);
+ schema.tables = hydrateSchemaTables(schema, schemas[schema.id], metadata);
});
Object.values(metadata.measures).forEach((measure) => {
measure.table = hydrateMeasureTable(measure, tables);
@@ -234,9 +234,8 @@ function createDatabase(
}
function createSchema(schema: NormalizedSchema, metadata: Metadata): Schema {
- const instance = new Schema(schema);
- instance.metadata = metadata;
- return instance;
+ const { database: _database, tables: _tables, ...rest } = schema;
+ return { ...rest, metadata };
}
function createTable(table: NormalizedTable, metadata: Metadata): Table {
@@ -314,15 +313,18 @@ function hydrateDatabaseSchemas(
}
function hydrateSchemaDatabase(
- schema: Schema,
+ normalized: NormalizedSchema,
metadata: Metadata,
): Database | undefined {
- const databaseId = schema.getPlainObject().database;
- return metadata.database(databaseId) ?? undefined;
+ return metadata.database(normalized.database) ?? undefined;
}
-function hydrateSchemaTables(schema: Schema, metadata: Metadata): Table[] {
- const tableIds = schema.getPlainObject().tables;
+function hydrateSchemaTables(
+ schema: Schema,
+ normalized: NormalizedSchema,
+ metadata: Metadata,
+): Table[] {
+ const tableIds = normalized.tables;
if (tableIds) {
return tableIds.map((table) => metadata.table(table)).filter(isNotNull);
} else if (schema.database && schema.database.getTables().length > 0) {