Skip to content

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

Remove measure entity (#73756)

Romeo Van Snick1da83bd51b78
diff --git a/frontend/src/metabase-lib/v1/metadata/Measure.ts b/frontend/src/metabase-lib/v1/metadata/Measure.ts
deleted file mode 100644
index d6e07a8d895..00000000000
--- a/frontend/src/metabase-lib/v1/metadata/Measure.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import type { NormalizedMeasure } from "metabase-types/api";
-
-import type Metadata from "./Metadata";
-import type Table from "./Table";
-
-interface Measure extends Omit<NormalizedMeasure, "table"> {
- table?: Table;
- metadata?: Metadata;
-}
-
-/**
- * @deprecated use RTK Query endpoints and plain api objects from metabase-types/api
- */
-class Measure {
- private readonly _plainObject: NormalizedMeasure;
-
- constructor(measure: NormalizedMeasure) {
- this._plainObject = measure;
- Object.assign(this, measure);
- }
-
- getPlainObject() {
- return this._plainObject;
- }
-
- displayName() {
- return this.name;
- }
-
- isActive() {
- return !this.archived;
- }
-}
-
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default Measure;
diff --git a/frontend/src/metabase-lib/v1/metadata/Metadata.ts b/frontend/src/metabase-lib/v1/metadata/Metadata.ts
index b5578a40f48..0816b0055c4 100644
--- a/frontend/src/metabase-lib/v1/metadata/Metadata.ts
+++ b/frontend/src/metabase-lib/v1/metadata/Metadata.ts
@@ -6,6 +6,7 @@ import type {
DatabaseId,
FieldId,
FieldReference,
+ Measure,
MeasureId,
Metric,
NativeQuerySnippet,
@@ -20,7 +21,6 @@ import type Question from "../Question";
import type Database from "./Database";
import type Field from "./Field";
-import type Measure from "./Measure";
import type Schema from "./Schema";
import type Table from "./Table";
import { getUniqueFieldId } from "./utils/fields";
diff --git a/frontend/src/metabase-lib/v1/metadata/Table.ts b/frontend/src/metabase-lib/v1/metadata/Table.ts
index b02353a9fb1..144562207cc 100644
--- a/frontend/src/metabase-lib/v1/metadata/Table.ts
+++ b/frontend/src/metabase-lib/v1/metadata/Table.ts
@@ -2,14 +2,13 @@ import _ from "underscore";
// NOTE: this needs to be imported first due to some cyclical dependency nonsense
import { singularize } from "metabase/utils/formatting";
-import type { NormalizedTable, Segment } from "metabase-types/api";
+import type { Measure, NormalizedTable, Segment } from "metabase-types/api";
import Question from "../Question";
import type Database from "./Database";
import type Field from "./Field";
import type ForeignKey from "./ForeignKey";
-import type Measure from "./Measure";
import type Metadata from "./Metadata";
import type Schema from "./Schema";
diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.ts
index 7f7d744b61a..05a04ab35ad 100644
--- a/frontend/src/metabase/entities/index.ts
+++ b/frontend/src/metabase/entities/index.ts
@@ -78,6 +78,5 @@ export { Databases as databases } from "./databases";
export { Schemas as schemas } from "./schemas";
export { Tables as tables } from "./tables";
export { Fields as fields } from "./fields";
-export { Measures as measures } from "./measures";
export { Snippets as snippets } from "./snippets";
diff --git a/frontend/src/metabase/entities/measures.js b/frontend/src/metabase/entities/measures.js
deleted file mode 100644
index a7f5c9607ef..00000000000
--- a/frontend/src/metabase/entities/measures.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import {
- measureApi,
- useGetMeasureQuery,
- useListMeasuresQuery,
-} from "metabase/api";
-import { MeasureSchema } from "metabase/schema";
-import { getMetadata } from "metabase/selectors/metadata";
-
-import { createEntity, entityCompatibleQuery } from "./utils";
-
-/**
- * @deprecated use "metabase/api" instead
- */
-export const Measures = createEntity({
- name: "measures",
- nameOne: "measure",
- path: "/api/measure",
- schema: MeasureSchema,
-
- rtk: () => ({
- getUseGetQuery: () => ({
- useGetQuery,
- }),
- useListQuery: useListMeasuresQuery,
- }),
-
- api: {
- list: (entityQuery, dispatch) =>
- entityCompatibleQuery(
- entityQuery,
- dispatch,
- measureApi.endpoints.listMeasures,
- ),
- get: (entityQuery, options, dispatch) =>
- entityCompatibleQuery(
- entityQuery.id,
- dispatch,
- measureApi.endpoints.getMeasure,
- ),
- create: (entityQuery, dispatch) =>
- entityCompatibleQuery(
- entityQuery,
- dispatch,
- measureApi.endpoints.createMeasure,
- ),
- update: (entityQuery, dispatch) =>
- entityCompatibleQuery(
- entityQuery,
- dispatch,
- measureApi.endpoints.updateMeasure,
- ),
- },
-
- selectors: {
- getObject: (state, { entityId }) => getMetadata(state).measure(entityId),
- },
-});
-
-const useGetQuery = ({ id }, options) => {
- return useGetMeasureQuery(id, options);
-};
diff --git a/frontend/src/metabase/entities/utils.ts b/frontend/src/metabase/entities/utils.ts
index 2e226db5b00..b0f2cf7231e 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 = ["metrics", "segments"];
+const RETIRED_ENTITY_NAMES = ["measures", "metrics", "segments"];
export function combineEntities(entities: Entity[]): CombinedEntities {
const entitiesMap: Record<string, Entity> = {};
diff --git a/frontend/src/metabase/redux/store/mocks/api.ts b/frontend/src/metabase/redux/store/mocks/api.ts
new file mode 100644
index 00000000000..e8d75d40829
--- /dev/null
+++ b/frontend/src/metabase/redux/store/mocks/api.ts
@@ -0,0 +1,5 @@
+import { Api } from "metabase/api/api";
+import type { State } from "metabase/redux/store";
+
+export const createMockApiState = (): State["metabase-api"] =>
+ Api.reducer(undefined, { type: "@@INIT" });
diff --git a/frontend/src/metabase/redux/store/mocks/index.ts b/frontend/src/metabase/redux/store/mocks/index.ts
index 8a763a94da6..7c0633d0c49 100644
--- a/frontend/src/metabase/redux/store/mocks/index.ts
+++ b/frontend/src/metabase/redux/store/mocks/index.ts
@@ -1,4 +1,5 @@
export * from "./admin";
+export * from "./api";
export * from "./app";
export * from "./auth";
export * from "./dashboard";
diff --git a/frontend/src/metabase/redux/store/mocks/state.ts b/frontend/src/metabase/redux/store/mocks/state.ts
index 2af97ffa8e8..29c9817d3b1 100644
--- a/frontend/src/metabase/redux/store/mocks/state.ts
+++ b/frontend/src/metabase/redux/store/mocks/state.ts
@@ -3,6 +3,7 @@ import type { State } from "metabase/redux/store";
import { createMockUser } from "metabase-types/api/mocks";
import { createMockAdminState } from "./admin";
+import { createMockApiState } from "./api";
import { createMockAppState } from "./app";
import { createMockAuthState } from "./auth";
import { createMockDashboardState } from "./dashboard";
@@ -33,6 +34,7 @@ export function createMockState(opts: any) {
embed: createMockEmbedState(),
embeddingDataPicker: createMockEmbeddingDataPickerState(),
entities: createMockNormalizedEntitiesState(),
+ "metabase-api": createMockApiState(),
parameters: createMockParametersState(),
qb: createMockQueryBuilderState(),
requests: createMockRequestsState(),
diff --git a/frontend/src/metabase/selectors/metadata.ts b/frontend/src/metabase/selectors/metadata.ts
index 00336985072..481025c7097 100644
--- a/frontend/src/metabase/selectors/metadata.ts
+++ b/frontend/src/metabase/selectors/metadata.ts
@@ -7,7 +7,6 @@ import Question from "metabase-lib/v1/Question";
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 Measure from "metabase-lib/v1/metadata/Measure";
import Metadata from "metabase-lib/v1/metadata/Metadata";
import Schema from "metabase-lib/v1/metadata/Schema";
import Table from "metabase-lib/v1/metadata/Table";
@@ -18,7 +17,9 @@ import {
} from "metabase-lib/v1/queries/utils/field";
import type {
Collection as ApiCollection,
+ Table as ApiTable,
Card,
+ Measure,
Metric,
NormalizedCollection,
NormalizedDatabase,
@@ -153,7 +154,7 @@ export const getMetadata: (
Object.values(segments).map((s) => [s.id, createSegment(s)]),
);
metadata.measures = Object.fromEntries(
- Object.values(measures).map((m) => [m.id, createMeasure(m, metadata)]),
+ Object.values(measures).map((m) => [m.id, createMeasure(m)]),
);
metadata.metrics = Object.fromEntries(
Object.values(metrics).map((m) => [m.id, createMetric(m)]),
@@ -187,7 +188,7 @@ export const getMetadata: (
schema.tables = hydrateSchemaTables(schema, metadata);
});
Object.values(metadata.measures).forEach((measure) => {
- measure.table = hydrateMeasureTable(measure, metadata);
+ measure.table = hydrateMeasureTable(measure, tables);
});
Object.values(metadata.metrics).forEach((metric) => {
metric.collection = hydrateMetricCollection(metric, collections);
@@ -269,13 +270,9 @@ function createSegment(segment: NormalizedSegment): Segment {
return rest;
}
-function createMeasure(
- measure: NormalizedMeasure,
- metadata: Metadata,
-): Measure {
- const instance = new Measure(measure);
- instance.metadata = metadata;
- return instance;
+function createMeasure(measure: NormalizedMeasure): Measure {
+ const { table: _normalizedTableId, ...rest } = measure;
+ return rest;
}
function createMetric(metric: NormalizedMetric): Metric {
@@ -430,9 +427,25 @@ function hydrateNameField(field: Field, metadata: Metadata): Field | undefined {
function hydrateMeasureTable(
measure: Measure,
- metadata: Metadata,
-): Table | undefined {
- return metadata.table(measure.table_id) ?? undefined;
+ tables: Record<string, NormalizedTable>,
+): ApiTable | undefined {
+ const normalized = tables[measure.table_id];
+ if (!normalized) {
+ return undefined;
+ }
+ const {
+ db: _db,
+ fields: _fields,
+ fks: _fks,
+ segments: _segments,
+ measures: _measures,
+ metrics: _metrics,
+ schema: _schema,
+ schema_name,
+ original_fields: _original_fields,
+ ...rest
+ } = normalized;
+ return { ...rest, schema: schema_name ?? "" };
}
function hydrateMetricCollection(
diff --git a/src/metabase/lib/js/metadata.cljc b/src/metabase/lib/js/metadata.cljc
index 227a9170b86..d8de1f3f1d9 100644
--- a/src/metabase/lib/js/metadata.cljc
+++ b/src/metabase/lib/js/metadata.cljc
@@ -502,8 +502,11 @@
(defmethod parse-field-fn :measure
[_object-type]
- (fn [_k v]
- v))
+ (fn [k v]
+ (case k
+ :definition #?(:cljs (js->clj v :keywordize-keys true)
+ :clj (perf/keywordize-keys v))
+ v)))
(defmethod parse-objects-default-key :measure
[_object-type]