Skip to content

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

Entities remove collections (#74148)

Romeo Van Snick072fd58660e5
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.jsx
index e128159b162..3e70736a2b2 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
@@ -1,7 +1,10 @@
import PropTypes from "prop-types";
import { useCallback, useMemo, useState } from "react";
-import _ from "underscore";
+import {
+ useGetCollectionQuery,
+ useListCollectionsTreeQuery,
+} from "metabase/api";
import {
currentUserPersonalCollections,
isRootPersonalCollection,
@@ -10,11 +13,11 @@ import {
import { Tree } from "metabase/common/components/tree";
import CS from "metabase/css/core/index.css";
import {
- Collections,
PERSONAL_COLLECTIONS,
buildCollectionTree,
} from "metabase/entities/collections";
-import { connect } from "metabase/redux";
+import { useSelector } from "metabase/redux";
+import { getUser } from "metabase/selectors/user";
import { Box, Icon } from "metabase/ui";
import SavedEntityList from "./SavedEntityList";
@@ -26,12 +29,9 @@ const propTypes = {
type: PropTypes.string,
onSelect: PropTypes.func.isRequired,
onBack: PropTypes.func.isRequired,
- collections: PropTypes.array.isRequired,
- currentUser: PropTypes.object.isRequired,
databaseId: PropTypes.string,
tableId: PropTypes.string,
collectionId: PropTypes.number,
- rootCollection: PropTypes.object,
};
const getOurAnalyticsCollection = (collectionEntity) => {
@@ -56,18 +56,30 @@ const ALL_PERSONAL_COLLECTIONS_ROOT = {
* @property {DataSourceSelectorProps['selectedDatabaseId']} databaseId
* @property {(cardId: string) => void} onSelect
* @property {() => void} onBack
- *
- * @typedef {object} SavedEntityPickerComposedProps
- * @property {import("metabase-types/api").User} currentUser
- * @property {import("metabase-types/api").Collection[]} collections
- * @property {import("metabase-types/api").Collection} rootCollection
*/
/**
- *
- * @param {SavedEntityPickerOwnProps & SavedEntityPickerComposedProps} props
- * @returns {JSX.Element}
+ * @param {SavedEntityPickerOwnProps} props
+ * @returns {JSX.Element | null}
*/
+export function SavedEntityPicker(props) {
+ const { data: collections } = useListCollectionsTreeQuery({
+ "exclude-archived": true,
+ namespaces: ["", "shared-tenant-collection", "tenant-specific"],
+ });
+ const { data: rootCollection } = useGetCollectionQuery({ id: "root" });
+ if (!collections) {
+ return null;
+ }
+ return (
+ <InnerSavedEntityPicker
+ {...props}
+ collections={collections}
+ rootCollection={rootCollection}
+ />
+ );
+}
+
function InnerSavedEntityPicker({
collectionId,
type,
@@ -75,11 +87,11 @@ function InnerSavedEntityPicker({
databaseId,
onSelect,
onBack,
-
- currentUser,
collections,
rootCollection,
}) {
+ const currentUser = useSelector(getUser);
+
const collectionTree = useMemo(() => {
const modelFilter = (model) => CARD_INFO[type].model === model;
@@ -162,23 +174,9 @@ function InnerSavedEntityPicker({
);
}
-InnerSavedEntityPicker.propTypes = propTypes;
-
-const mapStateToProps = ({ currentUser }) => ({ currentUser });
-
-/** @type {React.FC<SavedEntityPickerOwnProps>} */
-export const SavedEntityPicker = _.compose(
- Collections.load({
- id: () => "root",
- entityAlias: "rootCollection",
- loadingAndErrorWrapper: false,
- }),
- Collections.loadList({
- query: () => ({
- tree: true,
- "exclude-archived": true,
- namespaces: ["", "shared-tenant-collection", "tenant-specific"],
- }),
- }),
- connect(mapStateToProps),
-)(InnerSavedEntityPicker);
+SavedEntityPicker.propTypes = propTypes;
+InnerSavedEntityPicker.propTypes = {
+ ...propTypes,
+ collections: PropTypes.array.isRequired,
+ rootCollection: PropTypes.object,
+};
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsx b/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsx
index 7533ef78b07..5026ad4a894 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/collections/use-get-default-collection-id/use-get-default-collection-id.unit.spec.tsx
@@ -52,18 +52,19 @@ const setup = ({
collections: Collection[];
hasRootAccess?: boolean;
}) => {
- setupCollectionByIdEndpoint({ collections });
+ const allCollections = [
+ createMockCollection({
+ id: "root",
+ name: "Our analytics",
+ can_write: hasRootAccess,
+ }),
+ ...collections,
+ ];
+ setupCollectionByIdEndpoint({ collections: allCollections });
setupAuditInfoEndpoint();
const entitiesState = createMockEntitiesState({
- collections: [
- createMockCollection({
- id: "root",
- name: "Our analytics",
- can_write: hasRootAccess,
- }),
- ...collections,
- ],
+ collections: allCollections,
});
const state = createMockState({ currentUser: user, entities: entitiesState });
diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
index 4f2544bb4b4..f29690062af 100644
--- a/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/library/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
@@ -16,7 +16,7 @@ export function CollectionPermissionsModal({
<Modal onClose={onClose}>
<CollectionPermissionsModalBase
params={{ slug: String(collectionId) }}
- namespace={namespace}
+ namespace={namespace ?? null}
onClose={onClose}
/>
</Modal>
diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx
index 9927b6d42ad..c2efbdc7128 100644
--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionPermissionsModal/SnippetCollectionPermissionsModal.tsx
@@ -12,7 +12,7 @@ export function SnippetCollectionPermissionsModal({
return (
<Modal onClose={onClose}>
<CollectionPermissionsModal
- params={{ slug: collectionId }}
+ params={{ slug: String(collectionId) }}
onClose={onClose}
namespace="snippets"
/>
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx
index 9cc4d5aa897..c9cdb479d38 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/TenantCollectionPermissionsPage.tsx
@@ -27,7 +27,7 @@ import type {
PermissionEditorType,
} from "metabase/admin/permissions/types";
import { assertNumericId } from "metabase/admin/permissions/types";
-import { Collections } from "metabase/entities/collections";
+import { useListCollectionsTreeQuery } from "metabase/api";
import { connect } from "metabase/redux";
import type { State } from "metabase/redux/store";
import type { Collection, CollectionId } from "metabase-types/api";
@@ -62,18 +62,15 @@ type TenantCollectionPermissionsPageProps = {
params: CollectionIdProps["params"];
sidebar: CollectionSidebarType;
permissionEditor: PermissionEditorType | null;
- collection: Collection;
- navigateToItem: (item: { id: CollectionId }) => void;
- updateCollectionPermission: ({
- groupId,
- collection,
- value,
- shouldPropagateToChildren,
- }: UpdateTenantCollectionPermissionParams) => void;
+ collection: Collection | null;
+ navigateToItem: (item: { id: CollectionId }) => any;
+ updateCollectionPermission: (
+ params: UpdateTenantCollectionPermissionParams,
+ ) => any;
isDirty: boolean;
- savePermissions: () => void;
- loadPermissions: () => void;
- initialize: () => void;
+ savePermissions: (...args: any[]) => any;
+ loadPermissions: (...args: any[]) => any;
+ initialize: (...args: any[]) => any;
route: Route;
};
@@ -89,6 +86,8 @@ function TenantCollectionPermissionsPageView({
initialize,
route,
}: TenantCollectionPermissionsPageProps) {
+ useListCollectionsTreeQuery(tenantCollectionsQuery);
+
useEffect(() => {
initialize();
}, [initialize]);
@@ -100,6 +99,9 @@ function TenantCollectionPermissionsPageView({
value: unknown,
toggleState: boolean | null,
) => {
+ if (!collection) {
+ return;
+ }
updateCollectionPermission({
groupId: assertNumericId(item.id),
collection,
@@ -141,8 +143,5 @@ function TenantCollectionPermissionsPageView({
}
export const TenantCollectionPermissionsPage = _.compose(
- Collections.loadList({
- entityQuery: tenantCollectionsQuery,
- }),
connect(mapStateToProps, mapDispatchToProps),
)(TenantCollectionPermissionsPageView);
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
index 61029920754..b5d979b54aa 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.tsx
@@ -22,8 +22,8 @@ import {
isAdminGroup,
isDefaultGroup,
} from "metabase/admin/utils/groups";
+import { collectionApi } from "metabase/api";
import {
- Collections,
ROOT_COLLECTION,
getCollectionIcon,
} from "metabase/entities/collections";
@@ -39,11 +39,10 @@ import type {
} from "metabase-types/api";
export const tenantCollectionsQuery = {
- tree: true,
"exclude-other-user-collections": true,
"exclude-archived": true,
namespace: "shared-tenant-collection",
-};
+} as const;
export const getIsTenantDirty = createSelector(
(state: State) => state.admin.permissions.tenantCollectionPermissions,
@@ -77,10 +76,12 @@ const getTenantRootCollectionTreeItem = () => {
};
};
-const getTenantCollections = (state: State) =>
- Collections.selectors.getList(state, {
- entityQuery: tenantCollectionsQuery,
- }) ?? [];
+const getTenantCollections = (state: State) => {
+ const queryState = collectionApi.endpoints.listCollectionsTree.select(
+ tenantCollectionsQuery,
+ )(state);
+ return queryState?.data ?? [];
+};
const getTenantCollectionsTree = createSelector(
[getTenantCollections],
@@ -132,7 +133,7 @@ const findCollection = (
const getTenantCollection = createSelector(
[getCurrentTenantCollectionId, getTenantCollections],
- (collectionId, collections) => {
+ (collectionId, collections): Collection | null => {
if (collectionId == null) {
return null;
}
@@ -142,7 +143,7 @@ const getTenantCollection = createSelector(
...ROOT_COLLECTION,
name: t`Root shared collection`,
children: collections,
- };
+ } as unknown as Collection;
}
return findCollection(collections, collectionId);
@@ -171,7 +172,7 @@ export const getTenantCollectionsPermissionEditor = createSelector(
return null;
}
- const hasChildren = collection.children?.length > 0;
+ const hasChildren = (collection.children?.length ?? 0) > 0;
const toggleLabel = hasChildren ? t`Also change sub-collections` : null;
const entities = groups
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.unit.spec.ts b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.unit.spec.ts
index a32240fa1c6..b69a4ba33dc 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.unit.spec.ts
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantCollectionPermissionsPage/selectors.unit.spec.ts
@@ -53,7 +53,6 @@ describe("TenantCollectionPermissionsPage selectors", () => {
describe("tenantCollectionsQuery", () => {
it("should have correct query parameters", () => {
expect(tenantCollectionsQuery).toEqual({
- tree: true,
"exclude-other-user-collections": true,
"exclude-archived": true,
namespace: "shared-tenant-collection",
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx
index 5f989954651..e66572b385b 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/TenantSpecificCollectionPermissionsPage.tsx
@@ -20,7 +20,7 @@ import {
import type { CollectionIdProps } from "metabase/admin/permissions/selectors/collection-permissions";
import type { PermissionEditorEntity } from "metabase/admin/permissions/types";
import { assertNumericId } from "metabase/admin/permissions/types";
-import { Collections } from "metabase/entities/collections";
+import { useListCollectionsTreeQuery } from "metabase/api";
import { useDispatch, useSelector } from "metabase/redux";
import type { Collection, CollectionId } from "metabase-types/api";
@@ -41,6 +41,8 @@ function TenantSpecificCollectionPermissionsPageView({
params,
route,
}: TenantSpecificCollectionPermissionsPageProps) {
+ useListCollectionsTreeQuery(tenantSpecificCollectionsQuery);
+
const dispatch = useDispatch();
const props = useMemo(() => ({ params }), [params]);
@@ -148,6 +150,5 @@ function TenantSpecificCollectionPermissionsPageView({
);
}
-export const TenantSpecificCollectionPermissionsPage = Collections.loadList({
- entityQuery: tenantSpecificCollectionsQuery,
-})(TenantSpecificCollectionPermissionsPageView);
+export const TenantSpecificCollectionPermissionsPage =
+ TenantSpecificCollectionPermissionsPageView;
diff --git a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
index ba03a13024d..feeb36a80d2 100644
--- a/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/tenants/components/TenantSpecificCollectionPermissionsPage/selectors.tsx
@@ -21,9 +21,9 @@ import {
isAdminGroup,
isDefaultGroup,
} from "metabase/admin/utils/groups";
+import { collectionApi } from "metabase/api";
import { findCollectionById } from "metabase/common/utils/collections";
import {
- Collections,
ROOT_COLLECTION,
getCollectionIcon,
} from "metabase/entities/collections";
@@ -38,11 +38,10 @@ import type {
} from "metabase-types/api";
export const tenantSpecificCollectionsQuery = {
- tree: true,
"exclude-other-user-collections": true,
"exclude-archived": true,
namespace: "tenant-specific",
-};
+} as const;
export const getIsTenantSpecificDirty = createSelector(
(state: State) => state.admin.permissions.tenantSpecificCollectionPermissions,
@@ -78,10 +77,12 @@ const getTenantSpecificRootCollectionTreeItem = () => {
};
};
-const getTenantSpecificCollections = (state: State) =>
- Collections.selectors.getList(state, {
- entityQuery: tenantSpecificCollectionsQuery,
- }) ?? [];
+const getTenantSpecificCollections = (state: State) => {
+ const queryState = collectionApi.endpoints.listCollectionsTree.select(
+ tenantSpecificCollectionsQuery,
+ )(state);
+ return queryState?.data ?? [];
+};
const getTenantSpecificCollectionsTree = () => {
// Only show the single "Root tenant collection" in the sidebar
diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
index 9f378df8805..d3be805e793 100644
--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
+++ b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.tsx
@@ -2,12 +2,12 @@ import { useCallback, useEffect } from "react";
import { t } from "ttag";
import _ from "underscore";
+import { useListCollectionsTreeQuery } from "metabase/api";
import { isPersonalCollectionChild } from "metabase/collections/utils";
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 { connect, useSelector } from "metabase/redux";
import type { State } from "metabase/redux/store";
import * as Urls from "metabase/urls";
@@ -56,9 +56,6 @@ const mapStateToProps = (
params: { collectionId },
namespace: props.namespace,
}),
- collectionsList: Collections.selectors.getList(state, {
- entityQuery: { tree: true },
- }),
isDirty: getIsDirty(state),
};
};
@@ -75,7 +72,6 @@ interface CollectionPermissionsModalProps {
onClose: () => void;
namespace: CollectionNamespace;
collection?: Collection;
- collectionsList?: Collection[];
initialize: (namespace: CollectionNamespace) => void;
updateCollectionPermission: (
params: UpdateCollectionPermissionParams,
@@ -89,12 +85,14 @@ const CollectionPermissionsModal = ({
onClose,
namespace,
collection,
- collectionsList,
initialize,
updateCollectionPermission,
saveCollectionPermissions,
}: CollectionPermissionsModalProps) => {
+ const { data: collectionsList } =
+ useListCollectionsTreeQuery(collectionsQuery);
+
const originalPermissionsState = useSelector(
({ admin }) => admin.permissions.originalCollectionPermissions,
);
@@ -180,9 +178,6 @@ const CollectionPermissionsModal = ({
};
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default _.compose(
- Collections.loadList({
- entityQuery: collectionsQuery,
- }),
- connect(mapStateToProps, mapDispatchToProps),
-)(CollectionPermissionsModal);
+export default _.compose(connect(mapStateToProps, mapDispatchToProps))(
+ CollectionPermissionsModal,
+);
diff --git a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx
index bdb086b327f..2ed08e0001b 100644
--- a/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx
+++ b/frontend/src/metabase/admin/permissions/pages/CollectionPermissionsPage/CollectionPermissionsPage.tsx
@@ -5,7 +5,7 @@ import { t } from "ttag";
import _ from "underscore";
import { CollectionPermissionsHelp } from "metabase/admin/permissions/components/CollectionPermissionsHelp";
-import { Collections } from "metabase/entities/collections";
+import { useListCollectionsTreeQuery } from "metabase/api";
import { connect, useSelector } from "metabase/redux";
import type { State } from "metabase/redux/store";
import type { Collection, CollectionId } from "metabase-types/api";
@@ -59,18 +59,13 @@ type CollectionPermissionsPageProps = {
params: CollectionIdProps["params"];
sidebar: CollectionSidebarType;
permissionEditor: PermissionEditorType | null;
- collection: Collection;
+ collection: Collection | undefined;
navigateToItem: (item: any) => void;
- updateCollectionPermission: ({
- groupId,
- collection,
- value,
- shouldPropagateToChildren,
- }: UpdateCollectionPermissionParams) => void;
+ updateCollectionPermission: (params: UpdateCollectionPermissionParams) => any;
isDirty: boolean;
- savePermissions: () => void;
- loadPermissions: () => void;
- initialize: () => void;
+ savePermissions: (...args: any[]) => any;
+ loadPermissions: (...args: any[]) => any;
+ initialize: (...args: any[]) => any;
route: Route;
};
@@ -86,6 +81,8 @@ function CollectionsPermissionsPageView({
initialize,
route,
}: CollectionPermissionsPageProps) {
+ useListCollectionsTreeQuery(collectionsQuery);
+
const originalPermissionsState = useSelector(
({ admin }) => admin.permissions.originalCollectionPermissions,
);
@@ -101,6 +98,9 @@ function CollectionsPermissionsPageView({
value: unknown,
toggleState: boolean | null,
) => {
+ if (!collection) {
+ return;
+ }
updateCollectionPermission({
groupId: assertNumericId(item.id),
collection,
@@ -144,8 +144,5 @@ function CollectionsPermissionsPageView({
}
export const CollectionPermissionsPage = _.compose(
- Collections.loadList({
- entityQuery: collectionsQuery,
- }),
connect(mapStateToProps, mapDispatchToProps),
)(CollectionsPermissionsPageView);
diff --git a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
index f9e3338707b..4c638ce26e2 100644
--- a/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
+++ b/frontend/src/metabase/admin/permissions/selectors/collection-permissions.tsx
@@ -16,7 +16,6 @@ import {
nonPersonalOrArchivedCollection,
} from "metabase/collections/utils";
import {
- Collections,
ROOT_COLLECTION,
getCollectionIcon,
} from "metabase/entities/collections";
@@ -49,11 +48,10 @@ import { getPermissionWarningModal } from "./confirmations";
import { selectGroupList } from "./data-permissions/groups";
export const collectionsQuery = {
- tree: true,
"exclude-other-user-collections": true,
"exclude-archived": true,
"include-library": true,
-};
+} as const;
export const getIsDirty = createSelector(
(state: State) => state.admin.permissions.collectionPermissions,
@@ -91,12 +89,11 @@ const getRootCollectionTreeItem = () => {
};
};
-const getCollections = (state: State) =>
- (
- Collections.selectors.getList(state, {
- entityQuery: collectionsQuery,
- }) ?? []
- ).filter(nonPersonalOrArchivedCollection);
+const getCollections = (state: State) => {
+ const queryState =
+ collectionApi.endpoints.listCollectionsTree.select(collectionsQuery)(state);
+ return (queryState?.data ?? []).filter(nonPersonalOrArchivedCollection);
+};
const getCollectionsTree = createSelector([getCollections], (collections) => {
const libraryCollections = collections.filter(isLibraryCollection);
diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx
index 306f364a06a..3a512be3dd3 100644
--- a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx
+++ b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx
@@ -2,8 +2,9 @@ import { useDisclosure } from "@mantine/hooks";
import { useCallback, useMemo } from "react";
import { push } from "react-router-redux";
import { t } from "ttag";
+import _ from "underscore";
-import { Api } from "metabase/api";
+import { Api, collectionApi } from "metabase/api";
import { listTag } from "metabase/api/tags";
import { HACK_getParentCollectionFromEntityUpdateAction } from "metabase/archive/utils";
import { trackCollectionItemBookmarked } from "metabase/collections/analytics";
@@ -150,6 +151,26 @@ function ActionMenu({
}, [item, setCollectionPreview]);
const handleRestore = useCallback(async () => {
+ if (item.model === "collection") {
+ const collection = await dispatch(
+ collectionApi.endpoints.updateCollection.initiate({
+ id: item.id,
+ archived: false,
+ }),
+ ).unwrap();
+ dispatch(Api.util.invalidateTags([listTag("bookmark")]));
+
+ const parentCollection = _.last(collection.effective_ancestors ?? []);
+ const redirect = getParentEntityLink(collection, parentCollection);
+
+ sendToast({
+ message: t`${item.name} has been restored.`,
+ actionLabel: t`View`,
+ action: () => dispatch(push(redirect)),
+ });
+ return;
+ }
+
const Entity = entityForObject(item);
const result = await dispatch(
Entity.actions.update({ id: item.id, archived: false }),
@@ -171,6 +192,13 @@ function ActionMenu({
}, [item, dispatch, sendToast]);
const handleDeletePermanently = useCallback(() => {
+ if (item.model === "collection") {
+ dispatch(
+ collectionApi.endpoints.deleteCollection.initiate({ id: item.id }),
+ );
+ sendToast({ message: t`This item has been permanently deleted.` });
+ return;
+ }
const Entity = entityForObject(item);
dispatch(Entity.actions.delete(item));
sendToast({ message: t`This item has been permanently deleted.` });
diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.unit.spec.tsx b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.unit.spec.tsx
index 3d794910633..cdb64ac1508 100644
--- a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.unit.spec.tsx
+++ b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.unit.spec.tsx
@@ -5,7 +5,6 @@ import fetchMock from "fetch-mock";
import { setupCardEndpoints } from "__support__/server-mocks";
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 {
@@ -211,9 +210,7 @@ describe("ActionMenu", () => {
describe("getParentEntityLink", () => {
it("should generate collection link for collection question", () => {
- const updatedCollection = Collections.wrapEntity(
- createMockCollectionItem({ archived: false }),
- );
+ const updatedCollection = createMockCollectionItem({ archived: false });
const link = getParentEntityLink(updatedCollection, undefined);
expect(link).toBe("/collection/root");
});
@@ -222,9 +219,7 @@ describe("ActionMenu", () => {
const updatedDashboard = Dashboards.wrapEntity(
createMockDashboard({ archived: false }),
);
- const parentCollection = Collections.wrapEntity(
- createMockCollectionItem({ id: 123 }),
- );
+ const parentCollection = createMockCollectionItem({ id: 123 });
const link = getParentEntityLink(updatedDashboard, parentCollection);
expect(link).toBe("/collection/123-question");
});
diff --git a/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx b/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx
index 772a249f2f8..a77b113cf74 100644
--- a/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx
+++ b/frontend/src/metabase/collections/components/ArchiveCollectionModal/ArchiveCollectionModal.jsx
@@ -1,11 +1,10 @@
/* eslint-disable react/prop-types */
import { withRouter } from "react-router";
import { t } from "ttag";
-import _ from "underscore";
+import { skipToken, useGetCollectionQuery } from "metabase/api";
import { ArchiveModal } from "metabase/common/components/ArchiveModal";
import { useSetArchive } from "metabase/common/hooks";
-import { Collections } from "metabase/entities/collections";
import * as Urls from "metabase/urls";
function ArchiveCollectionModalInner({ collection, onClose }) {
@@ -25,9 +24,19 @@ function ArchiveCollectionModalInner({ collection, onClose }) {
);
}
-export const ArchiveCollectionModal = _.compose(
- Collections.load({
- id: (state, props) => Urls.extractCollectionId(props.params.slug),
- }),
- withRouter,
-)(ArchiveCollectionModalInner);
+function ArchiveCollectionModalContainer({ params, onClose }) {
+ const collectionId = Urls.extractCollectionId(params.slug);
+ const { data: collection } = useGetCollectionQuery(
+ collectionId != null ? { id: collectionId } : skipToken,
+ );
+ if (!collection) {
+ return null;
+ }
+ return (
+ <ArchiveCollectionModalInner collection={collection} onClose={onClose} />
+ );
+}
+
+export const ArchiveCollectionModal = withRouter(
+ ArchiveCollectionModalContainer,
+);
diff --git a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
index ea0b9e634dd..6eed5389b54 100644
--- a/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
+++ b/frontend/src/metabase/collections/components/CollectionContent/CollectionContentView.tsx
@@ -1,14 +1,18 @@
import { useDisclosure } from "@mantine/hooks";
import { useCallback, useEffect, useMemo, useState } from "react";
import { type FileRejection, useDropzone } from "react-dropzone";
+import { push } from "react-router-redux";
import { usePrevious } from "react-use";
import { match } from "ts-pattern";
import { t } from "ttag";
import ErrorBoundary from "metabase/ErrorBoundary";
-import { Api, useListCollectionItemsQuery } from "metabase/api";
+import {
+ Api,
+ useDeleteCollectionMutation,
+ useListCollectionItemsQuery,
+} from "metabase/api";
import { listTag } from "metabase/api/tags";
-import { deletePermanently } from "metabase/archive/actions";
import { ArchivedEntityBanner } from "metabase/archive/components/ArchivedEntityBanner";
import { trackCollectionBookmarked } from "metabase/collections/analytics";
import { CollectionBulkActions } from "metabase/collections/components/CollectionBulkActions";
@@ -37,8 +41,8 @@ import {
useToast,
} from "metabase/common/hooks";
import { useListSelect } from "metabase/common/hooks/use-list-select";
-import { Collections } from "metabase/entities/collections";
import { useDispatch } from "metabase/redux";
+import { addUndo } from "metabase/redux/undo";
import { MAX_UPLOAD_SIZE, MAX_UPLOAD_STRING } from "metabase/redux/uploads";
import type Database from "metabase-lib/v1/metadata/Database";
import type {
@@ -83,6 +87,7 @@ export const CollectionContentView = ({
visibleColumns?: CollectionContentTableColumn[];
}) => {
const dispatch = useDispatch();
+ const [deleteCollection] = useDeleteCollectionMutation();
const { data: pinnedItemsData, isLoading: loading } =
useListCollectionItemsQuery({
@@ -241,7 +246,6 @@ export const CollectionContentView = ({
const pinnedItems = list && !isRootTrashCollection(collection) ? list : [];
const hasPinnedItems = pinnedItems.length > 0;
- const actionId = { id: collectionId };
return (
<CollectionRoot {...dropzoneProps}>
@@ -271,9 +275,23 @@ export const CollectionContentView = ({
onMove={({ id }) =>
setCollection({ model: "collection", id: collectionId }, { id })
}
- onDeletePermanently={() =>
- dispatch(deletePermanently(Collections.actions.delete(actionId)))
- }
+ onDeletePermanently={async () => {
+ try {
+ await deleteCollection({ id: collectionId }).unwrap();
+ dispatch(push("/trash"));
+ dispatch(
+ addUndo({
+ message: t`This item has been permanently deleted.`,
+ }),
+ );
+ } catch {
+ dispatch(
+ addUndo({
+ message: t`There was an error permanently deleting this item.`,
+ }),
+ );
+ }
+ }}
/>
)}
diff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx b/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
index 2f695455a43..ddc47ddbab4 100644
--- a/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
+++ b/frontend/src/metabase/collections/components/CreateCollectionForm/CreateCollectionForm.tsx
@@ -2,7 +2,6 @@ import { useCallback, useMemo, useState } from "react";
import type { WithRouterProps } from "react-router";
import { withRouter } from "react-router";
import { t } from "ttag";
-import _ from "underscore";
import * as Yup from "yup";
import { skipToken, useGetCollectionQuery } from "metabase/api";
@@ -19,10 +18,8 @@ import type {
FilterItemsInPersonalCollection,
OmniPickerItem,
} from "metabase/common/components/Pickers";
-import { Collections } from "metabase/entities/collections";
import { Form, FormProvider } from "metabase/forms";
import { PLUGIN_TENANTS } from "metabase/plugins";
-import { connect } from "metabase/redux";
import { Flex } from "metabase/ui";
import * as Errors from "metabase/utils/errors";
import type { Collection, CollectionNamespace } from "metabase-types/api";
@@ -59,19 +56,7 @@ export interface CreateCollectionFormOwnProps {
showAuthorityLevelPicker?: boolean;
}
-interface CreateCollectionFormDispatchProps {
- handleCreateCollection: (
- collection: CreateCollectionProperties,
- ) => Promise<Collection>;
-}
-
-type Props = CreateCollectionFormOwnProps &
- CreateCollectionFormDispatchProps &
- WithRouterProps;
-
-const mapDispatchToProps = {
- handleCreateCollection: Collections.actions.create,
-};
+type Props = CreateCollectionFormOwnProps & WithRouterProps;
function CreateCollectionForm({
collectionId,
@@ -127,6 +112,7 @@ function CreateCollectionForm({
return (
<FormProvider
initialValues={initialValues}
+ enableReinitialize
validationSchema={COLLECTION_SCHEMA}
onSubmit={handleSubmit}
>
@@ -188,7 +174,4 @@ function CreateCollectionForm({
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default _.compose(
- withRouter,
- connect(null, mapDispatchToProps),
-)(CreateCollectionForm);
+export default withRouter(CreateCollectionForm);
diff --git a/frontend/src/metabase/collections/components/CreateCollectionForm/tests/common.unit.spec.tsx b/frontend/src/metabase/collections/components/CreateCollectionForm/tests/common.unit.spec.tsx
index 0f5ff016d77..166b2a51f38 100644
--- a/frontend/src/metabase/collections/components/CreateCollectionForm/tests/common.unit.spec.tsx
+++ b/frontend/src/metabase/collections/components/CreateCollectionForm/tests/common.unit.spec.tsx
@@ -5,7 +5,7 @@ import { screen } from "__support__/ui";
import { setup } from "./setup";
describe("CreateCollectionForm", () => {
- it("displays correct blank state", () => {
+ it("displays correct blank state", async () => {
setup();
expect(screen.getByLabelText("Name")).toBeInTheDocument();
@@ -15,7 +15,7 @@ describe("CreateCollectionForm", () => {
expect(screen.getByLabelText("Description")).toHaveValue("");
expect(screen.getByText(/Collection it's saved in/i)).toBeInTheDocument();
- expect(screen.getByText("Our analytics")).toBeInTheDocument();
+ expect(await screen.findByText("Our analytics")).toBeInTheDocument();
expect(screen.getByRole("button", { name: "Cancel" })).toBeInTheDocument();
expect(screen.getByRole("button", { name: "Create" })).toBeInTheDocument();
diff --git a/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx b/frontend/src/metabase/collections/containers/CollectionHeader/CollectionHeader.tsx
index 220b858a22c..1c74616016c 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 { collectionApi } from "metabase/api";
import { connect } from "metabase/redux";
import { uploadFile } from "metabase/redux/uploads";
import type { Collection } from "metabase-types/api";
@@ -7,7 +7,10 @@ import CollectionHeader from "../../components/CollectionHeader";
const mapDispatchToProps = {
onUpdateCollection: (collection: Collection, values: Partial<Collection>) =>
- Collections.actions.update(collection, values),
+ collectionApi.endpoints.updateCollection.initiate({
+ id: collection.id,
+ ...values,
+ } as any),
onUpload: uploadFile,
};
diff --git a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx b/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx
index 3405715da23..ade3cd7d1e2 100644
--- a/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx
+++ b/frontend/src/metabase/collections/containers/CreateCollectionModal.tsx
@@ -1,13 +1,11 @@
-import type { LocationDescriptor } from "history";
import { useCallback } from "react";
import { push } from "react-router-redux";
import { t } from "ttag";
+import { useCreateCollectionMutation } from "metabase/api";
import { useEscapeToCloseModal } from "metabase/common/hooks/use-escape-to-close-modal";
-import { Collections } from "metabase/entities/collections";
import { PLUGIN_LIBRARY } from "metabase/plugins";
-import { connect } from "metabase/redux";
-import type { State } from "metabase/redux/store";
+import { useDispatch } from "metabase/redux";
import { Modal } from "metabase/ui";
import * as Urls from "metabase/urls";
import type { Collection } from "metabase-types/api";
@@ -26,33 +24,18 @@ export interface CreateCollectionModalOwnProps extends Omit<
shouldNavigateOnCreate?: boolean;
}
-interface CreateCollectionModalDispatchProps {
- onChangeLocation: (location: LocationDescriptor) => void;
- handleCreateCollection: (
- collection: CreateCollectionProperties,
- ) => Promise<Collection>;
-}
-
-type Props = CreateCollectionModalOwnProps & CreateCollectionModalDispatchProps;
-
-const mapDispatchToProps = {
- onChangeLocation: push,
- handleCreateCollection: Collections.actions.create,
-};
-
function CreateCollectionModal({
onCreate,
- onChangeLocation,
onClose,
- handleCreateCollection,
shouldNavigateOnCreate = true,
...props
-}: Props) {
+}: CreateCollectionModalOwnProps) {
+ const dispatch = useDispatch();
+ const [createCollection] = useCreateCollectionMutation();
+
const handleCreate = useCallback(
async (values: CreateCollectionProperties) => {
- const action = await handleCreateCollection(values);
- const collection: Collection =
- Collections.HACK_getObjectFromAction(action);
+ const collection = await createCollection(values).unwrap();
if (typeof onCreate === "function") {
onCreate(collection);
@@ -75,16 +58,10 @@ function CreateCollectionModal({
});
}
- onChangeLocation(visitUrl);
+ dispatch(push(visitUrl));
}
},
- [
- handleCreateCollection,
- onCreate,
- onClose,
- onChangeLocation,
- shouldNavigateOnCreate,
- ],
+ [createCollection, dispatch, onCreate, onClose, shouldNavigateOnCreate],
);
useEscapeToCloseModal(onClose);
@@ -109,12 +86,4 @@ function CreateCollectionModal({
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default connect<
- unknown,
- CreateCollectionModalDispatchProps,
- CreateCollectionModalOwnProps,
- State
->(
- null,
- mapDispatchToProps,
-)(CreateCollectionModal);
+export default CreateCollectionModal;
diff --git a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx b/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
index 53b26980618..86c3e66880a 100644
--- a/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
+++ b/frontend/src/metabase/collections/containers/FormCollectionAndDashboardPicker/FormCollectionAndDashboardPicker.tsx
@@ -3,7 +3,11 @@ import type { HTMLAttributes } from "react";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
import { t } from "ttag";
-import { useGetCollectionQuery, useLazyGetDashboardQuery } from "metabase/api";
+import {
+ skipToken,
+ useGetCollectionQuery,
+ useLazyGetDashboardQuery,
+} from "metabase/api";
import {
type EntityType,
canonicalCollectionId,
@@ -25,7 +29,6 @@ import {
} from "metabase/common/components/Pickers";
import { SnippetCollectionName } from "metabase/common/components/SnippetCollectionName";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
-import { Collections } from "metabase/entities/collections";
import { getCollectionIcon } from "metabase/entities/collections/utils";
import { Dashboards } from "metabase/entities/dashboards";
import { useSelector } from "metabase/redux";
@@ -121,19 +124,19 @@ export function FormCollectionAndDashboardPicker({
const buttonRef = useRef<HTMLButtonElement>(null);
const [isPickerOpen, setIsPickerOpen] = useState(false);
- const openCollection = useSelector((state) =>
- Collections.selectors.getObject(state, { entityId: "root" }),
- );
+ const { data: openCollection } = useGetCollectionQuery({ id: "root" });
- const selectedItem = useSelector(
- (state) =>
- Dashboards.selectors.getObject(state, {
- entityId: dashboardIdInput.value,
- }) ||
- Collections.selectors.getObject(state, {
- entityId: collectionIdInput.value,
- }),
+ const selectedDashboard = useSelector((state) =>
+ Dashboards.selectors.getObject(state, {
+ entityId: dashboardIdInput.value,
+ }),
+ );
+ const { data: selectedCollection } = useGetCollectionQuery(
+ collectionIdInput.value != null
+ ? { id: collectionIdInput.value }
+ : skipToken,
);
+ const selectedItem = selectedDashboard || selectedCollection;
const namespace = selectedItem?.namespace;
diff --git a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx b/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
index 95d695f16ec..273645c0a45 100644
--- a/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
+++ b/frontend/src/metabase/collections/containers/FormCollectionPicker/FormCollectionPicker.tsx
@@ -3,6 +3,7 @@ import { useCallback, useEffect, useMemo, useState } from "react";
import { t } from "ttag";
import _ from "underscore";
+import { skipToken, useGetCollectionQuery } from "metabase/api";
import {
type EntityType,
canonicalCollectionId,
@@ -20,9 +21,7 @@ import {
import { SnippetCollectionName } from "metabase/common/components/SnippetCollectionName";
import { TransformCollectionName } from "metabase/common/components/TransformCollectionName";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
-import { Collections } from "metabase/entities/collections";
import { PLUGIN_TENANTS } from "metabase/plugins";
-import { useSelector } from "metabase/redux";
import { Button, Icon, Input, type InputWrapperProps } from "metabase/ui";
import type { CollectionId, CollectionNamespace } from "metabase-types/api";
@@ -85,16 +84,12 @@ function FormCollectionPicker({
const [openCollectionId] = useState<CollectionId>("root");
- const openCollection = useSelector((state) =>
- Collections.selectors.getObject(state, {
- entityId: openCollectionId,
- }),
- );
+ const { data: openCollection } = useGetCollectionQuery({
+ id: openCollectionId,
+ });
- const selectedCollection = useSelector((state) =>
- Collections.selectors.getObject(state, {
- entityId: value,
- }),
+ const { data: selectedCollection } = useGetCollectionQuery(
+ value != null ? { id: value } : skipToken,
);
const [collectionNamespace, setCollectionNamespace] =
diff --git a/frontend/src/metabase/collections/hooks.ts b/frontend/src/metabase/collections/hooks.ts
index 2e47205f392..e9b40a93cf5 100644
--- a/frontend/src/metabase/collections/hooks.ts
+++ b/frontend/src/metabase/collections/hooks.ts
@@ -1,12 +1,11 @@
import type { Location } from "history";
import { useMemo } from "react";
-import { collectionApi } from "metabase/api";
+import { skipToken, useGetCollectionQuery } from "metabase/api";
import { ROOT_COLLECTION } from "metabase/entities/collections/constants";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
import { useSelector } from "metabase/redux";
-import type { State } from "metabase/redux/store";
-import { getUserPersonalCollectionId } from "metabase/selectors/user";
+import { getUser, getUserPersonalCollectionId } from "metabase/selectors/user";
import * as Urls from "metabase/urls/collections";
import type { Collection, CollectionId } from "metabase-types/api";
@@ -18,74 +17,41 @@ export type UseInitialCollectionIdProps = {
params?: { collectionId?: Collection["id"]; slug?: string };
};
-// Collections are loaded into two places during the entity-system → RTK migration:
-// the legacy `state.entities.collections` slice via `Collections.actions.fetch`,
-// `Collections.load` HOC, etc.) and the RTK Query cache (via `useGetCollectionQuery`).
-// We read from both so this hook works regardless of which path loaded the collection.
-//
-// TODO: Once collections are exclusively RTK-loaded, the entity-state branch can be dropped.
-function selectCollectionFromCache(
- state: State,
- id: Collection["id"],
-): Collection | undefined {
- const fromEntities = state.entities?.collections?.[id] as
- | Collection
- | undefined;
- if (fromEntities) {
- return fromEntities;
- }
- const queryState = collectionApi.endpoints.getCollection.select({ id })(
- state,
- );
- if (queryState?.status === "fulfilled") {
- return queryState.data as Collection | undefined;
- }
- return undefined;
-}
+const collectionIdParam = (id: Collection["id"] | undefined | null) =>
+ id != null ? { id } : skipToken;
// Picks the collection ID a "create new X" form should default to, given a set of route/prop hints.
-//
-// TODO: Once collections are exclusively RTK-loaded, this can become a wrapper around `useGetCollectionQuery`
-// with explicit loading states.
export function useInitialCollectionId({
collectionId,
location,
params,
}: UseInitialCollectionIdProps = {}): CollectionId | null {
- const fromCollectionId = useSelector((state) =>
- collectionId != null
- ? selectCollectionFromCache(state, collectionId)
- : undefined,
+ const { data: fromCollectionId } = useGetCollectionQuery(
+ collectionIdParam(collectionId),
);
-
- const fromNavParam = useSelector((state) =>
- params?.collectionId != null
- ? selectCollectionFromCache(state, params.collectionId)
- : undefined,
+ const { data: fromNavParam } = useGetCollectionQuery(
+ collectionIdParam(params?.collectionId),
);
const idFromSlug =
params?.slug && location && Urls.isCollectionPath(location.pathname)
? Urls.extractCollectionId(params.slug)
: undefined;
- const fromSlug = useSelector((state) =>
- idFromSlug != null
- ? selectCollectionFromCache(state, idFromSlug)
- : undefined,
+ const { data: fromSlug } = useGetCollectionQuery(
+ collectionIdParam(idFromSlug),
);
const idFromQuery = location?.query?.collectionId as
| Collection["id"]
| undefined;
- const fromQuery = useSelector((state) =>
- idFromQuery != null
- ? selectCollectionFromCache(state, idFromQuery)
- : undefined,
+ const { data: fromQuery } = useGetCollectionQuery(
+ collectionIdParam(idFromQuery),
);
const personalCollectionId = useSelector(getUserPersonalCollectionId);
- const rootCollection = useSelector((state) =>
- selectCollectionFromCache(state, ROOT_COLLECTION.id),
+ const isAuthenticated = useSelector(getUser) != null;
+ const { data: rootCollection } = useGetCollectionQuery(
+ isAuthenticated ? { id: ROOT_COLLECTION.id } : skipToken,
);
return useMemo(() => {
diff --git a/frontend/src/metabase/collections/hooks.unit.spec.tsx b/frontend/src/metabase/collections/hooks.unit.spec.tsx
index 87713542f79..eebcc5c0e01 100644
--- a/frontend/src/metabase/collections/hooks.unit.spec.tsx
+++ b/frontend/src/metabase/collections/hooks.unit.spec.tsx
@@ -49,17 +49,18 @@ const setup = ({
collections: Collection[];
hasRootAccess?: boolean;
}) => {
- setupCollectionByIdEndpoint({ collections });
+ const allCollections = [
+ createMockCollection({
+ id: "root",
+ name: "Our analytics",
+ can_write: hasRootAccess,
+ }),
+ ...collections,
+ ];
+ setupCollectionByIdEndpoint({ collections: allCollections });
const entitiesState = createMockEntitiesState({
- collections: [
- createMockCollection({
- id: "root",
- name: "Our analytics",
- can_write: hasRootAccess,
- }),
- ...collections,
- ],
+ collections: allCollections,
});
const state = createMockState({ currentUser: user, entities: entitiesState });
diff --git a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsx b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsx
index 5943568d423..1c652646d38 100644
--- a/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsx
+++ b/frontend/src/metabase/common/CreateDashboard/CreateDashboardModal.unit.spec.tsx
@@ -108,12 +108,12 @@ describe("CreateDashboardModal", () => {
jest.restoreAllMocks();
});
- it("displays empty form fields", () => {
+ it("displays empty form fields", async () => {
setup();
expect(screen.getByLabelText("Name")).toHaveValue("");
expect(screen.getByLabelText("Description")).toHaveValue("");
- expect(screen.getByText("Our analytics")).toBeInTheDocument();
+ expect(await screen.findByText("Our analytics")).toBeInTheDocument();
expect(screen.getByRole("button", { name: "Create" })).toBeInTheDocument();
});
diff --git a/frontend/src/metabase/common/components/CollectionName.tsx b/frontend/src/metabase/common/components/CollectionName.tsx
index 78b5cf25161..bdba770f8a7 100644
--- a/frontend/src/metabase/common/components/CollectionName.tsx
+++ b/frontend/src/metabase/common/components/CollectionName.tsx
@@ -1,5 +1,7 @@
-import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";
+import { useGetCollectionQuery } from "metabase/api";
+import { ROOT_COLLECTION } from "metabase/entities/collections";
import { useTranslateContent } from "metabase/i18n/hooks";
+import { getName } from "metabase/utils/name";
import type { CollectionId } from "metabase-types/api";
interface CollectionNameProps {
@@ -11,9 +13,18 @@ export const CollectionName = ({ id }: CollectionNameProps) => {
if (id === "root" || id === null) {
return <span>{tc(ROOT_COLLECTION.name)}</span>;
- } else if (id === undefined || (typeof id === "number" && isNaN(id))) {
+ }
+ if (id === undefined || (typeof id === "number" && isNaN(id))) {
+ return null;
+ }
+ return <FetchedCollectionName id={id} />;
+};
+
+const FetchedCollectionName = ({ id }: { id: CollectionId }) => {
+ const tc = useTranslateContent();
+ const { data: collection } = useGetCollectionQuery({ id });
+ if (!collection) {
return null;
- } else {
- return <Collections.Name id={id} />;
}
+ return <span>{tc(getName(collection))}</span>;
};
diff --git a/frontend/src/metabase/common/components/SaveQuestionForm/context.unit.spec.tsx b/frontend/src/metabase/common/components/SaveQuestionForm/context.unit.spec.tsx
index 0cbde9c76c4..98d750285cf 100644
--- a/frontend/src/metabase/common/components/SaveQuestionForm/context.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/SaveQuestionForm/context.unit.spec.tsx
@@ -62,6 +62,9 @@ const setup = ({
const onSave = jest.fn();
setupAuditInfoEndpoint();
+ setupCollectionByIdEndpoint({
+ collections: [createMockCollection({ id: "root", can_write: true })],
+ });
const settings = mockSettings({
"token-features": createMockTokenFeatures({
diff --git a/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.tsx b/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.tsx
index 1ca3629a4eb..c8b74e5cf30 100644
--- a/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.tsx
+++ b/frontend/src/metabase/dashboard/components/AddCardSidebar/AddCardSidebar.tsx
@@ -7,15 +7,15 @@ import type { CardId } from "metabase-types/api";
import { QuestionPicker } from "../QuestionPicker";
export function AddCardSidebar() {
- const { dashboard, selectedTabId, addCardToDashboard, closeSidebar } =
+ const { dashboard, selectedTabId, addCardToDashboard } =
useDashboardContext();
const handleAddCard = useCallback(
- (cardId: CardId) => {
+ (cardId: string | number) => {
if (dashboard) {
addCardToDashboard({
dashId: dashboard.id,
- cardId: cardId,
+ cardId: cardId as CardId,
tabId: selectedTabId,
});
}
@@ -25,7 +25,7 @@ export function AddCardSidebar() {
return (
<Sidebar data-testid="add-card-sidebar">
- <QuestionPicker onSelect={handleAddCard} onClose={closeSidebar} />
+ <QuestionPicker onSelect={handleAddCard} />
</Sidebar>
);
}
diff --git a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx
index 56884efbc14..5307dfc7b78 100644
--- a/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx
+++ b/frontend/src/metabase/dashboard/components/QuestionPicker/QuestionPicker.tsx
@@ -1,7 +1,7 @@
-import { useState } from "react";
+import { useMemo, useState } from "react";
import { t } from "ttag";
-import _ from "underscore";
+import { useListCollectionsQuery } from "metabase/api";
import { isPublicCollection } from "metabase/collections/utils";
import { Breadcrumbs } from "metabase/common/components/Breadcrumbs";
import { Input } from "metabase/common/components/Input";
@@ -12,13 +12,17 @@ import { getCollectionBreadCrumbs } from "metabase/common/utils/collections";
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 {
+ ROOT_COLLECTION,
+ getExpandedCollectionsById,
+} from "metabase/entities/collections";
import { useGetIcon } from "metabase/hooks/use-icon";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
-import { connect, useDispatch, useSelector } from "metabase/redux";
+import { useDispatch, useSelector } from "metabase/redux";
import {
canUserCreateNativeQueries,
canUserCreateQueries,
+ getUserPersonalCollectionId,
} from "metabase/selectors/user";
import { Button, Flex, Icon } from "metabase/ui";
import { SEARCH_DEBOUNCE_DURATION } from "metabase/utils/constants";
@@ -33,15 +37,21 @@ import {
useCollectionsWithTenants,
} from "./hooks/use-collections-with-tenants";
-interface QuestionPickerInnerProps {
+interface QuestionPickerProps {
onSelect: BaseSelectListItemProps["onSelect"];
- collectionsById: Record<CollectionId, Collection>;
}
-function QuestionPickerInner({
- onSelect,
- collectionsById: baseCollectionsById,
-}: QuestionPickerInnerProps) {
+export function QuestionPicker({ onSelect }: QuestionPickerProps) {
+ const { data: allCollectionsList = [] } = useListCollectionsQuery();
+ const userPersonalCollectionId = useSelector(getUserPersonalCollectionId);
+ const baseCollectionsById = useMemo(
+ () =>
+ getExpandedCollectionsById(
+ allCollectionsList,
+ userPersonalCollectionId,
+ ) as Record<CollectionId, Collection>,
+ [allCollectionsList, userPersonalCollectionId],
+ );
const getIcon = useGetIcon();
const dispatch = useDispatch();
const dashboard = useSelector(getDashboard);
@@ -169,20 +179,3 @@ function QuestionPickerInner({
</div>
);
}
-
-export const QuestionPicker = _.compose(
- Collections.load({
- id: () => "root",
- entityType: "collections",
- loadingAndErrorWrapper: false,
- }),
- Collections.loadList({
- entityType: "collections",
- loadingAndErrorWrapper: false,
- }),
- connect((state, props: { entity: any /* collection entity instance */ }) => ({
- collectionsById: (
- props.entity || Collections
- ).selectors.getExpandedCollectionsById(state),
- })),
-)(QuestionPickerInner);
diff --git a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx
index db8a40e38e0..d3f49857eba 100644
--- a/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx
+++ b/frontend/src/metabase/dashboard/containers/ArchiveDashboardModal.tsx
@@ -5,7 +5,6 @@ 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 { useDispatch } from "metabase/redux";
import * as Urls from "metabase/urls";
@@ -62,10 +61,5 @@ export const ArchiveDashboardModalConnected = _.compose(
id: (_state: unknown, props: WithRouterProps) =>
Urls.extractCollectionId(props.params?.slug),
}),
- Collections.load({
- id: (_state: unknown, props: { dashboard?: Dashboard }) =>
- props.dashboard?.collection_id,
- loadingAndErrorWrapper: false,
- }),
withRouter,
)(ArchiveDashboardModal);
diff --git a/frontend/src/metabase/entities/collections/collections.ts b/frontend/src/metabase/entities/collections/collections.ts
deleted file mode 100644
index 9fef6690f5f..00000000000
--- a/frontend/src/metabase/entities/collections/collections.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { createSelector } from "@reduxjs/toolkit";
-import { t } from "ttag";
-import _ from "underscore";
-
-import {
- collectionApi,
- skipToken,
- useGetCollectionQuery,
- useListCollectionsQuery,
- useListCollectionsTreeQuery,
-} from "metabase/api";
-import type { Dispatch, GetState, ReduxAction } from "metabase/redux/store";
-import { CollectionSchema } from "metabase/schema";
-import { getUserPersonalCollectionId } from "metabase/selectors/user";
-import type {
- Collection,
- CreateCollectionRequest,
- DeleteCollectionRequest,
- ListCollectionsRequest,
- ListCollectionsTreeRequest,
- UpdateCollectionRequest,
-} from "metabase-types/api";
-
-import { createEntity, entityCompatibleQuery } from "../utils";
-
-import getExpandedCollectionsById from "./getExpandedCollectionsById";
-import { getCollectionType } from "./utils";
-
-const listCollectionsTree = (
- entityQuery: ListCollectionsTreeRequest,
- dispatch: Dispatch,
-) =>
- entityCompatibleQuery(
- entityQuery,
- dispatch,
- collectionApi.endpoints.listCollectionsTree,
- );
-
-const listCollections = (
- entityQuery: ListCollectionsRequest,
- dispatch: Dispatch,
-) =>
- entityCompatibleQuery(
- entityQuery,
- dispatch,
- collectionApi.endpoints.listCollections,
- );
-
-type ListParams = {
- tree?: boolean;
-} & (ListCollectionsRequest | ListCollectionsTreeRequest);
-
-/**
- * @deprecated use "metabase/api" instead
- */
-export const Collections = createEntity({
- name: "collections",
- path: "/api/collection",
- schema: CollectionSchema,
-
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- displayNameOne: t`collection`,
- // eslint-disable-next-line ttag/no-module-declaration -- see metabase#55045
- displayNameMany: t`collections`,
-
- rtk: () => ({
- getUseGetQuery: () => ({
- useGetQuery: useGetCollectionQuery,
- }),
- useListQuery,
- }),
-
- api: {
- list: async (params: ListParams, dispatch: Dispatch) => {
- const { tree, ...entityQuery } = params;
- return tree
- ? listCollectionsTree(entityQuery, dispatch)
- : listCollections(entityQuery, dispatch);
- },
- get: (entityQuery: { id: number }, options: unknown, dispatch: Dispatch) =>
- entityCompatibleQuery(
- entityQuery,
- dispatch,
- collectionApi.endpoints.getCollection,
- ),
- create: (entityQuery: CreateCollectionRequest, dispatch: Dispatch) =>
- entityCompatibleQuery(
- entityQuery,
- dispatch,
- collectionApi.endpoints.createCollection,
- ),
- update: (entityQuery: UpdateCollectionRequest, dispatch: Dispatch) =>
- entityCompatibleQuery(
- entityQuery,
- dispatch,
- collectionApi.endpoints.updateCollection,
- ),
- delete: (entityQuery: DeleteCollectionRequest, dispatch: Dispatch) =>
- entityCompatibleQuery(
- entityQuery,
- dispatch,
- collectionApi.endpoints.deleteCollection,
- ),
- },
-
- selectors: {
- getExpandedCollectionsById: createSelector(
- [
- (state) => Collections.selectors.getList(state),
- getUserPersonalCollectionId,
- (_state, props) => props?.collectionFilter,
- ],
- (collections, currentUserPersonalCollectionId, collectionFilter) =>
- getExpandedCollectionsById(
- collections || [],
- currentUserPersonalCollectionId,
- collectionFilter,
- ),
- ),
- },
-
- getAnalyticsMetadata(
- [object]: [Collection],
- { action: _action }: { action: ReduxAction },
- getState: GetState,
- ) {
- const type = object && getCollectionType(object.parent_id, getState());
- return type && `collection=${type}`;
- },
-});
-
-function useListQuery(
- params: ListParams | undefined,
- options: Parameters<
- typeof useListCollectionsTreeQuery | typeof useListCollectionsQuery
- >[1],
-) {
- const collectionsTree = useListCollectionsTreeQuery(
- params?.tree ? _.omit(params, "tree") : skipToken,
- options,
- );
-
- const collections = useListCollectionsQuery(
- params?.tree ? skipToken : params,
- options,
- );
-
- return params?.tree ? collectionsTree : collections;
-}
-
-export { getExpandedCollectionsById, useListQuery };
diff --git a/frontend/src/metabase/entities/collections/index.ts b/frontend/src/metabase/entities/collections/index.ts
index ea84e411c12..6c27f4cae60 100644
--- a/frontend/src/metabase/entities/collections/index.ts
+++ b/frontend/src/metabase/entities/collections/index.ts
@@ -1,3 +1,3 @@
+export { default as getExpandedCollectionsById } from "./getExpandedCollectionsById";
export * from "./constants";
-export * from "./collections";
export * from "./utils";
diff --git a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts b/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts
index 3dae010e2a9..f6a605fe9d7 100644
--- a/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts
+++ b/frontend/src/metabase/entities/containers/rtk-query/types/entities.ts
@@ -37,7 +37,6 @@ export type ReloadIntervalSelector<Entity> = (
export type EntityType =
| "alerts"
| "bookmarks"
- | "collections"
| "dashboards"
| "databases"
| "documents"
diff --git a/frontend/src/metabase/entities/index.ts b/frontend/src/metabase/entities/index.ts
index 214220e69cc..0d9fb620b72 100644
--- a/frontend/src/metabase/entities/index.ts
+++ b/frontend/src/metabase/entities/index.ts
@@ -68,7 +68,6 @@
* )(BookContainer);
*/
-export { Collections as collections } from "./collections";
export { Dashboards as dashboards } from "./dashboards";
export { Questions as questions } from "./questions";
diff --git a/frontend/src/metabase/entities/utils.ts b/frontend/src/metabase/entities/utils.ts
index d659d94847b..4fba9a8df60 100644
--- a/frontend/src/metabase/entities/utils.ts
+++ b/frontend/src/metabase/entities/utils.ts
@@ -103,7 +103,6 @@ export type EntitySelectors = {
getFetched: EntitySelector;
getError: EntitySelector;
getListMetadata: EntitySelector;
- getExpandedCollectionsById: EntitySelector;
};
/** Shape returned by createEntity */
@@ -974,6 +973,7 @@ type CombinedEntities = {
* `query_metadata` response).
*/
const RETIRED_ENTITY_NAMES = [
+ "collections",
"measures",
"metrics",
"schemas",
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx
index 9adbd01984b..d883d115af1 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/AddDataModal/tests/setup.tsx
@@ -1,5 +1,6 @@
import { setupEnterpriseOnlyPlugin } from "__support__/enterprise";
import {
+ setupCollectionByIdEndpoint,
setupDatabaseListEndpoint,
setupGdriveGetFolderEndpoint,
setupGdrivePostFolderEndpoint,
@@ -101,6 +102,7 @@ export const setup = ({
setupTokenStatusEndpoint({ valid: true });
setupDatabaseListEndpoint(databases);
+ setupCollectionByIdEndpoint({ collections });
if (enableGoogleSheets) {
setupGdrivePostFolderEndpoint();
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
index 31c4279ff8d..a8be5a7cb5c 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbarContainer/MainNavbarContainer.tsx
@@ -18,7 +18,6 @@ import {
import { Modal } from "metabase/common/components/Modal";
import type { CollectionTreeItem } from "metabase/entities/collections";
import {
- Collections,
ROOT_COLLECTION,
buildCollectionTree,
getCollectionIcon,
@@ -60,7 +59,6 @@ interface Props extends MainNavbarProps {
currentUser: User;
databases: Database[];
selectedItems: SelectedItem[];
- rootCollection: Collection;
hasDataAccess: boolean;
allError: boolean;
allFetched: boolean;
@@ -76,7 +74,6 @@ function MainNavbarContainer({
selectedItems,
isOpen,
currentUser,
- rootCollection,
hasDataAccess,
location,
params,
@@ -94,6 +91,10 @@ function MainNavbarContainer({
const { data: bookmarks = [] } = useListBookmarksQuery();
const [reorderBookmarksMutation] = useReorderBookmarksMutation();
+ const { data: rootCollection } = useGetCollectionQuery({
+ id: ROOT_COLLECTION.id,
+ });
+
const {
data: trashCollection,
isLoading,
@@ -239,11 +240,6 @@ function MainNavbarContainer({
// eslint-disable-next-line import/no-default-export -- deprecated usage
export default _.compose(
- Collections.load({
- id: ROOT_COLLECTION.id,
- entityAlias: "rootCollection",
- loadingAndErrorWrapper: false,
- }),
Databases.loadList({
loadingAndErrorWrapper: false,
}),
diff --git a/frontend/src/metabase/palette/components/Palette.unit.spec.tsx b/frontend/src/metabase/palette/components/Palette.unit.spec.tsx
index a7630235765..6dd32d50631 100644
--- a/frontend/src/metabase/palette/components/Palette.unit.spec.tsx
+++ b/frontend/src/metabase/palette/components/Palette.unit.spec.tsx
@@ -3,6 +3,7 @@ import fetchMock from "fetch-mock";
import { Route } from "react-router";
import {
+ setupCollectionByIdEndpoint,
setupDatabasesEndpoints,
setupRecentViewsEndpoints,
setupSearchEndpoints,
@@ -11,6 +12,7 @@ import { renderWithProviders, screen } from "__support__/ui";
import { createMockState } from "metabase/redux/store/mocks";
import type { SearchResult } from "metabase-types/api";
import {
+ createMockCollection,
createMockSearchResult,
createMockUser,
} from "metabase-types/api/mocks";
@@ -29,6 +31,9 @@ const setup = ({
setupDatabasesEndpoints([]);
setupSearchEndpoints(searchResults, searchResultsDelay);
setupRecentViewsEndpoints([]);
+ setupCollectionByIdEndpoint({
+ collections: [createMockCollection({ id: "root", can_write: true })],
+ });
renderWithProviders(<Route path="/" component={Palette} {...routeProps} />, {
withKBar: true,
withRouter: true,
diff --git a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx
index 35051088247..22245667ee0 100644
--- a/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx
+++ b/frontend/src/metabase/palette/components/test/PaletteResults/setup.tsx
@@ -5,6 +5,7 @@ import _ from "underscore";
import { setupEnterprisePlugins } from "__support__/enterprise";
import {
+ setupCollectionByIdEndpoint,
setupDatabasesEndpoints,
setupRecentViewsEndpoints,
setupSearchEndpoints,
@@ -134,6 +135,9 @@ export const commonSetup = ({
setupDatabasesEndpoints([DATABASE]);
setupSearchEndpoints([model_1, model_2, dashboard]);
setupRecentViewsEndpoints(recents);
+ setupCollectionByIdEndpoint({
+ collections: [createMockCollection({ id: "root", can_write: true })],
+ });
const adminState = isAdmin
? createMockAdminState({
app: createMockAdminAppState({
diff --git a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.unit.spec.tsx b/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.unit.spec.tsx
index 23154b810fc..4a0a7714794 100644
--- a/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/components/template_tags/SnippetFormModal/SnippetFormModal.unit.spec.tsx
@@ -38,6 +38,11 @@ async function setup({
response: TOP_SNIPPETS_FOLDER,
});
+ fetchMock.get(
+ "path:/api/collection/root",
+ createMockCollection({ id: "root", name: "Our analytics" }),
+ );
+
if (withDefaultFoldersList) {
fetchMock.get({
url: "path:/api/collection",
diff --git a/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx b/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx
index 84535d193dc..67dfc88f455 100644
--- a/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx
+++ b/frontend/src/metabase/query_builder/containers/QueryBuilder.unsaved-changes-warning.unit.spec.tsx
@@ -23,7 +23,6 @@ import {
} from "metabase-types/api/mocks";
import {
- TEST_COLLECTION,
TEST_DB,
TEST_MODEL_CARD,
TEST_MODEL_CARD_SLUG,
@@ -554,7 +553,7 @@ describe("QueryBuilder - unsaved changes warning", () => {
within(saveQuestionModal).getByLabelText(
/Where do you want to save this/,
),
- ).toHaveTextContent(TEST_COLLECTION.name);
+ ).toHaveTextContent("Our analytics");
});
await userEvent.click(within(saveQuestionModal).getByText("Save"));
diff --git a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx
index 65d683aba1e..c858bbe9e91 100644
--- a/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx
+++ b/frontend/src/metabase/querying/common/components/DataSelector/saved-entity-picker/SavedEntityPicker.jsx
@@ -1,7 +1,10 @@
import PropTypes from "prop-types";
import { useCallback, useMemo, useState } from "react";
-import _ from "underscore";
+import {
+ useGetCollectionQuery,
+ useListCollectionsTreeQuery,
+} from "metabase/api";
import {
currentUserPersonalCollections,
isRootPersonalCollection,
@@ -11,11 +14,11 @@ import { Tree } from "metabase/common/components/tree";
import { findCollectionById } from "metabase/common/utils/collections";
import CS from "metabase/css/core/index.css";
import {
- Collections,
PERSONAL_COLLECTIONS,
buildCollectionTree,
} from "metabase/entities/collections";
-import { connect } from "metabase/redux";
+import { useSelector } from "metabase/redux";
+import { getUser } from "metabase/selectors/user";
import { Box, Icon } from "metabase/ui";
import { SavedEntityList } from "./SavedEntityList";
@@ -26,12 +29,9 @@ const propTypes = {
type: PropTypes.string,
onSelect: PropTypes.func.isRequired,
onBack: PropTypes.func.isRequired,
- collections: PropTypes.array.isRequired,
- currentUser: PropTypes.object.isRequired,
databaseId: PropTypes.string,
tableId: PropTypes.string,
collectionId: PropTypes.number,
- rootCollection: PropTypes.object,
};
const getOurAnalyticsCollection = (collectionEntity) => {
@@ -46,17 +46,35 @@ const ALL_PERSONAL_COLLECTIONS_ROOT = {
...PERSONAL_COLLECTIONS,
};
+export function SavedEntityPicker(props) {
+ const { data: collections } = useListCollectionsTreeQuery({
+ "exclude-archived": true,
+ });
+ const { data: rootCollection } = useGetCollectionQuery({ id: "root" });
+ if (!collections || !rootCollection) {
+ return null;
+ }
+ return (
+ <SavedEntityPickerInner
+ {...props}
+ collections={collections}
+ rootCollection={rootCollection}
+ />
+ );
+}
+
function SavedEntityPickerInner({
type,
onBack,
onSelect,
- collections,
- currentUser,
databaseId,
tableId,
collectionId,
+ collections,
rootCollection,
}) {
+ const currentUser = useSelector(getUser);
+
const collectionTree = useMemo(() => {
const modelFilter = (model) => CARD_INFO[type].model === model;
@@ -139,18 +157,9 @@ function SavedEntityPickerInner({
);
}
-SavedEntityPickerInner.propTypes = propTypes;
-
-const mapStateToProps = ({ currentUser }) => ({ currentUser });
-
-export const SavedEntityPicker = _.compose(
- Collections.load({
- id: () => "root",
- entityAlias: "rootCollection",
- loadingAndErrorWrapper: false,
- }),
- Collections.loadList({
- query: () => ({ tree: true, "exclude-archived": true }),
- }),
- connect(mapStateToProps),
-)(SavedEntityPickerInner);
+SavedEntityPicker.propTypes = propTypes;
+SavedEntityPickerInner.propTypes = {
+ ...propTypes,
+ collections: PropTypes.array.isRequired,
+ rootCollection: PropTypes.object.isRequired,
+};
diff --git a/frontend/src/metabase/questions/components/CollectionBadge.tsx b/frontend/src/metabase/questions/components/CollectionBadge.tsx
index 8f7dd8a167c..582a7a36377 100644
--- a/frontend/src/metabase/questions/components/CollectionBadge.tsx
+++ b/frontend/src/metabase/questions/components/CollectionBadge.tsx
@@ -1,11 +1,8 @@
-import type { ComponentType, PropsWithChildren } from "react";
-
+import { useGetCollectionQuery } from "metabase/api";
import { Badge } from "metabase/common/components/Badge";
-import { Collections } from "metabase/entities/collections";
import { useGetIcon } from "metabase/hooks/use-icon";
import { useTranslateContent } from "metabase/i18n/hooks";
import { PLUGIN_COLLECTIONS } from "metabase/plugins";
-import type { State } from "metabase/redux/store";
import { modelToUrl } from "metabase/urls/modelToUrl";
import { getName } from "metabase/utils/name";
import type {
@@ -22,7 +19,7 @@ const IRREGULAR_ICON_PROPS = {
targetOffsetX: IRREGULAR_ICON_WIDTH,
};
-type CollectionBadgeProps = {
+type CollectionBadgeInnerProps = {
className?: string;
collection: CollectionType;
isSingleLine?: boolean;
@@ -34,7 +31,7 @@ const CollectionBadgeInner = ({
collection,
isSingleLine,
onClick,
-}: CollectionBadgeProps) => {
+}: CollectionBadgeInnerProps) => {
const tc = useTranslateContent();
const getIcon = useGetIcon();
@@ -65,15 +62,22 @@ const CollectionBadgeInner = ({
);
};
-export const CollectionBadge = Collections.load({
- id: (state: State, props: { collectionId?: CollectionId }) =>
- props.collectionId || "root",
- wrapped: true,
- loadingAndErrorWrapper: false,
-})(CollectionBadgeInner) as ComponentType<
- PropsWithChildren<
- {
- collectionId?: CollectionId;
- } & Omit<CollectionBadgeProps, "collection">
- >
->;
+type CollectionBadgeProps = {
+ className?: string;
+ collectionId?: CollectionId;
+ isSingleLine?: boolean;
+ onClick?: () => void;
+};
+
+export const CollectionBadge = ({
+ collectionId,
+ ...rest
+}: CollectionBadgeProps) => {
+ const { data: collection } = useGetCollectionQuery({
+ id: collectionId || "root",
+ });
+ if (!collection) {
+ return null;
+ }
+ return <CollectionBadgeInner collection={collection} {...rest} />;
+};
diff --git a/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.unit.spec.tsx b/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.unit.spec.tsx
index 6d017214a1c..8bc75f453b8 100644
--- a/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.unit.spec.tsx
+++ b/frontend/src/metabase/questions/components/CopyCardForm/CopyCardForm.unit.spec.tsx
@@ -1,9 +1,14 @@
import userEvent from "@testing-library/user-event";
-import { setupDashboardEndpoints } from "__support__/server-mocks";
+import {
+ setupCollectionsEndpoints,
+ setupDashboardEndpoints,
+ setupGetCollectionEndpoint,
+} from "__support__/server-mocks";
import { renderWithProviders, screen } from "__support__/ui";
import type { CardType } from "metabase-types/api";
import {
+ createMockCollection,
createMockDashboard,
createMockDashboardTab,
} from "metabase-types/api/mocks";
@@ -30,7 +35,11 @@ function setup({ initialValues = {}, model = "question" }: SetupOpts = {}) {
const onSaved = jest.fn();
const onCancel = jest.fn();
+ const fooCollection = createMockCollection({ id: 1, name: "Foo Collection" });
+
setupDashboardEndpoints(FOO_DASH);
+ setupCollectionsEndpoints({ collections: [fooCollection] });
+ setupGetCollectionEndpoint(fooCollection);
renderWithProviders(
<CopyCardForm
diff --git a/frontend/src/metabase/redux/uploads.ts b/frontend/src/metabase/redux/uploads.ts
index 1574e4df9b4..8205b57a6b7 100644
--- a/frontend/src/metabase/redux/uploads.ts
+++ b/frontend/src/metabase/redux/uploads.ts
@@ -1,8 +1,8 @@
import { assocIn, dissocIn, updateIn } from "icepick";
import { t } from "ttag";
-import { cardApi } from "metabase/api";
-import { Collections } from "metabase/entities/collections";
+import { Api, cardApi } from "metabase/api";
+import { listTag } from "metabase/api/tags";
import { entityCompatibleQuery } from "metabase/entities/utils";
import type { Dispatch, State } from "metabase/redux/store";
import type { FileUploadState } from "metabase/redux/store/upload";
@@ -122,7 +122,12 @@ export const uploadFile = createThunkAction(
if (tableId && onUploadComplete) {
onUploadComplete();
} else if (collectionId) {
- dispatch(Collections.actions.invalidateLists());
+ dispatch(
+ Api.util.invalidateTags([
+ listTag("collection"),
+ listTag("collection-tree"),
+ ]),
+ );
}
clear();
diff --git a/frontend/src/metabase/selectors/metadata.ts b/frontend/src/metabase/selectors/metadata.ts
index 3513ca61aae..2a2a6e93ca9 100644
--- a/frontend/src/metabase/selectors/metadata.ts
+++ b/frontend/src/metabase/selectors/metadata.ts
@@ -16,12 +16,10 @@ import {
getRemappings,
} from "metabase-lib/v1/queries/utils/field";
import type {
- Collection as ApiCollection,
Table as ApiTable,
Card,
Measure,
Metric,
- NormalizedCollection,
NormalizedDatabase,
NormalizedField,
NormalizedForeignKey,
@@ -97,7 +95,6 @@ const getNormalizedMeasures = (state: State) => state.entities.measures ?? {};
const getNormalizedMetrics = (state: State) => state.entities.metrics ?? {};
const getNormalizedQuestions = (state: State) => state.entities.questions;
const getNormalizedSnippets = (state: State) => state.entities.snippets;
-const getNormalizedCollections = (state: State) => state.entities.collections;
export const getShallowDatabases = getNormalizedDatabases;
export const getShallowTables = getNormalizedTables;
@@ -118,7 +115,6 @@ export const getMetadata: (
getNormalizedMetrics,
getNormalizedQuestions,
getNormalizedSnippets,
- getNormalizedCollections,
getSettings,
],
(
@@ -131,7 +127,6 @@ export const getMetadata: (
metrics,
questions,
snippets,
- collections,
settings,
) => {
const metadata = new Metadata({ settings });
@@ -190,9 +185,6 @@ export const getMetadata: (
Object.values(metadata.measures).forEach((measure) => {
measure.table = hydrateMeasureTable(measure, tables);
});
- Object.values(metadata.metrics).forEach((metric) => {
- metric.collection = hydrateMetricCollection(metric, collections);
- });
Object.values(metadata.fields).forEach((field) => {
hydrateField(field, metadata);
});
@@ -449,18 +441,3 @@ function hydrateMeasureTable(
} = normalized;
return { ...rest, schema: schema_name ?? "" };
}
-
-function hydrateMetricCollection(
- metric: Metric,
- collections: Record<string, NormalizedCollection>,
-): ApiCollection | null {
- if (metric.collection_id == null) {
- return null;
- }
- const normalized = collections[metric.collection_id];
- if (!normalized) {
- return null;
- }
- const { items: _items, ...rest } = normalized;
- return rest;
-}
diff --git a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx
index 519d5581e8b..d2073f7d51a 100644
--- a/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/MoveEventModal/MoveEventModal.tsx
@@ -2,12 +2,11 @@ import { push } from "react-router-redux";
import {
skipToken,
+ useGetCollectionQuery,
useGetTimelineEventQuery,
useListTimelinesQuery,
} from "metabase/api";
-import { Collections } from "metabase/entities/collections";
import { useDispatch } from "metabase/redux";
-import type { State } from "metabase/redux/store";
import MoveEventModal, {
type MoveEventModalProps,
} from "metabase/timelines/common/components/MoveEventModal";
@@ -23,19 +22,17 @@ interface OwnProps {
onClose?: () => void;
}
-const collectionProps = {
- id: (state: State, props: OwnProps) =>
- Urls.extractCollectionId(props.params.slug),
- LoadingAndErrorWrapper,
-};
-
-type ContainerProps = Omit<MoveEventModalProps, "event" | "onSubmit"> &
+type ContainerProps = Omit<
+ MoveEventModalProps,
+ "event" | "timelines" | "collection" | "onSubmit"
+> &
OwnProps;
function MoveEventModalContainer({ params, ...props }: ContainerProps) {
const setTimeline = useSetTimeline();
const dispatch = useDispatch();
const eventId = Urls.extractEntityId(params.timelineEventId);
+ const collectionId = Urls.extractCollectionId(params.slug);
const {
data: event,
isLoading: isEventLoading,
@@ -46,6 +43,13 @@ function MoveEventModalContainer({ params, ...props }: ContainerProps) {
isLoading: isTimelinesLoading,
error: timelinesError,
} = useListTimelinesQuery({ include: "events" });
+ const {
+ data: collection,
+ isLoading: isCollectionLoading,
+ error: collectionError,
+ } = useGetCollectionQuery(
+ collectionId != null ? { id: collectionId } : skipToken,
+ );
const handleSubmit = async (
event: TimelineEvent,
@@ -60,8 +64,8 @@ function MoveEventModalContainer({ params, ...props }: ContainerProps) {
}
};
- const isLoading = isEventLoading || isTimelinesLoading;
- const error = eventError ?? timelinesError;
+ const isLoading = isEventLoading || isTimelinesLoading || isCollectionLoading;
+ const error = eventError ?? timelinesError ?? collectionError;
if (isLoading || error || !event) {
return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
@@ -72,10 +76,11 @@ function MoveEventModalContainer({ params, ...props }: ContainerProps) {
{...props}
event={event}
timelines={timelines}
+ collection={collection}
onSubmit={handleSubmit}
/>
);
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default Collections.load(collectionProps)(MoveEventModalContainer);
+export default MoveEventModalContainer;
diff --git a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx
index f56eec72faa..a5427e00797 100644
--- a/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/NewEventWithTimelineModal/NewEventWithTimelineModal.tsx
@@ -1,13 +1,13 @@
import { push } from "react-router-redux";
import {
+ skipToken,
useCreateTimelineEventMutation,
useCreateTimelineMutation,
+ useGetCollectionQuery,
} from "metabase/api";
import { getDefaultTimeline } from "metabase/common/utils/timelines";
-import { Collections } from "metabase/entities/collections";
import { useDispatch } from "metabase/redux";
-import type { State } from "metabase/redux/store";
import NewEventModal from "metabase/timelines/common/components/NewEventModal";
import * as Urls from "metabase/urls";
import type {
@@ -25,18 +25,20 @@ interface NewEventWithTimelineModalContainerProps {
onClose?: () => void;
}
-const collectionProps = {
- id: (state: State, props: NewEventWithTimelineModalContainerProps) =>
- Urls.extractCollectionId(props.params.slug),
- LoadingAndErrorWrapper,
-};
-
function NewEventWithTimelineModalContainer(
props: NewEventWithTimelineModalContainerProps,
) {
const dispatch = useDispatch();
const [createTimeline] = useCreateTimelineMutation();
const [createTimelineEvent] = useCreateTimelineEventMutation();
+ const collectionId = Urls.extractCollectionId(props.params.slug);
+ const {
+ data: collection,
+ isLoading,
+ error,
+ } = useGetCollectionQuery(
+ collectionId != null ? { id: collectionId } : skipToken,
+ );
const onSubmit = async (
values: Partial<TimelineEvent>,
@@ -55,10 +57,19 @@ function NewEventWithTimelineModalContainer(
dispatch(push(Urls.timelinesInCollection(collection)));
};
- return <NewEventModal {...props} source="collections" onSubmit={onSubmit} />;
+ if (isLoading || error || !collection) {
+ return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
+ }
+
+ return (
+ <NewEventModal
+ {...props}
+ source="collections"
+ collection={collection}
+ onSubmit={onSubmit}
+ />
+ );
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default Collections.load(collectionProps)(
- NewEventWithTimelineModalContainer,
-);
+export default NewEventWithTimelineModalContainer;
diff --git a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx
index fb9962d67fe..2b20da2aa46 100644
--- a/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/NewTimelineModal/NewTimelineModal.tsx
@@ -1,35 +1,34 @@
import { push } from "react-router-redux";
-import { useCreateTimelineMutation } from "metabase/api";
-import { Collections } from "metabase/entities/collections";
+import {
+ skipToken,
+ useCreateTimelineMutation,
+ useGetCollectionQuery,
+} from "metabase/api";
import { useDispatch } from "metabase/redux";
-import type { State } from "metabase/redux/store";
import NewTimelineModal from "metabase/timelines/common/components/NewTimelineModal";
import * as Urls from "metabase/urls";
-import type {
- Collection,
- CreateTimelineRequest,
- Timeline,
-} from "metabase-types/api";
+import type { CreateTimelineRequest, Timeline } from "metabase-types/api";
import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";
import type { ModalParams } from "../../types";
interface NewTimelineModalContainerProps {
params: ModalParams;
- collection: Collection;
onClose?: () => void;
}
-const collectionProps = {
- id: (state: State, props: NewTimelineModalContainerProps) =>
- Urls.extractCollectionId(props.params.slug),
- LoadingAndErrorWrapper,
-};
-
function NewTimelineModalContainer(props: NewTimelineModalContainerProps) {
const dispatch = useDispatch();
const [createTimeline] = useCreateTimelineMutation();
+ const collectionId = Urls.extractCollectionId(props.params.slug);
+ const {
+ data: collection,
+ isLoading,
+ error,
+ } = useGetCollectionQuery(
+ collectionId != null ? { id: collectionId } : skipToken,
+ );
const onSubmit = async (values: Partial<Timeline>) => {
const timeline = await createTimeline(
@@ -38,8 +37,14 @@ function NewTimelineModalContainer(props: NewTimelineModalContainerProps) {
dispatch(push(Urls.timelineInCollection(timeline)));
};
- return <NewTimelineModal {...props} onSubmit={onSubmit} />;
+ if (isLoading || error || !collection) {
+ return <LoadingAndErrorWrapper loading={isLoading} error={error} />;
+ }
+
+ return (
+ <NewTimelineModal {...props} collection={collection} onSubmit={onSubmit} />
+ );
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default Collections.load(collectionProps)(NewTimelineModalContainer);
+export default NewTimelineModalContainer;
diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx
index 1bcc3b82db3..8a631574b00 100644
--- a/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListArchiveModal/TimelineListArchiveModal.tsx
@@ -1,10 +1,12 @@
import { push } from "react-router-redux";
-import { skipToken, useListCollectionTimelinesQuery } from "metabase/api";
+import {
+ skipToken,
+ useGetCollectionQuery,
+ useListCollectionTimelinesQuery,
+} from "metabase/api";
import { useSetArchive } from "metabase/common/hooks";
-import { Collections } from "metabase/entities/collections";
import { useDispatch } from "metabase/redux";
-import type { State } from "metabase/redux/store";
import * as Urls from "metabase/urls";
import type { Collection, Timeline } from "metabase-types/api";
@@ -14,16 +16,9 @@ import type { ModalParams } from "../../types";
interface TimelineListArchiveModalContainerProps {
params: ModalParams;
- collection: Collection;
onClose?: () => void;
}
-const collectionProps = {
- id: (state: State, props: TimelineListArchiveModalContainerProps) =>
- Urls.extractCollectionId(props.params.slug),
- LoadingAndErrorWrapper,
-};
-
function TimelineListArchiveModalContainer({
params,
...props
@@ -33,15 +28,25 @@ function TimelineListArchiveModalContainer({
const collectionId = Urls.extractCollectionId(params.slug);
const {
data: timelines = [],
- isLoading,
- error,
+ isLoading: isTimelinesLoading,
+ error: timelinesError,
} = useListCollectionTimelinesQuery(
collectionId != null
? { id: collectionId, include: "events", archived: true }
: skipToken,
);
+ const {
+ data: collection,
+ isLoading: isCollectionLoading,
+ error: collectionError,
+ } = useGetCollectionQuery(
+ collectionId != null ? { id: collectionId } : skipToken,
+ );
+
+ const isLoading = isTimelinesLoading || isCollectionLoading;
+ const error = timelinesError ?? collectionError;
- if (isLoading || error) {
+ if (isLoading || error || !collection) {
return (
<LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />
);
@@ -57,6 +62,7 @@ function TimelineListArchiveModalContainer({
return (
<TimelineListModal
{...props}
+ collection={collection}
timelines={timelines}
isArchive
onUnarchive={onUnarchive}
@@ -66,6 +72,4 @@ function TimelineListArchiveModalContainer({
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default Collections.load(collectionProps)(
- TimelineListArchiveModalContainer,
-);
+export default TimelineListArchiveModalContainer;
diff --git a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx b/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx
index 009ab6f2ed7..49a2eb62369 100644
--- a/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx
+++ b/frontend/src/metabase/timelines/collections/containers/TimelineListModal/TimelineListModal.tsx
@@ -1,8 +1,9 @@
-import { skipToken, useListCollectionTimelinesQuery } from "metabase/api";
-import { Collections } from "metabase/entities/collections";
-import type { State } from "metabase/redux/store";
+import {
+ skipToken,
+ useGetCollectionQuery,
+ useListCollectionTimelinesQuery,
+} from "metabase/api";
import * as Urls from "metabase/urls";
-import type { Collection } from "metabase-types/api";
import LoadingAndErrorWrapper from "../../components/LoadingAndErrorWrapper";
import TimelineListModal from "../../components/TimelineListModal";
@@ -10,16 +11,9 @@ import type { ModalParams } from "../../types";
interface TimelineListModalContainerProps {
params: ModalParams;
- collection: Collection;
onClose?: () => void;
}
-const collectionProps = {
- id: (state: State, props: TimelineListModalContainerProps) =>
- Urls.extractCollectionId(props.params.slug),
- LoadingAndErrorWrapper,
-};
-
function TimelineListModalContainer({
params,
...props
@@ -27,20 +21,36 @@ function TimelineListModalContainer({
const collectionId = Urls.extractCollectionId(params.slug);
const {
data: timelines = [],
- isLoading,
- error,
+ isLoading: isTimelinesLoading,
+ error: timelinesError,
} = useListCollectionTimelinesQuery(
collectionId != null ? { id: collectionId, include: "events" } : skipToken,
);
+ const {
+ data: collection,
+ isLoading: isCollectionLoading,
+ error: collectionError,
+ } = useGetCollectionQuery(
+ collectionId != null ? { id: collectionId } : skipToken,
+ );
- if (isLoading || error) {
+ const isLoading = isTimelinesLoading || isCollectionLoading;
+ const error = timelinesError ?? collectionError;
+
+ if (isLoading || error || !collection) {
return (
<LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper />
);
}
- return <TimelineListModal {...props} timelines={timelines} />;
+ return (
+ <TimelineListModal
+ {...props}
+ collection={collection}
+ timelines={timelines}
+ />
+ );
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default Collections.load(collectionProps)(TimelineListModalContainer);
+export default TimelineListModalContainer;
diff --git a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx
index 58497368413..7904e86e7b1 100644
--- a/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx
+++ b/frontend/src/metabase/timelines/questions/containers/MoveEventModal/MoveEventModal.tsx
@@ -1,36 +1,35 @@
-import { useGetTimelineEventQuery, useListTimelinesQuery } from "metabase/api";
-import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";
-import type { State } from "metabase/redux/store";
+import {
+ useGetCollectionQuery,
+ useGetTimelineEventQuery,
+ useListTimelinesQuery,
+} from "metabase/api";
+import { ROOT_COLLECTION } from "metabase/entities/collections";
import MoveEventModal, {
type MoveEventModalProps,
} from "metabase/timelines/common/components/MoveEventModal";
import { useSetTimeline } from "metabase/timelines/common/hooks";
-import type { Timeline, TimelineEvent } from "metabase-types/api";
-
-interface OwnProps {
- eventId: number;
- collectionId?: number;
- onClose?: () => void;
-}
-
-const collectionProps = {
- id: (state: State, props: OwnProps) => {
- return props.collectionId ?? ROOT_COLLECTION.id;
- },
-};
+import type { CollectionId, Timeline, TimelineEvent } from "metabase-types/api";
type ContainerProps = Omit<
MoveEventModalProps,
- "event" | "timelines" | "onSubmit" | "onSubmitSuccess"
+ "event" | "timelines" | "collection" | "onSubmit" | "onSubmitSuccess"
> & {
eventId: number;
+ collectionId?: CollectionId | null;
onClose?: () => void;
};
-function MoveEventModalContainer({ eventId, ...props }: ContainerProps) {
+function MoveEventModalContainer({
+ eventId,
+ collectionId,
+ ...props
+}: ContainerProps) {
const setTimeline = useSetTimeline();
const { data: event } = useGetTimelineEventQuery(eventId);
const { data: timelines = [] } = useListTimelinesQuery({ include: "events" });
+ const { data: collection } = useGetCollectionQuery({
+ id: collectionId == null ? ROOT_COLLECTION.id : collectionId,
+ });
const handleSubmit = async (event: TimelineEvent, newTimeline?: Timeline) => {
if (newTimeline) {
await setTimeline(event, newTimeline);
@@ -46,6 +45,7 @@ function MoveEventModalContainer({ eventId, ...props }: ContainerProps) {
{...props}
event={event}
timelines={timelines}
+ collection={collection}
onSubmit={handleSubmit}
onSubmitSuccess={props.onClose}
/>
@@ -53,4 +53,4 @@ function MoveEventModalContainer({ eventId, ...props }: ContainerProps) {
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default Collections.load(collectionProps)(MoveEventModalContainer);
+export default MoveEventModalContainer;
diff --git a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx
index a2af967ded3..b92ae8dca05 100644
--- a/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx
+++ b/frontend/src/metabase/timelines/questions/containers/NewEventModal/NewEventModal.tsx
@@ -3,16 +3,17 @@ import { t } from "ttag";
import {
useCreateTimelineEventMutation,
useCreateTimelineMutation,
+ useGetCollectionQuery,
useListTimelinesQuery,
} from "metabase/api";
import { getDefaultTimeline } from "metabase/common/utils/timelines";
-import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";
+import { ROOT_COLLECTION } from "metabase/entities/collections";
import { useDispatch } from "metabase/redux";
-import type { State } from "metabase/redux/store";
import { addUndo } from "metabase/redux/undo";
import NewEventModal from "metabase/timelines/common/components/NewEventModal";
import type {
Collection,
+ CollectionId,
CreateTimelineEventRequest,
CreateTimelineRequest,
TimelineEvent,
@@ -20,25 +21,21 @@ import type {
interface NewEventModalContainerProps {
cardId?: number;
- collectionId?: number;
+ collectionId?: CollectionId | null;
onClose?: () => void;
- collection?: Collection;
}
-const collectionProps = {
- id: (state: State, props: NewEventModalContainerProps) => {
- return props.collectionId ?? ROOT_COLLECTION.id;
- },
-};
-
function NewEventModalContainer({
+ collectionId,
onClose,
- collection,
}: NewEventModalContainerProps) {
const dispatch = useDispatch();
const [createTimeline] = useCreateTimelineMutation();
const [createTimelineEvent] = useCreateTimelineEventMutation();
const { data: timelines = [] } = useListTimelinesQuery({ include: "events" });
+ const { data: collection } = useGetCollectionQuery({
+ id: collectionId == null ? ROOT_COLLECTION.id : collectionId,
+ });
const onSubmit = async (
values: Partial<TimelineEvent>,
@@ -70,4 +67,4 @@ function NewEventModalContainer({
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default Collections.load(collectionProps)(NewEventModalContainer);
+export default NewEventModalContainer;
diff --git a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx b/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx
index a7e98c79af2..cddc6895d98 100644
--- a/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx
+++ b/frontend/src/metabase/timelines/questions/containers/TimelinePanel/TimelinePanel.tsx
@@ -1,28 +1,45 @@
import type { ComponentProps } from "react";
+import { useGetCollectionQuery } from "metabase/api";
+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useSetArchive } from "metabase/common/hooks";
-import { Collections, ROOT_COLLECTION } from "metabase/entities/collections";
-import type { State } from "metabase/redux/store";
-import type { TimelineEvent } from "metabase-types/api";
+import { ROOT_COLLECTION } from "metabase/entities/collections";
+import type { CollectionId, TimelineEvent } from "metabase-types/api";
import TimelinePanel from "../../components/TimelinePanel";
-interface TimelinePanelProps {
- collectionId?: number;
-}
+type InnerProps = ComponentProps<typeof TimelinePanel>;
-const collectionProps = {
- id: (state: State, props: TimelinePanelProps) => {
- return props.collectionId ?? ROOT_COLLECTION.id;
- },
+type TimelinePanelContainerProps = Omit<InnerProps, "collection"> & {
+ collectionId?: CollectionId | null;
};
-function TimelinePanelContainer(props: ComponentProps<typeof TimelinePanel>) {
+function TimelinePanelContainer({
+ collectionId,
+ ...props
+}: TimelinePanelContainerProps) {
const archive = useSetArchive();
+ const {
+ data: collection,
+ isLoading,
+ error,
+ } = useGetCollectionQuery({
+ id: collectionId == null ? ROOT_COLLECTION.id : collectionId,
+ });
const onArchiveEvent = (event: TimelineEvent) =>
archive({ id: event.id, model: "timeline-event" }, true);
- return <TimelinePanel {...props} onArchiveEvent={onArchiveEvent} />;
+ return (
+ <LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper>
+ {collection ? (
+ <TimelinePanel
+ {...props}
+ collection={collection}
+ onArchiveEvent={onArchiveEvent}
+ />
+ ) : null}
+ </LoadingAndErrorWrapper>
+ );
}
// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default Collections.load(collectionProps)(TimelinePanelContainer);
+export default TimelinePanelContainer;