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
Use named exports for entities (#66997)
Fraserfdf1b0678641
diff --git a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsxindex d3728b5123d..cd1fadaac6e 100644--- a/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx+++ b/enterprise/frontend/src/embedding/data-picker/DataSelector/DataSelector.jsx@@ -7,11 +7,11 @@ import _ from "underscore";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 Search from "metabase/entities/search";-import Tables from "metabase/entities/tables";+import { Databases } from "metabase/entities/databases";+import { Questions } from "metabase/entities/questions";+import { Schemas } from "metabase/entities/schemas";+import { Search } from "metabase/entities/search";+import { Tables } from "metabase/entities/tables";import { connect } from "metabase/lib/redux";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";diff --git a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsx b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsxindex f0d952a4c74..73ee6c41fb5 100644--- a/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsx+++ b/enterprise/frontend/src/embedding/data-picker/saved-entity-picker/SavedEntityPicker.jsx@@ -9,7 +9,8 @@ import {} from "metabase/collections/utils";import { Tree } from "metabase/common/components/tree";import CS from "metabase/css/core/index.css";-import Collections, {+import {+ Collections,PERSONAL_COLLECTIONS,buildCollectionTree,} from "metabase/entities/collections";diff --git a/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsxindex c196dd62437..8c5cf490afa 100644--- a/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/application_permissions/pages/ApplicationPermissionsPage/ApplicationPermissionsPage.tsx@@ -5,7 +5,7 @@ import _ from "underscore";import { ApplicationPermissionsHelp } from "metabase/admin/permissions/components/ApplicationPermissionsHelp";import { PermissionsEditor } from "metabase/admin/permissions/components/PermissionsEditor";import { PermissionsPageLayout } from "metabase/admin/permissions/components/PermissionsPageLayout";-import Groups from "metabase/entities/groups";+import { Groups } from "metabase/entities/groups";import { connect } from "metabase/lib/redux";import {initializeApplicationPermissions,diff --git a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsxindex 6306fe923cf..a7a322e14e8 100644--- a/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/clean_up/CleanupCollectionModal/CleanupCollectionModal.tsx@@ -7,7 +7,7 @@ import { DelayedLoadingAndErrorWrapper } from "metabase/common/components/Loadinimport { PaginationControls } from "metabase/common/components/PaginationControls";import { useUserSetting } from "metabase/common/hooks";import { useListSelect } from "metabase/common/hooks/use-list-select";-import Search from "metabase/entities/search";+import { Search } from "metabase/entities/search";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { Flex, Modal } from "metabase/ui";diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.jsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.jsxindex 7fa7faf332b..f33c6e1e706 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.jsx+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/CollectionRow.jsx@@ -4,7 +4,7 @@ import { Component } from "react";import { Ellipsified } from "metabase/common/components/Ellipsified";import CS from "metabase/css/core/index.css";-import SnippetCollections from "metabase/entities/snippet-collections";+import { SnippetCollections } from "metabase/entities/snippet-collections";import { Icon } from "metabase/ui";import CollectionOptionsButton from "./CollectionOptionsButton";diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsxindex eb081530beb..5a4c054d308 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx@@ -11,7 +11,7 @@ import FormInput from "metabase/common/components/FormInput";import FormSubmitButton from "metabase/common/components/FormSubmitButton";import FormTextArea from "metabase/common/components/FormTextArea";import type { CollectionPickerItem } from "metabase/common/components/Pickers/CollectionPicker";-import SnippetCollections from "metabase/entities/snippet-collections";+import { SnippetCollections } from "metabase/entities/snippet-collections";import { Form, FormProvider } from "metabase/forms";import * as Errors from "metabase/lib/errors";import { connect } from "metabase/lib/redux";diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsxindex 9dedda738d5..f5a0d1b2d4d 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx@@ -2,7 +2,7 @@ import { useEffect } from "react";import CollectionPermissionsModal from "metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal";import Modal from "metabase/common/components/Modal";-import SnippetCollections from "metabase/entities/snippet-collections";+import { SnippetCollections } from "metabase/entities/snippet-collections";import { useDispatch } from "metabase/lib/redux";import type { SnippetCollectionPermissionsModalProps } from "metabase/plugins";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsxindex 725861f64a2..388409b4e19 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx@@ -22,8 +22,8 @@ import type {CollectionPermissionEditorType,CollectionSidebarType,} from "metabase/admin/permissions/selectors/collection-permissions";-import Collections from "metabase/entities/collections";-import Groups from "metabase/entities/groups";+import { Collections } from "metabase/entities/collections";+import { Groups } from "metabase/entities/groups";import { connect } from "metabase/lib/redux";import type { Collection, CollectionId, GroupId } from "metabase-types/api";import type { State } from "metabase-types/store";diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsxindex 0177a015607..1facb5598cd 100644--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx@@ -13,11 +13,12 @@ import type {import { buildCollectionTree } from "metabase/admin/permissions/selectors/collection-permissions";import { getPermissionWarningModal } from "metabase/admin/permissions/selectors/confirmations";import type { DataPermissionValue } from "metabase/admin/permissions/types";-import Collections, {+import {+ Collections,ROOT_COLLECTION,getCollectionIcon,} from "metabase/entities/collections";-import Group from "metabase/entities/groups";+import { Groups } from "metabase/entities/groups";import { getGroupNameLocalized, isAdminGroup } from "metabase/lib/groups";import { PLUGIN_TENANTS } from "metabase/plugins";import type {@@ -155,7 +156,7 @@ const getTenantCollectionPermission = (export const getTenantCollectionsPermissionEditor = createSelector(getTenantCollectionsPermissions,getTenantCollectionEntity,- Group.selectors.getList,+ Groups.selectors.getList,(permissions, collection, groups): CollectionPermissionEditorType => {if (!permissions || collection == null) {return null;diff --git a/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.jsx b/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.jsxindex 15a3206e47f..cacc8dc55d5 100644--- a/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.jsx+++ b/frontend/src/metabase/account/notifications/containers/ArchivePulseModal/ArchivePulseModal.jsx@@ -1,6 +1,6 @@import _ from "underscore";-import Pulses from "metabase/entities/pulses";+import { Pulses } from "metabase/entities/pulses";import { connect } from "metabase/lib/redux";import { getUser } from "metabase/selectors/user";diff --git a/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx b/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsxindex 14302ac1428..17444a93bc5 100644--- a/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx+++ b/frontend/src/metabase/account/notifications/containers/NotificationsApp/NotificationsApp.tsx@@ -3,7 +3,7 @@ import { useMemo } from "react";import type { NotificationListItem } from "metabase/account/notifications/types";import { skipToken, useListNotificationsQuery } from "metabase/api";-import Pulses from "metabase/entities/pulses";+import { Pulses } from "metabase/entities/pulses";import { useDispatch, useSelector } from "metabase/lib/redux";import { parseTimestamp } from "metabase/lib/time-dayjs";import {diff --git a/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.jsx b/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.jsxindex 886f1058f4b..b454c6b231c 100644--- a/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.jsx+++ b/frontend/src/metabase/account/notifications/containers/UnsubscribePulseModal/UnsubscribePulseModal.jsx@@ -1,6 +1,6 @@import _ from "underscore";-import Pulses from "metabase/entities/pulses";+import { Pulses } from "metabase/entities/pulses";import { connect } from "metabase/lib/redux";import { getUser } from "metabase/selectors/user";diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsxindex 3e80cf5c91f..ddd1ae4a751 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.tsx@@ -12,9 +12,9 @@ import type {CreateActionParams,UpdateActionParams,} from "metabase/entities/actions";-import Actions from "metabase/entities/actions";-import Database from "metabase/entities/databases";-import Questions from "metabase/entities/questions";+import { Actions } from "metabase/entities/actions";+import { Databases } from "metabase/entities/databases";+import { Questions } from "metabase/entities/questions";import { connect } from "metabase/lib/redux";import { getMetadata } from "metabase/selectors/metadata";import type Question from "metabase-lib/v1/Question";@@ -230,6 +230,6 @@ export default _.compose(id: (state: State, props: OwnProps) => props?.modelId,entityAlias: "model",}),- Database.loadList(),+ Databases.loadList(),connect(mapStateToProps, mapDispatchToProps),)(ActionCreatorWithContext);diff --git a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsxindex 3e966a33500..88ff1d29afc 100644--- a/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreator/InlineActionSettings.tsx@@ -8,7 +8,7 @@ import CopyWidget from "metabase/common/components/CopyWidget";import FormField from "metabase/common/components/FormField";import TextArea from "metabase/common/components/TextArea";import { useUniqueId } from "metabase/common/hooks/use-unique-id";-import Actions from "metabase/entities/actions/actions";+import { Actions } from "metabase/entities/actions/actions";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import SidebarContent from "metabase/query_builder/components/SidebarContent";diff --git a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsxindex 19e55a196f1..d305bedd39f 100644--- a/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx+++ b/frontend/src/metabase/actions/containers/ActionCreatorModal/ActionCreatorModal.tsx@@ -5,7 +5,7 @@ import { replace } from "react-router-redux";import _ from "underscore";import { skipToken, useGetActionQuery } from "metabase/api";-import Questions from "metabase/entities/questions";+import { Questions } from "metabase/entities/questions";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { setErrorPage } from "metabase/redux/app";diff --git a/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.tsx b/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.tsxindex 5142b9ca527..2ebd366141f 100644--- a/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.tsx+++ b/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.tsx@@ -7,8 +7,8 @@ import ActionCreator from "metabase/actions/containers/ActionCreator";import Modal from "metabase/common/components/Modal";import { useToggle } from "metabase/common/hooks/use-toggle";import CS from "metabase/css/core/index.css";-import Actions from "metabase/entities/actions";-import Search from "metabase/entities/search";+import { Actions } from "metabase/entities/actions";+import { Search } from "metabase/entities/search";import type { Card, WritebackAction } from "metabase-types/api";import {diff --git a/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx b/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsxindex 026e8441406..94958a3f77e 100644--- a/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx+++ b/frontend/src/metabase/admin/app/containers/DeprecationNotice/DeprecationNotice.tsx@@ -1,6 +1,6 @@import _ from "underscore";-import Databases from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import { connect } from "metabase/lib/redux";import type Database from "metabase-lib/v1/metadata/Database";import type { State } from "metabase-types/store";diff --git a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsxindex 3fe72bdc92b..053a4bc2e0d 100644--- a/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx+++ b/frontend/src/metabase/admin/databases/components/DatabaseConnectionInfoSection/DatabaseConnectionInfoSection.tsx@@ -8,7 +8,7 @@ import {useSyncDatabaseSchemaMutation,} from "metabase/api";import ActionButton from "metabase/common/components/ActionButton";-import Tables from "metabase/entities/tables";+import { Tables } from "metabase/entities/tables";import { useDispatch } from "metabase/lib/redux";import { isSyncCompleted } from "metabase/lib/syncing";import { Button, Flex, Tooltip } from "metabase/ui";diff --git a/frontend/src/metabase/admin/databases/database.ts b/frontend/src/metabase/admin/databases/database.tsindex 6869cc010f0..73fa7f409fb 100644--- a/frontend/src/metabase/admin/databases/database.ts+++ b/frontend/src/metabase/admin/databases/database.ts@@ -1,7 +1,7 @@import { createAction, createReducer } from "@reduxjs/toolkit";import { push } from "react-router-redux";-import Databases from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import { combineReducers } from "metabase/lib/redux";import type { DatabaseData, DatabaseId } from "metabase-types/api";import type { Dispatch } from "metabase-types/store";diff --git a/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.jsx b/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.jsxindex 356c0276c7a..6f0959d3484 100644--- a/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.jsx+++ b/frontend/src/metabase/admin/datamodel/containers/RevisionHistoryApp.jsx@@ -2,8 +2,8 @@import { Component } from "react";import _ from "underscore";-import Segments from "metabase/entities/segments";-import Tables from "metabase/entities/tables";+import { Segments } from "metabase/entities/segments";+import { Tables } from "metabase/entities/tables";import { connect } from "metabase/lib/redux";import RevisionHistory from "../components/revisions/RevisionHistory";diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.jsx b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.jsxindex 7e187c050f8..43701897016 100644--- a/frontend/src/metabase/admin/datamodel/containers/SegmentApp.jsx+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentApp.jsx@@ -5,8 +5,8 @@ import _ from "underscore";import { LeaveRouteConfirmModal } from "metabase/common/components/LeaveConfirmModal";import { useCallbackEffect } from "metabase/common/hooks/use-callback-effect";-import Segments from "metabase/entities/segments";-import Tables from "metabase/entities/tables";+import { Segments } from "metabase/entities/segments";+import { Tables } from "metabase/entities/tables";import { connect } from "metabase/lib/redux";import SegmentForm from "../components/SegmentForm";diff --git a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.jsx b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.jsxindex 9b4c4007186..a5c75aeb3c5 100644--- a/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.jsx+++ b/frontend/src/metabase/admin/datamodel/containers/SegmentListApp.jsx@@ -10,7 +10,7 @@ import Button from "metabase/common/components/Button";import Link from "metabase/common/components/Link";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";-import Segments from "metabase/entities/segments";+import { Segments } from "metabase/entities/segments";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.jsx b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.jsxindex 0eff2ad9caf..e4d4c604163 100644--- a/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.jsx+++ b/frontend/src/metabase/admin/datamodel/hoc/FilteredToUrlTable.jsx@@ -6,7 +6,7 @@ import { t } from "ttag";import { FieldSet } from "metabase/common/components/FieldSet";import CS from "metabase/css/core/index.css";-import Tables from "metabase/entities/tables";+import { Tables } from "metabase/entities/tables";import { connect } from "metabase/lib/redux";import { DatabaseSchemaAndTableDataSelector } from "metabase/query_builder/components/DataSelector";import { Icon } from "metabase/ui";diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.jsx b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.jsxindex d6121165da2..3d3e75e24e7 100644--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.jsx+++ b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.jsx@@ -8,8 +8,8 @@ import Button from "metabase/common/components/Button";import Link from "metabase/common/components/Link";import ModalContent from "metabase/common/components/ModalContent";import CS from "metabase/css/core/index.css";-import Collections from "metabase/entities/collections";-import Groups from "metabase/entities/groups";+import { Collections } from "metabase/entities/collections";+import { Groups } from "metabase/entities/groups";import { connect, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsxindex 825d3306235..91daf6a700e 100644--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx@@ -5,8 +5,8 @@ import { t } from "ttag";import _ from "underscore";import { CollectionPermissionsHelp } from "metabase/admin/permissions/components/CollectionPermissionsHelp";-import Collections from "metabase/entities/collections";-import Groups from "metabase/entities/groups";+import { Collections } from "metabase/entities/collections";+import { Groups } from "metabase/entities/groups";import { connect, useSelector } from "metabase/lib/redux";import type {Collection,diff --git a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsxindex 0eb8487d8c9..722e82fdbf5 100644--- a/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx+++ b/frontend/src/metabase/admin/permissions/pages/DataPermissionsPage/DataPermissionsPage.tsx@@ -4,8 +4,8 @@ import { useAsync } from "react-use";import _ from "underscore";import { skipToken, useGetDatabaseMetadataQuery } from "metabase/api";-import Databases from "metabase/entities/databases";-import Groups from "metabase/entities/groups";+import { Databases } from "metabase/entities/databases";+import { Groups } from "metabase/entities/groups";import { isAdminGroup, isDefaultGroup } from "metabase/lib/groups";import { useDispatch, useSelector } from "metabase/lib/redux";import { getSetting } from "metabase/selectors/settings";diff --git a/frontend/src/metabase/admin/permissions/permissions.js b/frontend/src/metabase/admin/permissions/permissions.jsindex b7d3e61880b..b795a541ad5 100644--- a/frontend/src/metabase/admin/permissions/permissions.js+++ b/frontend/src/metabase/admin/permissions/permissions.js@@ -12,8 +12,8 @@ import {updateTablesPermission,} from "metabase/admin/permissions/utils/graph";import { getGroupFocusPermissionsUrl } from "metabase/admin/permissions/utils/urls";-import Group from "metabase/entities/groups";-import Tables from "metabase/entities/tables";+import { Groups } from "metabase/entities/groups";+import { Tables } from "metabase/entities/tables";import {combineReducers,createAction,@@ -42,7 +42,7 @@ export const initializeDataPermissions = createThunkAction(() => async (dispatch) => {await Promise.all([dispatch(loadDataPermissions()),- dispatch(Group.actions.fetchList()),+ dispatch(Groups.actions.fetchList()),]);},);@@ -80,7 +80,7 @@ export const initializeCollectionPermissions = createThunkAction((namespace) => async (dispatch) => {await Promise.all([dispatch(loadCollectionPermissions(namespace)),- dispatch(Group.actions.fetchList()),+ dispatch(Groups.actions.fetchList()),]);},);@@ -260,7 +260,7 @@ export const initializeTenantCollectionPermissions = createThunkAction(() => async (dispatch) => {await Promise.all([dispatch(loadTenantCollectionPermissions()),- dispatch(Group.actions.fetchList()),+ dispatch(Groups.actions.fetchList()),]);},);diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsxindex 12b0e993292..3f64c04eb3d 100644--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx+++ b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx@@ -8,12 +8,13 @@ import {isLibraryCollection,nonPersonalOrArchivedCollection,} from "metabase/collections/utils";-import Collections, {+import {+ Collections,ROOT_COLLECTION,getCollectionIcon,} from "metabase/entities/collections";-import Group from "metabase/entities/groups";-import SnippetCollections from "metabase/entities/snippet-collections";+import { Groups } from "metabase/entities/groups";+import { SnippetCollections } from "metabase/entities/snippet-collections";import {getGroupNameLocalized,isAdminGroup,@@ -233,7 +234,7 @@ export type CollectionPermissionEditorType = null | {export const getCollectionsPermissionEditor = createSelector(getCollectionsPermissions,getCollectionEntity,- Group.selectors.getList,+ Groups.selectors.getList,getNamespace,(permissions,diff --git a/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts b/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.tsindex e5bb18ff17e..b8b0deb9a27 100644--- a/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts+++ b/frontend/src/metabase/admin/permissions/selectors/data-permissions/groups.ts@@ -1,7 +1,7 @@import { createSelector } from "@reduxjs/toolkit";import _ from "underscore";-import Groups from "metabase/entities/groups";+import { Groups } from "metabase/entities/groups";import { isAdminGroup, isDefaultGroup } from "metabase/lib/groups";import { PLUGIN_TENANTS } from "metabase/plugins";import type { Group } from "metabase-types/api";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.tsxindex 98c44926730..61117b70ba9 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@@ -3,8 +3,8 @@ import { createSelector } from "@reduxjs/toolkit";import { msgid, ngettext, t } from "ttag";import _ from "underscore";-import Groups from "metabase/entities/groups";-import Tables from "metabase/entities/tables";+import { Groups } from "metabase/entities/groups";+import { Tables } from "metabase/entities/tables";import { isAdminGroup, isDefaultGroup } from "metabase/lib/groups";import {PLUGIN_AUDIT,diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsxindex a95927a55eb..da5cf6dec7a 100644--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.tsx@@ -1,7 +1,7 @@import _ from "underscore";import { updateSetting } from "metabase/admin/settings/settings";-import Group from "metabase/entities/groups";+import { Groups } from "metabase/entities/groups";import { connect } from "metabase/lib/redux";import { getSetting } from "metabase/selectors/settings";import type { Settings } from "metabase-types/api/settings";@@ -14,18 +14,18 @@ const mapStateToProps = (props: { mappingSetting: keyof Settings },) => {return {- allGroups: Group.selectors.getList(state),+ allGroups: Groups.selectors.getList(state),mappings: getSetting(state, props.mappingSetting) || {},};};const mapDispatchToProps = {updateSetting,- deleteGroup: Group.actions.delete,- clearGroupMember: Group.actions.clearMember,+ deleteGroup: Groups.actions.delete,+ clearGroupMember: Groups.actions.clearMember,};export const GroupMappingsWidget = _.compose(connect(mapStateToProps, mapDispatchToProps),- Group.loadList(),+ Groups.loadList(),)(GroupMappingsWidgetView);diff --git a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsx b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsxindex d20e139b16b..804d6836c26 100644--- a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsx+++ b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobModal.tsx@@ -7,7 +7,7 @@ import Button from "metabase/common/components/Button";import Link from "metabase/common/components/Link";import ModalContent from "metabase/common/components/ModalContent";import ButtonsS from "metabase/css/components/buttons.module.css";-import PersistedModels from "metabase/entities/persisted-models";+import { PersistedModels } from "metabase/entities/persisted-models";import { connect } from "metabase/lib/redux";import type { ModelCacheRefreshStatus } from "metabase-types/api";diff --git a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsxindex 45085032455..80b88fc4a44 100644--- a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx+++ b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.tsx@@ -17,7 +17,7 @@ import { PaginationControls } from "metabase/common/components/PaginationControlimport { usePagination } from "metabase/common/hooks/use-pagination";import AdminS from "metabase/css/admin.module.css";import CS from "metabase/css/core/index.css";-import PersistedModels from "metabase/entities/persisted-models";+import { PersistedModels } from "metabase/entities/persisted-models";import { capitalize } from "metabase/lib/formatting";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.unit.spec.tsx b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.unit.spec.tsxindex cf7e31c4ecf..60568435827 100644--- a/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.unit.spec.tsx+++ b/frontend/src/metabase/admin/tools/components/ModelCacheRefreshJobs/ModelCacheRefreshJobs.unit.spec.tsx@@ -1,6 +1,6 @@import { setupModelPersistenceEndpoints } from "__support__/server-mocks/persist";import { renderWithProviders, screen } from "__support__/ui";-import PersistedModels from "metabase/entities/persisted-models";+import { PersistedModels } from "metabase/entities/persisted-models";import type { ModelCacheRefreshStatus } from "metabase-types/api";import { getMockModelCacheInfo } from "metabase-types/api/mocks/models";diff --git a/frontend/src/metabase/archive/components/ArchivedEntityBanner/DashboardArchivedEntityBanner.tsx b/frontend/src/metabase/archive/components/ArchivedEntityBanner/DashboardArchivedEntityBanner.tsxindex d8a81b31b4c..e7e3a577e21 100644--- a/frontend/src/metabase/archive/components/ArchivedEntityBanner/DashboardArchivedEntityBanner.tsx+++ b/frontend/src/metabase/archive/components/ArchivedEntityBanner/DashboardArchivedEntityBanner.tsx@@ -1,6 +1,6 @@import { useDashboardContext } from "metabase/dashboard/context";-import Bookmarks from "metabase/entities/bookmarks";-import Dashboards from "metabase/entities/dashboards";+import { Bookmarks } from "metabase/entities/bookmarks";+import { Dashboards } from "metabase/entities/dashboards";import { useDispatch } from "metabase/lib/redux";import { ArchivedEntityBanner } from "./ArchivedEntityBanner";diff --git a/frontend/src/metabase/browse/containers/TableBrowser/TableBrowser.jsx b/frontend/src/metabase/browse/containers/TableBrowser/TableBrowser.jsxindex 68817562b76..bba99056171 100644--- a/frontend/src/metabase/browse/containers/TableBrowser/TableBrowser.jsx+++ b/frontend/src/metabase/browse/containers/TableBrowser/TableBrowser.jsx@@ -1,6 +1,6 @@import _ from "underscore";-import Tables from "metabase/entities/tables";+import { Tables } from "metabase/entities/tables";import { connect } from "metabase/lib/redux";import { isSyncInProgress } from "metabase/lib/syncing";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsxindex b2eac9bd64e..1ee5971c3f1 100644--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx@@ -21,8 +21,8 @@ import {import { Columns } from "metabase/common/components/ItemsTable/Columns";import type { ResponsiveProps } from "metabase/common/components/ItemsTable/utils";import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";-import Bookmarks from "metabase/entities/bookmarks";-import Questions from "metabase/entities/questions";+import { Bookmarks } from "metabase/entities/bookmarks";+import { Questions } from "metabase/entities/questions";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import {diff --git a/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx b/frontend/src/metabase/browse/schemas/BrowseSchemas.tsxindex 48f9ad4fb82..a7947b726e8 100644--- a/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx+++ b/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx@@ -4,8 +4,8 @@ import { t } from "ttag";import TableBrowser from "metabase/browse/containers/TableBrowser";import { BrowserCrumbs } from "metabase/common/components/BrowserCrumbs";import CS from "metabase/css/core/index.css";-import Database from "metabase/entities/databases";-import Schemas from "metabase/entities/schemas";+import { Databases } from "metabase/entities/databases";+import { Schemas } from "metabase/entities/schemas";import * as Urls from "metabase/lib/urls";import type { CollectionItem } from "metabase-types/api";@@ -49,7 +49,7 @@ const BrowseSchemasContainer = ({<BrowserCrumbscrumbs={[{ title: t`Databases`, to: "/browse/databases" },- { title: <Database.Name id={dbId} /> },+ { title: <Databases.Name id={dbId} /> },]}/></BrowseHeaderContent>diff --git a/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts b/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.tsindex 038540a7531..939c14adea4 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts+++ b/frontend/src/metabase/browse/tables/TableBrowser/useDatabaseCrumb.ts@@ -1,7 +1,7 @@import { t } from "ttag";import { skipToken, useGetDatabaseQuery } from "metabase/api";-import Databases from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import { useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { SAVED_QUESTIONS_VIRTUAL_DB_ID } from "metabase-lib/v1/metadata/utils/saved-questions";diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.unit.spec.tsx b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.unit.spec.tsxindex 44293cd5f99..a238ea4ed70 100644--- a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.unit.spec.tsx+++ b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.unit.spec.tsx@@ -3,9 +3,9 @@ import userEvent from "@testing-library/user-event";import { createMockEntitiesState } from "__support__/store";import { getIcon, queryIcon, renderWithProviders } from "__support__/ui";-import Collections from "metabase/entities/collections";-import Dashboards from "metabase/entities/dashboards";-import Questions from "metabase/entities/questions";+import { Collections } from "metabase/entities/collections";+import { Dashboards } from "metabase/entities/dashboards";+import { Questions } from "metabase/entities/questions";import { getMetadata } from "metabase/selectors/metadata";import type {Collection,diff --git a/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx b/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsxindex 48559afb3bd..ad8824dc812 100644--- a/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx+++ b/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx@@ -6,7 +6,7 @@ import { t } from "ttag";import _ from "underscore";import { ArchiveModal } from "metabase/common/components/ArchiveModal";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsxindex 22b9313151f..29c7594170e 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContent.tsx@@ -7,8 +7,8 @@ import {useCollectionQuery,useDatabaseListQuery,} from "metabase/common/hooks";-import Bookmark from "metabase/entities/bookmarks";-import Databases from "metabase/entities/databases";+import { Bookmarks } from "metabase/entities/bookmarks";+import { Databases } from "metabase/entities/databases";import { useDispatch, useSelector } from "metabase/lib/redux";import type { UploadFileProps } from "metabase/redux/uploads";import { uploadFile as uploadFileAction } from "metabase/redux/uploads";@@ -60,9 +60,9 @@ export function CollectionContent({const dispatch = useDispatch();const createBookmark = (id: BookmarkId, type: BookmarkType) =>- dispatch(Bookmark.actions.create({ id, type }));+ dispatch(Bookmarks.actions.create({ id, type }));const deleteBookmark = (id: BookmarkId, type: BookmarkType) =>- dispatch(Bookmark.actions.delete({ id, type }));+ dispatch(Bookmarks.actions.delete({ id, type }));const uploadFile = useCallback(({ file, modelId, collectionId, tableId, uploadMode }: UploadFileProps) =>diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsxindex 19148d2bd9a..47b2e159d22 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx@@ -29,9 +29,9 @@ import { getVisibleColumnsMap } from "metabase/common/components/ItemsTable/utilimport ItemsDragLayer from "metabase/common/components/dnd/ItemsDragLayer";import { useListSelect } from "metabase/common/hooks/use-list-select";import { useToggle } from "metabase/common/hooks/use-toggle";-import Bookmarks from "metabase/entities/bookmarks";-import Collections from "metabase/entities/collections";-import Search from "metabase/entities/search";+import { Bookmarks } from "metabase/entities/bookmarks";+import { Collections } from "metabase/entities/collections";+import { Search } from "metabase/entities/search";import { useDispatch } from "metabase/lib/redux";import { addUndo } from "metabase/redux/undo";import type Database from "metabase-lib/v1/metadata/Database";diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsxindex b86252245a3..fa8d966f26a 100644--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionItemsTable.tsx@@ -25,7 +25,7 @@ import { PaginationControls } from "metabase/common/components/PaginationControlimport { usePagination } from "metabase/common/hooks/use-pagination";import CS from "metabase/css/core/index.css";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";-import Search from "metabase/entities/search";+import { Search } from "metabase/entities/search";import type Database from "metabase-lib/v1/metadata/Database";import type {Bookmark,diff --git a/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx b/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsxindex ab6014820e1..9dddbff1bf6 100644--- a/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx+++ b/frontend/src/metabase/collections/components/CollectionCopyEntityModal.tsx@@ -2,7 +2,7 @@ import { dissoc } from "icepick";import { useState } from "react";import { t } from "ttag";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";import { connect } from "metabase/lib/redux";import { entityTypeForObject } from "metabase/lib/schema";diff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx b/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsxindex fe9d3beca0e..fef86bf534e 100644--- a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx+++ b/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx@@ -12,7 +12,7 @@ import { FormFooter } from "metabase/common/components/FormFooter";import FormInput from "metabase/common/components/FormInput";import FormSubmitButton from "metabase/common/components/FormSubmitButton";import FormTextArea from "metabase/common/components/FormTextArea";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import { Form, FormProvider } from "metabase/forms";import * as Errors from "metabase/lib/errors";import { connect } from "metabase/lib/redux";diff --git a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsxindex 1058652291e..d7fd3506a64 100644--- a/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx+++ b/frontend/src/metabase/collections/components/MoveCollectionModal/MoveCollectionModal.tsx@@ -9,7 +9,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { MoveModal } from "metabase/common/components/MoveModal";import type { CollectionPickerItem } from "metabase/common/components/Pickers/CollectionPicker";import { useCollectionQuery } from "metabase/common/hooks";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import type { Collection, CollectionId } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx b/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsxindex d0a1ee19a44..b241c045ae0 100644--- a/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx+++ b/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx@@ -1,4 +1,4 @@-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import { connect } from "metabase/lib/redux";import { uploadFile } from "metabase/redux/uploads";import type { Collection } from "metabase-types/api";diff --git a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx b/frontend/src/metabase/collections/containers/CreateCollectionModal.tsxindex c45cde66ccc..05ea1e4b0c6 100644--- a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx+++ b/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx@@ -4,7 +4,7 @@ import { push } from "react-router-redux";import { t } from "ttag";import { useEscapeToCloseModal } from "metabase/common/hooks/use-escape-to-close-modal";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { Modal } from "metabase/ui";diff --git a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx b/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsxindex 8eae581fcf2..ae6233d931f 100644--- a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx+++ b/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx@@ -21,9 +21,9 @@ import {} from "metabase/common/components/Pickers/CollectionPicker";import SnippetCollectionName from "metabase/common/components/SnippetCollectionName";import { useUniqueId } from "metabase/common/hooks/use-unique-id";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import { getCollectionIcon } from "metabase/entities/collections/utils";-import Dashboard from "metabase/entities/dashboards";+import { Dashboards } from "metabase/entities/dashboards";import { useSelector } from "metabase/lib/redux";import { Button, Flex, Icon } from "metabase/ui";import type { CollectionId, DashboardId } from "metabase-types/api";@@ -46,7 +46,7 @@ function ItemName({return (<Flex align="center" gap="sm"><Icon name="dashboard" c="brand" />- <Dashboard.Name id={dashboardId} />+ <Dashboards.Name id={dashboardId} /></Flex>);}@@ -134,7 +134,7 @@ export function FormCollectionAndDashboardPicker({const selectedItem = useSelector((state) =>- Dashboard.selectors.getObject(state, {+ Dashboards.selectors.getObject(state, {entityId: dashboardIdInput.value,}) ||Collections.selectors.getObject(state, {diff --git a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx b/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsxindex 8ae125c4632..e3590655c8c 100644--- a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx+++ b/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx@@ -20,7 +20,7 @@ import {} from "metabase/common/components/Pickers/CollectionPicker";import SnippetCollectionName from "metabase/common/components/SnippetCollectionName";import { useUniqueId } from "metabase/common/hooks/use-unique-id";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import { useSelector } from "metabase/lib/redux";import { PLUGIN_TENANTS } from "metabase/plugins";import { Button, Icon } from "metabase/ui";diff --git a/frontend/src/metabase/common/components/CollectionName.jsx b/frontend/src/metabase/common/components/CollectionName.jsxindex 1e1204d4ac2..97cb8acf675 100644--- a/frontend/src/metabase/common/components/CollectionName.jsx+++ b/frontend/src/metabase/common/components/CollectionName.jsx@@ -1,5 +1,5 @@/* eslint-disable react/prop-types */-import Collections, { ROOT_COLLECTION } from "metabase/entities/collections";+import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";const CollectionName = ({ id }) => {if (id === "root" || id === null) {diff --git a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsxindex 0edd84e864a..5e62df6635a 100644--- a/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx+++ b/frontend/src/metabase/common/components/MetadataInfo/TableInfo/TableInfo.tsx@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";import { useAsyncFn } from "react-use";import { t } from "ttag";-import Tables from "metabase/entities/tables";+import { Tables } from "metabase/entities/tables";import { connect } from "metabase/lib/redux";import type Table from "metabase-lib/v1/metadata/Table";diff --git a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsxindex b0acae588a2..7788150e02f 100644--- a/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx+++ b/frontend/src/metabase/common/components/NewItemMenu/NewItemMenu.tsx@@ -1,7 +1,7 @@import { push } from "react-router-redux";import _ from "underscore";-import Databases from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import { connect } from "metabase/lib/redux";import { closeNavbar } from "metabase/redux/app";import { getHasDatabaseWithJsonEngine } from "metabase/selectors/data";diff --git a/frontend/src/metabase/common/components/SavedQuestionLoader.jsx b/frontend/src/metabase/common/components/SavedQuestionLoader.jsxindex 136a62d4303..38514ff8268 100644--- a/frontend/src/metabase/common/components/SavedQuestionLoader.jsx+++ b/frontend/src/metabase/common/components/SavedQuestionLoader.jsx@@ -3,7 +3,7 @@ import { useMemo } from "react";import { useAsync } from "react-use";import _ from "underscore";-import Questions from "metabase/entities/questions";+import { Questions } from "metabase/entities/questions";import { useDispatch, useSelector } from "metabase/lib/redux";import { loadMetadataForCard } from "metabase/questions/actions";import { getMetadata } from "metabase/selectors/metadata";diff --git a/frontend/src/metabase/common/components/SnippetCollectionName.tsx b/frontend/src/metabase/common/components/SnippetCollectionName.tsxindex 327dc9e82e6..e789ac47d69 100644--- a/frontend/src/metabase/common/components/SnippetCollectionName.tsx+++ b/frontend/src/metabase/common/components/SnippetCollectionName.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import { isRootCollection } from "metabase/collections/utils";-import SnippetCollections from "metabase/entities/snippet-collections";+import { SnippetCollections } from "metabase/entities/snippet-collections";import type { CollectionId } from "metabase-types/api";function SnippetCollectionName({ id }: { id: CollectionId }) {diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-bookmark-list-query/use-bookmark-list-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-bookmark-list-query/use-bookmark-list-query.tsindex 365e5906dad..55c67aaa4f0 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-bookmark-list-query/use-bookmark-list-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-bookmark-list-query/use-bookmark-list-query.ts@@ -1,4 +1,4 @@-import Bookmarks from "metabase/entities/bookmarks";+import { Bookmarks } from "metabase/entities/bookmarks";import type { Bookmark } from "metabase-types/api";import type {diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-collection-query/use-collection-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-collection-query/use-collection-query.tsindex df4e2f88580..a7ef1cb186a 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-collection-query/use-collection-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-collection-query/use-collection-query.ts@@ -1,4 +1,4 @@-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import type { Collection, CollectionId } from "metabase-types/api";import type {diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-dashboard-query/use-dashboard-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-dashboard-query/use-dashboard-query.tsindex c41a07d66b7..f382fee29dc 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-dashboard-query/use-dashboard-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-dashboard-query/use-dashboard-query.ts@@ -3,7 +3,7 @@ import type {UseEntityQueryResult,} from "metabase/common/hooks/entity-framework/use-entity-query";import { useEntityQuery } from "metabase/common/hooks/entity-framework/use-entity-query";-import Dashboards from "metabase/entities/dashboards";+import { Dashboards } from "metabase/entities/dashboards";import type { Dashboard, DashboardId } from "metabase-types/api";/**diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/use-database-list-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/use-database-list-query.tsindex 92e4bb81006..7472a8d5382 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/use-database-list-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-database-list-query/use-database-list-query.ts@@ -3,7 +3,7 @@ import type {UseEntityListQueryResult,} from "metabase/common/hooks/entity-framework/use-entity-list-query";import { useEntityListQuery } from "metabase/common/hooks/entity-framework/use-entity-list-query";-import Databases from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import type Database from "metabase-lib/v1/metadata/Database";import type { ListDatabasesRequest } from "metabase-types/api";diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-database-query/use-database-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-database-query/use-database-query.tsindex 459f7624687..2f5cd04536f 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-database-query/use-database-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-database-query/use-database-query.ts@@ -3,7 +3,7 @@ import type {UseEntityQueryResult,} from "metabase/common/hooks/entity-framework/use-entity-query";import { useEntityQuery } from "metabase/common/hooks/entity-framework/use-entity-query";-import Databases from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import type Database from "metabase-lib/v1/metadata/Database";import type { DatabaseId, GetDatabaseRequest } from "metabase-types/api";diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsx b/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsxindex 6d13e8da748..732e62065cb 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsx+++ b/frontend/src/metabase/common/hooks/entity-framework/use-entity-list-query/use-entity-list-query.unit.spec.tsx@@ -13,8 +13,8 @@ import {within,} from "__support__/ui";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import Databases from "metabase/entities/databases";-import Tables from "metabase/entities/tables";+import { Databases } from "metabase/entities/databases";+import { Tables } from "metabase/entities/tables";import { delay } from "metabase/lib/promise";import { useDispatch } from "metabase/lib/redux";import type Database from "metabase-lib/v1/metadata/Database";diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.unit.spec.tsx b/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.unit.spec.tsxindex 0d251e31a47..b84a0814c75 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.unit.spec.tsx+++ b/frontend/src/metabase/common/hooks/entity-framework/use-entity-query/use-entity-query.unit.spec.tsx@@ -10,8 +10,8 @@ import {waitForLoaderToBeRemoved,} from "__support__/ui";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import Databases from "metabase/entities/databases";-import Tables from "metabase/entities/tables";+import { Databases } from "metabase/entities/databases";+import { Tables } from "metabase/entities/tables";import type Database from "metabase-lib/v1/metadata/Database";import type Table from "metabase-lib/v1/metadata/Table";import type { DatabaseId, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-group-list-query/use-group-list-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-group-list-query/use-group-list-query.tsindex 3fb2d215111..5a84903e1b9 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-group-list-query/use-group-list-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-group-list-query/use-group-list-query.ts@@ -3,7 +3,7 @@ import type {UseEntityListQueryResult,} from "metabase/common/hooks/entity-framework/use-entity-list-query";import { useEntityListQuery } from "metabase/common/hooks/entity-framework/use-entity-list-query";-import Groups from "metabase/entities/groups";+import { Groups } from "metabase/entities/groups";import type { GroupListQuery } from "metabase-types/api";/**diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-question-list-query/use-question-list-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-question-list-query/use-question-list-query.tsindex 69a48291df7..8ea06ef1367 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-question-list-query/use-question-list-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-question-list-query/use-question-list-query.ts@@ -3,7 +3,7 @@ import type {UseEntityListQueryResult,} from "metabase/common/hooks/entity-framework/use-entity-list-query";import { useEntityListQuery } from "metabase/common/hooks/entity-framework/use-entity-list-query";-import Questions from "metabase/entities/questions";+import { Questions } from "metabase/entities/questions";import type Question from "metabase-lib/v1/Question";import type { ListCardsRequest } from "metabase-types/api";diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-question-query/use-question-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-question-query/use-question-query.tsindex d15230fb635..655fcd1f2d2 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-question-query/use-question-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-question-query/use-question-query.ts@@ -3,7 +3,7 @@ import type {UseEntityQueryResult,} from "metabase/common/hooks/entity-framework/use-entity-query";import { useEntityQuery } from "metabase/common/hooks/entity-framework/use-entity-query";-import Questions from "metabase/entities/questions";+import { Questions } from "metabase/entities/questions";import type Question from "metabase-lib/v1/Question";import type { CardId, GetCardRequest } from "metabase-types/api";diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.tsindex dd1a0a26232..5311eeeb4de 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-search-list-query/use-search-list-query.ts@@ -1,4 +1,4 @@-import Search from "metabase/entities/search";+import { Search } from "metabase/entities/search";import type {CollectionItem,SearchRequest,diff --git a/frontend/src/metabase/common/hooks/entity-framework/use-table-query/use-table-query.ts b/frontend/src/metabase/common/hooks/entity-framework/use-table-query/use-table-query.tsindex 85d2ec909e1..600f466563d 100644--- a/frontend/src/metabase/common/hooks/entity-framework/use-table-query/use-table-query.ts+++ b/frontend/src/metabase/common/hooks/entity-framework/use-table-query/use-table-query.ts@@ -3,7 +3,7 @@ import type {UseEntityQueryResult,} from "metabase/common/hooks/entity-framework/use-entity-query";import { useEntityQuery } from "metabase/common/hooks/entity-framework/use-entity-query";-import Tables from "metabase/entities/tables";+import { Tables } from "metabase/entities/tables";import type Table from "metabase-lib/v1/metadata/Table";import type { GetTableRequest, TableId } from "metabase-types/api";diff --git a/frontend/src/metabase/dashboard/actions/cards-typed.ts b/frontend/src/metabase/dashboard/actions/cards-typed.tsindex b35f1e22512..eaca1d42d25 100644--- a/frontend/src/metabase/dashboard/actions/cards-typed.ts+++ b/frontend/src/metabase/dashboard/actions/cards-typed.ts@@ -2,7 +2,7 @@ import { createAction } from "@reduxjs/toolkit";import { t } from "ttag";import _ from "underscore";-import Questions from "metabase/entities/questions";+import { Questions } from "metabase/entities/questions";import {DEFAULT_CARD_SIZE,GRID_WIDTH,diff --git a/frontend/src/metabase/dashboard/actions/save.js b/frontend/src/metabase/dashboard/actions/save.jsindex 229c4904556..00742f53c87 100644--- a/frontend/src/metabase/dashboard/actions/save.js+++ b/frontend/src/metabase/dashboard/actions/save.js@@ -5,7 +5,7 @@ import {fetchDashboard,fetchDashboardCardData,} from "metabase/dashboard/actions";-import Dashboards from "metabase/entities/dashboards";+import { Dashboards } from "metabase/entities/dashboards";import { createThunkAction } from "metabase/lib/redux";import { CardApi } from "metabase/services";import { clickBehaviorIsValid } from "metabase-lib/v1/parameters/utils/click-behavior";diff --git a/frontend/src/metabase/dashboard/actions/tabs.ts b/frontend/src/metabase/dashboard/actions/tabs.tsindex 52bac18e843..8f98eacfda8 100644--- a/frontend/src/metabase/dashboard/actions/tabs.ts+++ b/frontend/src/metabase/dashboard/actions/tabs.ts@@ -7,7 +7,7 @@ import {CANCEL_EDITING_DASHBOARD,INITIALIZE,} from "metabase/dashboard/actions/core";-import Dashboards from "metabase/entities/dashboards";+import { Dashboards } from "metabase/entities/dashboards";import { getPositionForNewDashCard } from "metabase/lib/dashboard_grid";import { checkNotNull } from "metabase/lib/types";import { addUndo } from "metabase/redux/undo";diff --git a/frontend/src/metabase/dashboard/actions/trash.ts b/frontend/src/metabase/dashboard/actions/trash.tsindex 3dc60db384a..b33b28ca537 100644--- a/frontend/src/metabase/dashboard/actions/trash.ts+++ b/frontend/src/metabase/dashboard/actions/trash.ts@@ -4,8 +4,8 @@ import _ from "underscore";import { getTrashUndoMessage } from "metabase/archive/utils";import { canonicalCollectionId } from "metabase/collections/utils";import { fetchDashboard } from "metabase/dashboard/actions";-import Dashboards from "metabase/entities/dashboards";-import Questions from "metabase/entities/questions";+import { Dashboards } from "metabase/entities/dashboards";+import { Questions } from "metabase/entities/questions";import { createThunkAction } from "metabase/lib/redux";import { addUndo } from "metabase/redux/undo";diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsxindex d986cacbcab..e2127286feb 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/LinkOptions/LinkedEntityPicker/LinkedEntityPicker.tsx@@ -14,8 +14,8 @@ import {} from "metabase/dashboard/components/ClickMappings";import { getDashboard } from "metabase/dashboard/selectors";import { ROOT_COLLECTION } from "metabase/entities/collections/constants";-import Dashboards from "metabase/entities/dashboards";-import Questions from "metabase/entities/questions";+import { Dashboards } from "metabase/entities/dashboards";+import { Questions } from "metabase/entities/questions";import { useSelector } from "metabase/lib/redux";import { checkNotNull } from "metabase/lib/types";import { getMetadata } from "metabase/selectors/metadata";diff --git a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TableClickBehaviorView/Column.tsx b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TableClickBehaviorView/Column.tsxindex 2847acd3c93..40dfb7c9fe0 100644--- a/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TableClickBehaviorView/Column.tsx+++ b/frontend/src/metabase/dashboard/components/ClickBehaviorSidebar/TableClickBehaviorView/Column.tsx@@ -1,8 +1,8 @@import type * as React from "react";import { jt, msgid, ngettext, t } from "ttag";-import Dashboards from "metabase/entities/dashboards";-import Questions from "metabase/entities/questions";+import { Dashboards } from "metabase/entities/dashboards";+import { Questions } from "metabase/entities/questions";import type { IconName } from "metabase/ui";import { getIconForField } from "metabase-lib/v1/metadata/utils/fields";import type {diff --git a/frontend/src/metabase/dashboard/components/DashboardBookmark.tsx b/frontend/src/metabase/dashboard/components/DashboardBookmark.tsxindex f85721fe00e..b38d585dd83 100644--- a/frontend/src/metabase/dashboard/components/DashboardBookmark.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardBookmark.tsx@@ -1,7 +1,7 @@import { BookmarkToggle } from "metabase/common/components/BookmarkToggle";import { useBookmarkListQuery } from "metabase/common/hooks";import { useDashboardContext } from "metabase/dashboard/context/context";-import Bookmark from "metabase/entities/bookmarks";+import { Bookmarks } from "metabase/entities/bookmarks";import { useDispatch } from "metabase/lib/redux";import { useRegisterShortcut } from "metabase/palette/hooks/useRegisterShortcut";import type { DashboardId, Bookmark as IBookmark } from "metabase-types/api";@@ -27,7 +27,7 @@ export const DashboardBookmark = (): JSX.Element | null => {const handleCreateBookmark = () => {if (dashboard) {const id = dashboard.id;- dispatch(Bookmark.actions.create({ id, type: "dashboard" }));+ dispatch(Bookmarks.actions.create({ id, type: "dashboard" }));trackDashboardBookmarked();}};@@ -35,7 +35,7 @@ export const DashboardBookmark = (): JSX.Element | null => {const handleDeleteBookmark = () => {if (dashboard) {const id = dashboard.id;- dispatch(Bookmark.actions.delete({ id, type: "dashboard" }));+ dispatch(Bookmarks.actions.delete({ id, type: "dashboard" }));}};diff --git a/frontend/src/metabase/dashboard/components/DashboardCopyModal.jsx b/frontend/src/metabase/dashboard/components/DashboardCopyModal.jsxindex 5ad2cab49f6..8462c1aa48d 100644--- a/frontend/src/metabase/dashboard/components/DashboardCopyModal.jsx+++ b/frontend/src/metabase/dashboard/components/DashboardCopyModal.jsx@@ -6,9 +6,9 @@ import { replace } from "react-router-redux";import { t } from "ttag";import _ from "underscore";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import EntityCopyModal from "metabase/entities/containers/EntityCopyModal";-import Dashboards from "metabase/entities/dashboards";+import { Dashboards } from "metabase/entities/dashboards";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsxindex e4bede44022..ad13aba073d 100644--- a/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx+++ b/frontend/src/metabase/dashboard/components/DashboardMoveModal.tsx@@ -6,7 +6,7 @@ import Link from "metabase/common/components/Link";import { MoveModal } from "metabase/common/components/MoveModal";import type { CollectionPickerItem } from "metabase/common/components/Pickers/CollectionPicker";import { ROOT_COLLECTION } from "metabase/entities/collections";-import Dashboards from "metabase/entities/dashboards";+import { Dashboards } from "metabase/entities/dashboards";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { Flex, Icon } from "metabase/ui";diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsxindex 1381b4be77f..12f717c97a8 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionList.tsx@@ -16,7 +16,7 @@ import { usePagination } from "metabase/common/hooks/use-pagination";import { addCardWithVisualization } from "metabase/dashboard/actions";import { getSelectedTabId } from "metabase/dashboard/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";-import Search from "metabase/entities/search";+import { Search } from "metabase/entities/search";import { trackSimpleEvent } from "metabase/lib/analytics";import { DEFAULT_SEARCH_LIMIT } from "metabase/lib/constants";import { getIcon } from "metabase/lib/icon";diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsxindex 3b47938c3ce..46b9533e732 100644--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx@@ -11,7 +11,7 @@ import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";import { useDashboardContext } from "metabase/dashboard/context";import { getDashboard } from "metabase/dashboard/selectors";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";-import Collections, { ROOT_COLLECTION } from "metabase/entities/collections";+import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";import { getCrumbs } from "metabase/lib/collections";import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";import { connect, useDispatch, useSelector } from "metabase/lib/redux";diff --git a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.jsx b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.jsxindex f995e654acd..c2f9133cfda 100644--- a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.jsx+++ b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.jsx@@ -8,8 +8,8 @@ import _ from "underscore";import { ArchiveModal } from "metabase/common/components/ArchiveModal";import { setArchivedDashboard } from "metabase/dashboard/actions";-import Collections from "metabase/entities/collections";-import Dashboards from "metabase/entities/dashboards";+import { Collections } from "metabase/entities/collections";+import { Dashboards } from "metabase/entities/dashboards";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx b/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsxindex 36db0589987..45e7f04ff5a 100644--- a/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx+++ b/frontend/src/metabase/dashboard/containers/CopyDashboardForm.tsx@@ -8,7 +8,7 @@ import FormCollectionPicker from "metabase/collections/containers/FormCollectionimport Button from "metabase/common/components/Button";import type { FilterItemsInPersonalCollection } from "metabase/common/components/EntityPicker";import { FormFooter } from "metabase/common/components/FormFooter";-import Dashboards from "metabase/entities/dashboards";+import { Dashboards } from "metabase/entities/dashboards";import {Form,FormCheckbox,diff --git a/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx b/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsxindex db4e63155be..d98e7c6b705 100644--- a/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx+++ b/frontend/src/metabase/dashboard/containers/CreateDashboardForm.tsx@@ -6,7 +6,7 @@ import { useCreateDashboardMutation } from "metabase/api";import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker/FormCollectionPicker";import type { FilterItemsInPersonalCollection } from "metabase/common/components/EntityPicker";import { FormFooter } from "metabase/common/components/FormFooter";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import {Form,FormErrorMessage,diff --git a/frontend/src/metabase/dashboard/reducers-typed.ts b/frontend/src/metabase/dashboard/reducers-typed.tsindex 2ad51185a31..ebcbdcf010b 100644--- a/frontend/src/metabase/dashboard/reducers-typed.ts+++ b/frontend/src/metabase/dashboard/reducers-typed.ts@@ -8,8 +8,8 @@ import {updateDashboardEmbeddingParams,updateDashboardEnableEmbedding,} from "metabase/api";-import Dashboards from "metabase/entities/dashboards";-import Questions from "metabase/entities/questions";+import { Dashboards } from "metabase/entities/dashboards";+import { Questions } from "metabase/entities/questions";import { handleActions } from "metabase/lib/redux";import {NAVIGATE_BACK_TO_DASHBOARD,diff --git a/frontend/src/metabase/dashboard/reducers.js b/frontend/src/metabase/dashboard/reducers.jsindex 67079e2c22f..3a98cb42a6e 100644--- a/frontend/src/metabase/dashboard/reducers.js+++ b/frontend/src/metabase/dashboard/reducers.js@@ -1,8 +1,8 @@import { assoc, assocIn, chain, dissoc, merge, updateIn } from "icepick";import _ from "underscore";-import Actions from "metabase/entities/actions";-import Questions from "metabase/entities/questions";+import { Actions } from "metabase/entities/actions";+import { Questions } from "metabase/entities/questions";import { combineReducers, handleActions } from "metabase/lib/redux";import {diff --git a/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx b/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsxindex 505c3d06ec1..68bb993907d 100644--- a/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx+++ b/frontend/src/metabase/documents/components/DocumentArchivedEntityBanner.tsx@@ -2,8 +2,8 @@ import { t } from "ttag";import { deletePermanently } from "metabase/archive/actions";import { ArchivedEntityBanner } from "metabase/archive/components/ArchivedEntityBanner/ArchivedEntityBanner";-import Bookmarks from "metabase/entities/bookmarks";-import Documents from "metabase/entities/documents";+import { Bookmarks } from "metabase/entities/bookmarks";+import { Documents } from "metabase/entities/documents";import { useDispatch, useSelector } from "metabase/lib/redux";import { getCurrentDocument } from "../selectors";diff --git a/frontend/src/metabase/entities/actions/actions.ts b/frontend/src/metabase/entities/actions/actions.tsindex 9a4c526692a..283b8af6e49 100644--- a/frontend/src/metabase/entities/actions/actions.ts+++ b/frontend/src/metabase/entities/actions/actions.ts@@ -114,7 +114,7 @@ const DELETE_PUBLIC_LINK = "metabase/entities/actions/DELETE_PUBLIC_LINK";/*** @deprecated use "metabase/api" instead*/-const Actions = createEntity({+export const Actions = createEntity({name: "actions",nameOne: "action",schema: ActionSchema,@@ -226,6 +226,3 @@ const Actions = createEntity({}},});--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default Actions;diff --git a/frontend/src/metabase/entities/actions/index.ts b/frontend/src/metabase/entities/actions/index.tsindex 5c2375af75e..8ff5a89aff8 100644--- a/frontend/src/metabase/entities/actions/index.ts+++ b/frontend/src/metabase/entities/actions/index.ts@@ -1,3 +1 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./actions";export * from "./actions";diff --git a/frontend/src/metabase/entities/bookmarks.js b/frontend/src/metabase/entities/bookmarks.jsindex 4e2bde5d8fc..3490c621bb8 100644--- a/frontend/src/metabase/entities/bookmarks.js+++ b/frontend/src/metabase/entities/bookmarks.js@@ -4,10 +4,10 @@ import { t } from "ttag";import _ from "underscore";import { bookmarkApi, useListBookmarksQuery } from "metabase/api";-import Collections from "metabase/entities/collections";-import Dashboards from "metabase/entities/dashboards";-import Documents from "metabase/entities/documents";-import Questions from "metabase/entities/questions";+import { Collections } from "metabase/entities/collections";+import { Dashboards } from "metabase/entities/dashboards";+import { Documents } from "metabase/entities/documents";+import { Questions } from "metabase/entities/questions";import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";import { addUndo } from "metabase/redux/undo";import { BookmarkSchema } from "metabase/schema";@@ -17,7 +17,7 @@ const REORDER_ACTION = `metabase/entities/bookmarks/REORDER_ACTION`;/*** @deprecated use "metabase/api" instead*/-const Bookmarks = createEntity({+export const Bookmarks = createEntity({name: "bookmarks",nameOne: "bookmark",path: "/api/bookmark",@@ -160,5 +160,3 @@ export const getOrderedBookmarks = createSelector([Bookmarks.selectors.getList],(bookmarks) => _.sortBy(bookmarks, (bookmark) => bookmark.index),);--export default Bookmarks;diff --git a/frontend/src/metabase/entities/collections/collections.ts b/frontend/src/metabase/entities/collections/collections.tsindex c57172498a3..974b674e92b 100644--- a/frontend/src/metabase/entities/collections/collections.ts+++ b/frontend/src/metabase/entities/collections/collections.ts@@ -61,7 +61,7 @@ type ListParams = {/*** @deprecated use "metabase/api" instead*/-const Collections = createEntity({+export const Collections = createEntity({name: "collections",path: "/api/collection",schema: CollectionSchema,@@ -189,6 +189,3 @@ function useListQuery(}export { getExpandedCollectionsById, useListQuery };--// eslint-disable-next-line import/no-default-export -- deprecated usage-export default Collections;diff --git a/frontend/src/metabase/entities/collections/index.ts b/frontend/src/metabase/entities/collections/index.tsindex c48f60bd574..ea84e411c12 100644--- a/frontend/src/metabase/entities/collections/index.ts+++ b/frontend/src/metabase/entities/collections/index.ts@@ -1,6 +1,3 @@-// eslint-disable-next-line import/no-default-export -- deprecated usage-export { default } from "./collections";-export * from "./constants";export * from "./collections";export * from "./utils";diff --git a/frontend/src/metabase/entities/collections/tests/selectors.unit.spec.js b/frontend/src/metabase/entities/collections/tests/selectors.unit.spec.jsindex f1cd8148326..f230156c43f 100644--- a/frontend/src/metabase/entities/collections/tests/selectors.unit.spec.js+++ b/frontend/src/metabase/entities/collections/tests/selectors.unit.spec.js@@ -1,4 +1,4 @@-import { collections as Collections } from "metabase/entities";+import { Collections } from "metabase/entities/collections";import { ROOT_COLLECTION } from "metabase/entities/collections/constants";describe("Collection selectors", () => {diff --git a/frontend/src/metabase/entities/dashboards.js b/frontend/src/metabase/entities/dashboards.jsindex bf920f89b41..5aaf2a2e605 100644--- a/frontend/src/metabase/entities/dashboards.js+++ b/frontend/src/metabase/entities/dashboards.js@@ -27,7 +27,7 @@ const COPY_ACTION = `metabase/entities/dashboards/COPY`;/*** @deprecated use "metabase/api" instead*/-const Dashboards = createEntity({+export const Dashboards = createEntity({name: "dashboards",nameOne: "dashboard",path: "/api/dashboard",@@ -184,5 +184,3 @@ const Dashboards = createEntity({return type && `collection=${type}`;},});--export default Dashboards;diff --git a/frontend/src/metabase/entities/databases.js b/frontend/src/metabase/entities/databases.jsindex 30bb8ee0b56..5dc08aea3c4 100644--- a/frontend/src/metabase/entities/databases.js+++ b/frontend/src/metabase/entities/databases.js@@ -25,7 +25,7 @@ export const FETCH_DATABASE_METADATA =/*** @deprecated use "metabase/api" instead*/-const Databases = createEntity({+export const Databases = createEntity({name: "databases",path: "/api/database",schema: DatabaseSchema,@@ -144,5 +144,3 @@ const Databases = createEntity({),},});--export default Databases;diff --git a/frontend/src/metabase/entities/documents.ts b/frontend/src/metabase/entities/documents.tsindex e52d5135486..a4a7276860b 100644--- a/frontend/src/metabase/entities/documents.ts+++ b/frontend/src/metabase/entities/documents.ts@@ -27,7 +27,7 @@ import type { Dispatch } from "metabase-types/store";/*** @deprecated use "metabase/api" instead*/-const Documents = createEntity({+export const Documents = createEntity({name: "documents",nameOne: "document",path: "/api/document",@@ -129,6 +129,3 @@ const Documents = createEntity({getColor: () => color("brand"),},});--// eslint-disable-next-line import/no-default-export-export default Documents;diff --git a/frontend/src/metabase/entities/fields.js b/frontend/src/metabase/entities/fields.jsindex cc5b46b090c..76d11a65ab2 100644--- a/frontend/src/metabase/entities/fields.js+++ b/frontend/src/metabase/entities/fields.js@@ -50,7 +50,7 @@ export const ADD_FIELDS = "metabase/entities/fields/ADD_FIELDS";/*** @deprecated use "metabase/api" instead*/-const Fields = createEntity({+export const Fields = createEntity({name: "fields",path: "/api/field",schema: FieldSchema,@@ -256,5 +256,3 @@ const transformFieldValuesData = (data, table_id) => {// table_id is required for uniqueFieldId as it's a way to know if field is virtualreturn { id: field_id, ...rest, ...(table_id && { table_id }) };};--export default Fields;diff --git a/frontend/src/metabase/entities/groups.js b/frontend/src/metabase/entities/groups.jsindex 82eea67a075..c86ce6434dc 100644--- a/frontend/src/metabase/entities/groups.js+++ b/frontend/src/metabase/entities/groups.js@@ -11,7 +11,7 @@ import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";/*** @deprecated use "metabase/api" instead*/-const Groups = createEntity({+export const Groups = createEntity({name: "groups",path: "/api/permissions/group",@@ -83,5 +83,3 @@ const Groups = createEntity({const useGetQuery = ({ id }) => {return useGetPermissionsGroupQuery(id);};--export default Groups;diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.tsindex 91e6f05e3f0..1326b51ff0f 100644--- a/frontend/src/metabase/entities/index.ts+++ b/frontend/src/metabase/entities/index.ts@@ -1,24 +1,24 @@-export { default as actions } from "./actions";-export { default as collections } from "./collections";-export { default as snippetCollections } from "./snippet-collections";-export { default as dashboards } from "./dashboards";-export { default as pulses } from "./pulses";-export { default as questions } from "./questions";+export { Actions as actions } from "./actions/actions";+export { Collections as collections } from "./collections";+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 { default as timelines } from "./timelines";-export { default as timelineEvents } from "./timeline-events";+export { Timelines as timelines } from "./timelines";+export { TimelineEvents as timelineEvents } from "./timeline-events";-export { default as bookmarks } from "./bookmarks";-export { default as databases } from "./databases";-export { default as schemas } from "./schemas";-export { default as tables } from "./tables";-export { default as fields } from "./fields";-export { default as segments } from "./segments";+export { Bookmarks as bookmarks } from "./bookmarks";+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 { Segments as segments } from "./segments";-export { default as groups } from "./groups";+export { Groups as groups } from "./groups";-export { default as search } from "./search";-export { default as persistedModels } from "./persisted-models";-export { default as snippets } from "./snippets";-export { default as documents } from "./documents";+export { Search as search } from "./search";+export { PersistedModels as persistedModels } from "./persisted-models";+export { Snippets as snippets } from "./snippets";+export { Documents as documents } from "./documents";diff --git a/frontend/src/metabase/entities/persisted-models.js b/frontend/src/metabase/entities/persisted-models.jsindex 26b88ddecf7..93c6e10a7d5 100644--- a/frontend/src/metabase/entities/persisted-models.js+++ b/frontend/src/metabase/entities/persisted-models.js@@ -22,7 +22,7 @@ const getPersistedModelInfoByModelId = createSelector(/*** @deprecated use "metabase/api" instead*/-const PersistedModels = createEntity({+export const PersistedModels = createEntity({name: "persistedModels",nameOne: "persistedModel",path: "/api/persist",@@ -111,5 +111,3 @@ const useGetQuery = ({ id, type }, options) => {return type === "byModelId" ? persistedInfoByCard : persistedInfo;};--export default PersistedModels;diff --git a/frontend/src/metabase/entities/pulses.js b/frontend/src/metabase/entities/pulses.jsindex c3c29c438a5..26ebe4ca6b3 100644--- a/frontend/src/metabase/entities/pulses.js+++ b/frontend/src/metabase/entities/pulses.js@@ -19,7 +19,7 @@ export const UNSUBSCRIBE = "metabase/entities/pulses/unsubscribe";/*** @deprecated use "metabase/api" instead*/-const Pulses = createEntity({+export const Pulses = createEntity({name: "pulses",nameOne: "pulse",path: "/api/pulse",@@ -102,5 +102,3 @@ const Pulses = createEntity({const useGetQuery = ({ id }, options) => {return useGetSubscriptionQuery(id, options);};--export default Pulses;diff --git a/frontend/src/metabase/entities/questions.js b/frontend/src/metabase/entities/questions.jsindex c0fb2f5f164..0654d18ff59 100644--- a/frontend/src/metabase/entities/questions.js+++ b/frontend/src/metabase/entities/questions.js@@ -6,7 +6,8 @@ import {canonicalCollectionId,isRootTrashCollection,} from "metabase/collections/utils";-import Collections, {+import {+ Collections,getCollectionType,normalizedCollection,} from "metabase/entities/collections";@@ -31,7 +32,7 @@ export const INJECT_RTK_QUERY_QUESTION_VALUE =/*** @deprecated use "metabase/api" instead*/-const Questions = createEntity({+export const Questions = createEntity({name: "questions",nameOne: "question",path: "/api/card",@@ -230,5 +231,3 @@ function getLabel(card) {return t`question`;}--export default Questions;diff --git a/frontend/src/metabase/entities/schemas.js b/frontend/src/metabase/entities/schemas.jsindex cc8a36aa365..50208c730c4 100644--- a/frontend/src/metabase/entities/schemas.js+++ b/frontend/src/metabase/entities/schemas.js@@ -9,7 +9,7 @@ import {useListSyncableDatabaseSchemasQuery,useListVirtualDatabaseTablesQuery,} from "metabase/api";-import Questions from "metabase/entities/questions";+import { Questions } from "metabase/entities/questions";import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";import { SchemaSchema } from "metabase/schema";import { getMetadata } from "metabase/selectors/metadata";@@ -29,7 +29,7 @@ import {/*** @deprecated use "metabase/api" instead*/-export default createEntity({+export const Schemas = createEntity({name: "schemas",schema: SchemaSchema,diff --git a/frontend/src/metabase/entities/schemas.unit.spec.js b/frontend/src/metabase/entities/schemas.unit.spec.jsindex cb0a327294a..2531f057c62 100644--- a/frontend/src/metabase/entities/schemas.unit.spec.js+++ b/frontend/src/metabase/entities/schemas.unit.spec.js@@ -2,8 +2,8 @@ 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 { Questions } from "metabase/entities/questions";+import { Schemas } from "metabase/entities/schemas";import {ROOT_COLLECTION_VIRTUAL_SCHEMA,SAVED_QUESTIONS_VIRTUAL_DB_ID,diff --git a/frontend/src/metabase/entities/search.js b/frontend/src/metabase/entities/search.jsindex 27278cab21b..c572f2331c3 100644--- a/frontend/src/metabase/entities/search.js+++ b/frontend/src/metabase/entities/search.js@@ -13,20 +13,20 @@ import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";import { entityForObject } from "metabase/lib/schema";import { ObjectUnionSchema } from "metabase/schema";-import Actions from "./actions";-import Bookmarks from "./bookmarks";-import Collections from "./collections";-import Dashboards from "./dashboards";-import Pulses from "./pulses";-import Questions from "./questions";-import Segments from "./segments";-import SnippetCollections from "./snippet-collections";-import Snippets from "./snippets";+import { Actions } from "./actions";+import { Bookmarks } from "./bookmarks";+import { Collections } from "./collections";+import { Dashboards } from "./dashboards";+import { Pulses } from "./pulses";+import { Questions } from "./questions";+import { Segments } from "./segments";+import { SnippetCollections } from "./snippet-collections";+import { Snippets } from "./snippets";/*** @deprecated use "metabase/api" instead*/-export default createEntity({+export const Search = createEntity({name: "search",path: "/api/search",diff --git a/frontend/src/metabase/entities/segments.js b/frontend/src/metabase/entities/segments.jsindex cd12c4bcfd0..3eb643db776 100644--- a/frontend/src/metabase/entities/segments.js+++ b/frontend/src/metabase/entities/segments.js@@ -11,7 +11,7 @@ import { getMetadata } from "metabase/selectors/metadata";/*** @deprecated use "metabase/api" instead*/-const Segments = createEntity({+export const Segments = createEntity({name: "segments",nameOne: "segment",path: "/api/segment",@@ -77,5 +77,3 @@ const Segments = createEntity({const useGetQuery = ({ id }, options) => {return useGetSegmentQuery(id, options);};--export default Segments;diff --git a/frontend/src/metabase/entities/snippet-collections.js b/frontend/src/metabase/entities/snippet-collections.jsindex b7e115e6a48..2def31ef5d4 100644--- a/frontend/src/metabase/entities/snippet-collections.js+++ b/frontend/src/metabase/entities/snippet-collections.js@@ -4,7 +4,8 @@ import _ from "underscore";import { skipToken, useGetCollectionQuery } from "metabase/api";import { canonicalCollectionId } from "metabase/collections/utils";-import NormalCollections, {+import {+ Collections,getExpandedCollectionsById,useListQuery as useListCollectionsQuery,} from "metabase/entities/collections";@@ -14,7 +15,7 @@ import { SnippetCollectionSchema } from "metabase/schema";/*** @deprecated use "metabase/api" instead*/-const SnippetCollections = createEntity({+export const SnippetCollections = createEntity({name: "snippetCollections",schema: SnippetCollectionSchema,@@ -31,7 +32,7 @@ const SnippetCollections = createEntity({},api: _.mapObject(- NormalCollections.api,+ Collections.api,(request) =>(opts, ...rest) =>request({ ...opts, namespace: "snippets" }, ...rest),@@ -87,5 +88,3 @@ const useGetQuery = (query, options) => {function useListQuery(query, options) {return useListCollectionsQuery({ ...query, namespace: "snippets" }, options);}--export default SnippetCollections;diff --git a/frontend/src/metabase/entities/snippets.js b/frontend/src/metabase/entities/snippets.jsindex a9624cde674..afec5c1f614 100644--- a/frontend/src/metabase/entities/snippets.js+++ b/frontend/src/metabase/entities/snippets.js@@ -8,7 +8,7 @@ import { createEntity, entityCompatibleQuery } from "metabase/lib/entities";/*** @deprecated use "metabase/api" instead*/-const Snippets = createEntity({+export const Snippets = createEntity({name: "snippets",nameOne: "snippet",path: "/api/native-query-snippet",@@ -58,5 +58,3 @@ const Snippets = createEntity({const useGetQuery = ({ id }, options) => {return useGetSnippetQuery(id, options);};--export default Snippets;diff --git a/frontend/src/metabase/entities/tables.js b/frontend/src/metabase/entities/tables.jsindex 5149ee7c8c5..3981963e1fd 100644--- a/frontend/src/metabase/entities/tables.js+++ b/frontend/src/metabase/entities/tables.js@@ -15,9 +15,9 @@ import {useListDatabaseSchemaTablesQuery,useListTablesQuery,} from "metabase/api";-import Fields from "metabase/entities/fields";-import Questions from "metabase/entities/questions";-import Segments from "metabase/entities/segments";+import { Fields } from "metabase/entities/fields";+import { Questions } from "metabase/entities/questions";+import { Segments } from "metabase/entities/segments";import { color } from "metabase/lib/colors";import {createEntity,@@ -57,7 +57,7 @@ export const UPDATE_TABLE_FIELD_ORDER =/*** @deprecated use "metabase/api" instead*/-const Tables = createEntity({+export const Tables = createEntity({name: "tables",nameOne: "table",path: "/api/table",@@ -471,5 +471,3 @@ function getUseListQueryEndpoint(dbId, schemaName) {return "listTables";}--export default Tables;diff --git a/frontend/src/metabase/entities/tables.unit.spec.js b/frontend/src/metabase/entities/tables.unit.spec.jsindex ab8d8b1f961..51c10406972 100644--- a/frontend/src/metabase/entities/tables.unit.spec.js+++ b/frontend/src/metabase/entities/tables.unit.spec.js@@ -1,5 +1,5 @@-import Questions from "metabase/entities/questions";-import Tables from "metabase/entities/tables";+import { Questions } from "metabase/entities/questions";+import { Tables } from "metabase/entities/tables";import { convertSavedQuestionToVirtualTable } from "metabase-lib/v1/metadata/utils/saved-questions";describe("table entity", () => {diff --git a/frontend/src/metabase/entities/timeline-events.js b/frontend/src/metabase/entities/timeline-events.jsindex b894157ef4d..be92e1f59f1 100644--- a/frontend/src/metabase/entities/timeline-events.js+++ b/frontend/src/metabase/entities/timeline-events.js@@ -11,7 +11,7 @@ import { TimelineEventSchema } from "metabase/schema";/*** @deprecated use "metabase/api" instead*/-const TimelineEvents = createEntity({+export const TimelineEvents = createEntity({name: "timelineEvents",nameOne: "timelineEvent",path: "/api/timeline-event",@@ -75,5 +75,3 @@ const TimelineEvents = createEntity({const useGetQuery = ({ id }, options) => {return useGetTimelineEventQuery(id, options);};--export default TimelineEvents;diff --git a/frontend/src/metabase/entities/timelines.js b/frontend/src/metabase/entities/timelines.jsindex c9f47d591c8..45077d4c459 100644--- a/frontend/src/metabase/entities/timelines.js+++ b/frontend/src/metabase/entities/timelines.js@@ -19,12 +19,12 @@ import {import { getDefaultTimeline, getTimelineName } from "metabase/lib/timelines";import { TimelineSchema } from "metabase/schema";-import TimelineEvents from "./timeline-events";+import { TimelineEvents } from "./timeline-events";/*** @deprecated use "metabase/api" instead*/-const Timelines = createEntity({+export const Timelines = createEntity({name: "timelines",nameOne: "timeline",path: "/api/timeline",@@ -167,5 +167,3 @@ function useListQuery({ collectionId, ...params } = {}, options) {return collectionId ? collectionTimelines : timelines;}--export default Timelines;diff --git a/frontend/src/metabase/lib/click-behavior.js b/frontend/src/metabase/lib/click-behavior.jsindex 396b4eb0849..8853f90b9f2 100644--- a/frontend/src/metabase/lib/click-behavior.js+++ b/frontend/src/metabase/lib/click-behavior.js@@ -1,8 +1,8 @@import { getIn } from "icepick";import { msgid, ngettext, t } from "ttag";-import Dashboards from "metabase/entities/dashboards";-import Questions from "metabase/entities/questions";+import { Dashboards } from "metabase/entities/dashboards";+import { Questions } from "metabase/entities/questions";import Question from "metabase-lib/v1/Question";export function getClickBehaviorDescription(dashcard) {diff --git a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsxindex b8d9df058d3..2beedb88026 100644--- a/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx+++ b/frontend/src/metabase/models/components/ModelActions/ModelActionDetails/ModelActionDetails.tsx@@ -5,8 +5,8 @@ import _ from "underscore";import Button from "metabase/common/components/Button";import Link from "metabase/common/components/Link";import { useConfirmation } from "metabase/common/hooks/use-confirmation";-import Actions from "metabase/entities/actions";-import Databases from "metabase/entities/databases";+import { Actions } from "metabase/entities/actions";+import { Databases } from "metabase/entities/databases";import { connect } from "metabase/lib/redux";import { parseTimestamp } from "metabase/lib/time-dayjs";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsxindex 5b7c77dcb5a..5f3715fe50a 100644--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.tsx@@ -6,10 +6,10 @@ import { useMount } from "react-use";import _ from "underscore";import { NotFound } from "metabase/common/components/ErrorPages";-import Actions from "metabase/entities/actions";-import Databases from "metabase/entities/databases";-import Questions from "metabase/entities/questions";-import Tables from "metabase/entities/tables";+import { Actions } from "metabase/entities/actions";+import { Databases } from "metabase/entities/databases";+import { Questions } from "metabase/entities/questions";+import { Tables } from "metabase/entities/tables";import { usePageTitle } from "metabase/hooks/use-page-title";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsxindex 99f094af0a1..5b2935f2e0d 100644--- a/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx+++ b/frontend/src/metabase/models/containers/ModelActions/ModelActions.unit.spec.tsx@@ -19,7 +19,7 @@ import {within,} from "__support__/ui";import ActionCreator from "metabase/actions/containers/ActionCreatorModal";-import Models from "metabase/entities/questions";+import { Questions as Models } from "metabase/entities/questions";import { ModalRoute } from "metabase/hoc/ModalRoute";import { checkNotNull } from "metabase/lib/types";import { TYPE } from "metabase-lib/v1/types/constants";diff --git a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsxindex 64f119cd670..a7fe1603bff 100644--- a/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx+++ b/frontend/src/metabase/nav/components/search/SearchResults/SearchResults.tsx@@ -6,7 +6,7 @@ import { t } from "ttag";import EmptyState from "metabase/common/components/EmptyState";import { useSearchListQuery } from "metabase/common/hooks";import { useListKeyboardNavigation } from "metabase/common/hooks/use-list-keyboard-navigation";-import Search from "metabase/entities/search";+import { Search } from "metabase/entities/search";import {DEFAULT_SEARCH_LIMIT,SEARCH_DEBOUNCE_DURATION,diff --git a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsxindex 6706064282a..d3aa95a9681 100644--- a/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx+++ b/frontend/src/metabase/nav/containers/AppBar/AppBar.tsx@@ -5,7 +5,7 @@ import {getCommentSidebarOpen,getSidebarOpen,} from "metabase/documents/selectors";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import { connect } from "metabase/lib/redux";import { PLUGIN_METABOT } from "metabase/plugins";import { closeNavbar, toggleNavbar } from "metabase/redux/app";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsxindex 4172f291654..80267703527 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/BookmarkList/BookmarkList.tsx@@ -14,7 +14,7 @@ import { t } from "ttag";import CollapseSection from "metabase/common/components/CollapseSection";import { Sortable } from "metabase/common/components/Sortable";import GrabberS from "metabase/css/components/grabber.module.css";-import Bookmarks from "metabase/entities/bookmarks";+import { Bookmarks } from "metabase/entities/bookmarks";import { getIcon } from "metabase/lib/icon";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsxindex e00261c5025..f7ba2495cfc 100644--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx@@ -13,14 +13,15 @@ import {nonPersonalOrArchivedCollection,} from "metabase/collections/utils";import Modal from "metabase/common/components/Modal";-import Bookmarks, { getOrderedBookmarks } from "metabase/entities/bookmarks";+import { Bookmarks, getOrderedBookmarks } from "metabase/entities/bookmarks";import type { CollectionTreeItem } from "metabase/entities/collections";-import Collections, {+import {+ Collections,ROOT_COLLECTION,buildCollectionTree,getCollectionIcon,} from "metabase/entities/collections";-import Databases from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import { connect, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import {diff --git a/frontend/src/metabase/nav/containers/Navbar.tsx b/frontend/src/metabase/nav/containers/Navbar.tsxindex fba56238d01..d0bf4a12a2a 100644--- a/frontend/src/metabase/nav/containers/Navbar.tsx+++ b/frontend/src/metabase/nav/containers/Navbar.tsx@@ -4,7 +4,7 @@ import { withRouter } from "react-router";import _ from "underscore";import { getAdminPaths } from "metabase/admin/app/selectors";-import Database from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import { connect } from "metabase/lib/redux";import { getIsNavbarOpen } from "metabase/selectors/app";import { getUser } from "metabase/selectors/user";@@ -48,7 +48,7 @@ function Navbar({ isOpen, user, location, params, adminPaths }: NavbarProps) {// eslint-disable-next-line import/no-default-export -- deprecated usageexport default _.compose(- Database.loadList({+ Databases.loadList({loadingAndErrorWrapper: false,}),withRouter,diff --git a/frontend/src/metabase/new/components/NewModals/NewModals.tsx b/frontend/src/metabase/new/components/NewModals/NewModals.tsxindex 65fac387b95..117d8086839 100644--- a/frontend/src/metabase/new/components/NewModals/NewModals.tsx+++ b/frontend/src/metabase/new/components/NewModals/NewModals.tsx@@ -14,7 +14,7 @@ import {type LegacyStaticEmbeddingModalProps,} from "metabase/embedding/embedding-iframe-sdk-setup/components/LegacyStaticEmbeddingModal";import { SdkIframeEmbedSetupModal } from "metabase/embedding/embedding-iframe-sdk-setup/components/SdkIframeEmbedSetupModal";-import Collections from "metabase/entities/collections/collections";+import { Collections } from "metabase/entities/collections/collections";import { useDispatch, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { PaletteShortcutsModal } from "metabase/palette/components/PaletteShortcutsModal/PaletteShortcutsModal";diff --git a/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.jsx b/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.jsxindex 9a8748ff957..e41b244c893 100644--- a/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.jsx+++ b/frontend/src/metabase/notifications/DashboardSubscriptionsSidebar/DashboardSubscriptionsSidebar.jsx@@ -8,7 +8,7 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport { Sidebar } from "metabase/dashboard/components/Sidebar";import { useDashboardContext } from "metabase/dashboard/context";import { isEmbeddingSdk } from "metabase/embedding-sdk/config";-import Pulses from "metabase/entities/pulses";+import { Pulses } from "metabase/entities/pulses";import {NEW_PULSE_TEMPLATE,cleanPulse,@@ -20,7 +20,7 @@ import {AddEditSlackSidebar,} from "metabase/notifications/AddEditSidebar/AddEditSidebar";import { NewPulseSidebar } from "metabase/notifications/NewPulseSidebar";-import PulsesListSidebar from "metabase/notifications/PulsesListSidebar";+import { PulsesListSidebar } from "metabase/notifications/PulsesListSidebar";import {cancelEditingPulse,fetchPulseFormInput,diff --git a/frontend/src/metabase/notifications/pulse/actions.js b/frontend/src/metabase/notifications/pulse/actions.jsindex fe5bb18b194..3298c8f7167 100644--- a/frontend/src/metabase/notifications/pulse/actions.js+++ b/frontend/src/metabase/notifications/pulse/actions.js@@ -2,7 +2,7 @@ import { createAction } from "redux-actions";import { t } from "ttag";import { getActionErrorMessage } from "metabase/actions/utils";-import Pulses from "metabase/entities/pulses";+import { Pulses } from "metabase/entities/pulses";import {NEW_PULSE_TEMPLATE,createChannel,diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.tsxindex 96a0fa7a3aa..988788e188e 100644--- a/frontend/src/metabase/palette/hooks/useCommandPalette.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.tsx@@ -9,7 +9,7 @@ import { getPerformanceAdminPaths } from "metabase/admin/performance/constants/cimport { useListRecentsQuery, useSearchQuery } from "metabase/api";import { useSetting } from "metabase/common/hooks";import { ROOT_COLLECTION } from "metabase/entities/collections/constants";-import Search from "metabase/entities/search";+import { Search } from "metabase/entities/search";import { SEARCH_DEBOUNCE_DURATION } from "metabase/lib/constants";import { getIcon } from "metabase/lib/icon";import { getName } from "metabase/lib/name";diff --git a/frontend/src/metabase/palette/hooks/useCommandPalette.unit.spec.tsx b/frontend/src/metabase/palette/hooks/useCommandPalette.unit.spec.tsxindex daab0cbae64..64b23459be2 100644--- a/frontend/src/metabase/palette/hooks/useCommandPalette.unit.spec.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPalette.unit.spec.tsx@@ -1,7 +1,7 @@import type React from "react";import { render, screen } from "__support__/ui";-import Search from "metabase/entities/search";+import { Search } from "metabase/entities/search";import { Text } from "metabase/ui";import {createMockCollection,diff --git a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsxindex 757375ab05c..ab2eedd4221 100644--- a/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx+++ b/frontend/src/metabase/palette/hooks/useCommandPaletteBasicActions.tsx@@ -10,7 +10,7 @@ import {useHasTokenFeature,useSearchListQuery,} from "metabase/common/hooks";-import Collections from "metabase/entities/collections/collections";+import { Collections } from "metabase/entities/collections/collections";import { useDispatch, useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import type { SdkIframeEmbedSetupModalProps } from "metabase/plugins";diff --git a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsxindex 16c8f724cdf..9a89f2041e0 100644--- a/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx+++ b/frontend/src/metabase/parameters/components/ValuesSourceModal/ValuesSourceTypeModal.tsx@@ -12,8 +12,8 @@ import Radio from "metabase/common/components/Radio";import type { SelectChangeEvent } from "metabase/common/components/Select";import Select, { Option } from "metabase/common/components/Select";import SelectButton from "metabase/common/components/SelectButton";-import Questions from "metabase/entities/questions";-import Tables from "metabase/entities/tables";+import { Questions } from "metabase/entities/questions";+import { Tables } from "metabase/entities/tables";import { connect, useSelector } from "metabase/lib/redux";import { getLearnUrl } from "metabase/selectors/settings";import { getShowMetabaseLinks } from "metabase/selectors/whitelabel";diff --git a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsxindex c7f9cd044fc..952eadfb7ae 100644--- a/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx+++ b/frontend/src/metabase/parameters/components/widgets/ParameterFieldWidget/FieldValuesWidget/FieldValuesWidget.tsx@@ -24,7 +24,7 @@ import TokenField, {} from "metabase/common/components/TokenField";import type { LayoutRendererArgs } from "metabase/common/components/TokenField/TokenField";import CS from "metabase/css/core/index.css";-import Fields from "metabase/entities/fields";+import { Fields } from "metabase/entities/fields";import { useTranslateContent } from "metabase/i18n/hooks";import type { ContentTranslationFunction } from "metabase/i18n/types";import { parseNumber } from "metabase/lib/number";diff --git a/frontend/src/metabase/query_builder/actions/core/card.ts b/frontend/src/metabase/query_builder/actions/core/card.tsindex e6decd3adb0..6e6c77e178c 100644--- a/frontend/src/metabase/query_builder/actions/core/card.ts+++ b/frontend/src/metabase/query_builder/actions/core/card.ts@@ -1,4 +1,4 @@-import Questions from "metabase/entities/questions";+import { Questions } from "metabase/entities/questions";import type { Dispatch, GetState } from "metabase-types/store";// load a card either by ID or from a base64 serialization. if both are present then they are merged, which the serialized version taking precedencediff --git a/frontend/src/metabase/query_builder/actions/core/core.ts b/frontend/src/metabase/query_builder/actions/core/core.tsindex de60b52370b..8bac823b1fb 100644--- a/frontend/src/metabase/query_builder/actions/core/core.ts+++ b/frontend/src/metabase/query_builder/actions/core/core.ts@@ -2,9 +2,9 @@ import { createAction } from "redux-actions";import _ from "underscore";import { invalidateNotificationsApiCache, revisionApi } from "metabase/api";-import Databases from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import { updateModelIndexes } from "metabase/entities/model-indexes/actions";-import Questions from "metabase/entities/questions";+import { Questions } from "metabase/entities/questions";import { shouldOpenInBlankWindow } from "metabase/lib/dom";import { entityCompatibleQuery } from "metabase/lib/entities";import { createThunkAction } from "metabase/lib/redux";diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.tsindex cb547da76e7..26dbe2cf531 100644--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts@@ -2,8 +2,8 @@ import type { LocationDescriptorObject } from "history";import querystring from "querystring";import { replace } from "react-router-redux";-import Questions from "metabase/entities/questions";-import Snippets from "metabase/entities/snippets";+import { Questions } from "metabase/entities/questions";+import { Snippets } from "metabase/entities/snippets";import { deserializeCardFromUrl } from "metabase/lib/card";import { isNotNull } from "metabase/lib/types";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.tsindex 152a2d54028..8715353750c 100644--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.unit.spec.ts@@ -2,8 +2,8 @@ import fetchMock from "fetch-mock";import type { LocationDescriptorObject } from "history";import { createMockEntitiesState } from "__support__/store";-import Databases from "metabase/entities/databases";-import Snippets from "metabase/entities/snippets";+import { Databases } from "metabase/entities/databases";+import { Snippets } from "metabase/entities/snippets";import * as CardLib from "metabase/lib/card";import { checkNotNull } from "metabase/lib/types";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/query_builder/actions/native.ts b/frontend/src/metabase/query_builder/actions/native.tsindex 3423a73b7e5..3bdb3c88629 100644--- a/frontend/src/metabase/query_builder/actions/native.ts+++ b/frontend/src/metabase/query_builder/actions/native.ts@@ -1,6 +1,6 @@import { createAction } from "redux-actions";-import Questions from "metabase/entities/questions";+import { Questions } from "metabase/entities/questions";import { createThunkAction } from "metabase/lib/redux";import { updateUserSetting } from "metabase/redux/settings";import { getMetadata } from "metabase/selectors/metadata";diff --git a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx b/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsxindex b89ff6a91b4..2c696817298 100644--- a/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx+++ b/frontend/src/metabase/query_builder/components/DataSelector/DataSelector.jsx@@ -8,11 +8,11 @@ import _ from "underscore";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 Search from "metabase/entities/search";-import Tables from "metabase/entities/tables";+import { Databases } from "metabase/entities/databases";+import { Questions } from "metabase/entities/questions";+import { Schemas } from "metabase/entities/schemas";+import { Search } from "metabase/entities/search";+import { Tables } from "metabase/entities/tables";import { connect } from "metabase/lib/redux";import { getMetadata } from "metabase/selectors/metadata";import { getSetting } from "metabase/selectors/settings";diff --git a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx b/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsxindex abff0b80cd1..77683480f25 100644--- a/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx+++ b/frontend/src/metabase/query_builder/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx@@ -10,7 +10,8 @@ import {import { Tree } from "metabase/common/components/tree";import { findCollectionById } from "metabase/common/utils/collections";import CS from "metabase/css/core/index.css";-import Collections, {+import {+ Collections,PERSONAL_COLLECTIONS,buildCollectionTree,} from "metabase/entities/collections";diff --git a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsxindex 87f0c1ee029..db3eb381af7 100644--- a/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx+++ b/frontend/src/metabase/query_builder/components/NativeQueryEditor/NativeQueryEditor.tsx@@ -12,9 +12,9 @@ import { t } from "ttag";import _ from "underscore";import ExplicitSize from "metabase/common/components/ExplicitSize";-import Databases from "metabase/entities/databases";-import SnippetCollections from "metabase/entities/snippet-collections";-import Snippets from "metabase/entities/snippets";+import { Databases } from "metabase/entities/databases";+import { SnippetCollections } from "metabase/entities/snippet-collections";+import { Snippets } from "metabase/entities/snippets";import { useDispatch } from "metabase/lib/redux";import {runOrCancelQuestionOrSelectedQuery,diff --git a/frontend/src/metabase/query_builder/components/dataref/MainPane.jsx b/frontend/src/metabase/query_builder/components/dataref/MainPane.jsxindex db94e3b0249..f135cb9444a 100644--- a/frontend/src/metabase/query_builder/components/dataref/MainPane.jsx+++ b/frontend/src/metabase/query_builder/components/dataref/MainPane.jsx@@ -4,7 +4,7 @@ import PropTypes from "prop-types";import { t } from "ttag";import CS from "metabase/css/core/index.css";-import Databases from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import SidebarContent from "metabase/query_builder/components/SidebarContent";import {diff --git a/frontend/src/metabase/query_builder/components/dataref/SchemaPane.tsx b/frontend/src/metabase/query_builder/components/dataref/SchemaPane.tsxindex 9681ab433f4..d9615b69dab 100644--- a/frontend/src/metabase/query_builder/components/dataref/SchemaPane.tsx+++ b/frontend/src/metabase/query_builder/components/dataref/SchemaPane.tsx@@ -1,7 +1,7 @@import { useMemo } from "react";import { msgid, ngettext } from "ttag";-import Schemas from "metabase/entities/schemas";+import { Schemas } from "metabase/entities/schemas";import SidebarContent from "metabase/query_builder/components/SidebarContent";import type Schema from "metabase-lib/v1/metadata/Schema";import type { State } from "metabase-types/store";diff --git a/frontend/src/metabase/query_builder/components/dataref/TableInfoLoader.tsx b/frontend/src/metabase/query_builder/components/dataref/TableInfoLoader.tsxindex 8f7ff40c57f..271dc26a585 100644--- a/frontend/src/metabase/query_builder/components/dataref/TableInfoLoader.tsx+++ b/frontend/src/metabase/query_builder/components/dataref/TableInfoLoader.tsx@@ -1,7 +1,7 @@import { useEffect, useState } from "react";import { useAsyncFn } from "react-use";-import Tables from "metabase/entities/tables";+import { Tables } from "metabase/entities/tables";import { connect } from "metabase/lib/redux";import type Table from "metabase-lib/v1/metadata/Table";diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.tsx b/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.tsxindex 653d668dd90..231ab465e98 100644--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.tsx+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetForm/SnippetForm.tsx@@ -9,7 +9,7 @@ import FormErrorMessage from "metabase/common/components/FormErrorMessage";import FormInput from "metabase/common/components/FormInput";import FormSubmitButton from "metabase/common/components/FormSubmitButton";import FormTextArea from "metabase/common/components/FormTextArea";-import SnippetCollections from "metabase/entities/snippet-collections";+import { SnippetCollections } from "metabase/entities/snippet-collections";import { Form, FormProvider } from "metabase/forms";import * as Errors from "metabase/lib/errors";import { Flex } from "metabase/ui";diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx b/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsxindex e25404a9fa0..5ebeb2a8199 100644--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.tsx@@ -1,7 +1,7 @@import { useCallback, useState } from "react";import { t } from "ttag";-import Snippets from "metabase/entities/snippets";+import { Snippets } from "metabase/entities/snippets";import { useDispatch } from "metabase/lib/redux";import { PLUGIN_DEPENDENCIES } from "metabase/plugins";import { Flex, Modal } from "metabase/ui";diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.jsx b/frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.jsxindex 8821d1e4ed0..a8e261b5fdf 100644--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.jsx+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetRow/SnippetRow.jsx@@ -6,7 +6,7 @@ import { t } from "ttag";import Button from "metabase/common/components/Button";import { Ellipsified } from "metabase/common/components/Ellipsified";import CS from "metabase/css/core/index.css";-import Snippets from "metabase/entities/snippets";+import { Snippets } from "metabase/entities/snippets";import { Flex, Icon } from "metabase/ui";import SnippetRowS from "./SnippetRow.module.css";diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.jsx b/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.jsxindex c8f52d580fa..262caf11541 100644--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.jsx+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetSidebar/SnippetSidebar.jsx@@ -6,9 +6,9 @@ import _ from "underscore";import { canonicalCollectionId } from "metabase/collections/utils";import CS from "metabase/css/core/index.css";-import Search from "metabase/entities/search";-import SnippetCollections from "metabase/entities/snippet-collections";-import Snippets from "metabase/entities/snippets";+import { Search } from "metabase/entities/search";+import { SnippetCollections } from "metabase/entities/snippet-collections";+import { Snippets } from "metabase/entities/snippets";import { connect } from "metabase/lib/redux";import {PLUGIN_SNIPPET_SIDEBAR_HEADER_BUTTONS,diff --git a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsx b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsxindex 2e49ea9821c..844be35eaa6 100644--- a/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsx+++ b/frontend/src/metabase/query_builder/components/view/QuestionRowCount/QuestionRowCount.tsx@@ -11,7 +11,7 @@ import {import { formatRowCount } from "metabase/common/utils/format-row-count";import { getRowCountMessage } from "metabase/common/utils/get-row-count-message";import CS from "metabase/css/core/index.css";-import Database from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import { connect } from "metabase/lib/redux";import { setLimit } from "metabase/query_builder/actions";import LimitPopover from "metabase/query_builder/components/LimitPopover";@@ -203,7 +203,7 @@ function getDatabaseId(_state: State, { question }: OwnProps & StateProps) {const ConnectedQuestionRowCount = _.compose(connect(mapStateToProps, mapDispatchToProps),- Database.load({+ Databases.load({id: getDatabaseId,loadingAndErrorWrapper: false,}),diff --git a/frontend/src/metabase/query_builder/components/view/View/View/View.jsx b/frontend/src/metabase/query_builder/components/view/View/View/View.jsxindex c82b61956bf..264b798d033 100644--- a/frontend/src/metabase/query_builder/components/view/View/View/View.jsx+++ b/frontend/src/metabase/query_builder/components/view/View/View/View.jsx@@ -12,8 +12,8 @@ import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrimport Toaster from "metabase/common/components/Toaster";import CS from "metabase/css/core/index.css";import QueryBuilderS from "metabase/css/query_builder.module.css";-import Bookmarks from "metabase/entities/bookmarks";-import Questions from "metabase/entities/questions";+import { Bookmarks } from "metabase/entities/bookmarks";+import { Questions } from "metabase/entities/questions";import { connect } from "metabase/lib/redux";import {rememberLastUsedDatabase,diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsxindex 9f804cf8bd3..35894b8e259 100644--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.tsx@@ -14,8 +14,8 @@ import { useFavicon } from "metabase/common/hooks/use-favicon";import { useForceUpdate } from "metabase/common/hooks/use-force-update";import { useLoadingTimer } from "metabase/common/hooks/use-loading-timer";import { useWebNotification } from "metabase/common/hooks/use-web-notification";-import Bookmark from "metabase/entities/bookmarks";-import Timelines from "metabase/entities/timelines";+import { Bookmarks } from "metabase/entities/bookmarks";+import { Timelines } from "metabase/entities/timelines";import { usePageTitleWithLoadingTime } from "metabase/hooks/use-page-title";import { isWithinIframe } from "metabase/lib/dom";import { connect, useSelector } from "metabase/lib/redux";@@ -203,9 +203,9 @@ const mapDispatchToProps = {closeNavbar,onChangeLocation: push,createBookmark: (id: BookmarkId) =>- Bookmark.actions.create({ id, type: "card" }),+ Bookmarks.actions.create({ id, type: "card" }),deleteBookmark: (id: BookmarkId) =>- Bookmark.actions.delete({ id, type: "card" }),+ Bookmarks.actions.delete({ id, type: "card" }),};const connector = connect(mapStateToProps, mapDispatchToProps);@@ -490,7 +490,7 @@ function QueryBuilderInner(props: QueryBuilderInnerProps) {}export const QueryBuilder = _.compose(- Bookmark.loadList(),+ Bookmarks.loadList(),Timelines.loadList(timelineProps),connector,)(QueryBuilderInner);diff --git a/frontend/src/metabase/query_builder/reducers.js b/frontend/src/metabase/query_builder/reducers.jsindex 38fb5380f9a..24c637ec328 100644--- a/frontend/src/metabase/query_builder/reducers.js+++ b/frontend/src/metabase/query_builder/reducers.js@@ -6,7 +6,7 @@ import {EDIT_QUESTION,NAVIGATE_TO_NEW_CARD,} from "metabase/dashboard/actions";-import TimelineEvents from "metabase/entities/timeline-events";+import { TimelineEvents } from "metabase/entities/timeline-events";import { copy } from "metabase/lib/utils";import {diff --git a/frontend/src/metabase/query_builder/selectors.js b/frontend/src/metabase/query_builder/selectors.jsindex d144cf2c701..10329fa7783 100644--- a/frontend/src/metabase/query_builder/selectors.js+++ b/frontend/src/metabase/query_builder/selectors.js@@ -5,9 +5,9 @@ import { merge, updateIn } from "icepick";import _ from "underscore";import { LOAD_COMPLETE_FAVICON } from "metabase/common/hooks/constants";-import Databases from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import { cleanIndexFlags } from "metabase/entities/model-indexes/actions";-import Timelines from "metabase/entities/timelines";+import { Timelines } from "metabase/entities/timelines";import { parseTimestamp } from "metabase/lib/time-dayjs";import { getSortedTimelines } from "metabase/lib/timelines";import { isNotNull } from "metabase/lib/types";diff --git a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsxindex 46818ffcaf6..fe4673c6694 100644--- a/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx+++ b/frontend/src/metabase/querying/segments/components/SegmentEditor/DataStep/DataStep.tsx@@ -6,7 +6,7 @@ import {getDataPickerValue,} from "metabase/common/components/Pickers/DataPicker";import type { TablePickerValue } from "metabase/common/components/Pickers/TablePicker";-import Tables from "metabase/entities/tables";+import { Tables } from "metabase/entities/tables";import { useDispatch, useStore } from "metabase/lib/redux";import { checkNotNull } from "metabase/lib/types";import { TableBreadcrumbs } from "metabase/metadata/components";diff --git a/frontend/src/metabase/questions/actions.ts b/frontend/src/metabase/questions/actions.tsindex 7f0cd673d2c..7aefbd42230 100644--- a/frontend/src/metabase/questions/actions.ts+++ b/frontend/src/metabase/questions/actions.ts@@ -1,5 +1,5 @@import { cardApi, datasetApi } from "metabase/api";-import Tables from "metabase/entities/tables";+import { Tables } from "metabase/entities/tables";import { entityCompatibleQuery } from "metabase/lib/entities";import type { Card, TableId, UnsavedCard } from "metabase-types/api";import { isSavedCard } from "metabase-types/guards";diff --git a/frontend/src/metabase/questions/components/CollectionBadge.tsx b/frontend/src/metabase/questions/components/CollectionBadge.tsxindex 29139dff132..341d7d1072f 100644--- a/frontend/src/metabase/questions/components/CollectionBadge.tsx+++ b/frontend/src/metabase/questions/components/CollectionBadge.tsx@@ -1,7 +1,7 @@import type { ComponentType, PropsWithChildren } from "react";import { Badge } from "metabase/common/components/Badge";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import { getIcon } from "metabase/lib/icon";import { modelToUrl } from "metabase/lib/urls/modelToUrl";import { PLUGIN_COLLECTIONS } from "metabase/plugins";diff --git a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsxindex b50424ebdf6..ca5fe4b79fc 100644--- a/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx+++ b/frontend/src/metabase/questions/components/MoveCardModal/MoveCardModal.tsx@@ -14,7 +14,7 @@ import {import { ConfirmModal } from "metabase/common/components/ConfirmModal";import { MoveModal } from "metabase/common/components/MoveModal";import type { CollectionPickerItem } from "metabase/common/components/Pickers/CollectionPicker";-import Dashboards from "metabase/entities/dashboards";+import { Dashboards } from "metabase/entities/dashboards";import { INJECT_RTK_QUERY_QUESTION_VALUE } from "metabase/entities/questions";import { useDispatch } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";diff --git a/frontend/src/metabase/redux/metadata.js b/frontend/src/metabase/redux/metadata.jsindex a3008f59a31..dd567114e42 100644--- a/frontend/src/metabase/redux/metadata.js+++ b/frontend/src/metabase/redux/metadata.js@@ -2,10 +2,10 @@ import { getIn } from "icepick";import _ from "underscore";import { cardApi, dashboardApi, datasetApi } from "metabase/api";-import Databases from "metabase/entities/databases";-import Fields from "metabase/entities/fields";-import Segments from "metabase/entities/segments";-import Tables from "metabase/entities/tables";+import { Databases } from "metabase/entities/databases";+import { Fields } from "metabase/entities/fields";+import { Segments } from "metabase/entities/segments";+import { Tables } from "metabase/entities/tables";import { isProduction } from "metabase/env";import { entityCompatibleQuery } from "metabase/lib/entities";import { createThunkAction, fetchData } from "metabase/lib/redux";diff --git a/frontend/src/metabase/redux/metadata.unit.spec.js b/frontend/src/metabase/redux/metadata.unit.spec.jsindex 366c8463668..f58f512236b 100644--- a/frontend/src/metabase/redux/metadata.unit.spec.js+++ b/frontend/src/metabase/redux/metadata.unit.spec.js@@ -1,4 +1,4 @@-import Fields from "metabase/entities/fields";+import { Fields } from "metabase/entities/fields";import { fetchField } from "./metadata";diff --git a/frontend/src/metabase/redux/uploads.ts b/frontend/src/metabase/redux/uploads.tsindex 095a5b08b8b..91383795615 100644--- a/frontend/src/metabase/redux/uploads.ts+++ b/frontend/src/metabase/redux/uploads.ts@@ -2,7 +2,7 @@ import { assocIn, dissocIn, updateIn } from "icepick";import { t } from "ttag";import { cardApi } from "metabase/api";-import Collections from "metabase/entities/collections";+import { Collections } from "metabase/entities/collections";import { entityCompatibleQuery } from "metabase/lib/entities";import {createAction,diff --git a/frontend/src/metabase/redux/user.ts b/frontend/src/metabase/redux/user.tsindex 574d69ca2ab..f843ff3b5fe 100644--- a/frontend/src/metabase/redux/user.ts+++ b/frontend/src/metabase/redux/user.ts@@ -1,6 +1,6 @@import { createAction, createReducer } from "@reduxjs/toolkit";-import Dashboards from "metabase/entities/dashboards";+import { Dashboards } from "metabase/entities/dashboards";import { createAsyncThunk } from "metabase/lib/redux";import { CLOSE_QB_NEWB_MODAL } from "metabase/query_builder/actions/modal";import { UserApi } from "metabase/services";diff --git a/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsx b/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsxindex b4417df6a4f..27c9e222645 100644--- a/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsx+++ b/frontend/src/metabase/reference/databases/TableQuestionsContainer.jsx@@ -5,7 +5,7 @@ import { Component } from "react";import SidebarLayout from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";-import Questions from "metabase/entities/questions";+import { Questions } from "metabase/entities/questions";import { connect } from "metabase/lib/redux";import * as metadataActions from "metabase/redux/metadata";import TableQuestions from "metabase/reference/databases/TableQuestions";diff --git a/frontend/src/metabase/reference/segments/SegmentQuestions.jsx b/frontend/src/metabase/reference/segments/SegmentQuestions.jsxindex f6dc077554a..3a06f7aa782 100644--- a/frontend/src/metabase/reference/segments/SegmentQuestions.jsx+++ b/frontend/src/metabase/reference/segments/SegmentQuestions.jsx@@ -43,7 +43,7 @@ const mapDispatchToProps = {...metadataActions,};-export const SegmentQuestions = ({ style, table, segment, metadata }) => {+const SegmentQuestionsInner = ({ style, table, segment, metadata }) => {const {data = [],isLoading,@@ -92,11 +92,14 @@ export const SegmentQuestions = ({ style, table, segment, metadata }) => {);};-SegmentQuestions.propTypes = {+SegmentQuestionsInner.propTypes = {table: PropTypes.object,segment: PropTypes.object.isRequired,style: PropTypes.object.isRequired,metadata: PropTypes.object.isRequired,};-export default connect(mapStateToProps, mapDispatchToProps)(SegmentQuestions);+export const SegmentQuestions = connect(+ mapStateToProps,+ mapDispatchToProps,+)(SegmentQuestionsInner);diff --git a/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsx b/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsxindex 14410d657bd..60760cd6dc3 100644--- a/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsx+++ b/frontend/src/metabase/reference/segments/SegmentQuestionsContainer.jsx@@ -5,11 +5,11 @@ import { Component } from "react";import SidebarLayout from "metabase/common/components/SidebarLayout";import CS from "metabase/css/core/index.css";-import Questions from "metabase/entities/questions";+import { Questions } from "metabase/entities/questions";import { connect } from "metabase/lib/redux";import * as metadataActions from "metabase/redux/metadata";import * as actions from "metabase/reference/reference";-import SegmentQuestions from "metabase/reference/segments/SegmentQuestions";+import { SegmentQuestions } from "metabase/reference/segments/SegmentQuestions";import {getDatabaseId,diff --git a/frontend/src/metabase/reference/selectors.js b/frontend/src/metabase/reference/selectors.jsindex 84b5d913a68..da0fc66b91c 100644--- a/frontend/src/metabase/reference/selectors.js+++ b/frontend/src/metabase/reference/selectors.js@@ -1,7 +1,7 @@import { createSelector } from "@reduxjs/toolkit";import { getIn } from "icepick";-import Dashboards from "metabase/entities/dashboards";+import { Dashboards } from "metabase/entities/dashboards";import { resourceListToMap } from "metabase/lib/redux";import {getShallowDatabases as getDatabases,diff --git a/frontend/src/metabase/search/containers/SearchApp.jsx b/frontend/src/metabase/search/containers/SearchApp.jsxindex b8ed5bd7a05..089235a8b59 100644--- a/frontend/src/metabase/search/containers/SearchApp.jsx+++ b/frontend/src/metabase/search/containers/SearchApp.jsx@@ -9,7 +9,7 @@ import EmptyState from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { PaginationControls } from "metabase/common/components/PaginationControls";import { NoObjectError } from "metabase/common/components/errors/NoObjectError";-import Search from "metabase/entities/search";+import { Search } from "metabase/entities/search";import { usePageTitle } from "metabase/hooks/use-page-title";import { useDispatch } from "metabase/lib/redux";import { SearchSidebar } from "metabase/search/components/SearchSidebar";diff --git a/frontend/src/metabase/status/containers/DatabaseStatus/DatabaseStatus.tsx b/frontend/src/metabase/status/containers/DatabaseStatus/DatabaseStatus.tsxindex 9f97af717fb..e0b29c0fc20 100644--- a/frontend/src/metabase/status/containers/DatabaseStatus/DatabaseStatus.tsx+++ b/frontend/src/metabase/status/containers/DatabaseStatus/DatabaseStatus.tsx@@ -1,6 +1,6 @@import _ from "underscore";-import Databases from "metabase/entities/databases";+import { Databases } from "metabase/entities/databases";import { connect } from "metabase/lib/redux";import { isSyncInProgress } from "metabase/lib/syncing";import { getUser } from "metabase/selectors/user";diff --git a/frontend/src/metabase/timelines/collections/actions.ts b/frontend/src/metabase/timelines/collections/actions.tsindex 7aff26dd959..3e799c7d626 100644--- a/frontend/src/metabase/timelines/collections/actions.ts+++ b/frontend/src/metabase/timelines/collections/actions.ts@@ -1,6 +1,6 @@import { push } from "react-router-redux";-import Timelines from "metabase/entities/timelines";+import { Timelines } from "metabase/entities/timelines";import * as Urls from "metabase/lib/urls";import type { Timeline } from "metabase-types/api";import type { State } from "metabase-types/store";diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsxindex e886daf6e0c..200bbd0b14f 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteEventModal/DeleteEventModal.tsx@@ -1,8 +1,8 @@import { push } from "react-router-redux";import _ from "underscore";-import TimelineEvents from "metabase/entities/timeline-events";-import Timelines from "metabase/entities/timelines";+import { TimelineEvents } from "metabase/entities/timeline-events";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import DeleteEventModal from "metabase/timelines/common/components/DeleteEventModal";diff --git a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsxindex 60b1b536eb2..6f823170bcd 100644--- a/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/DeleteTimelineModal/DeleteTimelineModal.tsx@@ -1,7 +1,7 @@import { push } from "react-router-redux";import _ from "underscore";-import Timelines from "metabase/entities/timelines";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import DeleteTimelineModal from "metabase/timelines/common/components/DeleteTimelineModal";diff --git a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsxindex 0cbaae052da..997529cfe96 100644--- a/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditEventModal/EditEventModal.tsx@@ -1,8 +1,8 @@import { push } from "react-router-redux";import _ from "underscore";-import TimelineEvents from "metabase/entities/timeline-events";-import Timelines from "metabase/entities/timelines";+import { TimelineEvents } from "metabase/entities/timeline-events";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import EditEventModal from "metabase/timelines/common/components/EditEventModal";diff --git a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsxindex a60e6a88bb5..5a89b547848 100644--- a/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/EditTimelineModal/EditTimelineModal.tsx@@ -1,7 +1,7 @@import { push } from "react-router-redux";import _ from "underscore";-import Timelines from "metabase/entities/timelines";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import EditTimelineModal from "metabase/timelines/common/components/EditTimelineModal";diff --git a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsxindex 60686e228a2..320e0b65662 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx@@ -1,9 +1,9 @@import { push } from "react-router-redux";import _ from "underscore";-import Collections from "metabase/entities/collections";-import TimelineEvents from "metabase/entities/timeline-events";-import Timelines from "metabase/entities/timelines";+import { Collections } from "metabase/entities/collections";+import { TimelineEvents } from "metabase/entities/timeline-events";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import MoveEventModal from "metabase/timelines/common/components/MoveEventModal";diff --git a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsxindex 509cf01920c..4ada3074a33 100644--- a/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/MoveTimelineModal/MoveTimelineModal.tsx@@ -1,6 +1,6 @@import _ from "underscore";-import Timelines from "metabase/entities/timelines";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import MoveTimelineModal from "metabase/timelines/common/components/MoveTimelineModal";diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsxindex 46cf1c7c8d9..bee0c54f2df 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventModal/NewEventModal.tsx@@ -1,8 +1,8 @@import { push } from "react-router-redux";import _ from "underscore";-import TimelineEvents from "metabase/entities/timeline-events";-import Timelines from "metabase/entities/timelines";+import { TimelineEvents } from "metabase/entities/timeline-events";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import NewEventModal from "metabase/timelines/common/components/NewEventModal";diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsxindex f65edb5c870..27050a1baf5 100644--- a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx@@ -1,8 +1,8 @@import { push } from "react-router-redux";import _ from "underscore";-import Collections from "metabase/entities/collections";-import Timelines from "metabase/entities/timelines";+import { Collections } from "metabase/entities/collections";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import NewEventModal from "metabase/timelines/common/components/NewEventModal";diff --git a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsxindex a0a79ca7aab..773c5d5c24c 100644--- a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx@@ -1,8 +1,8 @@import { push } from "react-router-redux";import _ from "underscore";-import Collections from "metabase/entities/collections";-import Timelines from "metabase/entities/timelines";+import { Collections } from "metabase/entities/collections";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import NewTimelineModal from "metabase/timelines/common/components/NewTimelineModal";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsxindex df37d3effb5..6ae3f9f9155 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineArchiveModal/TimelineArchiveModal.tsx@@ -1,8 +1,8 @@import { push } from "react-router-redux";import _ from "underscore";-import TimelineEvents from "metabase/entities/timeline-events";-import Timelines from "metabase/entities/timelines";+import { TimelineEvents } from "metabase/entities/timeline-events";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsxindex 8b600ffb670..72ed56e5783 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineDetailsModal/TimelineDetailsModal.tsx@@ -1,8 +1,8 @@import { push } from "react-router-redux";import _ from "underscore";-import TimelineEvents from "metabase/entities/timeline-events";-import Timelines from "metabase/entities/timelines";+import { TimelineEvents } from "metabase/entities/timeline-events";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import type { Timeline, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsxindex 0d862f62290..7e6ba276236 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineIndexModal/TimelineIndexModal.tsx@@ -1,4 +1,4 @@-import Timelines from "metabase/entities/timelines";+import { Timelines } from "metabase/entities/timelines";import * as Urls from "metabase/lib/urls";import type { State } from "metabase-types/store";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsxindex 673ac3c7289..b011cb56899 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx@@ -1,8 +1,8 @@import { push } from "react-router-redux";import _ from "underscore";-import Collections from "metabase/entities/collections";-import Timelines from "metabase/entities/timelines";+import { Collections } from "metabase/entities/collections";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import type { Collection, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsxindex 1a9cee1a455..3b8cb7c78d9 100644--- a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx@@ -1,7 +1,7 @@import _ from "underscore";-import Collections from "metabase/entities/collections";-import Timelines from "metabase/entities/timelines";+import { Collections } from "metabase/entities/collections";+import { Timelines } from "metabase/entities/timelines";import * as Urls from "metabase/lib/urls";import type { State } from "metabase-types/store";diff --git a/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsxindex 1197c9df9ff..0305da20def 100644--- a/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx+++ b/frontend/src/metabase/timelines/questions/containers/EditEventModal/EditEventModal.tsx@@ -1,7 +1,7 @@import { t } from "ttag";import _ from "underscore";-import TimelineEvents from "metabase/entities/timeline-events";+import { TimelineEvents } from "metabase/entities/timeline-events";import { connect } from "metabase/lib/redux";import { addUndo } from "metabase/redux/undo";import EditEventModal from "metabase/timelines/common/components/EditEventModal";diff --git a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsxindex 3c962d90490..894e124ccd0 100644--- a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx+++ b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx@@ -1,8 +1,8 @@import _ from "underscore";-import Collections, { ROOT_COLLECTION } from "metabase/entities/collections";-import TimelineEvents from "metabase/entities/timeline-events";-import Timelines from "metabase/entities/timelines";+import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";+import { TimelineEvents } from "metabase/entities/timeline-events";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import MoveEventModal from "metabase/timelines/common/components/MoveEventModal";import type { Timeline, TimelineEvent } from "metabase-types/api";diff --git a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsxindex dcb36f53583..93d3c70d3cb 100644--- a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx+++ b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx@@ -1,9 +1,9 @@import { t } from "ttag";import _ from "underscore";-import Collections, { ROOT_COLLECTION } from "metabase/entities/collections";-import TimelineEvents from "metabase/entities/timeline-events";-import Timelines from "metabase/entities/timelines";+import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";+import { TimelineEvents } from "metabase/entities/timeline-events";+import { Timelines } from "metabase/entities/timelines";import { connect } from "metabase/lib/redux";import { addUndo } from "metabase/redux/undo";import NewEventModal from "metabase/timelines/common/components/NewEventModal";diff --git a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx b/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsxindex 240e1b75907..1002ad592cf 100644--- a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx+++ b/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx@@ -1,7 +1,7 @@import _ from "underscore";-import Collections, { ROOT_COLLECTION } from "metabase/entities/collections";-import TimelineEvents from "metabase/entities/timeline-events";+import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";+import { TimelineEvents } from "metabase/entities/timeline-events";import { connect } from "metabase/lib/redux";import type { TimelineEvent } from "metabase-types/api";import type { State } from "metabase-types/store";diff --git a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsxindex ba12f3afbf2..148dddff090 100644--- a/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx+++ b/frontend/src/metabase/visualizations/components/ObjectDetail/ObjectDetail.tsx@@ -1,4 +1,4 @@-import Tables from "metabase/entities/tables";+import { Tables } from "metabase/entities/tables";import { connect } from "metabase/lib/redux";import {closeObjectDetail,diff --git a/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.tsx b/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.tsxindex 1fa1b0696a9..adadccbadc0 100644--- a/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.tsx+++ b/frontend/src/metabase/visualizations/visualizations/LinkViz/LinkViz.tsx@@ -5,7 +5,7 @@ import _ from "underscore";import TippyPopover from "metabase/common/components/Popover/TippyPopover";import { useToggle } from "metabase/common/hooks/use-toggle";import { getParameterValues } from "metabase/dashboard/selectors";-import Search from "metabase/entities/search";+import { Search } from "metabase/entities/search";import { getUrlTarget } from "metabase/lib/dom";import { useSelector } from "metabase/lib/redux";import { modelToUrl } from "metabase/lib/urls";