From c5254fe8daffa625bc5b10441a69c0f216b9ef0b Mon Sep 17 00:00:00 2001
From: Pedro Bonamin <46196328+pedrobonamin@users.noreply.github.com>
Date: Wed, 17 Jul 2024 12:16:52 +0200
Subject: [PATCH] chore(corel): rename bundle.name to bundle.slug (#7171)

* chore(corel): rename bundle.name to bundle.slug

* chore(corel): add migration script and handlers

* fix(corel): update BundleDocument interface definition
---
 .../core/bundles/components/BundleMenu.tsx    |  18 +--
 .../components/__tests__/BundleMenu.test.tsx  |   8 +-
 .../bundles/components/dialog/BundleForm.tsx  |  14 +--
 .../components/dialog/CreateBundleDialog.tsx  |   6 +-
 .../dialog/__tests__/BundleForm.test.tsx      |   4 +-
 .../__tests__/CreateBundleDialog.test.tsx     |   6 +-
 .../components/panes/BundleActions.tsx        |  14 +--
 .../src/core/bundles/hooks/usePerspective.tsx |  10 +-
 .../sanity/src/core/bundles/util/const.ts     |   5 +-
 .../src/core/bundles/util/dummyGetters.ts     |   6 +-
 .../BundleMenuButton/BundleMenuButton.tsx     |   4 +-
 .../__tests__/BundleMenuButton.test.tsx       |   8 +-
 .../components/ReleaseDocumentPreview.tsx     |   8 +-
 .../components/ReleasesTable/ReleaseRow.tsx   |   5 +-
 .../ReleasesTable/ReleasesTable.tsx           |   2 +-
 .../__tests__/ReleasesTable.test.tsx          |  18 +--
 .../sanity/src/core/releases/plugin/index.ts  |   2 +-
 .../sanity/src/core/releases/tool/Migrate.tsx | 107 ++++++++++++++++++
 .../core/releases/tool/ReleasesOverview.tsx   |   4 +-
 .../src/core/releases/tool/ReleasesTool.tsx   |   8 +-
 .../tool/__tests__/ReleaseReview.test.tsx     |   4 +-
 .../tool/__tests__/ReleasesOverview.test.tsx  |  10 +-
 .../releases/tool/detail/ReleaseDetail.tsx    |  17 ++-
 .../releases/tool/detail/ReleaseOverview.tsx  |   2 +-
 .../tool/detail/documentTable/DocumentRow.tsx |   2 +-
 .../documentTable/useDocumentPreviewValues.ts |   2 +-
 .../detail/documentTable/useReleaseHistory.ts |  10 +-
 .../detail/review/DocumentReviewHeader.tsx    |   2 +-
 .../sanity/src/core/releases/types/router.ts  |   2 +-
 .../__workshop__/BundlesStoreStory.tsx        |  13 ++-
 .../sanity/src/core/store/bundles/types.ts    |   5 +-
 .../core/store/bundles/useBundleOperations.ts |   2 +-
 .../perspective/DocumentPerspectiveMenu.tsx   |   2 +-
 .../statusBar/DocumentStatusBarActions.tsx    |   4 +-
 34 files changed, 218 insertions(+), 116 deletions(-)
 create mode 100644 packages/sanity/src/core/releases/tool/Migrate.tsx

diff --git a/packages/sanity/src/core/bundles/components/BundleMenu.tsx b/packages/sanity/src/core/bundles/components/BundleMenu.tsx
index 5037e2cfe31..77fdb72937c 100644
--- a/packages/sanity/src/core/bundles/components/BundleMenu.tsx
+++ b/packages/sanity/src/core/bundles/components/BundleMenu.tsx
@@ -30,14 +30,14 @@ interface BundleListProps {
  */
 export function BundleMenu(props: BundleListProps): JSX.Element {
   const {bundles, loading, actions, button} = props
-  const hasBundles = bundles && bundles.filter((b) => !isDraftOrPublished(b.name)).length > 0
+  const hasBundles = bundles && bundles.filter((b) => !isDraftOrPublished(b.slug)).length > 0
 
   const {currentGlobalBundle, setPerspective} = usePerspective()
 
   const handleBundleChange = useCallback(
     (bundle: Partial<BundleDocument>) => () => {
-      if (bundle.name) {
-        setPerspective(bundle.name)
+      if (bundle.slug) {
+        setPerspective(bundle.slug)
       }
     },
     [setPerspective],
@@ -58,7 +58,7 @@ export function BundleMenu(props: BundleListProps): JSX.Element {
               <>
                 <MenuItem
                   iconRight={
-                    currentGlobalBundle.name === LATEST.name ? (
+                    currentGlobalBundle.slug === LATEST.slug ? (
                       <CheckmarkIcon data-testid="latest-checkmark-icon" />
                     ) : undefined
                   }
@@ -72,14 +72,14 @@ export function BundleMenu(props: BundleListProps): JSX.Element {
                     <MenuDivider />
                     <StyledBox data-testid="bundles-list">
                       {bundles
-                        .filter((b) => !isDraftOrPublished(b.name) && !b.archivedAt)
+                        .filter((b) => !isDraftOrPublished(b.slug) && !b.archivedAt)
                         .map((b) => (
                           <MenuItem
-                            key={b.name}
+                            key={b.slug}
                             onClick={handleBundleChange(b)}
                             padding={1}
                             pressed={false}
-                            data-testid={`bundle-${b.name}`}
+                            data-testid={`bundle-${b.slug}`}
                           >
                             <Flex>
                               <BundleBadge hue={b.hue} icon={b.icon} padding={2} />
@@ -103,8 +103,8 @@ export function BundleMenu(props: BundleListProps): JSX.Element {
                               <Box padding={2}>
                                 <Text size={1}>
                                   <CheckmarkIcon
-                                    style={{opacity: currentGlobalBundle.name === b.name ? 1 : 0}}
-                                    data-testid={`${b.name}-checkmark-icon`}
+                                    style={{opacity: currentGlobalBundle.slug === b.slug ? 1 : 0}}
+                                    data-testid={`${b.slug}-checkmark-icon`}
                                   />
                                 </Text>
                               </Box>
diff --git a/packages/sanity/src/core/bundles/components/__tests__/BundleMenu.test.tsx b/packages/sanity/src/core/bundles/components/__tests__/BundleMenu.test.tsx
index 4ea68ce7ccc..4e94a4eb6cb 100644
--- a/packages/sanity/src/core/bundles/components/__tests__/BundleMenu.test.tsx
+++ b/packages/sanity/src/core/bundles/components/__tests__/BundleMenu.test.tsx
@@ -29,7 +29,7 @@ describe('BundleMenu', () => {
       hue: 'magenta',
       _id: 'db76c50e-358b-445c-a57c-8344c588a5d5',
       _type: 'bundle',
-      name: 'spring-drop',
+      slug: 'spring-drop',
       _rev: '6z08CvvPnPe5pWSKJ5zPRR',
       icon: 'heart-filled',
       description: 'What a spring drop, allergies galore 🌸',
@@ -47,7 +47,7 @@ describe('BundleMenu', () => {
       _createdAt: '2024-07-02T11:37:06Z',
       _rev: '6z08CvvPnPe5pWSKJ5zJiK',
       _updatedAt: '2024-07-02T11:37:06Z',
-      name: 'autumn-drop',
+      slug: 'autumn-drop',
       authorId: '',
     },
     {
@@ -60,7 +60,7 @@ describe('BundleMenu', () => {
       _type: 'bundle',
       hue: 'red',
       _id: 'f6b2c2cc-1732-4465-bfb3-dd205b5d78e9',
-      name: 'summer-drop',
+      slug: 'summer-drop',
       authorId: '',
     },
   ]
@@ -133,7 +133,7 @@ describe('BundleMenu', () => {
 
     act(() => {
       expect(screen.getByText(mockBundles[0].title)).toBeInTheDocument()
-      expect(screen.getByTestId(`${mockBundles[0].name}-checkmark-icon`)).toBeInTheDocument()
+      expect(screen.getByTestId(`${mockBundles[0].slug}-checkmark-icon`)).toBeInTheDocument()
     })
   })
 
diff --git a/packages/sanity/src/core/bundles/components/dialog/BundleForm.tsx b/packages/sanity/src/core/bundles/components/dialog/BundleForm.tsx
index 86ce254e078..69f443a374f 100644
--- a/packages/sanity/src/core/bundles/components/dialog/BundleForm.tsx
+++ b/packages/sanity/src/core/bundles/components/dialog/BundleForm.tsx
@@ -55,15 +55,11 @@ export function BundleForm(props: {
   const handleBundleTitleChange = useCallback(
     (event: React.ChangeEvent<HTMLInputElement>) => {
       const pickedTitle = event.target.value
-      const pickedNameExists =
-        data && data.find((bundle) => bundle.name === speakingurl(pickedTitle))
+      const newSlug = speakingurl(pickedTitle)
+      const slugExists = data && data.find((bundle) => bundle.slug === newSlug)
       const isEmptyTitle = pickedTitle.trim() === '' && !isInitialRender
 
-      if (
-        isDraftOrPublished(pickedTitle) ||
-        pickedNameExists ||
-        (isEmptyTitle && !isInitialRender)
-      ) {
+      if (isDraftOrPublished(pickedTitle) || slugExists || (isEmptyTitle && !isInitialRender)) {
         if (isEmptyTitle && !isInitialRender) {
           // if the title is empty and it's not the first opening of the dialog, show an error
           // TODO localize text
@@ -77,7 +73,7 @@ export function BundleForm(props: {
             {level: 'error', message: "Title cannot be 'drafts' or 'published'", path: []},
           ])
         }
-        if (pickedNameExists) {
+        if (slugExists) {
           // if the bundle already exists, show an error
           // TODO localize text
           setTitleErrors([{level: 'error', message: 'Bundle already exists', path: []}])
@@ -90,7 +86,7 @@ export function BundleForm(props: {
       }
 
       setIsInitialRender(false)
-      onChange({...value, title: pickedTitle, name: speakingurl(pickedTitle)})
+      onChange({...value, title: pickedTitle, slug: newSlug})
     },
     [data, isInitialRender, onChange, onError, value],
   )
diff --git a/packages/sanity/src/core/bundles/components/dialog/CreateBundleDialog.tsx b/packages/sanity/src/core/bundles/components/dialog/CreateBundleDialog.tsx
index 5ee6e606a6e..71de6d3ff91 100644
--- a/packages/sanity/src/core/bundles/components/dialog/CreateBundleDialog.tsx
+++ b/packages/sanity/src/core/bundles/components/dialog/CreateBundleDialog.tsx
@@ -18,7 +18,7 @@ export function CreateBundleDialog(props: CreateBundleDialogProps): JSX.Element
   const [hasErrors, setHasErrors] = useState(false)
 
   const [value, setValue] = useState<Partial<BundleDocument>>({
-    name: '',
+    slug: '',
     title: '',
     hue: 'gray',
     icon: 'cube',
@@ -31,7 +31,7 @@ export function CreateBundleDialog(props: CreateBundleDialogProps): JSX.Element
 
   const handleOnSubmit = useCallback(
     async (event: FormEvent<HTMLFormElement>) => {
-      if (value.name) {
+      if (value.slug) {
         try {
           event.preventDefault()
           setIsCreating(true)
@@ -41,7 +41,7 @@ export function CreateBundleDialog(props: CreateBundleDialogProps): JSX.Element
           console.error(err)
         } finally {
           setIsCreating(false)
-          setPerspective(value.name)
+          setPerspective(value.slug)
           onCreate()
         }
       }
diff --git a/packages/sanity/src/core/bundles/components/dialog/__tests__/BundleForm.test.tsx b/packages/sanity/src/core/bundles/components/dialog/__tests__/BundleForm.test.tsx
index 620325324ca..1490ddfd31b 100644
--- a/packages/sanity/src/core/bundles/components/dialog/__tests__/BundleForm.test.tsx
+++ b/packages/sanity/src/core/bundles/components/dialog/__tests__/BundleForm.test.tsx
@@ -43,7 +43,7 @@ describe('BundleForm', () => {
         icon: 'heart-filled',
         _id: 'db76c50e-358b-445c-a57c-8344c588a5d5',
         _type: 'bundle',
-        name: 'spring-drop',
+        slug: 'spring-drop',
         hue: 'magenta',
         _createdAt: '2024-07-02T11:37:51Z',
       },
@@ -69,7 +69,7 @@ describe('BundleForm', () => {
     const titleInput = screen.getByTestId('bundle-form-title')
     fireEvent.change(titleInput, {target: {value: 'Bundle 1'}})
 
-    expect(onChangeMock).toHaveBeenCalledWith({...valueMock, title: 'Bundle 1', name: 'bundle-1'})
+    expect(onChangeMock).toHaveBeenCalledWith({...valueMock, title: 'Bundle 1', slug: 'bundle-1'})
   })
 
   it('should call onChange when description textarea value changes', () => {
diff --git a/packages/sanity/src/core/bundles/components/dialog/__tests__/CreateBundleDialog.test.tsx b/packages/sanity/src/core/bundles/components/dialog/__tests__/CreateBundleDialog.test.tsx
index e58bb8b43db..5d5b8e570f0 100644
--- a/packages/sanity/src/core/bundles/components/dialog/__tests__/CreateBundleDialog.test.tsx
+++ b/packages/sanity/src/core/bundles/components/dialog/__tests__/CreateBundleDialog.test.tsx
@@ -60,9 +60,9 @@ describe('CreateBundleDialog', () => {
     expect(onCancelMock).toHaveBeenCalled()
   })
 
-  it('should call createBundle, setPerspective, and onCreate when form is submitted with a valid name', async () => {
+  it('should call createBundle, setPerspective, and onCreate when form is submitted with a valid slug', async () => {
     const value: Partial<BundleDocument> = {
-      name: 'bundle-1',
+      slug: 'bundle-1',
       title: 'Bundle 1',
       hue: 'gray',
       icon: 'cube',
@@ -77,7 +77,7 @@ describe('CreateBundleDialog', () => {
 
     await expect(useBundleOperations().createBundle).toHaveBeenCalledWith(value)
 
-    expect(usePerspective().setPerspective).toHaveBeenCalledWith(value.name)
+    expect(usePerspective().setPerspective).toHaveBeenCalledWith(value.slug)
     expect(onCreateMock).toHaveBeenCalled()
   })
 })
diff --git a/packages/sanity/src/core/bundles/components/panes/BundleActions.tsx b/packages/sanity/src/core/bundles/components/panes/BundleActions.tsx
index 7980c0e8777..6b435e23824 100644
--- a/packages/sanity/src/core/bundles/components/panes/BundleActions.tsx
+++ b/packages/sanity/src/core/bundles/components/panes/BundleActions.tsx
@@ -25,7 +25,7 @@ interface BundleActionsProps {
  */
 export function BundleActions(props: BundleActionsProps): JSX.Element {
   const {currentGlobalBundle, documentId, documentType} = props
-  const {name, title} = currentGlobalBundle
+  const {slug, title} = currentGlobalBundle
   const {data: bundles, loading} = useBundles()
   const documentStore = useDocumentStore()
 
@@ -51,15 +51,15 @@ export function BundleActions(props: BundleActionsProps): JSX.Element {
         dummyFetch.current = fetchVersions()
       }
       await dummyFetch.current
-      setIsInVersion(versionDocumentExists(documentVersions, name))
+      setIsInVersion(versionDocumentExists(documentVersions, slug))
     }
 
     fetchVersionsInner()
-  }, [bundles, documentId, fetchVersions, documentVersions, name])
+  }, [bundles, documentId, fetchVersions, documentVersions, slug])
 
   const handleAddVersion = useCallback(async () => {
     // only add to version if there isn't already a version in that bundle of this doc
-    if (versionDocumentExists(documentVersions, name)) {
+    if (versionDocumentExists(documentVersions, slug)) {
       toast.push({
         status: 'error',
         title: `There's already a version of this document in the bundle ${title}`,
@@ -67,7 +67,7 @@ export function BundleActions(props: BundleActionsProps): JSX.Element {
       return
     }
 
-    const bundleId = `${name}.${documentId}`
+    const bundleId = `${slug}.${documentId}`
 
     setCreatingVersion(true)
 
@@ -88,7 +88,7 @@ export function BundleActions(props: BundleActionsProps): JSX.Element {
     documentStore.pair,
     documentType,
     documentVersions,
-    name,
+    slug,
     newVersion,
     title,
     toast,
@@ -98,7 +98,7 @@ export function BundleActions(props: BundleActionsProps): JSX.Element {
 
   return (
     <Button
-      data-testid={`action-add-to-${name}`}
+      data-testid={`action-add-to-${slug}`}
       // localize text
       text={isInVersion ? `Already in release ${title}` : `Add to ${title}`}
       icon={isInVersion ? CheckmarkIcon : AddIcon}
diff --git a/packages/sanity/src/core/bundles/hooks/usePerspective.tsx b/packages/sanity/src/core/bundles/hooks/usePerspective.tsx
index 91b92e0521b..0b812a14689 100644
--- a/packages/sanity/src/core/bundles/hooks/usePerspective.tsx
+++ b/packages/sanity/src/core/bundles/hooks/usePerspective.tsx
@@ -11,7 +11,7 @@ export interface PerspectiveValue {
   /* Return the current global bundle */
   currentGlobalBundle: Partial<BundleDocument>
   /* Change the perspective in the studio based on the perspective name */
-  setPerspective: (name: string) => void
+  setPerspective: (slug: string) => void
 }
 
 /**
@@ -21,18 +21,18 @@ export function usePerspective(): PerspectiveValue {
   const router = useRouter()
   const {data: bundles} = useBundles()
 
-  const setPerspective = (name: string | undefined) => {
-    if (name === 'drafts') {
+  const setPerspective = (slug: string | undefined) => {
+    if (slug === 'drafts') {
       router.navigateStickyParam('perspective', '')
     } else {
-      router.navigateStickyParam('perspective', `bundle.${name}`)
+      router.navigateStickyParam('perspective', `bundle.${slug}`)
     }
   }
   const selectedBundle =
     router.stickyParams?.perspective && bundles
       ? bundles.find((bundle: Partial<BundleDocument>) => {
           return (
-            `bundle.${bundle.name}`.toLocaleLowerCase() ===
+            `bundle.${bundle.slug}`.toLocaleLowerCase() ===
             router.stickyParams.perspective?.toLocaleLowerCase()
           )
         })
diff --git a/packages/sanity/src/core/bundles/util/const.ts b/packages/sanity/src/core/bundles/util/const.ts
index 976f31dad1b..7a2c5a9411f 100644
--- a/packages/sanity/src/core/bundles/util/const.ts
+++ b/packages/sanity/src/core/bundles/util/const.ts
@@ -6,9 +6,8 @@ import {type BundleDocument} from '../../store/bundles/types'
  * @internal
  */
 export const LATEST: Partial<BundleDocument> = {
-  name: 'drafts',
+  slug: 'drafts',
   title: 'Latest',
   icon: undefined,
-  tone: 'gray',
-  //publishAt: '',
+  hue: 'gray',
 }
diff --git a/packages/sanity/src/core/bundles/util/dummyGetters.ts b/packages/sanity/src/core/bundles/util/dummyGetters.ts
index ee2453d7347..b12cf2d436b 100644
--- a/packages/sanity/src/core/bundles/util/dummyGetters.ts
+++ b/packages/sanity/src/core/bundles/util/dummyGetters.ts
@@ -26,7 +26,7 @@ export async function getAllVersionsOfDocument(
   return await client.fetch(query, {}, {tag: 'document.list-versions'}).then((documents) => {
     return documents.map((doc: SanityDocument) => {
       const sluggedName = getVersionName(doc._id)
-      const bundle = bundles?.find((b) => b.name === sluggedName)
+      const bundle = bundles?.find((b) => b.slug === sluggedName)
       return {
         name: speakingurl(sluggedName),
         title: bundle?.title || sluggedName,
@@ -44,8 +44,8 @@ export function getVersionName(documentId: string): string {
   return version
 }
 
-export function versionDocumentExists(documentVersions: BundleDocument[], name: string): boolean {
-  return documentVersions.some((version) => version.name === name)
+export function versionDocumentExists(documentVersions: BundleDocument[], slug: string): boolean {
+  return documentVersions.some((version) => version.slug === slug)
 }
 
 export function isDraftOrPublished(versionName: string): boolean {
diff --git a/packages/sanity/src/core/releases/components/BundleMenuButton/BundleMenuButton.tsx b/packages/sanity/src/core/releases/components/BundleMenuButton/BundleMenuButton.tsx
index 4be88630e87..4f6bd007e3a 100644
--- a/packages/sanity/src/core/releases/components/BundleMenuButton/BundleMenuButton.tsx
+++ b/packages/sanity/src/core/releases/components/BundleMenuButton/BundleMenuButton.tsx
@@ -29,9 +29,9 @@ export const BundleMenuButton = ({bundle, documentCount}: Props) => {
       setDiscardStatus('discarding')
       await deleteBundle(bundle)
       setDiscardStatus('idle')
-      if (router.state.bundleName) {
+      if (router.state.bundleSlug) {
         // navigate back to bundle overview
-        router.navigate({bundleName: undefined})
+        router.navigate({bundleSlug: undefined})
       }
     } catch (e) {
       setDiscardStatus('error')
diff --git a/packages/sanity/src/core/releases/components/BundleMenuButton/__tests__/BundleMenuButton.test.tsx b/packages/sanity/src/core/releases/components/BundleMenuButton/__tests__/BundleMenuButton.test.tsx
index 0deebe1a9ea..79241eab7a2 100644
--- a/packages/sanity/src/core/releases/components/BundleMenuButton/__tests__/BundleMenuButton.test.tsx
+++ b/packages/sanity/src/core/releases/components/BundleMenuButton/__tests__/BundleMenuButton.test.tsx
@@ -39,7 +39,7 @@ describe('BundleMenuButton', () => {
       _type: 'bundle',
       archivedAt: undefined,
       title: 'activeBundle',
-      name: 'activeBundle',
+      slug: 'activeBundle',
       authorId: 'author',
       _createdAt: new Date().toISOString(),
       _updatedAt: new Date().toISOString(),
@@ -68,7 +68,7 @@ describe('BundleMenuButton', () => {
       _type: 'bundle',
       archivedAt: new Date().toISOString(),
       title: 'activeBundle',
-      name: 'activeBundle',
+      slug: 'activeBundle',
       authorId: 'author',
       _createdAt: new Date().toISOString(),
       _updatedAt: new Date().toISOString(),
@@ -96,7 +96,7 @@ describe('BundleMenuButton', () => {
       _type: 'bundle',
       archivedAt: new Date().toISOString(),
       title: 'activeBundle',
-      name: 'activeBundle',
+      slug: 'activeBundle',
       authorId: 'author',
       _createdAt: new Date().toISOString(),
       _updatedAt: new Date().toISOString(),
@@ -129,7 +129,7 @@ describe('BundleMenuButton', () => {
       _type: 'bundle',
       archivedAt: new Date().toISOString(),
       title: 'activeEmptyBundle',
-      name: 'activeEmptyBundle',
+      slug: 'activeEmptyBundle',
       authorId: 'author',
       _createdAt: new Date().toISOString(),
       _updatedAt: new Date().toISOString(),
diff --git a/packages/sanity/src/core/releases/components/ReleaseDocumentPreview.tsx b/packages/sanity/src/core/releases/components/ReleaseDocumentPreview.tsx
index 4cd9b306b13..9a1f17e86ca 100644
--- a/packages/sanity/src/core/releases/components/ReleaseDocumentPreview.tsx
+++ b/packages/sanity/src/core/releases/components/ReleaseDocumentPreview.tsx
@@ -9,7 +9,7 @@ import {getPublishedId} from '../../util/draftUtils'
 interface ReleaseDocumentPreviewProps {
   documentId: string
   documentTypeName: string
-  releaseName: string
+  releaseSlug: string
   previewValues: PreviewValue
   isLoading: boolean
 }
@@ -17,7 +17,7 @@ interface ReleaseDocumentPreviewProps {
 export function ReleaseDocumentPreview({
   documentId,
   documentTypeName,
-  releaseName,
+  releaseSlug,
   previewValues,
   isLoading,
 }: ReleaseDocumentPreviewProps) {
@@ -33,12 +33,12 @@ export function ReleaseDocumentPreview({
               id: getPublishedId(documentId, true),
               type: documentTypeName,
             }}
-            searchParams={[['perspective', `bundle.${releaseName}`]]}
+            searchParams={[['perspective', `bundle.${releaseSlug}`]]}
             ref={ref}
           />
         )
       }),
-    [documentId, documentTypeName, releaseName],
+    [documentId, documentTypeName, releaseSlug],
   )
 
   return (
diff --git a/packages/sanity/src/core/releases/components/ReleasesTable/ReleaseRow.tsx b/packages/sanity/src/core/releases/components/ReleasesTable/ReleaseRow.tsx
index 84b3dce3fc6..384981fdbff 100644
--- a/packages/sanity/src/core/releases/components/ReleasesTable/ReleaseRow.tsx
+++ b/packages/sanity/src/core/releases/components/ReleasesTable/ReleaseRow.tsx
@@ -21,13 +21,14 @@ export function ReleaseRow({bundle}: ReleaseRowProps) {
         <Card
           as="a"
           // navigate to bundle detail
-          onClick={() => router.navigate({bundleName: bundle.name})}
+          // eslint-disable-next-line react/jsx-no-bind
+          onClick={() => router.navigate({bundleSlug: bundle.slug})}
           padding={2}
           radius={2}
         >
           <Flex align="center" gap={2}>
             <Box flex="none">
-              <BundleBadge tone={bundle.tone} icon={bundle.icon} />
+              <BundleBadge hue={bundle.hue} icon={bundle.icon} />
             </Box>
             <Stack flex={1} space={2}>
               <Flex align="center" gap={2}>
diff --git a/packages/sanity/src/core/releases/components/ReleasesTable/ReleasesTable.tsx b/packages/sanity/src/core/releases/components/ReleasesTable/ReleasesTable.tsx
index 3485b0fd665..47bb2634665 100644
--- a/packages/sanity/src/core/releases/components/ReleasesTable/ReleasesTable.tsx
+++ b/packages/sanity/src/core/releases/components/ReleasesTable/ReleasesTable.tsx
@@ -49,7 +49,7 @@ export function ReleasesTable({bundles, searchTerm, setSearchTerm}: ReleasesTabl
       )
     }
 
-    return bundles.map((bundle) => <ReleaseRow key={bundle.name} bundle={bundle} />)
+    return bundles.map((bundle) => <ReleaseRow key={bundle.slug} bundle={bundle} />)
   }, [bundles])
 
   return (
diff --git a/packages/sanity/src/core/releases/components/ReleasesTable/__tests__/ReleasesTable.test.tsx b/packages/sanity/src/core/releases/components/ReleasesTable/__tests__/ReleasesTable.test.tsx
index 9edfb6ccb6d..ef638e5adcc 100644
--- a/packages/sanity/src/core/releases/components/ReleasesTable/__tests__/ReleasesTable.test.tsx
+++ b/packages/sanity/src/core/releases/components/ReleasesTable/__tests__/ReleasesTable.test.tsx
@@ -8,7 +8,7 @@ import {ReleasesTable, type TableBundle} from '../ReleasesTable'
 
 jest.mock('sanity/router', () => ({
   ...(jest.requireActual('sanity/router') || {}),
-  useRouter: jest.fn().mockReturnValue({state: {bundleName: '123'}, navigate: jest.fn()}),
+  useRouter: jest.fn().mockReturnValue({state: {bundleSlug: '123'}, navigate: jest.fn()}),
 }))
 
 jest.mock('../../../../store/bundles/useBundleOperations', () => ({
@@ -41,7 +41,7 @@ describe('ReleasesTable', () => {
     const bundles = [
       {
         title: 'Bundle 1',
-        name: 'bundle-1',
+        slug: 'bundle-1',
         _createdAt: new Date().toISOString(),
         documentsMetadata: {
           documentCount: 1,
@@ -49,7 +49,7 @@ describe('ReleasesTable', () => {
       },
       {
         title: 'Bundle 2',
-        name: 'bundle-2',
+        slug: 'bundle-2',
         _createdAt: new Date().toISOString(),
         documentsMetadata: {
           documentCount: 0,
@@ -57,7 +57,7 @@ describe('ReleasesTable', () => {
       },
       {
         title: 'Bundle 3',
-        name: 'bundle-3',
+        slug: 'bundle-3',
         _createdAt: new Date().toISOString(),
         documentsMetadata: {
           // 24 hours ago
@@ -91,7 +91,7 @@ describe('ReleasesTable', () => {
     await renderReleasesTable([
       {
         title: 'Bundle 1',
-        name: 'bundle-1',
+        slug: 'bundle-1',
         _createdAt: new Date().toISOString(),
         documentsMetadata: {
           documentCount: 0,
@@ -111,7 +111,7 @@ describe('ReleasesTable', () => {
         {
           _id: '123',
           title: 'Bundle 1',
-          name: 'bundle-1',
+          slug: 'bundle-1',
           _createdAt: new Date().toISOString(),
           documentsMetadata: {
             documentCount: 1,
@@ -123,7 +123,7 @@ describe('ReleasesTable', () => {
       const bundleRow = screen.getAllByTestId('bundle-row')[0]
       fireEvent.click(within(bundleRow).getByText('Bundle 1'))
 
-      expect(useRouter().navigate).toHaveBeenCalledWith({bundleName: 'bundle-1'})
+      expect(useRouter().navigate).toHaveBeenCalledWith({bundleSlug: 'bundle-1'})
     })
 
     it('should delete bundle when menu button is clicked', async () => {
@@ -131,7 +131,7 @@ describe('ReleasesTable', () => {
         {
           _id: '123',
           title: 'Bundle 1',
-          name: 'bundle-1',
+          slug: 'bundle-1',
           _createdAt: new Date().toISOString(),
           documentsMetadata: {
             documentCount: 1,
@@ -148,7 +148,7 @@ describe('ReleasesTable', () => {
 
       await waitFor(() => {
         expect(useBundleOperations().deleteBundle).toHaveBeenCalledWith(bundles[0])
-        expect(useRouter().navigate).toHaveBeenCalledWith({bundleName: undefined})
+        expect(useRouter().navigate).toHaveBeenCalledWith({bundleSlug: undefined})
       })
     })
   })
diff --git a/packages/sanity/src/core/releases/plugin/index.ts b/packages/sanity/src/core/releases/plugin/index.ts
index 4f555d1b294..6fb23ab6b6c 100644
--- a/packages/sanity/src/core/releases/plugin/index.ts
+++ b/packages/sanity/src/core/releases/plugin/index.ts
@@ -24,7 +24,7 @@ export const releases = definePlugin({
       name: 'releases',
       title: 'Releases',
       component: ReleasesTool,
-      router: route.create('/', [route.create('/:bundleName')]),
+      router: route.create('/', [route.create('/:bundleSlug')]),
     },
   ],
 })
diff --git a/packages/sanity/src/core/releases/tool/Migrate.tsx b/packages/sanity/src/core/releases/tool/Migrate.tsx
new file mode 100644
index 00000000000..6e05d36f7cb
--- /dev/null
+++ b/packages/sanity/src/core/releases/tool/Migrate.tsx
@@ -0,0 +1,107 @@
+/* eslint-disable no-console */
+import {Flex, Stack, Text} from '@sanity/ui'
+import {useState} from 'react'
+
+import {Button} from '../../../ui-components'
+import {useAddonDataset} from '../../studio'
+
+/**
+ * temporary migration script and buttons to trigger it, to add slug to bundles and to remove the bundles names once merged
+ */
+export function MigrateBundlesSlug() {
+  const {client} = useAddonDataset()
+  const [loading, setLoading] = useState(false)
+  const addBundlesSlug = async () => {
+    if (!client) return
+    try {
+      setLoading(true)
+      const documents = await client.fetch<
+        {
+          _id: string
+          name: string
+        }[]
+      >(`*[_type == 'bundle' && !defined(slug) && defined(name)]{ _id, name }`)
+      console.log('Documents to update: ', documents)
+      const transaction = client.transaction()
+      documents.forEach((doc) => {
+        transaction.patch(doc._id, {
+          set: {slug: doc.name},
+        })
+      })
+      const updated = await transaction.commit()
+      console.log('Transaction completed: ', updated)
+    } catch (error) {
+      console.error('Error adding bundles slug', error)
+    } finally {
+      setLoading(false)
+    }
+  }
+  const removeBundlesNames = async () => {
+    if (!client) return
+    try {
+      setLoading(true)
+      const documents = await client.fetch<
+        {
+          _id: string
+          name: string
+          slug: string
+        }[]
+      >(`*[_type == 'bundle' && defined(slug) && defined(name)]{ _id, name, slug }`)
+      console.log('Documents to update: ', documents)
+
+      const transaction = client.transaction()
+      documents.forEach((doc) => {
+        if (doc.name !== doc.slug) {
+          throw new Error(`Name and slug are not the same for bundle ${doc._id}`)
+        }
+        transaction.patch(doc._id, {
+          unset: ['name'],
+        })
+      })
+      const updated = await transaction.commit()
+      console.log('Transaction completed: ', updated)
+    } catch (error) {
+      console.error('Error removing bundles names', error)
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  const restoreBundlesNames = async () => {
+    if (!client) return
+    try {
+      setLoading(true)
+      const documents = await client.fetch<
+        {
+          _id: string
+          slug: string
+        }[]
+      >(`*[_type == 'bundle' && defined(slug) && !defined(name)]{ _id, slug }`)
+      console.log('Documents to update: ', documents)
+      const transaction = client.transaction()
+      documents.forEach((doc) => {
+        transaction.patch(doc._id, {
+          set: {name: doc.slug},
+        })
+      })
+      const updated = await transaction.commit()
+      console.log('Transaction completed: ', updated)
+    } catch (error) {
+      console.error('Error restoring bundles names', error)
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  return (
+    <Stack padding={4} space={5}>
+      <Flex gap={3}>
+        <Button onClick={addBundlesSlug} text="add bundles slug" disabled={loading} />
+        <Button onClick={removeBundlesNames} text="remove bundles names" disabled={loading} />
+        <Button onClick={restoreBundlesNames} text="Restore bundles names" disabled={loading} />
+      </Flex>
+      {loading && <Text>Executing...</Text>}
+      <Text>See your browser console for logs.</Text>
+    </Stack>
+  )
+}
diff --git a/packages/sanity/src/core/releases/tool/ReleasesOverview.tsx b/packages/sanity/src/core/releases/tool/ReleasesOverview.tsx
index d12710a46ac..2a953383c06 100644
--- a/packages/sanity/src/core/releases/tool/ReleasesOverview.tsx
+++ b/packages/sanity/src/core/releases/tool/ReleasesOverview.tsx
@@ -21,7 +21,7 @@ export function ReleasesOverview() {
   const [bundleGroupMode, setBundleGroupMode] = useState<Mode>('open')
   const [isCreateBundleDialogOpen, setIsCreateBundleDialogOpen] = useState(false)
   const [searchTerm, setSearchTerm] = useState<string>()
-  const bundleSlugs = useMemo(() => bundles?.map((bundle) => bundle.name) || [], [bundles])
+  const bundleSlugs = useMemo(() => bundles?.map((bundle) => bundle.slug) || [], [bundles])
   const {data: bundlesMetadata, loading: loadingBundlesMetadata} = useBundlesMetadata(bundleSlugs)
   const loading = loadingBundles || loadingBundlesMetadata
   const hasBundles = bundles && containsBundles(bundles)
@@ -32,7 +32,7 @@ export function ReleasesOverview() {
 
     return bundles.map((bundle) => ({
       ...bundle,
-      documentsMetadata: bundlesMetadata[bundle.name] || {},
+      documentsMetadata: bundlesMetadata[bundle.slug] || {},
     }))
   }, [bundles, bundlesMetadata])
 
diff --git a/packages/sanity/src/core/releases/tool/ReleasesTool.tsx b/packages/sanity/src/core/releases/tool/ReleasesTool.tsx
index 2225a2b262c..f7dfe6e256a 100644
--- a/packages/sanity/src/core/releases/tool/ReleasesTool.tsx
+++ b/packages/sanity/src/core/releases/tool/ReleasesTool.tsx
@@ -1,14 +1,16 @@
 import {useRouter} from 'sanity/router'
 
 import {ReleaseDetail} from './detail/ReleaseDetail'
+import {MigrateBundlesSlug} from './Migrate'
 import {ReleasesOverview} from './ReleasesOverview'
 
 export function ReleasesTool() {
   const router = useRouter()
 
-  const {bundleName} = router.state
-
-  if (bundleName) return <ReleaseDetail />
+  const {bundleSlug} = router.state
+  // TODO: Remove this after merging the PR and running the migration script
+  if (bundleSlug === 'migrate') return <MigrateBundlesSlug />
+  if (bundleSlug) return <ReleaseDetail />
 
   return <ReleasesOverview />
 }
diff --git a/packages/sanity/src/core/releases/tool/__tests__/ReleaseReview.test.tsx b/packages/sanity/src/core/releases/tool/__tests__/ReleaseReview.test.tsx
index ffc478abd1a..50d9d69f6cf 100644
--- a/packages/sanity/src/core/releases/tool/__tests__/ReleaseReview.test.tsx
+++ b/packages/sanity/src/core/releases/tool/__tests__/ReleaseReview.test.tsx
@@ -62,7 +62,7 @@ const MOCKED_PROPS = {
     title: 'Differences',
     _createdAt: '2024-07-10T12:09:56Z',
     icon: 'cube',
-    name: 'differences',
+    slug: 'differences',
     _id: 'd3137faf-ece6-44b5-a2b1-1090967f868e',
     _rev: 'j9BPWHem9m3oUugvhMXEGV',
   } as const,
@@ -83,7 +83,7 @@ jest.mock('sanity/router', () => ({
   ...(jest.requireActual('sanity/router') || {}),
   IntentLink: jest.fn().mockImplementation((props: any) => <a> {props.children}</a>),
   useRouter: jest.fn().mockReturnValue({
-    state: {bundleName: 'differences'},
+    state: {bundleSlug: 'differences'},
     navigate: jest.fn(),
   }),
 }))
diff --git a/packages/sanity/src/core/releases/tool/__tests__/ReleasesOverview.test.tsx b/packages/sanity/src/core/releases/tool/__tests__/ReleasesOverview.test.tsx
index 2e17bab5ea5..08846db976b 100644
--- a/packages/sanity/src/core/releases/tool/__tests__/ReleasesOverview.test.tsx
+++ b/packages/sanity/src/core/releases/tool/__tests__/ReleasesOverview.test.tsx
@@ -108,18 +108,18 @@ describe('ReleasesOverview', () => {
 
   describe('when bundles are loaded', () => {
     const bundles = [
-      {title: 'Bundle 1', name: 'bundle-1', _createdAt: new Date().toISOString()},
-      {title: 'Bundle 2', name: 'bundle-2', _createdAt: new Date().toISOString()},
+      {title: 'Bundle 1', slug: 'bundle-1', _createdAt: new Date().toISOString()},
+      {title: 'Bundle 2', slug: 'bundle-2', _createdAt: new Date().toISOString()},
       {
         title: 'Bundle 3',
         publishedAt: new Date().toISOString(),
-        name: 'bundle-3',
+        slug: 'bundle-3',
         _createdAt: new Date().toISOString(),
       },
       {
         title: 'Bundle 4',
         archivedAt: new Date().toISOString(),
-        name: 'bundle-4',
+        slug: 'bundle-4',
         _createdAt: new Date().toISOString(),
       },
     ] as BundleDocument[]
@@ -136,7 +136,7 @@ describe('ReleasesOverview', () => {
         error: null,
         data: Object.fromEntries(
           bundles.map((bundle) => [
-            bundle.name,
+            bundle.slug,
             {
               documentCount: 1,
             } as BundlesMetadata,
diff --git a/packages/sanity/src/core/releases/tool/detail/ReleaseDetail.tsx b/packages/sanity/src/core/releases/tool/detail/ReleaseDetail.tsx
index 078dca4af54..43593f8a7b9 100644
--- a/packages/sanity/src/core/releases/tool/detail/ReleaseDetail.tsx
+++ b/packages/sanity/src/core/releases/tool/detail/ReleaseDetail.tsx
@@ -7,7 +7,6 @@ import {type RouterContextValue, useRouter} from 'sanity/router'
 import {Button} from '../../../../ui-components'
 import {useListener} from '../../../hooks/useListener'
 import {useBundles} from '../../../store/bundles'
-import {type BundleDocument} from '../../../store/bundles/types'
 import {API_VERSION} from '../../../tasks/constants'
 import {BundleMenuButton} from '../../components/BundleMenuButton/BundleMenuButton'
 import {type ReleasesRouterState} from '../../types/router'
@@ -18,10 +17,10 @@ import {ReleaseReview} from './ReleaseReview'
 const SUPPORTED_SCREENS = ['overview', 'review'] as const
 type Screen = (typeof SUPPORTED_SCREENS)[number]
 
-const useFetchBundleDocuments = (bundleName: string) => {
+const useFetchBundleDocuments = (bundleSlug: string) => {
   const client = useClient({apiVersion: API_VERSION})
-  const query = `*[defined(_version) &&  _id in path("${bundleName}.*")]`
-  return useListener<BundleDocument>({query, client})
+  const query = `*[defined(_version) &&  _id in path("${bundleSlug}.*")]`
+  return useListener({query, client})
 }
 
 const getActiveScreen = (router: RouterContextValue): Screen => {
@@ -40,14 +39,14 @@ export const ReleaseDetail = () => {
 
   const activeScreen = getActiveScreen(router)
 
-  const {bundleName}: ReleasesRouterState = router.state
-  const parsedBundleName = decodeURIComponent(bundleName || '')
+  const {bundleSlug}: ReleasesRouterState = router.state
+  const parsedSlug = decodeURIComponent(bundleSlug || '')
   const {data, loading} = useBundles()
   const {documents: bundleDocuments, loading: documentsLoading} =
-    useFetchBundleDocuments(parsedBundleName)
+    useFetchBundleDocuments(parsedSlug)
   const history = useReleaseHistory(bundleDocuments)
 
-  const bundle = data?.find((storeBundle) => storeBundle.name === parsedBundleName)
+  const bundle = data?.find((storeBundle) => storeBundle.slug === parsedSlug)
   const bundleHasDocuments = !!bundleDocuments.length
   const showPublishButton = loading || !bundle?.publishedAt
   const isPublishButtonDisabled = loading || !bundle || !bundleHasDocuments
@@ -143,7 +142,7 @@ export const ReleaseDetail = () => {
       <Card flex={1} tone="critical">
         <Container width={0}>
           <Stack paddingX={4} paddingY={6} space={1}>
-            <Heading>Release not found: {bundleName}</Heading>
+            <Heading>Release not found: {bundleSlug}</Heading>
           </Stack>
         </Container>
       </Card>
diff --git a/packages/sanity/src/core/releases/tool/detail/ReleaseOverview.tsx b/packages/sanity/src/core/releases/tool/detail/ReleaseOverview.tsx
index a7b072d2d6c..d0a908cbcb9 100644
--- a/packages/sanity/src/core/releases/tool/detail/ReleaseOverview.tsx
+++ b/packages/sanity/src/core/releases/tool/detail/ReleaseOverview.tsx
@@ -94,7 +94,7 @@ export function ReleaseOverview(props: {
             />
 
             {/* Published */}
-            {!release.archived && (
+            {!release.archivedAt && (
               <Chip
                 avatar={
                   release.publishedBy ? <UserAvatar size={0} user={release.publishedBy} /> : null
diff --git a/packages/sanity/src/core/releases/tool/detail/documentTable/DocumentRow.tsx b/packages/sanity/src/core/releases/tool/detail/documentTable/DocumentRow.tsx
index 1c94c716a1e..42effe2fe71 100644
--- a/packages/sanity/src/core/releases/tool/detail/documentTable/DocumentRow.tsx
+++ b/packages/sanity/src/core/releases/tool/detail/documentTable/DocumentRow.tsx
@@ -85,7 +85,7 @@ export function DocumentRow(props: {
           <ReleaseDocumentPreview
             documentId={documentId}
             documentTypeName={documentTypeName}
-            releaseName="releaseName"
+            releaseSlug={release.slug}
             previewValues={previewValues}
             isLoading={!!isLoading}
           />
diff --git a/packages/sanity/src/core/releases/tool/detail/documentTable/useDocumentPreviewValues.ts b/packages/sanity/src/core/releases/tool/detail/documentTable/useDocumentPreviewValues.ts
index dfbda311426..22d2f9fcb4a 100644
--- a/packages/sanity/src/core/releases/tool/detail/documentTable/useDocumentPreviewValues.ts
+++ b/packages/sanity/src/core/releases/tool/detail/documentTable/useDocumentPreviewValues.ts
@@ -24,7 +24,7 @@ export const useDocumentPreviewValues = ({
   if (!schemaType) {
     throw new Error(`Schema type "${document._type}" not found`)
   }
-  const perspective = `bundle.${release.name}`
+  const perspective = `bundle.${release.slug}`
 
   const documentPreviewStore = useDocumentPreviewStore()
 
diff --git a/packages/sanity/src/core/releases/tool/detail/documentTable/useReleaseHistory.ts b/packages/sanity/src/core/releases/tool/detail/documentTable/useReleaseHistory.ts
index 485aa23207c..026b175a22b 100644
--- a/packages/sanity/src/core/releases/tool/detail/documentTable/useReleaseHistory.ts
+++ b/packages/sanity/src/core/releases/tool/detail/documentTable/useReleaseHistory.ts
@@ -1,10 +1,6 @@
+import {type SanityDocument} from '@sanity/types'
 import {useCallback, useEffect, useMemo, useState} from 'react'
-import {
-  type BundleDocument,
-  getPublishedId,
-  type TransactionLogEventWithEffects,
-  useClient,
-} from 'sanity'
+import {getPublishedId, type TransactionLogEventWithEffects, useClient} from 'sanity'
 
 import {getJsonStream} from '../../../../store/_legacy/history/history/getJsonStream'
 import {API_VERSION} from '../../../../tasks/constants'
@@ -17,7 +13,7 @@ export type DocumentHistory = {
 }
 
 // TODO: Update this to contemplate the _revision change on any of the internal bundle documents, and fetch only the history of that document if changes.
-export function useReleaseHistory(bundleDocuments: BundleDocument[]): {
+export function useReleaseHistory(bundleDocuments: SanityDocument[]): {
   documentsHistory: Map<string, DocumentHistory>
   collaborators: string[]
   loading: boolean
diff --git a/packages/sanity/src/core/releases/tool/detail/review/DocumentReviewHeader.tsx b/packages/sanity/src/core/releases/tool/detail/review/DocumentReviewHeader.tsx
index fb2090650fb..50b4e16d5d9 100644
--- a/packages/sanity/src/core/releases/tool/detail/review/DocumentReviewHeader.tsx
+++ b/packages/sanity/src/core/releases/tool/detail/review/DocumentReviewHeader.tsx
@@ -30,7 +30,7 @@ export function DocumentReviewHeader({
         <ReleaseDocumentPreview
           documentId={document._id}
           documentTypeName={document._type}
-          releaseName={release.name}
+          releaseSlug={release.slug}
           previewValues={previewValues}
           isLoading={isLoading}
         />
diff --git a/packages/sanity/src/core/releases/types/router.ts b/packages/sanity/src/core/releases/types/router.ts
index 7baec2f1e39..65b3a92b3d2 100644
--- a/packages/sanity/src/core/releases/types/router.ts
+++ b/packages/sanity/src/core/releases/types/router.ts
@@ -1,5 +1,5 @@
 import {type RouterState} from 'sanity/router'
 
 export interface ReleasesRouterState extends RouterState {
-  bundleName?: string
+  bundleSlug?: string
 }
diff --git a/packages/sanity/src/core/store/bundles/__workshop__/BundlesStoreStory.tsx b/packages/sanity/src/core/store/bundles/__workshop__/BundlesStoreStory.tsx
index b1e98ca7a86..ffa11cefeba 100644
--- a/packages/sanity/src/core/store/bundles/__workshop__/BundlesStoreStory.tsx
+++ b/packages/sanity/src/core/store/bundles/__workshop__/BundlesStoreStory.tsx
@@ -61,10 +61,10 @@ const BundlesStoreStory = () => {
   )
 
   const handleDeleteBundle = useCallback(
-    async (id: string) => {
+    async (bundle: BundleDocument) => {
       try {
-        setDeleting(id)
-        await deleteBundle(id)
+        setDeleting(bundle._id)
+        await deleteBundle(bundle)
       } catch (err) {
         console.error(err)
       } finally {
@@ -81,7 +81,7 @@ const BundlesStoreStory = () => {
           <form onSubmit={handleCreateBundle}>
             <Stack space={4}>
               <Text weight="medium">Create a new release</Text>
-              <BundleForm onChange={setValue} value={value} />
+              <BundleForm onChange={setValue} value={value} onError={() => {}} />
               <Flex justify="flex-end">
                 <Button
                   text="Create"
@@ -106,14 +106,14 @@ const BundlesStoreStory = () => {
           {data?.map((bundle) => (
             <Card key={bundle._id} padding={3} border radius={3}>
               <Flex align="center" gap={3} justify={'space-between'}>
-                <Text>{bundle.name}</Text>
+                <Text>{bundle.slug}</Text>
                 <Flex align="center" gap={2}>
                   <Button
                     text="Delete"
                     mode="bleed"
                     tone="critical"
                     // eslint-disable-next-line react/jsx-no-bind
-                    onClick={() => handleDeleteBundle(bundle._id)}
+                    onClick={() => handleDeleteBundle(bundle)}
                     disabled={deleting === bundle._id}
                     loading={deleting === bundle._id}
                   />
@@ -146,6 +146,7 @@ const BundlesStoreStory = () => {
         >
           {editing && (
             <BundleForm
+              onError={() => {}}
               // eslint-disable-next-line react/jsx-no-bind
               onChange={(bundle) =>
                 setEditing((prev) => ({
diff --git a/packages/sanity/src/core/store/bundles/types.ts b/packages/sanity/src/core/store/bundles/types.ts
index 98afa8f35f3..100be1964e3 100644
--- a/packages/sanity/src/core/store/bundles/types.ts
+++ b/packages/sanity/src/core/store/bundles/types.ts
@@ -10,10 +10,11 @@ import {type bundlesReducerAction, type bundlesReducerState} from './reducer'
 /**
  * @internal
  */
-export interface BundleDocument extends SanityDocument {
+export interface BundleDocument
+  extends Pick<SanityDocument, '_id' | '_createdAt' | '_updatedAt' | '_rev' | '_version'> {
   _type: 'bundle'
   title: string
-  name: string
+  slug: string
   description?: string
   hue: ColorHueKey
   icon: IconSymbol
diff --git a/packages/sanity/src/core/store/bundles/useBundleOperations.ts b/packages/sanity/src/core/store/bundles/useBundleOperations.ts
index 82055e43a3d..5024bc5bca7 100644
--- a/packages/sanity/src/core/store/bundles/useBundleOperations.ts
+++ b/packages/sanity/src/core/store/bundles/useBundleOperations.ts
@@ -32,7 +32,7 @@ export function useBundleOperations() {
     async (bundle: BundleDocument) => {
       // Fetch the related version documents from the main dataset, this documents will be removed
       const versionDocuments = await studioClient.fetch<SanityDocument[]>(
-        `*[defined(_version) && _id in path("${bundle.name}.*")]`,
+        `*[defined(_version) && _id in path("${bundle.slug}.*")]`,
       )
       // Starts the transaction to remove the documents.
       const transaction = studioClient.transaction()
diff --git a/packages/sanity/src/structure/panes/document/documentPanel/header/perspective/DocumentPerspectiveMenu.tsx b/packages/sanity/src/structure/panes/document/documentPanel/header/perspective/DocumentPerspectiveMenu.tsx
index 469b16f59f0..05cb4d571fd 100644
--- a/packages/sanity/src/structure/panes/document/documentPanel/header/perspective/DocumentPerspectiveMenu.tsx
+++ b/packages/sanity/src/structure/panes/document/documentPanel/header/perspective/DocumentPerspectiveMenu.tsx
@@ -47,7 +47,7 @@ export function DocumentPerspectiveMenu(props: {documentId: string}): JSX.Elemen
     <>
       {/* FIXME Version Badge should only show when the current opened document is in a version, RIGHT
       NOW IT'S USING THE GLOBAL */}
-      {currentGlobalBundle && currentGlobalBundle.name === LATEST.name && (
+      {currentGlobalBundle && currentGlobalBundle.slug === LATEST.slug && (
         <BundleBadge hue={hue} title={title} icon={icon} padding={2} />
       )}
       {/** TODO IS THIS STILL NEEDED? VS THE PICKER IN STUDIO NAVBAR? */}
diff --git a/packages/sanity/src/structure/panes/document/statusBar/DocumentStatusBarActions.tsx b/packages/sanity/src/structure/panes/document/statusBar/DocumentStatusBarActions.tsx
index 224410d8f15..1e41cb756f3 100644
--- a/packages/sanity/src/structure/panes/document/statusBar/DocumentStatusBarActions.tsx
+++ b/packages/sanity/src/structure/panes/document/statusBar/DocumentStatusBarActions.tsx
@@ -76,7 +76,7 @@ function DocumentStatusBarActionsInner(props: DocumentStatusBarActionsInnerProps
         <LayerProvider zOffset={200}>
           <Tooltip disabled={!tooltipContent} content={tooltipContent} placement="top">
             <Stack>
-              {currentGlobalBundle.name === LATEST.name ? (
+              {currentGlobalBundle.slug === LATEST.slug ? (
                 <Button
                   data-testid={`action-${firstActionState.label}`}
                   disabled={
@@ -116,7 +116,7 @@ function DocumentStatusBarActionsInner(props: DocumentStatusBarActionsInnerProps
        * TODO DO WE STILL NEED THIS OR CAN WE MOVE THIS TO THE PLUGIN?
        * SPECIFICALLY FOR ISDRAFT
        */}
-      {showMenu && menuActionStates.length > 0 && currentGlobalBundle.name === LATEST.name && (
+      {showMenu && menuActionStates.length > 0 && currentGlobalBundle.slug === LATEST.slug && (
         <ActionMenuButton actionStates={menuActionStates} disabled={disabled} />
       )}
       {firstActionState && firstActionState.dialog && (