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
more entity cleanup (#66659)
Ryan Laurieb4912b71f14e
diff --git a/enterprise/frontend/src/metabase-enterprise/entities/transforms.ts b/enterprise/frontend/src/metabase-enterprise/entities/transforms.tsindex ba03a837152..d7f12471378 100644--- a/enterprise/frontend/src/metabase-enterprise/entities/transforms.ts+++ b/enterprise/frontend/src/metabase-enterprise/entities/transforms.ts@@ -1,5 +1,4 @@import { createEntity } from "metabase/lib/entities";-import * as Urls from "metabase/lib/urls";import { TransformSchema } from "metabase/schema";import { color } from "metabase/ui/utils/colors";import type { Transform } from "metabase-types/api";@@ -16,7 +15,6 @@ export const Transforms = createEntity({objectSelectors: {getName: (transform: Transform) => transform && transform.name,- getUrl: (transform: Transform) => transform && Urls.transform(transform.id),getColor: () => color("brand"),},});diff --git a/frontend/src/metabase-types/api/collection.ts b/frontend/src/metabase-types/api/collection.tsindex aeff3775342..2ae106bcde8 100644--- a/frontend/src/metabase-types/api/collection.ts+++ b/frontend/src/metabase-types/api/collection.ts@@ -1,5 +1,5 @@import type { ColorName } from "metabase/lib/colors/types";-import type { IconName, IconProps } from "metabase/ui";+import type { IconName } from "metabase/ui";import type {BaseEntityId,CollectionEssentials,@@ -154,8 +154,6 @@ export interface CollectionItem {effective_location?: string;authority_level?: CollectionAuthorityLevel;dashboard_count?: number | null;- getIcon?: () => IconProps;- getUrl: (opts?: Record<string, unknown>) => string;setArchived?: (isArchived: boolean,opts?: Record<string, unknown>,diff --git a/frontend/src/metabase-types/api/mocks/collection.ts b/frontend/src/metabase-types/api/mocks/collection.tsindex adcc4cb7352..dc71a556fe4 100644--- a/frontend/src/metabase-types/api/mocks/collection.ts+++ b/frontend/src/metabase-types/api/mocks/collection.ts@@ -38,8 +38,6 @@ export const createMockCollectionItem = (collection_id: null,fully_parameterized: true,type: null,- getIcon: () => ({ name: "question" }),- getUrl: () => "/question/1",archived: false,...opts,});diff --git a/frontend/src/metabase-types/entities/common.ts b/frontend/src/metabase-types/entities/common.tsindex b03e0a32104..09c78b1e085 100644--- a/frontend/src/metabase-types/entities/common.ts+++ b/frontend/src/metabase-types/entities/common.ts@@ -4,7 +4,6 @@ export type WrappedEntity<Entity> = {getName: () => string;getColor: () => string;getCollection: () => Collection;- getUrl: () => string;setArchived: (isArchived: boolean) => void;setCollection: (collection: Collection) => void;setCollectionPreview: (isEnabled: boolean) => void;diff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.stories.tsx b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.stories.tsxindex 2f915e0be8b..d841fe1c51a 100644--- a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.stories.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.stories.tsx@@ -38,8 +38,6 @@ export const Question = {model: "card",name: "Question",description: "This is a description of the question",- getIcon: () => ({ name: "question" }),- getUrl: () => "/question/1",setArchived: action("setArchived"),setPinned: action("setPinned"),copy: true,@@ -65,8 +63,6 @@ export const Dashboard = {description: Array(20).fill("This is a description of the dashboard.").join(" "),- getIcon: () => ({ name: "dashboard" }),- getUrl: () => "/dashboard/1",setArchived: action("setArchived"),setPinned: action("setPinned"),archived: false,@@ -88,8 +84,6 @@ export const Model = {collection_id: null,name: "Model",description: "This is a description of the model",- getIcon: () => ({ name: "model" }),- getUrl: () => "/question/1",setArchived: action("setArchived"),setPinned: action("setPinned"),archived: false,diff --git a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsxindex 03855de0433..c2746cc2f67 100644--- a/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemCard/PinnedItemCard.unit.spec.tsx@@ -7,7 +7,6 @@ import {getIcon as testGetIcon,} from "__support__/ui";import { getIcon } from "metabase/lib/icon";-import type { IconName } from "metabase/ui";import type { CollectionItem, CollectionItemModel } from "metabase-types/api";import {createMockCollection,@@ -49,8 +48,6 @@ const getCollectionItem = ({name = "My Item",description = "description foo foo foo",collection_position = 1,- icon = "dashboard",- url = "/dashboard/1",setArchived = jest.fn(),setPinned = jest.fn(),...rest@@ -60,8 +57,6 @@ const getCollectionItem = ({name?: string;description?: string;collection_position?: number;- icon?: IconName;- url?: string;setArchived?: (isArchived: boolean) => Promise<void>;setPinned?: (isPinned: boolean) => void;} = {}): CollectionItem & { description: string } => {@@ -72,8 +67,6 @@ const getCollectionItem = ({name,description,collection_position,- getIcon: () => ({ name: icon }),- getUrl: () => url,setArchived,setPinned,}) as CollectionItem & { description: string };diff --git a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.unit.spec.tsx b/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.unit.spec.tsxindex e77cabf4cb2..a77d9e9174e 100644--- a/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.unit.spec.tsx+++ b/frontend/src/metabase/collections/components/PinnedItemOverview/PinnedItemOverview.unit.spec.tsx@@ -21,8 +21,6 @@ const dashboardItem1: CollectionItem = {collection_id: null,name: "Dashboard Foo",description: "description foo",- getIcon: () => ({ name: "dashboard" }),- getUrl: () => "/dashboard/1",setArchived: jest.fn(),setPinned: jest.fn(),archived: false,@@ -35,8 +33,6 @@ const dashboardItem2: CollectionItem = {collection_id: null,name: "Dashboard Bar",description: "description foo",- getIcon: () => ({ name: "dashboard" }),- getUrl: () => "/dashboard/2",setArchived: jest.fn(),setPinned: jest.fn(),archived: false,diff --git a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsxindex b58e52920a8..6cf8b2bf137 100644--- a/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx+++ b/frontend/src/metabase/common/components/ItemsTable/BaseItemsTable/BaseItemsTable.unit.spec.tsx@@ -24,8 +24,6 @@ function getCollectionItem({id = 1,model = "dashboard",name = "My Item",- icon = "dashboard",- url = "/dashboard/1",description = "A description",...rest}: Partial<CollectionItem> & {@@ -47,10 +45,6 @@ function getCollectionItem({description,name,collection: createMockCollection({ can_write: true }),- getIcon: () => ({- name: icon,- }),- getUrl: () => url,archived: false,};}diff --git a/frontend/src/metabase/entities/documents.ts b/frontend/src/metabase/entities/documents.tsindex a4a7276860b..ff4e03bd3e6 100644--- a/frontend/src/metabase/entities/documents.ts+++ b/frontend/src/metabase/entities/documents.ts@@ -10,7 +10,6 @@ import {entityCompatibleQuery,undo,} from "metabase/lib/entities";-import * as Urls from "metabase/lib/urls";import { DocumentSchema } from "metabase/schema";import { color } from "metabase/ui/utils/colors";import type {@@ -125,7 +124,6 @@ export const Documents = createEntity({objectSelectors: {getName: (document: Document) => document && document.name,- getUrl: (document: Document) => document && Urls.document(document),getColor: () => color("brand"),},});diff --git a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsxindex d4b736816a0..7ef9618cf37 100644--- a/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx+++ b/frontend/src/metabase/nav/components/search/SearchBar/SearchBar.unit.spec.tsx@@ -36,7 +36,6 @@ const TEST_SEARCH_RESULTS: CollectionItem[] = [createMockCollectionItem({name,id: index + 1,- getUrl: () => "/",}),);diff --git a/frontend/src/metabase/visualizations/visualizations/LinkViz/EntityDisplay.tsx b/frontend/src/metabase/visualizations/visualizations/LinkViz/EntityDisplay.tsxindex 81496826383..12e0ee74d4d 100644--- a/frontend/src/metabase/visualizations/visualizations/LinkViz/EntityDisplay.tsx+++ b/frontend/src/metabase/visualizations/visualizations/LinkViz/EntityDisplay.tsx@@ -4,19 +4,19 @@ import Markdown from "metabase/common/components/Markdown";import { getIcon } from "metabase/lib/icon";import { isEmpty } from "metabase/lib/validate";import { Icon } from "metabase/ui";+import type { UnrestrictedLinkEntity } from "metabase-types/api";import {EllipsifiedEntityContainer,EntityDisplayContainer,LeftContainer,} from "./EntityDisplay.styled";-import type { WrappedUnrestrictedLinkEntity } from "./types";export const EntityDisplay = ({entity,showDescription = false,}: {- entity: WrappedUnrestrictedLinkEntity;+ entity: UnrestrictedLinkEntity;showDescription?: boolean;}) => {return (@@ -65,7 +65,7 @@ export const UrlLinkDisplay = ({ url }: { url?: string }) => {);};-function getSearchIconName(entity: WrappedUnrestrictedLinkEntity) {+function getSearchIconName(entity: UnrestrictedLinkEntity) {const entityIcon = getIcon(entity) ?? { name: "link" };// we need to change this icon to make it match the icon in the search resultsdiff --git a/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.tsx b/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.tsxindex adadccbadc0..2caf5fb1193 100644--- a/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.tsx+++ b/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.tsx@@ -35,7 +35,6 @@ import {StyledRecentsList,} from "./LinkViz.styled";import { settings } from "./LinkVizSettings";-import type { WrappedUnrestrictedLinkEntity } from "./types";import { isUrlString } from "./utils";const MODELS_TO_SEARCH: SearchModel[] = [@@ -124,7 +123,7 @@ function LinkVizInner({);}- const wrappedEntity: WrappedUnrestrictedLinkEntity = Search.wrapEntity({+ const wrappedEntity: UnrestrictedLinkEntity = Search.wrapEntity({...entity,database_id: entity.db_id ?? entity.database_id,table_id: entity.model === "table" ? entity.id : undefined,diff --git a/frontend/src/metabase/visualizations/visualizations/LinkViz/types.ts b/frontend/src/metabase/visualizations/visualizations/LinkViz/types.tsdeleted file mode 100644index c58aaa3b4c8..00000000000--- a/frontend/src/metabase/visualizations/visualizations/LinkViz/types.ts+++ /dev/null@@ -1,10 +0,0 @@-import type { IconName } from "metabase/ui";-import type { UnrestrictedLinkEntity } from "metabase-types/api";--type WrappedEntity = {- getIcon: () => { name: IconName };- getUrl: () => string;-};--export type WrappedUnrestrictedLinkEntity = UnrestrictedLinkEntity &- WrappedEntity;