The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
Remove indexed-entities entity (#73549)
Romeo Van Snick429b4e26b201
diff --git a/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts b/frontend/src/metabase/dashboard/actions/parameters.unit.spec.tsindex 9f650566b74..d1709f0de9d 100644--- a/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts+++ b/frontend/src/metabase/dashboard/actions/parameters.unit.spec.ts@@ -276,7 +276,6 @@ describe("setParameterMapping", () => {metrics: {},snippets: {},questions: {},- indexedEntities: {},groups: {},},});@@ -393,7 +392,6 @@ describe("setParameterMapping", () => {metrics: {},snippets: {},questions: {},- indexedEntities: {},groups: {},},});diff --git a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts b/frontend/src/metabase/entities/containers/rtk-query/types/entities.tsindex 23998173f38..ef9cdd935c3 100644--- a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts+++ b/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts@@ -44,7 +44,6 @@ export type EntityType =| "documents"| "fields"| "groups"- | "indexedEntities"| "persistedModels"| "pulses"| "questions"diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.tsindex 589133162f9..ccb3c6382d9 100644--- a/frontend/src/metabase/entities/index.ts+++ b/frontend/src/metabase/entities/index.ts@@ -74,7 +74,6 @@ export { SnippetCollections as snippetCollections } from "./snippet-collections"export { Dashboards as dashboards } from "./dashboards";export { Pulses as pulses } from "./pulses";export { Questions as questions } from "./questions";-export { IndexedEntities as indexedEntities } from "./indexed-entities";export { Timelines as timelines } from "./timelines";export { TimelineEvents as timelineEvents } from "./timeline-events";diff --git a/frontend/src/metabase/entities/indexed-entities/index.ts b/frontend/src/metabase/entities/indexed-entities/index.tsdeleted file mode 100644index 0ca7d4031e7..00000000000--- a/frontend/src/metabase/entities/indexed-entities/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./indexed-entities";diff --git a/frontend/src/metabase/entities/indexed-entities/indexed-entities.ts b/frontend/src/metabase/entities/indexed-entities/indexed-entities.tsdeleted file mode 100644index e2ef9be43ce..00000000000--- a/frontend/src/metabase/entities/indexed-entities/indexed-entities.ts+++ /dev/null@@ -1,18 +0,0 @@-/**- * An indexed entity is returned by the search endpoint and points to a single database record in a model- * This is a special case for entities, because it doesn't have its own API endpoints, but it needs- * to be treated as an entity (for now at least) so that it will play nicely with search- */--import { IndexedEntitySchema } from "metabase/schema";--import { createEntity } from "../utils";--/**- * @deprecated use "metabase/api" instead- */-export const IndexedEntities = createEntity({- name: "indexedEntities",- nameOne: "indexedEntity",- schema: IndexedEntitySchema,-});diff --git a/frontend/src/metabase/entities/search.js b/frontend/src/metabase/entities/search.jsindex 40ae1a84ccd..794a551a52f 100644--- a/frontend/src/metabase/entities/search.js+++ b/frontend/src/metabase/entities/search.js@@ -113,21 +113,14 @@ export const Search = createEntity({// delegate to the actual object's entity wrapEntitywrapEntity(object, dispatch = null) {const entity = entityForObject(object);- if (entity) {- return entity.wrapEntity(object, dispatch);- } else {- console.warn("Couldn't find entity for object", object);- return object;- }+ return entity ? entity.wrapEntity(object, dispatch) : object;},objectActions: {delete: (object) => {return (dispatch) => {const entity = entityForObject(object);- return entity- ? dispatch(entity.actions.delete(object))- : warnEntityAndReturnObject(object);+ return entity ? dispatch(entity.actions.delete(object)) : object;};},},@@ -149,11 +142,6 @@ export const Search = createEntity({},});-function warnEntityAndReturnObject(object) {- console.warn("Couldn't find entity for object", object);- return object;-}-function useListQuery(query = {}, options) {const collectionItemsQuery = useListCollectionItemsQuery(query.collection ? getCollectionItemsQueryPayload(query) : skipToken,diff --git a/frontend/src/metabase/entities/utils.ts b/frontend/src/metabase/entities/utils.tsindex 6eb8c26d16b..797e855cc47 100644--- a/frontend/src/metabase/entities/utils.ts+++ b/frontend/src/metabase/entities/utils.ts@@ -28,10 +28,6 @@ export const entityTypeForModel = (model: string): string => {if (model === "card" || model === "dataset" || model === "metric") {return "questions";}- if (model === "indexed-entity") {- // handle non-standard plural 🙃- return "indexedEntities";- }return `${model}s`;};diff --git a/frontend/src/metabase/redux/store/entities.ts b/frontend/src/metabase/redux/store/entities.tsindex 9023697bbe3..1e46c040e95 100644--- a/frontend/src/metabase/redux/store/entities.ts+++ b/frontend/src/metabase/redux/store/entities.ts@@ -6,7 +6,6 @@ import type {NormalizedDocument,NormalizedField,NormalizedGroup,- NormalizedIndexedEntity,NormalizedMeasure,NormalizedMetric,NormalizedNativeQuerySnippet,@@ -28,7 +27,6 @@ export interface EntitiesState {segments: Record<string, NormalizedSegment>;measures: Record<string, NormalizedMeasure>;metrics: Record<string, NormalizedMetric>;- indexedEntities: Record<string, NormalizedIndexedEntity>;snippets: Record<string, NormalizedNativeQuerySnippet>;questions: Record<string, NormalizedCard>;groups: Record<string, NormalizedGroup>;diff --git a/frontend/src/metabase/redux/store/mocks/entities.ts b/frontend/src/metabase/redux/store/mocks/entities.tsindex 59dece868cd..7f54b20e0f5 100644--- a/frontend/src/metabase/redux/store/mocks/entities.ts+++ b/frontend/src/metabase/redux/store/mocks/entities.ts@@ -16,6 +16,5 @@ export const createMockNormalizedEntitiesState = (): EntitiesState => ({metrics: {},snippets: {},questions: {},- indexedEntities: {},groups: {},});diff --git a/frontend/src/metabase/schema.js b/frontend/src/metabase/schema.jsindex 3106704868b..be3b2332ef8 100644--- a/frontend/src/metabase/schema.js+++ b/frontend/src/metabase/schema.js@@ -10,7 +10,6 @@ import { generateSchemaId } from "metabase-lib/v1/metadata/utils/schema";export const ActionSchema = new schema.Entity("actions");export const QuestionSchema = new schema.Entity("questions");export const CacheConfigSchema = new schema.Entity("cacheConfigs");-export const IndexedEntitySchema = new schema.Entity("indexedEntities");export const BookmarkSchema = new schema.Entity("bookmarks");export const DocumentSchema = new schema.Entity("documents");export const DashboardSchema = new schema.Entity("dashboards");@@ -131,7 +130,6 @@ export const ENTITIES_SCHEMA_MAP = {actions: ActionSchema,questions: QuestionSchema,cacheConfigs: CacheConfigSchema,- indexedEntity: IndexedEntitySchema,bookmarks: BookmarkSchema,dashboards: DashboardSchema,pulses: PulseSchema,diff --git a/frontend/test/__support__/store.ts b/frontend/test/__support__/store.tsindex 452b9cb86bf..fa1d992f597 100644--- a/frontend/test/__support__/store.ts+++ b/frontend/test/__support__/store.ts@@ -11,7 +11,6 @@ import {DocumentSchema,FieldSchema,GroupSchema,- IndexedEntitySchema,MeasureSchema,MetricSchema,QuestionSchema,@@ -64,7 +63,6 @@ const EntitiesSchema: Record<keyof EntitiesState, NormalizrSchema<any>> = {measures: [MeasureSchema],metrics: [MetricSchema],snippets: [SnippetSchema],- indexedEntities: [IndexedEntitySchema],questions: [QuestionSchema],groups: [GroupSchema],};