The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
edit & archive transforms collections (#67170)
Aleksandr Lesnenko373cf5db5868
diff --git a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts b/e2e/test/scenarios/data-studio/transforms.cy.spec.tsindex facca52fd10..bf755a0454e 100644--- a/e2e/test/scenarios/data-studio/transforms.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/transforms.cy.spec.ts@@ -458,7 +458,7 @@ LIMITcy.button("Save").click();cy.wait("@createTransform");});- H.undoToast()+ H.modal().findByText("A table with that name already exists.").should("be.visible");});@@ -1906,6 +1906,89 @@ LIMIT"Alpha Transform",]);});++ it("should edit collection details", () => {+ H.createTransformCollection({ name: "Original Name" });+ H.createTransformCollection({ name: "Target Parent" });++ visitTransformListPage();++ cy.log("open edit modal via collection menu");+ getTransformsList()+ .findByText("Original Name")+ .closest('[role="row"]')+ .findByRole("button", { name: "Collection menu" })+ .click();++ H.popover().findByText("Edit collection details").click();++ cy.log("edit name and description");+ H.modal().within(() => {+ cy.findByText("Editing Original Name").should("be.visible");+ cy.findByLabelText("Name").clear().type("Renamed Collection");+ cy.findByLabelText("Description").type("A helpful description");+ cy.findByTestId("collection-picker-button").click();+ });++ cy.log("change parent collection");+ cy.findByRole("dialog", { name: "Select a collection" }).within(() => {+ cy.findByText("Target Parent").click();+ cy.findByRole("button", { name: "Select" }).click();+ });++ H.modal().button("Save").click();++ cy.log("verify collection was renamed and moved");+ getTransformsList().within(() => {+ cy.findByText("Original Name").should("not.exist");+ cy.findByText("Target Parent").click();+ cy.findByText("Renamed Collection").should("be.visible");+ });+ });++ it("should archive a collection with transforms", () => {+ H.createTransformCollection({ name: "Archive Me" }).then((collection) => {+ createMbqlTransform({+ name: "Transform In Collection",+ targetTable: "archived_transform_table",+ collectionId: collection.body.id,+ });+ });++ visitTransformListPage();++ getTransformsList().within(() => {+ cy.findByText("Archive Me").should("be.visible");+ cy.findByText("Archive Me").click();+ cy.findByText("Transform In Collection").should("be.visible");+ });++ cy.log("archive the collection via menu");+ getTransformsList()+ .findByText("Archive Me")+ .closest('[role="row"]')+ .findByRole("button", { name: "Collection menu" })+ .click();++ H.popover().findByText("Archive").click();++ H.modal().within(() => {+ cy.findByText('Archive "Archive Me"?').should("be.visible");+ cy.findByText("This will also archive 1 transform inside it.").should(+ "be.visible",+ );+ cy.button("Archive").click();+ });++ H.undoToast().findByText("Collection archived").should("be.visible");++ cy.log("verify collection and its children are no longer visible");+ getTransformsList().within(() => {+ cy.findByText("Archive Me").should("not.exist");+ cy.findByText("Transform In Collection").should("not.exist");+ cy.findByText("No transforms yet").should("be.visible");+ });+ });});});diff --git a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsxindex 5a4c054d308..bea6fc397aa 100644--- a/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx+++ b/enterprise/frontend/src/metabase-enterprise/snippets/components/SnippetCollectionForm.tsx@@ -11,6 +11,7 @@ import FormInput from "metabase/common/components/FormInput";import FormSubmitButton from "metabase/common/components/FormSubmitButton";import FormTextArea from "metabase/common/components/FormTextArea";import type { CollectionPickerItem } from "metabase/common/components/Pickers/CollectionPicker";+import { isItemInCollectionOrItsDescendants } from "metabase/common/components/Pickers/utils";import { SnippetCollections } from "metabase/entities/snippet-collections";import { Form, FormProvider } from "metabase/forms";import * as Errors from "metabase/lib/errors";@@ -109,18 +110,8 @@ function SnippetCollectionForm({);const shouldDisableItem = useCallback(- (item: CollectionPickerItem) => {- if (passedCollection.id === undefined) {- return false;- } else {- return (- item.effective_location- ?.split("/")- .includes(String(passedCollection.id)) ||- passedCollection.id === item.id- );- }- },+ (item: CollectionPickerItem) =>+ isItemInCollectionOrItsDescendants(item, passedCollection.id),[passedCollection.id],);diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformFolderModal/CreateTransformFolderModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsxsimilarity index 72%rename from enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformFolderModal/CreateTransformFolderModal.tsxrename to enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsxindex f1b7048389d..0617e494969 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformFolderModal/CreateTransformFolderModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformCollectionModal/CreateTransformCollectionModal.tsx@@ -1,10 +1,13 @@import { useCallback, useMemo } from "react";import { t } from "ttag";-import * as Yup from "yup";import { useCreateCollectionMutation } from "metabase/api";import { getErrorMessage } from "metabase/api/utils";import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";+import {+ COLLECTION_FORM_SCHEMA,+ type CollectionFormValues,+} from "metabase/collections/schemas";import { useToast } from "metabase/common/hooks";import {Form,@@ -12,35 +15,25 @@ import {FormProvider,FormSubmitButton,FormTextInput,+ FormTextarea,} from "metabase/forms";-import * as Errors from "metabase/lib/errors";import { Button, Group, Modal, Stack } from "metabase/ui";import type { Collection } from "metabase-types/api";-const COLLECTION_SCHEMA = Yup.object({- name: Yup.string()- .required(Errors.required)- .max(100, Errors.maxLength)- .default(""),- parent_id: Yup.number().nullable().default(null),-});--type CollectionFormValues = Yup.InferType<typeof COLLECTION_SCHEMA>;--type CreateTransformFolderModalProps = {+type CreateTransformCollectionModalProps = {onClose: () => void;onCreate?: (collection: Collection) => void;};-export function CreateTransformFolderModal({+export function CreateTransformCollectionModal({onClose,onCreate,-}: CreateTransformFolderModalProps) {+}: CreateTransformCollectionModalProps) {const [sendToast] = useToast();const [createCollection] = useCreateCollectionMutation();const initialValues = useMemo<CollectionFormValues>(- () => COLLECTION_SCHEMA.getDefault(),+ () => COLLECTION_FORM_SCHEMA.getDefault(),[],);@@ -49,6 +42,7 @@ export function CreateTransformFolderModal({try {const collection = await createCollection({name: values.name,+ description: values.description ?? undefined,parent_id: values.parent_id,namespace: "transforms",}).unwrap();@@ -64,11 +58,22 @@ export function CreateTransformFolderModal({[createCollection, onCreate, onClose, sendToast],);+ const stopPropagation = useCallback(+ (e: React.KeyboardEvent) => e.stopPropagation(),+ [],+ );+return (- <Modal title={t`New collection`} opened onClose={onClose} padding="xl">+ <Modal+ title={t`New collection`}+ opened+ onClose={onClose}+ padding="xl"+ onKeyDown={stopPropagation}+ ><FormProviderinitialValues={initialValues}- validationSchema={COLLECTION_SCHEMA}+ validationSchema={COLLECTION_FORM_SCHEMA}onSubmit={handleSubmit}><Form>@@ -79,6 +84,12 @@ export function CreateTransformFolderModal({placeholder={t`My collection`}data-autofocus/>+ <FormTextarea+ name="description"+ label={t`Description`}+ placeholder={t`Add a description`}+ nullable+ /><FormCollectionPickername="parent_id"title={t`Parent collection`}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformCollectionModal/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformCollectionModal/index.tsnew file mode 100644index 00000000000..a356bb5808d--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformCollectionModal/index.ts@@ -0,0 +1 @@+export { CreateTransformCollectionModal } from "./CreateTransformCollectionModal";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformFolderModal/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformFolderModal/index.tsdeleted file mode 100644index 96896e0fe90..00000000000--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformFolderModal/index.ts+++ /dev/null@@ -1 +0,0 @@-export { CreateTransformFolderModal } from "./CreateTransformFolderModal";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsxindex 500b416aedd..a078fdf89e4 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/CreateTransformMenu/CreateTransformMenu.tsx@@ -10,7 +10,7 @@ import { PLUGIN_TRANSFORMS_PYTHON } from "metabase/plugins";import { Button, Center, Icon, Loader, Menu, Tooltip } from "metabase/ui";import { trackTransformCreate } from "../../analytics";-import { CreateTransformFolderModal } from "../CreateTransformFolderModal";+import { CreateTransformCollectionModal } from "../CreateTransformCollectionModal";import { shouldDisableItem } from "./utils";@@ -19,8 +19,8 @@ export const CreateTransformMenu = () => {const [isPickerOpened, { open: openPicker, close: closePicker }] =useDisclosure();const [- isFolderModalOpened,- { open: openFolderModal, close: closeFolderModal },+ isCollectionModalOpened,+ { open: openCollectionModal, close: closeCollectionModal },] = useDisclosure();const { data: databases, isLoading } = useListDatabasesQuery({@@ -87,7 +87,7 @@ export const CreateTransformMenu = () => {<Menu.Divider /><Menu.ItemleftSection={<Icon name="folder" />}- onClick={openFolderModal}+ onClick={openCollectionModal}>{t`New collection`}</Menu.Item>@@ -111,8 +111,8 @@ export const CreateTransformMenu = () => {/>)}- {isFolderModalOpened && (- <CreateTransformFolderModal onClose={closeFolderModal} />+ {isCollectionModalOpened && (+ <CreateTransformCollectionModal onClose={closeCollectionModal} />)}</>);diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/EditTransformCollectionModal/EditTransformCollectionModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/components/EditTransformCollectionModal/EditTransformCollectionModal.tsxnew file mode 100644index 00000000000..193270b4aa6--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/EditTransformCollectionModal/EditTransformCollectionModal.tsx@@ -0,0 +1,161 @@+import { useCallback, useMemo } from "react";+import { t } from "ttag";++import {+ useGetCollectionQuery,+ useUpdateCollectionMutation,+} from "metabase/api";+import { getErrorMessage } from "metabase/api/utils";+import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";+import {+ COLLECTION_FORM_SCHEMA,+ type CollectionFormValues,+} from "metabase/collections/schemas";+import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";+import type { CollectionPickerItem } from "metabase/common/components/Pickers/CollectionPicker";+import { isItemInCollectionOrItsDescendants } from "metabase/common/components/Pickers/utils";+import { useToast } from "metabase/common/hooks";+import {+ Form,+ FormErrorMessage,+ FormProvider,+ FormSubmitButton,+ FormTextInput,+ FormTextarea,+} from "metabase/forms";+import { Button, Group, Modal, Stack } from "metabase/ui";++type EditTransformCollectionModalProps = {+ collectionId: number;+ onClose: () => void;+ onSave?: () => void;+};++export function EditTransformCollectionModal({+ collectionId,+ onClose,+ onSave,+}: EditTransformCollectionModalProps) {+ const [sendToast] = useToast();+ const [updateCollection] = useUpdateCollectionMutation();++ const {+ data: collection,+ isLoading,+ error,+ } = useGetCollectionQuery({+ id: collectionId,+ namespace: "transforms",+ });++ const initialValues = useMemo<CollectionFormValues>(() => {+ if (!collection) {+ return COLLECTION_FORM_SCHEMA.getDefault();+ }+ const parentId = collection.parent_id;+ return {+ name: collection.name ?? "",+ description: collection.description ?? null,+ parent_id: typeof parentId === "number" ? parentId : null,+ };+ }, [collection]);++ const handleSubmit = useCallback(+ async (values: CollectionFormValues) => {+ try {+ await updateCollection({+ id: collectionId,+ name: values.name,+ description: values.description ?? undefined,+ parent_id: values.parent_id,+ }).unwrap();+ onSave?.();+ onClose();+ } catch (err) {+ sendToast({+ message: getErrorMessage(err, t`Failed to update collection`),+ icon: "warning",+ });+ }+ },+ [collectionId, updateCollection, onSave, onClose, sendToast],+ );++ const shouldDisableItem = useCallback(+ (item: CollectionPickerItem) =>+ isItemInCollectionOrItsDescendants(item, collectionId),+ [collectionId],+ );++ const stopPropagation = useCallback(+ (e: React.KeyboardEvent) => e.stopPropagation(),+ [],+ );++ if (isLoading || error) {+ return (+ <Modal+ title={t`Edit collection`}+ opened+ onClose={onClose}+ padding="xl"+ onKeyDown={stopPropagation}+ >+ <LoadingAndErrorWrapper loading={isLoading} error={error} />+ </Modal>+ );+ }++ return (+ <Modal+ title={t`Editing ${collection?.name}`}+ opened+ onClose={onClose}+ padding="xl"+ onKeyDown={stopPropagation}+ >+ <FormProvider+ initialValues={initialValues}+ validationSchema={COLLECTION_FORM_SCHEMA}+ onSubmit={handleSubmit}+ enableReinitialize+ >+ {({ dirty }) => (+ <Form>+ <Stack gap="lg" mt="sm">+ <FormTextInput+ name="name"+ label={t`Name`}+ placeholder={t`My collection`}+ data-autofocus+ />+ <FormTextarea+ name="description"+ label={t`Description`}+ placeholder={t`Add a description`}+ nullable+ />+ <FormCollectionPicker+ name="parent_id"+ title={t`Parent collection`}+ type="transform-collections"+ collectionPickerModalProps={{+ shouldDisableItem,+ }}+ />+ <Group justify="flex-end">+ <FormErrorMessage />+ <Button onClick={onClose}>{t`Cancel`}</Button>+ <FormSubmitButton+ label={t`Save`}+ variant="filled"+ disabled={!dirty}+ />+ </Group>+ </Stack>+ </Form>+ )}+ </FormProvider>+ </Modal>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/components/EditTransformCollectionModal/index.ts b/enterprise/frontend/src/metabase-enterprise/transforms/components/EditTransformCollectionModal/index.tsnew file mode 100644index 00000000000..a03442a23ca--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/components/EditTransformCollectionModal/index.ts@@ -0,0 +1 @@+export { EditTransformCollectionModal } from "./EditTransformCollectionModal";diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsxindex 193f1dee37d..0d25a5a1a70 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/NewTransformPage/CreateTransformModal/CreateTransformModal.tsx@@ -8,10 +8,8 @@ import {useGetDatabaseQuery,useListDatabaseSchemasQuery,} from "metabase/api";-import { getErrorMessage } from "metabase/api/utils";import FormCollectionPicker from "metabase/collections/containers/FormCollectionPicker";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";-import { useToast } from "metabase/common/hooks";import {Form,FormErrorMessage,@@ -93,7 +91,6 @@ function CreateTransformForm({onCreate,onClose,}: CreateTransformFormProps) {- const [sendToast] = useToast();const databaseId =source.type === "query" ? source.query.database : source["source-database"];@@ -133,16 +130,9 @@ function CreateTransformForm({throw new Error("Database ID is required");}const request = getCreateRequest(source, values, databaseId);- try {- const transform = await createTransform(request).unwrap();- trackTransformCreated({ transformId: transform.id });- onCreate(transform);- } catch (error) {- sendToast({- message: getErrorMessage(error, t`Failed to create transform`),- icon: "warning",- });- }+ const transform = await createTransform(request).unwrap();+ trackTransformCreated({ transformId: transform.id });+ onCreate(transform);};return (@@ -169,6 +159,7 @@ function CreateTransformForm({<TargetNameInput /><FormCollectionPickername="collection_id"+ title={t`Collection`}type="transform-collections"/><IncrementalTransformSettings source={source} />@@ -176,7 +167,7 @@ function CreateTransformForm({<Box flex={1}><FormErrorMessage /></Box>- <Button variant="subtle" onClick={onClose}>{t`Back`}</Button>+ <Button onClick={onClose}>{t`Back`}</Button><FormSubmitButton label={t`Save`} variant="filled" /></Group></Stack>diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CollectionRowMenu.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CollectionRowMenu.tsxnew file mode 100644index 00000000000..663dd5f134f--- /dev/null+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/CollectionRowMenu.tsx@@ -0,0 +1,98 @@+import { useState } from "react";+import { msgid, ngettext, t } from "ttag";++import { useUpdateCollectionMutation } from "metabase/api";+import { useConfirmation } from "metabase/common/hooks/use-confirmation";+import { useDispatch } from "metabase/lib/redux";+import { addUndo } from "metabase/redux/undo";+import { ActionIcon, Box, Icon, Menu } from "metabase/ui";+import { EditTransformCollectionModal } from "metabase-enterprise/transforms/components/EditTransformCollectionModal";++type CollectionRowMenuProps = {+ collectionId: number;+ collectionName: string;+ transformCount: number;+};++export function CollectionRowMenu({+ collectionId,+ collectionName,+ transformCount,+}: CollectionRowMenuProps) {+ const dispatch = useDispatch();+ const [updateCollection] = useUpdateCollectionMutation();+ const { show, modalContent } = useConfirmation();+ const [isEditModalOpen, setIsEditModalOpen] = useState(false);++ const handleArchive = async () => {+ try {+ await updateCollection({ id: collectionId, archived: true }).unwrap();+ dispatch(+ addUndo({+ message: t`Collection archived`,+ action: async () => {+ await updateCollection({ id: collectionId, archived: false });+ },+ }),+ );+ } catch {+ dispatch(+ addUndo({+ message: t`Failed to archive collection`,+ icon: "warning",+ }),+ );+ }+ };++ const handleArchiveClick = () => {+ const message =+ transformCount > 0+ ? ngettext(+ msgid`This will also archive ${transformCount} transform inside it.`,+ `This will also archive ${transformCount} transforms inside it.`,+ transformCount,+ )+ : t`Are you sure you want to archive this collection?`;++ show({+ title: t`Archive "${collectionName}"?`,+ message,+ confirmButtonText: t`Archive`,+ onConfirm: handleArchive,+ });+ };++ return (+ <Box onClick={(e) => e.stopPropagation()}>+ <Menu position="bottom-end">+ <Menu.Target>+ <ActionIcon size="sm" aria-label={t`Collection menu`}>+ <Icon name="ellipsis" />+ </ActionIcon>+ </Menu.Target>+ <Menu.Dropdown>+ <Menu.Item+ leftSection={<Icon name="pencil" />}+ onClick={() => setIsEditModalOpen(true)}+ >+ {t`Edit collection details`}+ </Menu.Item>+ <Menu.Item+ leftSection={<Icon name="archive" />}+ onClick={handleArchiveClick}+ >+ {t`Archive`}+ </Menu.Item>+ </Menu.Dropdown>+ </Menu>+ {modalContent}+ {isEditModalOpen && (+ <EditTransformCollectionModal+ collectionId={collectionId}+ onClose={() => setIsEditModalOpen(false)}+ />+ )}+ </Box>+ );+}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsxindex e62de87b1cf..4de98bb8d5d 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/TransformListPage.tsx@@ -34,13 +34,26 @@ import { CreateTransformMenu } from "metabase-enterprise/transforms/components/Cimport { ListEmptyState } from "metabase-enterprise/transforms/components/ListEmptyState";import { ListLoadingState } from "metabase-enterprise/transforms/components/ListLoadingState";-import { type TreeNode, getCollectionNodeId } from "./types";+import { CollectionRowMenu } from "./CollectionRowMenu";+import { type TreeNode, getCollectionNodeId, isCollectionNode } from "./types";import { buildTreeData, getDefaultExpandedIds } from "./utils";const getNodeId = (node: TreeNode) => node.id;const getSubRows = (node: TreeNode) => node.children;const isFilterable = (node: TreeNode) => node.nodeType === "transform";+const countTransforms = (node: TreeNode): number => {+ if (!node.children) {+ return 0;+ }+ return node.children.reduce((count, child) => {+ if (child.nodeType === "transform") {+ return count + 1;+ }+ return count + countTransforms(child);+ }, 0);+};+const globalFilterFn = (row: { original: TreeNode },_columnId: string,@@ -141,6 +154,20 @@ export const TransformListPage = ({ location }: WithRouterProps) => {<Ellipsified>{row.original.target.name}</Ellipsified>) : null,},+ {+ id: "actions",+ header: "",+ width: 48,+ enableSorting: false,+ cell: ({ row }) =>+ isCollectionNode(row.original) ? (+ <CollectionRowMenu+ collectionId={row.original.collectionId}+ collectionName={row.original.name}+ transformCount={countTransforms(row.original)}+ />+ ) : null,+ },],[],);diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/types.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/types.tsindex 98df2f3d6b3..f0a3782b932 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/types.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/types.ts@@ -12,8 +12,15 @@ export type TreeNode = {target?: Transform["target"];children?: TreeNode[];transformId?: number;+ collectionId?: number;};+export function isCollectionNode(+ node: TreeNode,+): node is TreeNode & { collectionId: number } {+ return node.nodeType === "folder" && typeof node.collectionId === "number";+}+export function getCollectionNodeId(collectionId: number): string {return `collection-${collectionId}`;}diff --git a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.tsindex bdac5ff02bb..118f000a4c6 100644--- a/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts+++ b/enterprise/frontend/src/metabase-enterprise/transforms/pages/TransformListPage/utils.ts@@ -36,6 +36,7 @@ export function buildTreeData(nodeType: "folder",icon: getCollectionIcon(collection).name,children: [...childFolders, ...childTransforms],+ collectionId: collection.id as number,};}diff --git a/frontend/src/metabase/collections/schemas.ts b/frontend/src/metabase/collections/schemas.tsnew file mode 100644index 00000000000..98a597a503f--- /dev/null+++ b/frontend/src/metabase/collections/schemas.ts@@ -0,0 +1,14 @@+import * as Yup from "yup";++import * as Errors from "metabase/lib/errors";++export const COLLECTION_FORM_SCHEMA = Yup.object({+ name: Yup.string()+ .required(Errors.required)+ .max(100, Errors.maxLength)+ .default(""),+ description: Yup.string().nullable().max(255, Errors.maxLength).default(null),+ parent_id: Yup.number().nullable().default(null),+});++export type CollectionFormValues = Yup.InferType<typeof COLLECTION_FORM_SCHEMA>;diff --git a/frontend/src/metabase/common/components/MoveModal.tsx b/frontend/src/metabase/common/components/MoveModal.tsxindex a61541b3f49..bc8a7cd36e4 100644--- a/frontend/src/metabase/common/components/MoveModal.tsx+++ b/frontend/src/metabase/common/components/MoveModal.tsx@@ -20,6 +20,7 @@ import {type CollectionPickerValueItem,getCollectionType,} from "metabase/common/components/Pickers/CollectionPicker";+import { isItemInCollectionOrItsDescendants } from "metabase/common/components/Pickers/utils";import { PLUGIN_TENANTS } from "metabase/plugins";import type {CollectionId,@@ -98,15 +99,8 @@ export const MoveModal = ({movingCollectionNamespace,);const shouldDisableItem = (item: CollectionPickerItem): boolean => {- if (movingCollectionId) {- if (- item.id === movingCollectionId ||- (item.effective_location ?? item?.location)- ?.split("/")- .includes(String(movingCollectionId))- ) {- return true;- }+ if (isItemInCollectionOrItsDescendants(item, movingCollectionId)) {+ return true;}if (entityType && item.model === "collection") {diff --git a/frontend/src/metabase/common/components/Pickers/utils.ts b/frontend/src/metabase/common/components/Pickers/utils.tsindex a3fb04d5ffe..0fd9484298b 100644--- a/frontend/src/metabase/common/components/Pickers/utils.ts+++ b/frontend/src/metabase/common/components/Pickers/utils.ts@@ -240,3 +240,22 @@ export const canCollectionCardBeUsed = (return true;};++/**+ * Returns true if the item is the collection itself or a descendant of it.+ * Used to prevent circular references when moving or editing collections.+ */+export function isItemInCollectionOrItsDescendants(+ item: Pick<CollectionPickerItem, "id" | "effective_location" | "location">,+ collectionId: CollectionId | undefined,+): boolean {+ if (collectionId === undefined) {+ return false;+ }++ const location = item.effective_location ?? item.location;+ return (+ item.id === collectionId ||+ location?.split("/").includes(String(collectionId)) === true+ );+}diff --git a/frontend/src/metabase/common/components/Pickers/utils.unit.spec.ts b/frontend/src/metabase/common/components/Pickers/utils.unit.spec.tsindex 9f373b69ed7..234964439b3 100644--- a/frontend/src/metabase/common/components/Pickers/utils.unit.spec.ts+++ b/frontend/src/metabase/common/components/Pickers/utils.unit.spec.ts@@ -6,6 +6,7 @@ import {getDisabledReasonForSavingModel,getNamespaceForItem,getStateFromIdPath,+ isItemInCollectionOrItsDescendants,isNamespaceRoot,shouldDisableItemForSavingModel,} from "./utils";@@ -525,3 +526,83 @@ describe("getNamespaceForItem", () => {expect(getNamespaceForItem(item)).toBeUndefined();});});++describe("isItemInCollectionOrItsDescendants", () => {+ it("returns false when collectionId is undefined", () => {+ const item = {+ id: 1,+ effective_location: "/2/3",+ location: "/2/3",+ model: "collection" as const,+ name: "Test",+ };+ expect(isItemInCollectionOrItsDescendants(item, undefined)).toBe(false);+ });++ it("returns true when item.id matches collectionId", () => {+ const item = {+ id: 5,+ effective_location: "/2/3",+ location: "/2/3",+ model: "collection" as const,+ name: "Test",+ };+ expect(isItemInCollectionOrItsDescendants(item, 5)).toBe(true);+ });++ it("returns false when item.id does not match and is not a descendant", () => {+ const item = {+ id: 10,+ effective_location: "/2/3",+ location: "/2/3",+ model: "collection" as const,+ name: "Test",+ };+ expect(isItemInCollectionOrItsDescendants(item, 5)).toBe(false);+ });++ it("returns true when item is a descendant (collectionId in effective_location)", () => {+ const item = {+ id: 10,+ effective_location: "/2/5/8",+ location: "/2/5/8",+ model: "collection" as const,+ name: "Test",+ };+ expect(isItemInCollectionOrItsDescendants(item, 5)).toBe(true);+ });++ it("returns true when item is a nested descendant", () => {+ const item = {+ id: 20,+ effective_location: "/1/2/3/4/5",+ location: "/1/2/3/4/5",+ model: "collection" as const,+ name: "Test",+ };+ expect(isItemInCollectionOrItsDescendants(item, 3)).toBe(true);+ });++ it("uses location as fallback when effective_location is undefined", () => {+ const item = {+ id: 10,+ effective_location: undefined,+ location: "/2/5/8",+ model: "collection" as const,+ name: "Test",+ };+ expect(isItemInCollectionOrItsDescendants(item, 5)).toBe(true);+ });++ it("does not match partial IDs in location path", () => {+ const item = {+ id: 100,+ effective_location: "/12/123/1234",+ model: "collection" as const,+ name: "Test",+ };+ expect(isItemInCollectionOrItsDescendants(item, 1)).toBe(false);+ expect(isItemInCollectionOrItsDescendants(item, 12)).toBe(true);+ expect(isItemInCollectionOrItsDescendants(item, 123)).toBe(true);+ });+});